X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Fdhcpclient_src%2Fmain.c;h=858a61d100f01bd79f9ee0b5ca2ea54124361550;hb=e5deb25fdad3bf008df40679082abdc999d5d1d9;hp=5b122d8d0369853fa018b6e2e2496ad8f2dbaa85;hpb=52fad670ab81459de0ff1bd0fa99a3396a6999e3;p=tpg%2Facess2.git diff --git a/Usermode/Applications/dhcpclient_src/main.c b/Usermode/Applications/dhcpclient_src/main.c index 5b122d8d..858a61d1 100644 --- a/Usermode/Applications/dhcpclient_src/main.c +++ b/Usermode/Applications/dhcpclient_src/main.c @@ -2,7 +2,6 @@ * * http://www.ietf.org/rfc/rfc2131.txt */ -#include #include #include #include @@ -34,7 +33,7 @@ enum eStates STATE_PREINIT, STATE_DISCOVER_SENT, STATE_REQUEST_SENT, - STATE_COMPLETE + STATE_COMPLETE, }; // === STRUCTURES === @@ -72,6 +71,7 @@ typedef struct sInterface char HWAddr[6]; int64_t Timeout; + int nTimeouts; } tInterface; // === PROTOTYPES === @@ -80,8 +80,8 @@ void Scan_Dir(tInterface **IfaceList, const char *Directory); int Start_Interface(tInterface *Iface); void Send_DHCPDISCOVER(tInterface *Iface); void Send_DHCPREQUEST(tInterface *Iface, void *OfferBuffer, int TypeOffset); -int Handle_Packet(tInterface *Iface); -void Handle_Timeout(tInterface *Iface); + int Handle_Packet(tInterface *Iface); + int Handle_Timeout(tInterface *Iface); void Update_State(tInterface *Iface, int newState); void SetAddress(tInterface *Iface, void *Addr, void *Mask, void *Router); @@ -90,7 +90,6 @@ int main(int argc, char *argv[]) { tInterface *ifaces = NULL, *i; - // TODO: Scan /Devices and search for network adapters if( argc > 2 ) { fprintf(stderr, "Usage: %s \n", argv[0]); return -1; @@ -131,9 +130,9 @@ int main(int argc, char *argv[]) if(maxfd < i->SocketFD) maxfd = i->SocketFD; } - if( select(maxfd+1, &fds, NULL, NULL, &timeout) < 0 ) + if( _SysSelect(maxfd+1, &fds, NULL, NULL, &timeout, 0) < 0 ) { - // TODO: Check error result + perror("_SysSelect returned error"); return -1; } @@ -145,19 +144,24 @@ int main(int argc, char *argv[]) if( FD_ISSET(i->SocketFD, &fds) ) { if( Handle_Packet( i ) ) - { - _SysClose(i->SocketFD); - _SysClose(i->IfaceFD); - p->Next = i->Next; - free(i); - i = p; - } + goto _remove; } if( _SysTimestamp() > i->Timeout ) { - Handle_Timeout(i); + if( Handle_Timeout(i) ) + { + fprintf(stderr, "%s timed out\n", i->Adapter); + goto _remove; + } } + continue ; + _remove: + _SysClose(i->SocketFD); + _SysClose(i->IfaceFD); + p->Next = i->Next; + free(i); + i = p; } } return 0; @@ -202,11 +206,14 @@ int Start_Interface(tInterface *Iface) sprintf(path, "/Devices/ip/adapters/%s", Iface->Adapter); fd = _SysOpen(path, 0); if(fd == -1) { + perror("Opening adapter"); _SysDebug("Unable to open adapter %s", path); return -1; } - _SysIOCtl(fd, 4, Iface->HWAddr); - // TODO: Check if ioctl() failed + if( _SysIOCtl(fd, 4, Iface->HWAddr) ) { + perror("Getting MAC address"); + return -1; + } _SysClose(fd); } @@ -216,7 +223,15 @@ int Start_Interface(tInterface *Iface) fprintf(stderr, "ERROR: Unable to open '/Devices/ip'\n"); return -1; } - Iface->Num = _SysIOCtl(fd, 4, (void*)Iface->Adapter); // Create interface + struct { + const char *Device; + const char *Name; + int Type; + } ifinfo; + ifinfo.Device = Iface->Adapter; + ifinfo.Name = ""; + ifinfo.Type = 4; + Iface->Num = _SysIOCtl(fd, 4, &ifinfo); // Create interface if( Iface->Num == -1 ) { fprintf(stderr, "ERROR: Unable to create new interface\n"); return -1; @@ -230,20 +245,19 @@ int Start_Interface(tInterface *Iface) fprintf(stderr, "ERROR: Unable to open '%s'\n", path); return -1; } - tmp = 4; _SysIOCtl(fd, 4, &tmp); // Set to IPv4 _SysIOCtl(fd, 6, addr); // Set address to 0.0.0.0 tmp = 0; _SysIOCtl(fd, 7, &tmp); // Set subnet mask to 0 // Open UDP Client snprintf(path, sizeof(path), "/Devices/ip/%i/udp", Iface->Num); - Iface->SocketFD = fd = _SysOpen(path, O_RDWR); + Iface->SocketFD = fd = _SysOpen(path, OPENFLAG_READ|OPENFLAG_WRITE); if( fd == -1 ) { fprintf(stderr, "ERROR: Unable to open '%s'\n", path); return -1; } tmp = 68; _SysIOCtl(fd, 4, &tmp); // Local port tmp = 67; _SysIOCtl(fd, 5, &tmp); // Remote port - tmp = 0; _SysIOCtl(fd, 7, &tmp); // Remote addr mask bits - we don't care where the reply comes from + tmp = 0; _SysIOCtl(fd, 7, &tmp); // Remote addr mask bits - we don't care where the reply comes from addr[0] = addr[1] = addr[2] = addr[3] = 255; // 255.255.255.255 _SysIOCtl(fd, 8, addr); // Remote address @@ -294,7 +308,10 @@ void Send_DHCPDISCOVER(tInterface *Iface) data[2] = 4; data[3] = 0; // AddrType data[4] = 255; data[5] = 255; data[6] = 255; data[7] = 255; - _SysWrite(Iface->SocketFD, data, sizeof(data)); + i = _SysWrite(Iface->SocketFD, data, sizeof(data)); + if( i != sizeof(data) ) { + _SysDebug("_SysWrite failed (%i != %i)", i, sizeof(data)); + } Update_State(Iface, STATE_DISCOVER_SENT); } @@ -439,8 +456,10 @@ int Handle_Packet(tInterface *Iface) return 0; } -void Handle_Timeout(tInterface *Iface) +int Handle_Timeout(tInterface *Iface) { + if( Iface->nTimeouts == 3 ) + return 1; switch(Iface->State) { case STATE_DISCOVER_SENT: @@ -450,6 +469,7 @@ void Handle_Timeout(tInterface *Iface) _SysDebug("Timeout with state = %i", Iface->State); break; } + return 0; } void Update_State(tInterface *Iface, int newState) @@ -458,11 +478,13 @@ void Update_State(tInterface *Iface, int newState) { Iface->Timeout = _SysTimestamp() + 500; Iface->State = newState; + Iface->nTimeouts = 0; } else { // TODO: Exponential backoff Iface->Timeout = _SysTimestamp() + 3000; + Iface->nTimeouts ++; _SysDebug("State %i repeated, timeout is 3000ms now", newState); } } @@ -515,7 +537,7 @@ void SetAddress(tInterface *Iface, void *Addr, void *Mask, void *Router) _SysIOCtl(Iface->IfaceFD, 6, Addr); _SysIOCtl(Iface->IfaceFD, 7, &mask_bits); - if( Router ); + if( Router ) { uint8_t *addr = Router; _SysDebug("Router %i.%i.%i.%i", addr[0], addr[1], addr[2], addr[3]);