Changeset 501:985357040570 in roaraudio for libroar/basic.c

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

File:

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

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");