Properly process IPv6 extension headers - copy from 4.0alpha1 for app…

…neta#16
baigubulu · Dec 8, 2013 · 893d187 · 893d187
1 parent 91de0b0
commit 893d187
Show file tree

Hide file tree

Showing 18 changed files with 351 additions and 248 deletions.
diff --git a/.gitignore b/.gitignore
@@ -48,9 +48,6 @@ config.status
 libtool
 .deps
 autom4te.cache
-src/config.h
-src/defines.h
-src/stamp-h1
 test/config
 compile
 config.guess
@@ -77,4 +74,3 @@ types_c.vim
 .project
 .cproject
 *.1
-src/tcpedit/tcpedit_stub.h
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
@@ -9,7 +9,7 @@ $Id$
     - Removed sleep-accel option (appneta #2) 
     - Enhance accuracy and performance of --mbps option (appneta #2)
     - Add netmap injector (appneta #1)
-    - Add --sleepmode option to handle high precision timing (#421)
+    - Properly process IPv6 extension headers (#396)
     - Update URL's to point to new tcpreplay website (#430)
     - Improve & fix bugs in tcpcapinfo (#437)
     - Fix statistics to be more industry standard (#443)

diff --git a/src/.gitignore b/src/.gitignore
@@ -8,4 +8,6 @@ flowreplay
 tcpbridge
 defines.h
 config.h
+stamp-h1
 *_opts.c
+tcpedit/tcpedit_stub.h
diff --git a/src/Makefile.in b/src/Makefile.in
@@ -1294,10 +1294,10 @@ tcprewrite.1: tcprewrite_opts.def tcpedit/tcpedit_opts.def
 	@AUTOGEN@ -T agman-cmd.tpl $(opts_list) tcprewrite_opts.def || true
 
 tcpreplay-edit.1: tcpreplay_opts.def
-	@AUTOGEN@ -T agman-cmd.tpl $(opts_list) @NETMAPFLAGS@ -DTCPREPLAY_EDIT -DTCPREPLAY_EDIT_MAN tcpreplay_opts.def || true
+	@AUTOGEN@ -T agman-cmd.tpl $(opts_list) -DTCPREPLAY_EDIT -DTCPREPLAY_EDIT_MAN tcpreplay_opts.def || true
 
 tcpreplay.1: tcpreplay_opts.def
-	@AUTOGEN@ -T agman-cmd.tpl $(opts_list) @NETMAPFLAGS@ tcpreplay_opts.def || true
+	@AUTOGEN@ -T agman-cmd.tpl $(opts_list) tcpreplay_opts.def || true
 
 tcpbridge.1: tcpbridge_opts.def tcpedit/tcpedit_opts.def
 	@AUTOGEN@ -T agman-cmd.tpl $(opts_list) tcpbridge_opts.def || true

diff --git a/src/common.h b/src/common.h
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /*
  *   Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
  *   Copyright (c) 2013 Fred Klassen <fklassen at appneta dot com> - AppNeta Inc.
@@ -16,6 +18,7 @@
  *   along with the Tcpreplay Suite.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #ifndef __COMMON_H__
 #define __COMMON_H__
 #include <assert.h>

diff --git a/src/common/.gitignore b/src/common/.gitignore
@@ -1,2 +1 @@
-cmake_install.cmake
 git_version.c
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
@@ -8,7 +8,7 @@ git_version.c:
 	git describe --always --abbrev=0  | tr -d '\n' | tr -d '\r' >> git_version.c
 	$(ECHO) '";'			>> git_version.c
 	$(ECHO) 'const char *git_version(void) {'  >> git_version.c
-	$(ECHO) '	return GIT_Version;'	>> git_version.c
+	$(ECHO) '    return GIT_Version;'	>> git_version.c
 	$(ECHO) '}' 			      	>> git_version.c
 
 libcommon_a_SOURCES = cidr.c err.c list.c cache.c services.c get.c \

diff --git a/src/common/Makefile.in b/src/common/Makefile.in
@@ -556,7 +556,7 @@ git_version.c:
 	git describe --always --abbrev=0  | tr -d '\n' | tr -d '\r' >> git_version.c
 	$(ECHO) '";'			>> git_version.c
 	$(ECHO) 'const char *git_version(void) {'  >> git_version.c
-	$(ECHO) '	return GIT_Version;'	>> git_version.c
+	$(ECHO) '    return GIT_Version;'	>> git_version.c
 	$(ECHO) '}' 			      	>> git_version.c
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

diff --git a/src/common/cidr.c b/src/common/cidr.c
@@ -485,7 +485,7 @@ ip_in_cidr(const tcpr_cidr_t * mycidr, const unsigned long ip)
 
 #ifdef DEBUG
     /* copy this for debug purposes, since it's not re-entrant */
-    strlcpy(netstr, get_addr2name4(mycidr->u.network, RESOLVE), 20);
+    strlcpy(netstr, get_addr2name4(htonl(mycidr->u.network), RESOLVE), 20);
 #endif
 
     /* if they're the same, then ip is in network */
@@ -670,7 +670,7 @@ cidr2iplist(tcpr_cidr_t * cidr, char delim)
     for (i = 2; i <= (32 - cidr->masklen); i++)
         numips *= 2;
 
-    size = 16 * numips;
+    size = 17 * numips - 1;
 
     list = (char *)safe_malloc(size);
 
@@ -693,7 +693,7 @@ cidr2iplist(tcpr_cidr_t * cidr, char delim)
 
     /* last is a special case, end in \0 */
     in.s_addr = htonl(addr);
-    snprintf(ipaddr, 16, "%s", inet_ntoa(in));
+    snprintf(ipaddr, 17, "%s", inet_ntoa(in));
     strlcat(list, ipaddr, size);
 
     return list;