Changeset 417a2ba1 in mainline for uspace/srv/net/inetsrv/inet_link.c

Timestamp:

2013-09-29T22:28:53Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d7f2cd6

Parents:

5a324d99

Message:

iplink_ev_recv() should use ip_ver_t instead of AF.

File:

• uspace/srv/net/inetsrv/inet_link.c (modified) (4 diffs)

uspace/srv/net/inetsrv/inet_link.c

@@ -43 +43 @@
 #include <stdlib.h>
 #include <str.h>
-#include <net/socket_codes.h>
 #include "addrobj.h"
 #include "inetsrv.h"
@@ -55 +54 @@
 static uint16_t ip_ident = 0;
 
-static int inet_iplink_recv(iplink_t *, iplink_recv_sdu_t *, uint16_t);
+static int inet_iplink_recv(iplink_t *, iplink_recv_sdu_t *, ip_ver_t);
 static inet_link_t *inet_link_get_by_id_locked(sysarg_t);
 
@@ -81 +80 @@
 }
 
-static int inet_iplink_recv(iplink_t *iplink, iplink_recv_sdu_t *sdu, uint16_t af)
+static int inet_iplink_recv(iplink_t *iplink, iplink_recv_sdu_t *sdu, ip_ver_t ver)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_iplink_recv()");
@@ -88 +87 @@
         inet_packet_t packet;
         
-        switch (af) {
-        case AF_INET:
+        switch (ver) {
+        case ip_v4:
                 rc = inet_pdu_decode(sdu->data, sdu->size, &packet);
                 break;
-        case AF_INET6:
+        case ip_v6:
                 rc = inet_pdu_decode6(sdu->data, sdu->size, &packet);
                 break;
         default:
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "invalid address family");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "invalid IP version");
                 return EINVAL;
         }