Changeset 962f03b in mainline for uspace/srv/ethip/arp.c

Timestamp:

2012-02-27T19:32:15Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

56792a2

Parents:

87e5658c

Message:

IP links need to be made aware of configured IP addresses.

File:

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

uspace/srv/ethip/arp.c

@@ -46 +46 @@
 #include "std.h"
 
-#define MY_IPV4_ADDR ( (192 << 24) | (168 << 16) | (0 << 8) | 4U )
 #define MY_ETH_ADDR 0xaafeedfaceee
 
@@ -56 +55 @@
         arp_eth_packet_t packet;
         arp_eth_packet_t reply;
+        ethip_link_addr_t *laddr;
 
         log_msg(LVL_DEBUG, "arp_received()");
@@ -65 +65 @@
         log_msg(LVL_DEBUG, "ARP PDU decoded, opcode=%d, tpa=%x",
             packet.opcode, packet.target_proto_addr.ipv4);
-        if (packet.opcode == aop_request &&
-            packet.target_proto_addr.ipv4 == MY_IPV4_ADDR) {
-                log_msg(LVL_DEBUG, "Request on my address");
+        if (packet.opcode == aop_request) {
+                log_msg(LVL_DEBUG, "ARP request");
 
-                reply.opcode = aop_reply;
-                reply.sender_hw_addr.addr = MY_ETH_ADDR;
-                reply.sender_proto_addr.ipv4 = MY_IPV4_ADDR;
-                reply.target_hw_addr = packet.sender_hw_addr;
-                reply.target_proto_addr = packet.sender_proto_addr;
+                laddr = ethip_nic_addr_find(nic, &packet.target_proto_addr);
+                if (laddr != NULL) {
+                        log_msg(LVL_DEBUG, "Request on my address");
 
-                arp_send_packet(nic, &reply);
+                        reply.opcode = aop_reply;
+                        reply.sender_hw_addr.addr = MY_ETH_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);
+                }
         }
 }