Commit d6168ebb authored by Robert David Graham's avatar Robert David Graham
Browse files

Merge branch 'master' of https://github.com/robertdavidgraham/masscan

parents 56db218d 3ac75f86

Makefile

+3 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ PREFIX ?= /usr 
BINDIR ?= $(PREFIX)/bin

SYS := $(shell gcc -dumpmachine)

GITVER := $(shell git describe --tags)

INSTALL_DATA := -pDm755



ifeq ($(GITVER),)

GITVER = "unknown"
@@ -25,6 +26,7 @@ ifneq (, $(findstring darwin, $(SYS))) 
LIBS = -lpcap -lm -rdynamic

INCLUDES = -I.

FLAGS2 = 

INSTALL_DATA = -pm755

endif



# MinGW on Windows
@@ -100,6 +102,6 @@ regress: bin/masscan 
	bin/masscan --selftest



install: bin/masscan

	install -pDm755 bin/masscan $(DESTDIR)$(BINDIR)/masscan

	install $(INSTALL_DATA) bin/masscan $(DESTDIR)$(BINDIR)/masscan

	

default: bin/masscan

src/main-conf.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ masscan_usage(void) 
    printf("masscan -p80,8000-8100 10.0.0.0/8 --rate=10000\n");

    printf(" scan some web ports on 10.x.x.x at 10kpps\n");

    printf("masscan --nmap\n");

    printf(" list those options that are compatiable with nmap\n");

    printf(" list those options that are compatible with nmap\n");

    printf("masscan -p80 10.0.0.0/8 --banners -oB <filename>\n");

    printf(" save results of scan in binary format to <filename>\n");

    printf("masscan --open --banners --readscan <filename> -oX <savefile>\n");