coydog/zmap-freebsd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

friendlier error messages for vpn-users in get-gateway

Browse Source
This commit is contained in:
Eric 2013-08-31 16:16:49 -04:00
parent 5ff9684bf9
commit fc6ef16b8f
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/get_gateway.c
View File

@ -121,21 +121,33 @@ int get_hw_addr(struct in_addr *gw_ip, char *iface, unsigned char *hw_mac)
int correct_ip = 0; int correct_ip = 0;
rt_msg = (struct rtmsg *) NLMSG_DATA(nlhdr); rt_msg = (struct rtmsg *) NLMSG_DATA(nlhdr);
if ((rt_msg->rtm_family != AF_INET)) { if ((rt_msg->rtm_family != AF_INET)) {
return -1; return -1;
} }
rt_attr = (struct rtattr *) RTM_RTA(rt_msg); rt_attr = (struct rtattr *) RTM_RTA(rt_msg);
rt_len = RTM_PAYLOAD(nlhdr); rt_len = RTM_PAYLOAD(nlhdr);
while (RTA_OK(rt_attr, rt_len)) { while (RTA_OK(rt_attr, rt_len)) {
switch (rt_attr->rta_type) { switch (rt_attr->rta_type) {
case NDA_LLADDR: case NDA_LLADDR:
assert(RTA_PAYLOAD(rt_attr) == IFHWADDRLEN); if (RTA_PAYLOAD(rt_attr) != IFHWADDRLEN) {
// could be using a VPN
log_fatal("get_gateway", "Unexpected hardware address length (%d).\n\n" \
" If you are using a VPN, supply the --vpn flag (and provide an interface via -i)",
RTA_PAYLOAD(rt_attr));
exit(1);
}
memcpy(mac, RTA_DATA(rt_attr), IFHWADDRLEN); memcpy(mac, RTA_DATA(rt_attr), IFHWADDRLEN);
break; break;
case NDA_DST: case NDA_DST:
assert(RTA_PAYLOAD(rt_attr) == sizeof(dst_ip)); if (RTA_PAYLOAD(rt_attr) != sizeof(dst_ip)) {
// could be using a VPN
log_fatal("get_gateway", "Unexpected IP address length (%d).\n" \
" If you are using a VPN, supply the --vpn flag (and provide an interface via -i)",
RTA_PAYLOAD(rt_attr));
exit(1);
}
memcpy(&dst_ip, RTA_DATA(rt_attr), sizeof(dst_ip)); memcpy(&dst_ip, RTA_DATA(rt_attr), sizeof(dst_ip));
if (memcmp(&dst_ip, gw_ip, sizeof(dst_ip)) == 0) { if (memcmp(&dst_ip, gw_ip, sizeof(dst_ip)) == 0) {
correct_ip = 1; correct_ip = 1;