From 996d4db495e60df8a627097e3885acdce209132c Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Sun, 28 May 2006 19:49:07 +0000 Subject: [PATCH] Ethereal->Wireshark svn path=/trunk/; revision=18234 --- epan/addr_resolv.c | 2 +- epan/addr_resolv.h | 2 +- epan/address.h | 6 ++--- epan/dfilter/semcheck.c | 2 +- epan/dissectors/packet-ajp13.c | 4 ++-- epan/dissectors/packet-armagetronad.c | 2 +- epan/dissectors/packet-bssap.c | 6 ++--- epan/dissectors/packet-btrfcomm.c | 4 ++-- epan/dissectors/packet-catapult-dct2000.c | 4 ++-- epan/dissectors/packet-diameter.c | 10 ++++---- epan/dissectors/packet-gprs-llc.c | 6 ++--- epan/dissectors/packet-gsm_a.c | 2 +- epan/dissectors/packet-http.c | 2 +- epan/dissectors/packet-ieee80211.c | 10 ++++---- epan/dissectors/packet-ripng.h | 2 +- epan/dissectors/packet-smb-sidsnooping.c | 4 ++-- epan/dissectors/packet-xml.c | 2 +- epan/dtd.h | 2 +- epan/dtd_parse.h | 2 +- epan/emem.c | 6 ++--- epan/emem.h | 14 ++++++------ epan/exceptions.h | 14 ++++++------ epan/expert.h | 2 +- epan/filesystem.c | 28 +++++++++++------------ epan/filesystem.h | 4 ++-- epan/g_ascii_strtoull.h | 4 ++-- epan/plugins.c | 4 ++-- epan/prefs.c | 10 ++++---- epan/privileges.c | 2 +- epan/proto.c | 2 +- epan/proto.h | 8 +++---- epan/sigcomp-udvm.c | 2 +- epan/stats_tree.c | 4 ++-- epan/stats_tree.h | 2 +- epan/strutil.c | 2 +- epan/tap.c | 2 +- epan/xmlstub.c | 2 +- epan/xmlstub.h | 6 ++--- gtk/menu.c | 2 +- tools/checkhf.pl | 4 ++-- 40 files changed, 99 insertions(+), 99 deletions(-) diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index d79003eb5e..44c6f19ed8 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -737,7 +737,7 @@ static int parse_ether_line(char *line, ether_t *eth, unsigned int *mask, * See the ethers(4) or ethers(5) man page for ethers file format * (not available on all systems). * We allow both ethernet address separators (':' and '-'), - * as well as Ethereal's '.' separator. + * as well as Wireshark's '.' separator. */ gchar *cp; diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h index 54945b6154..859aa5d156 100644 --- a/epan/addr_resolv.h +++ b/epan/addr_resolv.h @@ -120,7 +120,7 @@ void get_addr_name_buf(address *addr, gchar *buf, guint size); extern void host_name_lookup_init(void); /* host_name_lookup_process does ADNS processing in GTK+ timeouts in Wireshark, - and before processing each packet in Tethereal, if we're using ADNS */ + and before processing each packet in Twireshark, if we're using ADNS */ extern gint host_name_lookup_process(gpointer data); /* host_name_lookup_cleanup cleans up an ADNS socket if we're using ADNS */ diff --git a/epan/address.h b/epan/address.h index 2e7c7a56ad..c9f54c69b0 100644 --- a/epan/address.h +++ b/epan/address.h @@ -26,7 +26,7 @@ #ifndef __ADDRESS_H__ #define __ADDRESS_H__ -/* Types of addresses Ethereal knows about. */ +/* Types of addresses Wireshark knows about. */ /* If a new address type is added here, a string representation procedure should */ /* also be included in address_to_str_buf defined in to_str.c, for presentation purposes */ @@ -105,7 +105,7 @@ typedef struct _address { (to)->data = COPY_ADDRESS_data; \ } -/* Types of port numbers Ethereal knows about. */ +/* Types of port numbers Wireshark knows about. */ typedef enum { PT_NONE, /* no port number */ PT_SCTP, /* SCTP */ @@ -121,7 +121,7 @@ typedef enum { PT_TIPC /* TIPC PORT */ } port_type; -/* Types of circuit IDs Ethereal knows about. */ +/* Types of circuit IDs Wireshark knows about. */ typedef enum { CT_NONE, /* no circuit type */ CT_DLCI, /* Frame Relay DLCI */ diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c index 9949f9f021..572bbc3e2b 100644 --- a/epan/dfilter/semcheck.c +++ b/epan/dfilter/semcheck.c @@ -1033,7 +1033,7 @@ check_test(stnode_t *st_node) #ifdef HAVE_LIBPCRE check_relation("matches", TRUE, ftype_can_matches, st_node, st_arg1, st_arg2); #else - dfilter_fail("This Ethereal version does not support the \"matches\" operation."); + dfilter_fail("This Wireshark version does not support the \"matches\" operation."); THROW(TypeError); #endif break; diff --git a/epan/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c index cbaa742be0..0f1ec4d39d 100644 --- a/epan/dissectors/packet-ajp13.c +++ b/epan/dissectors/packet-ajp13.c @@ -57,7 +57,7 @@ * state" that records context-sensitive stuff like "was there a * content-length in the previous request". During this first pass * through the data, the "tree" parameter might be null, or not. For - * the regular gui-based ethereal, it's null, which means we don't + * the regular gui-based Wireshark, it's null, which means we don't * actually display the dissected data in the gui quite yet. For the * text based interface, we might do the parsing and display both in * this first pass. @@ -100,7 +100,7 @@ * (0.9.4+) versions of wireshark provide the "tcp_dissect_pdus()" * function that takes care of much of the work. See the comments in * packet-tcp.c, the example code in packet-dns.c, or check the - * ethereal-dev archives for details. + * wireshark-dev archives for details. * * 3) Wireshark isn't guaranteed to see all the data. I'm a little * unclear on all the possible failure modes, but it comes down to: a) diff --git a/epan/dissectors/packet-armagetronad.c b/epan/dissectors/packet-armagetronad.c index e50c40248c..cdbe75c5eb 100644 --- a/epan/dissectors/packet-armagetronad.c +++ b/epan/dissectors/packet-armagetronad.c @@ -152,7 +152,7 @@ add_message_data(tvbuff_t * tvb, gint offset, guint16 data_len, for (ptr = data; ptr != end; ptr++) { /* * There must be a better way to tell - * Ethereal not to stop on null bytes + * Wireshark not to stop on null bytes * as the length is known */ gchar *bptr = (gchar *) ptr; diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c index ecbc604494..880b9722d9 100644 --- a/epan/dissectors/packet-bssap.c +++ b/epan/dissectors/packet-bssap.c @@ -12,8 +12,8 @@ * * $Id$ * - * Ethereal - Network traffic analyzer - * By Gerald Combs + * Wireshark - Network traffic analyzer + * By Gerald Combs * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or @@ -2149,7 +2149,7 @@ dissect_bssap_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return(TRUE); } -/* Register the protocol with Ethereal */ +/* Register the protocol with Wireshark */ void proto_register_bssap(void) { diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index d819549a46..8448d51c45 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -21,8 +21,8 @@ * * $Id$ * - * Ethereal - Network traffic analyzer - * By Gerald Combs + * Wireshark - Network traffic analyzer + * By Gerald Combs * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 0879b17a86..2026dbfc60 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -420,11 +420,11 @@ void proto_register_catapult_dct2000(void) /* Determines whether for not-handled protocols we should try to parse it if: - it looks like its embedded in an ipprim message, AND - - the DCT2000 protocol name matches an ethereal dissector name */ + - the DCT2000 protocol name matches an wireshark dissector name */ prefs_register_bool_preference(catapult_dct2000_module, "ipprim_heuristic", "Use IP Primitive heuristic", "If a payload looks like its embedded in an " - "IP primitive messages, and there is an ethereal " + "IP primitive messages, and there is an wireshark " "dissector matching the DCT2000 protocol name, " "try parsing the payload using that dissector", &catapult_dct2000_try_ipprim_heuristic); diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index 8ed075529a..9b1d6b9cfc 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -317,20 +317,20 @@ static gchar *diameter_vendor_to_str(guint32 vendorId, gboolean longName); */ static xmlDocPtr xmlParseFilePush( const char *filename, int checkValid -#ifndef ETHEREAL_XML_DO_VALIDITY_CHECKING +#ifndef WIRESHARK_XML_DO_VALIDITY_CHECKING _U_ #endif ) { FILE *f; xmlDocPtr doc=NULL; -#ifdef ETHEREAL_XML_DO_VALIDITY_CHECKING +#ifdef WIRESHARK_XML_DO_VALIDITY_CHECKING int valid=0; #endif int res, size = 1024; char chars[1024]; xmlParserCtxtPtr ctxt; -#ifdef ETHEREAL_XML_DO_VALIDITY_CHECKING +#ifdef WIRESHARK_XML_DO_VALIDITY_CHECKING /* I wonder what kind of a performance hit this is? */ *XmlStub.xmlDoValidityCheckingDefaultValue = checkValid; #endif @@ -350,14 +350,14 @@ xmlParseFilePush( const char *filename, int checkValid } XmlStub.xmlParseChunk(ctxt, chars, 0, 1); doc = ctxt->myDoc; -#ifdef ETHEREAL_XML_DO_VALIDITY_CHECKING +#ifdef WIRESHARK_XML_DO_VALIDITY_CHECKING valid=ctxt->valid; #endif XmlStub.xmlFreeParserCtxt(ctxt); } fclose(f); -#ifdef ETHEREAL_XML_DO_VALIDITY_CHECKING +#ifdef WIRESHARK_XML_DO_VALIDITY_CHECKING /* Check valid */ if (!valid) { report_failure( "Error! Invalid xml in %s! Failed DTD check!", diff --git a/epan/dissectors/packet-gprs-llc.c b/epan/dissectors/packet-gprs-llc.c index ba3083d314..9c66af4a30 100644 --- a/epan/dissectors/packet-gprs-llc.c +++ b/epan/dissectors/packet-gprs-llc.c @@ -4,8 +4,8 @@ * * $Id$ * - * Ethereal - Network traffic analyzer - * By Gerald Combs + * Wireshark - Network traffic analyzer + * By Gerald Combs * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or @@ -1164,7 +1164,7 @@ dissect_llcgprs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } -/* Register the protocol with Ethereal */ +/* Register the protocol with Wireshark */ /* this format is require because a script is used to build the C function */ /* that calls all the protocol registration. */ diff --git a/epan/dissectors/packet-gsm_a.c b/epan/dissectors/packet-gsm_a.c index d4dfcda066..f6768fdebb 100644 --- a/epan/dissectors/packet-gsm_a.c +++ b/epan/dissectors/packet-gsm_a.c @@ -18439,7 +18439,7 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } -/* Register the protocol with Ethereal */ +/* Register the protocol with Wireshark */ void proto_register_gsm_a(void) { diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 5167f986c9..c49cf2a913 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -1342,7 +1342,7 @@ chunked_encoding_dissector(tvbuff_t **tvb_ptr, packet_info *pinfo, if (chunk_size > 0) { /* * XXX - just use "proto_tree_add_text()"? - * This means that, in Tethereal, you get + * This means that, in Twireshark, you get * the entire chunk dumped out in hex, * in addition to whatever dissection is * done on the reassembled data. diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index ea129e26c6..cd4a1fe3af 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -101,9 +101,9 @@ static int weak_iv(guchar *iv); /* When this is set, an unlimited number of WEP keys can be set in the environment: - ETHEREAL_WEPKEYNUM=## - ETHEREAL_WEPKEY1=aa:bb:cc:dd:... - ETHEREAL_WEPKEY2=aa:bab:cc:dd:ee:... + WIRESHARK_WEPKEYNUM=## + WIRESHARK_WEPKEY1=aa:bb:cc:dd:... + WIRESHARK_WEPKEY2=aa:bab:cc:dd:ee:... ... you get the idea. @@ -4337,7 +4337,7 @@ static void init_wepkeys(void) { #ifdef USE_ENV guint8 *buf; - tmp = getenv("ETHEREAL_WEPKEYNUM"); + tmp = getenv("WIRESHARK_WEPKEYNUM"); if (!tmp) { num_wepkeys = 0; return; @@ -4367,7 +4367,7 @@ static void init_wepkeys(void) { #ifdef USE_ENV buf=ep_alloc(128); - g_snprintf(buf, 128, "ETHEREAL_WEPKEY%d", i+1); + g_snprintf(buf, 128, "WIRESHARK_WEPKEY%d", i+1); tmp = getenv(buf); #else tmp = wep_keystr[i]; diff --git a/epan/dissectors/packet-ripng.h b/epan/dissectors/packet-ripng.h index 5fd2225bd8..cb028017bf 100644 --- a/epan/dissectors/packet-ripng.h +++ b/epan/dissectors/packet-ripng.h @@ -5,7 +5,7 @@ * $Id$ * * Wireshark - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or diff --git a/epan/dissectors/packet-smb-sidsnooping.c b/epan/dissectors/packet-smb-sidsnooping.c index 49386bc6ee..ed0ccaae65 100644 --- a/epan/dissectors/packet-smb-sidsnooping.c +++ b/epan/dissectors/packet-smb-sidsnooping.c @@ -404,7 +404,7 @@ sid_snooping_init(void) if(error_string){ /* error, we failed to attach to the tap. clean up */ - fprintf(stderr, "tethereal: Couldn't register proto_reg_handoff_smb_sidsnooping()/lsa_policy_information tap: %s\n", + fprintf(stderr, "twireshark: Couldn't register proto_reg_handoff_smb_sidsnooping()/lsa_policy_information tap: %s\n", error_string->str); g_string_free(error_string, TRUE); exit(1); @@ -415,7 +415,7 @@ sid_snooping_init(void) if(error_string){ /* error, we failed to attach to the tap. clean up */ - fprintf(stderr, "tethereal: Couldn't register proto_reg_handoff_smb_sidsnooping()/samr_query_dispinfo tap: %s\n", + fprintf(stderr, "twireshark: Couldn't register proto_reg_handoff_smb_sidsnooping()/samr_query_dispinfo tap: %s\n", error_string->str); g_string_free(error_string, TRUE); exit(1); diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c index c7a515398d..88e97822c1 100644 --- a/epan/dissectors/packet-xml.c +++ b/epan/dissectors/packet-xml.c @@ -1,5 +1,5 @@ /* packet-xml.c - * ethereal's xml dissector . + * wireshark's xml dissector . * * (C) 2005, Luis E. Garcia Ontanon. * diff --git a/epan/dtd.h b/epan/dtd.h index 57e239ba70..0003ba1ba2 100644 --- a/epan/dtd.h +++ b/epan/dtd.h @@ -1,7 +1,7 @@ /* * dtd.h * - * XML dissector for ethereal + * XML dissector for Wireshark * DTD import declarations * * Copyright 2005, Luis E. Garcia Ontanon diff --git a/epan/dtd_parse.h b/epan/dtd_parse.h index 672272e884..f56caac21c 100644 --- a/epan/dtd_parse.h +++ b/epan/dtd_parse.h @@ -1,5 +1,5 @@ /* dtd_parse.h -* an XML dissector for ethereal +* an XML dissector for Wireshark * header file to declare functions defined in lexer and used in parser, * or vice versa * diff --git a/epan/emem.c b/epan/emem.c index f2ffa9adbb..0cf3501d31 100644 --- a/epan/emem.c +++ b/epan/emem.c @@ -1,5 +1,5 @@ /* emem.c - * Ethereal memory management and garbage collection functions + * Wireshark memory management and garbage collection functions * Ronnie Sahlberg 2005 * * $Id$ @@ -185,7 +185,7 @@ emem_canary_pad (size_t allocation) { /* Initialize the packet-lifetime memory allocation pool. - * This function should be called only once when Ethereal or Tethereal starts + * This function should be called only once when Wireshark or Twireshark starts * up. */ void @@ -223,7 +223,7 @@ ep_init_chunk(void) } /* Initialize the capture-lifetime memory allocation pool. - * This function should be called only once when Ethereal or Tethereal starts + * This function should be called only once when Wireshark or Twireshark starts * up. */ void diff --git a/epan/emem.h b/epan/emem.h index c4c2f90e53..a62eb5a9ec 100644 --- a/epan/emem.h +++ b/epan/emem.h @@ -1,5 +1,5 @@ /* emem.h - * Definitions for ethereal memory management and garbage collection + * Definitions for Wireshark memory management and garbage collection * Ronnie Sahlberg 2005 * * $Id$ @@ -31,8 +31,8 @@ /* Functions for handling memory allocation and garbage collection with * a packet lifetime scope. * These functions are used to allocate memory that will only remain persistent - * until ethereal starts dissecting the next packet in the list. - * Everytime ethereal starts decoding the next packet all memory allocated + * until Wireshark starts dissecting the next packet in the list. + * Everytime Wireshark starts decoding the next packet all memory allocated * through these functions will be released back to the free pool. * * These functions are very fast and offer automatic garbage collection: @@ -40,7 +40,7 @@ * the previous packet is freed. */ /* Initialize packet-lifetime memory allocation pool. This function is called - * once when [t]ethereal is initialized to set up the required structures. + * once when [t]Wireshark is initialized to set up the required structures. */ void ep_init_chunk(void); @@ -116,15 +116,15 @@ void* ep_stack_pop(ep_stack_t stack); /* Functions for handling memory allocation and garbage collection with * a capture lifetime scope. * These functions are used to allocate memory that will only remain persistent - * until ethereal opens a new capture or capture file. - * Everytime ethereal starts a new capture or opens a new capture file + * until Wireshark opens a new capture or capture file. + * Everytime Wireshark starts a new capture or opens a new capture file * all the data allocated through these functions will be released back * to the free pool. * * These functions are very fast and offer automatic garbage collection. */ /* Initialize capture-lifetime memory allocation pool. This function is called - * once when [t]ethereal is initialized to set up the required structures. + * once when [t]Wireshark is initialized to set up the required structures. */ void se_init_chunk(void); diff --git a/epan/exceptions.h b/epan/exceptions.h index 92cf9a7ced..b087f01a7e 100644 --- a/epan/exceptions.h +++ b/epan/exceptions.h @@ -5,10 +5,10 @@ #include "except.h" #endif -/* Ethereal has only one exception group, to make these macros simple */ -#define XCEPT_GROUP_ETHEREAL 1 +/* Wireshark has only one exception group, to make these macros simple */ +#define XCEPT_GROUP_WIRESHARK 1 -/* Ethereal's exceptions */ +/* Wireshark's exceptions */ /** Index is out of range. @@ -170,7 +170,7 @@ except_t *exc; \ volatile int except_state = 0; \ static const except_id_t catch_spec[] = { \ - { XCEPT_GROUP_ETHEREAL, XCEPT_CODE_ANY } }; \ + { XCEPT_GROUP_WIRESHARK, XCEPT_CODE_ANY } }; \ except_try_push(catch_spec, 1, &exc); \ \ if(except_state & EXCEPT_CAUGHT) \ @@ -213,10 +213,10 @@ /* user's code goes here */ #define THROW(x) \ - except_throw(XCEPT_GROUP_ETHEREAL, (x), NULL) + except_throw(XCEPT_GROUP_WIRESHARK, (x), NULL) #define THROW_MESSAGE(x, y) \ - except_throw(XCEPT_GROUP_ETHEREAL, (x), (y)) + except_throw(XCEPT_GROUP_WIRESHARK, (x), (y)) #define GET_MESSAGE except_message(exc) @@ -243,7 +243,7 @@ /* Register cleanup functions in case an exception is thrown and not caught. * From the Kazlib documentation, with modifications for use with the - * Ethereal-specific macros: + * Wireshark-specific macros: * * CLEANUP_PUSH(func, arg) * diff --git a/epan/expert.h b/epan/expert.h index 2a3a7e8f56..e1f3ea80f2 100644 --- a/epan/expert.h +++ b/epan/expert.h @@ -1,7 +1,7 @@ /* expert.h * Collecting of Expert information. * - * For further info, see: http://wiki.ethereal.com/Development/ExpertInfo + * For further info, see: http://wiki.wireshark.org/Development/ExpertInfo * * $Id$ * diff --git a/epan/filesystem.c b/epan/filesystem.c index 711f4aadf6..bbae20e630 100644 --- a/epan/filesystem.c +++ b/epan/filesystem.c @@ -248,7 +248,7 @@ init_progfile_dir(const char *arg0 * marks the end of the directory pathname. * * XXX - Can the pathname be something such as - * "C:ethereal.exe"? Or is it always a full pathname + * "C:wireshark.exe"? Or is it always a full pathname * beginning with "\" after the drive letter? */ dir_end = strrchr(prog_pathname, '\\'); @@ -479,7 +479,7 @@ get_progfile_dir(void) * stored. * * XXX - if we ever make libethereal a real library, used by multiple - * applications (more than just Tethereal and versions of Wireshark with + * applications (more than just Twireshark and versions of Wireshark with * various UIs), should the configuration files belong to the library * (and be shared by all those applications) or to the applications? * @@ -510,7 +510,7 @@ get_datafile_dir(void) * default. * * XXX - does NSIS put the installation directory into - * "\HKEY_LOCAL_MACHINE\SOFTWARE\Ethereal\InstallDir"? + * "\HKEY_LOCAL_MACHINE\SOFTWARE\Wireshark\InstallDir"? * If so, perhaps we should read that from the registry, * instead. */ @@ -521,7 +521,7 @@ get_datafile_dir(void) * No, we don't. * Fall back on the default installation directory. */ - return "C:\\Program Files\\Ethereal\\"; + return "C:\\Program Files\\Wireshark\\"; #else /* * Just use DATAFILE_DIR, as that's what the configure script @@ -552,13 +552,13 @@ get_systemfile_dir(void) * personal configuration files are stored. */ #ifdef _WIN32 -#define PF_DIR "Ethereal" +#define PF_DIR "Wireshark" #else /* * XXX - should this be ".libepan"? For backwards-compatibility, I'll keep - * it ".ethereal" for now. + * it ".wireshark" for now. */ -#define PF_DIR ".ethereal" +#define PF_DIR ".wireshark" #endif #ifdef WIN32 @@ -608,8 +608,8 @@ char *getenv_utf8(const char *varname) /* * Get the directory in which personal configuration files reside; - * in UNIX-compatible systems, it's ".ethereal", under the user's home - * directory, and on Windows systems, it's "Ethereal", under %APPDATA% + * in UNIX-compatible systems, it's ".wireshark", under the user's home + * directory, and on Windows systems, it's "Wireshark", under %APPDATA% * or, if %APPDATA% isn't set, it's "%USERPROFILE%\Application Data" * (which is what %APPDATA% normally is on Windows 2000). */ @@ -635,13 +635,13 @@ get_persconffile_dir(void) * stored in the user profile, rather than in the home directory. * The Windows convention is to store configuration information * in the user profile, and doing so means you can use - * Ethereal even if the home directory is an inaccessible + * Wireshark even if the home directory is an inaccessible * network drive. */ appdatadir = getenv_utf8("APPDATA"); if (appdatadir != NULL) { /* - * Concatenate %APPDATA% with "\Ethereal". + * Concatenate %APPDATA% with "\Wireshark". */ pf_dir = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", appdatadir, PF_DIR); @@ -819,7 +819,7 @@ get_home_dir(void) * file name. * * On Win32, if "for_writing" is FALSE, we check whether the file exists - * and, if not, construct a path name relative to the ".ethereal" + * and, if not, construct a path name relative to the ".wireshark" * subdirectory of the user's home directory, and check whether that * exists; if it does, we return that, so that configuration files * from earlier versions can be read. @@ -844,11 +844,11 @@ get_persconffile_path(const char *filename, gboolean for_writing if (eth_stat(path, &s_buf) != 0 && errno == ENOENT) { /* * OK, it's not in the personal configuration file - * directory; is it in the ".ethereal" subdirectory + * directory; is it in the ".wireshark" subdirectory * of their home directory? */ old_path = g_strdup_printf( - "%s" G_DIR_SEPARATOR_S ".ethereal" G_DIR_SEPARATOR_S "%s", + "%s" G_DIR_SEPARATOR_S ".wireshark" G_DIR_SEPARATOR_S "%s", get_home_dir(), filename); if (eth_stat(old_path, &s_buf) == 0) { /* diff --git a/epan/filesystem.h b/epan/filesystem.h index 9a59a58e20..8458b13bc2 100644 --- a/epan/filesystem.h +++ b/epan/filesystem.h @@ -90,7 +90,7 @@ extern char *get_datafile_path(const char *filename); /* * Get the directory in which files that, at least on UNIX, are * system files (such as "/etc/ethers") are stored; on Windows, - * there's no "/etc" directory, so we get them from the Ethereal + * there's no "/etc" directory, so we get them from the Wireshark * global configuration and data file directory. */ extern const char *get_systemfile_dir(void); @@ -109,7 +109,7 @@ extern int create_persconffile_dir(char **pf_dir_path_return); * file name. * * On Win32, if "for_writing" is FALSE, we check whether the file exists - * and, if not, construct a path name relative to the ".ethereal" + * and, if not, construct a path name relative to the ".wireshark" * subdirectory of the user's home directory, and check whether that * exists; if it does, we return that, so that configuration files * from earlier versions can be read. diff --git a/epan/g_ascii_strtoull.h b/epan/g_ascii_strtoull.h index dc24df0936..0b9c890913 100644 --- a/epan/g_ascii_strtoull.h +++ b/epan/g_ascii_strtoull.h @@ -5,8 +5,8 @@ * that don't have it (e.g., GLib 1.2[.x]). */ -#ifndef __ETHEREAL_G_ASCII_STRTOULL_H__ -#define __ETHEREAL_G_ASCII_STRTOULL_H__ +#ifndef __WIRESHARK_G_ASCII_STRTOULL_H__ +#define __WIRESHARK_G_ASCII_STRTOULL_H__ extern guint64 g_ascii_strtoull (const gchar *nptr, gchar **endptr, diff --git a/epan/plugins.c b/epan/plugins.c index 9680c1fd1c..a690422ff8 100644 --- a/epan/plugins.c +++ b/epan/plugins.c @@ -283,7 +283,7 @@ plugins_scan_dir(const char *dirname) /* * It's just an unsupported old-style plugin; */ - report_failure("The plugin %s has an old plugin init routine. Support has been dropped.\n Information on how to update your plugin is available at \nhttp://anonsvn.ethereal.com/ethereal/trunk/doc/README.plugins", + report_failure("The plugin %s has an old plugin init routine. Support has been dropped.\n Information on how to update your plugin is available at \nhttp://anonsvn.wireshark.com/wireshark/trunk/doc/README.plugins", name); g_module_close(handle); continue; @@ -378,7 +378,7 @@ char *get_plugins_global_dir(const char *plugin_dir) */ g_free(install_plugin_dir); install_plugin_dir = - g_strdup("C:\\Program Files\\Ethereal\\plugins\\" VERSION); + g_strdup("C:\\Program Files\\Wireshark\\plugins\\" VERSION); } return install_plugin_dir; diff --git a/epan/prefs.c b/epan/prefs.c index 4edd127376..0257601957 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -62,7 +62,7 @@ static void clear_string_list(GList *); static void free_col_info(e_prefs *); #define PF_NAME "preferences" -#define OLD_GPF_NAME "ethereal.conf" /* old name for global preferences file */ +#define OLD_GPF_NAME "wireshark.conf" /* old name for global preferences file */ static gboolean prefs_initialized = FALSE; static gchar *gpf_path = NULL; @@ -893,7 +893,7 @@ find_index_from_string_array(char *needle, const char **haystack, int default_va # This is a comment line print.command: lpr print.file: /a/very/long/path/ - to/ethereal-out.ps + to/wireshark-out.ps * */ @@ -916,7 +916,7 @@ init_prefs(void) { prefs.pr_format = PR_FMT_TEXT; prefs.pr_dest = PR_DEST_CMD; - prefs.pr_file = g_strdup("ethereal.out"); + prefs.pr_file = g_strdup("wireshark.out"); prefs.pr_cmd = g_strdup("lpr"); prefs.col_list = NULL; for (i = 0; i < DEF_NUM_COLS; i++) { @@ -981,7 +981,7 @@ init_prefs(void) { * * 2) if you use a font set, the text to be drawn must be a * multi-byte string in the appropriate locale, but - * Ethereal does *NOT* guarantee that's the case - in + * Wireshark does *NOT* guarantee that's the case - in * the hex-dump window, each character in the text portion * of the display must be a *single* byte, and in the * packet-list and protocol-tree windows, text extracted @@ -2250,7 +2250,7 @@ write_prefs(char **pf_path_return) fputs("# Configuration file for Wireshark " VERSION ".\n" "#\n" "# This file is regenerated each time preferences are saved within\n" - "# Ethereal. Making manual changes should be safe, however.\n", pf); + "# Wireshark. Making manual changes should be safe, however.\n", pf); fprintf (pf, "\n######## User Interface ########\n"); diff --git a/epan/privileges.c b/epan/privileges.c index 857a99cd82..bc5f19a938 100644 --- a/epan/privileges.c +++ b/epan/privileges.c @@ -45,7 +45,7 @@ get_credential_info(void) * For now, we say the program wasn't started with special privileges. * There are ways of running programs with credentials other than those * for the session in which it's run, but I don't know whether that'd be - * done with Ethereal/Tethereal or not. + * done with Wireshark/Twireshark or not. */ gboolean started_with_special_privs(void) diff --git a/epan/proto.c b/epan/proto.c index 1fe74913eb..b903d143a9 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -2840,7 +2840,7 @@ get_hfi_and_length(int hfindex, tvbuff_t *tvb, gint start, gint *length, * above) or goes past the end of the tvbuff, * cut it short at the end of the tvbuff. * That way, if this field is selected in - * Ethereal, we don't highlight stuff past + * Wireshark, we don't highlight stuff past * the end of the data. */ /* XXX - what to do, if we don't have a tvb? */ diff --git a/epan/proto.h b/epan/proto.h index 3fef7b00bf..86e07eba32 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -87,13 +87,13 @@ typedef struct _protocol protocol_t; * If that string is dynamically allocated, it should be allocated with * ep_alloc(); using ep_strdup_printf() would work. * - * If the ETHEREAL_ABORT_ON_DISSECTOR_BUG environment variable is set, + * If the WIRESHARK_ABORT_ON_DISSECTOR_BUG environment variable is set, * it will call abort(), instead, to make it easier to get a stack trace. * * @param message string to use as the message */ #define REPORT_DISSECTOR_BUG(message) \ - ((getenv("ETHEREAL_ABORT_ON_DISSECTOR_BUG") != NULL) ? \ + ((getenv("WIRESHARK_ABORT_ON_DISSECTOR_BUG") != NULL) ? \ abort() : \ THROW_MESSAGE(DissectorError, message)) @@ -272,7 +272,7 @@ typedef proto_node proto_item; /** The protocol field indicates a security probem (e.g. unsecure implementation) */ /*#define PI_SECURITY 0x8000*/ -/* add more, see http://wiki.ethereal.com/Development/ExpertInfo */ +/* add more, see http://wiki.wireshark.org/Development/ExpertInfo */ /** is this protocol field hidden from the protocol tree display (used for filtering only)? */ @@ -320,7 +320,7 @@ extern void proto_cleanup(void); you will still need to call any subdissector with the original value of tree or filtering will break. - The purpose of this is to optimize ethereal for speed and make it + The purpose of this is to optimize wireshark for speed and make it faster for when filters are being used. */ extern gboolean proto_field_is_referenced(proto_tree *tree, int proto_id); diff --git a/epan/sigcomp-udvm.c b/epan/sigcomp-udvm.c index 9a12759408..12d87a1cb9 100644 --- a/epan/sigcomp-udvm.c +++ b/epan/sigcomp-udvm.c @@ -348,7 +348,7 @@ execute_next_instruction: proto_tree_add_text(udvm_tree, bytecode_tvb, 0, -1, "Addr: %u ## DECOMPRESSION-FAILURE(0)", current_address); - proto_tree_add_text(udvm_tree, bytecode_tvb, 0, -1,"Ethereal UDVM diagnostic: %s.", + proto_tree_add_text(udvm_tree, bytecode_tvb, 0, -1,"Wireshark UDVM diagnostic: %s.", val_to_str(result_code, result_code_vals,"Unknown (%u)")); if ( output_address > 0 ){ /* At least something got decompressed, show it */ diff --git a/epan/stats_tree.c b/epan/stats_tree.c index abd4202a98..c0dfe3863d 100644 --- a/epan/stats_tree.c +++ b/epan/stats_tree.c @@ -1,5 +1,5 @@ /* stats_tree.c - * API for a counter tree for ethereal + * API for a counter tree for Wireshark * 2004, Luis E. G. Ontanon * * $Id$ @@ -510,7 +510,7 @@ extern int stats_tree_manip_node(manip_node_mode mode, stats_tree* st, const gui extern guint8* stats_tree_get_abbr(const guint8* optarg) { guint i; - /* XXX: this fails when tethereal is given any options + /* XXX: this fails when twireshark is given any options after the -z */ g_assert(optarg != NULL); diff --git a/epan/stats_tree.h b/epan/stats_tree.h index e1b005aa13..c48751badb 100644 --- a/epan/stats_tree.h +++ b/epan/stats_tree.h @@ -1,5 +1,5 @@ /* stats_tree.h - * A counter tree API for ethereal dissectors + * A counter tree API for Wireshark dissectors * 2005, Luis E. G. Ontanon * * $Id$ diff --git a/epan/strutil.c b/epan/strutil.c index f36d48071b..6707d710c2 100644 --- a/epan/strutil.c +++ b/epan/strutil.c @@ -143,7 +143,7 @@ get_token_len(const guchar *linep, const guchar *lineend, /* * XXX - "isprint()" can return "true" for non-ASCII characters, but * those don't work with GTK+ 1.3 or later, as they take UTF-8 strings - * as input. Until we fix up Ethereal to properly handle non-ASCII + * as input. Until we fix up Wireshark to properly handle non-ASCII * characters in all output (both GUI displays and text printouts) * in those versions of GTK+, we work around the problem by escaping * all characters that aren't printable ASCII. diff --git a/epan/tap.c b/epan/tap.c index 7ff4cd4c71..7622b7db5a 100644 --- a/epan/tap.c +++ b/epan/tap.c @@ -334,7 +334,7 @@ draw_tap_listeners(gboolean draw_all) /* ********************************************************************** * Functions used by tap to * 1, register that a really simple extension is available for use by - * ethereal. + * Wireshark. * 2, start tapping from a subdissector * 3, close an already open tap * ********************************************************************** */ diff --git a/epan/xmlstub.c b/epan/xmlstub.c index b0b8aa3f0d..9c2b8f2004 100644 --- a/epan/xmlstub.c +++ b/epan/xmlstub.c @@ -145,7 +145,7 @@ loadLibXML(void) } XmlStub.xmlSubstituteEntitiesDefault=(int(*)(int))symbol; -#ifdef ETHEREAL_XML_DO_VALIDITY_CHECKING +#ifdef WIRESHARK_XML_DO_VALIDITY_CHECKING if (!g_module_symbol(handle, "xmlDoValidityCheckingDefaultValue", &symbol)) { g_warning("Unable to find \"xmlDoValidityCheckingDefaultValue\""); error=TRUE; diff --git a/epan/xmlstub.h b/epan/xmlstub.h index ea9ac44968..6d8715c338 100644 --- a/epan/xmlstub.h +++ b/epan/xmlstub.h @@ -8,13 +8,13 @@ #include "config.h" -/****************** specific to ethereal ********************************/ +/****************** specific to wireshark ********************************/ /* * Uncomment the following line to restore XML_DO_VALIDITY_CHECKING * behavior which is causing issues on WIN32 platforms. See: * http://www.ethereal.com/lists/ethereal-dev/200410/msg00194.html */ -/* #define ETHEREAL_XML_DO_VALIDITY_CHECKING */ +/* #define WIRESHARK_XML_DO_VALIDITY_CHECKING */ /****************** From xml headers ************************************/ /* @@ -1095,7 +1095,7 @@ typedef struct { char *(*xmlGetProp)(xmlNodePtr, char *); int (*xmlKeepBlanksDefault)(int); int (*xmlSubstituteEntitiesDefault)(int); -#ifdef ETHEREAL_XML_DO_VALIDITY_CHECKING +#ifdef WIRESHARK_XML_DO_VALIDITY_CHECKING int *xmlDoValidityCheckingDefaultValue; #endif } XML_STUB; diff --git a/gtk/menu.c b/gtk/menu.c index 78827e63cd..a7604ea0f8 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -396,7 +396,7 @@ static GtkItemFactoryEntry menu_items[] = #endif ITEM_FACTORY_ENTRY("/Help/Manual Pages", NULL, NULL, 0, "", NULL), ITEM_FACTORY_ENTRY("/Help/Manual Pages/Wireshark", NULL, topic_menu_cb, LOCALPAGE_MAN_WIRESHARK, NULL, NULL), - ITEM_FACTORY_ENTRY("/Help/Manual Pages/Ethereal Filter", NULL, topic_menu_cb, LOCALPAGE_MAN_WIRESHARK_FILTER, NULL, NULL), + ITEM_FACTORY_ENTRY("/Help/Manual Pages/Wireshark Filter", NULL, topic_menu_cb, LOCALPAGE_MAN_WIRESHARK_FILTER, NULL, NULL), ITEM_FACTORY_ENTRY("/Help/Manual Pages/", NULL, NULL, 0, "", NULL), ITEM_FACTORY_ENTRY("/Help/Manual Pages/Twireshark", NULL, topic_menu_cb, LOCALPAGE_MAN_TWIRESHARK, NULL, NULL), ITEM_FACTORY_ENTRY("/Help/Manual Pages/Dumpcap", NULL, topic_menu_cb, LOCALPAGE_MAN_DUMPCAP, NULL, NULL), diff --git a/tools/checkhf.pl b/tools/checkhf.pl index edb1442f7c..da169edbf9 100755 --- a/tools/checkhf.pl +++ b/tools/checkhf.pl @@ -36,7 +36,7 @@ my $debug = 0; # # Example: -# ~/work/ethereal/trunk/epan/dissectors> ../../tools/checkhf.pl packet-afs.c +# ~/work/wireshark/trunk/epan/dissectors> ../../tools/checkhf.pl packet-afs.c # Unused entry: packet-afs.c, hf_afs_ubik_voteend # Unused entry: packet-afs.c, hf_afs_ubik_errcode # Unused entry: packet-afs.c, hf_afs_ubik_votetype @@ -47,7 +47,7 @@ my $debug = 0; # NOTE: This tool currently generates false positives! # # The "NO ARRAY" messages - if accurate - point to an error that will -# cause (t)ethereal to terminate with an assertion when a packet containing +# cause (t)(wire)shark to terminate with an assertion when a packet containing # this particular element is being dissected. # # The "Unused entry" message indicates the opposite: