From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 5 Mar 2013 19:34:10 +0000 (-0500)
Subject: Remove unused argument from dhcp_encode()
X-Git-Tag: release_3_0_0_beta1~845
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdd38861629ffbd727dc8debffe9ed7c9e5c6904;p=thirdparty%2Ffreeradius-server.git

Remove unused argument from dhcp_encode()
---

diff --git a/src/include/dhcp.h b/src/include/dhcp.h
index 66ccece2b80..605a367397e 100644
--- a/src/include/dhcp.h
+++ b/src/include/dhcp.h
@@ -40,7 +40,7 @@ int fr_dhcp_send(RADIUS_PACKET *packet);
 
 int fr_dhcp_add_arp_entry(int fd, const char *interface, VALUE_PAIR *hwvp, VALUE_PAIR *clvp);
 
-int fr_dhcp_encode(RADIUS_PACKET *packet, RADIUS_PACKET *original);
+int fr_dhcp_encode(RADIUS_PACKET *packet);
 ssize_t fr_dhcp_decode_options(uint8_t *data, size_t len, VALUE_PAIR **head);
 int fr_dhcp_decode(RADIUS_PACKET *packet);
 
diff --git a/src/lib/dhcp.c b/src/lib/dhcp.c
index ee87540a384..e4bf140e94d 100644
--- a/src/lib/dhcp.c
+++ b/src/lib/dhcp.c
@@ -1022,7 +1022,7 @@ static VALUE_PAIR *fr_dhcp_vp2suboption(VALUE_PAIR *vps)
 }
 
 
-int fr_dhcp_encode(RADIUS_PACKET *packet, RADIUS_PACKET *original)
+int fr_dhcp_encode(RADIUS_PACKET *packet)
 {
 	unsigned int i, num_vps;
 	uint8_t *p;
@@ -1500,17 +1500,6 @@ int fr_dhcp_encode(RADIUS_PACKET *packet, RADIUS_PACKET *original)
 	 */
 	packet->data_len = dhcp_size;
 
-	if (original) {
-		/*
-		 *	FIXME: This may set it to broadcast, which we don't
-		 *	want.  Instead, set it to the real address of the
-		 *	socket.
-		 */
-		packet->src_ipaddr = original->dst_ipaddr;
-	
-		packet->sockfd = original->sockfd;
-	}
-
 	if (packet->data_len < DEFAULT_PACKET_SIZE) {
 		memset(packet->data + packet->data_len, 0,
 		       DEFAULT_PACKET_SIZE - packet->data_len);
diff --git a/src/main/dhclient.c b/src/main/dhclient.c
index 23bc863e7b3..f7f154a4e2b 100644
--- a/src/main/dhclient.c
+++ b/src/main/dhclient.c
@@ -416,7 +416,7 @@ int main(int argc, char **argv)
 	/*
 	 *	Encode the packet
 	 */
-	if (fr_dhcp_encode(request, NULL) < 0) {
+	if (fr_dhcp_encode(request) < 0) {
 		fprintf(stderr, "dhclient: failed encoding: %s\n",
 			fr_strerror());
 		exit(1);
diff --git a/src/main/dhcpd.c b/src/main/dhcpd.c
index 5d141e10874..e8d3e469b0c 100644
--- a/src/main/dhcpd.c
+++ b/src/main/dhcpd.c
@@ -127,7 +127,7 @@ static int dhcprelay_process_client_request(REQUEST *request)
 	request->packet->dst_ipaddr.ipaddr.ip4addr.s_addr = vp->vp_ipaddr;
 	request->packet->dst_port = request->packet->dst_port;
 
-	if (fr_dhcp_encode(request->packet, NULL) < 0) {
+	if (fr_dhcp_encode(request->packet) < 0) {
 		DEBUG("dhcprelay_process_client_request: ERROR in fr_dhcp_encode\n");
 		return -1;
 	}
@@ -225,7 +225,7 @@ static int dhcprelay_process_server_reply(REQUEST *request)
 		}
 	}
 
-	if (fr_dhcp_encode(request->packet, NULL) < 0) {
+	if (fr_dhcp_encode(request->packet) < 0) {
 		DEBUG("dhcprelay_process_server_reply: ERROR in fr_dhcp_encode\n");
 		return -1;
 	}
@@ -522,11 +522,11 @@ static int dhcp_socket_send(rad_listen_t *listener, REQUEST *request)
 	if (request->reply->code == 0) return 0; /* don't reply */
 
 	if (request->packet->code != request->reply->code) {
-		if (fr_dhcp_encode(request->reply, request->packet) < 0) {
+		if (fr_dhcp_encode(request->reply) < 0) {
 			return -1;
 		}
 	} else {
-		if (fr_dhcp_encode(request->reply, NULL) < 0) {
+		if (fr_dhcp_encode(request->reply) < 0) {
 			return -1;
 		}
 	}