Compile fixes, implemented Net_GetInterface

diff --git a/Usermode/Applications/irc_src/Makefile b/Usermode/Applications/irc_src/Makefile
index 98fa2bb..b51ed6a 100644 (file)
--- a/Usermode/Applications/irc_src/Makefile
+++ b/Usermode/Applications/irc_src/Makefile
@@ -5,6 +5,6 @@
 LDFLAGS += -lnet
 
 OBJ = main.o
-BIN = ../ls
+BIN = ../irc
 
 -include ../Makefile.tpl

diff --git a/Usermode/Applications/irc_src/main.c b/Usermode/Applications/irc_src/main.c
index c202c6b..119e025 100644 (file)
--- a/Usermode/Applications/irc_src/main.c
+++ b/Usermode/Applications/irc_src/main.c
@@ -193,7 +193,8 @@ int writef(int FD, const char *Format, ...)
  */\r
 int OpenTCP(const char *AddressString, short PortNumber)\r
 {\r
-        int    fd, addrType, iface;\r
+        int    fd, addrType;\r
+       char    *iface;\r
        char    addrBuffer[8];\r
        \r
        // Parse IP Address\r
@@ -205,7 +206,7 @@ int OpenTCP(const char *AddressString, short PortNumber)
        \r
        // Finds the interface for the destination address\r
        iface = Net_GetInterface(addrType, addrBuffer);\r
-       if( iface == -1 ) {\r
+       if( iface == NULL ) {\r
                fprintf(stderr, "Unable to find a route to '%s'\n", AddressString);\r
                return -1;\r
        }\r
@@ -213,12 +214,14 @@ int OpenTCP(const char *AddressString, short PortNumber)
        // Open client socket\r
        // TODO: Move this out to libnet?\r
        {\r
-                int    len = snprintf(NULL, 100, "/Devices/ip/%i/tcpc", iface);\r
+                int    len = snprintf(NULL, 100, "/Devices/ip/%s/tcpc", iface);\r
                char    path[len+1];\r
-               snprintf(path, 100, "/Devices/ip/%i/tcpc", iface);\r
+               snprintf(path, 100, "/Devices/ip/%s/tcpc", iface);\r
                fd = open(path, OPENFLAG_READ|OPENFLAG_WRITE);\r
        }\r
        \r
+       free(iface);\r
+       \r
        if( fd == -1 ) {\r
                return -1;\r
        }\r

diff --git a/Usermode/Libraries/libnet.so_src/main.c b/Usermode/Libraries/libnet.so_src/main.c
index 526e296..938d114 100644 (file)
--- a/Usermode/Libraries/libnet.so_src/main.c
+++ b/Usermode/Libraries/libnet.so_src/main.c
@@ -6,9 +6,87 @@
  * - Library main (and misc functions)
  */
 #include <net.h>
+#include <acess/sys.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
 
 // === CODE ===
 int SoMain(void)
 {
        return 0;
 }
+
+int Net_GetAddressSize(int AddressType)
+{
+       switch(AddressType)
+       {
+       case 4: return 4;       // IPv4
+       case 6: return 16;      // IPv6
+       default:
+               return 0;
+       }
+}
+
+//TODO: Move out to another file
+char *Net_GetInterface(int AddressType, void *Address)
+{
+        int    size, routeNum;
+        int    fd;
+       size = Net_GetAddressSize(AddressType);
+       
+       if( size == 0 ) {
+               fprintf(stderr, "BUG: AddressType = %i unknown\n", AddressType);
+               return NULL;
+       }
+       
+       // Query the route manager for the route number
+       {
+               char    buf[sizeof(int)+size];
+               
+               // Open
+               fd = open("/Devices/ip/routes", 0);
+               if( !fd ) {
+                       fprintf(stderr, "ERROR: It seems that '/Devices/ip/routes' does not exist, are you running Acess2?\n");
+                       return NULL;
+               }
+               
+               // Make structure and ask
+               *(int*)buf = AddressType;
+               memcpy(&buf[sizeof(int)], Address, size);
+               routeNum = ioctl(fd, ioctl(fd, 3, "locate_route"), buf);
+               
+               // Close
+               close(fd);
+       }
+       
+       // Check answer validity
+       if( routeNum > 0 ) {
+                int    len = sprintf(NULL, "/Devices/ip/routes/%i", routeNum);
+               char    buf[len+1];
+               char    *ret;
+               
+               sprintf(buf, "/Devices/ip/routes/%i", routeNum);
+               
+               // Open route
+               fd = open(buf, 0);
+               if( !fd )       return NULL;    // Shouldn't happen :/
+               
+               // Allocate space for name
+               ret = malloc( ioctl(fd, ioctl(fd, 3, "get_interface"), NULL) + 1 );
+               if( !ret ) {
+                       fprintf(stderr, "malloc() failure - Allocating space for interface name\n");
+                       return NULL;
+               }
+               
+               // Get name
+               ioctl(fd, ioctl(fd, 3, "get_interface"), ret);
+               
+               // Close and return
+               close(fd);
+               
+               return ret;
+       }
+       
+       return NULL;    // Error
+}

diff --git a/Usermode/Libraries/libnet.so_src/net.h b/Usermode/Libraries/libnet.so_src/net.h
index 05deb9f..7c7a9b5 100644 (file)
--- a/Usermode/Libraries/libnet.so_src/net.h
+++ b/Usermode/Libraries/libnet.so_src/net.h
@@ -20,6 +20,6 @@ extern int    Net_ParseAddress(const char *String, void *Addr);
  * \param Addr Address in binary format
  * \return Interface number
  */
-extern int     Net_GetInterface(int AddrType, void *Addr);
+extern char    *Net_GetInterface(int AddrType, void *Addr);
 
 #endif