Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-21 06:23:52 +00:00
Code Releases Activity

fix the udp tunnel

Browse Source
This commit is contained in:
Max Lv
2014-02-21 11:59:33 +09:00
parent 3ed440f6ae
commit b0b2a30bb8
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udprelay.c
+22 -5
View File
@@ -473,6 +473,11 @@ static void remote_recv_cb (EV_P_ ev_io *w, int revents)
goto CLEAN_UP;
}
#ifdef UDPRELAY_TUNNEL
// Construct packet
buf_len -= addr_header_len;
memmove(buf, buf + addr_header_len, buf_len);
#else
// Construct packet
char *tmpbuf = malloc(buf_len + 3);
memset(tmpbuf, 0, 3);
@@ -481,6 +486,7 @@ static void remote_recv_cb (EV_P_ ev_io *w, int revents)
buf = tmpbuf;
buf_len += 3;
#endif
#endif
#ifdef UDPRELAY_REMOTE
// Construct packet
@@ -590,12 +596,20 @@ static void server_recv_cb (EV_P_ ev_io *w, int revents)
int host_len = strlen(host);
uint16_t port_num = (uint16_t)atoi(port);
uint16_t port_net_num = htons(port_num);
int addr_header_len = 1 + host_len + 2;
int addr_header_len = 2 + host_len + 2;
// initialize the addr header
addr_header[0] = 3;
memcpy(addr_header + 1, host, host_len);
memcpy(addr_header + 1 + host_len, &port_net_num, 2);
addr_header[1] = host_len;
memcpy(addr_header + 2, host, host_len);
memcpy(addr_header + 2 + host_len, &port_net_num, 2);
// reconstruct the buffer
char *tmp = malloc(buf_len + addr_header_len);
memcpy(tmp, addr_header, addr_header_len);
memcpy(tmp + addr_header_len, buf, buf_len);
free(buf);
buf = tmp;
#else
char host[256] = {0};
@@ -696,8 +710,11 @@ static void server_recv_cb (EV_P_ ev_io *w, int revents)
freeaddrinfo(result);
}
buf_len -= offset;
memmove(buf, buf + offset, buf_len);
if (offset > 0)
{
buf_len -= offset;
memmove(buf, buf + offset, buf_len);
}
buf = ss_encrypt_all(BUF_SIZE, buf, &buf_len, server_ctx->method);
src/utils.c
+8 -5
View File
@@ -82,9 +82,10 @@ void usage()
{
printf("\n");
printf("shadowsocks-libev %s\n\n", VERSION);
printf(" maintained by Max Lv <max.c.lv@gmail.com>\n\n");
printf(" maintained by Max Lv <max.c.lv@gmail.com>\n");
printf(" and Linus Yang <laokongzi@gmail.com>\n\n");
printf(" usage:\n\n");
printf(" ss-[local|redir|server]\n");
printf(" ss-[local|redir|server|tunnel]\n");
printf(" -s <server_host> host name or ip address of your remote server\n");
printf(" -p <server_port> port number of your remote server\n");
printf(" -l <local_port> port number of your local server\n");
@@ -100,11 +101,13 @@ void usage()
printf(" [-c <config_file>] json format config file\n");
printf("\n");
printf(" [-i <interface>] specific network interface to bind,\n");
printf(" only available in local and server modes\n");
printf(" not available in redir mode\n");
printf(" [-b <local_address>] specific local address to bind,\n");
printf(" only available in local and redir modes\n");
printf(" not available in server mode\n");
printf(" [-u] udprelay mode to supprot udp traffic\n");
printf(" only available in local and server modes\n");
printf(" not available in redir mode\n");
printf(" [-L <addr>:<port>] setup a local port forwarding tunnel\n");
printf(" only available in tunnel mode\n");
printf(" [-v] verbose mode, debug output in console\n");
printf("\n");
}