Added missing distribution files and deleted unused files for appneta#26

baigubulu · Dec 15, 2013 · 3b29b7b · 3b29b7b
1 parent 49a53f3
commit 3b29b7b
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 2,087 deletions.
diff --git a/docs/router-mode1.fig b/docs/router-mode1.fig
diff --git a/docs/router-mode2.fig b/docs/router-mode2.fig
diff --git a/docs/router-mode3.fig b/docs/router-mode3.fig
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -47,7 +47,7 @@ tcpcapinfo.1: tcpcapinfo_opts.def
 
 man_MANS = tcpreplay.1 tcpprep.1 tcprewrite.1 tcpreplay-edit.1 tcpcapinfo.1
 EXTRA_DIST = tcpreplay.1 tcpprep.1 tcprewrite.1 tcpbridge.1 tcpreplay-edit.1 \
-	tcpliveplay.1 tcpcapinfo.1 timestamp_trace.h
+	tcpliveplay.1 tcpcapinfo.1
 bin_PROGRAMS = tcpreplay tcpprep tcprewrite tcpreplay-edit tcpcapinfo
 
 if COMPILE_TCPBRIDGE
@@ -110,7 +110,6 @@ tcpcapinfo_LDADD = ./common/libcommon.a \
 tcpcapinfo_SOURCES = tcpcapinfo_opts.c tcpcapinfo.c
 tcpcapinfo_OBJECTS: tcpcapinfo_opts.h
 tcpcapinfo_opts.h: tcpcapinfo_opts.c
-
 tcpcapinfo_opts.c: tcpcapinfo_opts.def
 	@AUTOGEN@ $(opts_list) tcpcapinfo_opts.def || true
 
@@ -139,8 +138,9 @@ noinst_HEADERS = tcpreplay.h tcpprep.h bridge.h defines.h tree.h tcpliveplay.h \
 		 send_packets.h signal_handler.h common.h tcpreplay_opts.h tcpliveplay_opts.h \
 		 tcpreplay_edit_opts.h tcprewrite.h tcprewrite_opts.h tcpprep_opts.h \
 		 tcpprep_opts.def tcprewrite_opts.def tcpreplay_opts.def tcpliveplay_opts.def \
-		 tcpbridge_opts.def tcpbridge.h tcpbridge_opts.h tcpr.h sleep.h tcpcapinfo_opts.h
-
+		 tcpbridge_opts.def tcpbridge.h tcpbridge_opts.h tcpr.h sleep.h tcpcapinfo_opts.h \
+		 tcpcapinfo_opts.def replay.h tcpreplay_api.h tcpprep_api.h timestamp_trace.h \
+		 msvc_inttypes.h msvc_stdint.h
 
 MOSTLYCLEANFILES = *~ *.o
 

diff --git a/src/Makefile.in b/src/Makefile.in
@@ -383,7 +383,7 @@ opts_list = -L tcpedit
 man_MANS = tcpreplay.1 tcpprep.1 tcprewrite.1 tcpreplay-edit.1 \
 	tcpcapinfo.1 $(am__append_2) $(am__append_4)
 EXTRA_DIST = tcpreplay.1 tcpprep.1 tcprewrite.1 tcpbridge.1 tcpreplay-edit.1 \
-	tcpliveplay.1 tcpcapinfo.1 timestamp_trace.h
+	tcpliveplay.1 tcpcapinfo.1
 
 tcpreplay_edit_CFLAGS = $(LIBOPTS_CFLAGS) -I.. -Itcpedit $(LNAV_CFLAGS) @LDNETINC@ -DTCPREPLAY -DTCPREPLAY_EDIT -DHAVE_CACHEFILE_SUPPORT
 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 \
 		 send_packets.h signal_handler.h common.h tcpreplay_opts.h tcpliveplay_opts.h \
 		 tcpreplay_edit_opts.h tcprewrite.h tcprewrite_opts.h tcpprep_opts.h \
 		 tcpprep_opts.def tcprewrite_opts.def tcpreplay_opts.def tcpliveplay_opts.def \
-		 tcpbridge_opts.def tcpbridge.h tcpbridge_opts.h tcpr.h sleep.h tcpcapinfo_opts.h
+		 tcpbridge_opts.def tcpbridge.h tcpbridge_opts.h tcpr.h sleep.h tcpcapinfo_opts.h \
+		 tcpcapinfo_opts.def replay.h tcpreplay_api.h tcpprep_api.h timestamp_trace.h \
+		 msvc_inttypes.h msvc_stdint.h
 
 MOSTLYCLEANFILES = *~ *.o
 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
 	@AUTOGEN@ $(opts_list) tcprewrite_opts.def || true
 tcpcapinfo_OBJECTS: tcpcapinfo_opts.h
 tcpcapinfo_opts.h: tcpcapinfo_opts.c
-
 tcpcapinfo_opts.c: tcpcapinfo_opts.def
 	@AUTOGEN@ $(opts_list) tcpcapinfo_opts.def || true
 tcpprep_OBJECTS: tcpprep_opts.h

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
@@ -15,7 +15,7 @@ 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 git_version.c abort.c sendpacket.c \
 		      dlt_names.c mac.c interface.c git_version.c \
-		      flows.c
+		      flows.c txring.c
 
 if ENABLE_TCPDUMP
 libcommon_a_SOURCES += tcpdump.c
@@ -30,7 +30,7 @@ endif
 noinst_HEADERS = cidr.h err.h list.h cache.h services.h get.h \
 		 fakepcap.h fakepcapnav.h fakepoll.h xX.h utils.h \
 		 tcpdump.h timer.h abort.h pcap_dlt.h sendpacket.h \
-		 dlt_names.h mac.h interface.h flows.h
+		 dlt_names.h mac.h interface.h flows.h txring.h
 
 MOSTLYCLEANFILES = *~
 

diff --git a/src/common/Makefile.in b/src/common/Makefile.in
@@ -56,15 +56,16 @@ libcommon_a_AR = $(AR) $(ARFLAGS)
 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 \
 	git_version.c abort.c sendpacket.c dlt_names.c mac.c \
-	interface.c flows.c tcpdump.c
+	interface.c flows.c txring.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) \
 	git_version.$(OBJEXT) abort.$(OBJEXT) sendpacket.$(OBJEXT) \
 	dlt_names.$(OBJEXT) mac.$(OBJEXT) interface.$(OBJEXT) \
-	git_version.$(OBJEXT) flows.$(OBJEXT) $(am__objects_1)
+	git_version.$(OBJEXT) flows.$(OBJEXT) txring.$(OBJEXT) \
+	$(am__objects_1)
 libcommon_a_OBJECTS = $(am_libcommon_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -242,13 +243,13 @@ 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 \
 	git_version.c abort.c sendpacket.c dlt_names.c mac.c \
-	interface.c git_version.c flows.c $(am__append_1)
+	interface.c git_version.c flows.c txring.c $(am__append_1)
 AM_CFLAGS = -I.. -I../.. $(LNAV_CFLAGS) @LDNETINC@
 @SYSTEM_STRLCPY_FALSE@libcommon_a_LIBADD = ../../lib/libstrl.a
 noinst_HEADERS = cidr.h err.h list.h cache.h services.h get.h \
 		 fakepcap.h fakepcapnav.h fakepoll.h xX.h utils.h \
 		 tcpdump.h timer.h abort.h pcap_dlt.h sendpacket.h \
-		 dlt_names.h mac.h interface.h flows.h
+		 dlt_names.h mac.h interface.h flows.h txring.h
 
 MOSTLYCLEANFILES = *~
 MAINTAINERCLEANFILES = Makefile.in git_version.c
@@ -319,6 +320,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/services.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)/txring.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xX.Po@am__quote@
 

diff --git a/src/common/txring.c b/src/common/txring.c
@@ -31,6 +31,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef HAVE_TX_RING
+
 #include "err.h"
 #include "utils.h"
 #include "txring.h"
@@ -235,3 +237,5 @@ txring_init(int fd, unsigned int mtu)
 
     return txp;
 }
+
+#endif /* HAVE_TX_RING */
diff --git a/src/common/txring.h b/src/common/txring.h
@@ -37,6 +37,8 @@
 #include "config.h"
 #include "defines.h"
 
+#ifdef HAVE_TX_RING
+
 #if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1
 #include <netpacket/packet.h>
 #include <net/ethernet.h>       /* the L2 protocols */
@@ -60,5 +62,6 @@ typedef struct txring_s txring_t;
 
 int txring_put(txring_t *txp, const void * data, size_t length);
 txring_t* txring_init(int fd, unsigned int mtu);
+#endif /* HAVE_TX_RING */
 
-#endif
+#endif /*COMMON_TXRING_H */
diff --git a/src/tcpedit/Makefile.am b/src/tcpedit/Makefile.am
@@ -25,7 +25,7 @@ AM_CFLAGS = -I.. -I../common -I../.. @LDNETINC@ $(LIBOPTS_CFLAGS) $(LNAV_CFLAGS)
 
 noinst_HEADERS = tcpedit.h edit_packet.h portmap.h \
 	tcpedit_stub.h parse_args.h dlt.h checksum.h tcpedit_api.h \
-	tcpedit_types.h
+	tcpedit_types.h plugins.h plugins_api.h plugins_types.h
 
 MOSTLYCLEANFILES = *~
 

diff --git a/src/tcpedit/Makefile.in b/src/tcpedit/Makefile.in
@@ -339,6 +339,7 @@ AM_CFLAGS = -I.. -I../common -I../.. @LDNETINC@ $(LIBOPTS_CFLAGS) \
 	$(LIBOPTS_CFLAGS)
 noinst_HEADERS = tcpedit.h edit_packet.h portmap.h tcpedit_stub.h \
 	parse_args.h dlt.h checksum.h tcpedit_api.h tcpedit_types.h \
+	plugins.h plugins_api.h plugins_types.h \
 	$(srcdir)/plugins/ethernet.h $(srcdir)/plugins/dlt_utils.h \
 	$(srcdir)/plugins/ethernet.h \
 	$(srcdir)/plugins/dlt_en10mb/en10mb.h \
@@ -349,10 +350,12 @@ noinst_HEADERS = tcpedit.h edit_packet.h portmap.h tcpedit_stub.h \
 	$(srcdir)/plugins/dlt_hdlc/hdlc_types.h \
 	$(srcdir)/plugins/dlt_user/user.h \
 	$(srcdir)/plugins/dlt_user/user_api.h \
+	$(srcdir)/plugins/dlt_user/user_types.h \
 	$(srcdir)/plugins/dlt_raw/raw.h \
 	$(srcdir)/plugins/dlt_null/null.h \
 	$(srcdir)/plugins/dlt_loop/loop.h \
 	$(srcdir)/plugins/dlt_linuxsll/linuxsll.h \
+	$(srcdir)/plugins/dlt_linuxsll/linuxsll_types.h \
 	$(srcdir)/plugins/dlt_ieee80211/ieee80211.h \
 	$(srcdir)/plugins/dlt_ieee80211/ieee80211_hdr.h \
 	$(srcdir)/plugins/dlt_ieee80211/ieee80211_types.h \

diff --git a/src/tcpedit/plugins/dlt_linuxsll/Makefile.am b/src/tcpedit/plugins/dlt_linuxsll/Makefile.am
@@ -8,7 +8,8 @@
 
 libtcpedit_a_SOURCES += $(srcdir)/plugins/dlt_linuxsll/linuxsll.c
 
-noinst_HEADERS += $(srcdir)/plugins/dlt_linuxsll/linuxsll.h
+noinst_HEADERS += $(srcdir)/plugins/dlt_linuxsll/linuxsll.h \
+	$(srcdir)/plugins/dlt_linuxsll/linuxsll_types.h
 
 EXTRA_DIST += $(srcdir)/plugins/dlt_linuxsll/linuxsll_opts.def
 

diff --git a/src/tcpedit/plugins/dlt_user/Makefile.am b/src/tcpedit/plugins/dlt_user/Makefile.am
@@ -10,7 +10,8 @@ libtcpedit_a_SOURCES += $(srcdir)/plugins/dlt_user/user.c \
 	$(srcdir)/plugins/dlt_user/user_api.c
 
 noinst_HEADERS += $(srcdir)/plugins/dlt_user/user.h \
-	$(srcdir)/plugins/dlt_user/user_api.h
+	$(srcdir)/plugins/dlt_user/user_api.h \
+	$(srcdir)/plugins/dlt_user/user_types.h
 
 EXTRA_DIST += $(srcdir)/plugins/dlt_user/user_opts.def