A bunch of fixes for various compiler warnings

[gsconf] / main.c

diff --git a/main.c b/main.c
index 60f2ba4b66568acd665f97df861c8ff37afb5fe5..582e47c1c35cfa2d02744ce2c48261677629ba36 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include "socket.h"
-#include "packet.h"
+
 #include "gs105e.h"
 #include <stdlib.h>
 #include <string.h>
@@ -8,51 +8,17 @@
 #include <pwd.h>
 int shellHandler = 0;
 
-/*void shellHandlers[] = {
 
-        
-}*/
 
 
 int main () {
-        int n;
-        
         init_socket();
         
         myMac = get_mac("eth0");
         
         gs105e_init();
 
-        shell();
-        /*
-        printf("Model: %s\n", settings.model);
-        struct vlan * vl = settings.vlans;
-        
-        if (vl == NULL) {
-                printf("NO Vlans\n");
-        } else
-                printf("Vlans\n");
-        
-        while (vl != NULL) {
-                printf("%u\t", vl->id);
-                for (n = 0; n < 5; n++)
-                        printf("%c\t", vl->members & (0x80 >> n) ? (vl->tag & (0x80 >> n) ? 'T' : 'U') : '-', (unsigned int) vl->members);
-                printf("\n");
-                vl = vl->next;
-        }
-        
-        for (n = 0; n < 5; n++) {
-                printf("Port %u\t%s\t\t%lu Bytes in\t\t%lu Bytes out\n", n + 1, 
-                        (settings.portStatistics[n].state == 0x05 ? "1000 Mbit/s" : (settings.portStatistics[n].state == 0x04 ? "100 Mbit/s" : (settings.portStatistics[n].state == 0x03 ? "10 Mbit/s":  (settings.portStatistics[n].state == 0x00 ? "no connection": "???")))), settings.portStatistics[n].bytesIn, settings.portStatistics[n].bytesOut);
-        }
-        
-        
-        
-        //settings.password = "password";
-        
-        //gs105e_mirrorPorts(3, MSK_PORT1|MSK_PORT4);
-
-        */
+        return shell();
 }