rpms/dhcp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- BOOTP_BROADCAST_ALWAYS is not the same as ATSFP, fixed

Browse Source 
- Added anycast mac support to dhclient for OLPC
This commit is contained in:
David Cantrell 2007-06-18 15:11:10 +00:00
parent 47f03274a8
commit 9675569520
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dhcp-3.0.5-dhclient-anycast.patch
View File

@ -1,5 +1,5 @@
--- dhcp-3.0.5/client/clparse.c.anycast 2007-06-15 18:59:48.000000000 -0400 --- dhcp-3.0.5/client/clparse.c.anycast 2007-06-18 10:53:24.000000000 -0400
+++ dhcp-3.0.5/client/clparse.c 2007-06-15 18:59:57.000000000 -0400 +++ dhcp-3.0.5/client/clparse.c 2007-06-18 10:53:24.000000000 -0400
@@ -402,6 +402,17 @@ void parse_client_statement (cfile, ip, @@ -402,6 +402,17 @@ void parse_client_statement (cfile, ip,
} }
return; return;
@ -18,8 +18,8 @@
case REQUEST: case REQUEST:
token = next_token (&val, (unsigned *)0, cfile); token = next_token (&val, (unsigned *)0, cfile);
if (config -> requested_options == default_requested_options) if (config -> requested_options == default_requested_options)
--- dhcp-3.0.5/common/conflex.c.anycast 2007-06-15 18:59:48.000000000 -0400 --- dhcp-3.0.5/common/conflex.c.anycast 2007-06-18 10:53:24.000000000 -0400
+++ dhcp-3.0.5/common/conflex.c 2007-06-15 18:59:58.000000000 -0400 +++ dhcp-3.0.5/common/conflex.c 2007-06-18 10:53:24.000000000 -0400
@@ -549,6 +549,8 @@ static enum dhcp_token intern (atom, dfv @@ -549,6 +549,8 @@ static enum dhcp_token intern (atom, dfv
} }
if (!strcasecmp (atom + 1, "nd")) if (!strcasecmp (atom + 1, "nd"))
@ -29,20 +29,20 @@
if (!strcasecmp (atom + 1, "ppend")) if (!strcasecmp (atom + 1, "ppend"))
return APPEND; return APPEND;
if (!strcasecmp (atom + 1, "llow")) if (!strcasecmp (atom + 1, "llow"))
--- dhcp-3.0.5/common/lpf.c.anycast 2007-06-15 18:59:48.000000000 -0400 --- dhcp-3.0.5/common/lpf.c.anycast 2007-06-18 10:53:24.000000000 -0400
+++ dhcp-3.0.5/common/lpf.c 2007-06-15 18:59:58.000000000 -0400 +++ dhcp-3.0.5/common/lpf.c 2007-06-18 10:53:48.000000000 -0400
@@ -332,6 +332,9 @@ ssize_t send_packet (interface, packet, @@ -332,6 +332,9 @@ ssize_t send_packet (interface, packet,
return send_fallback (interface, packet, raw, return send_fallback (interface, packet, raw,
len, from, to, hto); len, from, to, hto);
+ if (hto == NULL && interface->anycast_mac_addr.len) + if (hto == NULL && interface->anycast_mac_addr.hlen)
+ hto = &interface->anycast_mac_addr; + hto = &interface->anycast_mac_addr;
+ +
/* Assemble the headers... */ /* Assemble the headers... */
assemble_hw_header (interface, (unsigned char *)hh, &hbufp, hto); assemble_hw_header (interface, (unsigned char *)hh, &hbufp, hto);
fudge = hbufp % 4; /* IP header must be word-aligned. */ fudge = hbufp % 4; /* IP header must be word-aligned. */
--- dhcp-3.0.5/includes/dhctoken.h.anycast 2007-06-15 18:59:48.000000000 -0400 --- dhcp-3.0.5/includes/dhctoken.h.anycast 2007-06-18 10:53:24.000000000 -0400
+++ dhcp-3.0.5/includes/dhctoken.h 2007-06-15 19:00:32.000000000 -0400 +++ dhcp-3.0.5/includes/dhctoken.h 2007-06-18 10:53:24.000000000 -0400
@@ -310,7 +310,8 @@ enum dhcp_token { @@ -310,7 +310,8 @@ enum dhcp_token {
DO_FORWARD_UPDATE = 614, DO_FORWARD_UPDATE = 614,
KNOWN_CLIENTS = 615, KNOWN_CLIENTS = 615,
@ -53,8 +53,8 @@
}; };
#define is_identifier(x) ((x) >= FIRST_TOKEN && \ #define is_identifier(x) ((x) >= FIRST_TOKEN && \
--- dhcp-3.0.5/includes/site.h.anycast 2007-06-15 18:59:47.000000000 -0400 --- dhcp-3.0.5/includes/site.h.anycast 2007-06-18 10:53:24.000000000 -0400
+++ dhcp-3.0.5/includes/site.h 2007-06-15 18:59:58.000000000 -0400 +++ dhcp-3.0.5/includes/site.h 2007-06-18 10:53:24.000000000 -0400
@@ -178,6 +178,8 @@ @@ -178,6 +178,8 @@
#define TRACING #define TRACING
@ -64,8 +64,8 @@
/* Define this if you want to read your config from LDAP. Read README.ldap /* Define this if you want to read your config from LDAP. Read README.ldap
about how to set this up */ about how to set this up */
--- dhcp-3.0.5/includes/dhcpd.h.anycast 2007-06-15 18:59:48.000000000 -0400 --- dhcp-3.0.5/includes/dhcpd.h.anycast 2007-06-18 10:53:24.000000000 -0400
+++ dhcp-3.0.5/includes/dhcpd.h 2007-06-15 18:59:58.000000000 -0400 +++ dhcp-3.0.5/includes/dhcpd.h 2007-06-18 10:53:24.000000000 -0400
@@ -845,6 +845,7 @@ struct interface_info { @@ -845,6 +845,7 @@ struct interface_info {
int dlpi_sap_length; int dlpi_sap_length;
struct hardware dlpi_broadcast_addr; struct hardware dlpi_broadcast_addr;