diff options
| -rw-r--r-- | wiretap/INSTALL | 4 | ||||
| -rw-r--r-- | wiretap/README | 2 | ||||
| -rw-r--r-- | wiretap/acinclude.m4 | 4 | ||||
| -rw-r--r-- | wiretap/configure.in | 10 | ||||
| -rw-r--r-- | wiretap/file_access.c | 6 | ||||
| -rw-r--r-- | wiretap/nettl.c | 4 |
6 files changed, 15 insertions, 15 deletions
diff --git a/wiretap/INSTALL b/wiretap/INSTALL index deae1bba6d..11b2d7974e 100644 --- a/wiretap/INSTALL +++ b/wiretap/INSTALL @@ -1,3 +1,3 @@ Currently there is no need to install this library. Since wiretap has just -been born, only ethereal uses it. Once wiretap becomes powerful enough to be -use outside of ethereal, then we can worry about installation. +been born, only wireshark uses it. Once wiretap becomes powerful enough to be +use outside of wireshark, then we can worry about installation. diff --git a/wiretap/README b/wiretap/README index 385d2f9382..c2aaa0c3b3 100644 --- a/wiretap/README +++ b/wiretap/README @@ -4,7 +4,7 @@ Wiretap is a library that is being developed as a future replacement for libpcap, the current standard Unix library for packet capturing. Libpcap is great in that it is very platform independent and has a wonderful BPF optimizing engine. But it has some shortcomings as well. These -shortcomings came to a head during the development of Ethereal +shortcomings came to a head during the development of Wireshark (http://www.wireshark.org/), a packet analyzer. As such, I began developing wiretap so that: diff --git a/wiretap/acinclude.m4 b/wiretap/acinclude.m4 index 93938b0e50..306caec591 100644 --- a/wiretap/acinclude.m4 +++ b/wiretap/acinclude.m4 @@ -217,8 +217,8 @@ AC_DEFUN([AC_WIRETAP_ZLIB_CHECK], # own zlib in the X11 library directory. # # The XFree86 zlib is an older version that lacks - # "gzgets()", and that's the zlib with which Ethereal - # gets linked, so the build of Ethereal fails. + # "gzgets()", and that's the zlib with which Wireshark + # gets linked, so the build of Wireshark fails. # ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" diff --git a/wiretap/configure.in b/wiretap/configure.in index 0d7884dcba..9a7bd9c7b3 100644 --- a/wiretap/configure.in +++ b/wiretap/configure.in @@ -37,12 +37,12 @@ AC_ARG_WITH(extra-gcc-checks, [ if test $withval != no then - ethereal_extra_gcc_flags=" -Wcast-qual -Wcast-align -Wbad-function-cast -pedantic -Wmissing-declarations -Wwrite-strings" + wireshark_extra_gcc_flags=" -Wcast-qual -Wcast-align -Wbad-function-cast -pedantic -Wmissing-declarations -Wwrite-strings" fi ],) -AC_MSG_CHECKING(to see if we can add '-Wall -W -Wcast-qual $ethereal_extra_gcc_flags' to CFLAGS) +AC_MSG_CHECKING(to see if we can add '-Wall -W -Wcast-qual $wireshark_extra_gcc_flags' to CFLAGS) if test x$GCC != x ; then - CFLAGS="-D_U_=\"__attribute__((unused))\" -Wall -W $ethereal_extra_gcc_flags $CFLAGS" + CFLAGS="-D_U_=\"__attribute__((unused))\" -Wall -W $wireshark_extra_gcc_flags $CFLAGS" AC_MSG_RESULT(yes) else CFLAGS="-D_U_=\"\" $CFLAGS" @@ -123,7 +123,7 @@ else fi AC_ARG_ENABLE(gtk2, -[ --disable-gtk2 build Glib1/Gtk1+-based (t)ethereal. [default=no]],enable_gtk2=$enableval,enable_gtk2=yes) +[ --disable-gtk2 build Glib1/Gtk1+-based wireshark/tshark. [default=no]],enable_gtk2=$enableval,enable_gtk2=yes) if test "x$enable_gtk2" = "xyes" ; then AM_PATH_GLIB_2_0(2.0.0, CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS", , gmodule) @@ -219,7 +219,7 @@ AC_COMPILE_IFELSE( # # "--with-pcap" is merely done to allow the user to specify a directory # in which to look for <pcap.h> (and so that specifying it to the -# top-level Ethereal configure script specifies it to the Wiretap +# top-level Wireshark configure script specifies it to the Wiretap # configure script as well); we search for it regardless of whether # "--without-pcap" was specified, as Wiretap isn't linked with it and # there's no benefit to not looking for the header. diff --git a/wiretap/file_access.c b/wiretap/file_access.c index 6ed09f6071..99b4ef6161 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -341,11 +341,11 @@ static const struct file_type_info { NULL, NULL }, /* WTAP_FILE_WTAP */ - { "Wiretap (Ethereal)", NULL, FALSE, + { "Wiretap (Wireshark)", NULL, FALSE, NULL, NULL }, /* WTAP_FILE_PCAP */ - { "libpcap (tcpdump, Ethereal, etc.)", "libpcap", TRUE, + { "libpcap (tcpdump, Wireshark, etc.)", "libpcap", TRUE, libpcap_dump_can_write_encap, libpcap_dump_open }, /* WTAP_FILE_PCAP_SS990417 */ @@ -369,7 +369,7 @@ static const struct file_type_info { NULL, NULL }, /* WTAP_FILE_PCAP_NSEC */ - { "Nanosecond libpcap (Ethereal)", "nseclibpcap", TRUE, + { "Nanosecond libpcap (Wireshark)", "nseclibpcap", TRUE, libpcap_dump_can_write_encap, libpcap_dump_open }, /* WTAP_FILE_LANALYZER */ diff --git a/wiretap/nettl.c b/wiretap/nettl.c index 9206d5e35f..749c72dfdd 100644 --- a/wiretap/nettl.c +++ b/wiretap/nettl.c @@ -704,9 +704,9 @@ gboolean nettl_dump_open(wtap_dumper *wdh, gboolean cant_seek _U_, int *err) /* Write the file header. */ memset(&file_hdr,0,sizeof(file_hdr)); memcpy(file_hdr.magic,nettl_magic_hpux10,sizeof(file_hdr.magic)); - strcpy(file_hdr.file_name,"/tmp/ethereal.TRC000"); + strcpy(file_hdr.file_name,"/tmp/wireshark.TRC000"); strcpy(file_hdr.tz,"UTC"); - strcpy(file_hdr.host_name,"ethereal"); + strcpy(file_hdr.host_name,"wireshark"); strcpy(file_hdr.os_vers,"B.11.11"); file_hdr.os_v=0x55; strcpy(file_hdr.model,"9000/800"); |