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

- Fix UseMulticast.patch to not repeatedly parse dhcpd.conf for unicast

Browse Source 
option
- Fix dhclient-script to set interface MTU only when it's greater than 576
    (#574629)
This commit is contained in:
Jiří Popelka 2010-03-19 17:22:59 +00:00
parent b08ba4ea9a
commit c4025679fd
3 changed files with 55 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dhclient-script
View File

@ -262,7 +262,12 @@ dhconfig() {
ip -4 addr add ${new_ip_address}/${new_prefix} broadcast ${new_broadcast_address} dev ${interface} ip -4 addr add ${new_ip_address}/${new_prefix} broadcast ${new_broadcast_address} dev ${interface}
ip link set dev ${interface} up ip link set dev ${interface} up
if [ -n "${new_interface_mtu}" ]; then # The 576 MTU is only used for X.25 and dialup connections
# where the admin wants low latency. Such a low MTU can cause
# problems with UDP traffic, among other things. As such,
# disallow MTUs from 576 and below by default, so that broken
# MTUs are ignored, but higher stuff is allowed (1492, 1500, etc).
if [ -n "${new_interface_mtu}" ] && [ ${new_interface_mtu} -gt 576 ]; then
ip link set ${interface} mtu ${new_interface_mtu} ip link set ${interface} mtu ${new_interface_mtu}
fi fi

69
dhcp-4.1.1-UseMulticast.patch
View File

@ -1,37 +1,56 @@
diff -up dhcp-4.1.1/server/dhcpv6.c.UseMulticast dhcp-4.1.1/server/dhcpv6.c diff -up dhcp-4.1.1/server/dhcpv6.c.UseMulticast dhcp-4.1.1/server/dhcpv6.c
--- dhcp-4.1.1/server/dhcpv6.c.UseMulticast 2009-09-30 23:01:20.000000000 +0200 --- dhcp-4.1.1/server/dhcpv6.c.UseMulticast 2009-09-30 23:01:20.000000000 +0200
+++ dhcp-4.1.1/server/dhcpv6.c 2010-03-12 19:59:50.000000000 +0100 +++ dhcp-4.1.1/server/dhcpv6.c 2010-03-15 12:29:32.000000000 +0100
@@ -1206,6 +1206,29 @@ pick_v6_prefix(struct iasubopt **pref, i @@ -345,6 +345,48 @@ generate_new_server_duid(void) {
} }
/* /*
+ * Is the D6O_UNICAST option defined in dhcpd.conf file. + * Is the D6O_UNICAST option defined in dhcpd.conf ?
+ */
+static isc_boolean_t unicast_option_defined;
+
+/*
+ * Did we already search dhcpd.conf for D6O_UNICAST option ?
+ * We need to store it here to not parse dhcpd.conf repeatedly.
+ */
+static isc_boolean_t unicast_option_parsed = ISC_FALSE;
+
+
+/*
+ * Is the D6O_UNICAST option defined in dhcpd.conf ?
+ */ + */
+isc_boolean_t +isc_boolean_t
+is_unicast_option_defined(void) { +is_unicast_option_defined(void) {
+ struct option_state *opt_state; + struct option_state *opt_state;
+ struct option_cache *oc; + struct option_cache *oc;
+ +
+ opt_state = NULL; + /*
+ if (!option_state_allocate(&opt_state, MDL)) { + * If we are looking for the unicast option for the first time
+ log_fatal("No memory for unicast option."); + */
+ if (unicast_option_parsed == ISC_FALSE) {
+ unicast_option_parsed = ISC_TRUE;
+ opt_state = NULL;
+ if (!option_state_allocate(&opt_state, MDL)) {
+ log_fatal("No memory for option state.");
+ }
+
+ execute_statements_in_scope(NULL, NULL, NULL, NULL, NULL,
+ opt_state, &global_scope, root_group, NULL);
+
+ oc = lookup_option(&dhcpv6_universe, opt_state, D6O_UNICAST);
+ unicast_option_defined = (oc != NULL);
+
+ option_state_dereference(&opt_state, MDL);
+ } + }
+ +
+ execute_statements_in_scope(NULL, NULL, NULL, NULL, NULL, + return (unicast_option_defined);
+ opt_state, &global_scope, root_group, NULL);
+
+ oc = lookup_option(&dhcpv6_universe, opt_state, D6O_UNICAST);
+
+ option_state_dereference(&opt_state, MDL);
+
+ return (oc != NULL);
+} +}
+ +
+/* +/*
* lease_to_client() is called from several messages to construct a * Get the client identifier from the packet.
* reply that contains all that we know about the client's correct lease */
* (or projected lease). isc_result_t
@@ -1398,6 +1421,56 @@ lease_to_client(struct data_string *repl @@ -1398,6 +1440,56 @@ lease_to_client(struct data_string *repl
reply.shared->group); reply.shared->group);
} }
@ -88,7 +107,7 @@ diff -up dhcp-4.1.1/server/dhcpv6.c.UseMulticast dhcp-4.1.1/server/dhcpv6.c
/* /*
* RFC3315 section 17.2.2 (Solicit): * RFC3315 section 17.2.2 (Solicit):
* *
@@ -1422,8 +1495,6 @@ lease_to_client(struct data_string *repl @@ -1422,8 +1514,6 @@ lease_to_client(struct data_string *repl
* the server. * the server.
* Sends a Renew/Rebind if the IA is not in the Reply message. * Sends a Renew/Rebind if the IA is not in the Reply message.
*/ */
@ -97,7 +116,7 @@ diff -up dhcp-4.1.1/server/dhcpv6.c.UseMulticast dhcp-4.1.1/server/dhcpv6.c
{ {
/* Set the NoAddrsAvail status code. */ /* Set the NoAddrsAvail status code. */
if (!set_status_code(STATUS_NoAddrsAvail, if (!set_status_code(STATUS_NoAddrsAvail,
@@ -4097,7 +4168,6 @@ dhcpv6_solicit(struct data_string *reply @@ -4097,7 +4187,6 @@ dhcpv6_solicit(struct data_string *reply
* Very similar to Solicit handling, except the server DUID is required. * Very similar to Solicit handling, except the server DUID is required.
*/ */
@ -105,7 +124,7 @@ diff -up dhcp-4.1.1/server/dhcpv6.c.UseMulticast dhcp-4.1.1/server/dhcpv6.c
static void static void
dhcpv6_request(struct data_string *reply_ret, struct packet *packet) { dhcpv6_request(struct data_string *reply_ret, struct packet *packet) {
struct data_string client_id; struct data_string client_id;
@@ -4412,7 +4482,6 @@ exit: @@ -4412,7 +4501,6 @@ exit:
* except for the error code of when addresses don't match. * except for the error code of when addresses don't match.
*/ */
@ -113,7 +132,7 @@ diff -up dhcp-4.1.1/server/dhcpv6.c.UseMulticast dhcp-4.1.1/server/dhcpv6.c
static void static void
dhcpv6_renew(struct data_string *reply, struct packet *packet) { dhcpv6_renew(struct data_string *reply, struct packet *packet) {
struct data_string client_id; struct data_string client_id;
@@ -4653,18 +4722,60 @@ iterate_over_ia_na(struct data_string *r @@ -4653,18 +4741,60 @@ iterate_over_ia_na(struct data_string *r
goto exit; goto exit;
} }
@ -184,7 +203,7 @@ diff -up dhcp-4.1.1/server/dhcpv6.c.UseMulticast dhcp-4.1.1/server/dhcpv6.c
/* /*
* Loop through the IA_NA reported by the client, and deal with * Loop through the IA_NA reported by the client, and deal with
@@ -4802,6 +4913,7 @@ iterate_over_ia_na(struct data_string *r @@ -4802,6 +4932,7 @@ iterate_over_ia_na(struct data_string *r
/* /*
* Return our reply to the caller. * Return our reply to the caller.
*/ */
@ -192,7 +211,7 @@ diff -up dhcp-4.1.1/server/dhcpv6.c.UseMulticast dhcp-4.1.1/server/dhcpv6.c
reply_ret->len = reply_ofs; reply_ret->len = reply_ofs;
reply_ret->buffer = NULL; reply_ret->buffer = NULL;
if (!buffer_allocate(&reply_ret->buffer, reply_ofs, MDL)) { if (!buffer_allocate(&reply_ret->buffer, reply_ofs, MDL)) {
@@ -4847,7 +4959,6 @@ exit: @@ -4847,7 +4978,6 @@ exit:
* we still need to be aware of this possibility. * we still need to be aware of this possibility.
*/ */
@ -200,7 +219,7 @@ diff -up dhcp-4.1.1/server/dhcpv6.c.UseMulticast dhcp-4.1.1/server/dhcpv6.c
/* TODO: IA_TA */ /* TODO: IA_TA */
static void static void
dhcpv6_decline(struct data_string *reply, struct packet *packet) { dhcpv6_decline(struct data_string *reply, struct packet *packet) {
@@ -5314,7 +5425,6 @@ exit: @@ -5314,7 +5444,6 @@ exit:
* Release means a client is done with the leases. * Release means a client is done with the leases.
*/ */

6
dhcp.spec
View File

@ -13,7 +13,7 @@
Summary: Dynamic host configuration protocol software Summary: Dynamic host configuration protocol software
Name: dhcp Name: dhcp
Version: %{basever} Version: %{basever}
Release: 13%{?dist} Release: 14%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and # dcantrell maintaining the package) made incorrect use of the epoch and
# that's why it is at 12 now. It should have never been used, but it was. # that's why it is at 12 now. It should have never been used, but it was.
@ -495,6 +495,10 @@ fi
%attr(0644,root,root) %{_mandir}/man3/omapi.3.gz %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
%changelog %changelog
* Fri Mar 19 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.1-14
- Fix UseMulticast.patch to not repeatedly parse dhcpd.conf for unicast option
- Fix dhclient-script to set interface MTU only when it's greater than 576 (#574629)
* Fri Mar 12 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.1-13 * Fri Mar 12 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.1-13
- Discard unicast Request/Renew/Release/Decline message - Discard unicast Request/Renew/Release/Decline message
(unless we set unicast option) and respond with Reply (unless we set unicast option) and respond with Reply