Changeset 2099 for Whitix/branches/netchannel/user/sdk/network/udp.c

Timestamp:

06/03/10 22:43:33 (2 years ago)

Author:

mwhitworth

Message:

Add to network stack.

Files:

• Whitix/branches/netchannel/user/sdk/network/udp.c (modified) (4 diffs)

Whitix/branches/netchannel/user/sdk/network/udp.c

@@ -36 +36 @@
 }
 
+int UdpSocketBind(Socket* socket, struct SockAddr* address)
+{
+        struct Ipv4EndPoint chanSrc, chanDest, *addr;
+
+        addr = (struct Ipv4EndPoint*)address;
+
+        chanSrc.address = 0;
+        chanSrc.port = addr->port;
+
+        chanDest.address = IPV4_BROADCAST;
+        chanDest.port = 0;
+
+        socket->channel = ChannelCreate(CHAN_MAKE_TYPE(CHAN_FAMILY_IP,
+                                CHAN_TYPE_UDP), &chanSrc, &chanDest, NULL);
+
+        if (!socket->channel)
+                return -1;
+
+        return 0;
+}
+
 #define CHAN_TYPE_UDP   0x01
 
@@ -74 +95 @@
 }
 
+#define UDP_IP_HDR_BYTES        (sizeof(struct IpHeader) + sizeof(struct UdpHeader))
+
 int UdpSocketSendTo(Socket* socket, const void* buffer, unsigned long length, int flags, struct SockAddr* dest)
 {
-        ChanSendBuffer* chanBuff;
-        int ret;
+        const char* p = (const char*)buffer;
         struct Ipv4EndPoint* destIp = (struct Ipv4EndPoint*)dest;
         struct Ipv4EndPoint* srcIp = (struct Ipv4EndPoint*)&socket->channel->src;
-        struct IpHeader* ipHeader;
-        struct UdpHeader* udpHeader;
-        char* data;
-        int totalLength;
-        
-        totalLength = length + sizeof(struct UdpHeader) + sizeof(struct IpHeader);
-
+        
         if (!dest)
                 return -1;
 
-        chanBuff = ChanSendBufferAlloc(socket->channel, &data);
-
-        if (!chanBuff)
-                return -1;
-
-        ipHeader=(struct IpHeader*)data;
-        IpBuildHeader(ipHeader, destIp, length + sizeof(struct UdpHeader), PROTOCOL_RAW_UDP);
-
-        /* Add UDP header. */
-        udpHeader = (struct UdpHeader*)(data + sizeof(struct IpHeader));
-        
-        udpHeader->sourcePort = NetToHostShort(srcIp->port);
-        udpHeader->destPort = NetToHostShort(destIp->port);
-        udpHeader->length = NetToHostShort(length + sizeof(struct UdpHeader));
-        
-        memcpy(data + sizeof(struct IpHeader) + sizeof(struct UdpHeader), buffer, length);
-        
-        ret = ChanBufferSend(socket->channel, chanBuff, totalLength);
-        
-        return ret;
+        while (length > 0)
+        {
+                ChanSendBuffer* chanBuff;
+                int pktLength = MIN(length, ChanMaxPacketSize(socket->channel) - UDP_IP_HDR_BYTES);
+                int ret;
+                char* data;
+                struct IpHeader* ipHeader;
+                struct UdpHeader* udpHeader;
+
+                chanBuff = ChanSendBufferAlloc(socket->channel, &data);
+
+                if (!chanBuff || !data)
+                        goto out;
+
+                ipHeader=(struct IpHeader*)data;
+                udpHeader = (struct UdpHeader*)(data + sizeof(struct IpHeader));
+
+                IpBuildHeader(ipHeader, destIp, pktLength + sizeof(struct UdpHeader), PROTOCOL_RAW_UDP);
+                
+                udpHeader->sourcePort = NetToHostShort(srcIp->port);
+                udpHeader->destPort = NetToHostShort(destIp->port);
+                udpHeader->length = NetToHostShort(pktLength + sizeof(struct UdpHeader));
+                
+                memcpy(data + UDP_IP_HDR_BYTES, p, pktLength);
+
+                ret = ChanBufferSend(socket->channel, chanBuff, pktLength + UDP_IP_HDR_BYTES) - UDP_IP_HDR_BYTES;
+                
+                if (ret < pktLength)
+                        goto out;
+
+                p += ret;
+                length -= ret;
+        }
+
+out:
+        return p - (const char*)buffer;
 }
 
@@ -136 +168 @@
         struct IpHeader* ipHeader;
         struct UdpHeader* udpHeader;
+        struct Ipv4EndPoint* address = (struct Ipv4EndPoint*)dest;
 
 again:
-        read = ChanBufferRecv(socket->channel, &chanBuff, &buf, 2000);
+        read = ChanBufferRecv(socket->channel, &chanBuff, &buf, -1);
 
         if (read <= 0)
-        {
-                printf("read = %d\n", read);
-                return read;
-        }
+                return -1;
 
         /* Verify checksum */
@@ -152 +182 @@
                 goto again;
 
-        /* TODO: Current buffer. Partial recv */
-
         dataByteCnt = read - sizeof(struct UdpHeader) - sizeof(struct IpHeader);
 
-        /* FIXME: More checking. */
         memcpy(buffer, buf + sizeof(struct IpHeader) + sizeof(struct UdpHeader),
                         dataByteCnt);
 
-//      ChanBufferFree(socket->channel, chanBuff);
-
-        return dataByteCnt; 
+        ChanRecvBuffFree(socket->channel, chanBuff);
+
+        /* Fill in the structure, so we know where the packet came from */
+        address->address = NetToHostLong(ipHeader->sourceAddr);
+        address->port = NetToHostShort(udpHeader->sourcePort);
+
+        return NetToHostShort(udpHeader->length) - sizeof(struct UdpHeader); 
 }
 
 static struct SocketOps udpSocketOps = 
 {
+        .bind = UdpSocketBind,
         .connect = UdpSocketConnect,
         .connectEx = UdpSocketConnectEx,