From 98995ac85bbb9f01233810386058c7ed94ab9dc3 Mon Sep 17 00:00:00 2001
From: fumiama <s862105088@gmail.com>
Date: Tue, 4 May 2021 16:12:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/server.c b/server.c
index 31e4481..4bb9d02 100644
--- a/server.c
+++ b/server.c
@@ -53,7 +53,6 @@ int bind_server(uint16_t port, u_int try_times);
 int check_buffer(THREADTIMER *timer);
 void close_file(FILE *fp);
 int close_file_and_send(THREADTIMER *timer, char *data, size_t numbytes);
-int free_after_send(int accept_fd, char *data, size_t length);
 void handle_accept(void *accept_fd_p);
 void handle_pipe(int signo);
 void handle_quit(int signo);
@@ -101,12 +100,6 @@ int listen_socket(u_int try_times) {
     }
 }
 
-int free_after_send(int accept_fd, char *data, size_t length) {
-    int re = send_data(accept_fd, data, length);
-    free(data);\
-    return re;
-}
-
 int send_data(int accept_fd, char *data, size_t length) {
     if(!~send(accept_fd, data, length, 0)) {
         puts("Send data error");
@@ -274,7 +267,7 @@ void accept_timer(void *p) {
             puts("Call kill thread");
             kill_thread(timer);
             puts("Free timer");
-            free(p);
+            free(timer);
             puts("Finish checking accept status");
             break;
         }
@@ -282,6 +275,7 @@ void accept_timer(void *p) {
 }
 
 void kill_thread(THREADTIMER* timer) {
+    puts("Start killing.");
     if(*(timer->thread)) {
         pthread_kill(*(timer->thread), SIGQUIT);
         *(timer->thread) = 0;
@@ -290,6 +284,7 @@ void kill_thread(THREADTIMER* timer) {
     if(timer->accept_fd) {
         close(timer->accept_fd);
         timer->accept_fd = 0;
+        puts("Close accept.");
     }
     if(timer->data) {
         free(timer->data);
@@ -301,6 +296,7 @@ void kill_thread(THREADTIMER* timer) {
         timer->is_open = 0;
         puts("Close file.");
     }
+    puts("Finish killing.");
 }
 
 void handle_pipe(int signo) {