Changeset 5608:584b36c566e2 in roaraudio for libroar/proto.c

Timestamp:

07/31/12 15:31:35 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Handle super long client names well (Closes: #286)

File:

• libroar/proto.c (modified) (2 diffs)

libroar/proto.c

@@ -148 +148 @@
 }
 
+static inline int _libroar_msgresyncer(struct roar_vio_calls  * vio, size_t len) {
+ char buffer[2*LIBROAR_BUFFER_MSGDATA]; // this is always called with len > LIBROAR_BUFFER_MSGDATA.
+ ssize_t ret;
+ size_t errorc = 0;
+
+ while (len && errorc < 4) {
+  ret = roar_vio_read(vio, buffer, len > sizeof(buffer) ? sizeof(buffer) : len);
+  if ( ret == (size_t)-1 ) {
+   errorc++;
+  } else {
+   errorc = 0;
+   len -= ret;
+  }
+ }
+
+ if ( len )
+  return -1; // last error is still set.
+ return 0;
+}
+
 int roar_vrecv_message2(struct roar_vio_calls  * vio, struct roar_message * mes, char ** data,
                         struct roar_error_frame * errorframe) {
@@ -269 +289 @@
  } else {
   if ( data == NULL ) {
-   roar_err_set(ROAR_ERROR_MSGSIZE);
+   if ( _libroar_msgresyncer(vio, mes->datalen) == -1 ) {
+    roar_err_set(ROAR_ERROR_BADCKSUM);
+   } else {
+    roar_err_set(ROAR_ERROR_MSGSIZE);
+   }
    return -1;
   }
 
   if ( (*data = roar_mm_malloc(mes->datalen)) == NULL ) {
-   roar_err_set(ROAR_ERROR_NOMEM);
+   if ( _libroar_msgresyncer(vio, mes->datalen) == -1 ) {
+    roar_err_set(ROAR_ERROR_BADCKSUM);
+   } else {
+    roar_err_set(ROAR_ERROR_NOMEM);
+   }
    return -1;
   }