diff options
author | Yves Fischer <yvesf-git@xapek.org> | 2014-08-11 23:26:36 +0200 |
---|---|---|
committer | Yves Fischer <yvesf-git@xapek.org> | 2014-08-11 23:26:36 +0200 |
commit | 5d8801d4687035ae45143f0f3bc3eeaf75dc17ec (patch) | |
tree | bf4395fd5938eb1865ba90b6e52e169d727d9404 /jni/iodine/src/windows.h | |
parent | 1251ce0d7cf2619f9b41637dcb88bebb66e54fb3 (diff) | |
download | andiodine-5d8801d4687035ae45143f0f3bc3eeaf75dc17ec.tar.gz andiodine-5d8801d4687035ae45143f0f3bc3eeaf75dc17ec.zip |
Upgrade code to iodine 0.7.0 and improve logging
Diffstat (limited to 'jni/iodine/src/windows.h')
-rw-r--r-- | jni/iodine/src/windows.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/jni/iodine/src/windows.h b/jni/iodine/src/windows.h index 7e0e16c..c665a60 100644 --- a/jni/iodine/src/windows.h +++ b/jni/iodine/src/windows.h @@ -1,5 +1,6 @@ /*
- * Copyright (c) 2006-2009 Bjorn Andersson <flex@kryo.se>, Erik Ekman <yarrick@kryo.se>
+ * Copyright (c) 2006-2014 Erik Ekman <yarrick@kryo.se>,
+ * 2006-2009 Bjorn Andersson <flex@kryo.se>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -19,9 +20,9 @@ typedef unsigned int in_addr_t;
+#include <winsock2.h>
#include <windows.h>
#include <windns.h>
-#include <winsock2.h>
#include <ws2tcpip.h>
#include <iphlpapi.h>
@@ -94,7 +95,8 @@ DWORD WINAPI tun_reader(LPVOID arg); struct tun_data {
HANDLE tun;
int sock;
- struct sockaddr_in addr;
+ struct sockaddr_storage addr;
+ int addrlen;
};
#endif
|