Changeset 2811:3d2f0ab1b673 in roaraudio

Timestamp:

09/29/09 17:58:29 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added nnode.[ch], added nnode support to ctl.c

Files:

• include/libroar/nnode.h (added)
• libroar/Makefile (modified) (1 diff)
• libroar/ctl.c (modified) (4 diffs)
• libroar/nnode.c (added)

libroar/Makefile

@@ -8 +8 @@
 VIO_BRIDGE=vio_bio.o vio_stdio.o
 VIO=$(VIO_META) $(VIO_BRIDGE) vio_cmd.o vio_magic.o vio_pipe.o vio_socket.o vio_stack.o vio_proto.o vio_dstr.o
-OBJS=libroar.o config.o debug.o basic.o stream.o simple.o auth.o socket.o ctl.o buffer.o meta.o file.o acl.o cdrom.o pinentry.o sshaskpass.o $(VIO) stack.o slp.o
+OBJS=libroar.o config.o debug.o basic.o stream.o simple.o auth.o socket.o ctl.o buffer.o meta.o file.o acl.o cdrom.o pinentry.o sshaskpass.o $(VIO) stack.o slp.o nnode.o
 
 #DEFINES        = -DDEBUG

libroar/ctl.c

@@ -337 +337 @@
  int max_len;
  uint32_t pid;
+ size_t len_rest;
 
  if ( c == NULL )
@@ -385 +386 @@
  cur += 4;
 
+ len_rest = sizeof(m->data) - cur;
+ if ( roar_nnode_to_blob(&(c->nnode), &(m->data[cur]), &len_rest) == 0 ) {
+  cur += len_rest;
+ }
+
  m->datalen = cur;
 
@@ -394 +400 @@
  int cur;
  uint32_t pid;
+ size_t len;
 
  if ( m == NULL || c == NULL )
@@ -454 +461 @@
  } else {
   c->byteorder = ROAR_BYTEORDER_UNKNOWN;
+ }
+
+ if ( m->datalen > cur ) {
+  len = m->datalen - cur;
+  if ( roar_nnode_from_blob(&(c->nnode), &(m->data[cur]), &len) == 0 ) {
+   cur += len;
+  } else {
+   if ( roar_nnode_new(&(c->nnode), ROAR_SOCKET_TYPE_UNKNOWN) == -1 )
+    return -1;
+  }
+ } else {
+  if ( roar_nnode_new(&(c->nnode), ROAR_SOCKET_TYPE_UNKNOWN) == -1 )
+   return -1;
  }