Zakir Durumeric
37630d7325
Merge branch 'stable'
2013-08-18 13:39:47 -04:00
Zakir Durumeric
314fb7b1de
updating CHANGELOG
2013-08-18 13:39:12 -04:00
Zakir Durumeric
01de79da5a
fixing recv_run header in recv.h. fixes issue #14
2013-08-18 13:35:45 -04:00
Zakir Durumeric
8ed7a2fe36
Merge branch 'master' of github.com:zmap/zmap
2013-08-18 13:34:13 -04:00
Zakir Durumeric
0b791e5c47
fixing recv_run header in recv.h. fixes issue #14
2013-08-18 13:33:30 -04:00
Zakir Durumeric
0d9842af97
Merge pull request #13 from hmoore-r7/bug/fix-udp-malloc-free
...
Fix strdup/malloc/free ordering to always free the right pointer.
2013-08-18 10:15:08 -07:00
HD Moore
1bf3f2a8d5
Arguments in error message were swapped, fix
2013-08-17 20:59:42 -05:00
HD Moore
d57091dcbf
Fix strdup/malloc/free ordering to always free the right pointer.
...
This commit ensures that udp_send_msg is freed before being reallocated
and freed before the process exits. This also changes the last fprintf
to a log_warn() call, which should be more inline with the intent.
2013-08-17 20:52:43 -05:00
Zakir Durumeric
aeac7d291d
fixing readme
2013-08-17 19:32:55 -04:00
Zakir Durumeric
9a40f15e91
cleaning up readme
2013-08-17 18:51:57 -04:00
Zakir Durumeric
779424fe2c
Merge branch 'master' of https://github.com/ciccio-87/zmap into ciccio-87-master
2013-08-17 18:51:27 -04:00
Zakir Durumeric
eaf4ece8dd
Merge branch 'stable'
2013-08-17 17:11:57 -04:00
Alex Halderman
ce5be6e30f
Clean up and add memory requirements.
2013-08-17 17:11:14 -04:00
Zakir Durumeric
387569538c
adding v1.0.1 to changelog.
2013-08-17 17:09:55 -04:00
Zakir Durumeric
0b5b8fb80d
fixing makefile to not require ssldb for building redis
2013-08-17 16:16:42 -04:00
HD Moore
c455d99298
Clean up snprintf and buffer size (less sloppy).
2013-08-17 15:16:35 -05:00
Alex Halderman
e084d3fb6f
Note 64-bit requirement
2013-08-17 16:16:00 -04:00
HD Moore
60011ca520
Clarify order of operations for compare
2013-08-17 15:10:50 -05:00
HD Moore
7455793d2d
Fix the data offset for icmp_echoscan
2013-08-17 15:08:32 -05:00
HD Moore
dc75ca2edd
Merge branch 'master' into feature/add-json-output
...
Conflicts:
INSTALL
2013-08-17 14:49:17 -05:00
HD Moore
c6f21fdeca
Small typo fix to a comment
2013-08-17 14:46:55 -05:00
Zakir Durumeric
f86b764cab
Merge branch 'hmoore-r7-feature/add-udp-probe-specifiers'
2013-08-17 15:45:30 -04:00
HD Moore
36564d8bb5
Add module names and gw mac address to output
2013-08-17 14:44:29 -05:00
Zakir Durumeric
43239cf5df
Merge branch 'hmoore-r7-feature/add-udp-probe-specifiers' of github.com:zmap/zmap into stable
2013-08-17 15:41:26 -04:00
Eric Wustrow
3b2ea3627e
merge
2013-08-17 15:30:31 -04:00
HD Moore
15036cfe83
Proper cleanup and typo fixes
2013-08-17 14:11:58 -05:00
HD Moore
ed47f926f5
Free memory on close
2013-08-17 14:06:34 -05:00
HD Moore
9d31ee1a62
Add json_file output format (uses json-c)
2013-08-17 14:02:23 -05:00
Alex Halderman
98f96410db
Clean up and add memory requirements.
2013-08-17 14:50:07 -04:00
Eric Wustrow
3776d3cae7
Merge pull request #8 from hmoore-r7/bug/fix-redis-output-compile
...
This is the last commit needed to build with REDIS
2013-08-17 11:41:39 -07:00
HD Moore
2e6261720f
This is the last commit needed to build with REDIS
2013-08-17 10:38:57 -05:00
HD Moore
8aac1ccc52
Make oom check consistent, check and correct overlong payload size
2013-08-17 10:20:17 -05:00
Eric
01f4f985a1
Merge branch 'master' of github.com:zmap/zmap
2013-08-17 02:35:30 -04:00
Eric
597a0c252e
remove ssldb and fix redis callback
2013-08-17 02:35:27 -04:00
ciccio87
7438bdd461
Merge branch 'master' of https://github.com/ciccio-87/zmap
2013-08-17 08:13:49 +02:00
ciccio-87
69f22bb996
Update README
2013-08-17 08:19:56 +02:00
ciccio87
4f860d66db
fixed blacklist.c
2013-08-17 08:13:01 +02:00
ciccio87
b90a901684
OK, now the 32bit fix should be working, keeping numbers right
...
(maybe issues could still exists in summary print)
2013-08-17 08:04:19 +02:00
Eric Wustrow
ceba676ccf
use log_fatal instead of stderr
2013-08-17 01:39:51 -04:00
Eric Wustrow
0b7ab2cac8
use the close callback for cleanup
2013-08-17 01:38:04 -04: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
cc47ec25ca
fixing makefile to not require ssldb for building redis
2013-08-17 00:30:57 -04:00
HD Moore
cfdbe3bbc2
Make the error messages consistent
2013-08-16 22:16:29 -05:00
HD Moore
75de805f41
Add README
2013-08-16 22:15:43 -05:00
Eric Wustrow
9f04ca6bd2
Merge branch 'feature/add-udp-probe-specifiers' of github.com:hmoore-r7/zmap into hmoore-r7-feature/add-udp-probe-specifiers
2013-08-16 17:43:30 -04:00
Eric Wustrow
b8246abf06
Add simple length checks on UDP payload; use logger
2013-08-16 17:43:02 -04:00
Eric Wustrow
f891b7cdf2
Merge branch 'feature/add-udp-probe-specifiers' of github.com:hmoore-r7/zmap into hmoore-r7-feature/add-udp-probe-specifiers
2013-08-16 17:10:56 -04:00
HD Moore
4fef9f0be8
Bump the snaplen size to full frames
2013-08-16 16:10:37 -05:00
HD Moore
228c66e9c3
Add some default udp probe files
2013-08-16 15:53:33 -05:00
Alex Halderman
cad968212a
Note 64-bit requirement
2013-08-16 16:51:58 -04:00
