Changeset 75c3830 in mainline

Timestamp:

2017-09-23T22:20:20Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

11d9630

Parents:

f538ef3

Message:

Separate display of addresses, static routes and IP links into individual subcommands.

File:

• uspace/app/inet/inet.c (modified) (11 diffs)

uspace/app/inet/inet.c

@@ -49 +49 @@
 static void print_syntax(void)
 {
+        printf("%s: Internet configuration utility.\n", NAME);
         printf("Syntax:\n");
-        printf("  %s create <addr>/<width> <link-name> <addr-name>\n", NAME);
-        printf("  %s delete <link-name> <addr-name>\n", NAME);
-        printf("  %s add-sr <dest-addr>/<width> <router-addr> <route-name>\n", NAME);
-        printf("  %s del-sr <route-name>\n", NAME);
+        printf("  %s list-addr\n", NAME);
+        printf("  %s create-addr <addr>/<width> <link-name> <addr-name>\n", NAME);
+        printf("  %s delete-addr <link-name> <addr-name>\n", NAME);
+        printf("  %s list-sr\n", NAME);
+        printf("  %s create-sr <dest-addr>/<width> <router-addr> <route-name>\n", NAME);
+        printf("  %s delete-sr <route-name>\n", NAME);
+        printf("  %s list-link\n", NAME);
 }
 
@@ -265 +269 @@
         }
 
-        table_set_margin_left(table, 4);
-
-        printf("Configured addresses:\n\n");
-
         table_header_row(table);
         table_printf(table, "Addr/Width\t" "Link-Name\t" "Addr-Name\t"
@@ -309 +309 @@
         }
 
-        if (count == 0) {
-                printf("None\n");
-        } else {
+        if (count != 0) {
                 rc = table_print_out(table, stdout);
                 if (rc != EOK) {
@@ -318 +316 @@
                 }
         }
-
-        printf("\n");
 
         rc = EOK;
@@ -358 +354 @@
         }
 
-        table_set_margin_left(table, 4);
-
-        printf("IP links:\n\n");
         table_header_row(table);
         table_printf(table, "Link-layer Address\t" "Link-Name\t" "Def-MTU\n");
@@ -384 +377 @@
         }
 
-        if (count == 0) {
-                printf("None\n");
-        } else {
+        if (count != 0) {
                 rc = table_print_out(table, stdout);
                 if (rc != EOK) {
@@ -393 +384 @@
                 }
         }
-
-        printf("\n");
 
         rc = EOK;
@@ -430 +419 @@
         }
 
-        table_set_margin_left(table, 4);
-
-        printf("Static routes:\n\n");
         table_header_row(table);
         table_printf(table, "Dest/Width\t" "Router-Addr\t" "Route-Name\n");
@@ -471 +457 @@
         }
 
-        if (count == 0) {
-                printf("None\n");
-        } else {
+        if (count != 0) {
                 rc = table_print_out(table, stdout);
                 if (rc != EOK) {
@@ -480 +464 @@
                 }
         }
-
-        printf("\n");
 
         rc = EOK;
@@ -509 +491 @@
         }
 
-        if (argc < 2) {
+        if (argc < 2 || str_cmp(argv[1], "-h") == 0) {
+                print_syntax();
+                return 0;
+        }
+
+        if (str_cmp(argv[1], "list-addr") == 0) {
                 rc = addr_list();
                 if (rc != EOK)
                         return 1;
+        } else if (str_cmp(argv[1], "create-addr") == 0) {
+                rc = addr_create_static(argc - 2, argv + 2);
+                if (rc != EOK)
+                        return 1;
+        } else if (str_cmp(argv[1], "delete-addr") == 0) {
+                rc = addr_delete(argc - 2, argv + 2);
+                if (rc != EOK)
+                        return 1;
+        } else if (str_cmp(argv[1], "list-sr") == 0) {
                 rc = sroute_list();
                 if (rc != EOK)
                         return 1;
+        } else if (str_cmp(argv[1], "create-sr") == 0) {
+                rc = sroute_create(argc - 2, argv + 2);
+                if (rc != EOK)
+                        return 1;
+        } else if (str_cmp(argv[1], "delete-sr") == 0) {
+                rc = sroute_delete(argc - 2, argv + 2);
+                if (rc != EOK)
+                        return 1;
+        } else if (str_cmp(argv[1], "list-link") == 0) {
                 rc = link_list();
-                if (rc != EOK)
-                        return 1;
-                return 0;
-        }
-
-        if (str_cmp(argv[1], "create") == 0) {
-                rc = addr_create_static(argc - 2, argv + 2);
-                if (rc != EOK)
-                        return 1;
-        } else if (str_cmp(argv[1], "delete") == 0) {
-                rc = addr_delete(argc - 2, argv + 2);
-                if (rc != EOK)
-                        return 1;
-        } else if (str_cmp(argv[1], "add-sr") == 0) {
-                rc = sroute_create(argc - 2, argv + 2);
-                if (rc != EOK)
-                        return 1;
-        } else if (str_cmp(argv[1], "del-sr") == 0) {
-                rc = sroute_delete(argc - 2, argv + 2);
                 if (rc != EOK)
                         return 1;