Changeset 99c2c69e in mainline for uspace/srv/net/inetsrv/inet_link.c

Timestamp:

2013-09-13T00:36:30Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

67fbd5e

Parents:

7f84430 (diff), 11d41be5 (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:

mainline changes

File:

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

uspace/srv/net/inetsrv/inet_link.c

@@ -140 +140 @@
                 already_known = false;
 
-                list_foreach(inet_link_list, ilink_link) {
-                        inet_link_t *ilink = list_get_instance(ilink_link,
-                            inet_link_t, link_list);
+                list_foreach(inet_link_list, link_list, inet_link_t, ilink) {
                         if (ilink->svc_id == svcs[i]) {
                                 already_known = true;
@@ -237 +235 @@
         inet_addrobj_t *addr = NULL;
         
+        /* XXX FIXME Cannot rely on loopback being the first IP link service!! */
         if (first_link) {
                 addr = inet_addrobj_new();
@@ -242 +241 @@
                 inet_naddr(&addr->naddr, 127, 0, 0, 1, 24);
                 first_link = false;
-        } else {
-                /*
-                 * FIXME
-                 * Setting static IPv4 address for testing purposes:
-                 * 10.0.2.15/24
-                 */
-                addr = inet_addrobj_new();
-                
-                inet_naddr(&addr->naddr, 10, 0, 2, 15, 24);
         }
         
@@ -492 +482 @@
         fibril_mutex_lock(&inet_discovery_lock);
 
-        list_foreach(inet_link_list, elem) {
-                inet_link_t *ilink = list_get_instance(elem, inet_link_t,
-                    link_list);
-
+        list_foreach(inet_link_list, link_list, inet_link_t, ilink) {
                 if (ilink->svc_id == link_id) {
                         fibril_mutex_unlock(&inet_discovery_lock);