Skip to content

Commit 3b29b7b

Browse files
fklassenfklassen
committed
Added missing distribution files and deleted unused files for #26 
1 parent 49a53f3 commit 3b29b7b

File tree

13 files changed

+32
-2087
lines changed

13 files changed

+32
-2087
lines changed

‎docs/router-mode1.fig

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

‎docs/router-mode2.fig

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

‎docs/router-mode3.fig

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

‎src/Makefile.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ tcpcapinfo.1: tcpcapinfo_opts.def
4747

4848
man_MANS = tcpreplay.1 tcpprep.1 tcprewrite.1 tcpreplay-edit.1 tcpcapinfo.1
4949
EXTRA_DIST = tcpreplay.1 tcpprep.1 tcprewrite.1 tcpbridge.1 tcpreplay-edit.1 \
50-
tcpliveplay.1 tcpcapinfo.1 timestamp_trace.h
50+
tcpliveplay.1 tcpcapinfo.1
5151
bin_PROGRAMS = tcpreplay tcpprep tcprewrite tcpreplay-edit tcpcapinfo
5252

5353
if COMPILE_TCPBRIDGE
@@ -110,7 +110,6 @@ tcpcapinfo_LDADD = ./common/libcommon.a \
110110
tcpcapinfo_SOURCES = tcpcapinfo_opts.c tcpcapinfo.c
111111
tcpcapinfo_OBJECTS: tcpcapinfo_opts.h
112112
tcpcapinfo_opts.h: tcpcapinfo_opts.c
113-
114113
tcpcapinfo_opts.c: tcpcapinfo_opts.def
115114
@AUTOGEN@ $(opts_list) tcpcapinfo_opts.def || true
116115

@@ -139,8 +138,9 @@ noinst_HEADERS = tcpreplay.h tcpprep.h bridge.h defines.h tree.h tcpliveplay.h \
139138
send_packets.h signal_handler.h common.h tcpreplay_opts.h tcpliveplay_opts.h \
140139
tcpreplay_edit_opts.h tcprewrite.h tcprewrite_opts.h tcpprep_opts.h \
141140
tcpprep_opts.def tcprewrite_opts.def tcpreplay_opts.def tcpliveplay_opts.def \
142-
tcpbridge_opts.def tcpbridge.h tcpbridge_opts.h tcpr.h sleep.h tcpcapinfo_opts.h
143-
141+
tcpbridge_opts.def tcpbridge.h tcpbridge_opts.h tcpr.h sleep.h tcpcapinfo_opts.h \
142+
tcpcapinfo_opts.def replay.h tcpreplay_api.h tcpprep_api.h timestamp_trace.h \
143+
msvc_inttypes.h msvc_stdint.h
144144

145145
MOSTLYCLEANFILES = *~ *.o
146146

‎src/Makefile.in

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ opts_list = -L tcpedit
383383
man_MANS = tcpreplay.1 tcpprep.1 tcprewrite.1 tcpreplay-edit.1 \
384384
tcpcapinfo.1 $(am__append_2) $(am__append_4)
385385
EXTRA_DIST = tcpreplay.1 tcpprep.1 tcprewrite.1 tcpbridge.1 tcpreplay-edit.1 \
386-
tcpliveplay.1 tcpcapinfo.1 timestamp_trace.h
386+
tcpliveplay.1 tcpcapinfo.1
387387

388388
tcpreplay_edit_CFLAGS = $(LIBOPTS_CFLAGS) -I.. -Itcpedit $(LNAV_CFLAGS) @LDNETINC@ -DTCPREPLAY -DTCPREPLAY_EDIT -DHAVE_CACHEFILE_SUPPORT
389389
tcpreplay_edit_LDADD = ./tcpedit/libtcpedit.a ./common/libcommon.a $(LIBSTRL) @LPCAPLIB@ @LDNETLIB@ $(LIBOPTS_LDADD)
@@ -422,7 +422,9 @@ noinst_HEADERS = tcpreplay.h tcpprep.h bridge.h defines.h tree.h tcpliveplay.h \
422422
send_packets.h signal_handler.h common.h tcpreplay_opts.h tcpliveplay_opts.h \
423423
tcpreplay_edit_opts.h tcprewrite.h tcprewrite_opts.h tcpprep_opts.h \
424424
tcpprep_opts.def tcprewrite_opts.def tcpreplay_opts.def tcpliveplay_opts.def \
425-
tcpbridge_opts.def tcpbridge.h tcpbridge_opts.h tcpr.h sleep.h tcpcapinfo_opts.h
425+
tcpbridge_opts.def tcpbridge.h tcpbridge_opts.h tcpr.h sleep.h tcpcapinfo_opts.h \
426+
tcpcapinfo_opts.def replay.h tcpreplay_api.h tcpprep_api.h timestamp_trace.h \
427+
msvc_inttypes.h msvc_stdint.h
426428

427429
MOSTLYCLEANFILES = *~ *.o
428430
MAINTAINERCLEANFILES = Makefile.in tcpreplay_opts.h tcpreplay_opts.c tcpliveplay_opts.c \
@@ -1424,7 +1426,6 @@ tcprewrite_opts.c: tcprewrite_opts.def tcpedit/tcpedit_opts.def
14241426
@AUTOGEN@ $(opts_list) tcprewrite_opts.def || true
14251427
tcpcapinfo_OBJECTS: tcpcapinfo_opts.h
14261428
tcpcapinfo_opts.h: tcpcapinfo_opts.c
1427-
14281429
tcpcapinfo_opts.c: tcpcapinfo_opts.def
14291430
@AUTOGEN@ $(opts_list) tcpcapinfo_opts.def || true
14301431
tcpprep_OBJECTS: tcpprep_opts.h

‎src/common/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ libcommon_a_SOURCES = cidr.c err.c list.c cache.c services.c get.c \
1515
fakepcap.c fakepcapnav.c fakepoll.c xX.c utils.c \
1616
timer.c git_version.c abort.c sendpacket.c \
1717
dlt_names.c mac.c interface.c git_version.c \
18-
flows.c
18+
flows.c txring.c
1919

2020
if ENABLE_TCPDUMP
2121
libcommon_a_SOURCES += tcpdump.c
@@ -30,7 +30,7 @@ endif
3030
noinst_HEADERS = cidr.h err.h list.h cache.h services.h get.h \
3131
fakepcap.h fakepcapnav.h fakepoll.h xX.h utils.h \
3232
tcpdump.h timer.h abort.h pcap_dlt.h sendpacket.h \
33-
dlt_names.h mac.h interface.h flows.h
33+
dlt_names.h mac.h interface.h flows.h txring.h
3434

3535
MOSTLYCLEANFILES = *~
3636

‎src/common/Makefile.in

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,16 @@ libcommon_a_AR = $(AR) $(ARFLAGS)
5656
am__libcommon_a_SOURCES_DIST = cidr.c err.c list.c cache.c services.c \
5757
get.c fakepcap.c fakepcapnav.c fakepoll.c xX.c utils.c timer.c \
5858
git_version.c abort.c sendpacket.c dlt_names.c mac.c \
59-
interface.c flows.c tcpdump.c
59+
interface.c flows.c txring.c tcpdump.c
6060
@ENABLE_TCPDUMP_TRUE@am__objects_1 = tcpdump.$(OBJEXT)
6161
am_libcommon_a_OBJECTS = cidr.$(OBJEXT) err.$(OBJEXT) list.$(OBJEXT) \
6262
cache.$(OBJEXT) services.$(OBJEXT) get.$(OBJEXT) \
6363
fakepcap.$(OBJEXT) fakepcapnav.$(OBJEXT) fakepoll.$(OBJEXT) \
6464
xX.$(OBJEXT) utils.$(OBJEXT) timer.$(OBJEXT) \
6565
git_version.$(OBJEXT) abort.$(OBJEXT) sendpacket.$(OBJEXT) \
6666
dlt_names.$(OBJEXT) mac.$(OBJEXT) interface.$(OBJEXT) \
67-
git_version.$(OBJEXT) flows.$(OBJEXT) $(am__objects_1)
67+
git_version.$(OBJEXT) flows.$(OBJEXT) txring.$(OBJEXT) \
68+
$(am__objects_1)
6869
libcommon_a_OBJECTS = $(am_libcommon_a_OBJECTS)
6970
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
7071
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -242,13 +243,13 @@ BUILT_SOURCES = git_version.c
242243
libcommon_a_SOURCES = cidr.c err.c list.c cache.c services.c get.c \
243244
fakepcap.c fakepcapnav.c fakepoll.c xX.c utils.c timer.c \
244245
git_version.c abort.c sendpacket.c dlt_names.c mac.c \
245-
interface.c git_version.c flows.c $(am__append_1)
246+
interface.c git_version.c flows.c txring.c $(am__append_1)
246247
AM_CFLAGS = -I.. -I../.. $(LNAV_CFLAGS) @LDNETINC@
247248
@SYSTEM_STRLCPY_FALSE@libcommon_a_LIBADD = ../../lib/libstrl.a
248249
noinst_HEADERS = cidr.h err.h list.h cache.h services.h get.h \
249250
fakepcap.h fakepcapnav.h fakepoll.h xX.h utils.h \
250251
tcpdump.h timer.h abort.h pcap_dlt.h sendpacket.h \
251-
dlt_names.h mac.h interface.h flows.h
252+
dlt_names.h mac.h interface.h flows.h txring.h
252253

253254
MOSTLYCLEANFILES = *~
254255
MAINTAINERCLEANFILES = Makefile.in git_version.c
@@ -319,6 +320,7 @@ distclean-compile:
319320
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/services.Po@am__quote@
320321
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tcpdump.Po@am__quote@
321322
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer.Po@am__quote@
323+
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/txring.Po@am__quote@
322324
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@
323325
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xX.Po@am__quote@
324326

‎src/common/txring.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3232
*/
3333

34+
#ifdef HAVE_TX_RING
35+
3436
#include "err.h"
3537
#include "utils.h"
3638
#include "txring.h"
@@ -235,3 +237,5 @@ txring_init(int fd, unsigned int mtu)
235237

236238
return txp;
237239
}
240+
241+
#endif /* HAVE_TX_RING */

‎src/common/txring.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
#include "config.h"
3838
#include "defines.h"
3939

40+
#ifdef HAVE_TX_RING
41+
4042
#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1
4143
#include <netpacket/packet.h>
4244
#include <net/ethernet.h> /* the L2 protocols */
@@ -60,5 +62,6 @@ typedef struct txring_s txring_t;
6062

6163
int txring_put(txring_t *txp, const void * data, size_t length);
6264
txring_t* txring_init(int fd, unsigned int mtu);
65+
#endif /* HAVE_TX_RING */
6366

64-
#endif
67+
#endif /*COMMON_TXRING_H */

‎src/tcpedit/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ AM_CFLAGS = -I.. -I../common -I../.. @LDNETINC@ $(LIBOPTS_CFLAGS) $(LNAV_CFLAGS)
2525

2626
noinst_HEADERS = tcpedit.h edit_packet.h portmap.h \
2727
tcpedit_stub.h parse_args.h dlt.h checksum.h tcpedit_api.h \
28-
tcpedit_types.h
28+
tcpedit_types.h plugins.h plugins_api.h plugins_types.h
2929

3030
MOSTLYCLEANFILES = *~
3131

‎src/tcpedit/Makefile.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,7 @@ AM_CFLAGS = -I.. -I../common -I../.. @LDNETINC@ $(LIBOPTS_CFLAGS) \
339339
$(LIBOPTS_CFLAGS)
340340
noinst_HEADERS = tcpedit.h edit_packet.h portmap.h tcpedit_stub.h \
341341
parse_args.h dlt.h checksum.h tcpedit_api.h tcpedit_types.h \
342+
plugins.h plugins_api.h plugins_types.h \
342343
$(srcdir)/plugins/ethernet.h $(srcdir)/plugins/dlt_utils.h \
343344
$(srcdir)/plugins/ethernet.h \
344345
$(srcdir)/plugins/dlt_en10mb/en10mb.h \
@@ -349,10 +350,12 @@ noinst_HEADERS = tcpedit.h edit_packet.h portmap.h tcpedit_stub.h \
349350
$(srcdir)/plugins/dlt_hdlc/hdlc_types.h \
350351
$(srcdir)/plugins/dlt_user/user.h \
351352
$(srcdir)/plugins/dlt_user/user_api.h \
353+
$(srcdir)/plugins/dlt_user/user_types.h \
352354
$(srcdir)/plugins/dlt_raw/raw.h \
353355
$(srcdir)/plugins/dlt_null/null.h \
354356
$(srcdir)/plugins/dlt_loop/loop.h \
355357
$(srcdir)/plugins/dlt_linuxsll/linuxsll.h \
358+
$(srcdir)/plugins/dlt_linuxsll/linuxsll_types.h \
356359
$(srcdir)/plugins/dlt_ieee80211/ieee80211.h \
357360
$(srcdir)/plugins/dlt_ieee80211/ieee80211_hdr.h \
358361
$(srcdir)/plugins/dlt_ieee80211/ieee80211_types.h \

‎src/tcpedit/plugins/dlt_linuxsll/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
libtcpedit_a_SOURCES += $(srcdir)/plugins/dlt_linuxsll/linuxsll.c
1010

11-
noinst_HEADERS += $(srcdir)/plugins/dlt_linuxsll/linuxsll.h
11+
noinst_HEADERS += $(srcdir)/plugins/dlt_linuxsll/linuxsll.h \
12+
$(srcdir)/plugins/dlt_linuxsll/linuxsll_types.h
1213

1314
EXTRA_DIST += $(srcdir)/plugins/dlt_linuxsll/linuxsll_opts.def
1415

‎src/tcpedit/plugins/dlt_user/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ libtcpedit_a_SOURCES += $(srcdir)/plugins/dlt_user/user.c \
1010
$(srcdir)/plugins/dlt_user/user_api.c
1111

1212
noinst_HEADERS += $(srcdir)/plugins/dlt_user/user.h \
13-
$(srcdir)/plugins/dlt_user/user_api.h
13+
$(srcdir)/plugins/dlt_user/user_api.h \
14+
$(srcdir)/plugins/dlt_user/user_types.h
1415

1516
EXTRA_DIST += $(srcdir)/plugins/dlt_user/user_opts.def
1617

0 commit comments

Comments
 (0)