coydog/zmap-freebsd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into probe-v2

Browse Source
This commit is contained in:
Zakir Durumeric 2013-08-20 00:34:27 -04:00
commit 1ae210f330
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@ -12,3 +12,8 @@ SUPPORT Issue #1 "Failure at calloc for 'ip_seen' on KVM VPSs?"
1.0.2 2013-8-18 1.0.2 2013-8-18
BUGFIX Issue #14 "gcc 4.7.2 -Wunprototyped-calls error with recv_run." BUGFIX Issue #14 "gcc 4.7.2 -Wunprototyped-calls error with recv_run."
- changed recv_run header to match def in recv.c - changed recv_run header to match def in recv.c
1.0.3 2013-8-19
BUGFIX Issues 21,28 "fixed get_gateway malloc/memset errors"
BUGFIX Issue 24 "Makefile does not respect LDFLAGS"
- changed = to += for CFLAGS, LDFAGS, and LDLIBS

8
src/Makefile
View File

@ -1,8 +1,6 @@
CC=gcc CFLAGS+=-Wall -pedantic -Wextra -std=gnu99 -I../lib -I./ -Ioutput_modules -O2 -g
LDFLAGS+=-g -pthread
CFLAGS=-Wall -pedantic -Wextra -std=gnu99 -I../lib -I./ -Ioutput_modules -O2 -g LDLIBS+= -lpcap -lgmp -lm
LDFLAGS=-g -pthread
LDLIBS= -lpcap -lgmp -lm
TARGETS=zmap TARGETS=zmap
VPATH=../lib:output_modules:probe_modules VPATH=../lib:output_modules:probe_modules
PREFIX=/usr/local PREFIX=/usr/local

2
src/get_gateway.c
View File

@ -72,7 +72,7 @@ int send_nl_req(uint16_t msg_type, uint32_t seq,
return -1; return -1;
} }
memset(nlmsg, 0, sizeof(nlmsg)); memset(nlmsg, 0, NLMSG_SPACE(payload_len));
memcpy(NLMSG_DATA(nlmsg), payload, payload_len); memcpy(NLMSG_DATA(nlmsg), payload, payload_len);
nlmsg->nlmsg_type = msg_type; nlmsg->nlmsg_type = msg_type;
nlmsg->nlmsg_len = NLMSG_LENGTH(payload_len); nlmsg->nlmsg_len = NLMSG_LENGTH(payload_len);