merging in master

2013-08-29 15:03:23 -04:00
parent c3e6e0c041 851cdb05d6
commit 161ba170d9
18 changed files with 64 additions and 55 deletions
--- a/src/probe_modules/packet.h
+++ b/src/probe_modules/packet.h
@ -6,8 +6,8 @@
 #include <netinet/ip_icmp.h>
 #include <netinet/udp.h>

-#ifndef HEADER_ZMAP_PACKET_H
-#define HEADER_ZMAP_PACKET_H
+#ifndef PACKET_H
+#define PACKET_H

 #define MAX_PACKET_SIZE 4096