From 46c4333240250f9ea73be9fb5bb3a8cf04e1435b Mon Sep 17 00:00:00 2001 From: wangyu Date: Mon, 31 Jul 2017 15:12:20 +0800 Subject: [PATCH] trival --- encrypt.cpp | 8 +++++--- main.cpp | 4 ++-- makefile | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/encrypt.cpp b/encrypt.cpp index d6116ab..7336bcb 100755 --- a/encrypt.cpp +++ b/encrypt.cpp @@ -5,7 +5,7 @@ #include #include #include - +#include #include "log.h" //static uint64_t seq=1; @@ -42,6 +42,7 @@ unsigned int crc32h(unsigned char *message,int len) { return ~crc; } + void sum(const unsigned char *data,int len,unsigned char* res) { memset(res,0,sizeof(int)); for(int i=0,j=0;imax_data_len) {mylog(log_trace,"len>max_data_len");return -1;} + if(len>max_data_len) {mylog(log_warn,"len>max_data_len");return -1;} char buf[buf_len]; char buf2[buf_len]; @@ -266,7 +268,7 @@ int my_encrypt(const char *data,char *output,int &len,char * key) int my_decrypt(const char *data,char *output,int &len,char * key) { if(len<0) return -1; - if(len>max_data_len) return -1; + if(len>max_data_len) {mylog(log_warn,"len>max_data_len");return -1;} if(cipher_decrypt(data,output,len,key) !=0) {mylog(log_debug,"cipher_decrypt failed \n"); return -1;} if(auth_verify(output,len)!=0) {mylog(log_debug,"auth_verify failed\n");return -1;} diff --git a/main.cpp b/main.cpp index 19b2369..70139c8 100755 --- a/main.cpp +++ b/main.cpp @@ -2481,8 +2481,8 @@ int server_event_loop() set_timer(epollfd,timer_fd); - long int begin_time; - long int end_time; + long int begin_time=0; + long int end_time=0; while(1)//////////////////////// { diff --git a/makefile b/makefile index 7641bfc..468bbef 100755 --- a/makefile +++ b/makefile @@ -1,5 +1,5 @@ ccmips=mips-openwrt-linux-g++ -FLAGS=-Wall -Wextra -Wno-unused-variable -Wno-unused-parameter +FLAGS=-Wall -Wextra -Wno-unused-variable -Wno-unused-parameter -O3 all: sudo killall udp2raw||true sleep 0.2