Changeset 0c2d9bb in mainline for uspace/app/inet/inet.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/app/inet/inet.c (modified) (2 diffs)

uspace/app/inet/inet.c

@@ -312 +312 @@
 }
 
+static int link_list(void)
+{
+        sysarg_t *link_list;
+        inet_link_info_t linfo;
+
+        size_t count;
+        size_t i;
+        int rc;
+
+        rc = inetcfg_get_link_list(&link_list, &count);
+        if (rc != EOK) {
+                printf(NAME ": Failed getting link list.\n");
+                return rc;
+        }
+
+        printf("IP links:\n");
+        if (count > 0)
+                printf("    [Link-layer Address] [Link-Name] [Def-MTU]\n");
+
+        for (i = 0; i < count; i++) {
+                rc = inetcfg_link_get(link_list[i], &linfo);
+                if (rc != EOK) {
+                        printf("Failed getting properties of link %zu.\n",
+                            (size_t)link_list[i]);
+                        continue;
+                }
+
+                printf("    %02x:%02x:%02x:%02x:%02x:%02x %s %zu\n",
+                    linfo.mac_addr[0], linfo.mac_addr[1],
+                    linfo.mac_addr[2], linfo.mac_addr[3],
+                    linfo.mac_addr[4], linfo.mac_addr[5],
+                    linfo.name, linfo.def_mtu);
+
+                free(linfo.name);
+
+                linfo.name = NULL;
+        }
+
+        if (count == 0)
+                printf("    None\n");
+
+        free(link_list);
+
+        return EOK;
+}
+
 static int sroute_list(void)
 {
@@ -404 +450 @@
                 if (rc != EOK)
                         return 1;
+                rc = link_list();
+                if (rc != EOK)
+                        return 1;
                 return 0;
         }