Skip to content

Commit

Permalink
just commit
Browse files Browse the repository at this point in the history
  • Loading branch information
wangyu- committed Oct 13, 2017
1 parent 11730a8 commit c12a132
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
8 changes: 4 additions & 4 deletions main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -442,9 +442,9 @@ int client_event_loop()
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);
}

if(cook_rm_crc32(data,data_len)!=0)
if(de_cook(data,data_len)!=0)
{
mylog(log_debug,"cook_rm_crc32 check error");
mylog(log_debug,"de_cook error");
continue;
}

Expand Down Expand Up @@ -602,9 +602,9 @@ int server_event_loop()
}


if(cook_rm_crc32(data,data_len)!=0)
if(de_cook(data,data_len)!=0)
{
mylog(log_debug,"cook_rm_crc32 check error");
mylog(log_debug,"de_cook error");
continue;
}

Expand Down
10 changes: 8 additions & 2 deletions packet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ int put_crc32(char * s,int &len)
return 0;
}

int cook_rm_crc32(char * s,int &len)
int de_cook(char * s,int &len)
{
if(!disable_xor)decrypt_0(s,len,key_string);
if(!disable_obscure)
Expand All @@ -313,7 +313,13 @@ int cook_rm_crc32(char * s,int &len)
return ret;
}
}
return rm_crc32(s,len);
int ret=rm_crc32(s,len);
if(ret!=0)
{
mylog(log_debug,"rm_crc32 fail\n");
return ret;
}
return 0;
}
int rm_crc32(char * s,int &len)
{
Expand Down
2 changes: 1 addition & 1 deletion packet.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ int put_conv(u32_t conv,const char * input,int len_in,char *&output,int &len_out
int get_conv(u32_t &conv,const char *input,int len_in,char *&output,int &len_out );
int put_crc32(char * s,int &len);
int rm_crc32(char * s,int &len);
int cook_rm_crc32(char * s,int &len);
int de_cook(char * s,int &len);
#endif /* PACKET_H_ */

0 comments on commit c12a132

Please sign in to comment.