Added 'interface_ipaddr' configuration parameter to help freeradius send the DHCP...

diff --git a/raddb/sites-available/dhcp b/raddb/sites-available/dhcp
index 54dfdc90a8a968f83fe8fe1828bde591cb8d168a..2a6b64cc37cc5fe0216ba9d2ced637d30d47db91 100644 (file)
--- a/raddb/sites-available/dhcp
+++ b/raddb/sites-available/dhcp
@@ -128,6 +128,7 @@ server dhcp {
                ipaddr = 255.255.255.255
                port = ${..port}
                interface = ${..interface}
+                interface_ipaddr = ${..ipaddr}
        }
 
        #  Listen for unicasts on an IP, but not bound to any interface.

diff --git a/src/main/dhcpd.c b/src/main/dhcpd.c
index 9042712aab3f678711cd74b92b8473e95d9ba419..821a571b93b35d723a3d179eaf37d1dc3dddf370 100644 (file)
--- a/src/main/dhcpd.c
+++ b/src/main/dhcpd.c
@@ -64,6 +64,7 @@ typedef struct dhcp_socket_t {
        int             suppress_responses;
        RADCLIENT       dhcp_client;
        const char      *arp_interface;
+        fr_ipaddr_t     interface_ipaddr;
 } dhcp_socket_t;
 
 static int dhcprelay_process_client_request(REQUEST *request)
@@ -216,8 +217,6 @@ static int dhcprelay_process_server_reply(REQUEST *request)
                                            "no Client Hardware Address. Discarding packet");
                                        return 1;
                                }
-                               if (sock->arp_interface == NULL)
-                                       sock->arp_interface = sock->interface;
                                if (fr_dhcp_add_arp_entry(request->packet->sockfd, sock->arp_interface, hwvp, vp) < 0) {
                                        return -1;
                                }
@@ -373,8 +372,7 @@ static int dhcp_process(REQUEST *request)
         */
        request->reply->dst_ipaddr.af = AF_INET;
        request->reply->src_ipaddr.af = AF_INET;
-       /* XXX sock->ipaddr == 0 (listening on '*') */
-       request->reply->src_ipaddr.ipaddr.ip4addr.s_addr = sock->ipaddr.ipaddr.ip4addr.s_addr;
+       request->reply->src_ipaddr.ipaddr.ip4addr.s_addr = sock->interface_ipaddr.ipaddr.ip4addr.s_addr;
 
        request->reply->dst_port = request->packet->src_port;
        request->reply->src_port = request->packet->dst_port;
@@ -422,8 +420,6 @@ static int dhcp_process(REQUEST *request)
                        if (request->reply->code == PW_DHCP_OFFER) {
                                VALUE_PAIR *hwvp = pairfind(request->reply->vps, DHCP2ATTR(267)); /* DHCP-Client-Hardware-Address */
                                rad_assert(hwvp != NULL);
-                               if (sock->arp_interface == NULL)
-                                       sock->arp_interface = sock->interface;
                                if (fr_dhcp_add_arp_entry(request->reply->sockfd, sock->arp_interface, hwvp, vp) < 0) {
                                        return -1;
                                }
@@ -495,6 +491,21 @@ static int dhcp_socket_parse(CONF_SECTION *cs, rad_listen_t *this)
                const char *value;
                value = cf_pair_value(cp);
                sock->arp_interface = value;
+       } else {
+                sock->arp_interface = sock->interface;
+        }
+
+       cp = cf_pair_find(cs, "interface_ipaddr");
+       if (cp) {
+               memset(&sock->interface_ipaddr, 0, sizeof(sock->interface_ipaddr));
+               sock->interface_ipaddr.ipaddr.ip4addr.s_addr = htonl(INADDR_NONE);
+               rcode = cf_item_parse(cs, "interface_ipaddr", PW_TYPE_IPADDR,
+                                       &sock->interface_ipaddr.ipaddr.ip4addr, NULL);
+               if (rcode < 0) return -1;
+
+               sock->interface_ipaddr.af = AF_INET;
+       } else {
+               memcpy(&sock->interface_ipaddr, &sock->ipaddr, sizeof(sock->interface_ipaddr));
        }
 
        /*