Use our own port when connecting to ourself.

[tinc] / src / mingw / device.c

diff --git a/src/mingw/device.c b/src/mingw/device.c
index e1fbf22..0ae0cf2 100644 (file)
--- a/src/mingw/device.c
+++ b/src/mingw/device.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: device.c,v 1.1.2.7 2003/07/29 23:21:01 guus Exp $
+    $Id: device.c,v 1.1.2.11 2003/08/03 21:45:41 guus Exp $
 */
 
 #include "system.h"
@@ -32,13 +32,9 @@
 #include "utils.h"
 #include "xalloc.h"
 
-#define NETCARD_REG_KEY_2000 "SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}"
-#define NETCARD_REG_KEY      "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\NetworkCards"
-#define REG_SERVICE_KEY      "SYSTEM\\CurrentControlSet\\Services"
 #define REG_CONTROL_NET      "SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}"
 
 #define USERMODEDEVICEDIR "\\\\.\\"
-#define SYSDEVICEDIR  "\\Device\\"
 #define USERDEVICEDIR "\\??\\"
 #define TAPSUFFIX     ".tap"
 
@@ -48,9 +44,6 @@
 #define TAP_IOCTL_GET_MAC        TAP_CONTROL_CODE(1, METHOD_BUFFERED)
 #define TAP_IOCTL_SET_STATISTICS TAP_CONTROL_CODE(2, METHOD_BUFFERED)
 
-/* FIXME: This only works for Windows 2000 */
-#define OSTYPE 5
-
 int device_fd = 0;
 HANDLE device_handle = INVALID_HANDLE_VALUE;
 char *device = NULL;
@@ -60,6 +53,8 @@ char *device_info = NULL;
 int device_total_in = 0;
 int device_total_out = 0;
 
+extern char *myport;
+
 DWORD WINAPI tapreader(void *bla) {
        int sock, err, status;
        struct addrinfo *ai;
@@ -75,7 +70,7 @@ DWORD WINAPI tapreader(void *bla) {
 
        /* Open a socket to the parent process */
 
-       err = getaddrinfo(NULL, "12345", &hint, &ai);
+       err = getaddrinfo(NULL, myport, &hint, &ai);
 
        if(err || !ai) {
                logger(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(errno));
@@ -147,7 +142,7 @@ bool setup_device(void)
                .ai_family = AF_UNSPEC,
                .ai_socktype = SOCK_DGRAM,
                .ai_protocol = IPPROTO_UDP,
-               .ai_flags = AI_PASSIVE,
+               .ai_flags = 0,
        };
 
        cp();
@@ -158,7 +153,7 @@ bool setup_device(void)
        /* Open registry and look for network adapters */
 
        if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, REG_CONTROL_NET, 0, KEY_READ, &key)) {
-               logger(LOG_ERR, _("Unable to read registry"));
+               logger(LOG_ERR, _("Unable to read registry: %s"), winerror(GetLastError()));
                return false;
        }
 
@@ -177,7 +172,7 @@ bool setup_device(void)
                len = sizeof(adaptername);
                RegQueryValueEx(key2, "Name", 0, 0, adaptername, &len);
 
-               RegKeyClose(key2);
+               RegCloseKey(key2);
 
                if(device) {
                        if(!strcmp(device, adapterid)) {
@@ -203,7 +198,7 @@ bool setup_device(void)
                }
        }
 
-       RegKeyClose(key);
+       RegCloseKey(key);
 
        if(!found) {
                logger(LOG_ERR, _("No Windows tap device found!"));
@@ -241,7 +236,7 @@ bool setup_device(void)
 
        /* Create a listening socket */
 
-       err = getaddrinfo(NULL, "12345", &hint, &ai);
+       err = getaddrinfo(NULL, myport, &hint, &ai);
 
        if(err || !ai) {
                logger(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(errno));
@@ -272,7 +267,7 @@ bool setup_device(void)
        thread = CreateThread(NULL, 0, tapreader, NULL, 0, NULL);
 
        if(!thread) {
-               logger(LOG_ERR, _("System call `%s' failed: %s"), "CreateThread", strerror(errno));
+               logger(LOG_ERR, _("System call `%s' failed: %s"), "CreateThread", winerror(GetLastError()));
                return false;
        }
 
@@ -332,7 +327,7 @@ bool write_packet(vpn_packet_t *packet)
                           packet->len, device_info);
 
        if(!WriteFile(device_handle, packet->data, packet->len, &lenout, &overlapped)) {
-               logger(LOG_ERR, _("Error while writing to %s %s"), device_info, device);
+               logger(LOG_ERR, _("Error while writing to %s %s: %s"), device_info, device, winerror(GetLastError()));
                return false;
        }