mirror of
https://github.com/wangyu-/UDPspeeder.git
synced 2025-09-17 20:54:33 +08:00
Compare commits
4 Commits
20200714.0
...
20210116.0
Author | SHA1 | Date | |
---|---|---|---|
|
af607e4bfa | ||
|
6dcc97155b | ||
|
d607c5ff92 | ||
|
13d5e40473 |
@@ -1,6 +1 @@
|
|||||||
For English speaking user:
|
English Only (except for bug reporting).
|
||||||
https://github.com/wangyu-/UDPspeeder/wiki/Issue-Guide
|
|
||||||
|
|
||||||
中文用户请看:
|
|
||||||
https://github.com/wangyu-/UDPspeeder/wiki/发Issue前请看
|
|
||||||
(否则Issue可能被忽略,或被直接关掉)
|
|
||||||
|
12
makefile
12
makefile
@@ -2,9 +2,11 @@ cc_cross=/home/wangyu/Desktop/arm-2014.05/bin/arm-none-linux-gnueabi-g++
|
|||||||
cc_local=g++
|
cc_local=g++
|
||||||
cc_mips24kc_be=/toolchains/lede-sdk-17.01.2-ar71xx-generic_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-mips_24kc_gcc-5.4.0_musl-1.1.16/bin/mips-openwrt-linux-musl-g++
|
cc_mips24kc_be=/toolchains/lede-sdk-17.01.2-ar71xx-generic_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-mips_24kc_gcc-5.4.0_musl-1.1.16/bin/mips-openwrt-linux-musl-g++
|
||||||
cc_mips24kc_le=/toolchains/lede-sdk-17.01.2-ramips-mt7621_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-mipsel_24kc_gcc-5.4.0_musl-1.1.16/bin/mipsel-openwrt-linux-musl-g++
|
cc_mips24kc_le=/toolchains/lede-sdk-17.01.2-ramips-mt7621_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-mipsel_24kc_gcc-5.4.0_musl-1.1.16/bin/mipsel-openwrt-linux-musl-g++
|
||||||
cc_arm= /toolchains/arm-2014.05/bin/arm-none-linux-gnueabi-g++
|
cc_arm= /toolchains/lede-sdk-17.01.2-bcm53xx_gcc-5.4.0_musl-1.1.16_eabi.Linux-x86_64/staging_dir/toolchain-arm_cortex-a9_gcc-5.4.0_musl-1.1.16_eabi/bin/arm-openwrt-linux-c++
|
||||||
cc_mingw_cross=i686-w64-mingw32-g++-posix
|
cc_mingw_cross=i686-w64-mingw32-g++-posix
|
||||||
cc_mac_cross=o64-clang++ -stdlib=libc++
|
cc_mac_cross=o64-clang++ -stdlib=libc++
|
||||||
|
cc_x86=/toolchains/lede-sdk-17.01.2-x86-generic_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-i386_pentium4_gcc-5.4.0_musl-1.1.16/bin/i486-openwrt-linux-c++
|
||||||
|
cc_amd64=/toolchains/lede-sdk-17.01.2-x86-64_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-x86_64_gcc-5.4.0_musl-1.1.16/bin/x86_64-openwrt-linux-c++
|
||||||
#cc_bcm2708=/home/wangyu/raspberry/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-g++
|
#cc_bcm2708=/home/wangyu/raspberry/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-g++
|
||||||
|
|
||||||
|
|
||||||
@@ -63,7 +65,7 @@ fast: git_version
|
|||||||
${cc_local} -o ${NAME} -I. ${SOURCES} ${FLAGS} -lrt -ggdb
|
${cc_local} -o ${NAME} -I. ${SOURCES} ${FLAGS} -lrt -ggdb
|
||||||
debug: git_version
|
debug: git_version
|
||||||
rm -f ${NAME}
|
rm -f ${NAME}
|
||||||
${cc_local} -o ${NAME} -I. ${SOURCES} ${FLAGS} -lrt -Wformat-nonliteral -D MY_DEBUG
|
${cc_local} -o ${NAME} -I. ${SOURCES} ${FLAGS} -lrt -Wformat-nonliteral -D MY_DEBUG -ggdb
|
||||||
debug2: git_version
|
debug2: git_version
|
||||||
rm -f ${NAME}
|
rm -f ${NAME}
|
||||||
${cc_local} -o ${NAME} -I. ${SOURCES} ${FLAGS} -lrt -Wformat-nonliteral -ggdb
|
${cc_local} -o ${NAME} -I. ${SOURCES} ${FLAGS} -lrt -Wformat-nonliteral -ggdb
|
||||||
@@ -77,12 +79,12 @@ mips24kc_le: git_version
|
|||||||
${cc_mips24kc_le} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -lgcc_eh -static -O2
|
${cc_mips24kc_le} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -lgcc_eh -static -O2
|
||||||
|
|
||||||
amd64:git_version
|
amd64:git_version
|
||||||
${cc_local} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -static -O2
|
${cc_amd64} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -static -O2 -lgcc_eh -ggdb
|
||||||
|
|
||||||
x86:git_version #to build this you need 'g++-multilib' installed
|
x86:git_version #to build this you need 'g++-multilib' installed
|
||||||
${cc_local} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -static -O2 -m32
|
${cc_x86} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -static -O2 -lgcc_eh -ggdb
|
||||||
arm:git_version
|
arm:git_version
|
||||||
${cc_arm} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -static -O2 -ggdb
|
${cc_arm} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -static -O2 -lgcc_eh
|
||||||
|
|
||||||
|
|
||||||
release: ${TARGETS}
|
release: ${TARGETS}
|
||||||
|
@@ -44,12 +44,18 @@ void data_from_local_or_fec_timeout(conn_info_t & conn_info,int is_time_out)
|
|||||||
mylog(log_trace,"events[idx].data.u64 == (u64_t)local_listen_fd\n");
|
mylog(log_trace,"events[idx].data.u64 == (u64_t)local_listen_fd\n");
|
||||||
address_t::storage_t udp_new_addr_in={0};
|
address_t::storage_t udp_new_addr_in={0};
|
||||||
socklen_t udp_new_addr_len = sizeof(address_t::storage_t);
|
socklen_t udp_new_addr_len = sizeof(address_t::storage_t);
|
||||||
if ((data_len = recvfrom(local_listen_fd, data, max_data_len, 0,
|
if ((data_len = recvfrom(local_listen_fd, data, max_data_len+1, 0,
|
||||||
(struct sockaddr *) &udp_new_addr_in, &udp_new_addr_len)) == -1) {
|
(struct sockaddr *) &udp_new_addr_in, &udp_new_addr_len)) == -1) {
|
||||||
mylog(log_debug,"recv_from error,this shouldnt happen,err=%s,but we can try to continue\n",get_sock_error());
|
mylog(log_debug,"recv_from error,this shouldnt happen,err=%s,but we can try to continue\n",get_sock_error());
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if(data_len==max_data_len+1)
|
||||||
|
{
|
||||||
|
mylog(log_warn,"huge packet, data_len > %d, packet truncated, dropped\n",max_data_len);
|
||||||
|
return ;
|
||||||
|
}
|
||||||
|
|
||||||
if(!disable_mtu_warn&&data_len>=mtu_warn)
|
if(!disable_mtu_warn&&data_len>=mtu_warn)
|
||||||
{
|
{
|
||||||
mylog(log_warn,"huge packet,data len=%d (>=%d).strongly suggested to set a smaller mtu at upper level,to get rid of this warn\n ",data_len,mtu_warn);
|
mylog(log_warn,"huge packet,data len=%d (>=%d).strongly suggested to set a smaller mtu at upper level,to get rid of this warn\n ",data_len,mtu_warn);
|
||||||
@@ -122,7 +128,15 @@ static void remote_cb(struct ev_loop *loop, struct ev_io *watcher, int revents)
|
|||||||
|
|
||||||
int fd=fd_manager.to_fd(remote_fd64);
|
int fd=fd_manager.to_fd(remote_fd64);
|
||||||
|
|
||||||
int data_len =recv(fd,data,max_data_len,0);
|
int data_len =recv(fd,data,max_data_len+1,0);
|
||||||
|
|
||||||
|
if(data_len==max_data_len+1)
|
||||||
|
{
|
||||||
|
mylog(log_warn,"huge packet, data_len > %d, packet truncated, dropped\n",max_data_len);
|
||||||
|
return ;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
mylog(log_trace, "received data from udp fd %d, len=%d\n", remote_fd,data_len);
|
mylog(log_trace, "received data from udp fd %d, len=%d\n", remote_fd,data_len);
|
||||||
if(data_len<0)
|
if(data_len<0)
|
||||||
{
|
{
|
||||||
|
@@ -89,7 +89,13 @@ void data_from_remote_or_fec_timeout_or_conn_timer(conn_info_t & conn_info,fd64_
|
|||||||
conn_info.update_active_time();
|
conn_info.update_active_time();
|
||||||
|
|
||||||
int fd=fd_manager.to_fd(fd64);
|
int fd=fd_manager.to_fd(fd64);
|
||||||
data_len=recv(fd,data,max_data_len,0);
|
data_len=recv(fd,data,max_data_len+1,0);
|
||||||
|
|
||||||
|
if(data_len==max_data_len+1)
|
||||||
|
{
|
||||||
|
mylog(log_warn,"huge packet, data_len > %d, packet truncated, dropped\n",max_data_len);
|
||||||
|
return ;
|
||||||
|
}
|
||||||
|
|
||||||
mylog(log_trace,"received a packet from udp_fd,len:%d,conv=%d\n",data_len,conv);
|
mylog(log_trace,"received a packet from udp_fd,len:%d,conv=%d\n",data_len,conv);
|
||||||
|
|
||||||
@@ -135,12 +141,18 @@ static void local_listen_cb(struct ev_loop *loop, struct ev_io *watcher, int rev
|
|||||||
int data_len;
|
int data_len;
|
||||||
address_t::storage_t udp_new_addr_in={0};
|
address_t::storage_t udp_new_addr_in={0};
|
||||||
socklen_t udp_new_addr_len = sizeof(address_t::storage_t);
|
socklen_t udp_new_addr_len = sizeof(address_t::storage_t);
|
||||||
if ((data_len = recvfrom(local_listen_fd, data, max_data_len, 0,
|
if ((data_len = recvfrom(local_listen_fd, data, max_data_len+1, 0,
|
||||||
(struct sockaddr *) &udp_new_addr_in, &udp_new_addr_len)) == -1) {
|
(struct sockaddr *) &udp_new_addr_in, &udp_new_addr_len)) == -1) {
|
||||||
mylog(log_error,"recv_from error,this shouldnt happen,err=%s,but we can try to continue\n",get_sock_error());
|
mylog(log_error,"recv_from error,this shouldnt happen,err=%s,but we can try to continue\n",get_sock_error());
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if(data_len==max_data_len+1)
|
||||||
|
{
|
||||||
|
mylog(log_warn,"huge packet, data_len > %d, packet truncated, dropped\n",max_data_len);
|
||||||
|
return ;
|
||||||
|
}
|
||||||
|
|
||||||
address_t addr;
|
address_t addr;
|
||||||
addr.from_sockaddr((struct sockaddr *) &udp_new_addr_in,udp_new_addr_len);
|
addr.from_sockaddr((struct sockaddr *) &udp_new_addr_in,udp_new_addr_len);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user