/[pkgs]/devel/dhcp/dhcp-4.1.0-dhclient-anycast.patch
ViewVC logotype

Contents of /devel/dhcp/dhcp-4.1.0-dhclient-anycast.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.1 - (show annotations) (download) (as text)
Tue Jan 6 23:46:50 2009 UTC (10 months, 2 weeks ago) by dcantrel
Branch: MAIN
CVS Tags: F-12-split, dhcp-4_1_0-3_fc11, dhcp-4_1_0-2_fc11, dhcp-4_1_0-22_fc12, dhcp-4_1_0-1_fc11, dhcp-4_1_0-20_fc12, dhcp-4_1_0p1-5_fc12, dhcp-4_1_0-16_fc11, dhcp-4_1_0p1-13_fc13, dhcp-4_1_0-11_fc11, dhcp-4_1_0p1-11_fc12, dhcp-4_1_0-10_fc11, dhcp-4_1_0-15_fc11, dhcp-4_1_0-12_fc11, dhcp-4_1_0-14_fc11, F-11-split, dhcp-4_1_0p1-6_fc12, dhcp-4_1_0p1-7_fc12, dhcp-4_1_0p1-8_fc12, dhcp-4_1_0-4_fc11, dhcp-4_1_0p1-4_fc12, dhcp-4_1_0-13_fc11, dhcp-4_1_0-18_fc12, dhcp-4_1_0p1-14_fc13, dhcp-4_1_0-23_fc12, dhcp-4_1_0-6_fc11, dhcp-4_1_0-17_fc12, dhcp-4_1_0-19_fc12, dhcp-4_1_0p1-1_fc12, dhcp-4_1_0p1-3_fc12, dhcp-4_1_0p1-9_fc12, dhcp-4_1_0-9_fc11, dhcp-4_1_0p1-12_fc13, dhcp-4_1_0-26_fc12, dhcp-4_1_0p1-10_fc12, dhcp-4_1_0-8_fc11, dhcp-4_1_0-5_fc11, dhcp-4_1_0-25_fc12, dhcp-4_1_0-24_fc12, dhcp-4_1_0-7_fc11, dhcp-4_1_0-27_fc12, dhcp-4_1_0-21_fc12, dhcp-4_1_0p1-2_fc12, HEAD
File MIME type: text/x-patch 
* Tue Jan 06 2009 David Cantrell <dcantrell@redhat.com> - 12:4.1.0-1
- Upgraded to ISC dhcp-4.1.0
- Had to rename the -T option to -timeout as ISC is now using -T
- Allow package rebuilders to easily enable DHCPv6 support with:
      rpmbuild --with DHCPv6 dhcp.spec
  Note that Fedora is still using the 'dhcpv6' package, but some
  users may want to experiment with the ISC DHCPv6 implementation
  locally.
1 diff -up dhcp-4.1.0/client/clparse.c.anycast dhcp-4.1.0/client/clparse.c
2 --- dhcp-4.1.0/client/clparse.c.anycast 2009-01-06 10:43:52.000000000 -1000
3 +++ dhcp-4.1.0/client/clparse.c 2009-01-06 10:43:53.000000000 -1000
4 @@ -558,6 +558,17 @@ void parse_client_statement (cfile, ip,
5 }
6 return;
7
8 + case ANYCAST_MAC:
9 + token = next_token (&val, (unsigned *)0, cfile);
10 + if (ip) {
11 + parse_hardware_param (cfile, &ip -> anycast_mac_addr);
12 + } else {
13 + parse_warn (cfile, "anycast mac address parameter %s",
14 + "not allowed here.");
15 + skip_to_semi (cfile);
16 + }
17 + return;
18 +
19 case REQUEST:
20 token = next_token (&val, (unsigned *)0, cfile);
21 if (config -> requested_options == default_requested_options)
22 diff -up dhcp-4.1.0/common/conflex.c.anycast dhcp-4.1.0/common/conflex.c
23 --- dhcp-4.1.0/common/conflex.c.anycast 2009-01-06 10:43:52.000000000 -1000
24 +++ dhcp-4.1.0/common/conflex.c 2009-01-06 10:43:53.000000000 -1000
25 @@ -729,6 +729,8 @@ intern(char *atom, enum dhcp_token dfv)
26 }
27 if (!strcasecmp (atom + 1, "nd"))
28 return AND;
29 + if (!strcasecmp (atom + 1, "nycast-mac"))
30 + return ANYCAST_MAC;
31 if (!strcasecmp (atom + 1, "ppend"))
32 return APPEND;
33 if (!strcasecmp (atom + 1, "llow"))
34 diff -up dhcp-4.1.0/common/lpf.c.anycast dhcp-4.1.0/common/lpf.c
35 --- dhcp-4.1.0/common/lpf.c.anycast 2009-01-06 10:43:52.000000000 -1000
36 +++ dhcp-4.1.0/common/lpf.c 2009-01-06 10:43:53.000000000 -1000
37 @@ -333,6 +333,9 @@ ssize_t send_packet (interface, packet,
38 return send_fallback (interface, packet, raw,
39 len, from, to, hto);
40
41 + if (hto == NULL && interface->anycast_mac_addr.hlen)
42 + hto = &interface->anycast_mac_addr;
43 +
44 /* Assemble the headers... */
45 assemble_hw_header (interface, (unsigned char *)hh, &hbufp, hto);
46 fudge = hbufp % 4; /* IP header must be word-aligned. */
47 diff -up dhcp-4.1.0/includes/dhcpd.h.anycast dhcp-4.1.0/includes/dhcpd.h
48 --- dhcp-4.1.0/includes/dhcpd.h.anycast 2009-01-06 10:43:53.000000000 -1000
49 +++ dhcp-4.1.0/includes/dhcpd.h 2009-01-06 10:43:53.000000000 -1000
50 @@ -1215,6 +1215,7 @@ struct interface_info {
51 int dlpi_sap_length;
52 struct hardware dlpi_broadcast_addr;
53 # endif /* DLPI_SEND || DLPI_RECEIVE */
54 + struct hardware anycast_mac_addr;
55 };
56
57 struct hardware_link {
58 diff -up dhcp-4.1.0/includes/dhctoken.h.anycast dhcp-4.1.0/includes/dhctoken.h
59 --- dhcp-4.1.0/includes/dhctoken.h.anycast 2009-01-06 10:43:52.000000000 -1000
60 +++ dhcp-4.1.0/includes/dhctoken.h 2009-01-06 10:49:12.000000000 -1000
61 @@ -353,7 +353,8 @@ enum dhcp_token {
62 TEMPORARY = 656,
63 PREFIX6 = 657,
64 FIXED_PREFIX6 = 658,
65 - BOOTP_BROADCAST_ALWAYS = 659
66 + BOOTP_BROADCAST_ALWAYS = 659,
67 + ANYCAST_MAC = 660
68 };
69
70 #define is_identifier(x) ((x) >= FIRST_TOKEN && \
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2