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

proto

parent 1bb39e39

Makefile

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ endif 
ifneq (, $(findstring linux, $(SYS)))

LIBS = -lpcap -lm -lrt -ldl -lpthread

INCLUDES =

FLAGS2 = -rdynamic

FLAGS2 = -rdynamic -fsanitize=address

endif



# MAC OS X
@@ -25,7 +25,7 @@ endif 
ifneq (, $(findstring darwin, $(SYS)))

LIBS = -lpcap -lm -rdynamic

INCLUDES = -I.

FLAGS2 = 

FLAGS2 = -fsanitize=address

INSTALL_DATA = -pm755

endif
@@ -66,7 +66,7 @@ FLAGS2 = 
endif



# this works on llvm or real gcc

CC = gcc

CC = clang



DEFINES = 

CFLAGS = -g -ggdb $(FLAGS2) $(INCLUDES) $(DEFINES) -Wall -O3

src/out-unicornscan.c

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static void init_tcp_services() 


static char *tcp_service_name(int port)

{

#ifndef WIN32

#ifdef __linux__

    int r;

    struct servent result_buf;

    struct servent *result;
@@ -47,7 +47,7 @@ static char *tcp_service_name(int port) 
    if (result == NULL)

        return "unknown";



    return _strdup(result->s_name);

    return strdup(result->s_name);

#endif

}

xcode4/masscan.xcodeproj/project.pbxproj

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
	objects = {



/* Begin PBXBuildFile section */

		11126597197A086B00DC5987 /* out-unicornscan.c in Sources */ = {isa = PBXBuildFile; fileRef = 11126596197A086B00DC5987 /* out-unicornscan.c */; };

		115C0CAB18035BC5004E6CD7 /* proto-netbios.c in Sources */ = {isa = PBXBuildFile; fileRef = 115C0CA518035BC5004E6CD7 /* proto-netbios.c */; };

		115C0CAC18035BC5004E6CD7 /* proto-ssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 115C0CA718035BC5004E6CD7 /* proto-ssl.c */; };

		11623F6A191E0DB00075EEE6 /* out-certs.c in Sources */ = {isa = PBXBuildFile; fileRef = 11623F69191E0DB00075EEE6 /* out-certs.c */; };
@@ -93,6 +94,7 @@ 
/* End PBXCopyFilesBuildPhase section */



/* Begin PBXFileReference section */

		11126596197A086B00DC5987 /* out-unicornscan.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "out-unicornscan.c"; sourceTree = "<group>"; };

		113AD3B818208A1900D5E067 /* masscan-status.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "masscan-status.h"; sourceTree = "<group>"; };

		115C0CA318035BC5004E6CD7 /* out-record.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "out-record.h"; sourceTree = "<group>"; };

		115C0CA418035BC5004E6CD7 /* proto-dns-parse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "proto-dns-parse.h"; sourceTree = "<group>"; };
@@ -260,6 +262,7 @@ 
		11A9219217DBCC7E00DDFD32 /* src */ = {

			isa = PBXGroup;

			children = (

				11126596197A086B00DC5987 /* out-unicornscan.c */,

				11A773E91881BFC700B135DE /* crypto-base64.c */,

				11A773EA1881BFC700B135DE /* crypto-base64.h */,

				11B05EA418B9649F009C935E /* crypto-blackrock2.c */,
@@ -518,6 +521,7 @@ 
				11B05EA718B9649F009C935E /* main-readrange.c in Sources */,

				11A50CAE191C128F006D5802 /* out-json.c in Sources */,

				11623F6A191E0DB00075EEE6 /* out-certs.c in Sources */,

				11126597197A086B00DC5987 /* out-unicornscan.c in Sources */,

			);

			runOnlyForDeploymentPostprocessing = 0;

		};