Fix network configuration modification

[ngadmin] / cli / src / com_netconf.c

diff --git a/cli/src/com_netconf.c b/cli/src/com_netconf.c
index d44b83a161260464f902bb10faa8cd59f63439ec..277d750c5fb1e561fb06811687a07c5de23d0d52 100644 (file)
--- a/cli/src/com_netconf.c
+++ b/cli/src/com_netconf.c
@@ -2,6 +2,34 @@
 #include "commands.h"
 
 
+int do_netconf_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
+{
+       const struct swi_attr *sa;
+       const struct net_conf *nc;
+       
+       
+       if (argc > 0) {
+               printf("this command takes no argument\n");
+               return 1;
+       }
+       
+       sa = ngadmin_getCurrentSwitch(nga);
+       if (sa == NULL) {
+               printf("must be logged\n");
+               return 1;
+       }
+       nc = &sa->nc;
+       
+       printf("DHCP\t : %s\n", nc->dhcp ? "yes" : "no");
+       printf("IP\t : %s\n", inet_ntoa(nc->ip));
+       printf("Netmask\t : %s\n", inet_ntoa(nc->netmask));
+       printf("Gateway\t : %s\n", inet_ntoa(nc->gw));
+       
+       
+       return 0;
+}
+
+
 int do_netconf_set (int argc, const char **argv, struct ngadmin *nga)
 {
        int i, k, ret = 0;
@@ -20,9 +48,9 @@ int do_netconf_set (int argc, const char **argv, struct ngadmin *nga)
                return 1;
        }
        
-       memset(&nc, 0, sizeof(struct net_conf));
+       memcpy(&nc, &sa->nc, sizeof(struct net_conf));
        
-       for (k = 0; k < argc; k += 2) {
+       for (k = 0; k < argc - 1; k += 2) {
                if (strcasecmp(argv[k], "dhcp") == 0) {
                        if (strcasecmp(argv[k + 1], "yes") == 0) {
                                nc.dhcp = true;