For complete changelog, please read the RELNOTES file shipped
along with this package or online at:
- Replaced hostname patch with a dhcpv6 and fqdn aware variant:
[- 0006-dhcp-4.2.5-dhclient-send-hostname-rml.patch,
+ 0006-dhcp-4.3.2-dhclient-send-hostname-or-fqdn.patch]
- Adjusted patch numbers in the spec file:
[- 0008-dhcp-4.1.1-P1-lpf-bind-msg-fix.patch,
- 0010-dhcp-4.2.2-dhclient-option-checks.patch,
- 0011-dhcp-4.2.6-close-on-exec.patch,
- 0012-dhcp-4.2.2-quiet-dhclient.patch,
- 0014-Fixed-linux-interface-discovery-using-getifaddrs.patch,
- 0020-dhcp-4.2.x-chown-server-leases.bnc868253.patch,
- 0024-dhcp-4.2.x-dhcpv6-decline-on-DAD-failure.872609.patch,
+ 0008-dhcp-4.2.2-dhclient-option-checks.patch,
+ 0009-dhcp-4.2.6-close-on-exec.patch,
+ 0010-dhcp-4.2.2-quiet-dhclient.patch,
+ 0011-Fixed-linux-interface-discovery-using-getifaddrs.patch,
+ 0012-dhcp-4.2.x-chown-server-leases.bnc868253.patch,
+ 0013-dhcp-4.2.x-dhcpv6-decline-on-DAD-failure.872609.patch]
- Fixed to not pass DHCPv6 address lifetimes a positive (unsigned
32bit) integers to scripts and properly format timestamps as long
to not break them on 64bit architectures (bsc#926159).
[+ 0014-dhclient6-unsigned-lifetimes-for-script-bsc-926159.patch]
- dhclient: expose next-server DHCPv4 option to script (bsc#928390)
[+ 0015-Expose-next-server-DHCPv4-option-to-dhclient-script.patch]
- Replaced infiniband support patch with fixed variant (bsc#910984):
[- 0017-dhcp-4.2.6-lpf-ip-over-ib-support.patch,
- 0018-dhcp-4.2.6-improved-xid.patch,
+ 0016-infiniband-support.patch]
- Moved dhcp-devel package include files and static libraries
OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=154
2015-09-14 17:35:16 +02:00
|
|
|
From ce15607bca2509bc2abd440000d25498ad589e27 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Marius Tomaschewski <mt@suse.de>
|
|
|
|
|
Date: Mon, 14 Sep 2015 15:31:37 +0200
|
|
|
|
|
Subject: [PATCH] server: no success report before send (bsc#919959)
|
|
|
|
|
References: bsc#919959
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/server/dhcp.c b/server/dhcp.c
|
2017-07-06 17:49:46 +02:00
|
|
|
index effa9b1..18297a6 100644
|
For complete changelog, please read the RELNOTES file shipped
along with this package or online at:
- Replaced hostname patch with a dhcpv6 and fqdn aware variant:
[- 0006-dhcp-4.2.5-dhclient-send-hostname-rml.patch,
+ 0006-dhcp-4.3.2-dhclient-send-hostname-or-fqdn.patch]
- Adjusted patch numbers in the spec file:
[- 0008-dhcp-4.1.1-P1-lpf-bind-msg-fix.patch,
- 0010-dhcp-4.2.2-dhclient-option-checks.patch,
- 0011-dhcp-4.2.6-close-on-exec.patch,
- 0012-dhcp-4.2.2-quiet-dhclient.patch,
- 0014-Fixed-linux-interface-discovery-using-getifaddrs.patch,
- 0020-dhcp-4.2.x-chown-server-leases.bnc868253.patch,
- 0024-dhcp-4.2.x-dhcpv6-decline-on-DAD-failure.872609.patch,
+ 0008-dhcp-4.2.2-dhclient-option-checks.patch,
+ 0009-dhcp-4.2.6-close-on-exec.patch,
+ 0010-dhcp-4.2.2-quiet-dhclient.patch,
+ 0011-Fixed-linux-interface-discovery-using-getifaddrs.patch,
+ 0012-dhcp-4.2.x-chown-server-leases.bnc868253.patch,
+ 0013-dhcp-4.2.x-dhcpv6-decline-on-DAD-failure.872609.patch]
- Fixed to not pass DHCPv6 address lifetimes a positive (unsigned
32bit) integers to scripts and properly format timestamps as long
to not break them on 64bit architectures (bsc#926159).
[+ 0014-dhclient6-unsigned-lifetimes-for-script-bsc-926159.patch]
- dhclient: expose next-server DHCPv4 option to script (bsc#928390)
[+ 0015-Expose-next-server-DHCPv4-option-to-dhclient-script.patch]
- Replaced infiniband support patch with fixed variant (bsc#910984):
[- 0017-dhcp-4.2.6-lpf-ip-over-ib-support.patch,
- 0018-dhcp-4.2.6-improved-xid.patch,
+ 0016-infiniband-support.patch]
- Moved dhcp-devel package include files and static libraries
OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=154
2015-09-14 17:35:16 +02:00
|
|
|
--- a/server/dhcp.c
|
|
|
|
|
+++ b/server/dhcp.c
|
2017-07-06 17:49:46 +02:00
|
|
|
@@ -3859,22 +3859,6 @@ void dhcp_reply (lease)
|
|
|
|
|
}
|
|
|
|
|
#endif
|
For complete changelog, please read the RELNOTES file shipped
along with this package or online at:
- Replaced hostname patch with a dhcpv6 and fqdn aware variant:
[- 0006-dhcp-4.2.5-dhclient-send-hostname-rml.patch,
+ 0006-dhcp-4.3.2-dhclient-send-hostname-or-fqdn.patch]
- Adjusted patch numbers in the spec file:
[- 0008-dhcp-4.1.1-P1-lpf-bind-msg-fix.patch,
- 0010-dhcp-4.2.2-dhclient-option-checks.patch,
- 0011-dhcp-4.2.6-close-on-exec.patch,
- 0012-dhcp-4.2.2-quiet-dhclient.patch,
- 0014-Fixed-linux-interface-discovery-using-getifaddrs.patch,
- 0020-dhcp-4.2.x-chown-server-leases.bnc868253.patch,
- 0024-dhcp-4.2.x-dhcpv6-decline-on-DAD-failure.872609.patch,
+ 0008-dhcp-4.2.2-dhclient-option-checks.patch,
+ 0009-dhcp-4.2.6-close-on-exec.patch,
+ 0010-dhcp-4.2.2-quiet-dhclient.patch,
+ 0011-Fixed-linux-interface-discovery-using-getifaddrs.patch,
+ 0012-dhcp-4.2.x-chown-server-leases.bnc868253.patch,
+ 0013-dhcp-4.2.x-dhcpv6-decline-on-DAD-failure.872609.patch]
- Fixed to not pass DHCPv6 address lifetimes a positive (unsigned
32bit) integers to scripts and properly format timestamps as long
to not break them on 64bit architectures (bsc#926159).
[+ 0014-dhclient6-unsigned-lifetimes-for-script-bsc-926159.patch]
- dhclient: expose next-server DHCPv4 option to script (bsc#928390)
[+ 0015-Expose-next-server-DHCPv4-option-to-dhclient-script.patch]
- Replaced infiniband support patch with fixed variant (bsc#910984):
[- 0017-dhcp-4.2.6-lpf-ip-over-ib-support.patch,
- 0018-dhcp-4.2.6-improved-xid.patch,
+ 0016-infiniband-support.patch]
- Moved dhcp-devel package include files and static libraries
OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=154
2015-09-14 17:35:16 +02:00
|
|
|
|
|
|
|
|
- /* Say what we're doing... */
|
|
|
|
|
- log_info ("%s on %s to %s %s%s%svia %s",
|
|
|
|
|
- (state -> offer
|
|
|
|
|
- ? (state -> offer == DHCPACK ? "DHCPACK" : "DHCPOFFER")
|
|
|
|
|
- : "BOOTREPLY"),
|
|
|
|
|
- piaddr (lease -> ip_addr),
|
|
|
|
|
- (lease -> hardware_addr.hlen
|
|
|
|
|
- ? print_hw_addr (lease -> hardware_addr.hbuf [0],
|
|
|
|
|
- lease -> hardware_addr.hlen - 1,
|
|
|
|
|
- &lease -> hardware_addr.hbuf [1])
|
|
|
|
|
- : print_hex_1(lease->uid_len, lease->uid, 60)),
|
|
|
|
|
- s ? "(" : "", s ? s : "", s ? ") " : "",
|
|
|
|
|
- (state -> giaddr.s_addr
|
|
|
|
|
- ? inet_ntoa (state -> giaddr)
|
|
|
|
|
- : state -> ip -> name));
|
|
|
|
|
-
|
2017-07-06 17:49:46 +02:00
|
|
|
#ifdef DEBUG_PACKET
|
|
|
|
|
dump_raw ((unsigned char *)&raw, packet_length);
|
|
|
|
|
#endif
|
|
|
|
|
@@ -3906,12 +3890,13 @@ void dhcp_reply (lease)
|
For complete changelog, please read the RELNOTES file shipped
along with this package or online at:
- Replaced hostname patch with a dhcpv6 and fqdn aware variant:
[- 0006-dhcp-4.2.5-dhclient-send-hostname-rml.patch,
+ 0006-dhcp-4.3.2-dhclient-send-hostname-or-fqdn.patch]
- Adjusted patch numbers in the spec file:
[- 0008-dhcp-4.1.1-P1-lpf-bind-msg-fix.patch,
- 0010-dhcp-4.2.2-dhclient-option-checks.patch,
- 0011-dhcp-4.2.6-close-on-exec.patch,
- 0012-dhcp-4.2.2-quiet-dhclient.patch,
- 0014-Fixed-linux-interface-discovery-using-getifaddrs.patch,
- 0020-dhcp-4.2.x-chown-server-leases.bnc868253.patch,
- 0024-dhcp-4.2.x-dhcpv6-decline-on-DAD-failure.872609.patch,
+ 0008-dhcp-4.2.2-dhclient-option-checks.patch,
+ 0009-dhcp-4.2.6-close-on-exec.patch,
+ 0010-dhcp-4.2.2-quiet-dhclient.patch,
+ 0011-Fixed-linux-interface-discovery-using-getifaddrs.patch,
+ 0012-dhcp-4.2.x-chown-server-leases.bnc868253.patch,
+ 0013-dhcp-4.2.x-dhcpv6-decline-on-DAD-failure.872609.patch]
- Fixed to not pass DHCPv6 address lifetimes a positive (unsigned
32bit) integers to scripts and properly format timestamps as long
to not break them on 64bit architectures (bsc#926159).
[+ 0014-dhclient6-unsigned-lifetimes-for-script-bsc-926159.patch]
- dhclient: expose next-server DHCPv4 option to script (bsc#928390)
[+ 0015-Expose-next-server-DHCPv4-option-to-dhclient-script.patch]
- Replaced infiniband support patch with fixed variant (bsc#910984):
[- 0017-dhcp-4.2.6-lpf-ip-over-ib-support.patch,
- 0018-dhcp-4.2.6-improved-xid.patch,
+ 0016-infiniband-support.patch]
- Moved dhcp-devel package include files and static libraries
OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=154
2015-09-14 17:35:16 +02:00
|
|
|
"packet over %s interface.", MDL,
|
|
|
|
|
packet_length,
|
|
|
|
|
fallback_interface->name);
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
+ free_lease_state (state, MDL);
|
|
|
|
|
+ lease -> state = (struct lease_state *)0;
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
- free_lease_state (state, MDL);
|
|
|
|
|
- lease -> state = (struct lease_state *)0;
|
|
|
|
|
- return;
|
|
|
|
|
+ goto report;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If the client is RENEWING, unicast to the client using the
|
2017-07-06 17:49:46 +02:00
|
|
|
@@ -3944,11 +3929,13 @@ void dhcp_reply (lease)
|
For complete changelog, please read the RELNOTES file shipped
along with this package or online at:
- Replaced hostname patch with a dhcpv6 and fqdn aware variant:
[- 0006-dhcp-4.2.5-dhclient-send-hostname-rml.patch,
+ 0006-dhcp-4.3.2-dhclient-send-hostname-or-fqdn.patch]
- Adjusted patch numbers in the spec file:
[- 0008-dhcp-4.1.1-P1-lpf-bind-msg-fix.patch,
- 0010-dhcp-4.2.2-dhclient-option-checks.patch,
- 0011-dhcp-4.2.6-close-on-exec.patch,
- 0012-dhcp-4.2.2-quiet-dhclient.patch,
- 0014-Fixed-linux-interface-discovery-using-getifaddrs.patch,
- 0020-dhcp-4.2.x-chown-server-leases.bnc868253.patch,
- 0024-dhcp-4.2.x-dhcpv6-decline-on-DAD-failure.872609.patch,
+ 0008-dhcp-4.2.2-dhclient-option-checks.patch,
+ 0009-dhcp-4.2.6-close-on-exec.patch,
+ 0010-dhcp-4.2.2-quiet-dhclient.patch,
+ 0011-Fixed-linux-interface-discovery-using-getifaddrs.patch,
+ 0012-dhcp-4.2.x-chown-server-leases.bnc868253.patch,
+ 0013-dhcp-4.2.x-dhcpv6-decline-on-DAD-failure.872609.patch]
- Fixed to not pass DHCPv6 address lifetimes a positive (unsigned
32bit) integers to scripts and properly format timestamps as long
to not break them on 64bit architectures (bsc#926159).
[+ 0014-dhclient6-unsigned-lifetimes-for-script-bsc-926159.patch]
- dhclient: expose next-server DHCPv4 option to script (bsc#928390)
[+ 0015-Expose-next-server-DHCPv4-option-to-dhclient-script.patch]
- Replaced infiniband support patch with fixed variant (bsc#910984):
[- 0017-dhcp-4.2.6-lpf-ip-over-ib-support.patch,
- 0018-dhcp-4.2.6-improved-xid.patch,
+ 0016-infiniband-support.patch]
- Moved dhcp-devel package include files and static libraries
OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=154
2015-09-14 17:35:16 +02:00
|
|
|
" packet over %s interface.", MDL,
|
|
|
|
|
packet_length,
|
|
|
|
|
fallback_interface->name);
|
|
|
|
|
+
|
|
|
|
|
+ free_lease_state (state, MDL);
|
|
|
|
|
+ lease -> state = (struct lease_state *)0;
|
|
|
|
|
+ return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- free_lease_state (state, MDL);
|
|
|
|
|
- lease -> state = (struct lease_state *)0;
|
|
|
|
|
- return;
|
|
|
|
|
+ goto report;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If it comes from a client that already knows its address
|
2017-07-06 17:49:46 +02:00
|
|
|
@@ -3976,8 +3963,28 @@ void dhcp_reply (lease)
|
For complete changelog, please read the RELNOTES file shipped
along with this package or online at:
- Replaced hostname patch with a dhcpv6 and fqdn aware variant:
[- 0006-dhcp-4.2.5-dhclient-send-hostname-rml.patch,
+ 0006-dhcp-4.3.2-dhclient-send-hostname-or-fqdn.patch]
- Adjusted patch numbers in the spec file:
[- 0008-dhcp-4.1.1-P1-lpf-bind-msg-fix.patch,
- 0010-dhcp-4.2.2-dhclient-option-checks.patch,
- 0011-dhcp-4.2.6-close-on-exec.patch,
- 0012-dhcp-4.2.2-quiet-dhclient.patch,
- 0014-Fixed-linux-interface-discovery-using-getifaddrs.patch,
- 0020-dhcp-4.2.x-chown-server-leases.bnc868253.patch,
- 0024-dhcp-4.2.x-dhcpv6-decline-on-DAD-failure.872609.patch,
+ 0008-dhcp-4.2.2-dhclient-option-checks.patch,
+ 0009-dhcp-4.2.6-close-on-exec.patch,
+ 0010-dhcp-4.2.2-quiet-dhclient.patch,
+ 0011-Fixed-linux-interface-discovery-using-getifaddrs.patch,
+ 0012-dhcp-4.2.x-chown-server-leases.bnc868253.patch,
+ 0013-dhcp-4.2.x-dhcpv6-decline-on-DAD-failure.872609.patch]
- Fixed to not pass DHCPv6 address lifetimes a positive (unsigned
32bit) integers to scripts and properly format timestamps as long
to not break them on 64bit architectures (bsc#926159).
[+ 0014-dhclient6-unsigned-lifetimes-for-script-bsc-926159.patch]
- dhclient: expose next-server DHCPv4 option to script (bsc#928390)
[+ 0015-Expose-next-server-DHCPv4-option-to-dhclient-script.patch]
- Replaced infiniband support patch with fixed variant (bsc#910984):
[- 0017-dhcp-4.2.6-lpf-ip-over-ib-support.patch,
- 0018-dhcp-4.2.6-improved-xid.patch,
+ 0016-infiniband-support.patch]
- Moved dhcp-devel package include files and static libraries
OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=154
2015-09-14 17:35:16 +02:00
|
|
|
log_error ("%s:%d: Failed to send %d byte long "
|
|
|
|
|
"packet over %s interface.", MDL,
|
|
|
|
|
packet_length, state->ip->name);
|
|
|
|
|
+
|
|
|
|
|
+ free_lease_state (state, MDL);
|
|
|
|
|
+ lease -> state = (struct lease_state *)0;
|
|
|
|
|
+ return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+report:
|
|
|
|
|
+ /* Say what we're doing... */
|
|
|
|
|
+ log_info ("%s on %s to %s %s%s%svia %s",
|
|
|
|
|
+ (state -> offer
|
|
|
|
|
+ ? (state -> offer == DHCPACK ? "DHCPACK" : "DHCPOFFER")
|
|
|
|
|
+ : "BOOTREPLY"),
|
|
|
|
|
+ piaddr (lease -> ip_addr),
|
|
|
|
|
+ (lease -> hardware_addr.hlen
|
|
|
|
|
+ ? print_hw_addr (lease -> hardware_addr.hbuf [0],
|
|
|
|
|
+ lease -> hardware_addr.hlen - 1,
|
|
|
|
|
+ &lease -> hardware_addr.hbuf [1])
|
|
|
|
|
+ : print_hex_1(lease->uid_len, lease->uid, 60)),
|
|
|
|
|
+ s ? "(" : "", s ? s : "", s ? ") " : "",
|
|
|
|
|
+ (state -> giaddr.s_addr
|
|
|
|
|
+ ? inet_ntoa (state -> giaddr)
|
|
|
|
|
+ : state -> ip -> name));
|
|
|
|
|
|
|
|
|
|
/* Free all of the entries in the option_state structure
|
|
|
|
|
now that we're done with them. */
|
