Changeset 508:1129ff87dd1e in roaraudio for libroar/socket.c

Timestamp:

08/15/08 00:40:31 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added DECnet listen support, introused -n/--decnet to roard, added woraround to Linux DECnet stack bugs on streams and added some helpfull DECnet macros, puh...

File:

• libroar/socket.c (modified) (4 diffs)

libroar/socket.c

@@ -42 +42 @@
  return fh;
 }
+
+int roar_socket_new_decnet_seqpacket (void) {
+#ifdef ROAR_HAVE_LIBDNET
+ int fh;
+
+ fh = socket(AF_DECnet, SOCK_SEQPACKET, DNPROTO_NSP);
+
+ return fh;
+#else
+ return -1;
+#endif
+}
+
+
+int roar_socket_new_decnet_stream (void) {
+#ifdef ROAR_HAVE_LIBDNET
+ int fh;
+
+ fh = socket(AF_DECnet, SOCK_STREAM, DNPROTO_NSP);
+
+ return fh;
+#else
+ return -1;
+#endif
+}
+
 
 int roar_socket_nonblock(int fh, int state) {
@@ -119 +145 @@
   return roar_socket_open_proxy(MODE_CONNECT, ROAR_SOCKET_TYPE_UNKNOWN, host, port, proxy_type);
  }
+}
+
+
+int roar_socket_listen_decnet (char * object, int num) {
+#ifdef ROAR_HAVE_LIBDNET
+ int fh = roar_socket_new_decnet_stream();
+ struct sockaddr_dn bind_sockaddr;
+
+ if ( fh == -1 )
+  return -1;
+
+ if ( !*object )
+  object = NULL;
+
+ if ( (object && num) || (!*object && !num) ) {
+  ROAR_WARN("roar_socket_listen_decnet(object='%s', num=%i): illegal address!", object, num);
+  close(fh);
+  return -1;
+ }
+
+ memset((void*)&bind_sockaddr, 0, sizeof(struct sockaddr_dn));
+
+ bind_sockaddr.sdn_family    = AF_DECnet;
+ bind_sockaddr.sdn_flags     = 0;
+ bind_sockaddr.sdn_objnum    = num;
+
+ if ( num ) {
+  bind_sockaddr.sdn_objnamel = 0;
+ } else {
+  bind_sockaddr.sdn_objnamel  = ROAR_dn_htons(strlen(object));
+  strcpy((char*)bind_sockaddr.sdn_objname, object); // FIXME: shouldn't we use strncpy()?
+ }
+
+ if ( bind(fh, (struct sockaddr *) &bind_sockaddr, sizeof(bind_sockaddr)) == -1 ) {
+  close(fh);
+  return -1;
+ }
+
+ if ( listen(fh, 8) == -1 ) {
+  close(fh);
+  return -1;
+ }
+
+ return fh;
+#else
+ return -1;
+#endif
 }
 
@@ -153 +226 @@
 
  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.
+   ROAR_DBG("roar_socket_open(*): hostname for DECnet: host(%p)=%s", host, host);
    del = strstr(host, "::");
+   ROAR_DBG("roar_socket_open(*): hostname for DECnet: del(%p)=%s", del, del);
+
+   if ( del == NULL ) {
+    ROAR_WARN("roar_socket_open(*): invalid hostname for DECnet: %s", host);
+    return -1;
+   }
+
    *del = 0;
 
@@ -172 +249 @@
    }
 
+  if ( mode == MODE_LISTEN ) {
+   fh = roar_socket_listen_decnet(obj, port);
+   *del = ':';
+   return fh;
+//   return -1; // listen sockets on DECnet are not supportet at the moment
+  } else {
+   // There is nothing wrong in this case to use dnet_conn() so we do.
    fh = dnet_conn(host, obj, SOCK_STREAM, 0 ,0 ,0 , 0);
    *del = ':';