wangyu 8 سال پیش
والد
کامیت
46c4333240
3فایلهای تغییر یافته به همراه8 افزوده شده و 6 حذف شده
  1. 5 3
      encrypt.cpp
  2. 2 2
      main.cpp
  3. 1 1
      makefile

+ 5 - 3
encrypt.cpp

@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <encrypt.h>
-
+#include <common.h>
 #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;i<len;i++,j++)
@@ -49,6 +50,7 @@ unsigned int crc32h(unsigned char *message,int len) {
 	   if(j==4) j=0;
 	   res[j]+=data[i];
    }
+
    return ;
 }
 
@@ -253,7 +255,7 @@ int cipher_decrypt(const char *data,char *output,int &len,char * key)
 int my_encrypt(const char *data,char *output,int &len,char * key)
 {
 	if(len<0) {mylog(log_trace,"len<0");return -1;}
-	if(len>max_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;}

+ 2 - 2
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)////////////////////////
 	{

+ 1 - 1
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