diff options
| author | Francis Dupont <fdupont@isc.org> | 2017-12-30 14:15:12 +0100 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2017-12-30 14:15:12 +0100 |
| commit | 27058b3e3b722f89fd1f512c58dbc64b0d203991 (patch) | |
| tree | dc7e788e7a5eb29f554126ac6b393977964c5257 | |
| parent | 563f0b8aef9558a900f215dfccc571eab99a0223 (diff) | |
| download | isc-dhcp-27058b3e3b722f89fd1f512c58dbc64b0d203991.tar.gz | |
Fixed CID 1426986, 1426985, 1426984 and 1426983
| -rw-r--r-- | server/dhcp.c | 18 | ||||
| -rw-r--r-- | server/dhcpleasequery.c | 6 |
2 files changed, 24 insertions, 0 deletions
diff --git a/server/dhcp.c b/server/dhcp.c index a0080e52..f302d6e6 100644 --- a/server/dhcp.c +++ b/server/dhcp.c @@ -1098,7 +1098,9 @@ void dhcpinform (packet, ms_nulltp) struct interface_info *interface; int result, h_m_client_ip = 0; struct host_decl *host = NULL, *hp = NULL, *h; +#if defined(RELAY_PORT) u_int16_t relay_port = 0; +#endif #if defined (DEBUG_INFORM_HOST) int h_w_fixed_addr = 0; #endif @@ -1715,7 +1717,11 @@ void dhcpinform (packet, ms_nulltp) */ if (!raw.ciaddr.s_addr && gip.len) { memcpy(&to.sin_addr, gip.iabuf, 4); +#if defined(RELAY_PORT) to.sin_port = relay_port ? relay_port : local_port; +#else + to.sin_port = local_port; +#endif raw.flags |= htons(BOOTP_BROADCAST); } else { gip.len = 0; @@ -1772,7 +1778,9 @@ void nak_lease (packet, cip, network_group) unsigned char nak = DHCPNAK; struct packet outgoing; unsigned i; +#if defined(RELAY_PORT) u_int16_t relay_port = 0; +#endif struct option_state *options = (struct option_state *)0; struct option_cache *oc = (struct option_cache *)0; struct option_state *eval_options = NULL; @@ -1953,7 +1961,11 @@ void nak_lease (packet, cip, network_group) if (raw.giaddr.s_addr) { to.sin_addr = raw.giaddr; if (raw.giaddr.s_addr != htonl (INADDR_LOOPBACK)) +#if defined(RELAY_PORT) to.sin_port = relay_port ? relay_port : local_port; +#else + to.sin_port = local_port; +#endif else to.sin_port = remote_port; /* for testing. */ @@ -3776,7 +3788,9 @@ void dhcp_reply (lease) int result; struct lease_state *state = lease -> state; int nulltp, bootpp, unicastp = 1; +#if defined(RELAY_PORT) u_int16_t relay_port = 0; +#endif struct data_string d1; const char *s; @@ -3954,7 +3968,11 @@ void dhcp_reply (lease) if (raw.giaddr.s_addr) { to.sin_addr = raw.giaddr; if (raw.giaddr.s_addr != htonl (INADDR_LOOPBACK)) +#if defined(RELAY_PORT) to.sin_port = relay_port ? relay_port : local_port; +#else + to.sin_port = local_port; +#endif else to.sin_port = remote_port; /* For debugging. */ diff --git a/server/dhcpleasequery.c b/server/dhcpleasequery.c index 40de910d..7be07889 100644 --- a/server/dhcpleasequery.c +++ b/server/dhcpleasequery.c @@ -152,7 +152,9 @@ dhcpleasequery(struct packet *packet, int ms_nulltp) { u_int32_t time_rebinding; u_int32_t time_expiry; u_int32_t client_last_transaction_time; +#if defined(RELAY_PORT) u_int16_t relay_port = 0; +#endif struct sockaddr_in to; struct in_addr siaddr; struct data_string prl; @@ -670,7 +672,11 @@ dhcpleasequery(struct packet *packet, int ms_nulltp) { */ to.sin_addr = packet->raw->giaddr; if (packet->raw->giaddr.s_addr != htonl(INADDR_LOOPBACK)) { +#if defined(RELAY_PORT) to.sin_port = relay_port ? relay_port : local_port; +#else + to.sin_port = local_port; +#endif } else { to.sin_port = remote_port; /* XXXSK: For debugging. */ } |