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

145 Commits

Author SHA1 Message Date
Zakir Durumeric
3406f10271 Merge branch 'master' of github.com:zmap/zmap 2013-09-02 15:57:51 -04:00
Zakir Durumeric
b77100a387 fixing Note the incorrect values for icmp_type, icmp_length, and ttl 2013-09-02 15:57:43 -04:00
Eric
7534966101 use pkg-config for JSON=true 2013-09-02 15:49:49 -04:00
Eric
e02ac4eb0b surely this will work 2013-09-02 15:44:15 -04:00
Eric
7ad015dc73 make now works with default json-c install 2013-09-02 15:30:21 -04:00
Eric
fde456e592 format output fields better 2013-09-02 14:22:57 -04:00
Eric
b4c2a42a86 print miliseconds in timestamp-str, and correct timestamp-us description 2013-09-02 14:22:10 -04:00
Eric
cec225302a tcp seq is 32-bits 2013-09-02 13:28:17 -04:00
Eric
d44b0f10e4 ipid is 16-bit and ttl is 8-bit 2013-09-02 13:22:52 -04:00
Eric
1ed0c2a32d print newline after csv headers 2013-09-02 13:18:39 -04:00
Zakir Durumeric
b606544591 Merge branch 'master' of github.com:zmap/zmap 2013-09-02 12:50:21 -04:00
Zakir Durumeric
5652d2084b fixing memset size in zmap.c 2013-09-02 12:49:47 -04:00
HD Moore
af157807cd Fix a cosmetic typo (csv vs json) 2013-09-02 05:41:03 -05:00
Eric
ba083e1a8e cleanup tab/spaces 2013-08-31 16:25:26 -04:00
Eric
075a44cfb4 reseting to simple_file; not sure why i had to change this in the first place 2013-08-31 16:23:40 -04:00
Eric
fc6ef16b8f friendlier error messages for vpn-users in get-gateway 2013-08-31 16:16:49 -04:00
Eric
5ff9684bf9 add --vpn to doc 2013-08-31 16:02:45 -04:00
Eric
c185f6b0a4 Fake an ethernet header rather than expose vulns 
There is probably a slight performance hit, but if you're
scanning with ZMap through a VPN, you probably don't care THAT
much about performance anyway...(also we only add a memcpy for
all accepted packets)
 2013-08-31 15:57:15 -04:00
Eric
2972bbefdc Add --vpn (-X) flag to support sending IP pkts 
When a user specifies a `-i tun0` flag for a VPN interface,
this interface expects raw IP packets, not ethernet frames.
The --vpn option allows you to send only IP packets to the
specified interface, and also performs some hacks on the receive
end to ensure we can process the results.

TODO: malloc a fake ethernet header for probe_modules.process_packet
(or better yet, make process_packet always take an IP packet, they
all seem to be implicitly doing that anyway).
 2013-08-31 15:38:13 -04:00
Eric
8f5e4beb01 Add make uninstall 
removes man page (and potential old-man page), and binary.
does not remove /etc/zmap/ or contents
 2013-08-31 14:55:08 -04:00
Alex Halderman
d11eb89768 Drop privileges after starting threads 2013-08-30 14:48:56 -04:00
Zakir Durumeric
473b96b1aa providing sock from main thread in order to faciliate dropping privs 2013-08-30 14:37:24 -04:00
Zakir Durumeric
c943dd529c is_success -> success in udp probe module 2013-08-30 02:57:48 -04:00
Zakir Durumeric
8cd541d039 adding UDP module back in with field set usage 2013-08-30 02:55:39 -04:00
Zakir Durumeric
d1eeff167d closing issue #34, no more NaN in cooldown 2013-08-30 01:21:21 -04:00
Zakir Durumeric
7270b383d9 no more NaN for hitrate. closing issue #34 2013-08-30 01:20:19 -04:00
Zakir Durumeric
42650bf402 Merge branch 'master' of github.com:zmap/zmap 2013-08-30 01:15:45 -04:00
Zakir Durumeric
be62665bb5 working MakeFile 2013-08-30 01:15:25 -04:00
Zakir Durumeric
5aee06935c compiling json module 2013-08-30 00:52:26 -04:00
Zakir Durumeric
65d19a8199 resolve merge conflicts and move timestamp to system field. 2013-08-29 23:05:53 -04:00
Eric
2aeb368f37 remove old man if it is there 2013-08-29 18:05:41 -04:00
Eric
e4025464b0 must initialize cmdline_parser before we read args 2013-08-29 18:05:06 -04:00
Zakir Durumeric
9d1b5210b0 fieldset to support 32-bit systems 2013-08-29 15:07:56 -04:00
Zakir Durumeric
161ba170d9 merging in master 2013-08-29 15:03:23 -04:00
Zakir Durumeric
c3e6e0c041 removing simple and extended file modules 2013-08-29 14:56:13 -04:00
Zakir Durumeric
672143e9ba bug fixes to extended_file output 2013-08-29 14:51:26 -04:00
Zakir Durumeric
a5eb3d0a8d dryrun no longer requires root access 2013-08-29 14:38:51 -04:00
Zakir Durumeric
0c83eabfd1 working new interface 2013-08-29 14:29:59 -04:00
Eric
851cdb05d6 Merge branch 'master' of github.com:jimcheetham/zmap into jimcheetham-master 2013-08-29 01:49:04 -04:00
Eric
f6bcd169c1 Merge branch 'patch-2' of github.com:cicku/zmap into cicku-patch-2 2013-08-29 01:09:04 -04:00
Zakir Durumeric
7674433142 working fieldsets without headers 2013-08-27 23:10:35 -04:00
Zakir Durumeric
67aa6f0ab0 adding generic csv output module 2013-08-27 12:03:24 -04:00
zakird
0d3ad52ee0 fixing header guards close issue #48 2013-08-26 12:26:01 -04:00
Zakir Durumeric
211307e308 adding types 2013-08-26 07:59:54 -04:00
Zakir Durumeric
ea39b3bac4 further progress 2013-08-26 07:59:41 -04:00
Christopher Meng
4ec783f748 $(EXTRA_CFLAGS) FOR RPM %{optflags} 
We RPM packaging system need to use optflags for secure building, and of course will override the flags you've defined.

However the current one is not good, we should leave it to the end of the flags queue.

[rpmaker@fab SPECS]$ rpm -E %{optflags}
-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables
 2013-08-22 13:40:19 +08:00
Jim Cheetham
c6fc67288a Install man files under $(PREFIX) 2013-08-20 21:53:37 -04:00
Eric
853524c2ae remove redundant -Ws from Makefile 2013-08-20 19:24:18 -04:00
Alex Halderman
5e4143973d Undefine _FORTIFY_SOURCE before defining it, in case it's set by the distro. 
Fixes Issue #7.
 2013-08-20 13:05:47 -04:00
Alex Halderman
9200992976 Remove Redis objects on make clean 
Resolves Issue #33.
 2013-08-20 12:23:12 -04:00
Alex Halderman
f34343a887 Clean up Makefile success output 2013-08-20 12:20:53 -04:00
Alex Halderman
b588a7dbaf Clean up GCC flags 
Remove some redundant or repeated flags, as noted by ppannuto in Issue #23.
 2013-08-20 12:11:48 -04:00
Alex Halderman
81f25a1848 Fix unrecognized option errors when building with older versions of GCC (Issue #23). 
This approach suggested by ppannuto.
 2013-08-20 12:01:01 -04:00
Zakir Durumeric
99312020ba parse CLI provided output columns 2013-08-20 09:45:52 -04:00
Zakir Durumeric
1ae210f330 Merge branch 'master' into probe-v2 2013-08-20 00:34:27 -04:00
Zakir Durumeric
12750cec8d fixing issue #28, fixing memset operation in send_nl_req. 2013-08-19 22:46:05 -04:00
Zakir Durumeric
aa090e63eb Fixing issue #24; accidentally clobbering LDFLAGS and CFLAGS previously. 2013-08-19 21:02:27 -04:00
Zakir Durumeric
b4f8698cb0 further progress 2013-08-19 18:10:55 -04:00
Zakir Durumeric
dab1e823bd fixing get_gateway malloc error issue #21 2013-08-19 11:34:16 -04:00
Zakir Durumeric
582d381b30 adding output-fields to global conf 2013-08-19 10:53:48 -04:00
Zakir Durumeric
952f6cefa1 building fieldset and probe modules 2013-08-19 04:42:25 -04:00
Zakir Durumeric
a0288adec8 beginning the implementation of new output / probe module interface 2013-08-19 03:02:52 -04:00
Zakir Durumeric
b70a2835b9 abstracting out port validation because shared between udp and tcp. 2013-08-18 23:36:57 -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
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
779424fe2c Merge branch 'master' of https://github.com/ciccio-87/zmap into ciccio-87-master 2013-08-17 18:51:27 -04:00
HD Moore
c455d99298 Clean up snprintf and buffer size (less sloppy). 2013-08-17 15:16:35 -05: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
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
597a0c252e remove ssldb and fix redis callback 2013-08-17 02:35:27 -04: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
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
HD Moore
4fef9f0be8 Bump the snaplen size to full frames 2013-08-16 16:10:37 -05:00
HD Moore
a290942a95 Add support for file:path, text:string, and hex:01020304 for udp probes 2013-08-16 15:50:55 -05:00
Zakir Durumeric
30081f5cf5 fixing incorrect include in redis output module 2013-08-16 11:17:09 -04:00
Zakir Durumeric
490054d239 inital public release 2013-08-16 11:12:47 -04:00