Nothing

lifenjoiner · Jan 17, 2017 · dd41da3 · dd41da3
1 parent dda4378
commit dd41da3
Show file tree

Hide file tree

Showing 83 changed files with 26 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/AUTHORS b/AUTHORS
diff --git a/COPYING b/COPYING
diff --git a/ChangeLog b/ChangeLog
diff --git a/INSTALL b/INSTALL
diff --git a/LICENSE b/LICENSE
diff --git a/NEWS b/NEWS
diff --git a/README b/README
diff --git a/README.md b/README.md
diff --git a/StatisticTemplate.html b/StatisticTemplate.html
diff --git a/aclocal.m4 b/aclocal.m4
diff --git a/addresslist.c b/addresslist.c
diff --git a/addresslist.h b/addresslist.h
diff --git a/array.h b/array.h
diff --git a/cacheht.c b/cacheht.c
diff --git a/cacheht.h b/cacheht.h
diff --git a/cachettlcrtl.h b/cachettlcrtl.h
diff --git a/checkip.c b/checkip.c
diff --git a/checkip.h b/checkip.h
diff --git a/codeblocks/dnsforwarder.cbp b/codeblocks/dnsforwarder.cbp
diff --git a/compile b/compile
diff --git a/config.h.in b/config.h.in
diff --git a/configure b/configure
diff --git a/configure.ac b/configure.ac
diff --git a/default.config b/default.config
diff --git a/depcomp b/depcomp
diff --git a/dnsparser.c b/dnsparser.c
diff --git a/dnsparser.h b/dnsparser.h
diff --git a/dnsrelated.c b/dnsrelated.c
diff --git a/dnsrelated.h b/dnsrelated.h
diff --git a/domainstatistic.h b/domainstatistic.h
diff --git a/downloader.c b/downloader.c
diff --git a/downloader.h b/downloader.h
diff --git a/filter.h b/filter.h
diff --git a/goodiplist.h b/goodiplist.h
diff --git a/install-sh b/install-sh
diff --git a/ipmisc.c b/ipmisc.c
diff --git a/ipmisc.h b/ipmisc.h
diff --git a/linkedqueue.h b/linkedqueue.h
diff --git a/mac_bin/dnsforwarder b/mac_bin/dnsforwarder
diff --git a/main.c b/main.c
@@ -519,7 +519,9 @@ int main(int argc, char *argv[])
         return -311;
     }
 
-	putchar('\n');
+	putchar('\n');
+
+	ExitThisThread();
 
 #ifdef WIN32
     WSACleanup();

diff --git a/makefile.am b/makefile.am
diff --git a/makefile.in b/makefile.in
diff --git a/missing b/missing
diff --git a/pipes.c b/pipes.c
diff --git a/pipes.h b/pipes.h
diff --git a/querydnslistentcp.h b/querydnslistentcp.h
diff --git a/readline.c b/readline.c
diff --git a/readline.h b/readline.h
diff --git a/request_response.c b/request_response.c
diff --git a/rwlock.h b/rwlock.h
diff --git a/simpleht.c b/simpleht.c
diff --git a/simpleht.h b/simpleht.h
diff --git a/socketpool.c b/socketpool.c
@@ -20,7 +20,7 @@ static int SocketPool_Add(SocketPool *sp,
         su.Data = NULL;
     }
 
-	if( sp->t.Add(&(sp->t), &su) != NULL )
+	if( sp->t.Add(&(sp->t), &su) == NULL )
 	{
 		return -27;
 	}
@@ -32,15 +32,22 @@ typedef struct _SocketPool_Fetch_Arg
 {
     SOCKET Sock;
     fd_set *fs;
+    void **DataOut;
 } SocketPool_Fetch_Arg;
 
 static int SocketPool_Fetch_Inner(Bst *t,
-                                  const SocketUnit *Data,
+                                  const SocketUnit *su,
                                   SocketPool_Fetch_Arg *Arg)
 {
-    if( FD_ISSET(Data->Sock, Arg->fs) )
+    if( FD_ISSET(su->Sock, Arg->fs) )
     {
-        Arg->Sock = Data->Sock;
+        Arg->Sock = su->Sock;
+
+        if( Arg->DataOut != NULL )
+        {
+            *(Arg->DataOut) = su->Data;
+        }
+
         return 1;
     }
 
@@ -52,7 +59,7 @@ static SOCKET SocketPool_FetchOnSet(SocketPool *sp,
                                     void **Data
                                     )
 {
-    SocketPool_Fetch_Arg ret = {INVALID_SOCKET, fs};
+    SocketPool_Fetch_Arg ret = {INVALID_SOCKET, fs, Data};
 
     sp->t.Enum(&(sp->t),
                (Bst_Enum_Callback)SocketPool_Fetch_Inner,

diff --git a/sockets.c b/sockets.c
diff --git a/sockets.h b/sockets.h
diff --git a/test/linkedqueue/linkedqueue.cbp b/test/linkedqueue/linkedqueue.cbp
diff --git a/test/linkedqueue/main.c b/test/linkedqueue/main.c
diff --git a/test/pipes/main.c b/test/pipes/main.c
diff --git a/test/pipes/pipe.cbp b/test/pipes/pipe.cbp
diff --git a/test/stablebuffer/main.c b/test/stablebuffer/main.c
diff --git a/test/stablebuffer/test.cbp b/test/stablebuffer/test.cbp
diff --git a/test/stringchunk/main.c b/test/stringchunk/main.c
diff --git a/test/stringchunk/stringchunk.cbp b/test/stringchunk/stringchunk.cbp
diff --git a/test/stringlist/main.c b/test/stringlist/main.c
diff --git a/test/stringlist/stringlist.cbp b/test/stringlist/stringlist.cbp
diff --git a/test/testutils.c b/test/testutils.c
diff --git a/test/testutils.h b/test/testutils.h
diff --git a/test/timedtask/main.c b/test/timedtask/main.c
diff --git a/test/timedtask/timedtask.cbp b/test/timedtask/timedtask.cbp
diff --git a/test/utils/main.c b/test/utils/main.c
diff --git a/test/utils/utils.cbp b/test/utils/utils.cbp
diff --git a/test/winmsgque/main.c b/test/winmsgque/main.c
diff --git a/test/winmsgque/winmsgque.cbp b/test/winmsgque/winmsgque.cbp
diff --git a/utils.c b/utils.c
@@ -1106,3 +1106,12 @@ int SetSocketNonBlock(SOCKET sock, BOOL NonBlocked)
 	return 0;
 #endif
 }
+
+void ExitThisThread(void)
+{
+#ifdef WIN32
+    ExitThread(0);
+#else /* WIN32 */
+    pthread_exit(NULL);
+#endif /* WIN32 */
+}
diff --git a/utils.h b/utils.h
@@ -146,5 +146,7 @@ char *ReplaceStr_WithLengthChecking(char *Src,
                                     );
 
 int SetSocketNonBlock(SOCKET sock, BOOL NonBlocked);
+
+void ExitThisThread(void);
 
 #endif /* _UTILS_ */
diff --git a/vc/dnsforwarder.sln b/vc/dnsforwarder.sln
diff --git a/vc/dnsforwarder.v11.suo b/vc/dnsforwarder.v11.suo
diff --git a/vc/dnsforwarder.vcxproj b/vc/dnsforwarder.vcxproj
diff --git a/vc/dnsforwarder.vcxproj.filters b/vc/dnsforwarder.vcxproj.filters
diff --git a/vc/dnsforwarder.vcxproj.user b/vc/dnsforwarder.vcxproj.user
diff --git a/winmsgque.c b/winmsgque.c
diff --git a/winmsgque.h b/winmsgque.h