Changeset 330df83 in mainline for uspace/srv/net/inetsrv/ndp.c

Timestamp:

2013-07-19T20:42:57Z (12 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

f4cbf9dd

Parents:

8a8a08d1 (diff), cd18cd1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline changes.

File:

• uspace/srv/net/inetsrv/ndp.c (modified) (6 diffs)

uspace/srv/net/inetsrv/ndp.c

@@ -38 +38 @@
 #include <mem.h>
 #include <malloc.h>
+#include <io/log.h>
 #include <net/socket_codes.h>
 #include "ntrans.h"
@@ -54 +55 @@
     {0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01, 0xff, 0, 0, 0};
 
+/** Compute solicited node MAC multicast address from target IPv6 address
+ *
+ * @param ip_addr  Target IPv6 address
+ * @param mac_addr Solicited MAC address to be assigned
+ *
+ */
 static void ndp_solicited_node_mac(addr128_t ip_addr, addr48_t mac_addr)
 {
@@ -60 +67 @@
 }
 
+/** Compute solicited node IPv6 multicast address from target IPv6 address
+ *
+ * @param ip_addr      Target IPv6 address
+ * @param ip_solicited Solicited IPv6 address to be assigned
+ *
+ */
 static void ndp_solicited_node_ip(addr128_t ip_addr,
     addr128_t ip_solicited)
@@ -88 +101 @@
 int ndp_received(inet_dgram_t *dgram)
 {
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ndp_received()");
+        
         ndp_packet_t packet;
         int rc = ndp_pdu_decode(dgram, &packet);
@@ -100 +115 @@
         
         inet_addrobj_t *laddr;
+        
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "NDP PDU decoded; opcode: %d",
+            packet.opcode);
         
         switch (packet.opcode) {
@@ -138 +156 @@
 }
 
+/** Translate IPv6 to MAC address
+ *
+ * @param src  Source IPv6 address
+ * @param dest Destination IPv6 address
+ * @param mac  Target MAC address to be assigned
+ * @param link Network interface
+ *
+ * @return EOK on success
+ * @return ENOENT when NDP translation failed
+ *
+ */
 int ndp_translate(addr128_t src_addr, addr128_t ip_addr, addr48_t mac_addr,
     inet_link_t *ilink)