X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Fdhcpclient_src%2Fmain.c;h=d6f4cda0565ecaa2a1cbe04f30282162024bb990;hb=5b487e31cf5145372e9777e9f82a8cd661d4f1b4;hp=149bd0a1fc20fd12a6a3aeb5912ae5f4400d7467;hpb=33495f1efd207f0af4f804858f247db0983fcb8f;p=tpg%2Facess2.git diff --git a/Usermode/Applications/dhcpclient_src/main.c b/Usermode/Applications/dhcpclient_src/main.c index 149bd0a1..d6f4cda0 100644 --- a/Usermode/Applications/dhcpclient_src/main.c +++ b/Usermode/Applications/dhcpclient_src/main.c @@ -1,10 +1,21 @@ /* + * + * http://www.ietf.org/rfc/rfc2131.txt */ -#include #include #include #include +#include #include +#include +#include + +enum { + UDP_IOCTL_GETSETLPORT = 4, + UDP_IOCTL_GETSETRPORT, + UDP_IOCTL_GETSETRMASK, + UDP_IOCTL_SETRADDR, +}; #define FILENAME_MAX 255 // --- Translation functions --- @@ -30,7 +41,7 @@ enum eStates STATE_PREINIT, STATE_DISCOVER_SENT, STATE_REQUEST_SENT, - STATE_COMPLETE + STATE_COMPLETE, }; // === STRUCTURES === @@ -63,6 +74,13 @@ typedef struct sInterface int Num; int SocketFD; int IfaceFD; + + uint32_t TransactionID; + char HWAddr[6]; + + int64_t StartTime; + int64_t Timeout; + int nTimeouts; } tInterface; // === PROTOTYPES === @@ -71,15 +89,16 @@ 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); + 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); // === CODE === int main(int argc, char *argv[]) { - tInterface *ifaces = NULL, *i; + tInterface *ifaces = NULL; - // TODO: Scan /Devices and search for network adapters if( argc > 2 ) { fprintf(stderr, "Usage: %s \n", argv[0]); return -1; @@ -94,12 +113,13 @@ int main(int argc, char *argv[]) Scan_Dir( &ifaces, "/Devices/ip/adapters" ); } - for( i = ifaces; i; i = i->Next ) + for( tInterface *i = ifaces; i; i = i->Next ) { - i->State = STATE_PREINIT; if( Start_Interface(i) < 0 ) { return -1; } + i->State = STATE_PREINIT; + i->StartTime = _SysTimestamp(); // Send request Send_DHCPDISCOVER(i); @@ -109,35 +129,48 @@ int main(int argc, char *argv[]) { int maxfd; fd_set fds; - tInterface *p; + int64_t timeout = 1000; maxfd = 0; FD_ZERO(&fds); - for( i = ifaces; i; i = i->Next ) + for( tInterface *i = ifaces; i; i = i->Next ) { FD_SET(i->SocketFD, &fds); if(maxfd < i->SocketFD) maxfd = i->SocketFD; } - if( select(maxfd+1, &fds, NULL, NULL, NULL) < 0 ) + + if( _SysSelect(maxfd+1, &fds, NULL, NULL, &timeout, 0) < 0 ) { - // TODO: Check error result + perror("_SysSelect returned error"); return -1; } + _SysDebug("select() returned"); + // Check for changes (with magic to allow inline deletion) - for( p = (void*)&ifaces, i = ifaces; i; p=i,i = i->Next ) + for( tInterface *p = (void*)&ifaces, *i = ifaces; i; p=i,i = i->Next ) { if( FD_ISSET(i->SocketFD, &fds) ) { if( Handle_Packet( i ) ) + goto _remove; + } + + if( _SysTimestamp() > i->Timeout ) + { + if( Handle_Timeout(i) ) { - close(i->SocketFD); - close(i->IfaceFD); - p->Next = i->Next; - free(i); - i = p; + fprintf(stderr, "DHCP on %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; @@ -145,10 +178,15 @@ int main(int argc, char *argv[]) void Scan_Dir(tInterface **IfaceList, const char *Directory) { - int dp = open(Directory, OPENFLAG_READ); + int dp = _SysOpen(Directory, OPENFLAG_READ); char filename[FILENAME_MAX]; - while( readdir(dp, filename) ) + if( dp == -1 ) { + fprintf(stderr, "Unable to open directory '%s'\n", Directory); + return ; + } + + while( _SysReadDir(dp, filename) ) { if( filename[0] == '.' ) continue ; if( strcmp(filename, "lo") == 0 ) continue ; @@ -159,7 +197,7 @@ void Scan_Dir(tInterface **IfaceList, const char *Directory) new->Next = *IfaceList; *IfaceList = new; } - close(dp); + _SysClose(dp); } // RETURN: Client FD @@ -171,44 +209,72 @@ int Start_Interface(tInterface *Iface) // TODO: Check that the adapter is not in use + // Request MAC address from network adapter + { + char path[] = "/Devices/ip/adapters/ethXXXX"; + 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; + } + if( _SysIOCtl(fd, 4, Iface->HWAddr) ) { + perror("Getting MAC address"); + return -1; + } + _SysClose(fd); + } + // Initialise an interface, with a dummy IP address (zero) - fd = open("/Devices/ip", 0); + fd = _SysOpen("/Devices/ip", 0); if( fd == -1 ) { fprintf(stderr, "ERROR: Unable to open '/Devices/ip'\n"); return -1; } - Iface->Num = ioctl(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; } - close(fd); + _SysClose(fd); // Open new interface snprintf(path, sizeof(path), "/Devices/ip/%i", Iface->Num); - Iface->IfaceFD = fd = open(path, 0); + Iface->IfaceFD = fd = _SysOpen(path, 0); if( fd == -1 ) { fprintf(stderr, "ERROR: Unable to open '%s'\n", path); return -1; } - tmp = 4; ioctl(fd, 4, &tmp); // Set to IPv4 - ioctl(fd, 6, addr); // Set address to 0.0.0.0 - tmp = 0; ioctl(fd, 7, &tmp); // Set subnet mask to 0 + _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 = open(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; ioctl(fd, 4, &tmp); // Local port - tmp = 67; ioctl(fd, 5, &tmp); // Remote port - tmp = 0; ioctl(fd, 7, &tmp); // Remote addr mask - we don't care where the reply comes from + tmp = 68; _SysIOCtl(fd, UDP_IOCTL_GETSETLPORT, &tmp); // Local port + tmp = 67; _SysIOCtl(fd, UDP_IOCTL_GETSETRPORT, &tmp); // Remote port + tmp = 0; _SysIOCtl(fd, UDP_IOCTL_GETSETRMASK, &tmp); // Remote addr mask bits - don't care source addr[0] = addr[1] = addr[2] = addr[3] = 255; // 255.255.255.255 - ioctl(fd, 8, addr); // Remote address + _SysIOCtl(fd, UDP_IOCTL_SETRADDR, addr); // Remote address - return fd; + return 0; +} + +void Send_DHCPRELEASE(tInterface *Iface) +{ } void Send_DHCPDISCOVER(tInterface *Iface) @@ -218,7 +284,10 @@ void Send_DHCPDISCOVER(tInterface *Iface) char data[8 + sizeof(struct sDHCP_Message) + 3 + 1]; msg = (void*)data + 8; + _SysDebug("DHCPDISCOVER to %s", Iface->Adapter); + transaction_id = rand(); + Iface->TransactionID = transaction_id; msg->op = htonb(1); // BOOTREQUEST msg->htype = htonb(1); // 10mb Ethernet @@ -226,25 +295,14 @@ void Send_DHCPDISCOVER(tInterface *Iface) msg->hops = htonb(0); // Hop count so far msg->xid = htonl(transaction_id); // Transaction ID msg->secs = htons(0); // secs - No time has elapsed - msg->flags = htons(0); // flags - TODO: Check if broadcast bit need be set + msg->flags = htons(0x0000); // flags - Broadcast is unset msg->ciaddr = htonl(0); // ciaddr - Zero, as we don't have one yet msg->yiaddr = htonl(0); // yiaddr - Zero? msg->siaddr = htonl(0); // siaddr - Zero? maybe -1 msg->giaddr = htonl(0); // giaddr - Zero? - // Request MAC address from network adapter - { - char path[] = "/Devices/ip/adapters/ethXXXX"; - sprintf(path, "/Devices/ip/adapters/%s", Iface->Adapter); - int fd = open(path, 0); - if(fd == -1) { - _SysDebug("Unable to open adapter %s", path); - } - else { - ioctl(fd, 4, msg->chaddr); - // TODO: Check if ioctl() failed - close(fd); - } - } + 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 msg->dhcp_magic = htonl(DHCP_MAGIC); @@ -253,29 +311,71 @@ 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; - write(Iface->SocketFD, data, sizeof(data)); - Iface->State = STATE_DISCOVER_SENT; + i = _SysWrite(Iface->SocketFD, data, sizeof(data)); + if( i != sizeof(data) ) { + _SysDebug("_SysWrite failed (%i != %i): %s", i, sizeof(data), + strerror(errno)); + } + Update_State(Iface, STATE_DISCOVER_SENT); } void Send_DHCPREQUEST(tInterface *Iface, void *OfferPacket, int TypeOffset) { struct sDHCP_Message *msg; + 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->options[TypeOffset+2] = 3; // DHCPREQUEST - msg->options[TypeOffset+3] = 255; + 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 + + i = 0; + msg->options[i++] = 53; // Message type = DHCPREQUEST + msg->options[i++] = 1; + msg->options[i++] = 3; + msg->options[i++] = 50; // Requested Address + msg->options[i++] = 4; + memcpy(msg->options + i, &msg->yiaddr, 4); i += 4; +// msg->options[i++] = 54; // Server identifier +// msg->options[i++] = 4; +// memcpy(msg->options + i, (char*)OfferPacket + 4, 4); i += 4; + msg->options[i++] = 255; + + // Clear last because yiaddr is needed in option setup + msg->ciaddr = htonl(0); + msg->yiaddr = htonl(0); + msg->siaddr = htonl(0); + msg->giaddr = htonl(0); + + // HACK + ((uint8_t*)OfferPacket)[4] = 255; + ((uint8_t*)OfferPacket)[5] = 255; + ((uint8_t*)OfferPacket)[6] = 255; + ((uint8_t*)OfferPacket)[7] = 255; - write(Iface->SocketFD, OfferPacket, 8 + sizeof(*msg) + TypeOffset + 4); - Iface->State = STATE_REQUEST_SENT; + _SysWrite(Iface->SocketFD, OfferPacket, 8 + sizeof(*msg) + i); + Update_State(Iface, STATE_REQUEST_SENT); } int Handle_Packet(tInterface *Iface) @@ -288,8 +388,8 @@ int Handle_Packet(tInterface *Iface) void *router = NULL; void *subnet_mask = NULL; - _SysDebug("Doing read on %i", Iface->SocketFD); - len = read(Iface->SocketFD, data, sizeof(data)); + _SysDebug("Doing read on %s %i", Iface->Adapter, Iface->SocketFD); + len = _SysRead(Iface->SocketFD, data, sizeof(data)); _SysDebug("len = %i", len); _SysDebug("*msg = {"); @@ -310,6 +410,19 @@ int Handle_Packet(tInterface *Iface) return 0; } + + // Check if the packet is related to our requests + if( ntohl(msg->xid) != Iface->TransactionID ) { + _SysDebug("Transaction ID mis-match, ignoring (0x%x != 0x%x)", + ntohl(msg->xid), Iface->TransactionID); + return 0; + } + if( memcmp(msg->chaddr, Iface->HWAddr, 6) != 0 ) { + _SysDebug("Hardware address mis-match, ignoring"); + return 0; + } + + // Parse options i = 0; while( i < len - sizeof(*msg) - 8 && msg->options[i] != 255 ) { @@ -353,13 +466,52 @@ int Handle_Packet(tInterface *Iface) case 4: // DHCPDECLINE - ? break; case 5: // DHCPACK - // TODO: Apply address SetAddress(Iface, &msg->yiaddr, subnet_mask, router); + // Return 1 to remove from list return 1; } return 0; } +int Handle_Timeout(tInterface *Iface) +{ + if( Iface->nTimeouts == 3 ) + return 1; + 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 (%s)", Iface->State, Iface->Adapter); + return 1; + } + return 0; +} + +void Update_State(tInterface *Iface, int newState) +{ + if( Iface->State != newState ) + { + Iface->Timeout = _SysTimestamp() + 500; + Iface->State = newState; + Iface->nTimeouts = 0; + } + else + { + // TODO: Exponential backoff + Iface->Timeout = _SysTimestamp() + 3000; + Iface->nTimeouts ++; + _SysDebug("%s: State %i repeated, timeout is 3000ms now", + Iface->Adapter, + newState); + } +} + void SetAddress(tInterface *Iface, void *Addr, void *Mask, void *Router) { int mask_bits = 0; @@ -405,26 +557,26 @@ void SetAddress(tInterface *Iface, void *Addr, void *Mask, void *Router) ); } - ioctl(Iface->IfaceFD, 6, Addr); - ioctl(Iface->IfaceFD, 7, &mask_bits); + _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]); // Set default route int fd; - fd = open("/Devices/ip/routes/4:00000000:0:0", OPENFLAG_CREATE); + fd = _SysOpen("/Devices/ip/routes/4:00000000:0:0", OPENFLAG_CREATE); if(fd == -1) { fprintf(stderr, "ERROR: Unable to open default route\n"); } else { char ifname[snprintf(NULL,0,"%i",Iface->Num)+1]; sprintf(ifname, "%i", Iface->Num); - ioctl(fd, ioctl(fd, 3, "set_nexthop"), Router); - ioctl(fd, ioctl(fd, 3, "set_interface"), ifname); - close(fd); + _SysIOCtl(fd, _SysIOCtl(fd, 3, "set_nexthop"), Router); + _SysIOCtl(fd, _SysIOCtl(fd, 3, "set_interface"), ifname); + _SysClose(fd); } } }