d14879487b
Merge remote-tracking branch 'upstream/master' into FREEBSD
...
Conflicts:
src/Makefile
2013-10-17 02:44:09 -05:00
833c781d94
FreeBSD port initial checkin. This is based on 5cd6f3294c,
...
September 9, 2013, before CMake changes. Includes proto_headers.h.
Most or all of __FREEBSD__ changes should, IMHO, be merged back into Linux version.
This should build on Linux with __FREEBSD__ defined.
2013-10-16 22:12:11 -05:00
f30c8df9e5
Remove extranneous printf
2013-10-16 17:36:40 -04:00
0e03d170e6
Fix bug where only 16 bits of entropy was used
...
Always use aesrand_getword() & 0xFFFFFFFF not 0xFFFF. This was causing
the groups used over multiple runs of ZMap to have identical generators
too often.
2013-10-16 17:26:34 -04:00
69fe56864b
Update install to use flex and byacc, not Bison
2013-10-16 11:43:14 -04:00
7d04b50e4b
adding david and hd to the authors list
2013-10-15 10:42:02 -04:00
002379f092
updated install instructions from cmake
2013-10-15 10:39:14 -04:00
d8a592a401
use whitelist
2013-10-15 10:22:23 -04:00
48154339e0
Delete whitelist
...
File from testing snuck into version control.
2013-10-14 18:21:17 -04:00
f6609beb2c
Don't overwrite conf files on install
2013-10-12 13:44:33 -04:00
bc28a5a576
Fix compile warnings in blacklist.c
2013-10-12 13:04:02 -04:00
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
d1f6d4c182
Fix minor styling errors
2013-10-12 12:52:15 -04:00
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
a01a99e239
Fix casing error in #include
2013-10-12 12:05:30 -04:00
8389362a01
return parsed data from redis parse conn str
2013-10-11 23:31:48 -04:00
e49e442535
working redis string connections
2013-10-11 23:15:59 -04:00
84318c2cf0
Revert "Untested iterative implementation of evaluate"
...
This reverts commit f2ba9d7621
2013-10-11 17:10:20 -04:00
8f19fb2cac
Revert "Switch to the iterative evaluator"
...
This reverts commit eeb5ddcf0c
2013-10-11 17:10:05 -04:00
eeb5ddcf0c
Switch to the iterative evaluator
2013-10-11 12:38:22 -04:00
f2ba9d7621
Untested iterative implementation of evaluate
2013-10-11 12:13:42 -04:00
2453404604
Move stack.h and stack.c to lib
2013-10-11 11:04:04 -04:00
bc516445ef
Remove debug printf calls
2013-10-11 10:25:45 -04:00
4af98e9951
Working filtering, still needs cleanup and optimization
2013-10-11 10:19:53 -04:00
3eb7630f28
making parse redis connstr externally available
2013-10-09 17:07:52 -04:00
76f848bf79
removing deprecated references to extended_file and simple_file.
2013-10-09 17:07:29 -04:00
b5f6a278bb
help to show selected output module name before printing help text
2013-10-09 17:07:00 -04:00
8fd1491680
adding null help text place holders
2013-10-09 17:06:15 -04:00
0410a99d18
adding support for help text to output modules
2013-10-09 17:05:44 -04:00
13ca18479a
compiling redis support
2013-10-09 15:11:23 -04:00
af834fe2e2
Update build to -Werror, #pragma to ignore in lexer.l
2013-10-09 12:49:58 -04:00
f6b827da4e
Merge branch 'master' of github.com:zmap/zmap
2013-10-08 22:42:31 -04:00
277f49457d
adding ability to scan specific CIDR blocks or addresses.
2013-10-08 22:42:17 -04:00
df68f4e57d
adding ability to scan specific CIDR blocks or addresses.
2013-10-07 17:08:23 -04:00
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
f6ea0a79a8
Build filter using CMake
2013-10-04 10:53:03 -04:00
6cf931b541
portable 64-bit output type
2013-10-03 22:03:55 -04:00
113d684fe8
done testing m32
2013-10-03 22:03:40 -04:00
ae07374bb9
Use a union in fieldset->value
...
Instead of unreliably casting uint64_t's to (void *)
2013-10-03 21:53:42 -04:00
a74f1d877b
testing on 32-bit system
2013-10-03 21:35:08 -04:00
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
82a8f402b8
change INSTALL to document cmake
2013-10-03 20:40:38 -04:00
9df8f678a3
Drop packets that don't pass the filter in recv
2013-10-03 14:29:46 -04:00
29c291c562
Incredibly hacky evaluate implementation
2013-10-03 14:29:46 -04:00
f7939bfbcb
Add support for holding an index instead of fieldname
2013-10-03 14:29:38 -04:00
8db9f260f2
Mildly working build process with argument parsing
2013-10-03 14:29:38 -04:00
8607c2574b
Move filter files into src/
...
- Makefile still needs work, is not compiling
2013-10-03 14:29:22 -04:00
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
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
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
William Kelly
David Adrian
David Adrian
Zakir Durumeric
Eric
Justin Lecher