Changes in uspace/srv/net/ethip/arp.c [02a09ed:69a93df7] in mainline

File:

• uspace/srv/net/ethip/arp.c (modified) (4 diffs)

uspace/srv/net/ethip/arp.c

@@ -38 +38 @@
 #include <io/log.h>
 #include <inet/iplink_srv.h>
-#include <inet/addr.h>
 #include <stdlib.h>
-#include <net/socket_codes.h>
+
 #include "arp.h"
 #include "atrans.h"
@@ -55 +54 @@
 void arp_received(ethip_nic_t *nic, eth_frame_t *frame)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "arp_received()");
-        
+        int rc;
         arp_eth_packet_t packet;
-        int rc = arp_pdu_decode(frame->data, frame->size, &packet);
+        arp_eth_packet_t reply;
+        ethip_link_addr_t *laddr;
+
+        log_msg(LVL_DEBUG, "arp_received()");
+
+        rc = arp_pdu_decode(frame->data, frame->size, &packet);
         if (rc != EOK)
                 return;
-        
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "ARP PDU decoded, opcode=%d, tpa=%x",
-            packet.opcode, packet.target_proto_addr);
-        
-        inet_addr_t addr;
-        inet_addr_set(packet.target_proto_addr, &addr);
-        
-        ethip_link_addr_t *laddr = ethip_nic_addr_find(nic, &addr);
-        if (laddr == NULL)
-                return;
-        
-        addr32_t laddr_v4;
-        uint16_t laddr_af = inet_addr_get(&laddr->addr, &laddr_v4, NULL);
-        if (laddr_af != AF_INET)
-                return;
-        
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "Request/reply to my address");
-        
-        (void) atrans_add(packet.sender_proto_addr,
-            packet.sender_hw_addr);
-        
-        if (packet.opcode == aop_request) {
-                arp_eth_packet_t reply;
-                
-                reply.opcode = aop_reply;
-                addr48(nic->mac_addr, reply.sender_hw_addr);
-                reply.sender_proto_addr = laddr_v4;
-                addr48(packet.sender_hw_addr, reply.target_hw_addr);
-                reply.target_proto_addr = packet.sender_proto_addr;
-                
-                arp_send_packet(nic, &reply);
+
+        log_msg(LVL_DEBUG, "ARP PDU decoded, opcode=%d, tpa=%x",
+            packet.opcode, packet.target_proto_addr.ipv4);
+
+        laddr = ethip_nic_addr_find(nic, &packet.target_proto_addr);
+        if (laddr != NULL) {
+                log_msg(LVL_DEBUG, "Request/reply to my address");
+
+                (void) atrans_add(&packet.sender_proto_addr,
+                    &packet.sender_hw_addr);
+
+                if (packet.opcode == aop_request) {
+                        reply.opcode = aop_reply;
+                        reply.sender_hw_addr = nic->mac_addr;
+                        reply.sender_proto_addr = laddr->addr;
+                        reply.target_hw_addr = packet.sender_hw_addr;
+                        reply.target_proto_addr = packet.sender_proto_addr;
+
+                        arp_send_packet(nic, &reply);
+                }
         }
 }
 
-int arp_translate(ethip_nic_t *nic, addr32_t src_addr, addr32_t ip_addr,
-    addr48_t mac_addr)
+int arp_translate(ethip_nic_t *nic, iplink_srv_addr_t *src_addr,
+    iplink_srv_addr_t *ip_addr, mac48_addr_t *mac_addr)
 {
-        int rc = atrans_lookup(ip_addr, mac_addr);
+        int rc;
+        arp_eth_packet_t packet;
+
+        rc = atrans_lookup(ip_addr, mac_addr);
         if (rc == EOK)
                 return EOK;
-        
-        arp_eth_packet_t packet;
-        
+
         packet.opcode = aop_request;
-        addr48(nic->mac_addr, packet.sender_hw_addr);
-        packet.sender_proto_addr = src_addr;
-        addr48(addr48_broadcast, packet.target_hw_addr);
-        packet.target_proto_addr = ip_addr;
-        
+        packet.sender_hw_addr = nic->mac_addr;
+        packet.sender_proto_addr = *src_addr;
+        packet.target_hw_addr.addr = MAC48_BROADCAST;
+        packet.target_proto_addr = *ip_addr;
+
         rc = arp_send_packet(nic, &packet);
         if (rc != EOK)
                 return rc;
-        
+
         (void) atrans_wait_timeout(ARP_REQUEST_TIMEOUT);
-        
+
         return atrans_lookup(ip_addr, mac_addr);
 }
@@ -129 +122 @@
         size_t fsize;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "arp_send_packet()");
+        log_msg(LVL_DEBUG, "arp_send_packet()");
 
         rc = arp_pdu_encode(packet, &pdata, &psize);
@@ -135 +128 @@
                 return rc;
 
-        addr48(packet->target_hw_addr, frame.dest);
-        addr48(packet->sender_hw_addr, frame.src);
+        frame.dest.addr = packet->target_hw_addr.addr;
+        frame.src.addr =  packet->sender_hw_addr.addr;
         frame.etype_len = ETYPE_ARP;
         frame.data = pdata;