|
 |
fad460 |
diff -up dhcp-4.2.4b1/server/bootp.c.unicast dhcp-4.2.4b1/server/bootp.c
|
|
|
fad460 |
--- dhcp-4.2.4b1/server/bootp.c.unicast 2012-04-10 23:27:06.000000000 +0200
|
|
|
fad460 |
+++ dhcp-4.2.4b1/server/bootp.c 2012-04-16 17:28:42.095919022 +0200
|
|
|
fad460 |
@@ -59,6 +59,7 @@ void bootp (packet)
|
|
|
fad460 |
char msgbuf [1024];
|
|
|
fad460 |
int ignorep;
|
|
|
fad460 |
int peer_has_leases = 0;
|
|
|
fad460 |
+ int norelay = 0;
|
|
|
fad460 |
|
|
|
fad460 |
if (packet -> raw -> op != BOOTREQUEST)
|
|
|
fad460 |
return;
|
|
|
fad460 |
@@ -74,7 +75,7 @@ void bootp (packet)
|
|
|
fad460 |
? inet_ntoa (packet -> raw -> giaddr)
|
|
|
fad460 |
: packet -> interface -> name);
|
|
|
fad460 |
|
|
|
fad460 |
- if (!locate_network (packet)) {
|
|
|
fad460 |
+ if ((norelay = locate_network (packet)) == 0) {
|
|
|
fad460 |
log_info ("%s: network unknown", msgbuf);
|
|
|
fad460 |
return;
|
|
|
fad460 |
}
|
|
|
fad460 |
@@ -399,6 +400,15 @@ void bootp (packet)
|
|
|
fad460 |
|
|
|
fad460 |
goto out;
|
|
|
fad460 |
}
|
|
|
fad460 |
+ } else if (norelay == 2) {
|
|
|
fad460 |
+ to.sin_addr = raw.ciaddr;
|
|
|
fad460 |
+ to.sin_port = remote_port;
|
|
|
fad460 |
+ if (fallback_interface) {
|
|
|
fad460 |
+ result = send_packet (fallback_interface, NULL, &raw,
|
|
|
fad460 |
+ outgoing.packet_length, from,
|
|
|
fad460 |
+ &to, &hto);
|
|
|
fad460 |
+ goto out;
|
|
|
fad460 |
+ }
|
|
|
fad460 |
|
|
|
fad460 |
/* If it comes from a client that already knows its address
|
|
|
fad460 |
and is not requesting a broadcast response, and we can
|
|
|
fad460 |
diff -up dhcp-4.2.4b1/server/dhcp.c.unicast dhcp-4.2.4b1/server/dhcp.c
|
|
|
fad460 |
--- dhcp-4.2.4b1/server/dhcp.c.unicast 2012-03-09 12:28:12.000000000 +0100
|
|
|
fad460 |
+++ dhcp-4.2.4b1/server/dhcp.c 2012-04-16 17:26:55.067418285 +0200
|
|
|
fad460 |
@@ -4299,6 +4299,7 @@ int locate_network (packet)
|
|
|
fad460 |
struct data_string data;
|
|
|
fad460 |
struct subnet *subnet = (struct subnet *)0;
|
|
|
fad460 |
struct option_cache *oc;
|
|
|
fad460 |
+ int norelay = 0;
|
|
|
fad460 |
|
|
|
fad460 |
/* See if there's a Relay Agent Link Selection Option, or a
|
|
|
fad460 |
* Subnet Selection Option. The Link-Select and Subnet-Select
|
|
|
fad460 |
@@ -4314,12 +4315,24 @@ int locate_network (packet)
|
|
|
fad460 |
from the interface, if there is one. If not, fail. */
|
|
|
fad460 |
if (!oc && !packet -> raw -> giaddr.s_addr) {
|
|
|
fad460 |
if (packet -> interface -> shared_network) {
|
|
|
fad460 |
- shared_network_reference
|
|
|
fad460 |
- (&packet -> shared_network,
|
|
|
fad460 |
- packet -> interface -> shared_network, MDL);
|
|
|
fad460 |
- return 1;
|
|
|
fad460 |
+ struct in_addr any_addr;
|
|
|
fad460 |
+ any_addr.s_addr = INADDR_ANY;
|
|
|
fad460 |
+
|
|
|
fad460 |
+ if (!packet -> packet_type && memcmp(&packet -> raw -> ciaddr, &any_addr, 4)) {
|
|
|
fad460 |
+ struct iaddr cip;
|
|
|
fad460 |
+ memcpy(cip.iabuf, &packet -> raw -> ciaddr, 4);
|
|
|
fad460 |
+ cip.len = 4;
|
|
|
fad460 |
+ if (!find_grouped_subnet(&subnet, packet->interface->shared_network, cip, MDL))
|
|
|
fad460 |
+ norelay = 2;
|
|
|
fad460 |
+ }
|
|
|
fad460 |
+
|
|
|
fad460 |
+ if (!norelay) {
|
|
|
fad460 |
+ shared_network_reference(&packet -> shared_network, packet -> interface -> shared_network, MDL);
|
|
|
fad460 |
+ return 1;
|
|
|
fad460 |
+ }
|
|
|
fad460 |
+ } else {
|
|
|
fad460 |
+ return 0;
|
|
|
fad460 |
}
|
|
|
fad460 |
- return 0;
|
|
|
fad460 |
}
|
|
|
fad460 |
|
|
|
fad460 |
/* If there's an option indicating link connection, and it's valid,
|
|
|
fad460 |
@@ -4342,7 +4355,10 @@ int locate_network (packet)
|
|
|
fad460 |
data_string_forget (&data, MDL);
|
|
|
fad460 |
} else {
|
|
|
fad460 |
ia.len = 4;
|
|
|
fad460 |
- memcpy (ia.iabuf, &packet -> raw -> giaddr, 4);
|
|
|
fad460 |
+ if (norelay)
|
|
|
fad460 |
+ memcpy (ia.iabuf, &packet->raw->ciaddr, 4);
|
|
|
fad460 |
+ else
|
|
|
fad460 |
+ memcpy (ia.iabuf, &packet->raw->giaddr, 4);
|
|
|
fad460 |
}
|
|
|
fad460 |
|
|
|
fad460 |
/* If we know the subnet on which the IP address lives, use it. */
|
|
|
fad460 |
@@ -4350,7 +4366,10 @@ int locate_network (packet)
|
|
|
fad460 |
shared_network_reference (&packet -> shared_network,
|
|
|
fad460 |
subnet -> shared_network, MDL);
|
|
|
fad460 |
subnet_dereference (&subnet, MDL);
|
|
|
fad460 |
- return 1;
|
|
|
fad460 |
+ if (norelay)
|
|
|
fad460 |
+ return norelay;
|
|
|
fad460 |
+ else
|
|
|
fad460 |
+ return 1;
|
|
|
fad460 |
}
|
|
|
fad460 |
|
|
|
fad460 |
/* Otherwise, fail. */
|