Mercurial > hg > quicktun
annotate src/common.c @ 35:a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
| author | Ivo Smits <Ivo@UCIS.nl> |
|---|---|
| date | Mon, 06 May 2013 18:05:07 +0200 |
| parents | b876afa5a72a |
| children | 1fe62a94c28a |
| 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> | |
| 30 #ifndef HAVE_NETINET_IN_H | |
| 31 #include <netinet/in.h> | |
| 32 #endif | |
| 33 #include <sys/ioctl.h> | |
| 7 | 34 #include <sys/socket.h> |
| 0 | 35 #include <poll.h> |
| 36 #include <netdb.h> | |
| 37 #include <stdlib.h> | |
|
8
6d86596d8884
Fixed BSD support, improved randombytes/secret key generation
ivo <Ivo@UCIS.nl>
parents:
7
diff
changeset
|
38 #include <net/if.h> |
| 7 | 39 #ifdef linux |
| 40 #include <linux/if_tun.h> | |
| 41 #include <linux/if_ether.h> | |
| 42 #else | |
| 43 #define ETH_FRAME_LEN 1514 | |
| 44 #include <net/if_tun.h> | |
| 13 | 45 #ifdef SOLARIS |
| 46 #include <sys/stropts.h> | |
| 47 #include <sys/sockio.h> | |
| 48 #endif | |
| 7 | 49 #endif |
| 0 | 50 |
| 51 #define MAX_PACKET_LEN (ETH_FRAME_LEN+4) //Some space for optional packet information | |
| 52 | |
| 53 struct qtsession; | |
| 54 struct qtproto { | |
| 55 int encrypted; | |
| 56 int buffersize_raw; | |
| 57 int buffersize_enc; | |
| 58 int offset_raw; | |
| 59 int offset_enc; | |
| 60 int (*encode)(struct qtsession* sess, char* raw, char* enc, int len); | |
| 61 int (*decode)(struct qtsession* sess, char* enc, char* raw, int len); | |
| 62 int (*init)(struct qtsession* sess); | |
| 63 int protocol_data_size; | |
| 64 }; | |
| 65 struct qtsession { | |
| 66 struct qtproto protocol; | |
| 67 void* protocol_data; | |
| 68 int fd_socket; | |
| 69 int fd_dev; | |
| 70 int remote_float; | |
| 71 struct sockaddr_in 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
|
72 int use_pi; |
| 0 | 73 }; |
| 74 | |
| 75 #ifdef COMBINED_BINARY | |
| 76 extern char* (*getconf)(const char*); | |
| 77 extern int errorexit(const char*); | |
| 78 extern int errorexitp(const char*); | |
| 79 extern void print_header(); | |
| 80 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
|
81 extern int debug; |
| 0 | 82 #else |
| 83 | |
| 84 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
|
85 int debug = 0; |
| 0 | 86 |
| 87 int errorexit(const char* text) { | |
| 88 fprintf(stderr, "%s\n", text); | |
| 89 return -1; | |
| 90 } | |
| 91 int errorexitp(const char* text) { | |
| 92 perror(text); | |
| 93 return -1; | |
| 94 } | |
| 95 | |
| 96 void print_header() { | |
|
6
cf9b44b46be5
Use stderr for output instead of stdout, added debugging code to nacltai
root <root@Really.UFO-Net.nl>
parents:
4
diff
changeset
|
97 fprintf(stderr, "UCIS QuickTun (c) 2010 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
|
98 fprintf(stderr, "More information: http://wiki.ucis.nl/QuickTun\n"); |
| 0 | 99 } |
| 100 | |
| 101 int init_udp(struct qtsession* session) { | |
| 102 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
|
103 fprintf(stderr, "Initializing UDP socket...\n"); |
| 0 | 104 int sfd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); |
| 105 if (sfd < 0) return errorexitp("Could not create UDP socket"); | |
| 106 struct sockaddr_in udpaddr; | |
| 107 struct hostent *he; | |
| 108 udpaddr.sin_family = AF_INET; | |
| 109 udpaddr.sin_addr.s_addr = INADDR_ANY; | |
| 110 udpaddr.sin_port = htons(2998); | |
| 111 if (envval = getconf("LOCAL_ADDRESS")) { | |
| 112 he = gethostbyname(envval); | |
| 113 if (!he) return errorexit("bind address lookup failed"); | |
| 114 else if (!he->h_addr_list[0]) return errorexit("no address to bind to"); | |
| 115 udpaddr.sin_addr.s_addr = *((unsigned long*)he->h_addr_list[0]); | |
| 116 udpaddr.sin_family = he->h_addrtype; | |
| 117 } | |
| 118 if (envval = getconf("LOCAL_PORT")) { | |
| 119 udpaddr.sin_port = htons(atoi(envval)); | |
| 120 } | |
| 121 if (bind(sfd, (struct sockaddr*)&udpaddr, sizeof(struct sockaddr_in))) return errorexitp("Could not bind socket"); | |
| 122 if (!(envval = getconf("REMOTE_ADDRESS"))) { | |
| 123 session->remote_float = 1; | |
| 124 //return errorexit("Missing REMOTE_ADDRESS"); | |
| 125 } else { | |
|
12
e4b60d041491
Make sure that the session buffer is zero
Ivo Smits <Ivo@UCIS.nl>
parents:
9
diff
changeset
|
126 session->remote_float = getconf("REMOTE_FLOAT") ? 1 : 0; |
| 0 | 127 he = gethostbyname(envval); |
| 128 if (!he) return errorexit("remote address lookup failed"); | |
| 129 else if (!he->h_addr_list[0]) return errorexit("no address to connect to"); | |
| 130 udpaddr.sin_family = he->h_addrtype; | |
| 131 udpaddr.sin_addr.s_addr = *((unsigned long*)he->h_addr_list[0]); | |
|
2
b2c7c83a1dda
Accept 0.0.0.0 remote address for float mode
ivo <ivo@UFO-Net.nl>
parents:
0
diff
changeset
|
132 if (udpaddr.sin_addr.s_addr == 0) { |
|
b2c7c83a1dda
Accept 0.0.0.0 remote address for float mode
ivo <ivo@UFO-Net.nl>
parents:
0
diff
changeset
|
133 session->remote_float = 1; |
|
b2c7c83a1dda
Accept 0.0.0.0 remote address for float mode
ivo <ivo@UFO-Net.nl>
parents:
0
diff
changeset
|
134 } else { |
|
b2c7c83a1dda
Accept 0.0.0.0 remote address for float mode
ivo <ivo@UFO-Net.nl>
parents:
0
diff
changeset
|
135 if (envval = getconf("REMOTE_PORT")) { |
|
b2c7c83a1dda
Accept 0.0.0.0 remote address for float mode
ivo <ivo@UFO-Net.nl>
parents:
0
diff
changeset
|
136 udpaddr.sin_port = htons(atoi(envval)); |
|
b2c7c83a1dda
Accept 0.0.0.0 remote address for float mode
ivo <ivo@UFO-Net.nl>
parents:
0
diff
changeset
|
137 } |
|
b2c7c83a1dda
Accept 0.0.0.0 remote address for float mode
ivo <ivo@UFO-Net.nl>
parents:
0
diff
changeset
|
138 if (connect(sfd, (struct sockaddr*)&udpaddr, sizeof(struct sockaddr_in))) return errorexitp("Could not connect socket"); |
|
b2c7c83a1dda
Accept 0.0.0.0 remote address for float mode
ivo <ivo@UFO-Net.nl>
parents:
0
diff
changeset
|
139 session->remote_addr = udpaddr; |
| 0 | 140 } |
| 141 } | |
| 142 session->fd_socket = sfd; | |
| 143 return sfd; | |
| 144 } | |
| 145 | |
|
35
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
146 int init_tuntap(struct qtsession* session) { |
| 0 | 147 char* envval; |
| 7 | 148 fprintf(stderr, "Initializing tun/tap device...\n"); |
| 0 | 149 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
|
150 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
|
151 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
|
152 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
|
153 if (tunmode && (envval = getconf("USE_PI"))) session->use_pi = atoi(envval); |
|
32
51c6d2fc712f
Fixes contributed by Daniel Dickinson <daniel@cshore.neomailbox.net>
Ivo Smits <Ivo@UCIS.nl>
parents:
30
diff
changeset
|
154 #if defined linux |
|
15
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
155 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
|
156 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
|
157 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
|
158 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
|
159 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
|
160 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
|
161 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
|
162 #elif defined SOLARIS |
| 13 | 163 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
|
164 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
|
165 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
|
166 if ((envval = getconf("INTERFACE"))) { |
|
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
167 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
|
168 ppa = atoi(envval); |
|
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
169 } |
|
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
170 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
|
171 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
|
172 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
|
173 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
|
174 if (ioctl(ip_fd, I_LINK, if_fd) < 0) return errorexitp("Could not link TUN device to IP"); |
| 7 | 175 #else |
|
15
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
176 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
|
177 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
|
178 if (tunmode) { |
|
33
422f3582bd38
Possible fix for tun mode on FreeBSD
Ivo Smits <Ivo@UCIS.nl>
parents:
32
diff
changeset
|
179 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
|
180 ioctl(ttfd, TUNSIFMODE, &i); |
|
35
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
181 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
|
182 ioctl(ttfd, TUNSIFHEAD, &i); |
|
33
422f3582bd38
Possible fix for tun mode on FreeBSD
Ivo Smits <Ivo@UCIS.nl>
parents:
32
diff
changeset
|
183 } |
|
15
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
184 #endif |
|
35
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
185 session->fd_dev = ttfd; |
| 0 | 186 return ttfd; |
| 187 } | |
| 188 | |
| 189 void hex2bin(unsigned char* dest, unsigned char* src, int count) { | |
| 190 int i; | |
| 191 for (i = 0; i < count; i++) { | |
| 192 if (*src >= '0' && *src <= '9') *dest = *src - '0'; | |
| 193 else if (*src >= 'a' && * src <='f') *dest = *src - 'a' + 10; | |
| 194 else if (*src >= 'A' && * src <='F') *dest = *src - 'A' + 10; | |
| 195 src++; *dest = *dest << 4; | |
| 196 if (*src >= '0' && *src <= '9') *dest += *src - '0'; | |
| 197 else if (*src >= 'a' && *src <= 'f') *dest += *src - 'a' + 10; | |
| 198 else if (*src >= 'A' && *src <= 'F') *dest += *src - 'A' + 10; | |
| 199 src++; dest++; | |
| 200 } | |
| 201 } | |
| 202 | |
| 203 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
|
204 if (getconf("DEBUG")) debug = 1; |
| 0 | 205 struct qtsession session; |
| 206 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
|
207 |
|
29
7c5e5be876bb
Small fix to error handling during initialization
Ivo Smits <Ivo@UCIS.nl>
parents:
28
diff
changeset
|
208 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
|
209 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
|
210 |
|
35
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
211 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
|
212 int ttfd = session.fd_dev; |
| 0 | 213 |
| 214 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
|
215 memset(protocol_data, 0, p->protocol_data_size); |
| 0 | 216 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
|
217 if (p->init && p->init(&session) < 0) return -1; |
| 0 | 218 |
|
6
cf9b44b46be5
Use stderr for output instead of stdout, added debugging code to nacltai
root <root@Really.UFO-Net.nl>
parents:
4
diff
changeset
|
219 fprintf(stderr, "The tunnel is now operational!\n"); |
| 0 | 220 |
| 221 struct pollfd fds[2]; | |
| 222 fds[0].fd = ttfd; | |
| 223 fds[0].events = POLLIN; | |
| 224 fds[1].fd = sfd; | |
| 225 fds[1].events = POLLIN; | |
| 226 | |
| 227 struct sockaddr_in recvaddr; | |
| 228 | |
|
35
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
229 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
|
230 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
|
231 |
|
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
232 char buffer_raw_a[p->buffersize_raw + pi_length]; |
| 0 | 233 char buffer_enc_a[p->buffersize_enc]; |
| 234 char* buffer_raw = buffer_raw_a; | |
| 235 char* buffer_enc = buffer_enc_a; | |
| 236 | |
| 237 while (1) { | |
| 238 int len = poll(fds, 2, -1); | |
| 239 if (len < 0) return errorexitp("poll error"); | |
| 240 else if (fds[0].revents & (POLLERR | POLLHUP | POLLNVAL)) return errorexit("poll error on tap device"); | |
| 241 else if (fds[1].revents & (POLLHUP | POLLNVAL)) return errorexit("poll error on udp socket"); | |
| 242 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
|
243 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
|
244 if (len < pi_length) errorexit("read packet smaller than header from tun device"); |
| 0 | 245 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
|
246 len = p->encode(&session, buffer_raw + pi_length, buffer_enc, len - pi_length); |
| 0 | 247 if (len < 0) return len; |
| 248 if (session.remote_float == 0) { | |
|
15
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
249 len = write(sfd, buffer_enc + p->offset_enc, len); |
| 0 | 250 } else { |
|
15
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
251 len = sendto(sfd, buffer_enc + p->offset_enc, len, 0, (struct sockaddr*)&session.remote_addr, sizeof(session.remote_addr)); |
| 0 | 252 } |
| 253 } | |
| 254 } | |
|
15
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
255 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
|
256 int out; |
|
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
257 len = sizeof(out); |
|
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
258 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
|
259 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
|
260 } |
| 0 | 261 if (fds[1].revents & POLLIN) { |
| 262 socklen_t recvaddr_len = sizeof(recvaddr); | |
| 263 if (session.remote_float == 0) { | |
| 264 len = read(sfd, buffer_enc + p->offset_enc, p->buffersize_enc); | |
| 265 } else { | |
| 266 len = recvfrom(sfd, buffer_enc + p->offset_enc, p->buffersize_enc, 0, (struct sockaddr*)&recvaddr, &recvaddr_len); | |
| 267 } | |
| 268 if (len < 0) { | |
|
15
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
269 long long out; |
|
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
270 len = sizeof(out); |
| 0 | 271 getsockopt(sfd, SOL_SOCKET, SO_ERROR, &out, &len); |
|
15
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
272 fprintf(stderr, "Received end of file on udp socket (error %d)\n", out); |
| 0 | 273 } else { |
|
35
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
274 len = p->decode(&session, buffer_enc, buffer_raw + pi_length, len); |
|
28
e77af6acb559
Small fixes: abort before updating remote endpoint after serious decryption error, print IP address bytes in the expected order
Ivo Smits <Ivo@UCIS.nl>
parents:
27
diff
changeset
|
275 if (len < 0) return len; |
| 0 | 276 if (len != 0 && session.remote_float != 0 && (session.remote_addr.sin_addr.s_addr != recvaddr.sin_addr.s_addr || session.remote_addr.sin_port != recvaddr.sin_port)) { |
|
28
e77af6acb559
Small fixes: abort before updating remote endpoint after serious decryption error, print IP address bytes in the expected order
Ivo Smits <Ivo@UCIS.nl>
parents:
27
diff
changeset
|
277 fprintf(stderr, "Remote endpoint has changed to %08X:%d\n", ntohl(recvaddr.sin_addr.s_addr), ntohs(recvaddr.sin_port)); |
| 0 | 278 session.remote_addr = recvaddr; |
| 279 session.remote_float = 2; | |
| 280 } | |
|
35
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
281 if (session.use_pi == 2) { |
|
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
282 int ipver = 0; |
|
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
283 if (len >= 1) ipver = (buffer_raw[p->offset_raw + pi_length] >> 4) & 0xf; |
|
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
284 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
|
285 #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
|
286 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
|
287 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
|
288 #else |
|
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
289 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
|
290 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
|
291 #endif |
|
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
292 *(int*)(buffer_raw + p->offset_raw) = ipver; |
|
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
293 } |
|
a1ec0d6b6f13
Added USE_PI=2 setting to automatically add/remove packet information header
Ivo Smits <Ivo@UCIS.nl>
parents:
34
diff
changeset
|
294 write(ttfd, buffer_raw + p->offset_raw, len + pi_length); |
| 0 | 295 } |
| 296 } | |
| 297 } | |
| 298 return 0; | |
| 299 } | |
| 300 #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
|
301 |