Merge pull request #13 from appneta/Enhancement_#3_GPLv3

Enhancement #3 gp lv3
appneta · Dec 7, 2013 · cee5268 · cee5268
2 parents b035de7 + 6ba0f24
commit cee5268
Show file tree

Hide file tree

Showing 124 changed files with 2,100 additions and 2,447 deletions.
diff --git a/.gitignore b/.gitignore
@@ -76,3 +76,5 @@ Makefile
 types_c.vim
 .project
 .cproject
+*.1
+src/tcpedit/tcpedit_stub.h
diff --git a/LICENSE b/LICENSE
diff --git a/Makefile.am b/Makefile.am
@@ -46,8 +46,8 @@ dlt_names:
 	cat @SAVEFILE_C@ | $(top_builddir)/scripts/dlt2name.pl src/dlt_names.h
 
 version:
-	-rm -f src/common/svn_version.c
-	cd src/common && make svn_version.c
+	-rm -f src/common/git_version.c
+	cd src/common && make git_version.c
 
 distclean-local:
 	-rm -rf autom4te.cache doxygen

diff --git a/Makefile.in b/Makefile.in
@@ -786,8 +786,8 @@ dlt_names:
 	cat @SAVEFILE_C@ | $(top_builddir)/scripts/dlt2name.pl src/dlt_names.h
 
 version:
-	-rm -f src/common/svn_version.c
-	cd src/common && make svn_version.c
+	-rm -f src/common/git_version.c
+	cd src/common && make git_version.c
 
 distclean-local:
 	-rm -rf autom4te.cache doxygen

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
@@ -2,6 +2,7 @@ $Id$
 
 ??/??/2013 Version 3.5.0
     - Implement pseudo-CRC to improve tcpedit performance (appneta #8)
+    - Switch from BSD to GPLv3 license (appneta #5)
     - Add --fast-flows option to tcpreplay (appneta #4)
     - Removed sleep-accel option (appneta #2) 
     - Enhance accuracy and performance of --mbps option (appneta #2)

diff --git a/docs/CREDIT b/docs/CREDIT
@@ -1,8 +1,8 @@
 $Id$ 
 
 tcpreplay and it's associated utilities (tcpprep, tcprewrite and flowreplay)
-were designed and written by Aaron Turner, and maintained by Fred Klassen
-of AppNeta Inc.
+were designed and written by Aaron Turner, and maintained and updated by 
+Fred Klassen of AppNeta Inc.
 
 This product includes software developed by the University of California,
 Berkeley, Lawrence Berkeley Laboratory and its contributors. 

diff --git a/docs/HACKING b/docs/HACKING
@@ -9,7 +9,8 @@ was significantly long ago, this document may be out of date.]
 If you contribute code the following will happen:
     a) You will be given credit in the CREDITS file
     b) Your code will be licensed under the same license as that of tcpreplay
-    c) You will be assigning your copyright to me- Aaron Turner
+    c) You will be assigning your copyright to Aaron Turner 
+       and Fred Klassen - Appneta Inc.
 
 If you have any questions regarding any of the three above stipulations,
 feel free to email the list at: [email protected]
@@ -49,7 +50,7 @@ The file layout is pretty simple:
 libtcpedit supports a plugin based architecture for handling different DLT
 types.  If you wish to add support for another DLT type, you should read:
 
-http://tcpreplay.synfin.net/trac/wiki/tcpeditDeveloper
+http://tcpreplay.synfin.net/wiki/tcpeditDeveloper
 
 Which contains information on creating new DLT plugins.
 

diff --git a/docs/LICENSE b/docs/LICENSE
diff --git a/lib/strlcpy.h b/lib/strlcpy.h
@@ -1,3 +1,21 @@
+/*
+ *   Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
+ *   Copyright (c) 2013 Fred Klassen <fklassen at appneta dot com> - AppNeta Inc.
+ *
+ *   The Tcpreplay Suite of tools is free software: you can redistribute it 
+ *   and/or modify it under the terms of the GNU General Public License as 
+ *   published by the Free Software Foundation, either version 3 of the 
+ *   License, or with the authors permission any later version.
+ *
+ *   The Tcpreplay Suite is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with the Tcpreplay Suite.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef _STRLCPY_H_
 #define _STRLCPY_H_
 

diff --git a/src/.gitignore b/src/.gitignore
@@ -8,6 +8,4 @@ flowreplay
 tcpbridge
 defines.h
 config.h
-tcpedit_stub.h
-*.1
 *_opts.c
diff --git a/src/bridge.c b/src/bridge.c
@@ -1,33 +1,21 @@
 /* $Id$ */
 
 /*
- * Copyright (c) 2001-2010 Aaron Turner.
- * All rights reserved.
+ *   Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
+ *   Copyright (c) 2013 Fred Klassen <fklassen at appneta dot com> - AppNeta Inc.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ *   The Tcpreplay Suite of tools is free software: you can redistribute it 
+ *   and/or modify it under the terms of the GNU General Public License as 
+ *   published by the Free Software Foundation, either version 3 of the 
+ *   License, or with the authors permission any later version.
  *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the names of the copyright owners nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
+ *   The Tcpreplay Suite is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
  *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *   You should have received a copy of the GNU General Public License
+ *   along with the Tcpreplay Suite.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

diff --git a/src/bridge.h b/src/bridge.h
@@ -1,35 +1,24 @@
 /* $Id$ */
 
 /*
- * Copyright (c) 2001-2010 Aaron Turner.
- * All rights reserved.
+ *   Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
+ *   Copyright (c) 2013 Fred Klassen <fklassen at appneta dot com> - AppNeta Inc.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ *   The Tcpreplay Suite of tools is free software: you can redistribute it 
+ *   and/or modify it under the terms of the GNU General Public License as 
+ *   published by the Free Software Foundation, either version 3 of the 
+ *   License, or with the authors permission any later version.
  *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the names of the copyright owners nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
+ *   The Tcpreplay Suite is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
  *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *   You should have received a copy of the GNU General Public License
+ *   along with the Tcpreplay Suite.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #ifndef __BRIDGE_H__
 #define __BRIDGE_H__
 

diff --git a/src/common.h b/src/common.h
@@ -1,3 +1,21 @@
+/*
+ *   Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
+ *   Copyright (c) 2013 Fred Klassen <fklassen at appneta dot com> - AppNeta Inc.
+ *
+ *   The Tcpreplay Suite of tools is free software: you can redistribute it 
+ *   and/or modify it under the terms of the GNU General Public License as 
+ *   published by the Free Software Foundation, either version 3 of the 
+ *   License, or with the authors permission any later version.
+ *
+ *   The Tcpreplay Suite is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with the Tcpreplay Suite.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef __COMMON_H__
 #define __COMMON_H__
 #include <assert.h>
@@ -22,7 +40,7 @@
 #include "common/sendpacket.h"
 #include "common/interface.h"
 
-const char *svn_version(void); /* svn_version.c */
+const char *git_version(void); /* git_version.c */
 
 #endif
 
diff --git a/src/common/.gitignore b/src/common/.gitignore
@@ -1,3 +1,2 @@
 cmake_install.cmake
 git_version.c
-svn_version.c
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
@@ -1,19 +1,19 @@
 # $Id: Makefile.am 1621 2006-11-09 07:01:37Z aturner $
 noinst_LIBRARIES = libcommon.a
 
-BUILT_SOURCES = svn_version.c
+BUILT_SOURCES = git_version.c
 
-svn_version.c:
-	$(ECHO) -n 'const char SVN_Version[] = "'   > svn_version.c
-	svnversion -n ../..                     >> svn_version.c
-	$(ECHO) '";'								>> svn_version.c
-	$(ECHO) 'const char *svn_version(void) {'  >> svn_version.c
-	$(ECHO) '	return SVN_Version;'			>> svn_version.c
-	$(ECHO) '}' 			      				>> svn_version.c
+git_version.c:
+	$(ECHO) -n 'const char GIT_Version[] = "git:'   > git_version.c
+	git describe --always --abbrev=0 --dirty  | 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) '}' 			      	>> git_version.c
 
 libcommon_a_SOURCES = cidr.c err.c list.c cache.c services.c get.c \
 		      fakepcap.c fakepcapnav.c fakepoll.c xX.c utils.c \
-		      timer.c svn_version.c abort.c sendpacket.c \
+		      timer.c git_version.c abort.c sendpacket.c \
 			  dlt_names.c mac.c interface.c rdtsc.c
 
 if ENABLE_TCPDUMP
@@ -33,4 +33,4 @@ noinst_HEADERS = cidr.h err.h list.h cache.h services.h get.h \
 
 MOSTLYCLEANFILES = *~
 
-MAINTAINERCLEANFILES = Makefile.in svn_version.c
+MAINTAINERCLEANFILES = Makefile.in git_version.c
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
@@ -55,14 +55,14 @@ libcommon_a_AR = $(AR) $(ARFLAGS)
 @SYSTEM_STRLCPY_FALSE@libcommon_a_DEPENDENCIES = ../../lib/libstrl.a
 am__libcommon_a_SOURCES_DIST = cidr.c err.c list.c cache.c services.c \
 	get.c fakepcap.c fakepcapnav.c fakepoll.c xX.c utils.c timer.c \
-	svn_version.c abort.c sendpacket.c dlt_names.c mac.c \
+	git_version.c abort.c sendpacket.c dlt_names.c mac.c \
 	interface.c rdtsc.c tcpdump.c
 @ENABLE_TCPDUMP_TRUE@am__objects_1 = tcpdump.$(OBJEXT)
 am_libcommon_a_OBJECTS = cidr.$(OBJEXT) err.$(OBJEXT) list.$(OBJEXT) \
 	cache.$(OBJEXT) services.$(OBJEXT) get.$(OBJEXT) \
 	fakepcap.$(OBJEXT) fakepcapnav.$(OBJEXT) fakepoll.$(OBJEXT) \
 	xX.$(OBJEXT) utils.$(OBJEXT) timer.$(OBJEXT) \
-	svn_version.$(OBJEXT) abort.$(OBJEXT) sendpacket.$(OBJEXT) \
+	git_version.$(OBJEXT) abort.$(OBJEXT) sendpacket.$(OBJEXT) \
 	dlt_names.$(OBJEXT) mac.$(OBJEXT) interface.$(OBJEXT) \
 	rdtsc.$(OBJEXT) $(am__objects_1)
 libcommon_a_OBJECTS = $(am_libcommon_a_OBJECTS)
@@ -238,10 +238,10 @@ top_srcdir = @top_srcdir@
 
 # $Id: Makefile.am 1621 2006-11-09 07:01:37Z aturner $
 noinst_LIBRARIES = libcommon.a
-BUILT_SOURCES = svn_version.c
+BUILT_SOURCES = git_version.c
 libcommon_a_SOURCES = cidr.c err.c list.c cache.c services.c get.c \
 	fakepcap.c fakepcapnav.c fakepoll.c xX.c utils.c timer.c \
-	svn_version.c abort.c sendpacket.c dlt_names.c mac.c \
+	git_version.c abort.c sendpacket.c dlt_names.c mac.c \
 	interface.c rdtsc.c $(am__append_1)
 AM_CFLAGS = -I.. -I../.. $(LNAV_CFLAGS) @LDNETINC@
 @SYSTEM_STRLCPY_FALSE@libcommon_a_LIBADD = ../../lib/libstrl.a
@@ -251,7 +251,7 @@ noinst_HEADERS = cidr.h err.h list.h cache.h services.h get.h \
 		 dlt_names.h mac.h interface.h rdtsc.h
 
 MOSTLYCLEANFILES = *~
-MAINTAINERCLEANFILES = Makefile.in svn_version.c
+MAINTAINERCLEANFILES = Makefile.in git_version.c
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -310,13 +310,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fakepcapnav.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fakepoll.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/git_version.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interface.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mac.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rdtsc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendpacket.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/services.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svn_version.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tcpdump.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@
@@ -552,13 +552,13 @@ uninstall-am:
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
 
-svn_version.c:
-	$(ECHO) -n 'const char SVN_Version[] = "'   > svn_version.c
-	svnversion -n ../..                     >> svn_version.c
-	$(ECHO) '";'								>> svn_version.c
-	$(ECHO) 'const char *svn_version(void) {'  >> svn_version.c
-	$(ECHO) '	return SVN_Version;'			>> svn_version.c
-	$(ECHO) '}' 			      				>> svn_version.c
+git_version.c:
+	$(ECHO) -n 'const char GIT_Version[] = "git:'   > git_version.c
+	git describe --always --abbrev=0 --dirty  | 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) '}' 			      	>> git_version.c
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.