osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Don't link plugins against libwireshark: any program that loads the dissector 

plugins should already be linked against libwireshark.

Don't link capinfos and editcap against libwireshark: they only needed to be
because the plugins were linked against libwireshark (see rev 24123 and the
ensuing discussion on -dev).

capinfos and editcap: don't complain if plugins fail to load: dissector
plugins should fail to load because they need libwireshark.  I am assuming
here that wiretap plugins don't need libwireshark (I've never seen such a
plugin but LEGO's code and comments suggest this is the case).

(The goal of this checkin is to stop linking capinfos and editcap against
libwireshark while still allowing wiretap plugins.  Since we don't have any
such plugins in the tree I do somewhat doubt the need for all this but I don't
want to be the one to remove the functionality.)

svn path=/trunk/; revision=24650
daniel/osmux
Jeff Morriss 2008-03-16 00:58:15 +00:00
parent ddca4dd583
commit b59322ecc1
4 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Makefile.am
View File

@ -384,34 +384,12 @@ mergecap_LDADD = \
# Libraries with which to link capinfos.
capinfos_LDADD = \
wiretap/libwiretap.la \
epan/libwireshark.la \
@INET_PTON_LO@ \
@SSL_LIBS@ \
$(plugin_ldadd) \
@PCRE_LIBS@ \
@GLIB_LIBS@ -lm \
@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
@FRAMEWORKS@ \
@LIBICONV@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
@GLIB_LIBS@
# Libraries with which to link editcap.
editcap_LDADD = \
wiretap/libwiretap.la \
epan/libwireshark.la \
@INET_PTON_LO@ \
@SSL_LIBS@ \
$(plugin_ldadd) \
@PCRE_LIBS@ \
@GLIB_LIBS@ -lm \
@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
@FRAMEWORKS@ \
@LIBICONV@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
@GLIB_LIBS@
# Libraries with which to link randpkt.
randpkt_LDADD = \

10
capinfos.c
View File

@ -262,14 +262,14 @@ usage(gboolean is_error)
}
/*
* Errors are reported with a console message.
* Don't report failures to load plugins because most (non-wiretap) plugins
* *should* fail to load (because we're not linked against libwireshark and
* dissector plugins need libwireshark).
*/
static void
failure_message(const char *msg_format, va_list ap)
failure_message(const char *msg_format _U_, va_list ap _U_)
{
fprintf(stderr, "capinfos: ");
vfprintf(stderr, msg_format, ap);
fprintf(stderr, "\n");
return;
}

2
configure.in
View File

@ -1567,7 +1567,7 @@ CPPFLAGS="$CPPFLAGS '-DPLUGIN_DIR=\"\$(plugindir)\"'"
#
# The plugin dissectors reside in ./plugins/PROTO/
#
PLUGIN_LIBS="-L../../epan -lwireshark"
PLUGIN_LIBS=""
AC_SUBST(PLUGIN_LIBS)
dnl libtool defs

11
editcap.c
View File

@ -370,12 +370,15 @@ list_encap_types(void) {
}
}
/*
* Don't report failures to load plugins because most (non-wiretap) plugins
* *should* fail to load (because we're not linked against libwireshark and
* dissector plugins need libwireshark).
*/
static void
failure_message(const char *msg_format, va_list ap)
failure_message(const char *msg_format _U_, va_list ap _U_)
{
fprintf(stderr, "editcap: ");
vfprintf(stderr, msg_format, ap);
fprintf(stderr, "\n");
return;
}
int