Changeset 56792a2 in mainline

Timestamp:

2012-02-27T19:52:41Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1cc8b42

Parents:

962f03b

Message:

Read MAC address from NIC.

Location:

uspace/srv/ethip

Files:

• arp.c (modified) (2 diffs)
• ethip.c (modified) (1 diff)
• ethip.h (modified) (2 diffs)
• ethip_nic.c (modified) (3 diffs)
• pdu.c (modified) (3 diffs)
• pdu.h (modified) (1 diff)

uspace/srv/ethip/arp.c

@@ -46 +46 @@
 #include "std.h"
 
-#define MY_ETH_ADDR 0xaafeedfaceee
-
 static int arp_send_packet(ethip_nic_t *nic, arp_eth_packet_t *packet);
 
@@ -73 +71 @@
 
                         reply.opcode = aop_reply;
-                        reply.sender_hw_addr.addr = MY_ETH_ADDR;
+                        reply.sender_hw_addr = nic->mac_addr;
                         reply.sender_proto_addr = laddr->addr;
                         reply.target_hw_addr = packet.sender_hw_addr;

uspace/srv/ethip/ethip.c

@@ -177 +177 @@
 
         frame.dest.addr = 0xdeeedeeedeee;
-        frame.src.addr =  0xaadeadbeeffe;
+        frame.src       = nic->mac_addr;
         frame.etype_len = ETYPE_IP;
         frame.data = sdu->data;

uspace/srv/ethip/ethip.h

@@ -44 +44 @@
 #include <sys/types.h>
 
-typedef struct ethip_nic {
-        link_t nic_list;
-        service_id_t svc_id;
-        char *svc_name;
-        async_sess_t *sess;
-
-        iplink_srv_t iplink;
-        service_id_t iplink_sid;
-
-        /** List of IP addresses configured on this link */
-        list_t addr_list; /* of ethip_link_addr_t */
-} ethip_nic_t;
-
 typedef struct {
         link_t addr_list;
@@ -67 +54 @@
         uint64_t addr;
 } mac48_addr_t;
+
+typedef struct ethip_nic {
+        link_t nic_list;
+        service_id_t svc_id;
+        char *svc_name;
+        async_sess_t *sess;
+
+        iplink_srv_t iplink;
+        service_id_t iplink_sid;
+
+        /** MAC address */
+        mac48_addr_t mac_addr;
+        /** List of IP addresses configured on this link */
+        list_t addr_list; /* of ethip_link_addr_t */
+} ethip_nic_t;
 
 /** Ethernet frame */

uspace/srv/ethip/ethip_nic.c

@@ -48 +48 @@
 #include "ethip.h"
 #include "ethip_nic.h"
+#include "pdu.h"
 
 static int ethip_nic_open(service_id_t sid);
@@ -152 +153 @@
         int rc;
         bool in_list = false;
+        nic_address_t nic_address;
 
         log_msg(LVL_DEBUG, "ethip_nic_open()");
@@ -187 +189 @@
                 goto error;
 
+        rc = nic_get_address(nic->sess, &nic_address);
+        if (rc != EOK) {
+                log_msg(LVL_ERROR, "Error getting MAC address of NIC '%s'.",
+                    nic->svc_name);
+                goto error;
+        }
+
+        mac48_decode(nic_address.address, &nic->mac_addr);
+
         rc = nic_set_state(nic->sess, NIC_STATE_ACTIVE);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed activating NIC '%s'.",
+                log_msg(LVL_ERROR, "Error activating NIC '%s'.",
                     nic->svc_name);
                 goto error;
         }
 
-        log_msg(LVL_DEBUG, "Initialized IP link service.");
+        log_msg(LVL_DEBUG, "Initialized IP link service, MAC = 0x%" PRIx64,
+            nic->mac_addr.addr);
 
         return EOK;

uspace/srv/ethip/pdu.c

@@ -46 +46 @@
 #include "pdu.h"
 
-static void mac48_encode(mac48_addr_t *addr, void *buf);
-static void mac48_decode(void *data, mac48_addr_t *addr);
-
 #define MAC48_BYTES 6
 
@@ -116 +113 @@
 }
 
-static void mac48_encode(mac48_addr_t *addr, void *buf)
+void mac48_encode(mac48_addr_t *addr, void *buf)
 {
         uint64_t val;
@@ -127 +124 @@
 }
 
-static void mac48_decode(void *data, mac48_addr_t *addr)
+void mac48_decode(void *data, mac48_addr_t *addr)
 {
         uint64_t val;

uspace/srv/ethip/pdu.h

@@ -42 +42 @@
 extern int eth_pdu_encode(eth_frame_t *, void **, size_t *);
 extern int eth_pdu_decode(void *, size_t, eth_frame_t *);
+extern void mac48_encode(mac48_addr_t *, void *);
+extern void mac48_decode(void *, mac48_addr_t *);
 extern int arp_pdu_encode(arp_eth_packet_t *, void **, size_t *);
 extern int arp_pdu_decode(void *, size_t, arp_eth_packet_t *);
+
 
 #endif