Changeset 5146:716400712348 in roaraudio for libroar/error.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/error.c (modified) (3 diffs)

libroar/error.c

@@ -45 +45 @@
 int roar_errno = ROAR_ERROR_NONE;
 
+struct roar_error_frame * roar_err_errorframe(void) {
+ static struct roar_error_frame frame = {
+  .version     =  0,
+  .cmd         = -1,
+  .ra_errno    = ROAR_ERROR_UNKNOWN,
+  .ra_suberrno = -1,
+  .p_errno     = -1,
+  .flags       =  0,
+  .datalen     =  0,
+  .data        = NULL
+ };
+
+ return &frame;
+}
+
 int    roar_err_int(struct roar_error_frame * frame) {
- if ( frame == NULL )
+ roar_debug_warn_obsolete("roar_err_int", "roar_err_init", NULL);
+ return roar_err_init(frame);
+}
+int    roar_err_init(struct roar_error_frame * frame) {
+ if ( frame == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
   return -1;
+ }
 
  memset(frame, 0, sizeof(struct roar_error_frame));
 
  frame->cmd         = -1;
- frame->ra_errno    = -1;
+ frame->ra_errno    = ROAR_ERROR_UNKNOWN;
  frame->ra_suberrno = -1;
  frame->p_errno     = -1;
+ frame->datalen     =  0;
+ frame->data        = NULL;
 
  return 0;
 }
 
+
 void * roar_err_buildmsg(struct roar_message * mes, struct roar_error_frame * frame) {
+ roar_debug_warn_obsolete("roar_err_buildmsg", "roar_err_buildmsg2", NULL);
+ return roar_err_buildmsg2(mes, NULL, frame);
+}
+void * roar_err_buildmsg2(struct roar_message * mes, void ** data, struct roar_error_frame * frame) {
+ char * databuf = NULL;
  int16_t * d;
-
- if ( mes == NULL || frame == NULL )
+ size_t datalen;
+
+ if ( mes == NULL || frame == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
   return NULL;
+ }
+
+ if ( data != NULL )
+  *data = NULL;
+
+ datalen = 8 + frame->datalen;
+ if ( datalen > LIBROAR_BUFFER_MSGDATA ) {
+  if ( data == NULL ) {
+   roar_err_set(ROAR_ERROR_FAULT);
+   return NULL;
+  }
+
+  roar_err_clear_errno();
+  *data = malloc(datalen);
+  roar_err_from_errno();
+  if ( *data == NULL )
+   return NULL;
+
+  databuf = *data;
+ } else {
+  databuf = mes->data;
+ }
 
  memset(mes,  0, sizeof(struct roar_message));
-
- d = (int16_t*)mes->data;
-
- mes->datalen = 8 + frame->datalen;
- frame->data  = &(mes->data[8]);
-
- mes->data[0]    = 0; // version.
- mes->data[1]    = frame->cmd;
- mes->data[2]    = frame->ra_errno;
- mes->data[3]    = frame->ra_suberrno;
+ memset(databuf, 0, mes->datalen);
+
+ mes->datalen = datalen;
+
+ d = (int16_t*)databuf;
+
+ frame->data  = &(databuf[8]);
+
+ databuf[0]    = 0; // version.
+ databuf[1]    = frame->cmd;
+ databuf[2]    = frame->ra_errno;
+ databuf[3]    = frame->ra_suberrno;
  d[2]            = ROAR_HOST2NET16(frame->p_errno);
  d[3]            = ROAR_HOST2NET16(frame->flags);
@@ -83 +138 @@
 
 int    roar_err_parsemsg(struct roar_message * mes, struct roar_error_frame * frame) {
+ roar_debug_warn_obsolete("roar_err_parsemsg", "roar_err_parsemsg", NULL);
+ return roar_err_parsemsg2(mes, NULL, frame);
+}
+int    roar_err_parsemsg2(struct roar_message * mes, void *  data, struct roar_error_frame * frame) {
+ char * databuf = (char *)data;
  int16_t * d;
 
- if ( mes == NULL || frame == NULL )
+ ROAR_DBG("roar_err_parsemsg2(mes=%p{.datalen=%i, .data=%p}, data=%p, frame=%p) = ?",
+          mes, (int)mes->datalen, mes->data, data, frame);
+
+ if ( mes == NULL || frame == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  ROAR_DBG("roar_err_parsemsg2(mes=%p{.datalen=%i, .data=%p}, data=%p, frame=%p) = -1 // error=FAULT",
+           mes, (int)mes->datalen, mes->data, data, frame);
   return -1;
-
- d = (int16_t*)mes->data;
-
- if ( mes->datalen < 8 )
+ }
+
+ ROAR_DBG("roar_err_parsemsg2(mes=%p{.datalen=%i, .data=%p}, data=%p, frame=%p) = ?",
+          mes, (int)mes->datalen, mes->data, data, frame);
+
+ if ( databuf == NULL )
+  databuf = mes->data;
+
+ d = (int16_t*)databuf;
+
+ ROAR_DBG("roar_err_parsemsg2(mes=%p{.datalen=%i, .data=%p}, data=%p, frame=%p) = ?",
+          mes, (int)mes->datalen, mes->data, data, frame);
+
+ if ( mes->datalen < 8 ) {
+  roar_err_set(ROAR_ERROR_MSGSIZE);
+  ROAR_DBG("roar_err_parsemsg2(mes=%p{.datalen=%i, .data=%p}, data=%p, frame=%p) = -1 // error=MSGSIZE",
+           mes, (int)mes->datalen, mes->data, data, frame);
   return -1;
-
- if ( mes->data[0] != 0 )
+ }
+
+ ROAR_DBG("roar_err_parsemsg2(mes=%p{.datalen=%i, .data=%p}, data=%p, frame=%p) = ?",
+          mes, (int)mes->datalen, mes->data, data, frame);
+
+ if ( databuf[0] != 0 ) {
+  roar_err_set(ROAR_ERROR_NSVERSION);
+  ROAR_DBG("roar_err_parsemsg2(mes=%p{.datalen=%i, .data=%p}, data=%p, frame=%p) = -1 // error=NSVERSION",
+           mes, (int)mes->datalen, mes->data, data, frame);
   return -1;
-
- frame->cmd         = mes->data[1];
- frame->ra_errno    = mes->data[2];
- frame->ra_suberrno = mes->data[3];
+ }
+
+ ROAR_DBG("roar_err_parsemsg2(mes=%p{.datalen=%i, .data=%p}, data=%p, frame=%p) = ?",
+          mes, (int)mes->datalen, mes->data, data, frame);
+
+ frame->cmd         = databuf[1];
+ frame->ra_errno    = databuf[2];
+ frame->ra_suberrno = databuf[3];
  frame->p_errno     = ROAR_NET2HOST16(d[2]);
  frame->flags       = ROAR_NET2HOST16(d[3]);
 
  frame->datalen     = mes->datalen - 8;
- frame->data        = &(mes->data[8]);
-
+ frame->data        = &(databuf[8]);
+
+ ROAR_DBG("roar_err_parsemsg2(mes=%p{.datalen=%i, .data=%p}, data=%p, frame=%p) = 0",
+          mes, (int)mes->datalen, mes->data, data, frame);
  return 0;
 }
@@ -128 +220 @@
  int * err = roar_errno2();
 
- // NOTE: _NEVER_ call ROAR_{DBG,INFO,WARN,ERRO}() in here! (will result in endless loop)
+ // NOTE: _NEVER_ call ROAR_{DBG,INFO,WARN,ERROR}() in here! (will result in endless loop)
  //printf("*err=%i, errno=%i\n", *err, (int)errno);