From: Nicolas C <nchaigne@capgemini.fr>
Date: Fri, 26 Sep 2014 08:57:47 +0000 (+0200)
Subject: Set source IP address in PktFilterInet::send
X-Git-Tag: rt3470_base~3^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ac36ed7a1d97bcf52ffb2aec7cbf116e58e5803;p=thirdparty%2Fkea.git

Set source IP address in PktFilterInet::send

Perfdhcp can be used with option -l to specify the local address to be
used.

However, when this option is used on a secondary address of an
interface, this doesn't work correctly.

The packets are sent with:
- giaddr = adresse specified (correct)
- source ip address = the interface primary IP address

Here is a patch that correctly sets the source IP address before sending
the packet.
This allows to launch multiple perfdhcp processes at the same time,
sharing the same interface but each using a distinct IP address.
---

diff --git a/src/lib/dhcp/pkt_filter_inet.cc b/src/lib/dhcp/pkt_filter_inet.cc
index 813eabc93a..391aa13777 100644
--- a/src/lib/dhcp/pkt_filter_inet.cc
+++ b/src/lib/dhcp/pkt_filter_inet.cc
@@ -226,9 +226,8 @@ PktFilterInet::send(const Iface&, uint16_t sockfd,
     // Setting the interface is a bit more involved.
     //
     // We have to create a "control message", and set that to
-    // define the IPv4 packet information. We could set the
-    // source address if we wanted, but we can safely let the
-    // kernel decide what that should be.
+    // define the IPv4 packet information. We set the source address
+    // to handle correctly interfaces with multiple addresses.
     m.msg_control = &control_buf_[0];
     m.msg_controllen = control_buf_len_;
     struct cmsghdr* cmsg = CMSG_FIRSTHDR(&m);
@@ -238,6 +237,7 @@ PktFilterInet::send(const Iface&, uint16_t sockfd,
     struct in_pktinfo* pktinfo =(struct in_pktinfo *)CMSG_DATA(cmsg);
     memset(pktinfo, 0, sizeof(struct in_pktinfo));
     pktinfo->ipi_ifindex = pkt->getIndex();
+	pktinfo->ipi_spec_dst.s_addr = htonl(pkt->getLocalAddr()); // set the source IP address
     m.msg_controllen = CMSG_SPACE(sizeof(struct in_pktinfo));
 #endif