Changeset 0773396 in mainline for uspace/srv/net/inetsrv/addrobj.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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 mainline changes

File:

• uspace/srv/net/inetsrv/addrobj.c (modified) (7 diffs)

uspace/srv/net/inetsrv/addrobj.c

@@ -42 +42 @@
 #include <stdlib.h>
 #include <str.h>
-#include <net/socket_codes.h>
 #include "addrobj.h"
 #include "inetsrv.h"
@@ -115 +114 @@
         fibril_mutex_lock(&addr_list_lock);
         
-        list_foreach(addr_list, link) {
-                inet_addrobj_t *naddr = list_get_instance(link,
-                    inet_addrobj_t, addr_list);
-                
+        list_foreach(addr_list, addr_list, inet_addrobj_t, naddr) {
                 switch (find) {
                 case iaf_net:
@@ -158 +154 @@
             name, ilink->svc_name);
 
-        list_foreach(addr_list, link) {
-                inet_addrobj_t *naddr = list_get_instance(link,
-                    inet_addrobj_t, addr_list);
-
+        list_foreach(addr_list, addr_list, inet_addrobj_t, naddr) {
                 if (naddr->ilink == ilink && str_cmp(naddr->name, name) == 0) {
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find_by_name_locked: found %p",
@@ -206 +199 @@
         fibril_mutex_lock(&addr_list_lock);
 
-        list_foreach(addr_list, link) {
-                inet_addrobj_t *naddr = list_get_instance(link,
-                    inet_addrobj_t, addr_list);
-
+        list_foreach(addr_list, addr_list, inet_addrobj_t, naddr) {
                 if (naddr->id == id) {
                         fibril_mutex_unlock(&addr_list_lock);
@@ -227 +217 @@
         inet_addr_t lsrc_addr;
         inet_naddr_addr(&addr->naddr, &lsrc_addr);
-        
+
         addr32_t lsrc_v4;
         addr128_t lsrc_v6;
-        uint16_t lsrc_af = inet_addr_get(&lsrc_addr, &lsrc_v4, &lsrc_v6);
-        
+        ip_ver_t lsrc_ver = inet_addr_get(&lsrc_addr, &lsrc_v4, &lsrc_v6);
+
         addr32_t ldest_v4;
         addr128_t ldest_v6;
-        uint16_t ldest_af = inet_addr_get(ldest, &ldest_v4, &ldest_v6);
-        
-        if (lsrc_af != ldest_af)
+        ip_ver_t ldest_ver = inet_addr_get(ldest, &ldest_v4, &ldest_v6);
+
+        if (lsrc_ver != ldest_ver)
                 return EINVAL;
-        
+
         int rc;
         addr48_t ldest_mac;
-        
-        switch (ldest_af) {
-        case AF_INET:
+
+        switch (ldest_ver) {
+        case ip_v4:
                 return inet_link_send_dgram(addr->ilink, lsrc_v4, ldest_v4,
                     dgram, proto, ttl, df);
-        case AF_INET6:
+        case ip_v6:
                 /*
                  * Translate local destination IPv6 address.
@@ -253 +243 @@
                 if (rc != EOK)
                         return rc;
-                
+
                 return inet_link_send_dgram6(addr->ilink, ldest_mac, dgram,
                     proto, ttl, df);
-        }
-        
+        default:
+                assert(false);
+                break;
+        }
+
         return ENOTSUP;
 }
@@ -277 +270 @@
 
         i = 0;
-        list_foreach(addr_list, link) {
-                inet_addrobj_t *addr = list_get_instance(link,
-                    inet_addrobj_t, addr_list);
-
+        list_foreach(addr_list, addr_list, inet_addrobj_t, addr) {
                 id_list[i++] = addr->id;
         }