Commented all the code that called wsockinit(), getservent(), endservent() because those functions are not in the latest libpcap API.

hsluoyz · hsluoyz · commit 0eead1541025 · 2016-10-06T17:51:22.000+08:00
diff --git a/Tcpdump.c b/Tcpdump.c
@@ -491,7 +491,7 @@ main(int argc, char **argv)
 
 #ifdef WIN32
 	u_int UserBufferSize = 1000000;
-	if(wsockinit() != 0) return 1;
+	// if(wsockinit() != 0) return 1;
 #endif /* WIN32 */
 
         gndo->ndo_Oflag=1;
diff --git a/addrtoname.c b/addrtoname.c
@@ -684,36 +684,36 @@ ipxsap_string(u_short port)
 	return (tp->name);
 }
 
-static void
-init_servarray(void)
-{
-	struct servent *sv;
-	register struct hnamemem *table;
-	register int i;
-	char buf[sizeof("0000000000")];
-
-	while ((sv = getservent()) != NULL) {
-		int port = ntohs(sv->s_port);
-		i = port & (HASHNAMESIZE-1);
-		if (strcmp(sv->s_proto, "tcp") == 0)
-			table = &tporttable[i];
-		else if (strcmp(sv->s_proto, "udp") == 0)
-			table = &uporttable[i];
-		else
-			continue;
-
-		while (table->name)
-			table = table->nxt;
-		if (nflag) {
-			(void)snprintf(buf, sizeof(buf), "%d", port);
-			table->name = strdup(buf);
-		} else
-			table->name = strdup(sv->s_name);
-		table->addr = port;
-		table->nxt = newhnamemem();
-	}
-	endservent();
-}
+// static void
+// init_servarray(void)
+// {
+// 	struct servent *sv;
+// 	register struct hnamemem *table;
+// 	register int i;
+// 	char buf[sizeof("0000000000")];
+// 
+// 	while ((sv = getservent()) != NULL) {
+// 		int port = ntohs(sv->s_port);
+// 		i = port & (HASHNAMESIZE-1);
+// 		if (strcmp(sv->s_proto, "tcp") == 0)
+// 			table = &tporttable[i];
+// 		else if (strcmp(sv->s_proto, "udp") == 0)
+// 			table = &uporttable[i];
+// 		else
+// 			continue;
+// 
+// 		while (table->name)
+// 			table = table->nxt;
+// 		if (nflag) {
+// 			(void)snprintf(buf, sizeof(buf), "%d", port);
+// 			table->name = strdup(buf);
+// 		} else
+// 			table->name = strdup(sv->s_name);
+// 		table->addr = port;
+// 		table->nxt = newhnamemem();
+// 	}
+// 	endservent();
+// }
 
 /* in libpcap.a (nametoaddr.c) */
 // #if defined(WIN32) && !defined(USE_STATIC_LIBPCAP)
@@ -1111,7 +1111,7 @@ init_addrtoname(u_int32_t localnet, u_int32_t mask)
 		return;
 
 	init_etherarray();
-	init_servarray();
+	//init_servarray();
 	//init_eprotoarray();
 	//init_protoidarray();
 	init_ipxsaparray();
