*
* http://www.ietf.org/rfc/rfc2131.txt
*/
-#include <unistd.h>
#include <stdint.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <net.h>
+#include <acess/sys.h>
+#include <errno.h>
+
+enum {
+ UDP_IOCTL_GETSETLPORT = 4,
+ UDP_IOCTL_GETSETRPORT,
+ UDP_IOCTL_GETSETRMASK,
+ UDP_IOCTL_SETRADDR,
+};
#define FILENAME_MAX 255
// --- Translation functions ---
STATE_PREINIT,
STATE_DISCOVER_SENT,
STATE_REQUEST_SENT,
- STATE_COMPLETE
+ STATE_COMPLETE,
};
// === STRUCTURES ===
uint32_t TransactionID;
char HWAddr[6];
-
+
+ int64_t StartTime;
int64_t Timeout;
+ int nTimeouts;
} tInterface;
// === PROTOTYPES ===
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);
// === 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 <interface>\n", argv[0]);
return -1;
Scan_Dir( &ifaces, "/Devices/ip/adapters" );
}
- for( i = ifaces; i; i = i->Next )
+ for( tInterface *i = ifaces; i; i = i->Next )
{
if( Start_Interface(i) < 0 ) {
return -1;
}
i->State = STATE_PREINIT;
+ i->StartTime = _SysTimestamp();
// Send request
Send_DHCPDISCOVER(i);
{
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, &timeout) < 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 ) )
- {
- close(i->SocketFD);
- close(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, "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;
void Scan_Dir(tInterface **IfaceList, const char *Directory)
{
- int dp = open(Directory, OPENFLAG_READ);
+ int dp = _SysOpen(Directory, OPENFLAG_READ);
char filename[FILENAME_MAX];
if( dp == -1 ) {
fprintf(stderr, "Unable to open directory '%s'\n", Directory);
+ return ;
}
- while( SysReadDir(dp, filename) )
+ while( _SysReadDir(dp, filename) )
{
if( filename[0] == '.' ) continue ;
if( strcmp(filename, "lo") == 0 ) continue ;
new->Next = *IfaceList;
*IfaceList = new;
}
- close(dp);
+ _SysClose(dp);
}
// RETURN: Client FD
{
char path[] = "/Devices/ip/adapters/ethXXXX";
sprintf(path, "/Devices/ip/adapters/%s", Iface->Adapter);
- fd = open(path, 0);
+ fd = _SysOpen(path, 0);
if(fd == -1) {
+ perror("Opening adapter");
_SysDebug("Unable to open adapter %s", path);
return -1;
}
- ioctl(fd, 4, Iface->HWAddr);
- // TODO: Check if ioctl() failed
- close(fd);
+ 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 bits - 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 0;
}
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
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));
+ 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);
}
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
((uint8_t*)OfferPacket)[6] = 255;
((uint8_t*)OfferPacket)[7] = 255;
- write(Iface->SocketFD, OfferPacket, 8 + sizeof(*msg) + i);
+ _SysWrite(Iface->SocketFD, OfferPacket, 8 + sizeof(*msg) + i);
Update_State(Iface, STATE_REQUEST_SENT);
}
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 = {");
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:
+ 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;
}
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;
- _SysDebug("State %i repeated, timeout is 3000ms now", newState);
+ Iface->nTimeouts ++;
+ _SysDebug("%s: State %i repeated, timeout is 3000ms now",
+ Iface->Adapter,
+ newState);
}
}
);
}
- 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);
}
}
}
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au