Loading src/main.c +39 −11 Changes for src/main.c: 39 added lines, 11 removed lines. Original line number Diff line number Diff line Loading @@ -81,7 +81,7 @@ unsigned volatile is_tx_done = 0; unsigned volatile is_rx_done = 0; time_t global_now; uint64_t usec_start; /*************************************************************************** * We create a pair of transmit/receive threads for each network adapter. Loading Loading @@ -157,6 +157,9 @@ struct ThreadPair { uint64_t *total_synacks; uint64_t *total_tcbs; uint64_t *total_syns; size_t thread_handle_xmit; size_t thread_handle_recv; }; Loading Loading @@ -468,8 +471,8 @@ infinite: * Wait until the receive thread realizes the scan is over */ LOG(1, "THREAD: xmit done, waiting for receive thread to realize this\n"); while (!is_tx_done) pixie_usleep(1000); /*while (!is_tx_done) pixie_mssleep(1);*/ /* * We are done transmitting. However, response packets will take several Loading Loading @@ -1228,14 +1231,14 @@ main_scan(struct Masscan *masscan) * THIS IS WHERE THE PROGRAM STARTS SPEWING OUT PACKETS AT A HIGH * RATE OF SPEED. */ pixie_begin_thread(transmit_thread, 0, parms); parms->thread_handle_xmit = pixie_begin_thread(transmit_thread, 0, parms); /* * Start the MATCHING receive thread. Transmit and receive threads * come in matching pairs. */ pixie_begin_thread(receive_thread, 0, parms); parms->thread_handle_recv = pixie_begin_thread(receive_thread, 0, parms); } Loading @@ -1259,6 +1262,7 @@ main_scan(struct Masscan *masscan) /* * Now wait for <ctrl-c> to be pressed OR for threads to exit */ LOG(1, "THREAD: status: starting thread\n"); status_start(&status); status.is_infinite = masscan->is_infinite; while (!is_tx_done && masscan->output.is_status_updates) { Loading Loading @@ -1321,7 +1325,6 @@ main_scan(struct Masscan *masscan) /* * Now wait for all threads to exit */ LOG(1, "THREAD: status: starting thread\n"); now = time(0); for (;;) { unsigned transmit_count = 0; Loading Loading @@ -1352,14 +1355,15 @@ main_scan(struct Masscan *masscan) } if (masscan->output.is_status_updates) status_print(&status, min_index, range, rate, total_tcbs, total_synacks, total_syns, masscan->wait - (time(0) - now)); if (time(0) - now >= masscan->wait) is_rx_done = 1; if (masscan->output.is_status_updates) { status_print(&status, min_index, range, rate, total_tcbs, total_synacks, total_syns, masscan->wait - (time(0) - now)); for (i=0; i<masscan->nic_count; i++) { struct ThreadPair *parms = &parms_array[i]; Loading @@ -1368,7 +1372,7 @@ main_scan(struct Masscan *masscan) } pixie_mssleep(10); pixie_mssleep(250); if (transmit_count < masscan->nic_count) continue; Loading @@ -1376,6 +1380,24 @@ main_scan(struct Masscan *masscan) is_rx_done = 1; if (receive_count < masscan->nic_count) continue; } else { /* [AFL-fuzz] * Join the threads, which doesn't allow us to print out * status messages, but allows us to exit cleaningly without * any waiting */ for (i=0; i<masscan->nic_count; i++) { struct ThreadPair *parms = &parms_array[i]; pixie_thread_join(parms->thread_handle_xmit); parms->thread_handle_xmit = 0; pixie_thread_join(parms->thread_handle_recv); parms->thread_handle_recv = 0; } is_tx_done = 1; is_rx_done = 1; } break; } Loading @@ -1387,6 +1409,11 @@ main_scan(struct Masscan *masscan) status_finish(&status); rangelist_pick2_destroy(picker); if (!masscan->output.is_status_updates) { uint64_t usec_now = pixie_gettime(); printf("%u milliseconds ellapsed\n", (unsigned)((usec_now - usec_start)/1000)); } return 0; } Loading @@ -1400,6 +1427,7 @@ int main(int argc, char *argv[]) struct Masscan masscan[1]; unsigned i; usec_start = pixie_gettime(); #if defined(WIN32) {WSADATA x; WSAStartup(0x101, &x);} #endif Loading src/pixie-threads.c +13 Changes for src/pixie-threads.c: 13 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -194,3 +194,16 @@ pixie_begin_thread( #error pixie_begin_thread undefined #endif } /**************************************************************************** ****************************************************************************/ void pixie_thread_join(size_t thread_handle) { #if defined(WIN32) WaitForSingleObject((HANDLE)thread_handle, INFINITE); #else void *p; pthread_join(thread_handle, &p); #endif } No newline at end of file src/pixie-threads.h +2 Changes for src/pixie-threads.h: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -21,6 +21,8 @@ size_t pixie_begin_thread(void (*worker_thread)(void*), unsigned flags, void *worker_data); void pixie_thread_join(size_t thread_handle); void pixie_cpu_set_affinity(unsigned processor); void pixie_cpu_raise_priority(void); Loading vs10/masscan.vcxproj +3 Changes for vs10/masscan.vcxproj: 3 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -252,11 +252,13 @@ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <EnablePREfast>false</EnablePREfast> <WholeProgramOptimization>false</WholeProgramOptimization> </ClCompile> <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <AdditionalLibraryDirectories>lib;</AdditionalLibraryDirectories> <Profile>true</Profile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> Loading @@ -274,6 +276,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <AdditionalLibraryDirectories>lib\x64;</AdditionalLibraryDirectories> <AdditionalDependencies>setargv.obj;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <Profile>true</Profile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> Loading Loading
src/main.c +39 −11 Changes for src/main.c: 39 added lines, 11 removed lines. Original line number Diff line number Diff line Loading @@ -81,7 +81,7 @@ unsigned volatile is_tx_done = 0; unsigned volatile is_rx_done = 0; time_t global_now; uint64_t usec_start; /*************************************************************************** * We create a pair of transmit/receive threads for each network adapter. Loading Loading @@ -157,6 +157,9 @@ struct ThreadPair { uint64_t *total_synacks; uint64_t *total_tcbs; uint64_t *total_syns; size_t thread_handle_xmit; size_t thread_handle_recv; }; Loading Loading @@ -468,8 +471,8 @@ infinite: * Wait until the receive thread realizes the scan is over */ LOG(1, "THREAD: xmit done, waiting for receive thread to realize this\n"); while (!is_tx_done) pixie_usleep(1000); /*while (!is_tx_done) pixie_mssleep(1);*/ /* * We are done transmitting. However, response packets will take several Loading Loading @@ -1228,14 +1231,14 @@ main_scan(struct Masscan *masscan) * THIS IS WHERE THE PROGRAM STARTS SPEWING OUT PACKETS AT A HIGH * RATE OF SPEED. */ pixie_begin_thread(transmit_thread, 0, parms); parms->thread_handle_xmit = pixie_begin_thread(transmit_thread, 0, parms); /* * Start the MATCHING receive thread. Transmit and receive threads * come in matching pairs. */ pixie_begin_thread(receive_thread, 0, parms); parms->thread_handle_recv = pixie_begin_thread(receive_thread, 0, parms); } Loading @@ -1259,6 +1262,7 @@ main_scan(struct Masscan *masscan) /* * Now wait for <ctrl-c> to be pressed OR for threads to exit */ LOG(1, "THREAD: status: starting thread\n"); status_start(&status); status.is_infinite = masscan->is_infinite; while (!is_tx_done && masscan->output.is_status_updates) { Loading Loading @@ -1321,7 +1325,6 @@ main_scan(struct Masscan *masscan) /* * Now wait for all threads to exit */ LOG(1, "THREAD: status: starting thread\n"); now = time(0); for (;;) { unsigned transmit_count = 0; Loading Loading @@ -1352,14 +1355,15 @@ main_scan(struct Masscan *masscan) } if (masscan->output.is_status_updates) status_print(&status, min_index, range, rate, total_tcbs, total_synacks, total_syns, masscan->wait - (time(0) - now)); if (time(0) - now >= masscan->wait) is_rx_done = 1; if (masscan->output.is_status_updates) { status_print(&status, min_index, range, rate, total_tcbs, total_synacks, total_syns, masscan->wait - (time(0) - now)); for (i=0; i<masscan->nic_count; i++) { struct ThreadPair *parms = &parms_array[i]; Loading @@ -1368,7 +1372,7 @@ main_scan(struct Masscan *masscan) } pixie_mssleep(10); pixie_mssleep(250); if (transmit_count < masscan->nic_count) continue; Loading @@ -1376,6 +1380,24 @@ main_scan(struct Masscan *masscan) is_rx_done = 1; if (receive_count < masscan->nic_count) continue; } else { /* [AFL-fuzz] * Join the threads, which doesn't allow us to print out * status messages, but allows us to exit cleaningly without * any waiting */ for (i=0; i<masscan->nic_count; i++) { struct ThreadPair *parms = &parms_array[i]; pixie_thread_join(parms->thread_handle_xmit); parms->thread_handle_xmit = 0; pixie_thread_join(parms->thread_handle_recv); parms->thread_handle_recv = 0; } is_tx_done = 1; is_rx_done = 1; } break; } Loading @@ -1387,6 +1409,11 @@ main_scan(struct Masscan *masscan) status_finish(&status); rangelist_pick2_destroy(picker); if (!masscan->output.is_status_updates) { uint64_t usec_now = pixie_gettime(); printf("%u milliseconds ellapsed\n", (unsigned)((usec_now - usec_start)/1000)); } return 0; } Loading @@ -1400,6 +1427,7 @@ int main(int argc, char *argv[]) struct Masscan masscan[1]; unsigned i; usec_start = pixie_gettime(); #if defined(WIN32) {WSADATA x; WSAStartup(0x101, &x);} #endif Loading
src/pixie-threads.c +13 Changes for src/pixie-threads.c: 13 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -194,3 +194,16 @@ pixie_begin_thread( #error pixie_begin_thread undefined #endif } /**************************************************************************** ****************************************************************************/ void pixie_thread_join(size_t thread_handle) { #if defined(WIN32) WaitForSingleObject((HANDLE)thread_handle, INFINITE); #else void *p; pthread_join(thread_handle, &p); #endif } No newline at end of file
src/pixie-threads.h +2 Changes for src/pixie-threads.h: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -21,6 +21,8 @@ size_t pixie_begin_thread(void (*worker_thread)(void*), unsigned flags, void *worker_data); void pixie_thread_join(size_t thread_handle); void pixie_cpu_set_affinity(unsigned processor); void pixie_cpu_raise_priority(void); Loading
vs10/masscan.vcxproj +3 Changes for vs10/masscan.vcxproj: 3 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -252,11 +252,13 @@ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <EnablePREfast>false</EnablePREfast> <WholeProgramOptimization>false</WholeProgramOptimization> </ClCompile> <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <AdditionalLibraryDirectories>lib;</AdditionalLibraryDirectories> <Profile>true</Profile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> Loading @@ -274,6 +276,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <AdditionalLibraryDirectories>lib\x64;</AdditionalLibraryDirectories> <AdditionalDependencies>setargv.obj;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <Profile>true</Profile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> Loading