Changeset 470 for trunk/thune/net.c

Timestamp:

09/03/07 18:33:32 (15 months ago)

Author:

krobillard

Message:

Added 'wait. UDP port now has 'nowait option.

Files:

• trunk/thune/net.c (modified) (7 diffs)

trunk/thune/net.c

@@ -173 +173 @@
 /*
   ('udp port -- port!)
-  ('udp [port host host-port] -- port!)
+  ('udp [port host host-port 'nowait] -- port!)
 
   The UPortDevice open method must return the following:
@@ -184 +184 @@
     struct sockaddr_in addr;
     int port = 0;
+    int blocking = 1;
+    UCell* initAddr = 0;
     UCell* spec = 0;
     UCell* res = ur_s_prev(tos);
@@ -204 +206 @@
         UCell* end;
         int hostPort;
+        UAtom atom_nb = 0;
         UBlock* blk = ur_block(spec);
 
@@ -221 +224 @@
             else if( ur_is(it, UT_STRING) )
             {
-                spec = it;
+                initAddr = it;
+            }
+            else if( ur_is(it, UT_WORD) )
+            {
+                if( ! atom_nb )
+                    atom_nb = ur_intern( "nowait", 6 );
+                if( ur_atom(it) == atom_nb )
+                    blocking = 0;
             }
             ++it;
         }
 
-        if( (! hostPort) || (! ur_is(spec, UT_STRING)) )
-        {
-            ur_throwErr( UR_ERR_DATATYPE, "Invalid socket spec" );
-            return -1;
-        }
-
-        if( ! _makeAddrName( &addr, ur_cstring(ut,spec), hostPort ) )
-        {
-            ur_throwErr( UR_ERR_ACCESS, "gethostbyname failed" );
-            return -1;
+        if( initAddr && hostPort )
+        {
+            if( ! _makeAddrName( &addr, ur_cstring(ut,initAddr), hostPort ) )
+            {
+                ur_throwErr( UR_ERR_ACCESS, "gethostbyname failed" );
+                return -1;
+            }
         }
     }
@@ -242 +249 @@
         UCell* val;
         int socket;
-        int block = 1;
 
         if( ! ur_userAllows( ut, "Open socket on port %d", port ) )
@@ -250 +256 @@
         }
 
-        socket = _openUdpSocket( ut, port, block );
+        socket = _openUdpSocket( ut, port, blocking );
         if( socket < 0 )
             return -1;
@@ -264 +270 @@
 
             binN = ur_makeBinary( sizeof(struct sockaddr), &bin );
-            if( spec )
+            if( initAddr )
             {
                 bin->used = sizeof(addr);