scip/udpxd
1
0
Fork 0
mirror of https://codeberg.org/scip/udpxd.git synced 2025-12-16 11:30:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7 from ValdikSS/master

Browse Source 
Check for socket exhaustion and fix memory leak
This commit is contained in:
T.v.Dein
2017-04-17 16:16:51 +02:00
committed by GitHub
parent 332769d700 1f8f9b591b
commit 1bb1e2b1fd
1 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
net.c
View File

@@ -68,7 +68,7 @@ int bindsocket( host_t *sock_h) {
fd = socket( PF_INET, SOCK_DGRAM, IPPROTO_UDP ); fd = socket( PF_INET, SOCK_DGRAM, IPPROTO_UDP );
} }
if( -1 == bind( fd, (struct sockaddr*)sock_h->sock, sock_h->size ) ) { if( ! ( fd >= 0 && -1 != bind( fd, (struct sockaddr*)sock_h->sock, sock_h->size ) ) ) {
err = 1; err = 1;
} }
@@ -270,14 +270,11 @@ void handle_inside(int inside, host_t *listen_h, host_t *bind_h, host_t *dst_h)
len = recvfrom( inside, buffer, sizeof( buffer ), 0, len = recvfrom( inside, buffer, sizeof( buffer ), 0,
(struct sockaddr*)src, (socklen_t *)&size ); (struct sockaddr*)src, (socklen_t *)&size );
if(listen_h->is_v6)
src_h = get_host(NULL, 0, NULL, (struct sockaddr_in6 *)src);
else
src_h = get_host(NULL, 0, (struct sockaddr_in *)src, NULL);
free(src);
if(len > 0) { if(len > 0) {
if(listen_h->is_v6)
src_h = get_host(NULL, 0, NULL, (struct sockaddr_in6 *)src);
else
src_h = get_host(NULL, 0, (struct sockaddr_in *)src, NULL);
/* do we know it ? */ /* do we know it ? */
client = client_find_src(src_h); client = client_find_src(src_h);
if(client != NULL) { if(client != NULL) {
@@ -293,6 +290,7 @@ void handle_inside(int inside, host_t *listen_h, host_t *bind_h, host_t *dst_h)
else { else {
client_seen(client); client_seen(client);
} }
host_clean(src_h);
} }
else { else {
/* unknown client, open new out socket */ /* unknown client, open new out socket */
@@ -301,34 +299,39 @@ void handle_inside(int inside, host_t *listen_h, host_t *bind_h, host_t *dst_h)
verb_prbind(bind_h); verb_prbind(bind_h);
output = bindsocket(bind_h); output = bindsocket(bind_h);
if (output >= 0) {
/* send req out */ /* send req out */
if(sendto(output, buffer, len, 0, (struct sockaddr*)dst_h->sock, dst_h->size) < 0) { if(sendto(output, buffer, len, 0, (struct sockaddr*)dst_h->sock, dst_h->size) < 0) {
fprintf(stderr, "unable to forward to %s:%d\n", dst_h->ip, dst_h->port); fprintf(stderr, "unable to forward to %s:%d\n", dst_h->ip, dst_h->port);
perror(NULL); perror(NULL);
}
else {
size = listen_h->size;
host_t *ret_h;
if(listen_h->is_v6) {
struct sockaddr_in6 *ret = malloc(size);
getsockname(output, (struct sockaddr*)ret, (socklen_t *)&size);
ret_h = get_host(NULL, 0, NULL, ret);
free(ret);
client = client_new(output, src_h, ret_h);
} }
else { else {
struct sockaddr_in *ret = malloc(size); size = listen_h->size;
getsockname(output, (struct sockaddr*)ret, (socklen_t *)&size); host_t *ret_h;
ret_h = get_host(NULL, 0, ret, NULL); if(listen_h->is_v6) {
free(ret); struct sockaddr_in6 *ret = malloc(size);
client = client_new(output, src_h, ret_h); getsockname(output, (struct sockaddr*)ret, (socklen_t *)&size);
ret_h = get_host(NULL, 0, NULL, ret);
free(ret);
client = client_new(output, src_h, ret_h);
}
else {
struct sockaddr_in *ret = malloc(size);
getsockname(output, (struct sockaddr*)ret, (socklen_t *)&size);
ret_h = get_host(NULL, 0, ret, NULL);
free(ret);
client = client_new(output, src_h, ret_h);
}
client_add(client);
} }
}
client_add(client); else {
host_clean(src_h);
} }
} }
} }
free(src);
} }
/* handle answer from the outside */ /* handle answer from the outside */