Changeset 515

Timestamp:

02/27/08 17:39:09 (7 months ago)

Author:

krobillard

Message:

Can now open TCP client ports.

Files:

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

trunk/thune/net.c

@@ -62 +62 @@
 
 
+#define ur_sockType(cell)   ((cell)->num.id._pad0)
+
+
 // Values in the socket port context.
 #define SV_FD       0
@@ -113 +116 @@
 
         if( ! _makeAddrName( (struct sockaddr_in*) addr->ptr.v,
-                             ur_cstring(ut,hc), ur_int(tos) ) ) 
+                             ur_cstring(ut, hc), ur_int(tos) ) ) 
         {
             ur_throwErr( UR_ERR_SCRIPT, "gethostbyname failed" );
@@ -169 +172 @@
 
 
+static int _openTcpClient( UThread* ut, struct sockaddr_in* addr )
+{
+    SOCKET fd;
+
+
+    fd = socket( PF_INET, SOCK_STREAM, 0 );
+#ifdef _WIN32
+    if( fd == INVALID_SOCKET )
+#else
+    if( fd < 0 )
+#endif
+    {
+        ur_throwErr( UR_ERR_ACCESS, "socket %s", SOCKET_ERR );
+        return -1;
+    }
+
+    if( connect( fd, (struct sockaddr*) addr, sizeof(struct sockaddr_in) ) < 0 )
+    {
+        closesocket( fd );
+        ur_throwErr( UR_ERR_ACCESS, "connect %s", SOCKET_ERR );
+        return -1;
+    }
+
+    return fd;
+}
+
+
 /*
   ('udp port -- port!)
   ('udp [port host host-port 'nowait] -- port!)
+  ('tcp [host host-port] -- port!)
 
   The UPortDevice open method must return the following:
@@ -181 +212 @@
 {
     struct sockaddr_in addr;
+    int addrBuilt = 0;
     int port = 0;
+    int hostPort = 0;
     int blocking = 1;
+    int stype;
     UCell* initAddr = 0;
     UCell* spec = 0;
@@ -196 +230 @@
     if( ! ur_isAWord(res) )
         return 0;
-    if( ur_atom(res) != ur_intern("udp", 3) )
+
+    if( ur_atom(res) == ur_intern("udp", 3) )
+        stype = SOCK_DGRAM;
+    else if( ur_atom(res) == ur_intern("tcp", 3) )
+        stype = SOCK_STREAM;
+    else
         return 0;
 
@@ -203 +242 @@
         UCell* it;
         UCell* end;
-        int hostPort;
         UAtom atom_nb = 0;
         UBlock* blk = ur_block(spec);
@@ -209 +247 @@
         UR_ITER_BLOCK( it, end, blk, spec );
 
-        port = hostPort = 0;
-
         while( it != end )
         {
             if( ur_is(it, UT_INT) )
             {
-                if( port )
+                if( initAddr )
                     hostPort = ur_int(it);
                 else
@@ -236 +272 @@
         if( initAddr && hostPort )
         {
-            if( ! _makeAddrName( &addr, ur_cstring(ut,initAddr), hostPort ) )
+            if( ! _makeAddrName( &addr, ur_cstring(ut, initAddr), hostPort ) )
             {
                 ur_throwErr( UR_ERR_ACCESS, "gethostbyname failed" );
                 return -1;
             }
+            addrBuilt = 1;
         }
     }
@@ -248 +285 @@
         int socket;
 
-        if( ! ur_userAllows( ut, "Open socket on port %d", port ) )
-        {
-            ur_throwErr( UR_ERR_ACCESS, "User denied open" );
-            return -1;
-        }
-
-        socket = _openUdpSocket( ut, port, blocking );
+        if( stype == SOCK_DGRAM )
+        {
+            if( ! ur_userAllows( ut, "Open socket on port %d", port ) )
+            {
+                ur_throwErr( UR_ERR_ACCESS, "User denied open" );
+                return -1;
+            }
+            socket = _openUdpSocket( ut, port, blocking );
+        }
+        else
+        {
+            if( ! addrBuilt )
+            {
+                ur_throwErr( UR_ERR_SCRIPT,
+                             "TCP port requires hostname and port" );
+                return -1;
+            }
+            if( ! ur_userAllows( ut, "Open TCP connection to %s:%d",
+                                 ur_cstring(ut, initAddr), hostPort ) )
+            {
+                ur_throwErr( UR_ERR_ACCESS, "User denied open" );
+                return -1;
+            }
+            socket = _openTcpClient( ut, &addr );
+        }
+
         if( socket < 0 )
             return -1;
@@ -266 +322 @@
             ur_initType(val, UT_INT);       // SV_FD
             ur_int(val) = socket;
+            ur_sockType(val) = stype;
 
             binN = ur_makeBinary( sizeof(struct sockaddr), &bin );
@@ -352 +409 @@
             fromlen = sizeof(struct sockaddr_in);
 
-            count = recvfrom( ur_int(val), bin->ptr.c, RECV_BUF_SIZE, 0,
-                              (struct sockaddr*) addr->ptr.v, &fromlen );
+            if( ur_sockType(val) == SOCK_STREAM )
+            {
+                count = recv( ur_int(val), bin->ptr.c, RECV_BUF_SIZE, 0 );
+            }
+            else
+            {
+                count = recvfrom( ur_int(val), bin->ptr.c, RECV_BUF_SIZE, 0,
+                                  (struct sockaddr*) addr->ptr.v, &fromlen );
+            }
             if( count == -1 )
             {
@@ -404 +468 @@
         if( buf )
         {
-            UBinary* bin;
             int n;
             SOCKET fd = ur_int(val);
             int len = end - buf;
 
-            bin = ur_bin( blk->ptr.cells + SV_ADDR );
-
-            n = sendto( fd, buf, len, 0, (struct sockaddr*) bin->ptr.v,
-                        sizeof(struct sockaddr) );
+            if( ur_sockType(val) == SOCK_STREAM )
+            {
+                n = send( fd, buf, len, 0 );
+            }
+            else
+            {
+                UBinary* bin = ur_bin( blk->ptr.cells + SV_ADDR );
+
+                n = sendto( fd, buf, len, 0, (struct sockaddr*) bin->ptr.v,
+                            sizeof(struct sockaddr) );
+            }
+
             if( n == -1 )
             {
-                ur_throwErr( UR_ERR_ACCESS, "sendto %d", SOCKET_ERR );
+                ur_throwErr( UR_ERR_ACCESS, "send %d", SOCKET_ERR );
 
                 // An error occured; the socket must not be used again.
@@ -425 +496 @@
             {
                 ur_throwErr( UR_ERR_ACCESS,
-                             "sendto only sent %d of %d bytes", n, len );
+                             "send only sent %d of %d bytes", n, len );
                 return;
             }