Merge branch 'master' into probe-v2

This commit is contained in:
Zakir Durumeric
2013-08-20 00:34:27 -04:00
3 changed files with 9 additions and 6 deletions

View File

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

View File

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