Changeset 501:985357040570 in roaraudio

Timestamp:

08/14/08 17:51:30 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

ha! It's working: RoarAudio via DECnet! :), needs cleanup

Files:

• include/libroar/libroar.h (modified) (1 diff)
• include/libroar/socket.h (modified) (2 diffs)
• libroar/Makefile (modified) (2 diffs)
• libroar/basic.c (modified) (4 diffs)
• libroar/socket.c (modified) (4 diffs)
• roard/clients.c (modified) (1 diff)
• roard/roard.c (modified) (2 diffs)

include/libroar/libroar.h

@@ -12 +12 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
+#ifdef ROAR_HAVE_LIBDNET
+#include <netdnet/dn.h>
+#include <netdnet/dnetdb.h>
+#endif
 
 #include "basic.h"

include/libroar/socket.h

@@ -19 +19 @@
 #define ROAR_SOCKET_TYPE_UDP  5
 #define ROAR_SOCKET_TYPE_GENSTR 6 /* generic stream: TCP or UNIX */
+#define ROAR_SOCKET_TYPE_DECNET 7 /* DECnet */
 
 #define ROAR_SOCKET_TYPE_MAX  4
@@ -46 +47 @@
 int roar_socket_open_socks4a(int mode, int fh, char * host, int port);
 
+#if 0
+#ifdef ROAR_HAVE_LIBDNET
+int roar_accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen);
+#else
+#define roar_accept accept
+#endif
+#endif
+#define roar_accept accept
+
 #endif
 

libroar/Makefile

@@ +1 @@
+include ../Makefile.conf
+
 TARGETS=libroar.so
 OBJS=libroar.o basic.o stream.o simple.o auth.o socket.o ctl.o buffer.o convert.o poly.o meta.o file.o midi.o acl.o
@@ -5 +7 @@
 INCLUDE = -I../include -I../include/libroar
 CFLAGS  = -g -Wall -O2 $(DEFINES) $(INCLUDE) -fPIC
-LDFLAGS = -g -shared $(LDPATH) -lm
+LDFLAGS = -g -shared $(LDPATH) $(lib_dnet) -lm
 
 all: ${TARGETS}

libroar/basic.c

@@ -9 +9 @@
  int port = 0;
  int fh = -1;
+ int is_decnet = 0;
 
  if ( server == NULL && (roar_server = getenv("ROAR_SERVER")) != NULL )
@@ -35 +36 @@
  } else {
   /* connect via (char*)server */
-  for (i = 0; server[i] != 0; i++) {
-   if ( server[i] == ':' ) {
-    port = atoi(server+i+1);
-    server[i] = 0;
-    break;
+  // find a port:
+  if ( *server != '/' ) { // don't test AF_UNIX sockets for ports
+   for (i = 0; server[i] != 0; i++) {
+    if ( server[i] == ':' ) {
+     if ( server[i+1] == ':' ) { // DECnet, leave unchanged
+      is_decnet = 1;
+      break;
+     }
+
+     port = atoi(server+i+1);
+     server[i] = 0;
+     break;
+    }
    }
   }
 
-  if ( port ) {
+  if ( port || is_decnet ) {
    fh = roar_socket_connect(server, port);
    // restore the original string
@@ -144 +153 @@
 int roar_recv_message (struct roar_connection * con, struct roar_message * mes, char ** data) {
  char buf[_ROAR_MESS_BUF_LEN];
+/*
+#ifdef ROAR_HAVE_LIBDNET
+ int len;
+#endif
+*/
 
  ROAR_DBG("roar_recv_message(*): try to get a response form the server...");
@@ -150 +164 @@
   *data = NULL;
 
+/*
+#ifdef ROAR_HAVE_LIBDNET
+ if ( (len = read(con->fh, buf, _ROAR_MESS_BUF_LEN)) != _ROAR_MESS_BUF_LEN ) {
+  if ( len != 0 )
+   return -1;
+
+  usleep(2000);
+
+  if ( read(con->fh, buf, _ROAR_MESS_BUF_LEN) != _ROAR_MESS_BUF_LEN )
+   return -1;
+  }
+#else
+*/
  if ( read(con->fh, buf, _ROAR_MESS_BUF_LEN) != _ROAR_MESS_BUF_LEN )
   return -1;
+/*
+#endif
+*/
 
  ROAR_DBG("roar_recv_message(*): Got a header");

libroar/socket.c

@@ -139 +139 @@
  //unsigned int host_div = 0;
  int (*mode_func)(int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen) = connect; // default is to connect
+#ifdef ROAR_HAVE_LIBDNET
+ char obj[80];
+ char * del;
+#endif
 
  if ( mode == MODE_LISTEN )
@@ -149 +153 @@
   } else if ( strcmp(host, "+fork") == 0 ) {
    type = ROAR_SOCKET_TYPE_FORK;
+  } else if ( strstr(host, "::") != NULL ) {
+   type = ROAR_SOCKET_TYPE_DECNET;
   }
  }
@@ -155 +161 @@
  ROAR_DBG("roar_socket_open(*): type=%s, host='%s', port=%i",
              type == ROAR_SOCKET_TYPE_UNIX ? "UNIX" : "INET", host, port);
+
+ if ( type == ROAR_SOCKET_TYPE_DECNET ) {
+  if ( mode == MODE_LISTEN ) {
+   return -1; // listen sockets on DECnet are not supportet at the moment
+  } else {
+#ifdef ROAR_HAVE_LIBDNET
+   // There is nothing wrong in this case to use dnet_conn() so we do.
+   del = strstr(host, "::");
+   *del = 0;
+
+   if ( *(del+2) == '#' ) { // assume we have node::#num
+    port = atoi(del+2);
+   }
+
+   if ( port ) {
+    sprintf(obj, "%i", port); // no need for snprintf() as dec(port) is smaller than obj[]
+   } else {
+    *obj = 0;
+    strncat(obj, del+2, 79);
+   }
+
+   fh = dnet_conn(host, obj, SOCK_STREAM, 0 ,0 ,0 , 0);
+   *del = ':';
+   return fh;
+#else
+   return -1; // no decnet support
+#endif
+  }
+ }
 
  memset(&socket_addr   , 0, sizeof(socket_addr));
@@ -348 +383 @@
 }
 
+#if 0
+#ifdef ROAR_HAVE_LIBDNET
+int roar_accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen) {
+ struct sockaddr_dn sockaddr_d, * sockaddr_p = &sockaddr_d;
+ socklen_t len = *addrlen;
+ int r;
+
+ if ( len < sizeof(struct sockaddr_dn) ) {
+  len = sizeof(struct sockaddr_dn);
+  r = accept(sockfd, (struct sockaddr *) sockaddr_p, &len);
+
+  memcpy((void*)addr, (void*) sockaddr_p, len > *addrlen ? *addrlen : len);
+
+  if ( len < *addrlen )
+   *addrlen = len;
+
+ } else {
+  r = accept(sockfd, addr, addrlen);
+  sockaddr_p = (struct sockaddr_dn *) addr;
+  len = *addrlen;
+ }
+
+ if ( r != -1 ) {
+  // do dnet_accept(), but it does nothing at the moment.
+ }
+
+ return r;
+}
+#endif
+#endif
+
 //ll

roard/clients.c

@@ -95 +95 @@
 
 int clients_set_fh    (int id, int    fh) {
+#ifdef ROAR_HAVE_LIBDNET
+ struct sockaddr_dn sockaddr_d;
+ socklen_t len = sizeof(struct sockaddr_dn);
+#endif
+
  if ( g_clients[id] == NULL )
   return -1;
 
  g_clients[id]->fh = fh;
+
+#ifdef ROAR_HAVE_LIBDNET
+ if ( getsockname(fh, (struct sockaddr *)&sockaddr_d, &len) != -1 ) {
+  if ( sockaddr_d.sdn_family == AF_DECnet )
+   roar_socket_nonblock(fh, ROAR_SOCKET_BLOCK);
+ }
+#endif
 
  return 0;

roard/roard.c

@@ -55 +55 @@
         " --no-listen           - Do not listen for new clients (only usefull for relaing)\n"
         " --client-fh           - Comunicate with a client over this handle\n"
-        "                         (only usefull for relaing)\n",
+        "                         (only usefull for relaing)\n"
+        " --close-fh            - Closes the given fh\n",
         ROAR_DEFAULT_SOCKGRP
        );
@@ -228 +229 @@
     return 1;
    }
+  } else if ( strcmp(k, "--close-fh") == 0 ) {
+   close(atoi(argv[++i]));
 
   } else {