Skip to content

Commit 3b9caec

Browse files
committed
Merge PR #26: (Win32) Remove delay_socket
My hack came from many years ago, but still it's unlike me to miss something like so basic as Sleep(). So I suspect there was A Reason I did it this way (despite the contrite comment). But I have no way to test it at this point, so I'm just gonna merge it in.
2 parents a6ef70a + ffd512a commit 3b9caec

File tree

1 file changed

+1
-27
lines changed

1 file changed

+1
-27
lines changed

ngrep.c

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,6 @@ struct in_addr net, mask;
171171
*/
172172

173173
struct timeval prev_ts = {0, 0}, prev_delay_ts = {0,0};
174-
#if defined(_WIN32)
175-
struct timeval delay_tv;
176-
FD_SET delay_fds;
177-
SOCKET delay_socket = 0;
178-
#endif
179174

180175
void (*print_time)(struct pcap_pkthdr *) = NULL, (*dump_delay)(struct pcap_pkthdr *) = dump_delay_proc_init;
181176

@@ -1324,27 +1319,7 @@ void dump_delay_proc(struct pcap_pkthdr *h) {
13241319
}
13251320

13261321
#ifdef _WIN32
1327-
{
1328-
// grevious hack, yes, but windows sucks. sorry. :( --jordan
1329-
if ((delay_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) {
1330-
perror("delay socket creation failed, disabling -D");
1331-
Sleep(3000); // give them time to read the message
1332-
want_delay = 0;
1333-
return;
1334-
}
1335-
1336-
FD_ZERO(&delay_fds);
1337-
FD_SET(delay_socket, &delay_fds);
1338-
1339-
delay_tv.tv_sec = secs;
1340-
delay_tv.tv_usec = usecs;
1341-
1342-
if (select(0, &delay_fds, 0, 0, &delay_tv) == -1)
1343-
fprintf(stderr, "WSAGetLastError = %u\n", WSAGetLastError());
1344-
1345-
closesocket(delay_socket);
1346-
delay_socket = 0; // in case someone ^C's out of me
1347-
}
1322+
Sleep(1000*secs + usecs/1000);
13481323
#else
13491324
sleep(secs);
13501325
usleep(usecs);
@@ -1516,7 +1491,6 @@ void clean_exit(int32_t sig) {
15161491
if (pd_dump) pcap_dump_close(pd_dump);
15171492

15181493
#if defined(_WIN32)
1519-
if (delay_socket) closesocket(delay_socket);
15201494
if (want_delay) WSACleanup();
15211495
if (usedev) free(usedev);
15221496
#endif

0 commit comments

Comments
 (0)