Mercurial > hg > quicktun
annotate src/common.c @ 54:4ff8003d0973
Fix for OpenBSD tun/tap initialization
author | Ivo Smits <Ivo@UCIS.nl> |
---|---|
date | Sat, 23 Nov 2013 16:58:54 +0100 |
parents | 3115f8af98bb |
children | 5685fad38195 |
rev | line source |
---|---|
0 | 1 /* Copyright 2010 Ivo Smits <Ivo@UCIS.nl>. All rights reserved. |
2 Redistribution and use in source and binary forms, with or without modification, are | |
3 permitted provided that the following conditions are met: | |
4 | |
5 1. Redistributions of source code must retain the above copyright notice, this list of | |
6 conditions and the following disclaimer. | |
7 | |
8 2. Redistributions in binary form must reproduce the above copyright notice, this list | |
9 of conditions and the following disclaimer in the documentation and/or other materials | |
10 provided with the distribution. | |
11 | |
12 THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED | |
13 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND | |
14 FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR | |
15 CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
16 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | |
17 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | |
18 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | |
19 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |
20 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
21 | |
22 The views and conclusions contained in the software and documentation are those of the | |
23 authors and should not be interpreted as representing official policies, either expressed | |
24 or implied, of Ivo Smits.*/ | |
25 | |
26 #include <stdio.h> | |
27 #include <stdlib.h> | |
28 #include <string.h> | |
29 #include <fcntl.h> | |
36
1fe62a94c28a
Added option SETUID to drop privileges
Ivo Smits <Ivo@UCIS.nl>
parents:
35
diff
changeset
|
30 #include <pwd.h> |
0 | 31 #ifndef HAVE_NETINET_IN_H |
32 #include <netinet/in.h> | |
33 #endif | |
34 #include <sys/ioctl.h> | |
7 | 35 #include <sys/socket.h> |
0 | 36 #include <poll.h> |
37 #include <netdb.h> | |
38 #include <stdlib.h> | |
8
6d86596d8884
Fixed BSD support, improved randombytes/secret key generation
ivo <Ivo@UCIS.nl>
parents:
7
diff
changeset
|
39 #include <net/if.h> |
7 | 40 #ifdef linux |
41 #include <linux/if_tun.h> | |
42 #include <linux/if_ether.h> | |
43 #else | |
44 #define ETH_FRAME_LEN 1514 | |
45 #include <net/if_tun.h> | |
13 | 46 #ifdef SOLARIS |
47 #include <sys/stropts.h> | |
48 #include <sys/sockio.h> | |
49 #endif | |
7 | 50 #endif |
0 | 51 |
52 #define MAX_PACKET_LEN (ETH_FRAME_LEN+4) //Some space for optional packet information | |
53 | |
47
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
54 typedef union { |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
55 struct sockaddr any; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
56 struct sockaddr_in ip4; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
57 struct sockaddr_in6 ip6; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
58 } sockaddr_any; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
59 |
0 | 60 struct qtsession; |
61 struct qtproto { | |
62 int encrypted; | |
63 int buffersize_raw; | |
64 int buffersize_enc; | |
65 int offset_raw; | |
66 int offset_enc; | |
67 int (*encode)(struct qtsession* sess, char* raw, char* enc, int len); | |
68 int (*decode)(struct qtsession* sess, char* enc, char* raw, int len); | |
69 int (*init)(struct qtsession* sess); | |
70 int protocol_data_size; | |
41
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
71 void (*idle)(struct qtsession* sess); |
0 | 72 }; |
73 struct qtsession { | |
74 struct qtproto protocol; | |
75 void* protocol_data; | |
76 int fd_socket; | |
77 int fd_dev; | |
78 int remote_float; | |
47
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
79 sockaddr_any remote_addr; |
35
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
80 int use_pi; |
41
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
81 int poll_timeout; |
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
82 void (*sendnetworkpacket)(struct qtsession* sess, char* msg, int len); |
0 | 83 }; |
84 | |
85 #ifdef COMBINED_BINARY | |
86 extern char* (*getconf)(const char*); | |
87 extern int errorexit(const char*); | |
88 extern int errorexitp(const char*); | |
89 extern void print_header(); | |
90 extern void hex2bin(unsigned char*, unsigned char*, int); | |
22
38d495566d1c
Re-added some debugging messages to nacltai protocol code, enabled by the DEBUG environment variable
Ivo Smits <Ivo@UCIS.nl>
parents:
15
diff
changeset
|
91 extern int debug; |
0 | 92 #else |
93 | |
94 char* (*getconf)(const char*) = getenv; | |
22
38d495566d1c
Re-added some debugging messages to nacltai protocol code, enabled by the DEBUG environment variable
Ivo Smits <Ivo@UCIS.nl>
parents:
15
diff
changeset
|
95 int debug = 0; |
38
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
96 static int gargc = 0; |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
97 static char** gargv = NULL; |
0 | 98 |
99 int errorexit(const char* text) { | |
100 fprintf(stderr, "%s\n", text); | |
101 return -1; | |
102 } | |
52
3115f8af98bb
Added support for libsodium, fixed bug in USE_PI compatibility mode, improved timestamp checking in nacltai protocol
Ivo Smits <Ivo@UCIS.nl>
parents:
49
diff
changeset
|
103 int errorexit2(const char* text, const char* error) { |
3115f8af98bb
Added support for libsodium, fixed bug in USE_PI compatibility mode, improved timestamp checking in nacltai protocol
Ivo Smits <Ivo@UCIS.nl>
parents:
49
diff
changeset
|
104 fprintf(stderr, "%s: %s\n", text, error); |
3115f8af98bb
Added support for libsodium, fixed bug in USE_PI compatibility mode, improved timestamp checking in nacltai protocol
Ivo Smits <Ivo@UCIS.nl>
parents:
49
diff
changeset
|
105 return -1; |
3115f8af98bb
Added support for libsodium, fixed bug in USE_PI compatibility mode, improved timestamp checking in nacltai protocol
Ivo Smits <Ivo@UCIS.nl>
parents:
49
diff
changeset
|
106 } |
0 | 107 int errorexitp(const char* text) { |
108 perror(text); | |
109 return -1; | |
110 } | |
111 | |
112 void print_header() { | |
38
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
113 fprintf(stderr, "UCIS QuickTun "QT_VERSION" (c) 2010-2013 Ivo Smits <Ivo@UCIS.nl>\n"); |
22
38d495566d1c
Re-added some debugging messages to nacltai protocol code, enabled by the DEBUG environment variable
Ivo Smits <Ivo@UCIS.nl>
parents:
15
diff
changeset
|
114 fprintf(stderr, "More information: http://wiki.ucis.nl/QuickTun\n"); |
0 | 115 } |
116 | |
47
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
117 static int is_all_zero(void* buf, int size) { |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
118 int i; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
119 char* bb = (char*)buf; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
120 for (i = 0; i < size; i++) if (bb[i] != 0) return 0; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
121 return 1; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
122 } |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
123 static int sockaddr_is_zero_address(sockaddr_any* sa) { |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
124 int af = sa->any.sa_family; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
125 if (af == AF_INET) return is_all_zero(&sa->ip4.sin_addr, sizeof(struct in_addr)); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
126 if (af == AF_INET6) return is_all_zero(&sa->ip6.sin6_addr, sizeof(struct in6_addr)); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
127 return is_all_zero(sa, sizeof(sockaddr_any)); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
128 } |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
129 static int sockaddr_set_port(sockaddr_any* sa, int port) { |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
130 port = htons(port); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
131 int af = sa->any.sa_family; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
132 if (af == AF_INET) sa->ip4.sin_port = port; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
133 else if (af == AF_INET6) sa->ip6.sin6_port = port; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
134 else return errorexit("Unknown address family"); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
135 return 0; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
136 } |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
137 static int sockaddr_equal(sockaddr_any* a, sockaddr_any* b) { |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
138 if (a->any.sa_family != b->any.sa_family) return 0; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
139 if (a->any.sa_family == AF_INET) return a->ip4.sin_port == b->ip4.sin_port && a->ip4.sin_addr.s_addr == b->ip4.sin_addr.s_addr; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
140 if (a->any.sa_family == AF_INET6) return a->ip6.sin6_port == b->ip6.sin6_port && memcmp(&a->ip6.sin6_addr, &b->ip6.sin6_addr, sizeof(struct in6_addr)) == 0 && a->ip6.sin6_scope_id == b->ip6.sin6_scope_id; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
141 return memcmp(a, b, sizeof(sockaddr_any)) == 0; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
142 } |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
143 static void sockaddr_to_string(sockaddr_any* sa, char* str, int strbuflen) { |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
144 if (sa->any.sa_family == AF_INET) { |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
145 if (!inet_ntop(AF_INET, &sa->ip4.sin_addr, str, strbuflen)) str[0] = 0; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
146 int i = strlen(str); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
147 snprintf(str + i, strbuflen - i, ":%u", ntohs(sa->ip4.sin_port)); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
148 } else if (sa->any.sa_family == AF_INET6) { |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
149 if (!inet_ntop(AF_INET6, &sa->ip6.sin6_addr, str, strbuflen)) str[0] = 0; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
150 int i = strlen(str); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
151 snprintf(str + i, strbuflen - i, "%%%d:%u", sa->ip6.sin6_scope_id, ntohs(sa->ip6.sin6_port)); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
152 } else { |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
153 strncpy(str, "Unknown AF", strbuflen); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
154 } |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
155 str[strbuflen - 1] = 0; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
156 } |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
157 |
41
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
158 static int init_udp(struct qtsession* session) { |
0 | 159 char* envval; |
6
cf9b44b46be5
Use stderr for output instead of stdout, added debugging code to nacltai
root <root@Really.UFO-Net.nl>
parents:
4
diff
changeset
|
160 fprintf(stderr, "Initializing UDP socket...\n"); |
47
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
161 struct addrinfo *ai_local = NULL, *ai_remote = NULL; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
162 unsigned short af = 0; |
52
3115f8af98bb
Added support for libsodium, fixed bug in USE_PI compatibility mode, improved timestamp checking in nacltai protocol
Ivo Smits <Ivo@UCIS.nl>
parents:
49
diff
changeset
|
163 int ret; |
0 | 164 if (envval = getconf("LOCAL_ADDRESS")) { |
52
3115f8af98bb
Added support for libsodium, fixed bug in USE_PI compatibility mode, improved timestamp checking in nacltai protocol
Ivo Smits <Ivo@UCIS.nl>
parents:
49
diff
changeset
|
165 if (ret = getaddrinfo(envval, NULL, NULL, &ai_local)) return errorexit2("getaddrinfo(LOCAL_ADDRESS)", gai_strerror(ret)); |
47
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
166 if (!ai_local) return errorexit("LOCAL_ADDRESS lookup failed"); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
167 if (ai_local->ai_addrlen > sizeof(sockaddr_any)) return errorexit("Resolved LOCAL_ADDRESS is too big"); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
168 af = ai_local->ai_family; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
169 } |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
170 if (envval = getconf("REMOTE_ADDRESS")) { |
52
3115f8af98bb
Added support for libsodium, fixed bug in USE_PI compatibility mode, improved timestamp checking in nacltai protocol
Ivo Smits <Ivo@UCIS.nl>
parents:
49
diff
changeset
|
171 if (ret = getaddrinfo(envval, NULL, NULL, &ai_remote)) return errorexit2("getaddrinfo(REMOTE_ADDRESS)", gai_strerror(ret)); |
47
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
172 if (!ai_remote) return errorexit("REMOTE_ADDRESS lookup failed"); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
173 if (ai_remote->ai_addrlen > sizeof(sockaddr_any)) return errorexit("Resolved REMOTE_ADDRESS is too big"); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
174 if (af && af != ai_remote->ai_family) return errorexit("Address families do not match"); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
175 af = ai_remote->ai_family; |
0 | 176 } |
47
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
177 if (!af) af = AF_INET; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
178 int sfd = socket(af, SOCK_DGRAM, IPPROTO_UDP); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
179 if (sfd < 0) return errorexitp("Could not create UDP socket"); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
180 sockaddr_any udpaddr; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
181 memset(&udpaddr, 0, sizeof(udpaddr)); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
182 udpaddr.any.sa_family = af; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
183 if (ai_local) memcpy(&udpaddr, ai_local->ai_addr, ai_local->ai_addrlen); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
184 int port = 2998; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
185 if (envval = getconf("LOCAL_PORT")) port = atoi(envval); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
186 if (sockaddr_set_port(&udpaddr, port)) return -1; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
187 if (bind(sfd, (struct sockaddr*)&udpaddr, sizeof(udpaddr))) return errorexitp("Could not bind socket"); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
188 memset(&udpaddr, 0, sizeof(udpaddr)); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
189 udpaddr.any.sa_family = af; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
190 if (ai_remote) memcpy(&udpaddr, ai_remote->ai_addr, ai_remote->ai_addrlen); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
191 if (!ai_remote || sockaddr_is_zero_address(&udpaddr)) { |
0 | 192 session->remote_float = 1; |
193 } else { | |
12
e4b60d041491
Make sure that the session buffer is zero
Ivo Smits <Ivo@UCIS.nl>
parents:
9
diff
changeset
|
194 session->remote_float = getconf("REMOTE_FLOAT") ? 1 : 0; |
47
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
195 port = 2998; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
196 if (envval = getconf("REMOTE_PORT")) port = atoi(envval); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
197 if (sockaddr_set_port(&udpaddr, port)) return -1; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
198 session->remote_addr = udpaddr; |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
199 if (session->remote_float) { |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
200 session->remote_float = 2; |
2
b2c7c83a1dda
Accept 0.0.0.0 remote address for float mode
ivo <ivo@UFO-Net.nl>
parents:
0
diff
changeset
|
201 } else { |
47
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
202 if (connect(sfd, (struct sockaddr*)&udpaddr, sizeof(udpaddr))) return errorexitp("Could not connect socket"); |
0 | 203 } |
204 } | |
47
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
205 if (ai_local) freeaddrinfo(ai_local); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
206 if (ai_remote) freeaddrinfo(ai_remote); |
0 | 207 session->fd_socket = sfd; |
208 return sfd; | |
209 } | |
210 | |
41
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
211 static int init_tuntap(struct qtsession* session) { |
0 | 212 char* envval; |
7 | 213 fprintf(stderr, "Initializing tun/tap device...\n"); |
0 | 214 int ttfd; //Tap device file descriptor |
35
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
215 int tunmode = 0; |
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
216 if (envval = getconf("TUN_MODE")) tunmode = atoi(envval); |
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
217 session->use_pi = 0; |
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
218 if (tunmode && (envval = getconf("USE_PI"))) session->use_pi = atoi(envval); |
54
4ff8003d0973
Fix for OpenBSD tun/tap initialization
Ivo Smits <Ivo@UCIS.nl>
parents:
52
diff
changeset
|
219 #if defined(__linux__) |
15
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
220 struct ifreq ifr; //required for tun/tap setup |
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
221 memset(&ifr, 0, sizeof(ifr)); |
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
222 if ((ttfd = open("/dev/net/tun", O_RDWR)) < 0) return errorexitp("Could not open tun/tap device file"); |
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
223 if (envval = getconf("INTERFACE")) strcpy(ifr.ifr_name, envval); |
35
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
224 ifr.ifr_flags = tunmode ? IFF_TUN : IFF_TAP; |
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
225 if (!session->use_pi) ifr.ifr_flags |= IFF_NO_PI; |
15
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
226 if (ioctl(ttfd, TUNSETIFF, (void *)&ifr) < 0) return errorexitp("TUNSETIFF ioctl failed"); |
32
51c6d2fc712f
Fixes contributed by Daniel Dickinson <daniel@cshore.neomailbox.net>
Ivo Smits <Ivo@UCIS.nl>
parents:
30
diff
changeset
|
227 #elif defined SOLARIS |
13 | 228 int ip_fd = -1, if_fd = -1, ppa = 0; |
15
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
229 if ((ttfd = open("/dev/tun", O_RDWR)) < 0) return errorexitp("Could not open tun device file"); |
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
230 if ((ip_fd = open("/dev/ip", O_RDWR, 0)) < 0) return errorexitp("Could not open /dev/ip"); |
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
231 if ((envval = getconf("INTERFACE"))) { |
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
232 while (*envval && !isdigit((int)*envval)) envval++; |
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
233 ppa = atoi(envval); |
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
234 } |
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
235 if ((ppa = ioctl(ttfd, TUNNEWPPA, ppa)) < 0) return errorexitp("Could not assign new PPA"); |
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
236 if ((if_fd = open("/dev/tun", O_RDWR, 0)) < 0) return errorexitp("Could not open tun device file again"); |
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
237 if (ioctl(if_fd, I_PUSH, "ip") < 0) return errorexitp("Could not push IP module"); |
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
238 if (ioctl(if_fd, IF_UNITSEL, (char *)&ppa) < 0) return errorexitp("Could not set PPA"); |
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
239 if (ioctl(ip_fd, I_LINK, if_fd) < 0) return errorexitp("Could not link TUN device to IP"); |
7 | 240 #else |
15
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
241 if (!(envval = getconf("INTERFACE"))) envval = "/dev/tun0"; |
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
242 if ((ttfd = open(envval, O_RDWR)) < 0) return errorexitp("Could not open tun device file"); |
35
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
243 if (tunmode) { |
33
422f3582bd38
Possible fix for tun mode on FreeBSD
Ivo Smits <Ivo@UCIS.nl>
parents:
32
diff
changeset
|
244 int i = IFF_POINTOPOINT | IFF_MULTICAST; |
34
b876afa5a72a
Fixed the build script and FreeBSD tun mode
Ivo Smits <Ivo@UCIS.nl>
parents:
33
diff
changeset
|
245 ioctl(ttfd, TUNSIFMODE, &i); |
54
4ff8003d0973
Fix for OpenBSD tun/tap initialization
Ivo Smits <Ivo@UCIS.nl>
parents:
52
diff
changeset
|
246 #if defined(__OpenBSD__) |
4ff8003d0973
Fix for OpenBSD tun/tap initialization
Ivo Smits <Ivo@UCIS.nl>
parents:
52
diff
changeset
|
247 if (!session->use_pi) session->use_pi = 2; |
4ff8003d0973
Fix for OpenBSD tun/tap initialization
Ivo Smits <Ivo@UCIS.nl>
parents:
52
diff
changeset
|
248 #else |
35
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
249 i = session->use_pi ? 1 : 0; |
34
b876afa5a72a
Fixed the build script and FreeBSD tun mode
Ivo Smits <Ivo@UCIS.nl>
parents:
33
diff
changeset
|
250 ioctl(ttfd, TUNSIFHEAD, &i); |
54
4ff8003d0973
Fix for OpenBSD tun/tap initialization
Ivo Smits <Ivo@UCIS.nl>
parents:
52
diff
changeset
|
251 #endif |
33
422f3582bd38
Possible fix for tun mode on FreeBSD
Ivo Smits <Ivo@UCIS.nl>
parents:
32
diff
changeset
|
252 } |
15
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
253 #endif |
39
47a34fe75c57
Added option to run a script after opening the tun device
Ivo Smits <Ivo@UCIS.nl>
parents:
38
diff
changeset
|
254 if (envval = getconf("TUN_UP_SCRIPT")) system(envval); |
35
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
255 session->fd_dev = ttfd; |
0 | 256 return ttfd; |
257 } | |
258 | |
259 void hex2bin(unsigned char* dest, unsigned char* src, int count) { | |
260 int i; | |
261 for (i = 0; i < count; i++) { | |
262 if (*src >= '0' && *src <= '9') *dest = *src - '0'; | |
263 else if (*src >= 'a' && * src <='f') *dest = *src - 'a' + 10; | |
264 else if (*src >= 'A' && * src <='F') *dest = *src - 'A' + 10; | |
265 src++; *dest = *dest << 4; | |
266 if (*src >= '0' && *src <= '9') *dest += *src - '0'; | |
267 else if (*src >= 'a' && *src <= 'f') *dest += *src - 'a' + 10; | |
268 else if (*src >= 'A' && *src <= 'F') *dest += *src - 'A' + 10; | |
269 src++; dest++; | |
270 } | |
271 } | |
272 | |
41
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
273 static int drop_privileges() { |
36
1fe62a94c28a
Added option SETUID to drop privileges
Ivo Smits <Ivo@UCIS.nl>
parents:
35
diff
changeset
|
274 char* envval; |
49 | 275 struct passwd *pw = NULL; |
36
1fe62a94c28a
Added option SETUID to drop privileges
Ivo Smits <Ivo@UCIS.nl>
parents:
35
diff
changeset
|
276 if (envval = getconf("SETUID")) { |
49 | 277 pw = getpwnam(envval); |
278 if (!pw) return errorexitp("getpwnam"); | |
279 } | |
280 if (envval = getconf("CHROOT")) { | |
281 if (chroot(envval)) return errorexitp("chroot"); | |
282 if (chdir("/")) return errorexitp("chdir /"); | |
283 } | |
284 if (pw) { | |
36
1fe62a94c28a
Added option SETUID to drop privileges
Ivo Smits <Ivo@UCIS.nl>
parents:
35
diff
changeset
|
285 if (setgroups(0, NULL) == -1) return errorexitp("setgroups"); |
1fe62a94c28a
Added option SETUID to drop privileges
Ivo Smits <Ivo@UCIS.nl>
parents:
35
diff
changeset
|
286 if (setgid(pw->pw_gid) == -1) return errorexitp("setgid"); |
1fe62a94c28a
Added option SETUID to drop privileges
Ivo Smits <Ivo@UCIS.nl>
parents:
35
diff
changeset
|
287 if (setuid(pw->pw_uid) == -1) return errorexitp("setuid"); |
1fe62a94c28a
Added option SETUID to drop privileges
Ivo Smits <Ivo@UCIS.nl>
parents:
35
diff
changeset
|
288 } |
1fe62a94c28a
Added option SETUID to drop privileges
Ivo Smits <Ivo@UCIS.nl>
parents:
35
diff
changeset
|
289 } |
1fe62a94c28a
Added option SETUID to drop privileges
Ivo Smits <Ivo@UCIS.nl>
parents:
35
diff
changeset
|
290 |
41
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
291 static void qtsendnetworkpacket(struct qtsession* session, char* msg, int len) { |
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
292 if (session->remote_float == 0) { |
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
293 len = write(session->fd_socket, msg, len); |
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
294 } else if (session->remote_float == 2) { |
47
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
295 len = sendto(session->fd_socket, msg, len, 0, (struct sockaddr*)&session->remote_addr, sizeof(sockaddr_any)); |
41
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
296 } |
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
297 } |
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
298 |
0 | 299 int qtrun(struct qtproto* p) { |
22
38d495566d1c
Re-added some debugging messages to nacltai protocol code, enabled by the DEBUG environment variable
Ivo Smits <Ivo@UCIS.nl>
parents:
15
diff
changeset
|
300 if (getconf("DEBUG")) debug = 1; |
0 | 301 struct qtsession session; |
41
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
302 session.poll_timeout = -1; |
0 | 303 session.protocol = *p; |
6
cf9b44b46be5
Use stderr for output instead of stdout, added debugging code to nacltai
root <root@Really.UFO-Net.nl>
parents:
4
diff
changeset
|
304 |
29
7c5e5be876bb
Small fix to error handling during initialization
Ivo Smits <Ivo@UCIS.nl>
parents:
28
diff
changeset
|
305 if (init_udp(&session) < 0) return -1; |
6
cf9b44b46be5
Use stderr for output instead of stdout, added debugging code to nacltai
root <root@Really.UFO-Net.nl>
parents:
4
diff
changeset
|
306 int sfd = session.fd_socket; |
cf9b44b46be5
Use stderr for output instead of stdout, added debugging code to nacltai
root <root@Really.UFO-Net.nl>
parents:
4
diff
changeset
|
307 |
41
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
308 session.sendnetworkpacket = qtsendnetworkpacket; |
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
309 |
35
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
310 if (init_tuntap(&session) < 0) return -1; |
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
311 int ttfd = session.fd_dev; |
0 | 312 |
313 char protocol_data[p->protocol_data_size]; | |
12
e4b60d041491
Make sure that the session buffer is zero
Ivo Smits <Ivo@UCIS.nl>
parents:
9
diff
changeset
|
314 memset(protocol_data, 0, p->protocol_data_size); |
0 | 315 session.protocol_data = &protocol_data; |
27
5ba185ca7102
Fixed error checking during initialization, restructured code a bit to make it even simpler
Ivo Smits <Ivo@UCIS.nl>
parents:
22
diff
changeset
|
316 if (p->init && p->init(&session) < 0) return -1; |
0 | 317 |
36
1fe62a94c28a
Added option SETUID to drop privileges
Ivo Smits <Ivo@UCIS.nl>
parents:
35
diff
changeset
|
318 if (drop_privileges() < 0) return -1; |
1fe62a94c28a
Added option SETUID to drop privileges
Ivo Smits <Ivo@UCIS.nl>
parents:
35
diff
changeset
|
319 |
6
cf9b44b46be5
Use stderr for output instead of stdout, added debugging code to nacltai
root <root@Really.UFO-Net.nl>
parents:
4
diff
changeset
|
320 fprintf(stderr, "The tunnel is now operational!\n"); |
0 | 321 |
322 struct pollfd fds[2]; | |
323 fds[0].fd = ttfd; | |
324 fds[0].events = POLLIN; | |
325 fds[1].fd = sfd; | |
326 fds[1].events = POLLIN; | |
327 | |
35
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
328 int pi_length = 0; |
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
329 if (session.use_pi == 2) pi_length = 4; |
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
330 |
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
331 char buffer_raw_a[p->buffersize_raw + pi_length]; |
0 | 332 char buffer_enc_a[p->buffersize_enc]; |
333 char* buffer_raw = buffer_raw_a; | |
334 char* buffer_enc = buffer_enc_a; | |
335 | |
336 while (1) { | |
41
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
337 int len = poll(fds, 2, session.poll_timeout); |
0 | 338 if (len < 0) return errorexitp("poll error"); |
339 else if (fds[0].revents & (POLLERR | POLLHUP | POLLNVAL)) return errorexit("poll error on tap device"); | |
340 else if (fds[1].revents & (POLLHUP | POLLNVAL)) return errorexit("poll error on udp socket"); | |
41
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
341 if (len == 0 && p->idle) p->idle(&session); |
0 | 342 if (fds[0].revents & POLLIN) { |
35
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
343 len = read(ttfd, buffer_raw + p->offset_raw, p->buffersize_raw + pi_length); |
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
344 if (len < pi_length) errorexit("read packet smaller than header from tun device"); |
0 | 345 if (session.remote_float == 0 || session.remote_float == 2) { |
35
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
346 len = p->encode(&session, buffer_raw + pi_length, buffer_enc, len - pi_length); |
0 | 347 if (len < 0) return len; |
41
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
348 if (len == 0) continue; //encoding is not yet possible |
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
349 qtsendnetworkpacket(&session, buffer_enc + p->offset_enc, len); |
0 | 350 } |
351 } | |
15
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
352 if (fds[1].revents & POLLERR) { |
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
353 int out; |
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
354 len = sizeof(out); |
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
355 getsockopt(sfd, SOL_SOCKET, SO_ERROR, &out, &len); |
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
356 fprintf(stderr, "Received error %d on udp socket\n", out); |
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
357 } |
0 | 358 if (fds[1].revents & POLLIN) { |
47
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
359 sockaddr_any recvaddr; |
0 | 360 socklen_t recvaddr_len = sizeof(recvaddr); |
361 if (session.remote_float == 0) { | |
362 len = read(sfd, buffer_enc + p->offset_enc, p->buffersize_enc); | |
363 } else { | |
364 len = recvfrom(sfd, buffer_enc + p->offset_enc, p->buffersize_enc, 0, (struct sockaddr*)&recvaddr, &recvaddr_len); | |
365 } | |
366 if (len < 0) { | |
15
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
367 long long out; |
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
368 len = sizeof(out); |
0 | 369 getsockopt(sfd, SOL_SOCKET, SO_ERROR, &out, &len); |
41
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
370 fprintf(stderr, "Received end of file on udp socket (error %lld)\n", out); |
0 | 371 } else { |
35
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
372 len = p->decode(&session, buffer_enc, buffer_raw + pi_length, len); |
41
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
373 if (len < 0) continue; |
47
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
374 if (session.remote_float != 0 && !sockaddr_equal(&session.remote_addr, &recvaddr)) { |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
375 char epname[INET6_ADDRSTRLEN + 1 + 2 + 1 + 5]; //addr%scope:port |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
376 sockaddr_to_string(&recvaddr, epname, sizeof(epname)); |
e896392f7e03
Added support for connecting over IPv6
Ivo Smits <Ivo@UCIS.nl>
parents:
41
diff
changeset
|
377 fprintf(stderr, "Remote endpoint has changed to %s\n", epname); |
0 | 378 session.remote_addr = recvaddr; |
379 session.remote_float = 2; | |
380 } | |
41
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
381 if (len > 0 && session.use_pi == 2) { |
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
382 int ipver = (buffer_raw[p->offset_raw + pi_length] >> 4) & 0xf; |
35
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
383 int pihdr = 0; |
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
384 #if defined linux |
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
385 if (ipver == 4) pihdr = 0x0000 | (0x0008 << 16); //little endian: flags and protocol are swapped |
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
386 else if (ipver == 6) pihdr = 0x0000 | (0xdd86 << 16); |
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
387 #else |
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
388 if (ipver == 4) pihdr = htonl(AF_INET); |
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
389 else if (ipver == 6) pihdr = htonl(AF_INET6); |
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
390 #endif |
52
3115f8af98bb
Added support for libsodium, fixed bug in USE_PI compatibility mode, improved timestamp checking in nacltai protocol
Ivo Smits <Ivo@UCIS.nl>
parents:
49
diff
changeset
|
391 *(int*)(buffer_raw + p->offset_raw) = pihdr; |
35
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
392 } |
41
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
393 if (len > 0) write(ttfd, buffer_raw + p->offset_raw, len + pi_length); |
0 | 394 } |
395 } | |
396 } | |
397 return 0; | |
398 } | |
38
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
399 |
41
54d28a81ca99
Small updates in preparation for stateful protocols
Ivo Smits <Ivo@UCIS.nl>
parents:
39
diff
changeset
|
400 static char* getconfcmdargs(const char* name) { |
38
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
401 int i; |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
402 for (i = 1; i < gargc - 2; i++) { |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
403 if (strcmp(gargv[i], "-c")) continue; |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
404 if (strcmp(gargv[i + 1], name)) continue; |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
405 return gargv[i + 2]; |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
406 } |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
407 return NULL; |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
408 } |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
409 |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
410 int qtprocessargs(int argc, char** argv) { |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
411 int i; |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
412 for (i = 1; i < argc; i++) { |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
413 char* a = argv[i]; |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
414 if (!strcmp(a, "-h") || !strcmp(a, "--help")) { |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
415 return errorexit("Please read the documentation at http://wiki.ucis.nl/QuickTun"); |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
416 } else if (!strcmp(a, "-v") || !strcmp(a, "--version")) { |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
417 return errorexit("UCIS QuickTun "QT_VERSION); |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
418 } else if (!strcmp(a, "-c")) { |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
419 gargc = argc; |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
420 gargv = argv; |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
421 getconf = getconfcmdargs; |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
422 i += 2; |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
423 } else { |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
424 return errorexit("Unexpected command line argument"); |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
425 } |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
426 } |
d9f5caa13898
Added support for NetBSD, added command line parsing to provide configuration options
Ivo Smits <Ivo@UCIS.nl>
parents:
36
diff
changeset
|
427 } |
0 | 428 #endif |
30
6f0e6b7dc088
Fixed build script to support multiple abis on one machine, bugfix in code, minor improvements
Ivo Smits <Ivo@UCIS.nl>
parents:
29
diff
changeset
|
429 |