github/wangyu-UDPspeeder
1
0
Fork 0
mirror of https://github.com/wangyu-/UDPspeeder.git synced 2025-01-18 22:09:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'branch_libev' of https://github.com/wangyu-/UDPspeeder into branch_libev

Browse Source
This commit is contained in:
wangyu- 2018-06-04 03:00:47 -05:00
commit a94c75d6b7
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.h
View File

@ -26,7 +26,7 @@
#include <netinet/tcp.h> //Provides declarations for tcp header #include <netinet/tcp.h> //Provides declarations for tcp header
#include <netinet/udp.h> #include <netinet/udp.h>
#include <netinet/ip.h> //Provides declarations for ip header #include <netinet/ip.h> //Provides declarations for ip header
#include <netinet/if_ether.h> //#include <netinet/if_ether.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <fcntl.h> #include <fcntl.h>
#include <arpa/inet.h> #include <arpa/inet.h>

4
fec_manager.cpp
View File

@ -177,7 +177,7 @@ int fec_encode_manager_t::append(char *s,int len/*,int &is_first_packet*/)
{ {
if(counter==0) if(counter==0)
{ {
itimerspec its; my_itimerspec its;
memset(&its.it_interval,0,sizeof(its.it_interval)); memset(&its.it_interval,0,sizeof(its.it_interval));
first_packet_time=get_current_time_us(); first_packet_time=get_current_time_us();
my_time_t tmp_time=fec_timeout+first_packet_time; my_time_t tmp_time=fec_timeout+first_packet_time;
@ -414,7 +414,7 @@ int fec_encode_manager_t::input(char *s,int len/*,int &is_first_packet*/)
output_n=actual_data_num+actual_redundant_num; output_n=actual_data_num+actual_redundant_num;
blob_encode.clear(); blob_encode.clear();
itimerspec its; my_itimerspec its;
memset(&its,0,sizeof(its)); memset(&its,0,sizeof(its));
ev_timer_stop(loop, &timer); ev_timer_stop(loop, &timer);
//timerfd_settime(timer_fd,TFD_TIMER_ABSTIME,&its,0); //timerfd_settime(timer_fd,TFD_TIMER_ABSTIME,&its,0);

2
log.h
View File

@ -28,7 +28,7 @@
#include <netinet/tcp.h> //Provides declarations for tcp header #include <netinet/tcp.h> //Provides declarations for tcp header
#include <netinet/udp.h> #include <netinet/udp.h>
#include <netinet/ip.h> //Provides declarations for ip header #include <netinet/ip.h> //Provides declarations for ip header
#include <netinet/if_ether.h> //#include <netinet/if_ether.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/socket.h> #include <sys/socket.h>

6
makefile
View File

@ -17,7 +17,11 @@ TAR=${NAME}_binaries.tar.gz `echo ${TARGETS}|sed -r 's/([^ ]+)/speederv2_\1/g'`
all:git_version all:git_version
rm -f ${NAME} rm -f ${NAME}
${cc_local} -o ${NAME} -I. ${SOURCES} ${FLAGS} -lrt -ggdb -static -O3 ${cc_local} -o ${NAME} -I. ${SOURCES} ${FLAGS} -lrt -ggdb -static -O3
cygwin:git_version
rm -f ${NAME}
${cc_local} -o ${NAME} -I. ${SOURCES} ${FLAGS} -lrt -ggdb -static -O3 -D_GNU_SOURCE
mac:git_version mac:git_version
rm -f ${NAME} rm -f ${NAME}