Commit Graph

55 Commits

Author SHA1 Message Date
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
Zakir Durumeric f86b764cab Merge branch 'hmoore-r7-feature/add-udp-probe-specifiers' 2013-08-17 15:45:30 -04: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 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