@@ -171,11 +171,6 @@ struct in_addr net, mask;
171171 */
172172
173173struct 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
180175void (* print_time )() = NULL , (* dump_delay )() = dump_delay_proc_init ;
181176
@@ -1308,27 +1303,7 @@ void dump_delay_proc(struct pcap_pkthdr *h) {
13081303 }
13091304
13101305#ifdef _WIN32
1311- {
1312- // grevious hack, yes, but windows sucks. sorry. :( --jordan
1313- if ((delay_socket = socket (AF_INET , SOCK_STREAM , IPPROTO_TCP )) == -1 ) {
1314- perror ("delay socket creation failed, disabling -D" );
1315- Sleep (3000 ); // give them time to read the message
1316- want_delay = 0 ;
1317- return ;
1318- }
1319-
1320- FD_ZERO (& delay_fds );
1321- FD_SET (delay_socket , & delay_fds );
1322-
1323- delay_tv .tv_sec = secs ;
1324- delay_tv .tv_usec = usecs ;
1325-
1326- if (select (0 , & delay_fds , 0 , 0 , & delay_tv ) == -1 )
1327- fprintf (stderr , "WSAGetLastError = %u\n" , WSAGetLastError ());
1328-
1329- closesocket (delay_socket );
1330- delay_socket = 0 ; // in case someone ^C's out of me
1331- }
1306+ Sleep (1000 * secs + usecs /1000 );
13321307#else
13331308 sleep (secs );
13341309 usleep (usecs );
@@ -1500,7 +1475,6 @@ void clean_exit(int32_t sig) {
15001475 if (pd_dump ) pcap_dump_close (pd_dump );
15011476
15021477#if defined(_WIN32 )
1503- if (delay_socket ) closesocket (delay_socket );
15041478 if (want_delay ) WSACleanup ();
15051479 if (usedev ) free (usedev );
15061480#endif
0 commit comments