Skip to content

Commit 328684d

Browse files
fklassenfklassen
committed
Implemented GPLv3 license. Implemented git_version.c. Closes #3.
1 parent b035de7 commit 328684d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+2098
-2447
lines changed

‎LICENSE‎

Lines changed: 681 additions & 0 deletions
Large diffs are not rendered by default.

‎Makefile.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ dlt_names:
4646
cat @SAVEFILE_C@ | $(top_builddir)/scripts/dlt2name.pl src/dlt_names.h
4747

4848
version:
49-
-rm -f src/common/svn_version.c
50-
cd src/common && make svn_version.c
49+
-rm -f src/common/git_version.c
50+
cd src/common && make git_version.c
5151

5252
distclean-local:
5353
-rm -rf autom4te.cache doxygen

‎Makefile.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -786,8 +786,8 @@ dlt_names:
786786
cat @SAVEFILE_C@ | $(top_builddir)/scripts/dlt2name.pl src/dlt_names.h
787787

788788
version:
789-
-rm -f src/common/svn_version.c
790-
cd src/common && make svn_version.c
789+
-rm -f src/common/git_version.c
790+
cd src/common && make git_version.c
791791

792792
distclean-local:
793793
-rm -rf autom4te.cache doxygen

‎docs/CHANGELOG‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ $Id$
22

33
??/??/2013 Version 3.5.0
44
- Implement pseudo-CRC to improve tcpedit performance (appneta #8)
5+
- Switch from BSD to GPLv3 license (appneta #5)
56
- Add --fast-flows option to tcpreplay (appneta #4)
67
- Removed sleep-accel option (appneta #2)
78
- Enhance accuracy and performance of --mbps option (appneta #2)

‎docs/CREDIT‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
$Id$
22

33
tcpreplay and it's associated utilities (tcpprep, tcprewrite and flowreplay)
4-
were designed and written by Aaron Turner, and maintained by Fred Klassen
5-
of AppNeta Inc.
4+
were designed and written by Aaron Turner, and maintained and updated by
5+
Fred Klassen of AppNeta Inc.
66

77
This product includes software developed by the University of California,
88
Berkeley, Lawrence Berkeley Laboratory and its contributors.

‎docs/HACKING‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ was significantly long ago, this document may be out of date.]
99
If you contribute code the following will happen:
1010
a) You will be given credit in the CREDITS file
1111
b) Your code will be licensed under the same license as that of tcpreplay
12-
c) You will be assigning your copyright to me- Aaron Turner
12+
c) You will be assigning your copyright to Aaron Turner
13+
and Fred Klassen - Appneta Inc.
1314

1415
If you have any questions regarding any of the three above stipulations,
1516
feel free to email the list at: [email protected]
@@ -49,7 +50,7 @@ The file layout is pretty simple:
4950
libtcpedit supports a plugin based architecture for handling different DLT
5051
types. If you wish to add support for another DLT type, you should read:
5152

52-
http://tcpreplay.synfin.net/trac/wiki/tcpeditDeveloper
53+
http://tcpreplay.synfin.net/wiki/tcpeditDeveloper
5354

5455
Which contains information on creating new DLT plugins.
5556

‎docs/LICENSE‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎lib/strlcpy.h‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
3+
* Copyright (c) 2013 Fred Klassen <fklassen at appneta dot com> - AppNeta Inc.
4+
*
5+
* The Tcpreplay Suite of tools is free software: you can redistribute it
6+
* and/or modify it under the terms of the GNU General Public License as
7+
* published by the Free Software Foundation, either version 3 of the
8+
* License, or with the authors permission any later version.
9+
*
10+
* The Tcpreplay Suite is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with the Tcpreplay Suite. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
119
#ifndef _STRLCPY_H_
220
#define _STRLCPY_H_
321

‎src/.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,4 @@ flowreplay
88
tcpbridge
99
defines.h
1010
config.h
11-
tcpedit_stub.h
12-
*.1
1311
*_opts.c

‎src/bridge.c‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,21 @@
11
/* $Id$ */
22

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

3321
#include "config.h"

0 commit comments

Comments
 (0)