Changeset 0c2d9bb in mainline for uspace/srv/net/inetsrv/sroute.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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/sroute.c (modified) (6 diffs)

uspace/srv/net/inetsrv/sroute.c

@@ -89 +89 @@
 }
 
-/** Find address object matching address @a addr.
+/** Find static route object matching address @a addr.
  *
  * @param addr  Address
@@ -95 +95 @@
 inet_sroute_t *inet_sroute_find(inet_addr_t *addr)
 {
-        uint16_t addr_af = inet_addr_get(addr, NULL, NULL);
+        ip_ver_t addr_ver = inet_addr_get(addr, NULL, NULL);
         
         inet_sroute_t *best = NULL;
@@ -102 +102 @@
         fibril_mutex_lock(&sroute_list_lock);
         
-        list_foreach(sroute_list, link) {
-                inet_sroute_t *sroute = list_get_instance(link,
-                    inet_sroute_t, sroute_list);
-                
+        list_foreach(sroute_list, sroute_list, inet_sroute_t, sroute) {
                 uint8_t dest_bits;
-                uint16_t dest_af = inet_naddr_get(&sroute->dest, NULL, NULL,
+                ip_ver_t dest_ver = inet_naddr_get(&sroute->dest, NULL, NULL,
                     &dest_bits);
                 
                 /* Skip comparison with different address family */
-                if (addr_af != dest_af)
+                if (addr_ver != dest_ver)
                         continue;
                 
@@ -147 +144 @@
         fibril_mutex_lock(&sroute_list_lock);
 
-        list_foreach(sroute_list, link) {
-                inet_sroute_t *sroute = list_get_instance(link,
-                    inet_sroute_t, sroute_list);
-
+        list_foreach(sroute_list, sroute_list, inet_sroute_t, sroute) {
                 if (str_cmp(sroute->name, name) == 0) {
                         fibril_mutex_unlock(&sroute_list_lock);
@@ -176 +170 @@
         fibril_mutex_lock(&sroute_list_lock);
 
-        list_foreach(sroute_list, link) {
-                inet_sroute_t *sroute = list_get_instance(link,
-                    inet_sroute_t, sroute_list);
-
+        list_foreach(sroute_list, sroute_list, inet_sroute_t, sroute) {
                 if (sroute->id == id) {
                         fibril_mutex_unlock(&sroute_list_lock);
@@ -207 +198 @@
 
         i = 0;
-        list_foreach(sroute_list, link) {
-                inet_sroute_t *sroute = list_get_instance(link,
-                    inet_sroute_t, sroute_list);
-
+        list_foreach(sroute_list, sroute_list, inet_sroute_t, sroute) {
                 id_list[i++] = sroute->id;
         }