Changeset 5376:c8f94c6ad2a3 in roaraudio

Timestamp:

12/23/11 02:32:21 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

finished rewrite of socket.[ch] for this release. Closes: #187

Files:

• ChangeLog (modified) (1 diff)
• include/libroar/socket.h (modified) (1 diff)
• libroar/socket.c (modified) (8 diffs)

ChangeLog

@@ -4 +4 @@
         * Do not set errno to zero in ogg_vorbis codec filter (Closes: #191)
         * Updated data types for struct roar_audio_info (Closes: #189)
-        * Removed old functions from API (Closes: #186, See: #130)
+        * Removed old functions from API (Closes: #186, #187, See: #130)
         * Removed old roarclients (See: #130)
         * Improved plugin loader a lot (Closes: #190)

include/libroar/socket.h

@@ -63 +63 @@
 int roar_socket_open       (int mode, int type, const char * host, int port);
 
-int roar_socket_listen_decnet (const char * object, int num);
-
 const char * roar_socket_get_local_nodename(void);
 
 int roar_socket_nonblock(int fh, int state);
-int roar_socket_decnet_set_timeout (int fh, time_t sec, int_least32_t usec);
 
 int roar_socket_dup_udp_local_end (int fh);

libroar/socket.c

@@ -67 +67 @@
 #endif
 
-int roar_socket_decnet_set_timeout (int fh, time_t sec, int_least32_t usec) {
+static int roar_socket_decnet_set_timeout (int fh, time_t sec, int_least32_t usec) {
 #ifdef ROAR_HAVE_LIBDNET
  struct timeval timeout = {sec, usec};
@@ -409 +409 @@
 
 
-int roar_socket_listen_decnet (const char * object, int num) {
+static int roar_socket_listen_decnet (const char * object, int num) {
 #ifdef ROAR_HAVE_LIBDNET
  int fh = roar_socket_new(ROAR_SOCKET_TYPE_DECNET);
@@ -417 +417 @@
   return -1;
 
- if ( !*object )
+ if ( object != NULL && !*object )
   object = NULL;
 
- if ( (object && num) || (!*object && !num) ) {
+ if ( (object != NULL && num) || (object != NULL && !*object && !num) || (object == NULL && !num) ) {
   ROAR_WARN("roar_socket_listen_decnet(object='%s', num=%i): illegal address!", object, num);
   close(fh);
+  roar_err_set(ROAR_ERROR_INVAL);
   return -1;
  }
@@ -442 +443 @@
 
  if ( bind(fh, (struct sockaddr *) &bind_sockaddr, sizeof(bind_sockaddr)) == -1 ) {
+  roar_err_from_errno();
   close(fh);
   return -1;
@@ -447 +449 @@
 
  if ( listen(fh, 8) == -1 ) {
+  roar_err_from_errno();
   close(fh);
   return -1;
@@ -453 +456 @@
  return fh;
 #else
+ roar_err_set(ROAR_ERROR_NOSYS);
  return -1;
 #endif
@@ -464 +468 @@
 
  if ( !node[0] ) {
-  if ( (binaddr=getnodeadd()) == NULL)
+
+ // TODO: This does this function not use getnodename()?
+
+ // Those strange workarounds for the error codes are because those functions currently
+ // don't set errno. This way we will use errno as soon as it starts to set it.
+
+  roar_err_update();
+  if ( (binaddr=getnodeadd()) == NULL) {
+   roar_err_update();
+   if ( roar_error == ROAR_ERROR_NONE )
+    roar_err_set(ROAR_ERROR_NOENT);
    return NULL;
-
-  if ( (dp=getnodebyaddr((char*)binaddr->a_addr, binaddr->a_len, AF_DECnet)) == NULL )
+  }
+
+  roar_err_update();
+  if ( (dp=getnodebyaddr((char*)binaddr->a_addr, binaddr->a_len, AF_DECnet)) == NULL ) {
+   roar_err_update();
+   if ( roar_error == ROAR_ERROR_NONE )
+    roar_err_set(ROAR_ERROR_NOENT);
    return NULL;
+  }
 
   strncpy(node, dp->n_name, 15);
@@ -476 +496 @@
  return node;
 #else
+ roar_err_set(ROAR_ERROR_AFNOTSUP);
  return NULL;
 #endif