David Adrian 
							
						 
					 
					
						
						
							
						
						bc28a5a576 
					 
					
						
						
							
							Fix compile warnings in blacklist.c  
						
						 
						
						
						
						
					 
					
						2013-10-12 13:04:02 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Adrian 
							
						 
					 
					
						
						
							
						
						4eac51fdca 
					 
					
						
						
							
							Merge in changes to allow filtering received packets  
						
						 
						
						... 
						
						
						
						Merge branch 'output-filter'
Conflicts:
	src/zmap.c 
						
						
					 
					
						2013-10-12 12:54:56 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zakir Durumeric 
							
						 
					 
					
						
						
							
						
						8389362a01 
					 
					
						
						
							
							return parsed data from redis parse conn str  
						
						 
						
						
						
						
					 
					
						2013-10-11 23:31:48 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zakir Durumeric 
							
						 
					 
					
						
						
							
						
						e49e442535 
					 
					
						
						
							
							working redis string connections  
						
						 
						
						
						
						
					 
					
						2013-10-11 23:15:59 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Adrian 
							
						 
					 
					
						
						
							
						
						84318c2cf0 
					 
					
						
						
							
							Revert "Untested iterative implementation of evaluate"  
						
						 
						
						... 
						
						
						
						This reverts commit f2ba9d7621 . 
						
						
					 
					
						2013-10-11 17:10:20 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Adrian 
							
						 
					 
					
						
						
							
						
						f2ba9d7621 
					 
					
						
						
							
							Untested iterative implementation of evaluate  
						
						 
						
						
						
						
					 
					
						2013-10-11 12:13:42 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Adrian 
							
						 
					 
					
						
						
							
						
						2453404604 
					 
					
						
						
							
							Move stack.h and stack.c to lib  
						
						 
						
						
						
						
					 
					
						2013-10-11 11:04:04 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zakir Durumeric 
							
						 
					 
					
						
						
							
						
						3eb7630f28 
					 
					
						
						
							
							making parse redis connstr externally available  
						
						 
						
						
						
						
					 
					
						2013-10-09 17:07:52 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zakir Durumeric 
							
						 
					 
					
						
						
							
						
						13ca18479a 
					 
					
						
						
							
							compiling redis support  
						
						 
						
						
						
						
					 
					
						2013-10-09 15:11:23 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zakir Durumeric 
							
						 
					 
					
						
						
							
						
						277f49457d 
					 
					
						
						
							
							adding ability to scan specific CIDR blocks or addresses.  
						
						 
						
						
						
						
					 
					
						2013-10-08 22:42:17 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Adrian 
							
						 
					 
					
						
						
							
						
						8db9f260f2 
					 
					
						
						
							
							Mildly working build process with argument parsing  
						
						 
						
						
						
						
					 
					
						2013-10-03 14:29:38 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zakir Durumeric 
							
						 
					 
					
						
						
							
						
						4a37dba56f 
					 
					
						
						
							
							Merge branch 'fast-whitelist' of github.com:zmap/zmap  
						
						 
						
						
						
						
					 
					
						2013-10-03 10:59:21 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eric 
							
						 
					 
					
						
						
							
						
						19c4a04932 
					 
					
						
						
							
							demote spurious log_infos to log_debug  
						
						 
						
						
						
						
					 
					
						2013-10-03 04:17:03 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eric 
							
						 
					 
					
						
						
							
						
						3aa0f27b51 
					 
					
						
						
							
							constraints stores network order; we want to return host order  
						
						 
						
						
						
						
					 
					
						2013-10-03 02:48:46 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eric 
							
						 
					 
					
						
						
							
						
						408e46d939 
					 
					
						
						
							
							add blacklist_lookup_index proto  
						
						 
						
						
						
						
					 
					
						2013-10-03 02:47:31 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eric 
							
						 
					 
					
						
						
							
						
						8ecbd038b5 
					 
					
						
						
							
							Adding radix support to constraints  
						
						 
						
						... 
						
						
						
						This allows us to lookup an index -> ip address much faster
(16 seconds for ~3.7 billion addresses with sparse blacklist,
vs 65 sec before radix array).
Setting the PREFIX_LEN to /20, as this appears to give a good tradeoff
between radix population time (<1ms), runtime (16s), and memory footprint (4MB). 
						
						
					 
					
						2013-10-03 02:28:19 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Halderman 
							
						 
					 
					
						
						
							
						
						bc3ec6456a 
					 
					
						
						
							
							What Eric and Zakir said  
						
						 
						
						
						
						
					 
					
						2013-10-01 17:05:47 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zakir Durumeric 
							
						 
					 
					
						
						
							
						
						161ba170d9 
					 
					
						
						
							
							merging in master  
						
						 
						
						
						
						
					 
					
						2013-08-29 15:03:23 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zakir Durumeric 
							
						 
					 
					
						
						
							
						
						67aa6f0ab0 
					 
					
						
						
							
							adding generic csv output module  
						
						 
						
						
						
						
					 
					
						2013-08-27 12:03:24 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zakird 
							
						 
					 
					
						
						
							
						
						0d125d18e3 
					 
					
						
						
							
							fixing .h protectors in lib/*  
						
						 
						
						
						
						
					 
					
						2013-08-26 14:30:02 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ciccio87 
							
						 
					 
					
						
						
							
						
						4f860d66db 
					 
					
						
						
							
							fixed blacklist.c  
						
						 
						
						
						
						
					 
					
						2013-08-17 08:13:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ciccio87 
							
						 
					 
					
						
						
							
						
						9ae0d5e656 
					 
					
						
						
							
							quick and dirty fix to make it compile and (seemingly) work  
						
						 
						
						... 
						
						
						
						on 32 bits systems, it needs more testing though 
						
						
					 
					
						2013-08-17 07:26:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zakir Durumeric 
							
						 
					 
					
						
						
							
						
						490054d239 
					 
					
						
						
							
							inital public release  
						
						 
						
						
						
						
					 
					
						2013-08-16 11:12:47 -04:00