Mercurial > hg > quicktun
annotate src/common.c @ 29:7c5e5be876bb default/master
Small fix to error handling during initialization
| author | Ivo Smits <Ivo@UCIS.nl> |
|---|---|
| date | Sat, 09 Apr 2011 23:34:06 +0200 |
| parents | e77af6acb559 |
| children | 6f0e6b7dc088 |
| 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; | |
| 72 }; | |
| 73 | |
| 74 #ifdef COMBINED_BINARY | |
| 75 extern char* (*getconf)(const char*); | |
| 76 extern int errorexit(const char*); | |
| 77 extern int errorexitp(const char*); | |
| 78 extern void print_header(); | |
| 79 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
|
80 extern int debug; |
| 0 | 81 #else |
| 82 | |
| 83 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
|
84 int debug = 0; |
| 0 | 85 |
| 86 int errorexit(const char* text) { | |
| 87 fprintf(stderr, "%s\n", text); | |
| 88 return -1; | |
| 89 } | |
| 90 int errorexitp(const char* text) { | |
| 91 perror(text); | |
| 92 return -1; | |
| 93 } | |
| 94 | |
| 95 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
|
96 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
|
97 fprintf(stderr, "More information: http://wiki.ucis.nl/QuickTun\n"); |
| 0 | 98 } |
| 99 | |
| 100 int init_udp(struct qtsession* session) { | |
| 101 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
|
102 fprintf(stderr, "Initializing UDP socket...\n"); |
| 0 | 103 int sfd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); |
| 104 if (sfd < 0) return errorexitp("Could not create UDP socket"); | |
| 105 struct sockaddr_in udpaddr; | |
| 106 struct hostent *he; | |
| 107 udpaddr.sin_family = AF_INET; | |
| 108 udpaddr.sin_addr.s_addr = INADDR_ANY; | |
| 109 udpaddr.sin_port = htons(2998); | |
| 110 if (envval = getconf("LOCAL_ADDRESS")) { | |
| 111 he = gethostbyname(envval); | |
| 112 if (!he) return errorexit("bind address lookup failed"); | |
| 113 else if (!he->h_addr_list[0]) return errorexit("no address to bind to"); | |
| 114 udpaddr.sin_addr.s_addr = *((unsigned long*)he->h_addr_list[0]); | |
| 115 udpaddr.sin_family = he->h_addrtype; | |
| 116 } | |
| 117 if (envval = getconf("LOCAL_PORT")) { | |
| 118 udpaddr.sin_port = htons(atoi(envval)); | |
| 119 } | |
| 120 if (bind(sfd, (struct sockaddr*)&udpaddr, sizeof(struct sockaddr_in))) return errorexitp("Could not bind socket"); | |
| 121 if (!(envval = getconf("REMOTE_ADDRESS"))) { | |
| 122 session->remote_float = 1; | |
| 123 //return errorexit("Missing REMOTE_ADDRESS"); | |
| 124 } else { | |
|
12
e4b60d041491
Make sure that the session buffer is zero
Ivo Smits <Ivo@UCIS.nl>
parents:
9
diff
changeset
|
125 session->remote_float = getconf("REMOTE_FLOAT") ? 1 : 0; |
| 0 | 126 he = gethostbyname(envval); |
| 127 if (!he) return errorexit("remote address lookup failed"); | |
| 128 else if (!he->h_addr_list[0]) return errorexit("no address to connect to"); | |
| 129 udpaddr.sin_family = he->h_addrtype; | |
| 130 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
|
131 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
|
132 session->remote_float = 1; |
|
b2c7c83a1dda
Accept 0.0.0.0 remote address for float mode
ivo <ivo@UFO-Net.nl>
parents:
0
diff
changeset
|
133 } else { |
|
b2c7c83a1dda
Accept 0.0.0.0 remote address for float mode
ivo <ivo@UFO-Net.nl>
parents:
0
diff
changeset
|
134 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
|
135 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
|
136 } |
|
b2c7c83a1dda
Accept 0.0.0.0 remote address for float mode
ivo <ivo@UFO-Net.nl>
parents:
0
diff
changeset
|
137 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
|
138 session->remote_addr = udpaddr; |
| 0 | 139 } |
| 140 } | |
| 141 session->fd_socket = sfd; | |
| 142 return sfd; | |
| 143 } | |
| 144 | |
| 145 int init_tuntap() { | |
| 146 char* envval; | |
| 7 | 147 fprintf(stderr, "Initializing tun/tap device...\n"); |
| 0 | 148 int ttfd; //Tap device file descriptor |
|
15
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
149 #ifdef linux |
|
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
150 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
|
151 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
|
152 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
|
153 if (envval = getconf("INTERFACE")) strcpy(ifr.ifr_name, envval); |
|
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
154 ifr.ifr_flags = getconf("TUN_MODE") ? IFF_TUN : IFF_TAP; |
|
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
155 ifr.ifr_flags |= getconf("USE_PI") ? 0 : IFF_NO_PI; |
|
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
156 if (ioctl(ttfd, TUNSETIFF, (void *)&ifr) < 0) return errorexitp("TUNSETIFF ioctl failed"); |
|
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
157 #else |
| 13 | 158 #ifdef SOLARIS |
| 159 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
|
160 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
|
161 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
|
162 if ((envval = getconf("INTERFACE"))) { |
|
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
163 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
|
164 ppa = atoi(envval); |
|
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
165 } |
|
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
166 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
|
167 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
|
168 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
|
169 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
|
170 if (ioctl(ip_fd, I_LINK, if_fd) < 0) return errorexitp("Could not link TUN device to IP"); |
| 7 | 171 #else |
|
15
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
172 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
|
173 if ((ttfd = open(envval, 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
|
174 #endif |
| 7 | 175 #endif |
| 0 | 176 return ttfd; |
| 177 } | |
| 178 | |
| 179 void hex2bin(unsigned char* dest, unsigned char* src, int count) { | |
| 180 int i; | |
| 181 for (i = 0; i < count; i++) { | |
| 182 if (*src >= '0' && *src <= '9') *dest = *src - '0'; | |
| 183 else if (*src >= 'a' && * src <='f') *dest = *src - 'a' + 10; | |
| 184 else if (*src >= 'A' && * src <='F') *dest = *src - 'A' + 10; | |
| 185 src++; *dest = *dest << 4; | |
| 186 if (*src >= '0' && *src <= '9') *dest += *src - '0'; | |
| 187 else if (*src >= 'a' && *src <= 'f') *dest += *src - 'a' + 10; | |
| 188 else if (*src >= 'A' && *src <= 'F') *dest += *src - 'A' + 10; | |
| 189 src++; dest++; | |
| 190 } | |
| 191 } | |
| 192 | |
| 193 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
|
194 if (getconf("DEBUG")) debug = 1; |
| 0 | 195 struct qtsession session; |
| 196 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
|
197 |
|
29
7c5e5be876bb
Small fix to error handling during initialization
Ivo Smits <Ivo@UCIS.nl>
parents:
28
diff
changeset
|
198 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
|
199 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
|
200 if (sfd == -1) return -1; |
|
cf9b44b46be5
Use stderr for output instead of stdout, added debugging code to nacltai
root <root@Really.UFO-Net.nl>
parents:
4
diff
changeset
|
201 |
|
29
7c5e5be876bb
Small fix to error handling during initialization
Ivo Smits <Ivo@UCIS.nl>
parents:
28
diff
changeset
|
202 int ttfd = init_tuntap(); |
|
6
cf9b44b46be5
Use stderr for output instead of stdout, added debugging code to nacltai
root <root@Really.UFO-Net.nl>
parents:
4
diff
changeset
|
203 if (ttfd == -1) return -1; |
|
29
7c5e5be876bb
Small fix to error handling during initialization
Ivo Smits <Ivo@UCIS.nl>
parents:
28
diff
changeset
|
204 session.fd_dev = ttfd; |
| 0 | 205 |
| 206 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
|
207 memset(protocol_data, 0, p->protocol_data_size); |
| 0 | 208 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
|
209 if (p->init && p->init(&session) < 0) return -1; |
| 0 | 210 |
|
6
cf9b44b46be5
Use stderr for output instead of stdout, added debugging code to nacltai
root <root@Really.UFO-Net.nl>
parents:
4
diff
changeset
|
211 fprintf(stderr, "The tunnel is now operational!\n"); |
| 0 | 212 |
| 213 struct pollfd fds[2]; | |
| 214 fds[0].fd = ttfd; | |
| 215 fds[0].events = POLLIN; | |
| 216 fds[1].fd = sfd; | |
| 217 fds[1].events = POLLIN; | |
| 218 | |
| 219 struct sockaddr_in recvaddr; | |
| 220 | |
| 221 char buffer_raw_a[p->buffersize_raw]; | |
| 222 char buffer_enc_a[p->buffersize_enc]; | |
| 223 char* buffer_raw = buffer_raw_a; | |
| 224 char* buffer_enc = buffer_enc_a; | |
| 225 | |
| 226 while (1) { | |
| 227 int len = poll(fds, 2, -1); | |
| 228 if (len < 0) return errorexitp("poll error"); | |
| 229 else if (fds[0].revents & (POLLERR | POLLHUP | POLLNVAL)) return errorexit("poll error on tap device"); | |
| 230 else if (fds[1].revents & (POLLHUP | POLLNVAL)) return errorexit("poll error on udp socket"); | |
| 231 if (fds[0].revents & POLLIN) { | |
|
9
640f620a55cf
Bugfixes for floating remote and debian upgrade
Ivo Smits <Ivo@UCIS.nl>
parents:
8
diff
changeset
|
232 len = read(ttfd, buffer_raw + p->offset_raw, p->buffersize_raw); |
| 0 | 233 if (session.remote_float == 0 || session.remote_float == 2) { |
| 234 len = p->encode(&session, buffer_raw, buffer_enc, len); | |
| 235 if (len < 0) return len; | |
| 236 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
|
237 len = write(sfd, buffer_enc + p->offset_enc, len); |
| 0 | 238 } else { |
|
15
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
239 len = sendto(sfd, buffer_enc + p->offset_enc, len, 0, (struct sockaddr*)&session.remote_addr, sizeof(session.remote_addr)); |
| 0 | 240 } |
| 241 } | |
| 242 } | |
|
15
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
243 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
|
244 int out; |
|
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
245 len = sizeof(out); |
|
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
246 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
|
247 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
|
248 } |
| 0 | 249 if (fds[1].revents & POLLIN) { |
| 250 socklen_t recvaddr_len = sizeof(recvaddr); | |
| 251 if (session.remote_float == 0) { | |
| 252 len = read(sfd, buffer_enc + p->offset_enc, p->buffersize_enc); | |
| 253 } else { | |
| 254 len = recvfrom(sfd, buffer_enc + p->offset_enc, p->buffersize_enc, 0, (struct sockaddr*)&recvaddr, &recvaddr_len); | |
| 255 } | |
| 256 if (len < 0) { | |
|
15
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
257 long long out; |
|
1fa5b5fa49e1
Fixed a race condition caused by reception of ICMP errors
Ivo Smits <Ivo@UCIS.nl>
parents:
13
diff
changeset
|
258 len = sizeof(out); |
| 0 | 259 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
|
260 fprintf(stderr, "Received end of file on udp socket (error %d)\n", out); |
| 0 | 261 } else { |
| 262 len = p->decode(&session, buffer_enc, buffer_raw, 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
|
263 if (len < 0) return len; |
| 0 | 264 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
|
265 fprintf(stderr, "Remote endpoint has changed to %08X:%d\n", ntohl(recvaddr.sin_addr.s_addr), ntohs(recvaddr.sin_port)); |
| 0 | 266 session.remote_addr = recvaddr; |
| 267 session.remote_float = 2; | |
| 268 } | |
| 269 write(ttfd, buffer_raw + p->offset_raw, len); | |
| 270 } | |
| 271 } | |
| 272 } | |
| 273 return 0; | |
| 274 } | |
| 275 #endif |