#include <sys/types.h>
#include <stdbool.h>
+#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#if defined(NMRPFLASH_LINUX)
#define NMRPFLASH_AF_PACKET AF_PACKET
#include <linux/if_packet.h>
+#include <netlink/route/addr.h>
+#include <netlink/route/neighbour.h>
#else
#define NMRPFLASH_AF_PACKET AF_LINK
#include <net/if_types.h>
return 0;
}
+#ifndef NMRPFLASH_LINUX
+static int systemf(const char *fmt, ...)
+{
+ char cmd[1024];
+ int ret;
+ va_list va;
+ va_start(va, fmt);
+
+ ret = vsnprintf(cmd, sizeof(cmd) - 1, fmt, va);
+ if (ret >= sizeof(cmd) - 1) {
+ return -1;
+ }
+
+ ret = system(cmd);
+ va_end(va);
+
+ return ret;
+}
+#endif
+
#ifndef NMRPFLASH_WINDOWS
static inline bool sockaddr_get_hwaddr(struct sockaddr *sa, uint8_t *hwaddr)
{
return ret;
}
+
+static struct nl_addr *build_ip(uint32_t ip)
+{
+ struct nl_addr *na = nl_addr_build(AF_INET, &ip, 4);
+ if (!na) {
+ xperror("nl_addr_build");
+ }
+
+ return na;
+}
+
+static struct nl_sock *xnl_socket_route()
+{
+ int err;
+ struct nl_sock *sk = nl_socket_alloc();
+ if (sk) {
+ if (!(err = nl_connect(sk, NETLINK_ROUTE))) {
+ return sk;
+ }
+ nl_socket_free(sk);
+ nl_perror(err, "nl_connect");
+ } else {
+ xperror("nl_socket_alloc");
+ }
+
+ return NULL;
+}
+
+static bool intf_add_del_ip(const char *intf, uint32_t ipaddr, uint32_t ipmask, bool add)
+{
+ struct rtnl_addr *ra = NULL;
+ struct nl_sock *sk = NULL;
+ struct nl_addr *na = NULL;
+ int err = 1;
+
+ if (!(sk = xnl_socket_route())) {
+ return false;
+ }
+
+ if (!(ra = rtnl_addr_alloc())) {
+ xperror("rtnl_addr_alloc");
+ goto out;
+ }
+
+ rtnl_addr_set_ifindex(ra, if_nametoindex(intf));
+
+ if (!(na = build_ip(ipaddr))) {
+ goto out;
+ }
+
+ nl_addr_set_prefixlen(na, bitcount(ipmask));
+ rtnl_addr_set_local(ra, na);
+ nl_addr_put(na);
+
+ if (!(na = build_ip((ipaddr & ipmask) | ~ipmask))) {
+ goto out;
+ }
+
+ rtnl_addr_set_broadcast(ra, na);
+ nl_addr_put(na);
+
+ if ((err = add ? rtnl_addr_add(sk, ra, 0) : rtnl_addr_delete(sk, ra, 0)) < 0) {
+ if (add && err == -NLE_EXIST) {
+ err = 0;
+ } else if (add || verbosity > 1) {
+ nl_perror(err, add ? "rtnl_addr_add" : "rtnl_addr_delete");
+ }
+ }
+
+out:
+ rtnl_addr_put(ra);
+ nl_socket_free(sk);
+
+ return !err;
+}
+
+static bool intf_add_del_arp(const char *intf, uint32_t ipaddr, uint8_t *hwaddr, bool add)
+{
+#if 0
+ struct arpreq arp;
+ memset(&arp, 0, sizeof(arp));
+ arp.arp_ha.sa_family = ARPHRD_ETHER;
+ memcpy(&arp.arp_ha.sa_data, hwaddr, 6);
+ arp.arp_flags = ATF_PERM | ATF_COM;
+
+ struct sockaddr_in *in = (struct sockaddr_in*)&req.arp_pa;
+ in->sin_addr.s_addr = htonl(ipaddr);
+ in->sin_family = AF_INET;
+
+ int fd = socket(AF_INET, SOCK_DGRAM, 0);
+ if (fd < 0) {
+ perror("socket");
+ return false;
+ }
+
+ bool ret = true;
+
+ if (ioctl(fd, add ? SIOCSARP : SIOCDARP, &req) < 0) {
+ perror(add ? "ioctl(SIOCSARP)" : "ioctl(SIOCDARP");
+ ret = false;
+ }
+
+ close(fd);
+ return ret;
+#else
+ struct nl_sock *sk;
+ struct rtnl_neigh *neigh;
+ struct nl_addr *mac, *ip;
+ int err = 1;
+
+ sk = NULL;
+ neigh = NULL;
+ mac = ip = NULL;
+
+ if (!(sk = xnl_socket_route())) {
+ goto out;
+ }
+
+ if (!(neigh = rtnl_neigh_alloc())) {
+ xperror("rtnl_neigh_alloc");
+ goto out;
+ }
+
+ if (!(mac = nl_addr_build(AF_PACKET, hwaddr, 6))) {
+ xperror("nl_addr_build");
+ goto out;
+ }
+
+ if (!(ip = nl_addr_build(AF_INET, &ipaddr, 4))) {
+ xperror("nl_addr_build");
+ goto out;
+ }
+
+ rtnl_neigh_set_ifindex(neigh, if_nametoindex(intf));
+ rtnl_neigh_set_dst(neigh, ip);
+
+ err = rtnl_neigh_delete(sk, neigh, 0);
+
+ if (add) {
+ rtnl_neigh_set_lladdr(neigh, mac);
+ rtnl_neigh_set_state(neigh, NUD_PERMANENT);
+ err = rtnl_neigh_add(sk, neigh, NLM_F_CREATE);
+ }
+
+ if (err && (add || verbosity > 1)) {
+ nl_perror(err, add ? "rtnl_neigh_add" : "rtnl_neigh_delete");
+ }
+
+out:
+ nl_addr_put(ip);
+ nl_addr_put(mac);
+ rtnl_neigh_put(neigh);
+ nl_socket_free(sk);
+
+ return !err;
+#endif
+}
+
#endif
static bool intf_get_info(const char *intf, uint8_t *hwaddr, bool *bridge)
FD_ZERO(&fds);
FD_SET(fd, &fds);
- tv.tv_sec = timeout / 1000;
- tv.tv_usec = 1000 * (timeout % 1000);
+ tv.tv_sec = timeout / 1000000;
+ tv.tv_usec = timeout % 1000000;
status = select(fd + 1, &fds, NULL, NULL, &tv);
if (status < 0) {
return 0;
}
-#ifndef NMRPFLASH_WINDOWS
-int ethsock_arp_add(struct ethsock *sock, uint8_t *hwaddr, uint32_t ipaddr, struct ethsock_arp_undo **undo)
-{
- return 0;
-}
-
-int ethsock_arp_del(struct ethsock *sock, struct ethsock_arp_undo **undo)
-{
- return 0;
-}
-#else
static int ethsock_arp(struct ethsock *sock, uint8_t *hwaddr, uint32_t ipaddr, struct ethsock_arp_undo **undo)
{
- DWORD ret;
+#if defined(NMRPFLASH_UNIX) && !defined(NMRPFLASH_LINUX)
+ struct in_addr addr = { .s_addr = ipaddr };
+#elif defined(NMRPFLASH_WINDOWS)
+ DWORD err;
MIB_IPNETROW arp = {
.dwIndex = sock->index,
.dwPhysAddrLen = 6,
};
memcpy(arp.bPhysAddr, hwaddr, 6);
+#endif
if (undo) {
- ret = CreateIpNetEntry(&arp);
- if (ret != NO_ERROR) {
- win_perror2("CreateIpNetEntry", ret);
+#if defined(NMRPFLASH_LINUX)
+ if (!intf_add_del_arp(sock->intf, ipaddr, hwaddr, true)) {
return -1;
}
+#elif defined(NMRPFLASH_WINDOWS)
+ err = CreateIpNetEntry(&arp);
+ if (err != NO_ERROR) {
+ win_perror2("CreateIpNetEntry", err);
+ return -1;
+ }
+#else
+ if (systemf("arp -s %s %s", inet_ntoa(addr), mac_to_str(hwaddr)) != 0) {
+ return -1;
+ }
+#endif
*undo = malloc(sizeof(struct ethsock_arp_undo));
if (!*undo) {
(*undo)->ipaddr = ipaddr;
memcpy((*undo)->hwaddr, hwaddr, 6);
} else {
- DeleteIpNetEntry(&arp);
+#if defined(NMRPFLASH_LINUX)
+ if (!intf_add_del_arp(sock->intf, ipaddr, hwaddr, false)) {
+ return -1;
+ }
+#elif defined(NMRPFLASH_WINDOWS)
+ return DeleteIpNetEntry(&arp) ? 0 : -1;
+#else
+ return systemf("arp -d %s", inet_ntoa(addr));
+#endif
}
return 0;
*undo = NULL;
return ret;
}
-#endif
static bool get_hwaddr_from_pcap(const pcap_if_t *dev, uint8_t *hwaddr)
{
#endif
}
-#ifndef NMRPFLASH_WINDOWS
+#if !defined(NMRPFLASH_WINDOWS) && !defined(NMRPFLASH_LINUX)
static bool intf_up(int fd, const char *intf, bool up)
{
struct ifreq ifr;
}
#endif
-int ethsock_ip_add(struct ethsock *sock, uint32_t ipaddr, uint32_t ipmask, struct ethsock_ip_undo **undo)
+static int ethsock_ip_add_del(struct ethsock *sock, uint32_t ipaddr, uint32_t ipmask, struct ethsock_ip_undo **undo, bool add)
{
- if (undo && !(*undo = malloc(sizeof(struct ethsock_ip_undo)))) {
- xperror("malloc");
- return -1;
+ int ret, fd;
+
+ if (add && undo) {
+ if (!(*undo = malloc(sizeof(struct ethsock_ip_undo)))) {
+ xperror("malloc");
+ return -1;
+ }
+
+ memset(*undo, 0, sizeof(**undo));
}
- int ret = -1;
- int fd = socket(AF_INET, SOCK_DGRAM, 0);
+ ret = -1;
+ fd = socket(AF_INET, SOCK_DGRAM, 0);
if (fd < 0) {
sock_perror("socket");
goto out;
}
#ifndef NMRPFLASH_WINDOWS
- // XXX: undo is non-zero only if we're adding an IP
- bool add = undo;
#ifdef NMRPFLASH_LINUX
- struct ifreq ifr;
- strncpy(ifr.ifr_name, sock->intf, IFNAMSIZ);
- // FIXME: automatically determine the next free alias
- strcat(ifr.ifr_name, ":42");
-
if (add) {
- set_addr(&ifr.ifr_addr, ipaddr);
- if (ioctl(fd, SIOCSIFADDR, &ifr) != 0) {
- xperror("ioctl(SIOSIFADDR)");
- goto out;
- }
-
- set_addr(&ifr.ifr_netmask, ipmask);
- if (ioctl(fd, SIOCSIFNETMASK, &ifr) != 0) {
- xperror("ioctl(SIOCSIFNETMASK)");
- goto out;
- }
-
(*undo)->ip[0] = ipaddr;
(*undo)->ip[1] = ipmask;
}
- if (!intf_up(fd, ifr.ifr_name, add)) {
+ if (!intf_add_del_ip(sock->intf, (*undo)->ip[0], (*undo)->ip[1], add)) {
goto out;
}
#else // NMRPFLASH_OSX (or any other BSD)
return ret;
}
+int ethsock_ip_add(struct ethsock *sock, uint32_t ipaddr, uint32_t ipmask, struct ethsock_ip_undo **undo)
+{
+ return ethsock_ip_add_del(sock, ipaddr, ipmask, undo, true);
+}
+
int ethsock_ip_del(struct ethsock *sock, struct ethsock_ip_undo **undo)
{
if (!*undo) {
#ifndef NMRPFLASH_WINDOWS
if ((*undo)->ip[0] != INADDR_NONE) {
- ret = ethsock_ip_add(sock, (*undo)->ip[0], (*undo)->ip[1], NULL);
+ ret = ethsock_ip_add_del(sock, (*undo)->ip[0], (*undo)->ip[1], undo, false);
} else {
ret = 0;
}
#else
- DeleteIPAddress((*undo)->context);
- ret = 0;
+ ret = DeleteIPAddress((*undo)->context) ? 0 : -1;
#endif
free(*undo);
projects / oweals / nmrpflash.git / blobdiff