Add files via upload

dns.c

@@ -1,7 +1,7 @@
 #include "dns.h"
 #include "http.h"
 
-struct dns dns_list[MAX_CONNECTION / 2];  //һ<EFBFBD><EFBFBD><EFBFBD>ͻ<EFBFBD><EFBFBD><EFBFBD> + һ<><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ռ<><D5BC>һ<EFBFBD><D2BB>dns<6E>ṹ<EFBFBD><E1B9B9>
+struct dns dns_list[MAX_CONNECTION / 2];  //一个客户端 + 一个服务端 占用一个dns结构体
 int dnsFd;
 
 void read_dns_rsp()
@@ -17,10 +17,10 @@ void read_dns_rsp()
         memcpy(&dns_flag, rsp_data, 2);
         dns = dns_list + dns_flag;
         client = cts + (dns_flag << 1);
-        //<EFBFBD>ж<EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>DNS<EFBFBD><EFBFBD>Ӧ<EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD>ѹر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        //判断是否是正常DNS回应，是否已关闭连接
         if (dns_flag > MAX_CONNECTION >> 1 || client->fd < 0)
             continue;
-        if (dns->request_len + 12 > len || (unsigned char)rsp_data[3] != 128)  //charֻ<EFBFBD><EFBFBD>7λ<EFBFBD><EFBFBD><EFBFBD>ã<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ127
+        if (dns->request_len + 12 > len || (unsigned char)rsp_data[3] != 128)  //char只有7位可用，则正数最高为127
         {
             close_connection(client);
             continue;
@@ -58,7 +58,7 @@ void read_dns_rsp()
     }
 }
 
-/* <EFBFBD><EFBFBD>ȫ<EFBFBD><EFBFBD><EFBFBD>ͷ<EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ͳ<EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD>1<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-1 */
+/* 完全发送返回0，发送部分返回1，出错返回-1 */
 static int8_t send_dns_req(struct dns *dns)
 {
     static int write_len;

dns.h

@@ -4,7 +4,7 @@
 #include "main.h"
 
 struct dns {
-    char request[512];  //UDP<EFBFBD><EFBFBD>DNS<EFBFBD><EFBFBD><EFBFBD>󲻳<EFBFBD>512<EFBFBD>ֽ<EFBFBD>
+    char request[512];  //UDP的DNS请求不超512字节
     uint16_t request_len, sent_len;
 };
 

http.c

@@ -226,10 +226,10 @@ static char *build_request(char *client_data, int *data_len, char *host)
     static char *uri, *url, *p, *lf, *header, *new_data, *proxy_host;
     static int len;
 
-    del_hdr(client_data, data_len);
     header = client_data;
     proxy_host = host;
     do {
+        del_hdr(client_data, data_len);
         /* 将完整url转换为uri */
         url = strchr(header, ' ');
         lf = strchr(header, '\n');

main.c

@@ -30,7 +30,7 @@ static void server_loop()
     pthread_t thread_id;
     int n;
 
-	//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>accept<70><74><EFBFBD><EFBFBD><EFBFBD>̲<EFBFBD><CCB2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>²<EFBFBD><C2B2>ᾪȺ
+    //单独进程accept多进程并发环境下不会惊群
     pthread_create(&thread_id, NULL, accept_loop, NULL);
     ev.events = EPOLLIN;
     ev.data.fd = dnsFd;
@@ -73,10 +73,10 @@ static void initializate(int argc, char **argv)
         exit(1);
     }
     dnsAddr.sin_family = addr.sin_family = AF_INET;
-	//Ĭ<><C4AC>dns<6E><73>ַ
+    //默认dns地址
     dnsAddr.sin_addr.s_addr = inet_addr(DEFAULT_DNS_IP);
     dnsAddr.sin_port = htons(53);
-	dns_connect(&dnsAddr);  //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>е<EFBFBD>fd
+    dns_connect(&dnsAddr);  //主进程中的fd
     strict_spilce = 0;
     local_header = NULL;
     ssl_proxy = (char *)"CONNECT";
@@ -84,7 +84,7 @@ static void initializate(int argc, char **argv)
     proxy_header = (char *)"\nHost:";
     proxy_header_len = strlen(proxy_header);
     local_header_len = strlen(local_header);
-	/* <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD>в<EFBFBD><D0B2><EFBFBD> */
+    /* 读取命令行参数 */
     while ((opt = getopt(argc, argv, "d:l:p:s:w:L:ah")) != -1)
     {
         switch (opt)
@@ -118,7 +118,7 @@ static void initializate(int argc, char **argv)
             break;
             
             case 'p':
-                //<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѡ<EFBFBD><EFBFBD>ֵΪ "Proxy", proxy_header<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ "\nProxy:"
+                //假如选项值为 "Proxy", proxy_header设置为 "\nProxy:"
                 proxy_header_len = strlen(optarg) + 2;
                 if (optarg[proxy_header_len] == ':')
                     optarg[proxy_header_len--] = '\0';
@@ -169,7 +169,7 @@ static void initializate(int argc, char **argv)
     memset(cts, 0, sizeof(cts));
     for (i = MAX_CONNECTION; i--; )
         cts[i].fd = -1;
-    //Ϊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˵Ľṹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD>
+    //为服务端的结构体分配内存
     for (i = 1; i < MAX_CONNECTION; i += 2)
     {
         cts[i].ready_data = (char *)malloc(BUFFER_SIZE);
@@ -196,7 +196,7 @@ static void initializate(int argc, char **argv)
     }
     signal(SIGPIPE, SIG_IGN);
     while (workers-- > 1 && fork() == 0)
-		//<2F>ӽ<EFBFBD><D3BD><EFBFBD><EFBFBD>е<EFBFBD>dnsFd<46><64><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>룬<EFBFBD><EBA3AC>Ȼepoll<6C><6C><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܶ<EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̵õ<CCB5><C3B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        //子进程中的dnsFd必须重新申请，不然epoll监听可能读取到其他进程得到的数据
         dns_connect(&dnsAddr);
 }