miegl/glorytun
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop bad packets

Browse Source
This commit is contained in:
angt
2015-10-22 00:37:35 +02:00
parent 6ad9807f9d
commit 69a3414e76
1 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
glorytun.c
View File

@@ -145,7 +145,7 @@ static int read_to_buffer (int fd, buffer_t *buffer, size_t size)
buffer->write += ret; buffer->write += ret;
return 1; return ret;
} }
static int write_from_buffer (int fd, buffer_t *buffer, size_t size) static int write_from_buffer (int fd, buffer_t *buffer, size_t size)
@@ -168,7 +168,7 @@ static int write_from_buffer (int fd, buffer_t *buffer, size_t size)
buffer->read += ret; buffer->read += ret;
return 1; return ret;
} }
enum option_type { enum option_type {
@@ -291,45 +291,50 @@ int main (int argc, char **argv)
buffer_shift(&tun.recv); buffer_shift(&tun.recv);
if (fds[0].revents & POLLIN) { if (fds[0].revents & POLLIN) {
uint8_t *tmp = tun.recv.write; if (buffer_write_size(&tun.recv)) {
int r = read_to_buffer(fds[0].fd, &tun.recv, buffer_write_size(&tun.recv)); uint8_t *tmp = tun.recv.write;
size_t ps = (tmp[2]<<8)|tmp[3]; int r = read_to_buffer(fds[0].fd, &tun.recv, buffer_write_size(&tun.recv));
printf("packet len %zu\n", ps); if (!r)
if (!r) return 2; return 2;
if (r==1) printf("tun -> tun.recv\n"); if (r>0 && r!=((tmp[2]<<8)|tmp[3]))
tun.recv.write = tmp;
}
} }
if (buffer_read_size(&tun.recv)) { if (fds[1].revents & POLLOUT)
fds[1].events = POLLIN; fds[1].events = POLLIN;
if (buffer_read_size(&tun.recv)) {
int r = write_from_buffer(fds[1].fd, &tun.recv, buffer_read_size(&tun.recv)); int r = write_from_buffer(fds[1].fd, &tun.recv, buffer_read_size(&tun.recv));
if (!r) goto restart; if (!r)
if (r==-1) fds[1].events = POLLIN|POLLOUT; goto restart;
if (r==1) printf("tun.recv -> socket\n"); if (r==-1)
fds[1].events = POLLIN|POLLOUT;
} }
buffer_shift(&sock.recv); buffer_shift(&sock.recv);
if (fds[1].revents & POLLIN) { if (fds[1].revents & POLLIN) {
int r = read_to_buffer(fds[1].fd, &sock.recv, buffer_write_size(&sock.recv)); int r = read_to_buffer(fds[1].fd, &sock.recv, buffer_write_size(&sock.recv));
if (!r) goto restart; if (!r)
if (r==1) printf("socket -> sock.recv\n"); goto restart;
} }
if (buffer_read_size(&sock.recv)) { if (fds[0].revents & POLLOUT)
if ((sock.recv.read[0]>>4)!=4)
return 4;
size_t ps = (sock.recv.read[2]<<8)|sock.recv.read[3];
printf("recv %zu\n", ps);
fds[0].events = POLLIN; fds[0].events = POLLIN;
int r = write_from_buffer(fds[0].fd, &sock.recv, ps); if (buffer_read_size(&sock.recv)>=20) {
if (!r) return 2; if ((sock.recv.read[0]>>4)!=4)
if (r==-1) fds[0].events = POLLIN|POLLOUT; return 4;
if (r==1) printf("sock.recv -> tun\n"); size_t ps = (sock.recv.read[2]<<8)|sock.recv.read[3];
if (buffer_read_size(&sock.recv)>=ps) {
int r = write_from_buffer(fds[0].fd, &sock.recv, ps);
if (!r)
return 2;
if (r==-1)
fds[0].events = POLLIN|POLLOUT;
}
} }
} }
restart: restart: