fumiama/simple-dict
1
0
Fork 0
mirror of https://github.com/fumiama/simple-dict.git synced 2026-07-03 10:20:23 +08:00
Code Activity

修复 密码验证

Browse Source
This commit is contained in:
fumiama
2021-02-17 16:44:18 +08:00
parent 76a6431453
commit 13f7f1592f
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server.c
View File

@@ -50,7 +50,7 @@ DICTBLK dict;
void acceptClient(); void acceptClient();
void acceptTimer(void *p); void acceptTimer(void *p);
int bindServer(uint16_t port, u_int try_times); int bindServer(uint16_t port, u_int try_times);
int checkBuffer(int accept_fd); int checkBuffer(int accept_fd, int *s);
int closeDict(FILE *fp); int closeDict(FILE *fp);
off_t fileSize(const char* fname); off_t fileSize(const char* fname);
void handleAccept(void *accept_fd_p); void handleAccept(void *accept_fd_p);
@@ -243,17 +243,16 @@ int s5_list(int *s, int accept_fd) {
} else return sendData(accept_fd, "erro", 4); } else return sendData(accept_fd, "erro", 4);
} }
int checkBuffer(int accept_fd) { int checkBuffer(int accept_fd, int *s) {
static int s = -1; printf("Status: %d\n", *s);
printf("Status: %d\n", s); switch(*s) {
switch(s) { case -1: return sm1_pwd(s, accept_fd); break;
case -1: return sm1_pwd(&s, accept_fd); break; case 0: return s0_init(s, accept_fd); break;
case 0: return s0_init(&s, accept_fd); break; case 1: return s1_get(s, accept_fd); break;
case 1: return s1_get(&s, accept_fd); break; case 2: return s2_set(s, accept_fd); break;
case 2: return s2_set(&s, accept_fd); break; case 3: return s3_setData(s, accept_fd); break;
case 3: return s3_setData(&s, accept_fd); break; case 4: return s4_del(s, accept_fd); break;
case 4: return s4_del(&s, accept_fd); break; case 5: return s5_list(s, accept_fd); break;
case 5: return s5_list(&s, accept_fd); break;
default: return -1; break; default: return -1; break;
} }
} }
@@ -287,12 +286,13 @@ void handleAccept(void *p) {
if (pthread_create(&thread, NULL, (void *)&acceptTimer, p)) perror("Error creating timer thread"); if (pthread_create(&thread, NULL, (void *)&acceptTimer, p)) perror("Error creating timer thread");
else puts("Creating timer thread succeeded"); else puts("Creating timer thread succeeded");
sendData(accept_fd, "Welcome to simple dict server.", 31); sendData(accept_fd, "Welcome to simple dict server.", 31);
int s = -1;
while((numbytes = recv(accept_fd, buff, BUFSIZ, 0)) > 0) { while((numbytes = recv(accept_fd, buff, BUFSIZ, 0)) > 0) {
touchTimer(p); touchTimer(p);
buff[numbytes] = 0; buff[numbytes] = 0;
printf("Get %zd bytes: %s\n", numbytes, buff); printf("Get %zd bytes: %s\n", numbytes, buff);
puts("Check buffer"); puts("Check buffer");
if(!checkBuffer(accept_fd)) break; if(!checkBuffer(accept_fd, &s)) break;
} }
fprintf(stderr, "Recv %zd bytes\n", numbytes); fprintf(stderr, "Recv %zd bytes\n", numbytes);
close(accept_fd); close(accept_fd);