OK, to heck with it - link reassemble_test with libwireshark. Trying to

selectively pick up particular object files is just too much of a mess.

Alas, this requires that we add some additional symbols to the list
exported by libwireshark; the DCE RPC ones shouldn't be global, but
reassemble_test uses them, so....

Get rid of stubs in reassemble_test.c - they just stub out routines from
libwireshark, but that's not necessary any more.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41223 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/Makefile.am b/epan/Makefile.am
index ccbd6e700c928a6174b8f9f708684474eb1ddc2d..af858a483f7e3292964b24d08bd791231703bc1b 100644 (file)
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -1,6 +1,7 @@
 # Makefile.am
-# Automake file for the EPAN library
-# (Ethereal Protocol ANalyzer Library)
+# Automake file for the libwireshark library
+# (EPAN is a historical name; it stands for Ethereal Protocol ANalyzer
+# Library)
 #
 # $Id$
 #
@@ -150,12 +151,11 @@ libwireshark_la_DEPENDENCIES = \
        ${top_builddir}/wiretap/libwiretap.la \
        libwireshark.sym
 
-#EXTRA_PROGRAMS = reassemble_test
-#reassemble_test_LDADD = $(GLIB_LIBS)
-
-reassemble_test: reassemble_test.o packet.o tvbuff.o except.o to_str.o strutil.o emem.o \
-                 reassemble.o charsets.o
-       $(LINK) $^ $(GLIB_LIBS) -lz
+EXTRA_PROGRAMS = reassemble_test
+reassemble_test_LDADD = \
+       libwireshark.la \
+       $(GLIB_LIBS) \
+       -lz
 
 tvbtest: tvbtest.o tvbuff.o except.o to_str.o strutil.o emem.o charsets.o
        $(LINK) $^ $(GLIB_LIBS) -lz

diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index a554cad363f0c173f1537ff33e54ac4d161006e9..cee8743a857e26f97a3e623cf8f05f02b912bff1 100644 (file)
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -253,19 +253,29 @@ tvbtest.exe: $(TVBTEST_OBJ)
 
 # Object files for reassemble_test
 REASSEMBLE_TEST_OBJ=reassemble_test.obj \
-       packet.obj \
-       tvbuff.obj \
-       except.obj \
-       to_str.obj \
-       strutil.obj \
-       charsets.obj \
-       emem.obj \
-       reassemble.obj
+REASSEMBLE_TEST_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
+       wsock32.lib user32.lib \
+       $(GLIB_LIBS) \
+       wsutil\libwsutil.lib \
+       $(GNUTLS_LIBS) \
+       $(PYTHON_LIBS) \
+!IFDEF ENABLE_LIBWIRESHARK
+       epan\libwireshark.lib \
+!ELSE
+       epan\dissectors\dissectors.lib \
+       epan\wireshark.lib \
+       epan\crypt\airpdcap.lib \
+       epan\dfilter\dfilter.lib \
+       epan\ftypes\ftypes.lib \
+       $(C_ARES_LIBS) \
+       $(ADNS_LIBS) \
+       $(ZLIB_LIBS)
+!ENDIF
 
 reassemble_test.exe: $(REASSEMBLE_TEST_OBJ)
        @echo Linking $@
        $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \
-                $(GLIB_LIBS) $(ZLIB_LIBS) $(REASSEMBLE_TEST_OBJ)
+                $(REASSEMBLE_TEST_LIBS) $(GLIB_LIBS) $(ZLIB_LIBS) $(REASSEMBLE_TEST_OBJ)
 !IFDEF MANIFEST_INFO_REQUIRED
        mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1
 !ENDIF

diff --git a/epan/libwireshark.def b/epan/libwireshark.def
index b250865846b18acc21fa5d096d546b2a4b46b109..eb220c24f6c0ffc26834679cb99b85da651bdb5e 100644 (file)
--- a/epan/libwireshark.def
+++ b/epan/libwireshark.def
@@ -127,6 +127,7 @@ create_persconffile_dir
 create_persconffile_profile
 data_out_file                   DATA
 dcerpc_add_conv_to_bind_table
+dcerpc_fragment_table_init
 dcerpc_get_proto_hf_opnum
 dcerpc_get_proto_name
 dcerpc_get_proto_sub_dissector
@@ -463,8 +464,10 @@ format_text
 format_uri
 fragment_add
 fragment_add_check
+fragment_add_dcerpc_dg
 fragment_add_multiple_ok
 fragment_add_seq
+fragment_add_seq_802_11
 fragment_add_seq_check
 fragment_add_seq_next
 fragment_delete

diff --git a/epan/reassemble_test.c b/epan/reassemble_test.c
index 6de2f664d7ab593518437dacfef77cf38bbb0102..6c9f5b48085ec914dcde959f722dd4d699d08450 100644 (file)
--- a/epan/reassemble_test.c
+++ b/epan/reassemble_test.c
@@ -1700,53 +1700,3 @@ main(int argc _U_, char **argv _U_)
     printf(failure?"FAILURE\n":"SUCCESS\n");
     return failure;
 }
-
-
-/* stubs */
-void add_new_data_source(packet_info *pinfo _U_, tvbuff_t *tvb _U_,
-                        const char *name _U_)
-{}
-
-proto_item *
-proto_tree_add_uint(proto_tree *tree _U_, int hfindex _U_, tvbuff_t *tvb _U_,
-                    gint start _U_, gint length _U_, guint32 value _U_)
-{ return NULL; }
-
-void proto_item_prepend_text(proto_item *ti _U_, const char *format _U_, ...)
-{}
-
-void proto_item_append_text(proto_item *ti _U_, const char *format _U_, ...)
-{}
-
-proto_item *proto_tree_add_uint_format(proto_tree *tree _U_, int hfindex _U_,
-                                       tvbuff_t *tvb _U_, gint start _U_,
-                                       gint length _U_, guint32 value _U_,
-                                       const char *format _U_, ...)
-{ return NULL; }
-
-proto_tree* proto_item_add_subtree(proto_item *ti _U_, const gint idx _U_)
-{ return NULL; }
-
-proto_item *proto_tree_add_boolean(proto_tree *tree _U_, int hfindex _U_,
-                                   tvbuff_t *tvb _U_, gint start _U_,
-                                   gint length _U_, guint32 value _U_)
-{ return NULL; }
-
-proto_item *proto_tree_add_item(proto_tree *tree _U_, const int hfindex _U_,
-                                tvbuff_t *tvb _U_, const gint start _U_,
-                                gint length _U_,
-                                const guint encoding _U_)
-{ return NULL; }
-
-gint check_col(column_info *cinfo _U_, const gint col _U_)
-{ return 0; }
-
-void col_add_fstr(column_info *cinfo _U_, const gint col _U_, const gchar *format _U_,
-                       ...)
-{}
-
-const char* proto_registrar_get_name(const int n _U_)
-{ return ""; }
-
-void proto_item_set_text(proto_item *ti _U_, const char *format _U_, ...)
-{ }