Changeset 807:9289636092cd in roaraudio

Timestamp:

09/17/08 17:19:00 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

set roar_errno

File:

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

libroar/basic.c

@@ -43 +43 @@
  int is_decnet = 0;
  char * obj = NULL;
+
+ roar_errno = ROAR_ERROR_UNKNOWN;
 
  if ( server == NULL && (roar_server = getenv("ROAR_SERVER")) != NULL )
@@ -114 +116 @@
  }
 
+ if ( fh == -1 )
+  roar_errno = ROAR_ERROR_CONNREFUSED;
+
  ROAR_DBG("roar_connect_raw(*) = %i", fh);
 
@@ -120 +125 @@
 
 int roar_connect    (struct roar_connection * con, char * server) {
+ roar_errno = ROAR_ERROR_UNKNOWN;
  con->fh = roar_connect_raw(server);
 
  if ( con->fh == -1 )
   return -1;
+
+ roar_errno = ROAR_ERROR_NONE;
 
  return 0;
@@ -142 +150 @@
  con->fh = -1;
 
+ roar_errno = ROAR_ERROR_NONE;
+
  return 0;
 }
@@ -150 +160 @@
  int max_len;
 
+ roar_errno = ROAR_ERROR_UNKNOWN;
+
  ROAR_DBG("roar_identify(*): try to identify myself...");
 
@@ -184 +196 @@
 int roar_send_message (struct roar_connection * con, struct roar_message * mes, char * data) {
  char buf[_ROAR_MESS_BUF_LEN];
+
+ roar_errno = ROAR_ERROR_UNKNOWN;
 
  ROAR_DBG("roar_send_message(*): try to send an request...");
@@ -193 +207 @@
  *(uint16_t*)(buf+8) = ROAR_HOST2NET16(mes->datalen);
 
- if ( write(con->fh, buf, _ROAR_MESS_BUF_LEN) != _ROAR_MESS_BUF_LEN )
-  return -1;
-
- if ( mes->datalen != 0 )
-  if ( write(con->fh, data == NULL ? mes->data : data, mes->datalen) != mes->datalen )
+ if ( write(con->fh, buf, _ROAR_MESS_BUF_LEN) != _ROAR_MESS_BUF_LEN ) {
+  roar_errno = ROAR_ERROR_PIPE;
+  return -1;
+ }
+
+ if ( mes->datalen != 0 ) {
+  if ( write(con->fh, data == NULL ? mes->data : data, mes->datalen) != mes->datalen ) {
+   roar_errno = ROAR_ERROR_PIPE;
    return -1;
+  }
+ }
+
+ roar_errno = ROAR_ERROR_NONE;
 
  ROAR_DBG("roar_send_message(*) = 0");
@@ -207 +228 @@
  char buf[_ROAR_MESS_BUF_LEN];
 
+ roar_errno = ROAR_ERROR_UNKNOWN;
+
  ROAR_DBG("roar_recv_message(*): try to get a response form the server...");
 
@@ -212 +235 @@
   *data = NULL;
 
- if ( read(con->fh, buf, _ROAR_MESS_BUF_LEN) != _ROAR_MESS_BUF_LEN )
-  return -1;
+ if ( read(con->fh, buf, _ROAR_MESS_BUF_LEN) != _ROAR_MESS_BUF_LEN ) {
+  roar_errno = ROAR_ERROR_PROTO;
+  return -1;
+ }
 
  ROAR_DBG("roar_recv_message(*): Got a header");
 
- if ( buf[0] != _ROAR_MESSAGE_VERSION )
-  return -1;
+ if ( buf[0] != _ROAR_MESSAGE_VERSION ) {
+  roar_errno = ROAR_ERROR_PROTO;
+  return -1;
+ }
 
  mes->cmd     = (unsigned char)buf[1];
@@ -231 +258 @@
   ROAR_DBG("roar_recv_message(*): no data in this pkg");
   ROAR_DBG("roar_recv_message(*) = 0");
+  roar_errno = ROAR_ERROR_NONE;
   return 0;
  }
@@ -238 +266 @@
    ROAR_DBG("roar_recv_message(*): Got data!");
    ROAR_DBG("roar_recv_message(*) = 0");
+   roar_errno = ROAR_ERROR_NONE;
    return 0;
   }
+
+  roar_errno = ROAR_ERROR_PIPE;
   return -1;
  } else {
-  if ( data == NULL )
+  if ( data == NULL ) {
+   roar_errno = ROAR_ERROR_MSGSIZE;
    return -1;
-
-  if ( (*data = malloc(mes->datalen)) == NULL )
+  }
+
+  if ( (*data = malloc(mes->datalen)) == NULL ) {
+   roar_errno = ROAR_ERROR_NOMEM;
    return -1;
-
-  if ( mes->datalen == 0 )
+  }
+
+  if ( mes->datalen == 0 ) {
+   roar_errno = ROAR_ERROR_NONE;
    return 0;
+  }
 
   if ( read(con->fh, *data, mes->datalen) == mes->datalen ) {
    ROAR_DBG("roar_recv_message(*): Got data!");
    ROAR_DBG("roar_recv_message(*) = 0");
+   roar_errno = ROAR_ERROR_NONE;
    return 0;
   }
-  return -1;
- }
-
+
+  roar_errno = ROAR_ERROR_PIPE;
+  return -1;
+ }
+
+ // what happened here?
  return -1;
 }