coydog/zmap-freebsd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
186 Commits 2 Branches 0 Tags 403 KiB
4eac51fdca
Commit Graph

186 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Adrian
d1f6d4c182 Fix minor styling errors 2013-10-12 12:52:15 -04:00
David Adrian
f483288e5a Improved filter validator 
- Can no longer do "stringfield = INTEGER" or "intfield = string"
- Print slightly more sane error messages
 2013-10-12 12:47:23 -04:00
David Adrian
a01a99e239 Fix casing error in #include 2013-10-12 12:05:30 -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
8f19fb2cac Revert "Switch to the iterative evaluator" 
This reverts commit eeb5ddcf0c.
 2013-10-11 17:10:05 -04:00
David Adrian
eeb5ddcf0c Switch to the iterative evaluator 2013-10-11 12:38:22 -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
David Adrian
bc516445ef Remove debug printf calls 2013-10-11 10:25:45 -04:00
David Adrian
4af98e9951 Working filtering, still needs cleanup and optimization 2013-10-11 10:19:53 -04:00
Zakir Durumeric
3eb7630f28 making parse redis connstr externally available 2013-10-09 17:07:52 -04:00
Zakir Durumeric
76f848bf79 removing deprecated references to extended_file and simple_file. 2013-10-09 17:07:29 -04:00
Zakir Durumeric
b5f6a278bb help to show selected output module name before printing help text 2013-10-09 17:07:00 -04:00
Zakir Durumeric
8fd1491680 adding null help text place holders 2013-10-09 17:06:15 -04:00
Zakir Durumeric
0410a99d18 adding support for help text to output modules 2013-10-09 17:05:44 -04:00
Zakir Durumeric
13ca18479a compiling redis support 2013-10-09 15:11:23 -04:00
David Adrian
af834fe2e2 Update build to -Werror, #pragma to ignore in lexer.l 2013-10-09 12:49:58 -04:00
Zakir Durumeric
f6b827da4e Merge branch 'master' of github.com:zmap/zmap 2013-10-08 22:42:31 -04:00
Zakir Durumeric
277f49457d adding ability to scan specific CIDR blocks or addresses. 2013-10-08 22:42:17 -04:00
Zakir Durumeric
df68f4e57d adding ability to scan specific CIDR blocks or addresses. 2013-10-07 17:08:23 -04:00
David Adrian
45918feced Fix JSON build errors 
Updated module_json.c to use field_t.value as a union, not as
a pointer.
 2013-10-04 12:00:32 -04:00
David Adrian
f6ea0a79a8 Build filter using CMake 2013-10-04 10:53:03 -04:00
Eric
6cf931b541 portable 64-bit output type 2013-10-03 22:03:55 -04:00
Eric
113d684fe8 done testing m32 2013-10-03 22:03:40 -04:00
Eric
ae07374bb9 Use a union in fieldset->value 
Instead of unreliably casting uint64_t's to (void *)
 2013-10-03 21:53:42 -04:00
Eric
a74f1d877b testing on 32-bit system 2013-10-03 21:35:08 -04:00
Eric
55b65d697a I care more about users than attacking governments 
I'll bet the users would agree with this default as well. Arguably,
this shouldn't even be an option???
 2013-10-03 21:00:14 -04:00
Eric
82a8f402b8 change INSTALL to document cmake 2013-10-03 20:40:38 -04:00
David Adrian
9df8f678a3 Drop packets that don't pass the filter in recv 2013-10-03 14:29:46 -04:00
David Adrian
29c291c562 Incredibly hacky evaluate implementation 2013-10-03 14:29:46 -04:00
David Adrian
f7939bfbcb Add support for holding an index instead of fieldname 2013-10-03 14:29:38 -04:00
David Adrian
8db9f260f2 Mildly working build process with argument parsing 2013-10-03 14:29:38 -04:00
David Adrian
8607c2574b Move filter files into src/ 
- Makefile still needs work, is not compiling
 2013-10-03 14:29:22 -04:00
David Adrian
9693b66024 Initial import of filter parser 
Current runs as its own program, partially implemented.
Commiting for the sake of sharing access / backup.
Still needs a lot of work.
 2013-10-03 14:28:44 -04:00
David Adrian
21fa755c13 Finish moving zmap to CMake 
- Generalize libjson support in CMakeLists
- Remove zopt.h, zopt.c from the repository
 2013-10-03 12:14:36 -04:00
Justin Lecher
154fb01525 Convert plain Makefile into cmake 
The package can be configured with 4 different options:

-DWITH_REDIS=ON

Enable support for Redis DB

-DWITH_JSON=ON

Enable support for JSON based output

-DENABLE_DEVELOPMENT=ON

Enable all warnings and make them fatal

-DENABLE_HARDENING=ON

Compile and link with some hardening

Use the new system by creating a build directory and change into that.
And then call the following

cmake -DWITH_REDIS=OFF -DWITH_JSON=ON -DENABLE_DEVELOPMENT=ON -DENABLE_HARDENING=ON /path/to/source/dir/
make
make DESTDIR="/..." install

Signed-off-by: Justin Lecher <jlec@gentoo.org>

Merged by David Adrian
- Remove src/Makefile
- Updated .gitignore for CMake
 2013-10-03 11:38:48 -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
ec1b761489 Support multiple cyclic groups for smaller subnets 
We will choose the first one in the list that is large enough to support
the number of hosts chosen. This speeds up scanning small networks considerably:
e.g. /16s can be scanned in <200ms (+ cooldown)
 2013-10-03 03:50:12 -04:00
Eric
d2112701b0 have cyclic use blacklist_lookup_index 2013-10-03 02:49:50 -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
5cd6f3294c Merge branch 'master' of github.com:zmap/zmap 2013-09-09 22:38:21 -04:00
Zakir Durumeric
952df21a1f Changing 192.18.0.0/15 to 198.18.0.0/15 in default blacklist. 
Reported by David Fifield: The network 192.18.0.0/15 is typoed in RFC 2544;
it should be 198.18.0.0/15. The erratum is here:
http://www.rfc-editor.org/errata_search.php?rfc=2544
 2013-09-09 22:36:56 -04:00
Eric
6c74ce6837 Update man page to include fields 
and also update file paths
 2013-09-03 16:02:27 -04:00