Changeset 4440:970fdb88487b in roaraudio for libroar/serverinfo.c

Timestamp:

10/09/10 15:56:35 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for lage messages

File:

• libroar/serverinfo.c (modified) (13 diffs)

libroar/serverinfo.c

@@ -43 +43 @@
 
 struct roar_server_info * roar_server_info(struct roar_connection * con) {
+ struct roar_server_info * ret;
  struct roar_message mes;
  uint16_t * d16;
+ char * data = NULL;
 
  memset(&mes, 0, sizeof(mes));
@@ -55 +57 @@
  d16[1] = ROAR_HOST2NET16(ROAR_IT_SERVER);
 
- if ( roar_req(con, &mes, NULL) != 0 )
+ if ( roar_req(con, &mes, &data) != 0 )
   return NULL;
 
@@ -61 +63 @@
   return NULL;
 
- return roar_server_info_from_mes(&mes);
+ ret = roar_server_info_from_mes(&mes, data);
+
+ if ( data != NULL )
+  free(data);
+
+ return ret;
 }
 
@@ -75 +82 @@
 #define _add(t, m) do { if ( info->m != NULL && (sl = strlen(info->m)) != 0 ) { iebuf[idx].type = (t); iebuf[idx].len = sl; iebuf[idx].buf = (info->m); idx++; needlen += 4 + sl; } } while (0)
 
-int roar_server_info_to_mes(struct roar_message * mes, struct roar_server_info * info) {
+int roar_server_info_to_mes(struct roar_message * mes, struct roar_server_info * info, void ** data) {
  size_t needlen = 4;
  size_t sl;
@@ -83 +90 @@
  char * textpart;
  int i;
+ char * mesdata;
 
  if ( mes == NULL || info == NULL )
@@ -100 +108 @@
 
  if ( needlen > LIBROAR_BUFFER_MSGDATA ) {
-  return -1;
+  if ( data == NULL )
+   return -1;
+
+  mesdata = malloc(needlen);
+
+  if ( mesdata == NULL )
+   return -1;
+ } else {
+  mesdata = mes->data;
  }
 
@@ -107 +123 @@
  mes->datalen = needlen;
 
- d16 = (uint16_t*)mes->data;
-
- mes->data[0] = 0; // version
- mes->data[1] = 0; // reserved
+ d16 = (uint16_t*)mesdata;
+
+ mesdata[0] = 0; // version
+ mesdata[1] = 0; // reserved
 
  d16[1] = ROAR_HOST2NET16(idx);
@@ -122 +138 @@
  }
 
- textpart = mes->data + (4 + 4*idx);
+ textpart = mesdata + (4 + 4*idx);
 
  for (i = 0; i < idx; i++) {
@@ -132 +148 @@
 }
 
-struct roar_server_info * roar_server_info_from_mes(struct roar_message * mes) {
+struct roar_server_info * roar_server_info_from_mes(struct roar_message * mes, void * data) {
  struct ie iebuf[sizeof(struct roar_server_info)/sizeof(char*)];
  struct ie * ieptr;
@@ -143 +159 @@
  char * textbuf;
  char ** tptr;
+ char * mesdata;
 
  ROAR_DBG("roar_server_info(mes=%p{.datalen=%llu) = ?", mes, (long long unsigned int)mes->datalen);
@@ -148 +165 @@
  if ( mes == NULL )
   return NULL;
+
+ if ( data == NULL ) {
+  mesdata = mes->data;
+ } else {
+  mesdata = data;
+ }
 
  memset(iebuf, 0, sizeof(iebuf));
@@ -159 +182 @@
  ROAR_DBG("roar_server_info(mes=%p) = ?", mes);
 
- if ( mes->data[0] != 0 ) /* version */
-  return NULL;
-
- ROAR_DBG("roar_server_info(mes=%p) = ?", mes);
-
- if ( mes->data[1] != 0 ) /* reserved */
-  return NULL;
-
- ROAR_DBG("roar_server_info(mes=%p) = ?", mes);
-
- d16 = (uint16_t*)mes->data;
+ if ( mesdata[0] != 0 ) /* version */
+  return NULL;
+
+ ROAR_DBG("roar_server_info(mes=%p) = ?", mes);
+
+ if ( mesdata[1] != 0 ) /* reserved */
+  return NULL;
+
+ ROAR_DBG("roar_server_info(mes=%p) = ?", mes);
+
+ d16 = (uint16_t*)mesdata;
 
  idx = ROAR_NET2HOST16(d16[1]);
@@ -191 +214 @@
  ROAR_DBG("roar_server_info(mes=%p) = ?", mes);
 
- d16 = (uint16_t*)mes->data;
+ d16 = (uint16_t*)mesdata;
  dptr = &(d16[2]);
 
- textpart = mes->data + (4 + 4*idx);
+ textpart = mesdata + (4 + 4*idx);
 
  ROAR_DBG("roar_server_info(mes=%p): needlen=%llu", mes, (long long unsigned int)needlen);