Command functions return int instead of bool

diff --git a/cli/com_bitrate.c b/cli/com_bitrate.c
index 60415822baeb07bd6d55f39e347fc9b1eca64dd3..7085b82ede6e6811cf40759e4fd743f118139250 100644 (file)
--- a/cli/com_bitrate.c
+++ b/cli/com_bitrate.c
@@ -28,25 +28,25 @@ static int bitrate_analyse (int argc, const char **argv, int *ports)
 }
 
 
-bool do_bitrate_set (int argc, const char **argv, struct ngadmin *nga)
+int do_bitrate_set (int argc, const char **argv, struct ngadmin *nga)
 {
-       int i, k = 0, defs[] = {12, 12}, p, *ports = NULL;
+       int i, k = 0, defs[] = {12, 12}, p, *ports = NULL, ret = 0;
        const struct swi_attr *sa;
-       bool ret = true;
+       
        
        if (argc < 2) {
                printf(
                "usage: bitrate set [all SPEEDSPEC] <port1> SPEEDSPEC [<port2> SPEEDSPEC ...]\n"
                "SPEEDSPEC: [inout <speed>] [in <ispeed>] [out <ospeed>]\n"
                );
-               ret = false;
+               ret = 1;
                goto end;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -80,22 +80,22 @@ end:
 }
 
 
-bool do_bitrate_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
+int do_bitrate_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
 {
-       int i, ret = true, *ports = NULL;
+       int i, ret = 0, *ports = NULL;
        const struct swi_attr *sa;
        
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -104,7 +104,7 @@ bool do_bitrate_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
        i = ngadmin_getBitrateLimits(nga, ports);
        if (i != ERR_OK) {
                printErrCode(i);
-               ret = false;
+               ret = 1;
                goto end;
        }
        

diff --git a/cli/com_cabletest.c b/cli/com_cabletest.c
index 370d1cd90ac31217588dae01e87d8b22b94a3464..b5dfab30bbd7bb0bb5a34fed9c13c61798f20be7 100644 (file)
--- a/cli/com_cabletest.c
+++ b/cli/com_cabletest.c
@@ -2,12 +2,11 @@
 #include "commands.h"
 
 
-bool do_cabletest (int argc, const char **argv, struct ngadmin *nga)
+int do_cabletest (int argc, const char **argv, struct ngadmin *nga)
 {
-       bool ret = true;
        const struct swi_attr *sa;
        struct cabletest *ct = NULL;
-       int i, j=0, k=0;
+       int i, j = 0, k = 0, ret = 0;
        
        
        if (argc < 1) {
@@ -18,7 +17,7 @@ bool do_cabletest (int argc, const char **argv, struct ngadmin *nga)
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -34,7 +33,7 @@ bool do_cabletest (int argc, const char **argv, struct ngadmin *nga)
        i = ngadmin_cabletest(nga, ct, j);
        if (i < 0) {
                printErrCode(i);
-               ret = false;
+               ret = 1;
                goto end;
        }
        

diff --git a/cli/com_defaults.c b/cli/com_defaults.c
index 3574e4b52b63c69fdd928d129fb48e1adf399a16..74ecfa5ff2d5eed05aaaf2451888b0bc93a726c1 100644 (file)
--- a/cli/com_defaults.c
+++ b/cli/com_defaults.c
@@ -2,23 +2,23 @@
 #include "commands.h"
 
 
-bool do_defaults (int argc, const char **argv UNUSED, struct ngadmin *nga)
+int do_defaults (int argc, const char **argv UNUSED, struct ngadmin *nga)
 {
-       int i, ret = true;
+       int i, ret = 0;
        const struct swi_attr *sa;
        char line[16];
        
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        

diff --git a/cli/com_firmware.c b/cli/com_firmware.c
index d3e9d0df24f5bd94f83ebd8ea41fdb76a64dbebc..3d5e76c2437ec2161fca9a83a064fd82aa2a53a3 100644 (file)
--- a/cli/com_firmware.c
+++ b/cli/com_firmware.c
@@ -2,22 +2,22 @@
 #include "commands.h"
 
 
-bool do_firmware_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
+int do_firmware_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
 {
        const struct swi_attr *sa;
-       bool ret = true;
+       int ret = 0;
        
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -29,23 +29,22 @@ end:
 }
 
 
-bool do_firmware_upgrade (int argc, const char **argv, struct ngadmin *nga)
+int do_firmware_upgrade (int argc, const char **argv, struct ngadmin *nga)
 {
        const struct swi_attr *sa;
-       bool ret = true;
-       int i;
+       int i, ret = 0;
        
        
        if (argc != 1) {
                printf("usage: firmware upgrade <file>\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        

diff --git a/cli/com_help.c b/cli/com_help.c
index a857cc15b61bfbd4f269677305f1da67d3aff992..34fc2bcf3d15b85662b095c74e343a83393e9da6 100644 (file)
--- a/cli/com_help.c
+++ b/cli/com_help.c
@@ -9,7 +9,7 @@ bool do_help (int argc, const char **argv UNUSED, struct ngadmin *nga UNUSED)
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               return false;
+               return 1;
        }
        
        printf("Available commands: \n");
@@ -18,7 +18,8 @@ bool do_help (int argc, const char **argv UNUSED, struct ngadmin *nga UNUSED)
                printf("%s ", s->name);
        putchar('\n');
        
-       return true;
+       
+       return 0;
 }
 
 

diff --git a/cli/com_igmp.c b/cli/com_igmp.c
index 22647ff614e21f5d94c95d724dbf3e3c3669f3e4..55e12da2c3b94068a0c7b90cb5853f8cd718e73c 100644 (file)
--- a/cli/com_igmp.c
+++ b/cli/com_igmp.c
@@ -2,7 +2,7 @@
 #include "commands.h"
 
 
-bool do_igmp_set (int argc, const char **argv, struct ngadmin *nga)
+int do_igmp_set (int argc, const char **argv, struct ngadmin *nga)
 {
        int i;
        struct igmp_conf ic;
@@ -10,12 +10,12 @@ bool do_igmp_set (int argc, const char **argv, struct ngadmin *nga)
        
        if (argc != 4) {
                printf("usage: igmp set <enable> <vlan> <validate> <block>\n");
-               return false;
+               return 1;
        }
        
        if (ngadmin_getCurrentSwitch(nga) == NULL) {
                printf("must be logged\n");
-               return false;
+               return 1;
        }
        
        ic.enable = strtol(argv[0], NULL, 0);
@@ -27,35 +27,34 @@ bool do_igmp_set (int argc, const char **argv, struct ngadmin *nga)
        printErrCode(i);
        
        
-       return true;
+       return 0;
 }
 
 
-bool do_igmp_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
+int do_igmp_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
 {
-       int i;
+       int i, ret = 0;
        const struct swi_attr *sa;
        struct igmp_conf ic;
-       bool ret = true;
        
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
        i = ngadmin_getIGMPConf(nga, &ic);
        if (i != ERR_OK) {
                printErrCode(i);
-               ret = false;
+               ret = 1;
                goto end;
        }
        

diff --git a/cli/com_list.c b/cli/com_list.c
index 064690cde700eebe8010b8f47592c5c6d6ebc883..853f8f371f79055e33fa18bfdaa3989a904c26b6 100644 (file)
--- a/cli/com_list.c
+++ b/cli/com_list.c
@@ -10,13 +10,14 @@ bool do_list (int argc, const char **argv UNUSED, struct ngadmin *nga)
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               return false;
+               return 1;
        }
        
        sa = ngadmin_getSwitchTab(nga, &n);
        displaySwitchTab(sa, n);
        
-       return true;
+       
+       return 0;
 }
 
 

diff --git a/cli/com_login.c b/cli/com_login.c
index ed4154e3c715e40a7ec056a6e1217eeeae8048d0..a6ee7e8a90952f92b749768fafea928885924790 100644 (file)
--- a/cli/com_login.c
+++ b/cli/com_login.c
@@ -9,7 +9,7 @@ bool do_login (int argc, const char **argv, struct ngadmin *nga)
        
        if (argc != 1) {
                printf("usage: login <num>\n");
-               return false;
+               return 1;
        }
        
        i = strtol(argv[0], NULL, 0);
@@ -17,7 +17,7 @@ bool do_login (int argc, const char **argv, struct ngadmin *nga)
        printErrCode(i);
        
        
-       return true;
+       return 0;
 }
 
 

diff --git a/cli/com_mirror.c b/cli/com_mirror.c
index 507ee1f8fbf9336f1bc84ff181fe8887dbe8a1e0..5ebe0403cb63cdeceaf1c6110af53c4e3c763f2f 100644 (file)
--- a/cli/com_mirror.c
+++ b/cli/com_mirror.c
@@ -2,35 +2,34 @@
 #include "commands.h"
 
 
-bool do_mirror_disable (int argc, const char **argv UNUSED, struct ngadmin *nga)
+int do_mirror_disable (int argc, const char **argv UNUSED, struct ngadmin *nga)
 {
        int i;
        
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               return false;
+               return 1;
        }
        
        if (ngadmin_getCurrentSwitch(nga) == NULL) {
                printf("must be logged\n");
-               return false;
+               return 1;
        }
        
        i = ngadmin_setMirror(nga, NULL);
        printErrCode(i);
        
        
-       return true;
+       return 0;
 }
 
 
-bool do_mirror_set (int argc, const char **argv, struct ngadmin *nga)
+int do_mirror_set (int argc, const char **argv, struct ngadmin *nga)
 {
        const struct swi_attr *sa;
        char *ports = NULL;
-       bool ret = true;
-       int i, k = 0;
+       int i, k = 0, ret = 0;
        
        
        if (argc < 3) {
@@ -41,7 +40,7 @@ bool do_mirror_set (int argc, const char **argv, struct ngadmin *nga)
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -51,7 +50,7 @@ bool do_mirror_set (int argc, const char **argv, struct ngadmin *nga)
        ports[0] = strtol(argv[k++], NULL, 0);
        if (ports[0] < 1 || ports[0] > sa->ports || strcasecmp(argv[k++], "clone") != 0) {
                printf("syntax error\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -59,11 +58,11 @@ bool do_mirror_set (int argc, const char **argv, struct ngadmin *nga)
                i = strtol(argv[k++], NULL, 0);
                if (i < 1 || i > sa->ports) {
                        printf("port out of range\n");
-                       ret = false;
+                       ret = 1;
                        goto end;
                } else if (i == ports[0]) {
                        printf("destination port cannot be in port list\n");
-                       ret = false;
+                       ret = 1;
                        goto end;
                }
                ports[i] = 1;
@@ -79,7 +78,7 @@ end:
 }
 
 
-bool do_mirror_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
+int do_mirror_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
 {
        const struct swi_attr *sa;
        char *ports = NULL;
@@ -88,13 +87,13 @@ bool do_mirror_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               return false;
+               return 1;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               return false;
+               return 1;
        }
        
        ports = malloc((sa->ports + 1) * sizeof(char));
@@ -121,7 +120,7 @@ bool do_mirror_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
 end:
        free(ports);
        
-       return true;
+       return 0;
 }
 
 

diff --git a/cli/com_name.c b/cli/com_name.c
index 8e47878c0f27c4065cb692f1d01efc064dfda61f..dd7b0484100d842bb18cfb1bbfa6a5b09f6bb91f 100644 (file)
--- a/cli/com_name.c
+++ b/cli/com_name.c
@@ -2,30 +2,30 @@
 #include "commands.h"
 
 
-bool do_name_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
+int do_name_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
 {
        const struct swi_attr *sa;
        
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               return false;
+               return 1;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               return false;
+               return 1;
        }
        
        puts(sa->name);
        
        
-       return true;
+       return 0;
 }
 
 
-bool do_name_set (int argc, const char **argv, struct ngadmin *nga)
+int do_name_set (int argc, const char **argv, struct ngadmin *nga)
 {
        int i;
        const struct swi_attr *sa;
@@ -33,24 +33,24 @@ bool do_name_set (int argc, const char **argv, struct ngadmin *nga)
        
        if (argc != 1) {
                printf("usage: name set <value>\n");
-               return false;
+               return 1;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               return false;
+               return 1;
        }
        
        i = ngadmin_setName(nga, argv[0]);
        printErrCode(i);
        
        
-       return true;
+       return 0;
 }
 
 
-bool do_name_clear (int argc, const char **argv UNUSED, struct ngadmin *nga)
+int do_name_clear (int argc, const char **argv UNUSED, struct ngadmin *nga)
 {
        int i;
        const struct swi_attr *sa;
@@ -58,20 +58,20 @@ bool do_name_clear (int argc, const char **argv UNUSED, struct ngadmin *nga)
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               return false;
+               return 1;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               return false;
+               return 1;
        }
        
        i = ngadmin_setName(nga, NULL);
        printErrCode(i);
        
        
-       return true;
+       return 0;
 }
 
 

diff --git a/cli/com_netconf.c b/cli/com_netconf.c
index 99cd6baa9926b046de174619c499dd0afb15a5f8..d44b83a161260464f902bb10faa8cd59f63439ec 100644 (file)
--- a/cli/com_netconf.c
+++ b/cli/com_netconf.c
@@ -2,23 +2,22 @@
 #include "commands.h"
 
 
-bool do_netconf_set (int argc, const char **argv, struct ngadmin *nga)
+int do_netconf_set (int argc, const char **argv, struct ngadmin *nga)
 {
-       int i, k;
+       int i, k, ret = 0;
        const struct swi_attr *sa;
        struct net_conf nc;
-       bool ret = true;
        
        
        if (argc == 0) {
                printf("usage: netconf set [dhcp yes|no] [ip <ip>] [mask <mask>] [gw <gw>]\n");
-               return false;
+               return 1;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               return false;
+               return 1;
        }
        
        memset(&nc, 0, sizeof(struct net_conf));
@@ -28,29 +27,29 @@ bool do_netconf_set (int argc, const char **argv, struct ngadmin *nga)
                        if (strcasecmp(argv[k + 1], "yes") == 0) {
                                nc.dhcp = true;
                        } else if (strcasecmp(argv[k + 1], "no") == 0) {
-                               nc.dhcp = false;
+                               nc.dhcp = 1;
                        } else {
                                printf("Incorrect DHCP value\n");
-                               ret = false;
+                               ret = 1;
                                goto end;
                        }
                } else if (strcasecmp(argv[k], "ip") == 0) {
                        if (inet_aton(argv[k + 1], &nc.ip) == 0) {
                                printf("Incorrect IP value\n");
-                               ret = false;
+                               ret = 1;
                                goto end;
                        }
                } else if (strcasecmp(argv[k], "mask") == 0) {
                        /* TODO: check if it is a correct mask */
                        if (inet_aton(argv[k + 1], &nc.netmask) == 0) {
                                printf("Incorrect mask value\n");
-                               ret = false;
+                               ret = 1;
                                goto end;
                        }
                } else if (strcasecmp(argv[k], "gw") == 0) {
                        if (inet_aton(argv[k + 1], &nc.gw) == 0) {
                                printf("Incorrect gateway value\n");
-                               ret = false;
+                               ret = 1;
                                goto end;
                        }
                }
@@ -59,7 +58,7 @@ bool do_netconf_set (int argc, const char **argv, struct ngadmin *nga)
        i = ngadmin_setNetConf(nga, &nc);
        if (i != ERR_OK) {
                printErrCode(i);
-               ret = false;
+               ret = 1;
        }
        
 end:

diff --git a/cli/com_password.c b/cli/com_password.c
index f67ccc09e96c55b6d6aeaa38f8010ad2de421d05..0303b2b3c902abd53f1f4c1e2fa161a1b79a99ec 100644 (file)
--- a/cli/com_password.c
+++ b/cli/com_password.c
@@ -2,7 +2,7 @@
 #include "commands.h"
 
 
-bool do_password_change (int argc, const char **argv, struct ngadmin *nga)
+int do_password_change (int argc, const char **argv, struct ngadmin *nga)
 {
        int i;
        const struct swi_attr *sa;
@@ -10,24 +10,24 @@ bool do_password_change (int argc, const char **argv, struct ngadmin *nga)
        
        if (argc != 1) {
                printf("usage: password change <value>\n");
-               return false;
+               return 1;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               return false;
+               return 1;
        }
        
        i = ngadmin_changePassword(nga, argv[0]);
        printErrCode(i);
        
        
-       return true;
+       return 0;
 }
 
 
-bool do_password_set (int argc, const char **argv, struct ngadmin *nga)
+int do_password_set (int argc, const char **argv, struct ngadmin *nga)
 {
        int i;
        char buf[64];
@@ -36,7 +36,7 @@ bool do_password_set (int argc, const char **argv, struct ngadmin *nga)
        
        if (argc > 1) {
                printf("usage: password set [<value>]\n");
-               return false;
+               return 1;
        }
        
        if (argc == 0) {
@@ -59,7 +59,7 @@ bool do_password_set (int argc, const char **argv, struct ngadmin *nga)
        }
        
        
-       return true;
+       return 0;
 }
 
 

diff --git a/cli/com_ports.c b/cli/com_ports.c
index 866a84b49a5413ecabafd77e8bc723ac64dd730d..3337b435d3d2f9a8a22b0002bd095b98bcf6ef52 100644 (file)
--- a/cli/com_ports.c
+++ b/cli/com_ports.c
@@ -2,24 +2,23 @@
 #include "commands.h"
 
 
-bool do_ports_state (int argc, const char **argv UNUSED, struct ngadmin *nga)
+int do_ports_state (int argc, const char **argv UNUSED, struct ngadmin *nga)
 {
-       int i;
+       int i, ret = 0;
        const struct swi_attr *sa;
        unsigned char *ports = NULL;
-       bool ret = true;
        
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -27,7 +26,7 @@ bool do_ports_state (int argc, const char **argv UNUSED, struct ngadmin *nga)
        i = ngadmin_getPortsStatus(nga, ports);
        if (i < 0) {
                printErrCode(i);
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -65,46 +64,45 @@ end:
 }
 
 
-bool do_ports_statistics_reset (int argc, const char **argv UNUSED, struct ngadmin *nga)
+int do_ports_statistics_reset (int argc, const char **argv UNUSED, struct ngadmin *nga)
 {
        int i;
        
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               return false;
+               return 1;
        }
        
        if (ngadmin_getCurrentSwitch(nga) == NULL) {
                printf("must be logged\n");
-               return false;
+               return 1;
        }
        
        i = ngadmin_resetPortsStatistics(nga);
        printErrCode(i);
        
-       return true;
+       return 0;
 }
 
 
-bool do_ports_statistics_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
+int do_ports_statistics_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
 {
-       int i;
+       int i, ret = 0;
        const struct swi_attr *sa;
-       bool ret = true;
        struct port_stats *ps = NULL;
        
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -112,7 +110,7 @@ bool do_ports_statistics_show (int argc, const char **argv UNUSED, struct ngadmi
        i = ngadmin_getPortsStatistics(nga, ps);
        if (i < 0) {
                printErrCode(i);
-               ret = false;
+               ret = 1;
                goto end;
        }
        

diff --git a/cli/com_qos.c b/cli/com_qos.c
index ac2ea81823cc2a5f463e66a6d0ce0be0cdddbc00..7b51bd2f268e2b9734d7fc6f9c94fe47459ac00e 100644 (file)
--- a/cli/com_qos.c
+++ b/cli/com_qos.c
@@ -2,9 +2,9 @@
 #include "commands.h"
 
 
-bool do_qos_mode (int argc, const char **argv, struct ngadmin *nga)
+int do_qos_mode (int argc, const char **argv, struct ngadmin *nga)
 {
-       int i, s, ret = true;
+       int i, s, ret = 0;
        const struct swi_attr *sa;
        
        
@@ -16,7 +16,7 @@ bool do_qos_mode (int argc, const char **argv, struct ngadmin *nga)
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -26,7 +26,7 @@ bool do_qos_mode (int argc, const char **argv, struct ngadmin *nga)
                s = QOS_DOT;
        } else {
                printf("Unknown QOS mode\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -39,24 +39,23 @@ end:
 }
 
 
-bool do_qos_set (int argc, const char **argv, struct ngadmin *nga)
+int do_qos_set (int argc, const char **argv, struct ngadmin *nga)
 {
-       int i, p;
+       int i, p, ret = 0;
        const struct swi_attr *sa;
-       bool ret = true;
        char d = PRIO_UNSPEC, *ports = NULL;
        
        
        if (argc < 2) {
                printf("usage: qos set (all <prio0>)|(<port1> <prio1> [<port2> <prio2> ...])\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa ==NULL) {
                printf("must be logged\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -92,30 +91,30 @@ end:
 }
 
 
-bool do_qos_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
+int do_qos_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
 {
-       int i, s = 0, ret = true;
+       int i, s = 0, ret = 0;
        const struct swi_attr *sa;
        char *ports = NULL;
        
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
        i = ngadmin_getQOSMode(nga, &s);
        if (i != ERR_OK) {
                printErrCode(i);
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -139,7 +138,7 @@ bool do_qos_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
        i = ngadmin_getQOSValues(nga, ports);
        if (i != ERR_OK) {
                printErrCode(i);
-               ret = false;
+               ret = 1;
                goto end;
        }
        

diff --git a/cli/com_quit.c b/cli/com_quit.c
index 8a78fe16ec09e627d20bce9cdf149fbb7c5cf084..f27620bb2008b5e0709b39822c54e9b255c76b24 100644 (file)
--- a/cli/com_quit.c
+++ b/cli/com_quit.c
@@ -2,16 +2,16 @@
 #include "commands.h"
 
 
-bool do_quit (int argc, const char **argv UNUSED, struct ngadmin *nga UNUSED)
+int do_quit (int argc, const char **argv UNUSED, struct ngadmin *nga UNUSED)
 {
        if (argc > 0) {
                printf("this command takes no argument\n");
-               return false;
+               return 1;
        }
        
        main_loop_continue = 0;
        
-       return true;
+       return 0;
 }
 
 

diff --git a/cli/com_restart.c b/cli/com_restart.c
index 590ac6b0241959502230e75859e675e8f1005b49..c464828019c9ba42af6da76c6244cf68bac7d21f 100644 (file)
--- a/cli/com_restart.c
+++ b/cli/com_restart.c
@@ -2,23 +2,23 @@
 #include "commands.h"
 
 
-bool do_restart (int argc, const char **argv UNUSED, struct ngadmin *nga UNUSED)
+int do_restart (int argc, const char **argv UNUSED, struct ngadmin *nga UNUSED)
 {
-       int i, ret = true;
+       int i, ret = 0;
        const struct swi_attr *sa;
        char line[16];
        
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        

diff --git a/cli/com_scan.c b/cli/com_scan.c
index 7b96e5ea003129f59ecf54d48c3f7073cb93d5c9..f374d18e69f53b07ed01916c28a7a2b5ef87bc9f 100644 (file)
--- a/cli/com_scan.c
+++ b/cli/com_scan.c
@@ -2,7 +2,7 @@
 #include "commands.h"
 
 
-bool do_scan (int argc, const char **argv UNUSED, struct ngadmin *nga)
+int do_scan (int argc, const char **argv UNUSED, struct ngadmin *nga)
 {
        int i;
        const struct swi_attr *sa;
@@ -10,20 +10,20 @@ bool do_scan (int argc, const char **argv UNUSED, struct ngadmin *nga)
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               return false;
+               return 1;
        }
        
        i = ngadmin_scan(nga);
        if (i < 0) {
                printErrCode(i);
-               return false;
+               return 1;
        }
        
        sa = ngadmin_getSwitchTab(nga, &i);
        displaySwitchTab(sa, i);
        
        
-       return true;
+       return 0;
 }
 
 

diff --git a/cli/com_stormfilter.c b/cli/com_stormfilter.c
index 6f2f5165adb30a6935ae7df95861a76364b4d1a2..dbd91f82f4bfec47d32755519194e8f97151bea7 100644 (file)
--- a/cli/com_stormfilter.c
+++ b/cli/com_stormfilter.c
@@ -2,7 +2,7 @@
 #include "commands.h"
 
 
-bool do_stormfilter_enable (int argc, const char **argv UNUSED, struct ngadmin *nga)
+int do_stormfilter_enable (int argc, const char **argv UNUSED, struct ngadmin *nga)
 {
        int i;
        const struct swi_attr *sa;
@@ -10,24 +10,24 @@ bool do_stormfilter_enable (int argc, const char **argv UNUSED, struct ngadmin *
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               return false;
+               return 1;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               return false;
+               return 1;
        }
        
        i = ngadmin_setStormFilterState(nga, 1);
        printErrCode(i);
        
        
-       return true;
+       return 0;
 }
 
 
-bool do_stormfilter_disable (int argc, const char **argv UNUSED, struct ngadmin *nga)
+int do_stormfilter_disable (int argc, const char **argv UNUSED, struct ngadmin *nga)
 {
        int i;
        const struct swi_attr *sa;
@@ -35,40 +35,39 @@ bool do_stormfilter_disable (int argc, const char **argv UNUSED, struct ngadmin
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               return false;
+               return 1;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               return false;
+               return 1;
        }
        
        i = ngadmin_setStormFilterState(nga, 0);
        printErrCode(i);
        
        
-       return true;
+       return 0;
 }
 
 
-bool do_stormfilter_set (int argc, const char **argv, struct ngadmin *nga)
+int do_stormfilter_set (int argc, const char **argv, struct ngadmin *nga)
 {
-       int i, d = BITRATE_UNSPEC, p, *ports = NULL;
+       int i, d = BITRATE_UNSPEC, p, *ports = NULL, ret = 0;
        const struct swi_attr *sa;
-       bool ret = true;
        
        
        if (argc < 2) {
                printf("usage: stormfilt set (all <speed0>)|(<port1> <speed1> [<port2> <speed2> ...])\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -104,29 +103,29 @@ end:
 }
 
 
-bool do_stormfilter_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
+int do_stormfilter_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
 {
-       int i, s, ret = true, *ports = NULL;
+       int i, s, ret = 0, *ports = NULL;
        const struct swi_attr *sa;
        
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
        i = ngadmin_getStormFilterState(nga, &s);
        if (i != ERR_OK) {
                printErrCode(i);
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -141,7 +140,7 @@ bool do_stormfilter_show (int argc, const char **argv UNUSED, struct ngadmin *ng
        i = ngadmin_getStormFilterValues(nga, ports);
        if (i != ERR_OK) {
                printErrCode(i);
-               ret = false;
+               ret = 1;
                goto end;
        }
        

diff --git a/cli/com_tree.c b/cli/com_tree.c
index 4b4384b3e56b96b242e5b83f2a52b47056edacc4..b1dadff42d840ca069e64cabda818f955df43d84 100644 (file)
--- a/cli/com_tree.c
+++ b/cli/com_tree.c
@@ -20,16 +20,16 @@ static void display_node (const struct TreeNode *tn, int depth)
 }
 
 
-bool do_tree (int argc, const char **argv UNUSED, struct ngadmin *nga UNUSED)
+int do_tree (int argc, const char **argv UNUSED, struct ngadmin *nga UNUSED)
 {
        if (argc > 0) {
                printf("this command takes no argument\n");
-               return false;
+               return 1;
        }
        
        display_node(&commands, 0);
        
-       return true;
+       return 0;
 }
 
 

diff --git a/cli/com_vlan.c b/cli/com_vlan.c
index f70a6c941b411ea8c487563ca84d84ab075377cf..1e2b573dd60e368fa5fa1c0ee03a8dfdc9a49ab0 100644 (file)
--- a/cli/com_vlan.c
+++ b/cli/com_vlan.c
@@ -22,7 +22,7 @@ static char vlan_char (int t)
 }
 
 
-bool do_vlan_8021q_del (int argc, const char **argv, struct ngadmin *nga)
+int do_vlan_8021q_del (int argc, const char **argv, struct ngadmin *nga)
 {
        const struct swi_attr *sa;
        unsigned short vlan;
@@ -31,48 +31,47 @@ bool do_vlan_8021q_del (int argc, const char **argv, struct ngadmin *nga)
        
        if (argc != 1) {
                printf("usage: vlan 8021q del <vlan>\n");
-               return false;
+               return 1;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               return false;
+               return 1;
        }
        
        vlan=strtoul(argv[0], NULL, 0);
        if (vlan < 1 || vlan > VLAN_MAX) {
                printf("vlan out of range\n");
-               return false;
+               return 1;
        }
        
        i = ngadmin_VLANDestroy(nga, vlan);
        printErrCode(i);
        
        
-       return true;
+       return 0;
 }
 
 
-bool do_vlan_8021q_set (int argc, const char **argv, struct ngadmin *nga)
+int do_vlan_8021q_set (int argc, const char **argv, struct ngadmin *nga)
 {
        unsigned char *ports = NULL, p, def = VLAN_UNSPEC;
        const struct swi_attr *sa;
-       bool ret = true;
        unsigned short vlan;
-       int i, k = 0;
+       int i, k = 0, ret = 0;
        
        
        if (argc == 0) {
                printf("usage: vlan 802.1q set <vlan> [all unspec|no|untagged|tagged] [<port1> unspec|no|untagged|tagged ...]\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -81,7 +80,7 @@ bool do_vlan_8021q_set (int argc, const char **argv, struct ngadmin *nga)
        
        if (vlan < 1 || vlan > VLAN_MAX) {
                printf("vlan out of range\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -98,7 +97,7 @@ bool do_vlan_8021q_set (int argc, const char **argv, struct ngadmin *nga)
                        def = VLAN_UNSPEC;
                } else {
                        printf("incorrect type\n");
-                       ret = false;
+                       ret = 1;
                        goto end;
                }
                k++;
@@ -114,7 +113,7 @@ bool do_vlan_8021q_set (int argc, const char **argv, struct ngadmin *nga)
                p = strtoul(argv[k++], NULL, 0) - 1;
                if (p >= sa->ports) {
                        printf("port out of range\n");
-                       ret = false;
+                       ret = 1;
                        goto end;
                }
                if (strcasecmp(argv[k], "tagged") ==0) {
@@ -127,7 +126,7 @@ bool do_vlan_8021q_set (int argc, const char **argv, struct ngadmin *nga)
                        ports[p] = VLAN_UNSPEC;
                } else {
                        printf("incorrect type\n");
-                       ret = false;
+                       ret = 1;
                        goto end;
                }
                k++;
@@ -144,19 +143,18 @@ end:
 }
 
 
-bool do_vlan_8021q_show (int argc, const char **argv, struct ngadmin *nga)
+int do_vlan_8021q_show (int argc, const char **argv, struct ngadmin *nga)
 {
        unsigned short vl = 0, *vlans = NULL;
        unsigned char *ports = NULL;
        const struct swi_attr *sa;
-       int i, j, n = 16;
-       bool ret = true;
+       int i, j, n = 16, ret = 0;
        
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -178,7 +176,7 @@ bool do_vlan_8021q_show (int argc, const char **argv, struct ngadmin *nga)
        
        if (i != ERR_OK) {
                printErrCode(i);
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -212,7 +210,7 @@ end:
 }
 
 
-bool do_vlan_mode_set (int argc, const char **argv, struct ngadmin *nga)
+int do_vlan_mode_set (int argc, const char **argv, struct ngadmin *nga)
 {
        int mode, i;
        
@@ -225,49 +223,49 @@ bool do_vlan_mode_set (int argc, const char **argv, struct ngadmin *nga)
                "3 - basic 802.1Q\n"
                "4 - advanced 802.1Q\n"
                );
-               return true;
+               return 0;
        }
        
        if (ngadmin_getCurrentSwitch(nga) == NULL) {
                printf("must be logged\n");
-               return false;
+               return 1;
        }
        
        mode = strtoul(argv[0], NULL, 0);
        if (mode < 1 || mode > 4) {
                printf("mode out of range\n");
-               return false;
+               return 1;
        }
        
        i = ngadmin_setVLANType(nga, mode);
        printErrCode(i);
        
        
-       return true;
+       return 0;
 }
 
 
-bool do_vlan_mode_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
+int do_vlan_mode_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
 {
-       int i, t, ret = true;
+       int i, t, ret = 0;
        
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
        if (ngadmin_getCurrentSwitch(nga) == NULL) {
                printf("must be logged\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
        i = ngadmin_getVLANType(nga, &t);
        if (i != ERR_OK) {
                printErrCode(i);
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -304,7 +302,7 @@ end:
 }
 
 
-bool do_vlan_pvid_set (int argc, const char **argv, struct ngadmin *nga)
+int do_vlan_pvid_set (int argc, const char **argv, struct ngadmin *nga)
 {
        const struct swi_attr *sa;
        unsigned char port;
@@ -314,13 +312,13 @@ bool do_vlan_pvid_set (int argc, const char **argv, struct ngadmin *nga)
        
        if (argc != 2) {
                printf("usage: vlan pvid set <port> <vlan>\n");
-               return false;
+               return 1;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               return false;
+               return 1;
        }
        
        port = strtoul(argv[0], NULL, 0);
@@ -328,40 +326,39 @@ bool do_vlan_pvid_set (int argc, const char **argv, struct ngadmin *nga)
        
        if (port < 1 || port > sa->ports) {
                printf("port out of range\n");
-               return false;
+               return 1;
        }
        
        if (vlan < 1 || vlan > VLAN_MAX) {
                printf("vlan out of range\n");
-               return false;
+               return 1;
        }
        
        i = ngadmin_setPVID(nga, port, vlan);
        printErrCode(i);
        
        
-       return true;
+       return 0;
 }
 
 
-bool do_vlan_pvid_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
+int do_vlan_pvid_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
 {
        unsigned short *ports = NULL;
        const struct swi_attr *sa;
-       int i;
-       bool ret = true;
+       int i, ret = 0;
        
        
        if (argc > 0) {
                printf("this command takes no argument\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
        sa = ngadmin_getCurrentSwitch(nga);
        if (sa == NULL) {
                printf("must be logged\n");
-               ret = false;
+               ret = 1;
                goto end;
        }
        
@@ -369,7 +366,7 @@ bool do_vlan_pvid_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
        i = ngadmin_getAllPVID(nga, ports);
        if (i != ERR_OK) {
                printErrCode(i);
-               ret = false;
+               ret = 1;
                goto end;
        }
        

diff --git a/cli/commands.c b/cli/commands.c
index c5809e92bb2a41fcc50374d4250ef6724f826a78..6d6bc2ac88dc17b11bd705566be21481cd50b686 100644 (file)
--- a/cli/commands.c
+++ b/cli/commands.c
@@ -3,104 +3,104 @@
 
 
 /* bitrate */
-bool do_bitrate_set (int argc, const char **argv, struct ngadmin *nga);
-bool do_bitrate_show (int argc, const char **argv, struct ngadmin *nga);
+int do_bitrate_set (int argc, const char **argv, struct ngadmin *nga);
+int do_bitrate_show (int argc, const char **argv, struct ngadmin *nga);
 
 
 /* cabletest */
-bool do_cabletest (int argc, const char **argv, struct ngadmin *nga);
+int do_cabletest (int argc, const char **argv, struct ngadmin *nga);
 
 
 /* defaults */
-bool do_defaults (int argc, const char **argv, struct ngadmin *nga);
+int do_defaults (int argc, const char **argv, struct ngadmin *nga);
 
 
 /* firmware */
-bool do_firmware_show (int argc, const char **argv, struct ngadmin *nga);
-bool do_firmware_upgrade (int argc, const char **argv, struct ngadmin *nga);
+int do_firmware_show (int argc, const char **argv, struct ngadmin *nga);
+int do_firmware_upgrade (int argc, const char **argv, struct ngadmin *nga);
 
 
 /* help */
-bool do_help (int argc, const char **argv, struct ngadmin *nga);
+int do_help (int argc, const char **argv, struct ngadmin *nga);
 
 
 /* igmp */
-bool do_igmp_set (int argc, const char **argv, struct ngadmin *nga);
-bool do_igmp_show (int argc, const char **argv, struct ngadmin *nga);
+int do_igmp_set (int argc, const char **argv, struct ngadmin *nga);
+int do_igmp_show (int argc, const char **argv, struct ngadmin *nga);
 
 
 /* list */
-bool do_list (int argc, const char **argv, struct ngadmin *nga);
+int do_list (int argc, const char **argv, struct ngadmin *nga);
 
 
 /* login */
-bool do_login (int argc, const char **argv, struct ngadmin *nga);
+int do_login (int argc, const char **argv, struct ngadmin *nga);
 
 
 /* mirror */
-bool do_mirror_disable (int argc, const char **argv, struct ngadmin *nga);
-bool do_mirror_set (int argc, const char **argv, struct ngadmin *nga);
-bool do_mirror_show (int argc, const char **argv, struct ngadmin *nga);
+int do_mirror_disable (int argc, const char **argv, struct ngadmin *nga);
+int do_mirror_set (int argc, const char **argv, struct ngadmin *nga);
+int do_mirror_show (int argc, const char **argv, struct ngadmin *nga);
 
 
 /* name */
-bool do_name_show (int argc, const char **argv, struct ngadmin *nga);
-bool do_name_set (int argc, const char **argv, struct ngadmin *nga);
-bool do_name_clear (int argc, const char **argv, struct ngadmin *nga);
+int do_name_show (int argc, const char **argv, struct ngadmin *nga);
+int do_name_set (int argc, const char **argv, struct ngadmin *nga);
+int do_name_clear (int argc, const char **argv, struct ngadmin *nga);
 
 
 /* netconf */
-bool do_netconf_set (int argc, const char **argv, struct ngadmin *nga);
+int do_netconf_set (int argc, const char **argv, struct ngadmin *nga);
 
 
 /* password */
-bool do_password_change (int argc, const char **argv, struct ngadmin *nga);
-bool do_password_set (int argc, const char **argv, struct ngadmin *nga);
+int do_password_change (int argc, const char **argv, struct ngadmin *nga);
+int do_password_set (int argc, const char **argv, struct ngadmin *nga);
 
 
 /* ports */
-bool do_ports_state (int argc, const char **argv, struct ngadmin *nga);
-bool do_ports_statistics_reset (int argc, const char **argv, struct ngadmin *nga);
-bool do_ports_statistics_show (int argc, const char **argv, struct ngadmin *nga);
+int do_ports_state (int argc, const char **argv, struct ngadmin *nga);
+int do_ports_statistics_reset (int argc, const char **argv, struct ngadmin *nga);
+int do_ports_statistics_show (int argc, const char **argv, struct ngadmin *nga);
 
 
 /* qos */
-bool do_qos_mode (int argc, const char **argv, struct ngadmin *nga);
-bool do_qos_set (int argc, const char **argv, struct ngadmin *nga);
-bool do_qos_show (int argc, const char **argv, struct ngadmin *nga);
+int do_qos_mode (int argc, const char **argv, struct ngadmin *nga);
+int do_qos_set (int argc, const char **argv, struct ngadmin *nga);
+int do_qos_show (int argc, const char **argv, struct ngadmin *nga);
 
 
 /* quit */
-bool do_quit (int argc, const char **argv, struct ngadmin *nga);
+int do_quit (int argc, const char **argv, struct ngadmin *nga);
 
 
 /* restart */
-bool do_restart (int argc, const char **argv, struct ngadmin *nga);
+int do_restart (int argc, const char **argv, struct ngadmin *nga);
 
 
 /* scan */
-bool do_scan (int argc, const char **argv, struct ngadmin *nga);
+int do_scan (int argc, const char **argv, struct ngadmin *nga);
 
 
 /* stormfilter */
-bool do_stormfilter_enable (int argc, const char **argv, struct ngadmin *nga);
-bool do_stormfilter_disable (int argc, const char **argv, struct ngadmin *nga);
-bool do_stormfilter_set (int argc, const char **argv, struct ngadmin *nga);
-bool do_stormfilter_show (int argc, const char **argv, struct ngadmin *nga);
+int do_stormfilter_enable (int argc, const char **argv, struct ngadmin *nga);
+int do_stormfilter_disable (int argc, const char **argv, struct ngadmin *nga);
+int do_stormfilter_set (int argc, const char **argv, struct ngadmin *nga);
+int do_stormfilter_show (int argc, const char **argv, struct ngadmin *nga);
 
 
 /* tree */
-bool do_tree (int argc, const char **argv, struct ngadmin *nga);
+int do_tree (int argc, const char **argv, struct ngadmin *nga);
 
 
 /* vlan */
-bool do_vlan_8021q_del (int argc, const char **argv, struct ngadmin *nga);
-bool do_vlan_8021q_set (int argc, const char **argv, struct ngadmin *nga);
-bool do_vlan_8021q_show (int argc, const char **argv, struct ngadmin *nga);
-bool do_vlan_mode_set (int argc, const char **argv, struct ngadmin *nga);
-bool do_vlan_mode_show (int argc, const char **argv, struct ngadmin *nga);
-bool do_vlan_pvid_set (int argc, const char **argv, struct ngadmin *nga);
-bool do_vlan_pvid_show (int argc, const char **argv, struct ngadmin *nga);
+int do_vlan_8021q_del (int argc, const char **argv, struct ngadmin *nga);
+int do_vlan_8021q_set (int argc, const char **argv, struct ngadmin *nga);
+int do_vlan_8021q_show (int argc, const char **argv, struct ngadmin *nga);
+int do_vlan_mode_set (int argc, const char **argv, struct ngadmin *nga);
+int do_vlan_mode_show (int argc, const char **argv, struct ngadmin *nga);
+int do_vlan_pvid_set (int argc, const char **argv, struct ngadmin *nga);
+int do_vlan_pvid_show (int argc, const char **argv, struct ngadmin *nga);
 
 
 /* commands structure */

diff --git a/cli/commands.h b/cli/commands.h
index 5707dc099ec15390978d303f2b2911ac377baafb..2aeada5d345a1e4b0594d919e5c120ae53f132a3 100644 (file)
--- a/cli/commands.h
+++ b/cli/commands.h
@@ -8,7 +8,7 @@
 
 struct TreeNode {
        const char *name;
-       bool (* const comfunc)(int, const char**, struct ngadmin*);
+       int (*comfunc)(int, const char**, struct ngadmin*);
        const struct TreeNode *sub;
 };