Changeset 2815:8cf175ac7bf9 in roaraudio

Timestamp:

09/29/09 18:04:17 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added nnode support

Location:

roard

Files:

• clients.c (modified) (3 diffs)
• network.c (modified) (2 diffs)
• roard.c (modified) (1 diff)

roard/clients.c

@@ -70 +70 @@
      n->streams[s] = -1;
 
+    if ( roar_nnode_new(&(n->nnode), ROAR_SOCKET_TYPE_UNKNOWN) == -1 ) {
+     free(n);
+     return -1;
+    }
+
     g_clients[i] = n;
 
@@ -106 +111 @@
  if ( g_clients[id]->fh != -1 && close_client_fh )
   close(g_clients[id]->fh);
+
+ roar_nnode_free(&(g_clients[id]->nnode));
 
  free(g_clients[id]);
@@ -495 +502 @@
    streams_set_fh(stream, g_clients[client]->fh);
    streams_set_socktype(stream, ROAR_SOCKET_TYPE_GENSTR);
+   ROAR_DBG("client_stream_exec(client=%i, stream=%i) = 0", client, stream);
    return 0;
   }

roard/network.c

@@ -89 +89 @@
  socklen_t cred_len = sizeof(cred);
 #endif
- struct roar_vio_calls vio;
+ struct roar_vio_calls    vio;
+ struct sockaddr_storage  addr;
+ socklen_t                addrlen = sizeof(addr);
 
- fh = accept(sock, NULL, NULL);
+ fh = accept(sock, (struct sockaddr*)&addr, &addrlen);
 
  ROAR_DBG("net_get_new_client(void): fh = %i", fh);
@@ -126 +128 @@
  }
 #endif
+
+ if ( roar_nnode_free(&(c->nnode)) == -1 )
+  return -1;
+
+ if ( roar_nnode_new_from_sockaddr(&(c->nnode), (struct sockaddr*)&addr, addrlen) == -1 )
+  return -1;
 
  ROAR_DBG("net_get_new_client(*): proto=0x%.4x", proto);

roard/roard.c

@@ -1519 +1519 @@
  strcpy(self->name, "RoarAudio daemon internal");
 
+ if ( roar_nnode_free(&(self->nnode)) == -1 )
+  return 1;
+
+ // not fully correct but ok as workaorund
+ // so tools assume that roard runs on the same machine as
+ // they in case they use AF_UNIX:
+ if ( roar_nnode_new(&(self->nnode), ROAR_SOCKET_TYPE_UNIX) == -1 )
+  return 1;
+
 #ifdef ROAR_HAVE_FORK
  if ( daemon ) {