diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | Makefile.in | 27 | ||||
| -rw-r--r-- | column.c | 25 | ||||
| -rwxr-xr-x | configure | 120 | ||||
| -rw-r--r-- | ethereal.c | 6 | ||||
| -rw-r--r-- | packet-bootp.c | 3 | ||||
| -rw-r--r-- | packet-ncp.h | 6 | ||||
| -rw-r--r-- | packet-rip.c | 3 | ||||
| -rw-r--r-- | packet-tcp.c | 11 | ||||
| -rw-r--r-- | packet.c | 3 | ||||
| -rw-r--r-- | packet.h | 4 | ||||
| -rw-r--r-- | prefs.c | 11 | ||||
| -rwxr-xr-x | wiretap/configure | 41 |
14 files changed, 143 insertions, 119 deletions
@@ -39,6 +39,7 @@ Laurent Deniel <deniel@worldnet.fr> { Name resolution Ethernet/Manufacturer files support FDDI support + OMG GIOP/IIOP support ISO/OSI CLNP/COTP support Miscellaneous enhancements and fixes } diff --git a/Makefile.am b/Makefile.am index d1c331da47..f94f7c0259 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,6 +22,7 @@ ethereal_SOURCES = \ packet-dns.c \ packet-eth.c \ packet-fddi.c \ + packet-giop.c \ packet-llc.c \ packet-lpd.c \ packet-ip.c \ diff --git a/Makefile.in b/Makefile.in index 3c25e1a492..75059e089f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -96,6 +96,7 @@ ethereal_SOURCES = \ packet-dns.c \ packet-eth.c \ packet-fddi.c \ + packet-giop.c \ packet-llc.c \ packet-lpd.c \ packet-ip.c \ @@ -180,11 +181,11 @@ LIBS = @LIBS@ ethereal_OBJECTS = capture.o column.o ethereal.o ethertype.o file.o \ filter.o follow.o menu.o packet.o packet-aarp.o packet-arp.o \ packet-atalk.o packet-bootp.o packet-data.o packet-dns.o packet-eth.o \ -packet-fddi.o packet-llc.o packet-lpd.o packet-ip.o packet-ipv6.o \ -packet-ipx.o packet-nbipx.o packet-nbns.o packet-ncp.o packet-null.o \ -packet-osi.o packet-ospf.o packet-ppp.o packet-raw.o packet-rip.o \ -packet-tcp.o packet-tr.o packet-trmac.o packet-udp.o packet-vines.o \ -prefs.o print.o ps.o resolv.o util.o +packet-fddi.o packet-giop.o packet-llc.o packet-lpd.o packet-ip.o \ +packet-ipv6.o packet-ipx.o packet-nbipx.o packet-nbns.o packet-ncp.o \ +packet-null.o packet-osi.o packet-ospf.o packet-ppp.o packet-raw.o \ +packet-rip.o packet-tcp.o packet-tr.o packet-trmac.o packet-udp.o \ +packet-vines.o prefs.o print.o ps.o resolv.o util.o ethereal_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @@ -210,14 +211,14 @@ DEP_FILES = .deps/capture.P .deps/column.P .deps/ethereal.P \ .deps/menu.P .deps/packet-aarp.P .deps/packet-arp.P \ .deps/packet-atalk.P .deps/packet-bootp.P .deps/packet-data.P \ .deps/packet-dns.P .deps/packet-eth.P .deps/packet-fddi.P \ -.deps/packet-ip.P .deps/packet-ipv6.P .deps/packet-ipx.P \ -.deps/packet-llc.P .deps/packet-lpd.P .deps/packet-nbipx.P \ -.deps/packet-nbns.P .deps/packet-ncp.P .deps/packet-null.P \ -.deps/packet-osi.P .deps/packet-ospf.P .deps/packet-ppp.P \ -.deps/packet-raw.P .deps/packet-rip.P .deps/packet-tcp.P \ -.deps/packet-tr.P .deps/packet-trmac.P .deps/packet-udp.P \ -.deps/packet-vines.P .deps/packet.P .deps/prefs.P .deps/print.P \ -.deps/ps.P .deps/resolv.P .deps/snprintf.P .deps/util.P +.deps/packet-giop.P .deps/packet-ip.P .deps/packet-ipv6.P \ +.deps/packet-ipx.P .deps/packet-llc.P .deps/packet-lpd.P \ +.deps/packet-nbipx.P .deps/packet-nbns.P .deps/packet-ncp.P \ +.deps/packet-null.P .deps/packet-osi.P .deps/packet-ospf.P \ +.deps/packet-ppp.P .deps/packet-raw.P .deps/packet-rip.P \ +.deps/packet-tcp.P .deps/packet-tr.P .deps/packet-trmac.P \ +.deps/packet-udp.P .deps/packet-vines.P .deps/packet.P .deps/prefs.P \ +.deps/print.P .deps/ps.P .deps/resolv.P .deps/snprintf.P .deps/util.P SOURCES = $(ethereal_SOURCES) $(EXTRA_ethereal_SOURCES) OBJECTS = $(ethereal_OBJECTS) @@ -1,7 +1,7 @@ /* column.c * Routines for handling column preferences * - * $Id: column.c,v 1.2 1998/11/17 05:04:03 gerald Exp $ + * $Id: column.c,v 1.3 1998/11/18 03:01:26 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -224,15 +224,17 @@ get_column_width(gint format, GdkFont *font) { gint get_column_format(gint col) { - fmt_data *cfmt = (g_list_nth(prefs.col_list, col))->data; + GList *clp = g_list_nth(prefs.col_list, col); + fmt_data *cfmt; + + cfmt = (fmt_data *) clp->data; return(get_column_format_from_str(cfmt->fmt)); } static gint get_column_format_from_str(gchar *str) { - gchar *cptr = str, last_char = '\0'; - gboolean in_fmt = FALSE; + gchar *cptr = str; gint res_off = RES_DEF, addr_off = ADDR_DEF; /* To do: Make this parse %-formatted strings "for real" */ @@ -282,7 +284,10 @@ get_column_format_from_str(gchar *str) { gchar * get_column_title(gint col) { - fmt_data *cfmt = (g_list_nth(prefs.col_list, col))->data; + GList *clp = g_list_nth(prefs.col_list, col); + fmt_data *cfmt; + + cfmt = (fmt_data *) clp->data; return(cfmt->title); } @@ -339,18 +344,10 @@ col_format_to_pref_str() { GtkWidget * column_prefs_show() { GtkWidget *main_vb, *top_hb, *list_bb, *new_bt, *column_sc, *nl_item, - *nl_lb, *tb, *lb, *bottom_hb, *column_lb, *menu, *mitem, - *arrow_hb, *arrow_pm; - GtkWidget *l_select = NULL; + *nl_lb, *tb, *lb, *menu, *mitem, *arrow_hb; GList *clp = NULL; fmt_data *cfmt; - gchar *column_te_str = NULL, **arrow; gint i; - GdkPixmap *pm; - GdkBitmap *mask; - GtkStyle *style; - GdkColormap *cmap; - /* Container for each row of widgets */ main_vb = gtk_vbox_new(FALSE, 5); @@ -1008,6 +1008,16 @@ else fi +# If we're running gcc, add '-Wall' to CFLAGS. +echo $ac_n "checking to see if we can add '-Wall' to CFLAGS""... $ac_c" 1>&6 +echo "configure:1014: checking to see if we can add '-Wall' to CFLAGS" >&5 +if test x$GCC != x ; then + CFLAGS="-Wall $CFLAGS" + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + # Create DATAFILE_DIR #define for config.h DATAFILE_DIR=$sysconfdir DATAFILE_DIR=`( @@ -1026,7 +1036,7 @@ EOF case "$host_os" in solaris*) echo $ac_n "checking for LD_LIBRARY_PATH""... $ac_c" 1>&6 -echo "configure:1030: checking for LD_LIBRARY_PATH" >&5 +echo "configure:1040: checking for LD_LIBRARY_PATH" >&5 if test x$LD_LIBRARY_PATH != x ; then LIBS="$LIBS -R$LD_LIBRARY_PATH" echo "$ac_t""yes -- added LD_LIBRARY_PATH to run-time linker path" 1>&6 @@ -1078,7 +1088,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1082: checking for $ac_word" >&5 +echo "configure:1092: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1109,7 +1119,7 @@ fi min_gtk_version=1.0.0 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:1113: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:1123: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -1132,7 +1142,7 @@ echo "configure:1113: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext <<EOF -#line 1136 "configure" +#line 1146 "configure" #include "confdefs.h" #include <gtk/gtk.h> @@ -1195,7 +1205,7 @@ main () } EOF -if { (eval echo configure:1199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1229,7 +1239,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext <<EOF -#line 1233 "configure" +#line 1243 "configure" #include "confdefs.h" #include <gtk/gtk.h> @@ -1239,7 +1249,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:1243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -1280,7 +1290,7 @@ rm -f conftest* # Pcap checks echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1284: checking how to run the C preprocessor" >&5 +echo "configure:1294: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1295,13 +1305,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1299 "configure" +#line 1309 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1312,13 +1322,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1316 "configure" +#line 1326 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1322: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1332: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1342,17 +1352,17 @@ echo "$ac_t""$CPP" 1>&6 ac_safe=`echo "net/bpf.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for net/bpf.h""... $ac_c" 1>&6 -echo "configure:1346: checking for net/bpf.h" >&5 +echo "configure:1356: checking for net/bpf.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1351 "configure" +#line 1361 "configure" #include "confdefs.h" #include <net/bpf.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1376,17 +1386,17 @@ fi ac_safe=`echo "pcap.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for pcap.h""... $ac_c" 1>&6 -echo "configure:1380: checking for pcap.h" >&5 +echo "configure:1390: checking for pcap.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1385 "configure" +#line 1395 "configure" #include "confdefs.h" #include <pcap.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1409,7 +1419,7 @@ else fi echo $ac_n "checking for pcap_open_offline in -lpcap""... $ac_c" 1>&6 -echo "configure:1413: checking for pcap_open_offline in -lpcap" >&5 +echo "configure:1423: checking for pcap_open_offline in -lpcap" >&5 ac_lib_var=`echo pcap'_'pcap_open_offline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1417,7 +1427,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 1421 "configure" +#line 1431 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1428,7 +1438,7 @@ int main() { pcap_open_offline() ; return 0; } EOF -if { (eval echo configure:1432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1459,7 +1469,7 @@ fi # Evidently, some systems have pcap.h, etc. in */include/pcap echo $ac_n "checking for extraneous pcap header directories""... $ac_c" 1>&6 -echo "configure:1463: checking for extraneous pcap header directories" >&5 +echo "configure:1473: checking for extraneous pcap header directories" >&5 found_pcap_dir="" for pcap_dir in /usr/include/pcap /usr/local/include/pcap do @@ -1477,7 +1487,7 @@ fi # Wiretap check echo $ac_n "checking whether to include wiretap library""... $ac_c" 1>&6 -echo "configure:1481: checking whether to include wiretap library" >&5 +echo "configure:1491: checking whether to include wiretap library" >&5 # Check whether --with-wiretap or --without-wiretap was given. if test "${with_wiretap+set}" = set; then withval="$with_wiretap" @@ -1504,12 +1514,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1508: checking for ANSI C header files" >&5 +echo "configure:1518: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1513 "configure" +#line 1523 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1517,7 +1527,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1534,7 +1544,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1538 "configure" +#line 1548 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1552,7 +1562,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1556 "configure" +#line 1566 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1573,7 +1583,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1577 "configure" +#line 1587 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1584,7 +1594,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1611,17 +1621,17 @@ for ac_hdr in fcntl.h strings.h sys/ioctl.h sys/time.h unistd.h stdarg.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1615: checking for $ac_hdr" >&5 +echo "configure:1625: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1620 "configure" +#line 1630 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1652,17 +1662,17 @@ for ac_hdr in sys/sockio.h sys/types.h netinet/in.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1656: checking for $ac_hdr" >&5 +echo "configure:1666: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1661 "configure" +#line 1671 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1695,12 +1705,12 @@ done # for get_interface_list(). echo $ac_n "checking for sa_len in struct sockaddr""... $ac_c" 1>&6 -echo "configure:1699: checking for sa_len in struct sockaddr" >&5 +echo "configure:1709: checking for sa_len in struct sockaddr" >&5 if eval "test \"`echo '$''{'ac_cv_ethereal_struct_sa_len'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1704 "configure" +#line 1714 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -1708,7 +1718,7 @@ int main() { struct sockaddr s; s.sa_len; ; return 0; } EOF -if { (eval echo configure:1712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_ethereal_struct_sa_len=yes else @@ -1731,14 +1741,14 @@ fi # We must know our byte order echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:1735: checking whether byte ordering is bigendian" >&5 +echo "configure:1745: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 1742 "configure" +#line 1752 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -1749,11 +1759,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 1757 "configure" +#line 1767 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -1764,7 +1774,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -1784,7 +1794,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1788 "configure" +#line 1798 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -1797,7 +1807,7 @@ main () { exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:1801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -1823,13 +1833,13 @@ fi if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1827: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1837: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF -#line 1833 "configure" +#line 1843 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -1847,7 +1857,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF -#line 1851 "configure" +#line 1861 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -1869,12 +1879,12 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 fi echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:1873: checking for socket" >&5 +echo "configure:1883: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1878 "configure" +#line 1888 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socket(); below. */ @@ -1897,7 +1907,7 @@ socket(); ; return 0; } EOF -if { (eval echo configure:1901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -1923,12 +1933,12 @@ fi SNPRINTF_C="" SNPRINTF_O="" echo $ac_n "checking for snprintf""... $ac_c" 1>&6 -echo "configure:1927: checking for snprintf" >&5 +echo "configure:1937: checking for snprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_snprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1932 "configure" +#line 1942 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char snprintf(); below. */ @@ -1951,7 +1961,7 @@ snprintf(); ; return 0; } EOF -if { (eval echo configure:1955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_snprintf=yes" else diff --git a/ethereal.c b/ethereal.c index 3a878f9834..304a4f8443 100644 --- a/ethereal.c +++ b/ethereal.c @@ -1,6 +1,6 @@ /* ethereal.c * - * $Id: ethereal.c,v 1.12 1998/11/17 04:28:44 gerald Exp $ + * $Id: ethereal.c,v 1.13 1998/11/18 03:01:31 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -367,14 +367,14 @@ print_usage(void) { int main(int argc, char *argv[]) { - int opt, i, j; + int opt, i; extern char *optarg; GtkWidget *window, *main_vbox, *menubar, *u_pane, *l_pane, *bv_table, *bv_hscroll, *bv_vscroll, *stat_hbox, *tv_scrollw, *filter_bt, *filter_te; GtkStyle *pl_style; GtkAcceleratorTable *accel; - gint col_width, pl_size = 280, tv_size = 95, bv_size = 75; + gint pl_size = 280, tv_size = 95, bv_size = 75; gchar *rc_file, *cf_name = NULL; gchar *medium_font = MONO_MEDIUM_FONT; gchar *bold_font = MONO_BOLD_FONT; diff --git a/packet-bootp.c b/packet-bootp.c index e3e77ff75f..59a7cf1e5a 100644 --- a/packet-bootp.c +++ b/packet-bootp.c @@ -2,7 +2,7 @@ * Routines for BOOTP/DHCP packet disassembly * Gilbert Ramirez <gram@verdict.uthscsa.edu> * - * $Id: packet-bootp.c,v 1.10 1998/11/17 04:28:51 gerald Exp $ + * $Id: packet-bootp.c,v 1.11 1998/11/18 03:01:33 gerald Exp $ * * The information used comes from: * RFC 2132: DHCP Options and BOOTP Vendor Extensions @@ -269,6 +269,7 @@ bootp_option(const u_char *pd, GtkWidget *bp_tree, int voff, int eoff) default: /* nothing */ + break; } /* Normal cases */ diff --git a/packet-ncp.h b/packet-ncp.h index d5d6f77133..59a52f5b10 100644 --- a/packet-ncp.h +++ b/packet-ncp.h @@ -2,7 +2,7 @@ * Routines for NetWare Core Protocol * Gilbert Ramirez <gram@verdict.uthscsa.edu> * - * $Id: packet-ncp.h,v 1.3 1998/10/22 04:50:21 gram Exp $ + * $Id: packet-ncp.h,v 1.4 1998/11/18 03:01:34 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@unicom.net> @@ -52,7 +52,7 @@ struct ncp_request_header { guint8 task ; guint8 conn_high ;*/ guint8 function ; - guint8 data[0] ; +/* guint8 data[0] ;*/ }; #define NCP_REPLY (0x3333) @@ -66,7 +66,7 @@ struct ncp_reply_header { guint8 conn_high ;*/ guint8 completion_code ; guint8 connection_state ; - guint8 data[0] ; +/* guint8 data[0] ;*/ }; diff --git a/packet-rip.c b/packet-rip.c index ae5f251678..c97cc00eda 100644 --- a/packet-rip.c +++ b/packet-rip.c @@ -2,7 +2,7 @@ * Routines for RIPv1 and RIPv2 packet disassembly * (c) Copyright Hannes R. Boehm <hannes@boehm.org> * - * $Id: packet-rip.c,v 1.4 1998/11/17 04:29:04 gerald Exp $ + * $Id: packet-rip.c,v 1.5 1998/11/18 03:01:36 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -107,6 +107,7 @@ dissect_rip(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) { auth = TRUE; break; default: + break; /* return; */ } diff --git a/packet-tcp.c b/packet-tcp.c index c6f9b2f92f..c90fd08d32 100644 --- a/packet-tcp.c +++ b/packet-tcp.c @@ -1,7 +1,7 @@ /* packet-tcp.c * Routines for TCP packet disassembly * - * $Id: packet-tcp.c,v 1.8 1998/11/18 01:49:12 gerald Exp $ + * $Id: packet-tcp.c,v 1.9 1998/11/18 03:01:37 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -312,7 +312,14 @@ dissect_tcp(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) { dissect_lpd(pd, offset, fd, tree); break; default: - dissect_data(pd, offset, fd, tree); + /* check existence of high level protocols */ + + if (memcmp(&pd[offset], "GIOP", 4) == 0) { + dissect_giop(pd, offset, fd, tree); + } + else { + dissect_data(pd, offset, fd, tree); + } } } @@ -1,7 +1,7 @@ /* packet.c * Routines for packet disassembly * - * $Id: packet.c,v 1.11 1998/11/17 04:29:08 gerald Exp $ + * $Id: packet.c,v 1.12 1998/11/18 03:01:38 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -35,6 +35,7 @@ #include <stdio.h> #include <stdarg.h> +#include <string.h> #include <ctype.h> #include <time.h> @@ -1,7 +1,7 @@ /* packet.h * Definitions for packet disassembly structures and routines * - * $Id: packet.h,v 1.24 1998/11/17 04:29:09 gerald Exp $ + * $Id: packet.h,v 1.25 1998/11/18 03:01:40 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -432,6 +432,7 @@ enum { ETT_NBNS_RR, ETT_NBIPX, ETT_AARP, + ETT_GIOP, NUM_TREE_TYPES /* last item number plus one */ }; @@ -531,6 +532,7 @@ void dissect_igmp(const u_char *, int, frame_data *, GtkTree *); void dissect_ip(const u_char *, int, frame_data *, GtkTree *); void dissect_ipv6(const u_char *, int, frame_data *, GtkTree *); void dissect_ipx(const u_char *, int, frame_data *, GtkTree *); +void dissect_giop(const u_char *, int, frame_data *, GtkTree *); void dissect_llc(const u_char *, int, frame_data *, GtkTree *); void dissect_lpd(const u_char *, int, frame_data *, GtkTree *); void dissect_nbipx_ns(const u_char *, int, frame_data *, GtkTree *); @@ -1,7 +1,7 @@ /* prefs.c * Routines for handling preferences * - * $Id: prefs.c,v 1.10 1998/11/17 04:29:10 gerald Exp $ + * $Id: prefs.c,v 1.11 1998/11/18 03:01:42 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -192,7 +192,7 @@ get_string_list(gchar *str) { gint state = PRE_QUOT, i = 0, j = 0; gboolean backslash = FALSE; - gchar cur_c, *slstr; + gchar cur_c, *slstr = NULL; GList *sl = NULL; while ((cur_c = str[i]) != '\0') { @@ -263,7 +263,7 @@ e_prefs * read_prefs() { enum { START, IN_VAR, PRE_VAL, IN_VAL, IN_SKIP }; FILE *pf; - gchar cur_var[MAX_VAR_LEN], cur_val[MAX_VAL_LEN], **cfdata; + gchar cur_var[MAX_VAR_LEN], cur_val[MAX_VAL_LEN]; int got_c, state = START, i; gint var_len = 0, val_len = 0, fline = 1, pline = 1; gboolean got_val = FALSE; @@ -302,7 +302,7 @@ read_prefs() { simple_dialog(ESD_TYPE_WARN, NULL, "Can't open preferences file\n\"%s\".", pf_path); } - return; + return &prefs; } while ((got_c = getc(pf)) != EOF) { @@ -405,9 +405,8 @@ static gchar *pr_dests[] = { "command", "file" }; int set_pref(gchar *pref, gchar *value) { - gchar *col_ptr; GList *col_l; - gint i, llen; + gint llen; fmt_data *cfmt; if (strcmp(pref, PRS_PRINT_FMT) == 0) { diff --git a/wiretap/configure b/wiretap/configure index 11672dd84b..3c58fd137b 100755 --- a/wiretap/configure +++ b/wiretap/configure @@ -1085,10 +1085,13 @@ int main () { int major, minor, micro; + char *tmp_version; system ("touch conf.gtktest"); - if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, µ) != 3) { + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_gtk_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { printf("%s, bad version string\n", "$min_gtk_version"); exit(1); } @@ -1138,7 +1141,7 @@ main () } EOF -if { (eval echo configure:1142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1172,7 +1175,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext <<EOF -#line 1176 "configure" +#line 1179 "configure" #include "confdefs.h" #include <gtk/gtk.h> @@ -1182,7 +1185,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:1186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -1222,7 +1225,7 @@ rm -f conftest* echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1226: checking how to run the C preprocessor" >&5 +echo "configure:1229: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1237,13 +1240,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1241 "configure" +#line 1244 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1254,13 +1257,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1258 "configure" +#line 1261 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1283,12 +1286,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1287: checking for ANSI C header files" >&5 +echo "configure:1290: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1292 "configure" +#line 1295 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1296,7 +1299,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1303: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1313,7 +1316,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1317 "configure" +#line 1320 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1331,7 +1334,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1335 "configure" +#line 1338 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1352,7 +1355,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1356 "configure" +#line 1359 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1363,7 +1366,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1390,17 +1393,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1394: checking for $ac_hdr" >&5 +echo "configure:1397: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1399 "configure" +#line 1402 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1407: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* |