External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-26 15:45:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

nwfilter: Also pick IP address from a DHCP ACK message

Browse Source 
The local DHCP server on virtbr0 sends DHCP ACK messages when a VM is
started and requests an IP address while the initial DHCP lease on the
VM's MAC address hasn't expired. So, also pick the IP address of the VM
if that type of message is seen.
Thanks to Gerhard Stenzel for providing a test case for this.

Changes from V1 to V2:
- cleanup: replacing DHCP option numbers through constants
This commit is contained in:
Stefan Berger 2010-04-30 07:51:47 -04:00
parent c179a0f63c
commit 7c66c033a9
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/nwfilter/nwfilter_learnipaddr.c
View File

@ -98,6 +98,11 @@ struct dhcp {
} ATTRIBUTE_PACKED; } ATTRIBUTE_PACKED;
#define DHCP_MSGT_DHCPOFFER 2 #define DHCP_MSGT_DHCPOFFER 2
#define DHCP_MSGT_DHCPACK 5
#define DHCP_OPT_BCASTADDRESS 28
#define DHCP_OPT_MESSAGETYPE 53
struct ether_vlan_header struct ether_vlan_header
{ {
@ -336,17 +341,18 @@ procDHCPOpts(struct dhcp *dhcp, int dhcp_opts_len,
switch (dhcpopt->code) { switch (dhcpopt->code) {
case 28: /* Broadcast address */ case DHCP_OPT_BCASTADDRESS: /* Broadcast address */
if (dhcp_opts_len >= 6) { if (dhcp_opts_len >= 6) {
uint32_t *tmp = (uint32_t *)&dhcpopt->value; uint32_t *tmp = (uint32_t *)&dhcpopt->value;
(*bcastaddr) = ntohl(*tmp); (*bcastaddr) = ntohl(*tmp);
} }
break; break;
case 53: /* Message type */ case DHCP_OPT_MESSAGETYPE: /* Message type */
if (dhcp_opts_len >= 3) { if (dhcp_opts_len >= 3) {
uint8_t *val = (uint8_t *)&dhcpopt->value; uint8_t *val = (uint8_t *)&dhcpopt->value;
switch (*val) { switch (*val) {
case DHCP_MSGT_DHCPACK:
case DHCP_MSGT_DHCPOFFER: case DHCP_MSGT_DHCPOFFER:
*vmaddr = dhcp->yiaddr; *vmaddr = dhcp->yiaddr;
*howDetected = DETECT_DHCP; *howDetected = DETECT_DHCP;