Merge branches

[oweals/nmrpflash.git] / ethsock.c

diff --git a/ethsock.c b/ethsock.c
index 4bef279d660d3937cd7501c49cb6e9e1c504ceb3..24d2b82bef16efe7f9598523149d351d3b4992cd 100644 (file)
--- a/ethsock.c
+++ b/ethsock.c
@@ -29,6 +29,7 @@ struct ethsock
        int fd;
 #else
        HANDLE handle;
+       DWORD index;
 #endif
        unsigned timeout;
        uint8_t hwaddr[6];
@@ -75,7 +76,7 @@ static inline bool sockaddr_get_hwaddr(struct sockaddr *sa, uint8_t *hwaddr)
        return true;
 }
 
-static bool get_hwaddr_from_intf(const char *intf, uint8_t *hwaddr)
+static bool get_intf_info(const char *intf, uint8_t *hwaddr, void *dummy)
 {
        struct ifaddrs *ifas, *ifa;
        bool found;
@@ -119,7 +120,7 @@ void win_perror2(const char *msg, DWORD err)
        }
 }
 
-static bool get_hwaddr_from_intf(const char *intf, uint8_t *hwaddr)
+static bool get_intf_info(const char *intf, uint8_t *hwaddr, DWORD *index)
 {
        PIP_ADAPTER_INFO adapters, adapter;
        DWORD ret;
@@ -147,10 +148,10 @@ static bool get_hwaddr_from_intf(const char *intf, uint8_t *hwaddr)
                         * AdapterName from GetAdaptersInfo is just "{GUID}".*/
                        if (strstr(intf, adapter->AdapterName)) {
                                if (adapter->AddressLength == 6) {
-                                       for (i = 0; i != 6; ++i) {
-                                               hwaddr[i] = adapter->Address[i];
+                                       memcpy(hwaddr, adapter->Address, 6);
+                                       if (index) {
+                                               *index = adapter->Index;
                                        }
-
                                        found = true;
                                        break;
                                }
@@ -289,8 +290,13 @@ struct ethsock *ethsock_create(const char *intf, uint16_t protocol)
                goto cleanup_pcap;
        }
 
-       if (!get_hwaddr_from_intf(intf, sock->hwaddr)) {
-               fprintf(stderr, "Failed to get MAC address of interface.\n");
+#ifndef NMRPFLASH_WINDOWS
+       err = !get_intf_info(intf, sock->hwaddr, NULL);
+#else
+       err = !get_intf_info(intf, sock->hwaddr, &sock->index);
+#endif
+       if (err) {
+               fprintf(stderr, "Failed to get interface info.\n");
                goto cleanup_malloc;
        }
 
@@ -436,6 +442,54 @@ inline int ethsock_set_timeout(struct ethsock *sock, unsigned msec)
        return 0;
 }
 
+#ifndef NMRPFLASH_WINDOWS
+int ethsock_arp_add(struct ethsock *sock, uint8_t *hwaddr, struct in_addr *ipaddr)
+{
+       return 0;
+}
+
+int ethsock_arp_del(struct ethsock *sock, uint8_t *hwaddr, struct in_addr *ipaddr)
+{
+       return 0;
+}
+#else
+static int ethsock_arp(struct ethsock *sock, uint8_t *hwaddr, struct in_addr *ipaddr, int add)
+{
+       DWORD ret;
+       MIB_IPNETROW arp = {
+               .dwIndex = sock->index,
+               .dwPhysAddrLen = 6,
+               .dwAddr = ipaddr->s_addr,
+               .dwType = MIB_IPNET_TYPE_STATIC
+       };
+       
+       memcpy(arp.bPhysAddr, hwaddr, 6);
+       
+       if (add) {
+               ret = CreateIpNetEntry(&arp);
+               if (ret != NO_ERROR) {
+                       win_perror2("CreateIpNetEntry", ret);
+                       return -1;
+               }
+       } else {
+               DeleteIpNetEntry(&arp);
+       }
+       
+       return 0;
+}
+
+int ethsock_arp_add(struct ethsock *sock, uint8_t *hwaddr, struct in_addr *ipaddr)
+{
+       ethsock_arp_del(sock, hwaddr, ipaddr);
+       return ethsock_arp(sock, hwaddr, ipaddr, 1);
+}
+
+int ethsock_arp_del(struct ethsock *sock, uint8_t *hwaddr, struct in_addr *ipaddr)
+{
+       return ethsock_arp(sock, hwaddr, ipaddr, 0);
+}
+#endif
+
 static bool get_hwaddr_from_pcap(const pcap_if_t *dev, uint8_t *hwaddr)
 {
 #ifndef NMRPFLASH_WINDOWS
@@ -458,7 +512,7 @@ static bool get_hwaddr_from_pcap(const pcap_if_t *dev, uint8_t *hwaddr)
        }
 #endif
 
-       return get_hwaddr_from_intf(dev->name, hwaddr);
+       return get_intf_info(dev->name, hwaddr, NULL);
 }
 
 int ethsock_list_all(void)