Cleanup Commit

[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 47798a8..ba78838 100644 (file)
--- a/Usermode/Applications/ifconfig_src/main.c
+++ b/Usermode/Applications/ifconfig_src/main.c
@@ -61,7 +61,6 @@ void DumpInterfaces(int DumpAll)
        while( readdir(dp, filename) )
        {
                if(filename[0] == '.')  continue;
-               if(filename[0] != 'i' || filename[1] != 'p')    continue;
                
                fd = open(path, OPENFLAG_READ);
                if(fd == -1) {
@@ -71,6 +70,13 @@ void DumpInterfaces(int DumpAll)
                type = ioctl(fd, 4, NULL);
                
                printf("%s:\t", filename);
+               {
+                       int len = ioctl(fd, ioctl(fd, 3, "get_device"), NULL);
+                       char *buf = malloc(len+1);
+                       ioctl(fd, ioctl(fd, 3, "get_device"), buf);
+                       printf("'%s'\t", buf);
+                       free(buf);
+               }
                switch(type)
                {
                case 0:
@@ -126,7 +132,7 @@ int AddInterface( char *Device )
                return -1;
        }
        
-       printf("-- Added '"IPSTACK_ROOT"/ip%i' using device %s\n", ret, Device);
+       printf("-- Added '"IPSTACK_ROOT"/%i' using device %s\n", ret, Device);
        
        return ret;
 }
@@ -135,13 +141,14 @@ int DoAutoConfig( char *Device )
 {
         int    tmp, fd;
        char    path[sizeof(IPSTACK_ROOT)+5+1]; // ip000
-       uint8_t addr[4] = {192,168,1,39};
-       uint8_t gw[4] = {192,168,1,1};
+       uint8_t addr[4] = {10,0,2,55};
+       uint8_t gw[4] = {10,0,2,1};
+        int    subnet = 8;
        
        tmp = AddInterface(Device);
        if( tmp < 0 )   return tmp;
        
-       sprintf(path, IPSTACK_ROOT"/ip%i", tmp);
+       sprintf(path, IPSTACK_ROOT"/%i", tmp);
        
        fd = open(path, OPENFLAG_READ);
        if( fd == -1 ) {
@@ -158,14 +165,16 @@ int DoAutoConfig( char *Device )
        // Set Address
        ioctl(fd, ioctl(fd, 3, "set_address"), addr);
        // Set Subnet
-       tmp = 24;
-       ioctl(fd, ioctl(fd, 3, "getset_subnet"), &tmp);
+       ioctl(fd, ioctl(fd, 3, "getset_subnet"), &subnet);
        // Set Gateway
        ioctl(fd, ioctl(fd, 3, "set_gateway"), gw);
        
        close(fd);
        
-       printf("Set address to 192.168.1.39/24 (GW: 192.168.1.1)\n");
+       printf("Set address to %i.%i.%i.%i/%i (GW: %i.%i.%i.%i)\n",
+               addr[0], addr[1], addr[2], addr[3],
+               subnet,
+               gw[0], gw[1], gw[2], gw[3]);
        
        return 0;
 }