Changeset 636 for Whitix/branches

Timestamp:

06/24/08 13:59:31 (5 months ago)

Author:

mwhitworth

Message:

Add to DHCP client.

Files:

• Whitix/branches/network/user/net/dhcp.c (modified) (5 diffs)

Whitix/branches/network/user/net/dhcp.c

@@ -36 +36 @@
 }__attribute__((packed));
 
+/* Need to be more flexible. */
 char sourceAddr[6];
+DWORD address;
+DWORD serverIp;
 
 void DhcpError(char* message)
@@ -103 +106 @@
 
         ipHeader->versionLength=(4 << 4) | 5;
-        printf("versionLength = %#X\n", ipHeader->versionLength);
         ipHeader->id=HostToNetShort(1);
         ipHeader->ttl=8;
@@ -201 +203 @@
 }
 
+int DhcpConstructRequest(char* buf)
+{
+        int offset, length;
+        struct DhcpPacket* dhcpPacket;
+        struct DhcpOption* options;
+        BYTE optionsWanted[7]={1, 28, 2, 3, 15, 6, 12};
+        DWORD netAddress;
+
+        offset=DhcpConstructHeaders(buf);
+
+        dhcpPacket=(struct DhcpPacket*)(buf+offset);
+        memset(dhcpPacket, 0, sizeof(struct DhcpPacket));
+
+        dhcpPacket->op=DHCP_BOOT_REQUEST;
+        dhcpPacket->hType=1;
+        dhcpPacket->hLen=6;
+        dhcpPacket->flags=HostToNetShort(0x8000);
+        dhcpPacket->xId=HostToNetLong(0xDEADBEEF);
+
+        memcpy(dhcpPacket->clientHw, sourceAddr, 6);
+        dhcpPacket->cookie=HostToNetLong(0x63825363);
+
+        options=(struct DhcpOption*)(buf+offset+sizeof(struct DhcpPacket));
+
+        /* DHCP message type. */
+        options->code=53;
+        options->len=1;
+        options->data[0]=3;     
+
+        length=offset+sizeof(struct DhcpPacket)+sizeof(struct DhcpOption);
+
+        netAddress=HostToNetLong(address);
+
+        options=(struct DhcpOption*)(buf+length);
+        options->code=50;
+        options->len=4;
+        memcpy(options->data, &netAddress, 4);
+
+        length+=sizeof(struct DhcpOption)+3;
+
+        options=(struct DhcpOption*)(buf+length);
+        options->code=54;
+        options->len=4;
+        memcpy(options->data, &serverIp, 4);
+
+        length+=sizeof(struct DhcpOption)+3;
+
+        /* End option */
+        buf[length]=0xFF;
+        length++;
+
+        /* Padding */
+        memset(buf+length, 0, 344-length);
+
+        length=344;
+
+        DhcpFinishPacket(buf, length);
+        
+        return length;
+}
+
+int DhcpPacketCheck(char* buf)
+{
+        struct EthHeader* ethHeader=(struct EthHeader*)buf;
+        struct IpHeader* ipHeader;
+        struct UdpHeader* udpHeader;
+
+        if (HostToNetShort(ethHeader->ethType) != ETH_TYPE_IP)
+                return 0;
+
+#if 0
+        printf("%X:%X:%X:%X:%X:%X\n", ethHeader->dest[0], ethHeader->dest[1], ethHeader->dest[2],
+                ethHeader->dest[3], ethHeader->dest[4], ethHeader->dest[5]);
+
+        /* Should be addressed only to us. */
+        if (memcmp(sourceAddr, ethHeader->dest, 6))
+                return 0;
+#endif
+
+        ipHeader=(struct IpHeader*)(buf+sizeof(struct EthHeader));
+
+        /* TODO: Checksum */
+
+        if (ipHeader->protocol != PROTOCOL_RAW_UDP)
+                return 0;
+
+        udpHeader=(struct UdpHeader*)(buf+sizeof(struct EthHeader)+sizeof(struct IpHeader));
+
+        if (HostToNetShort(udpHeader->destPort) != 68)
+                return 0;
+
+        /* TODO: Checksum */
+
+        return 1;
+}
+
+int DhcpParseOffer(char* buf)
+{
+        struct DhcpPacket* dhcpPacket=(struct DhcpPacket*)(buf+sizeof(struct EthHeader)+sizeof(struct IpHeader)+sizeof(struct UdpHeader));
+        struct DhcpOption* dhcpOption=(struct DhcpOption*)((char*)dhcpPacket+sizeof(struct DhcpPacket));
+        char* option=(char*)dhcpOption;
+
+        address=NetToHostLong(dhcpPacket->yourIp);
+
+        while (dhcpOption->code != 0xFF)
+        {
+                if (dhcpOption->code == 54)
+                {
+                        memcpy(&serverIp, dhcpOption->data, 4);
+                        break;
+                }
+
+                option+=sizeof(struct DhcpOption)+dhcpOption->len-1;
+                dhcpOption=(struct DhcpOption*)option;
+        }
+
+        return 0;
+}
+
 int DhcpPacketSend(int sockFd, char* buf, int (*packetConstructor)(char*))
 {
@@ -219 +340 @@
                 startSeconds=time.seconds;
 
-                while (1)
+                /* And check for receive. */
+                do
                 {
-                        SysGetTime(&time);
-                        if (time.seconds - startSeconds > i)
-                                break;
-                }
-
-                /* And check for receive. */
-                SysSocketReceive(sockFd, buf, 1024, 0);
+                        SysSocketReceive(sockFd, buf, 1024, 0);
+                }while( !DhcpPacketCheck(buf));
+
+                if (DhcpPacketCheck(buf))
+                        break;
 
                 i *= 2;
         }
+
+        if (i == 128)
+                return 1;
 
         return 0;
@@ -255 +378 @@
         DhcpPacketSend(sockFd, buf, DhcpConstructDiscover);
         
+        /* Parse the DHCPOFFER packet */
+        DhcpParseOffer(buf);
+
+        printf("dhcp: Sending DHCPREQUEST packet\n");
+        DhcpPacketSend(sockFd, buf, DhcpConstructRequest);
+
+        printf("Address is: %u.%u.%u.%u\n", (address >> 24) & 0xFF, (address >> 16) & 0xFF, (address >> 8) & 0xFF, address & 0xFF);
+
+        /* Check lease time. Process DHCP ACK packet. */
 
         NetSocketClose(sockFd);