emo/ndhc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Send an ARP announcement after getting a new lease.

Browse Source
This commit is contained in:
Nicholas J. Kain 2011-07-02 05:48:24 -04:00
parent d304fb6b38
commit 9224374d98
1 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ndhc/arp.c
View File

@ -135,7 +135,6 @@ static int arpping(struct client_state_t *cs, uint32_t test_ip)
.plen = 4, .plen = 4,
.operation = htons(ARPOP_REQUEST), .operation = htons(ARPOP_REQUEST),
}; };
memset(arp.h_dest, 0xff, 6);
memcpy(arp.h_source, client_config.arp, 6); memcpy(arp.h_source, client_config.arp, 6);
memcpy(arp.smac, client_config.arp, 6); memcpy(arp.smac, client_config.arp, 6);
memcpy(arp.dip4, &test_ip, sizeof test_ip); memcpy(arp.dip4, &test_ip, sizeof test_ip);
@ -157,6 +156,40 @@ static int arpping(struct client_state_t *cs, uint32_t test_ip)
return 0; return 0;
} }
static int arp_announcement(struct client_state_t *cs)
{
if (arp_open_fd(cs) == -1)
return -1;
struct arpMsg arp = {
.h_proto = htons(ETH_P_ARP),
.htype = htons(ARPHRD_ETHER),
.ptype = htons(ETH_P_IP),
.hlen = 6,
.plen = 4,
.operation = htons(ARPOP_REQUEST),
};
memcpy(arp.h_source, client_config.arp, 6);
memcpy(arp.smac, client_config.arp, 6);
memcpy(arp.sip4, &cs->clientAddr, 4);
memcpy(arp.dip4, &cs->clientAddr, 4);
struct sockaddr_ll addr = {
.sll_family = AF_PACKET,
.sll_ifindex = client_config.ifindex,
.sll_halen = 6,
};
memcpy(addr.sll_addr, client_config.arp, 6);
if (safe_sendto(cs->arpFd, (const char *)&arp, sizeof arp,
0, (struct sockaddr *)&addr, sizeof addr) < 0) {
log_error("arp: announcement sendto failed: %s", strerror(errno));
arp_close_fd(cs);
return -1;
}
return 0;
}
static void arpreply_clear() static void arpreply_clear()
{ {
memset(&arpreply, 0, sizeof arpreply); memset(&arpreply, 0, sizeof arpreply);
@ -231,6 +264,7 @@ void arp_gw_failed(struct client_state_t *cs)
void arp_success(struct client_state_t *cs) void arp_success(struct client_state_t *cs)
{ {
arp_announcement(cs);
arp_close_fd(cs); arp_close_fd(cs);
cs->timeout = (cs->renewTime * 1000) - (curms() - cs->leaseStartTime); cs->timeout = (cs->renewTime * 1000) - (curms() - cs->leaseStartTime);
@ -255,6 +289,7 @@ void arp_success(struct client_state_t *cs)
static void arp_gw_success(struct client_state_t *cs) static void arp_gw_success(struct client_state_t *cs)
{ {
log_line("arp: Gateway seems unchanged"); log_line("arp: Gateway seems unchanged");
arp_announcement(cs);
arp_close_fd(cs); arp_close_fd(cs);
cs->timeout = cs->oldTimeout; cs->timeout = cs->oldTimeout;