Changeset 508:1129ff87dd1e in roaraudio for roard

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...

Location:

roard

Files:

• roard.c (modified) (3 diffs)
• streams.c (modified) (2 diffs)

roard/roard.c

@@ -46 +46 @@
  printf(" -t  --tcp             - Use TCP listen socket\n"
         " -u  --unix            - Use UNIX Domain listen socket (default)\n"
+#ifdef ROAR_HAVE_LIBDNET
+        " -n  --decnet          - use DECnet listen socket\n"
+#endif
         " -p  --port            - TCP Port to bind to\n"
         " -b  --bind            - IP/Hostname to bind to\n"
@@ -92 +95 @@
  DRIVER_USERDATA_T drvinst;
  struct roar_client * self = NULL;
+#ifdef ROAR_HAVE_LIBDNET
+ char decnethost[80];
+#endif
 
  g_listen_socket = -1;
@@ -217 +223 @@
   } else if ( strcmp(k, "-u") == 0 ) {
    // ignore this case as it is the default behavor.
+  } else if ( strcmp(k, "-n") == 0 ) {
+#ifdef ROAR_HAVE_LIBDNET
+    port   = ROAR_DEFAULT_NUM;
+    strcpy(decnethost, ROAR_DEFAULT_LISTEN_OBJECT);
+    server = decnethost;
+#else
+    ROAR_ERR("No DECnet support compiled in!");
+    return 1;
+#endif
   } else if ( strcmp(k, "-G") == 0 ) {
    sock_grp  = argv[++i];

roard/streams.c

@@ -522 +522 @@
 int streams_check  (int id) {
  int fh;
- ssize_t req;
+ ssize_t req, realreq, done;
  struct roar_stream        *   s;
  struct roar_stream_server *  ss;
@@ -557 +557 @@
 
  if ( ss->codecfilter == -1 ) {
+  realreq = req;
+/*
   req = read(fh, buf, req);
+  if ( req < realreq ) { // we can do this as the stream is in nonblocking mode!
+   if ( (realreq = read(fh, buf+req, realreq-req)) > 0 )
+    req += realreq;
+  }
+*/
+  done = 0;
+  while (req > 0 && done != realreq) {
+   if ( (req = read(fh, buf+done, realreq-done)) > 0 )
+    done += req;
+  }
+  req = done;
  } else {
   req = codecfilter_read(ss->codecfilter_inst, ss->codecfilter, buf, req);