Changeset 5146:716400712348 in roaraudio for libroar/proto.c

Timestamp:

10/15/11 12:48:07 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Moved error frame handling into proto functions (pr0)

File:

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

libroar/proto.c

@@ -134 +134 @@
 
 int roar_recv_message (struct roar_connection * con, struct roar_message * mes, char ** data) {
+ return roar_recv_message2(con, mes, data, NULL);
+}
+int roar_recv_message2 (struct roar_connection * con, struct roar_message * mes, char ** data,
+                        struct roar_error_frame * errorframe) {
  struct roar_vio_calls * vio;
 
@@ -139 +143 @@
   return -1;
 
- return roar_vrecv_message(vio, mes, data);
+ return roar_vrecv_message2(vio, mes, data, errorframe);
 }
 
 int roar_vrecv_message(struct roar_vio_calls * vio, struct roar_message * mes, char ** data) {
+ return roar_vrecv_message2(vio, mes, data, NULL);
+}
+
+int roar_vrecv_message2(struct roar_vio_calls  * vio, struct roar_message * mes, char ** data,
+                        struct roar_error_frame * errorframe) {
  // TODO: add CRC support.
  char buf[_ROAR_MESS_BUF_LEN_MAX];
@@ -153 +162 @@
  roar_err_set(ROAR_ERROR_UNKNOWN);
 
- ROAR_DBG("roar_recv_message(*): try to get a response form the server...");
-
- if ( mes == NULL )
-  return -1;
+ ROAR_DBG("roar_vrecv_message2(vio=%p, mes=%p, data=%p, errorframe=%p) = ?", vio, mes, data, errorframe);
+
+ ROAR_DBG("roar_vrecv_message2(*): try to get a response form the server...");
+
+ if ( vio == NULL || mes == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
 
  if ( data != NULL )
@@ -168 +181 @@
  }
 
- ROAR_DBG("roar_recv_message(*): Got a header");
+ ROAR_DBG("roar_vrecv_message2(*): Got a header");
 
  mes->version = buf[0];
@@ -224 +237 @@
   mes->stream = -1;
 
- ROAR_DBG("roar_recv_message(*): command=%i(%s)", mes->cmd,
+ ROAR_DBG("roar_vrecv_message2(*): command=%i(%s)", mes->cmd,
            mes->cmd == ROAR_CMD_OK ? "OK" : (mes->cmd == ROAR_CMD_ERROR ? "ERROR" : "UNKNOWN"));
 
@@ -230 +243 @@
 
  if ( mes->datalen == 0 ) {
-  ROAR_DBG("roar_recv_message(*): no data in this pkg");
-  ROAR_DBG("roar_recv_message(*) = 0");
+  ROAR_DBG("roar_vrecv_message2(*): no data in this pkg");
+  if ( mes->cmd == ROAR_CMD_ERROR && errorframe != NULL ) {
+   roar_err_init(errorframe);
+  }
   roar_err_clear();
+  ROAR_DBG("roar_vrecv_message2(*) = 0");
   return 0;
  }
@@ -238 +254 @@
  if ( mes->datalen <= LIBROAR_BUFFER_MSGDATA ) {
   if ( roar_vio_read(vio, mes->data, mes->datalen) == mes->datalen ) {
-   ROAR_DBG("roar_recv_message(*): Got data!");
-   ROAR_DBG("roar_recv_message(*) = 0");
+   ROAR_DBG("roar_vrecv_message2(*): Got data!");
    roar_err_clear();
+   if ( mes->cmd == ROAR_CMD_ERROR && errorframe != NULL ) {
+    if ( roar_err_parsemsg2(mes, *data, errorframe) != 0 ) {
+     roar_err_init(errorframe);
+    }
+   }
+   ROAR_DBG("roar_vrecv_message2(*) = 0");
    return 0;
   }
@@ -258 +279 @@
   if ( mes->datalen == 0 ) {
    roar_err_clear();
+   if ( mes->cmd == ROAR_CMD_ERROR && errorframe != NULL ) {
+    roar_err_init(errorframe);
+   }
    return 0;
   }
 
   if ( roar_vio_read(vio, *data, mes->datalen) == mes->datalen ) {
-   ROAR_DBG("roar_recv_message(*): Got data!");
-   ROAR_DBG("roar_recv_message(*) = 0");
+   ROAR_DBG("roar_vrecv_message2(*): Got data!");
+
    roar_err_clear();
+   if ( mes->cmd == ROAR_CMD_ERROR && errorframe != NULL ) {
+    if ( roar_err_parsemsg2(mes, *data, errorframe) != 0 ) {
+     roar_err_init(errorframe);
+    }
+   }
+   ROAR_DBG("roar_vrecv_message2(*) = 0");
    return 0;
   }
@@ -277 +307 @@
 
 int roar_req (struct roar_connection * con, struct roar_message * mes, char ** data) {
+ return roar_req2(con, mes, data, NULL);
+}
+
+int roar_req2          (struct roar_connection * con, struct roar_message * mes, char ** data,
+                        struct roar_error_frame * errorframe) {
  struct roar_vio_calls * vio;
 
@@ -282 +317 @@
   return -1;
 
- return roar_vreq(vio, mes, data);
+ return roar_vreq2(vio, mes, data, errorframe);
 }
 
 int roar_vreq         (struct roar_vio_calls * vio, struct roar_message * mes, char ** data) {
+ return roar_vreq2(vio, mes, data, NULL);
+}
+
+int roar_vreq2         (struct roar_vio_calls  * vio, struct roar_message * mes, char ** data,
+                        struct roar_error_frame * errorframe) {
  if ( roar_vsend_message(vio, mes, data != NULL ? *data : NULL) != 0 )
   return -1;
@@ -294 +334 @@
  roar_vio_sync(vio); // we need to do this becasue of ssl/compressed links
 
- return roar_vrecv_message(vio, mes, data);
+ return roar_vrecv_message2(vio, mes, data, errorframe);
 }