fumiama/simple-dict
1
0
Fork 0
mirror of https://github.com/fumiama/simple-dict.git synced 2026-06-11 13:40:36 +08:00
Code Activity

优化 handle_accept loop

Browse Source
This commit is contained in:
源文雨
2022-05-07 23:21:59 +08:00
parent 4588024d5a
commit 84da1d596a
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server.c
View File

@@ -591,9 +591,10 @@ static void handle_accept(void *p) {
printf("[handle] Get %zd bytes, total: %zd.\n", numbytes, offset); printf("[handle] Get %zd bytes, total: %zd.\n", numbytes, offset);
#endif #endif
if(offset < CMDPACKET_HEAD_LEN) break; if(offset < CMDPACKET_HEAD_LEN) break;
if(offset < CMDPACKET_HEAD_LEN+cp->datalen) { if(offset < CMDPACKET_HEAD_LEN+(ssize_t)(cp->datalen)) {
numbytes = recv(accept_fd, buff+offset, CMDPACKET_HEAD_LEN+cp->datalen-offset, MSG_WAITALL); ssize_t toread = CMDPACKET_HEAD_LEN+(ssize_t)(cp->datalen)-offset;
if(numbytes <= 0) break; numbytes = recv(accept_fd, buff+offset, toread, MSG_WAITALL);
if(numbytes != toread) break;
else { else {
offset += numbytes; offset += numbytes;
#ifdef DEBUG #ifdef DEBUG
@@ -601,16 +602,16 @@ static void handle_accept(void *p) {
#endif #endif
} }
} }
numbytes = CMDPACKET_HEAD_LEN+cp->datalen; // 暂存 packet len numbytes = CMDPACKET_HEAD_LEN+(ssize_t)(cp->datalen); // 暂存 packet len
if(offset < numbytes) break; if(offset < numbytes) break;
#ifdef DEBUG #ifdef DEBUG
printf("[handle] Decrypt %d bytes data...\n", (int)cp->datalen); printf("[handle] Decrypt %d bytes data...\n", (int)cp->datalen);
#endif #endif
if(cp->cmd < 5) { if(cp->cmd <= CMDEND) {
if(cmdpacket_decrypt(cp, index, cfg.pwd)) { if(cmdpacket_decrypt(cp, index, cfg.pwd)) {
cp->data[cp->datalen] = 0; cp->data[cp->datalen] = 0;
timer_pointer_of(p)->dat = (char*)cp->data; timer_pointer_of(p)->dat = (char*)cp->data;
timer_pointer_of(p)->numbytes = cp->datalen; timer_pointer_of(p)->numbytes = (ssize_t)(cp->datalen);
printf("[normal] Get %zd bytes packet with cmd: %d, data: %s\n", offset, cp->cmd, cp->data); printf("[normal] Get %zd bytes packet with cmd: %d, data: %s\n", offset, cp->cmd, cp->data);
switch(cp->cmd) { switch(cp->cmd) {
case CMDGET: case CMDGET:
@@ -622,7 +623,7 @@ static void handle_accept(void *p) {
case CMDMD5: case CMDMD5:
if(!is_ex_dict_open && !s5_md5(timer_pointer_of(p))) goto CONV_END; if(!is_ex_dict_open && !s5_md5(timer_pointer_of(p))) goto CONV_END;
break; break;
case CMDACK: break; case CMDACK:
case CMDEND: case CMDEND:
default: goto CONV_END; break; default: goto CONV_END; break;
} }
@@ -630,11 +631,11 @@ static void handle_accept(void *p) {
puts("Decrypt normal data failed"); puts("Decrypt normal data failed");
break; break;
} }
} else if(cp->cmd < 8) { } else if(cp->cmd <= CMDDAT) {
if(cmdpacket_decrypt(cp, index, cfg.sps)) { if(cmdpacket_decrypt(cp, index, cfg.sps)) {
cp->data[cp->datalen] = 0; cp->data[cp->datalen] = 0;
timer_pointer_of(p)->dat = (char*)cp->data; timer_pointer_of(p)->dat = (char*)cp->data;
timer_pointer_of(p)->numbytes = cp->datalen; timer_pointer_of(p)->numbytes = (ssize_t)(cp->datalen);
printf("[super] Get %zd bytes packet with data: %s\n", offset, cp->data); printf("[super] Get %zd bytes packet with data: %s\n", offset, cp->data);
switch(cp->cmd) { switch(cp->cmd) {
case CMDSET: case CMDSET: