Fixed compile issues in AxWin2 WM

[tpg/acess2.git] / Usermode / Applications / ifconfig_src / main.c

diff --git a/Usermode/Applications/ifconfig_src/main.c b/Usermode/Applications/ifconfig_src/main.c
index c3ae316..3a45530 100644 (file)
--- a/Usermode/Applications/ifconfig_src/main.c
+++ b/Usermode/Applications/ifconfig_src/main.c
@@ -174,9 +174,10 @@ void DumpInterface(const char *Name)
                 int    len = ioctl(fd, call_num, NULL);
                char    *buf = malloc(len+1);
                ioctl(fd, call_num, buf);
-               printf("'%s'\t", buf);
+               printf("'%s'\n", buf);
                free(buf);
        }
+       printf("\t");
        // Get the address type
        switch(type)
        {
@@ -187,20 +188,20 @@ void DumpInterface(const char *Name)
                {
                uint8_t ip[4];
                 int    subnet;
-               printf("IPv4\n");
+               printf("IPv4\t");
                ioctl(fd, 5, ip);       // Get IP Address
                subnet = ioctl(fd, 7, NULL);    // Get Subnet Bits
-               printf("\tAddress: %i.%i.%i.%i/%i\n", ip[0], ip[1], ip[2], ip[3], subnet);
+               printf("%i.%i.%i.%i/%i\n", ip[0], ip[1], ip[2], ip[3], subnet);
                }
                break;
        case 6: // IPv6
                {
                uint16_t        ip[8];
                 int    subnet;
-               printf("IPv6\n");
+               printf("IPv6\t");
                ioctl(fd, 5, ip);       // Get IP Address
                subnet = ioctl(fd, 7, NULL);    // Get Subnet Bits
-               printf("\t%x:%x:%x:%x:%x:%x:%x:%x/%i\n",
+               printf("%x:%x:%x:%x:%x:%x:%x:%x/%i\n",
                        ntohs(ip[0]), ntohs(ip[1]), ntohs(ip[2]), ntohs(ip[3]),
                        ntohs(ip[4]), ntohs(ip[5]), ntohs(ip[6]), ntohs(ip[7]),
                        subnet);
@@ -210,7 +211,6 @@ void DumpInterface(const char *Name)
                printf("UNKNOWN (%i)\n", type);
                break;
        }
-       printf("\n");
                        
        close(fd);
 }
@@ -348,8 +348,8 @@ int DoAutoConfig(const char *Device)
         int    tmp, fd;
        char    path[sizeof(IPSTACK_ROOT)+1+4+1];       // /0000
        uint8_t addr[4] = {10,0,2,55};
-       uint8_t gw[4] = {10,0,2,1};
-        int    subnet = 8;
+       uint8_t gw[4] = {10,0,2,2};
+        int    subnet = 24;
        
        tmp = AddInterface(Device);
        if( tmp < 0 )   return tmp;
@@ -376,7 +376,7 @@ int DoAutoConfig(const char *Device)
        // Set routes
        {
                uint8_t net[4] = {0,0,0,0};
-               AddRoute(path + sizeof(IPSTACK_ROOT), addr, 8, net);    // This interface
+               AddRoute(path + sizeof(IPSTACK_ROOT), addr, subnet, net);       // This interface
                AddRoute(path + sizeof(IPSTACK_ROOT), net, 0, gw);      // Gateway
        }