search for: giaddr

...delimiters (which must not match [0-9A-Fa-f]) and requires 2-digit entry for the octet. This is an extremely loose input format such that users may utilize it in their preferred format. After adding this, I believe I have about everything implemented except I'm uncertain about the DHCP field giaddr (pxe_bootp_t.gip). My current test environment doesn't utilize this (just 0). I'm mostly looking to see if it's something that it might be desirable to modify. DHCP fields sname and siaddr are already adjusted as needed. -- -Gene

[ added klibc ml to cc ] > I found a problem with klibc's "ipconfig" program, or at least, behavior > that breaks DHCP on my thin clients (LTSP 5.0). It has to do with setting > the giaddr field on dhcp_send in dhcp_proto.c, line 164. thank you for digging into it. > Otherwise, the relay agent SHALL forward any received DHCP packet > with a valid non-zero giaddr WITHOUT adding any relay agent options. > Per RFC 2131 < > ;http://www.faqs.org/rfcs /rfc2131.html>...

...lapsed since client boot flags flags DHCP Flags field client.ip.addr ciaddr client IP addr your.ip.addr yiaddr 'Your' IP addr. (from server) server.ip.addr siaddr Boot server IP addr gateway.ip.addr giaddr Relay agent IP addr client.mac chaddr Client hardware addr server.hostname sname Optl. boot server hostname boot.file file boot file name (ascii path) magic.cookie cookie Magic cookie getoptions() returns a table of t...

...ss length (hlen) = 6 octets DHCP: Relay agent hops = 0 DHCP: Transaction ID = 0x58c771d DHCP: Time since boot = 0 seconds DHCP: Flags = 0x0000 DHCP: Client address (ciaddr) = 0.0.0.0 DHCP: Your client address (yiaddr) = 0.0.0.0 DHCP: Next server address (siaddr) = 0.0.0.0 DHCP: Relay agent address (giaddr) = 0.0.0.0 DHCP: Client hardware address (chaddr) = 00:16:3E:1E:87:45 DHCP: DHCP: ----- (Options) field options ----- DHCP: DHCP: Message type = DHCPREQUEST DHCP: Requested IP Address = 192.168.2.111 DHCP: IP Address Lease Time = -1 seconds DHCP: Maximum DHCP Message Size = 1472 bytes DHCP: Client...

...length (hlen) = 6 octets DHCP: Relay agent hops = 0 DHCP: Transaction ID = 0xd6054229 DHCP: Time since boot = 12 seconds DHCP: Flags = 0x0000 DHCP: Client address (ciaddr) = 0.0.0.0 DHCP: Your client address (yiaddr) = 0.0.0.0 DHCP: Next server address (siaddr) = 0.0.0.0 DHCP: Relay agent address (giaddr) = 0.0.0.0 DHCP: Client hardware address (chaddr) = 00:16:3E:00:00:E4 DHCP: DHCP: ----- (Options) field options ----- DHCP: DHCP: Message type = DHCPDISCOVER DHCP: Maximum DHCP Message Size = 1472 bytes DHCP: IP Address Lease Time = -1 seconds DHCP: Client Class Identifier = "SUNW.i86xpv"...

..._proto.c index a1090f3..8ff1d58 100644 --- a/usr/kinit/ipconfig/dhcp_proto.c +++ b/usr/kinit/ipconfig/dhcp_proto.c @@ -161,7 +161,7 @@ static int dhcp_send(struct netdev *dev, struct iovec *vec) bootp.hlen = dev->hwlen; bootp.xid = dev->bootp.xid; bootp.ciaddr = dev->ip_addr; - bootp.giaddr = dev->bootp.gateway; + bootp.giaddr = INADDR_ANY; bootp.secs = htons(time(NULL) - dev->open_time); memcpy(bootp.chaddr, dev->hwaddr, 16); commit fbf8aa559d25685eea12248c76bcc983c68306b2 Author: maximilian attems <max at stro.at> Date: Sat Sep 22 23:06:05 2007 +0200 [kl...

...20454 -0600 @@ -201,7 +201,8 @@ static int dhcp_send(struct netdev *dev, bootp.hlen = dev->hwlen; bootp.xid = dev->bootp.xid; bootp.ciaddr = INADDR_ANY; - bootp.yiaddr = dev->ip_addr; + bootp.yiaddr = INADDR_ANY; + bootp.flags = htons(0x800); bootp.giaddr = INADDR_ANY; bootp.secs = htons(time(NULL) - dev->open_time); memcpy(bootp.chaddr, dev->hwaddr, 16);

...ADDR_ANY; - bootp.yiaddr = dev->ip_addr; + /* yiaddr should always be set to 0 for the messages we're likely + * to send as a DHCP client: DHCPDISCOVER, DHCPREQUEST, DHCPDECLINE, + * DHCPINFORM, DHCPRELEASE + * cf. RFC2131 section 4.1.1, table 5. + */ + bootp.yiaddr = INADDR_ANY; bootp.giaddr = INADDR_ANY; + bootp.flags = htons(0x8000); bootp.secs = htons(time(NULL) - dev->open_time); memcpy(bootp.chaddr, dev->hwaddr, 16);

hi, I've written a start of an c32-module to do basic substition: add subst.c32 this is a start of a generic substition module --- commit 9a1f41a7e6599fe6a162197cd9ddc6610185e780 tree cfb799a0be9844926afe44e21b2eb96630666c44 parent 89478bdbfa7167bc1b627a478d042c99e46f06b7 author Maurice Massar <massar at unix-ag.uni-kl.de> Tue, 10 Apr 2007 20:13:39 +0200 committer Maurice Massar

Hi, Here are two fixes for ipconfig/dhcp, the second of them being required for my dhcp3 server to accept ipconfig's requests. Thanks, Louis Louis Rilling (2): ipconfig: Fix missing dhcp_end field ipconfig: Fix null ciaddr on DHCPREQUEST during SELECTING state usr/kinit/ipconfig/dhcp_proto.c | 4 ++-- usr/kinit/ipconfig/packet.c | 2 +- 2 files changed, 3

...)(dst_i + 1)); + exit(1); + } +#endif + return decoded_str; +} + +/* * Parse a bootp reply packet */ int bootp_parse(struct netdev *dev, struct bootp_hdr *hdr, uint8_t *exts, int extlen) { + uint8_t ext119_buf[BOOTP_EXTS_SIZE]; + int16_t ext119_len = 0; + dev->bootp.gateway = hdr->giaddr; dev->ip_addr = hdr->yiaddr; dev->ip_server = hdr->siaddr; @@ -143,11 +358,32 @@ int bootp_parse(struct netdev *dev, struct bootp_hdr *hdr, if (len == 4 && !dev->ip_server) memcpy(&dev->ip_server, ext, 4); break; + case 119: /* Domain Search Opt...

...outes; +} + /* * Parse a bootp reply packet */ @@ -275,6 +356,8 @@ int bootp_parse(struct netdev *dev, struct bootp_hdr *hdr, { uint8_t ext119_buf[BOOTP_EXTS_SIZE]; int16_t ext119_len = 0; + uint8_t ext121_buf[BOOTP_EXTS_SIZE]; + int16_t ext121_len = 0; dev->bootp.gateway = hdr->giaddr; dev->ip_addr = hdr->yiaddr; @@ -367,6 +450,16 @@ int bootp_parse(struct netdev *dev, struct bootp_hdr *hdr, } else ext119_len = -1; + break; + case 121: /* Classless Static Route Option (RFC3442) */ + if (ext121_len >= 0 && + ext121_len + len <= s...

...outes; +} + /* * Parse a bootp reply packet */ @@ -275,6 +356,8 @@ int bootp_parse(struct netdev *dev, struct bootp_hdr *hdr, { uint8_t ext119_buf[BOOTP_EXTS_SIZE]; int16_t ext119_len = 0; + uint8_t ext121_buf[BOOTP_EXTS_SIZE]; + int16_t ext121_len = 0; dev->bootp.gateway = hdr->giaddr; dev->ip_addr = hdr->yiaddr; @@ -367,6 +450,16 @@ int bootp_parse(struct netdev *dev, struct bootp_hdr *hdr, } else ext119_len = -1; + break; + case 121: /* Classless Static Route Option (RFC3442) */ + if (ext121_len >= 0 && + ext121_len + len <= s...

...outes; +} + /* * Parse a bootp reply packet */ @@ -275,6 +356,8 @@ int bootp_parse(struct netdev *dev, struct bootp_hdr *hdr, { uint8_t ext119_buf[BOOTP_EXTS_SIZE]; int16_t ext119_len = 0; + uint8_t ext121_buf[BOOTP_EXTS_SIZE]; + int16_t ext121_len = 0; dev->bootp.gateway = hdr->giaddr; dev->ip_addr = hdr->yiaddr; @@ -367,6 +450,16 @@ int bootp_parse(struct netdev *dev, struct bootp_hdr *hdr, } else ext119_len = -1; + break; + case 121: /* Classless Static Route Option (RFC3442) */ + if (ext121_len >= 0 && + ext121_len + len <= s...

...outes; +} + /* * Parse a bootp reply packet */ @@ -275,6 +356,8 @@ int bootp_parse(struct netdev *dev, struct bootp_hdr *hdr, { uint8_t ext119_buf[BOOTP_EXTS_SIZE]; int16_t ext119_len = 0; + uint8_t ext121_buf[BOOTP_EXTS_SIZE]; + int16_t ext121_len = 0; dev->bootp.gateway = hdr->giaddr; dev->ip_addr = hdr->yiaddr; @@ -367,6 +450,16 @@ int bootp_parse(struct netdev *dev, struct bootp_hdr *hdr, } else ext119_len = -1; + break; + case 121: /* Classless Static Route Option (RFC3442) */ + if (ext121_len >= 0 && + ext121_len + len <= s...

...onfig/dhcp_proto.c @@ -171,7 +171,8 @@ static int dhcp_send(struct netdev *dev, struct iovec *vec) bootp.htype = dev->hwtype; bootp.hlen = dev->hwlen; bootp.xid = dev->bootp.xid; - bootp.ciaddr = dev->ip_addr; + bootp.ciaddr = INADDR_NONE; + bootp.yiaddr = dev->ip_addr; bootp.giaddr = INADDR_ANY; bootp.secs = htons(time(NULL) - dev->open_time); memcpy(bootp.chaddr, dev->hwaddr, 16); commit 959ed5fced3403cba814c819146e8d8251c3d7b1 Author: maximilian attems <max at stro.at> Date: Fri Sep 5 22:38:22 2008 +0200 [klibc] ipconfig: raise field length for rootp...

...onfig/dhcp_proto.c @@ -171,7 +171,8 @@ static int dhcp_send(struct netdev *dev, struct iovec *vec) bootp.htype = dev->hwtype; bootp.hlen = dev->hwlen; bootp.xid = dev->bootp.xid; - bootp.ciaddr = dev->ip_addr; + bootp.ciaddr = INADDR_NONE; + bootp.yiaddr = dev->ip_addr; bootp.giaddr = INADDR_ANY; bootp.secs = htons(time(NULL) - dev->open_time); memcpy(bootp.chaddr, dev->hwaddr, 16); commit 848a8ce349331cd74021cc3b8ea43f9e47c14e50 Author: maximilian attems <max at stro.at> Date: Fri Sep 5 22:38:22 2008 +0200 [klibc] ipconfig: raise field length for rootp...

The following patches come from Debian and/or Ubuntu packages of klibc. Ben. Ben Hutchings (1): [klibc] run-init: Add dry-run mode Jay Vosburgh (1): [klibc] ipconfig: Use separate sockets for DHCP from multiple interfaces Mathieu Trudel-Lapierre (1): [klibc] ipconfig: Set broadcast when sending DHCPREQUEST and DHCPDISCOVER YunQiang Su (1): [klibc] mips: setjmp.S: don't