X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Fdhcpclient_src%2Fmain.c;h=d6f4cda0565ecaa2a1cbe04f30282162024bb990;hb=HEAD;hp=ff326b0331abf1a5972be5c140468364b2a5836d;hpb=26958b09ad9c9df4d606ad305848566bf8c09560;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/dhcpclient_src/main.c b/Usermode/Applications/dhcpclient_src/main.c
index ff326b03..d6f4cda0 100644
--- a/Usermode/Applications/dhcpclient_src/main.c
+++ b/Usermode/Applications/dhcpclient_src/main.c
@@ -8,6 +8,7 @@
 #include <stdlib.h>
 #include <net.h>
 #include <acess/sys.h>
+#include <errno.h>
 
 enum {
 	UDP_IOCTL_GETSETLPORT = 4,
@@ -76,7 +77,8 @@ typedef struct sInterface
 
 	uint32_t	TransactionID;
 	char	HWAddr[6];
-	
+
+	int64_t	StartTime;	
 	int64_t	Timeout;
 	 int	nTimeouts;
 } tInterface;
@@ -117,6 +119,7 @@ int main(int argc, char *argv[])
 			return -1;
 		}
 		i->State = STATE_PREINIT;
+		i->StartTime = _SysTimestamp();
 		
 		// Send request
 		Send_DHCPDISCOVER(i);
@@ -298,6 +301,7 @@ void Send_DHCPDISCOVER(tInterface *Iface)
 	msg->siaddr = htonl(0);	// siaddr - Zero? maybe -1
 	msg->giaddr = htonl(0);	// giaddr - Zero?
 	memcpy(msg->chaddr, Iface->HWAddr, 6);
+	memset(msg->chaddr+6, 0, sizeof(msg->chaddr)-6);
 
 	memset(msg->sname, 0, sizeof(msg->sname));	// Nuke the rest
 	memset(msg->file, 0, sizeof(msg->file));	// Nuke the rest
@@ -307,16 +311,18 @@ void Send_DHCPDISCOVER(tInterface *Iface)
 	msg->options[i++] =  53;	// DHCP Message Type
 	msg->options[i++] =   1;
 	msg->options[i++] =   1;	// - DHCPDISCOVER
-	msg->options[i++] = 255;	// End of list
+	msg->options[i  ] = 255;	// End of list
 	
 
+	// UDP Header
 	data[0] = 67;	data[1] = 0;	// Port
 	data[2] = 4;	data[3] = 0;	// AddrType
 	data[4] = 255;	data[5] = 255;	data[6] = 255;	data[7] = 255;
 
 	i = _SysWrite(Iface->SocketFD, data, sizeof(data));
 	if( i != sizeof(data) ) {
-		_SysDebug("_SysWrite failed (%i != %i)", i, sizeof(data));
+		_SysDebug("_SysWrite failed (%i != %i): %s", i, sizeof(data),
+			strerror(errno));
 	}
 	Update_State(Iface, STATE_DISCOVER_SENT);
 }
@@ -327,14 +333,19 @@ void Send_DHCPREQUEST(tInterface *Iface, void *OfferPacket, int TypeOffset)
 	 int	i;
 	msg = (void*) ((char*)OfferPacket) + 8;
 
+	if( msg->xid != htonl(Iface->TransactionID) ) {
+		_SysDebug("DHCPREQUEST: Transaction ID mismatch");
+		return ;
+	}
+
 	// Reuses old data :)
-	msg->op    = 1;
-	msg->htype = 1;
-	msg->hlen  = 6;
-	msg->hops  = 0;
-	msg->xid   = msg->xid;
-	msg->secs  = htons(0);	// TODO: Maintain times
-	msg->flags = htons(0);
+	msg->op    = htonb(1);
+	msg->htype = htonb(1);
+	msg->hlen  = htonb(6);
+	msg->hops  = htonb(0);
+	msg->xid   = htonl(Iface->TransactionID);
+	msg->secs  = htons( (_SysTimestamp()-Iface->StartTime+499)/1000 );	// TODO: Maintain times
+	msg->flags = htons(0x0000);
 	memcpy(msg->chaddr, Iface->HWAddr, 6);
 	memset(msg->sname, 0, sizeof(msg->sname));	// Nuke the rest
 	memset(msg->file, 0, sizeof(msg->file));	// Nuke the rest
@@ -377,7 +388,7 @@ int Handle_Packet(tInterface *Iface)
 	void	*router = NULL;
 	void	*subnet_mask = NULL;
 	
-	_SysDebug("Doing read on %i", Iface->SocketFD);
+	_SysDebug("Doing read on %s %i", Iface->Adapter, Iface->SocketFD);
 	len = _SysRead(Iface->SocketFD, data, sizeof(data));
 	_SysDebug("len = %i", len);
 
@@ -469,11 +480,15 @@ int Handle_Timeout(tInterface *Iface)
 	switch(Iface->State)
 	{
 	case STATE_DISCOVER_SENT:
+		fprintf(stderr, "DHCPDISCOVER timeout on %s, trying again\n", Iface->Adapter);
 		Send_DHCPDISCOVER(Iface);
 		break;
+	case STATE_REQUEST_SENT:
+		fprintf(stderr, "DHCPREQUEST timeout on %s\n", Iface->Adapter);
+		return 1;
 	default:
-		_SysDebug("Timeout with state = %i", Iface->State);
-		break;
+		_SysDebug("Timeout with state = %i (%s)", Iface->State, Iface->Adapter);
+		return 1;
 	}
 	return 0;
 }
@@ -491,7 +506,9 @@ void Update_State(tInterface *Iface, int newState)
 		// TODO: Exponential backoff
 		Iface->Timeout = _SysTimestamp() + 3000;
 		Iface->nTimeouts ++;
-		_SysDebug("State %i repeated, timeout is 3000ms now", newState);
+		_SysDebug("%s: State %i repeated, timeout is 3000ms now",
+			Iface->Adapter,
+			newState);
 	}
 }