aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
Diffstat (limited to 'epan')
-rw-r--r--epan/Makefile.am4
-rw-r--r--epan/Makefile.common4
-rw-r--r--epan/addr_and_mask.c4
-rw-r--r--epan/addr_and_mask.h4
-rw-r--r--epan/addr_resolv.c4
-rw-r--r--epan/addr_resolv.h4
-rw-r--r--epan/address.h4
-rw-r--r--epan/adler32.c4
-rw-r--r--epan/adler32.h4
-rw-r--r--epan/afn.c4
-rw-r--r--epan/afn.h4
-rw-r--r--epan/aftypes.h4
-rw-r--r--epan/arcnet_pids.h4
-rw-r--r--epan/arptypes.h4
-rw-r--r--epan/asn1.c4
-rw-r--r--epan/asn1.h4
-rw-r--r--epan/base64.c4
-rw-r--r--epan/base64.h4
-rw-r--r--epan/bitswap.c2
-rw-r--r--epan/bitswap.h2
-rw-r--r--epan/bridged_pids.h4
-rw-r--r--epan/charsets.c4
-rw-r--r--epan/charsets.h4
-rw-r--r--epan/chdlctypes.h4
-rw-r--r--epan/circuit.c4
-rw-r--r--epan/circuit.h4
-rw-r--r--epan/column-utils.c4
-rw-r--r--epan/column-utils.h4
-rw-r--r--epan/column.c4
-rw-r--r--epan/column.h4
-rw-r--r--epan/column_info.h4
-rw-r--r--epan/conversation.c4
-rw-r--r--epan/conversation.h4
-rw-r--r--epan/crc16.c2
-rw-r--r--epan/crc16.h2
-rw-r--r--epan/crc32.c4
-rw-r--r--epan/crc32.h4
-rw-r--r--epan/dfilter/Makefile.am2
-rw-r--r--epan/dfilter/dfilter-int.h4
-rw-r--r--epan/dfilter/dfilter.c4
-rw-r--r--epan/dfilter/dfilter.h4
-rw-r--r--epan/dfilter/dfunctions.c2
-rw-r--r--epan/dfilter/dfunctions.h2
-rw-r--r--epan/dfilter/dfvm.c4
-rw-r--r--epan/dfilter/dfvm.h4
-rw-r--r--epan/dfilter/drange.c2
-rw-r--r--epan/dfilter/drange.h2
-rw-r--r--epan/dfilter/gencode.c4
-rw-r--r--epan/dfilter/scanner.l4
-rw-r--r--epan/dfilter/semcheck.c4
-rw-r--r--epan/dfilter/semcheck.h2
-rw-r--r--epan/dfilter/sttype-function.c2
-rw-r--r--epan/dfilter/sttype-function.h2
-rw-r--r--epan/dfilter/sttype-integer.c2
-rw-r--r--epan/dfilter/sttype-pointer.c2
-rw-r--r--epan/dfilter/sttype-range.c4
-rw-r--r--epan/dfilter/sttype-range.h2
-rw-r--r--epan/dfilter/sttype-string.c2
-rw-r--r--epan/dfilter/sttype-test.c2
-rw-r--r--epan/dfilter/sttype-test.h2
-rw-r--r--epan/dfilter/syntax-tree.c4
-rw-r--r--epan/dfilter/syntax-tree.h4
-rw-r--r--epan/dissectors/Makefile.am4
-rw-r--r--epan/dissectors/Makefile.common4
-rw-r--r--epan/dissectors/dcerpc/budb/template.c4
-rw-r--r--epan/dissectors/dcerpc/budb/template.h4
-rw-r--r--epan/dissectors/dcerpc/butc/template.c4
-rw-r--r--epan/dissectors/dcerpc/butc/template.h4
-rw-r--r--epan/dissectors/dcerpc/drsuapi/template.c4
-rw-r--r--epan/dissectors/dcerpc/drsuapi/template.h4
-rw-r--r--epan/dissectors/dcerpc/efs/template.c4
-rw-r--r--epan/dissectors/dcerpc/efs/template.h4
-rw-r--r--epan/dissectors/packet-ncp2222.inc4
-rw-r--r--epan/dissectors/process-x11-fields.pl4
-rw-r--r--epan/dissectors/x11-fields4
-rw-r--r--epan/dtd.h4
-rw-r--r--epan/dtd_grammar.lemon4
-rw-r--r--epan/dtd_parse.h4
-rw-r--r--epan/dtd_parse.l4
-rw-r--r--epan/dtd_preparse.l4
-rw-r--r--epan/emem.c4
-rw-r--r--epan/emem.h4
-rw-r--r--epan/epan.c2
-rw-r--r--epan/epan.h4
-rw-r--r--epan/epan_dissect.h4
-rw-r--r--epan/etypes.h4
-rw-r--r--epan/ex-opt.c4
-rw-r--r--epan/ex-opt.h4
-rw-r--r--epan/expert.c4
-rw-r--r--epan/expert.h4
-rw-r--r--epan/filesystem.c6
-rw-r--r--epan/filesystem.h4
-rw-r--r--epan/follow.c4
-rw-r--r--epan/follow.h6
-rw-r--r--epan/frame_data.c2
-rw-r--r--epan/frame_data.h4
-rw-r--r--epan/ftypes/Makefile.am2
-rw-r--r--epan/ftypes/ftype-bytes.c4
-rw-r--r--epan/ftypes/ftype-double.c4
-rw-r--r--epan/ftypes/ftype-guid.c4
-rw-r--r--epan/ftypes/ftype-integer.c4
-rw-r--r--epan/ftypes/ftype-ipv4.c4
-rw-r--r--epan/ftypes/ftype-none.c4
-rw-r--r--epan/ftypes/ftype-pcre.c4
-rw-r--r--epan/ftypes/ftype-string.c4
-rw-r--r--epan/ftypes/ftype-time.c4
-rw-r--r--epan/ftypes/ftype-tvbuff.c4
-rw-r--r--epan/ftypes/ftypes-int.h4
-rw-r--r--epan/ftypes/ftypes.c4
-rw-r--r--epan/ftypes/ftypes.h4
-rw-r--r--epan/funnel.c4
-rw-r--r--epan/funnel.h4
-rw-r--r--epan/gnuc_format_check.h4
-rw-r--r--epan/greproto.h4
-rw-r--r--epan/guid-utils.h4
-rw-r--r--epan/h225-persistentdata.c8
-rw-r--r--epan/h225-persistentdata.h6
-rw-r--r--epan/iax2_codec_type.h4
-rw-r--r--epan/inet_aton.h2
-rw-r--r--epan/inet_v6defs.h4
-rw-r--r--epan/ip_opts.h4
-rw-r--r--epan/ipproto.c4
-rw-r--r--epan/ipproto.h4
-rw-r--r--epan/ipv4.c4
-rw-r--r--epan/ipv4.h4
-rw-r--r--epan/ipv6-utils.h4
-rw-r--r--epan/lapd_sapi.h4
-rw-r--r--epan/llcsaps.h4
-rwxr-xr-xepan/make-sminmpec.pl4
-rw-r--r--epan/nlpid.h4
-rw-r--r--epan/nstime.c4
-rw-r--r--epan/nstime.h4
-rw-r--r--epan/oid_resolv.c4
-rw-r--r--epan/oid_resolv.h4
-rw-r--r--epan/osi-utils.c4
-rw-r--r--epan/osi-utils.h4
-rw-r--r--epan/oui.h4
-rw-r--r--epan/packet.c4
-rw-r--r--epan/packet.h4
-rw-r--r--epan/packet_info.h4
-rw-r--r--epan/pint.h2
-rw-r--r--epan/plugins.c10
-rw-r--r--epan/plugins.h4
-rw-r--r--epan/ppptypes.h4
-rw-r--r--epan/prefs-int.h6
-rw-r--r--epan/prefs.c14
-rw-r--r--epan/prefs.h4
-rw-r--r--epan/privileges.c4
-rw-r--r--epan/privileges.h4
-rw-r--r--epan/proto.c8
-rw-r--r--epan/proto.h16
-rw-r--r--epan/ptvcursor.h4
-rw-r--r--epan/radius_dict.l4
-rw-r--r--epan/range.c4
-rw-r--r--epan/range.h4
-rw-r--r--epan/reassemble.c4
-rw-r--r--epan/reassemble.h4
-rw-r--r--epan/report_err.h4
-rw-r--r--epan/req_resp_hdrs.c4
-rw-r--r--epan/req_resp_hdrs.h4
-rw-r--r--epan/rtp_pt.h4
-rw-r--r--epan/sctpppids.h4
-rw-r--r--epan/sigcomp-udvm.c4
-rw-r--r--epan/sigcomp-udvm.h4
-rw-r--r--epan/sigcomp_state_hdlr.c4
-rw-r--r--epan/sigcomp_state_hdlr.h4
-rw-r--r--epan/slab.h4
-rw-r--r--epan/sminmpec.h4
-rw-r--r--epan/sna-utils.c4
-rw-r--r--epan/stat_cmd_args.c4
-rw-r--r--epan/stat_cmd_args.h4
-rw-r--r--epan/stats_tree.c4
-rw-r--r--epan/stats_tree.h4
-rw-r--r--epan/stats_tree_priv.h4
-rw-r--r--epan/stream.c4
-rw-r--r--epan/stream.h4
-rw-r--r--epan/strutil.c4
-rw-r--r--epan/strutil.h4
-rw-r--r--epan/t35.c4
-rw-r--r--epan/t35.h4
-rw-r--r--epan/tap.c6
-rw-r--r--epan/tap.h6
-rw-r--r--epan/timestamp.c4
-rw-r--r--epan/timestamp.h4
-rw-r--r--epan/to_str.c4
-rw-r--r--epan/to_str.h4
-rw-r--r--epan/tpg.c4
-rw-r--r--epan/tpg.h4
-rw-r--r--epan/tvbparse.c4
-rw-r--r--epan/tvbparse.h4
-rw-r--r--epan/tvbuff.c16
-rw-r--r--epan/tvbuff.h6
-rw-r--r--epan/value_string.c4
-rw-r--r--epan/value_string.h4
-rw-r--r--epan/x264_prt_id.h4
-rw-r--r--epan/xdlc.c4
-rw-r--r--epan/xdlc.h4
-rw-r--r--epan/xmlstub.c4
198 files changed, 404 insertions, 404 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am
index da3561ecce..f5155a2b27 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -4,8 +4,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/epan/Makefile.common b/epan/Makefile.common
index 8fc886f440..5cf487a0ed 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/epan/addr_and_mask.c b/epan/addr_and_mask.c
index 26cb16c417..d793290047 100644
--- a/epan/addr_and_mask.c
+++ b/epan/addr_and_mask.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/addr_and_mask.h b/epan/addr_and_mask.h
index 30e54bd70e..7498179ac5 100644
--- a/epan/addr_and_mask.h
+++ b/epan/addr_and_mask.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 1db6b2b0c5..d79003eb5e 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -5,8 +5,8 @@
*
* Laurent Deniel <laurent.deniel@free.fr>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h
index 8a924d82cf..390830aa8b 100644
--- a/epan/addr_resolv.h
+++ b/epan/addr_resolv.h
@@ -5,8 +5,8 @@
*
* Laurent Deniel <laurent.deniel@free.fr>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/address.h b/epan/address.h
index db204a1445..2e7c7a56ad 100644
--- a/epan/address.h
+++ b/epan/address.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/adler32.c b/epan/adler32.c
index 5981c7b6ab..82cf7b6a00 100644
--- a/epan/adler32.c
+++ b/epan/adler32.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/adler32.h b/epan/adler32.h
index 090d6322de..0e6f4a5dc7 100644
--- a/epan/adler32.h
+++ b/epan/adler32.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/afn.c b/epan/afn.c
index bf5b6a7144..7cad4f3e95 100644
--- a/epan/afn.c
+++ b/epan/afn.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/afn.h b/epan/afn.h
index 7e892f4581..a8f25bb5f7 100644
--- a/epan/afn.h
+++ b/epan/afn.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/aftypes.h b/epan/aftypes.h
index d49cb10d59..5899671ff0 100644
--- a/epan/aftypes.h
+++ b/epan/aftypes.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
*
* This file created and by Mike Hall <mlh@io.com>
* Copyright 1998
diff --git a/epan/arcnet_pids.h b/epan/arcnet_pids.h
index 59b815f29d..ec0024d34e 100644
--- a/epan/arcnet_pids.h
+++ b/epan/arcnet_pids.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/arptypes.h b/epan/arptypes.h
index 6f6ba29bb7..af4e527496 100644
--- a/epan/arptypes.h
+++ b/epan/arptypes.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/asn1.c b/epan/asn1.c
index a8c0e1ae45..26c59c6ae6 100644
--- a/epan/asn1.c
+++ b/epan/asn1.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
*
* Based on "g_asn1.c" from:
*
diff --git a/epan/asn1.h b/epan/asn1.h
index fd9a378698..d967779434 100644
--- a/epan/asn1.h
+++ b/epan/asn1.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
*
* Based on "g_asn1.h" from:
*
diff --git a/epan/base64.c b/epan/base64.c
index 2d7f034871..c3bc53faa2 100644
--- a/epan/base64.c
+++ b/epan/base64.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/base64.h b/epan/base64.h
index 7ce9b6f8fb..46d060eadc 100644
--- a/epan/base64.h
+++ b/epan/base64.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/bitswap.c b/epan/bitswap.c
index 0fa8198f9f..8d1d62e7df 100644
--- a/epan/bitswap.c
+++ b/epan/bitswap.c
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/bitswap.h b/epan/bitswap.h
index 57aef9c773..cc7efd4aa9 100644
--- a/epan/bitswap.h
+++ b/epan/bitswap.h
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/bridged_pids.h b/epan/bridged_pids.h
index 27e11bff0b..e3c0384a0a 100644
--- a/epan/bridged_pids.h
+++ b/epan/bridged_pids.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 - 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/charsets.c b/epan/charsets.c
index fb17c779d1..40ae56a8c4 100644
--- a/epan/charsets.c
+++ b/epan/charsets.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/charsets.h b/epan/charsets.h
index af6670b723..a943d4cfe5 100644
--- a/epan/charsets.h
+++ b/epan/charsets.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/chdlctypes.h b/epan/chdlctypes.h
index 4237cfe4ca..552fd3040b 100644
--- a/epan/chdlctypes.h
+++ b/epan/chdlctypes.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/circuit.c b/epan/circuit.c
index cc6741e6c8..73dbbce2c6 100644
--- a/epan/circuit.c
+++ b/epan/circuit.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/circuit.h b/epan/circuit.h
index e273a0002c..7e802ba62b 100644
--- a/epan/circuit.h
+++ b/epan/circuit.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/column-utils.c b/epan/column-utils.c
index 776fb82de9..e4635a1bcb 100644
--- a/epan/column-utils.c
+++ b/epan/column-utils.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/column-utils.h b/epan/column-utils.h
index c80706084d..3f84a7dcc3 100644
--- a/epan/column-utils.h
+++ b/epan/column-utils.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/column.c b/epan/column.c
index b3d956aa96..44c22ec9df 100644
--- a/epan/column.c
+++ b/epan/column.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/column.h b/epan/column.h
index 3cd972d2b7..621fac03dc 100644
--- a/epan/column.h
+++ b/epan/column.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/column_info.h b/epan/column_info.h
index 3796f42658..4980e1af9a 100644
--- a/epan/column_info.h
+++ b/epan/column_info.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/conversation.c b/epan/conversation.c
index ad08ac818c..777a4e5268 100644
--- a/epan/conversation.c
+++ b/epan/conversation.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/conversation.h b/epan/conversation.h
index bdf31b8519..f00ff93e46 100644
--- a/epan/conversation.h
+++ b/epan/conversation.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/crc16.c b/epan/crc16.c
index a371ffe77c..553ac03c0c 100644
--- a/epan/crc16.c
+++ b/epan/crc16.c
@@ -5,7 +5,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@xxxxxxxxxxxx>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/crc16.h b/epan/crc16.h
index 8df7b47a32..19ceb90aa5 100644
--- a/epan/crc16.h
+++ b/epan/crc16.h
@@ -5,7 +5,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@xxxxxxxxxxxx>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/crc32.c b/epan/crc32.c
index 18362d7ca9..9775a3be48 100644
--- a/epan/crc32.c
+++ b/epan/crc32.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
diff --git a/epan/crc32.h b/epan/crc32.h
index 291302c06e..5396204263 100644
--- a/epan/crc32.h
+++ b/epan/crc32.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am
index 7e1614320d..283d8573b4 100644
--- a/epan/dfilter/Makefile.am
+++ b/epan/dfilter/Makefile.am
@@ -2,7 +2,7 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
+# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
# Copyright 2001 Gerald Combs
#
diff --git a/epan/dfilter/dfilter-int.h b/epan/dfilter/dfilter-int.h
index 410aba44ee..059a6b75af 100644
--- a/epan/dfilter/dfilter-int.h
+++ b/epan/dfilter/dfilter-int.h
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c
index aded30f365..a2bb2ecd61 100644
--- a/epan/dfilter/dfilter.c
+++ b/epan/dfilter/dfilter.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/dfilter.h b/epan/dfilter/dfilter.h
index f2f16d783f..370d73865a 100644
--- a/epan/dfilter/dfilter.h
+++ b/epan/dfilter/dfilter.h
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/dfunctions.c b/epan/dfilter/dfunctions.c
index 1b949b2ea5..485ab5bc4d 100644
--- a/epan/dfilter/dfunctions.c
+++ b/epan/dfilter/dfunctions.c
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
*
* Copyright 2006 Gilbert Ramirez <gram@alumni.rice.edu>
*
diff --git a/epan/dfilter/dfunctions.h b/epan/dfilter/dfunctions.h
index 3e7ca3f0de..8abf520ecc 100644
--- a/epan/dfilter/dfunctions.h
+++ b/epan/dfilter/dfunctions.h
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
*
* Copyright 2006 Gilbert Ramirez <gram@alumni.rice.edu>
*
diff --git a/epan/dfilter/dfvm.c b/epan/dfilter/dfvm.c
index ad3a467243..9d368abb18 100644
--- a/epan/dfilter/dfvm.c
+++ b/epan/dfilter/dfvm.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/dfvm.h b/epan/dfilter/dfvm.h
index da773b7759..cdc8f96453 100644
--- a/epan/dfilter/dfvm.h
+++ b/epan/dfilter/dfvm.h
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/drange.c b/epan/dfilter/drange.c
index 5a374ea786..13a52f5ad4 100644
--- a/epan/dfilter/drange.c
+++ b/epan/dfilter/drange.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs
* Copyright 1999 Gerald Combs
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/drange.h b/epan/dfilter/drange.h
index 6a139681fc..e5d5be1f22 100644
--- a/epan/dfilter/drange.h
+++ b/epan/dfilter/drange.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs
* Copyright 1999 Gerald Combs
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/gencode.c b/epan/dfilter/gencode.c
index 5da0b1c2ad..e7ac516fd4 100644
--- a/epan/dfilter/gencode.c
+++ b/epan/dfilter/gencode.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/scanner.l b/epan/dfilter/scanner.l
index 545c923c85..4697c891cb 100644
--- a/epan/dfilter/scanner.l
+++ b/epan/dfilter/scanner.l
@@ -2,8 +2,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c
index 9e91bff0e5..9949f9f021 100644
--- a/epan/dfilter/semcheck.c
+++ b/epan/dfilter/semcheck.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/semcheck.h b/epan/dfilter/semcheck.h
index fec5d80e96..14851a4bfd 100644
--- a/epan/dfilter/semcheck.h
+++ b/epan/dfilter/semcheck.h
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2001 Gerald Combs
*
diff --git a/epan/dfilter/sttype-function.c b/epan/dfilter/sttype-function.c
index c6c8a5af83..0cbdb3fd70 100644
--- a/epan/dfilter/sttype-function.c
+++ b/epan/dfilter/sttype-function.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2006 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/epan/dfilter/sttype-function.h b/epan/dfilter/sttype-function.h
index b93f2e3273..fb8e7085a7 100644
--- a/epan/dfilter/sttype-function.h
+++ b/epan/dfilter/sttype-function.h
@@ -1,7 +1,7 @@
/*
* $Id: sttype-test.h 11400 2004-07-18 00:24:25Z guy $
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2001 Gerald Combs
*
diff --git a/epan/dfilter/sttype-integer.c b/epan/dfilter/sttype-integer.c
index c8765dac0f..5017fc4ac9 100644
--- a/epan/dfilter/sttype-integer.c
+++ b/epan/dfilter/sttype-integer.c
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2001 Gerald Combs
*
diff --git a/epan/dfilter/sttype-pointer.c b/epan/dfilter/sttype-pointer.c
index 3879fdae14..a5e90bb396 100644
--- a/epan/dfilter/sttype-pointer.c
+++ b/epan/dfilter/sttype-pointer.c
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2001 Gerald Combs
*
diff --git a/epan/dfilter/sttype-range.c b/epan/dfilter/sttype-range.c
index c1be33af6c..775ec51412 100644
--- a/epan/dfilter/sttype-range.c
+++ b/epan/dfilter/sttype-range.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/sttype-range.h b/epan/dfilter/sttype-range.h
index b4fc480148..66c97bf349 100644
--- a/epan/dfilter/sttype-range.h
+++ b/epan/dfilter/sttype-range.h
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2001 Gerald Combs
*
diff --git a/epan/dfilter/sttype-string.c b/epan/dfilter/sttype-string.c
index bc92d8ae8b..c24c1609e7 100644
--- a/epan/dfilter/sttype-string.c
+++ b/epan/dfilter/sttype-string.c
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2001 Gerald Combs
*
diff --git a/epan/dfilter/sttype-test.c b/epan/dfilter/sttype-test.c
index 9a0408efaf..b8a9668779 100644
--- a/epan/dfilter/sttype-test.c
+++ b/epan/dfilter/sttype-test.c
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2001 Gerald Combs
*
diff --git a/epan/dfilter/sttype-test.h b/epan/dfilter/sttype-test.h
index ad615f0a4d..855e0dd79f 100644
--- a/epan/dfilter/sttype-test.h
+++ b/epan/dfilter/sttype-test.h
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2001 Gerald Combs
*
diff --git a/epan/dfilter/syntax-tree.c b/epan/dfilter/syntax-tree.c
index 62b54d97fe..51bb0879f3 100644
--- a/epan/dfilter/syntax-tree.c
+++ b/epan/dfilter/syntax-tree.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/syntax-tree.h b/epan/dfilter/syntax-tree.h
index d57c850f90..635feeda32 100644
--- a/epan/dfilter/syntax-tree.h
+++ b/epan/dfilter/syntax-tree.h
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
index 5847115d8c..d4d9bcb529 100644
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/Makefile.am
@@ -2,8 +2,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 2004 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index ac8820ad18..b7abad07a5 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/dcerpc/budb/template.c b/epan/dissectors/dcerpc/budb/template.c
index 0c1edc9787..3b266eeb40 100644
--- a/epan/dissectors/dcerpc/budb/template.c
+++ b/epan/dissectors/dcerpc/budb/template.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/dcerpc/budb/template.h b/epan/dissectors/dcerpc/budb/template.h
index d0059850c9..8b26f8b9a0 100644
--- a/epan/dissectors/dcerpc/budb/template.h
+++ b/epan/dissectors/dcerpc/budb/template.h
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/dcerpc/butc/template.c b/epan/dissectors/dcerpc/butc/template.c
index 5f84bedbdf..9d1982c7c5 100644
--- a/epan/dissectors/dcerpc/butc/template.c
+++ b/epan/dissectors/dcerpc/butc/template.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/dcerpc/butc/template.h b/epan/dissectors/dcerpc/butc/template.h
index 9bc9698aba..4c8c77ac5a 100644
--- a/epan/dissectors/dcerpc/butc/template.h
+++ b/epan/dissectors/dcerpc/butc/template.h
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/dcerpc/drsuapi/template.c b/epan/dissectors/dcerpc/drsuapi/template.c
index 98e121a440..b057a93356 100644
--- a/epan/dissectors/dcerpc/drsuapi/template.c
+++ b/epan/dissectors/dcerpc/drsuapi/template.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/dcerpc/drsuapi/template.h b/epan/dissectors/dcerpc/drsuapi/template.h
index ba12115e11..750b8bc261 100644
--- a/epan/dissectors/dcerpc/drsuapi/template.h
+++ b/epan/dissectors/dcerpc/drsuapi/template.h
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/dcerpc/efs/template.c b/epan/dissectors/dcerpc/efs/template.c
index 5b948bfb09..c0f90d5879 100644
--- a/epan/dissectors/dcerpc/efs/template.c
+++ b/epan/dissectors/dcerpc/efs/template.c
@@ -10,8 +10,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/dcerpc/efs/template.h b/epan/dissectors/dcerpc/efs/template.h
index d86cbdb3d5..2d6f6140ff 100644
--- a/epan/dissectors/dcerpc/efs/template.h
+++ b/epan/dissectors/dcerpc/efs/template.h
@@ -9,8 +9,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc
index 344dc7d4c8..01864916d3 100644
--- a/epan/dissectors/packet-ncp2222.inc
+++ b/epan/dissectors/packet-ncp2222.inc
@@ -21,8 +21,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/process-x11-fields.pl b/epan/dissectors/process-x11-fields.pl
index 057f9b44b7..c417668c6c 100644
--- a/epan/dissectors/process-x11-fields.pl
+++ b/epan/dissectors/process-x11-fields.pl
@@ -8,8 +8,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/x11-fields b/epan/dissectors/x11-fields
index 51625d953e..4994e3bd41 100644
--- a/epan/dissectors/x11-fields
+++ b/epan/dissectors/x11-fields
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/epan/dtd.h b/epan/dtd.h
index 7c39041310..57e239ba70 100644
--- a/epan/dtd.h
+++ b/epan/dtd.h
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dtd_grammar.lemon b/epan/dtd_grammar.lemon
index c743d626ff..38b1908acc 100644
--- a/epan/dtd_grammar.lemon
+++ b/epan/dtd_grammar.lemon
@@ -8,8 +8,8 @@
*
* $Id$
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dtd_parse.h b/epan/dtd_parse.h
index 2e937fefe5..672272e884 100644
--- a/epan/dtd_parse.h
+++ b/epan/dtd_parse.h
@@ -7,8 +7,8 @@
*
* $Id$
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dtd_parse.l b/epan/dtd_parse.l
index 857f8c8ace..8ee18560d6 100644
--- a/epan/dtd_parse.l
+++ b/epan/dtd_parse.l
@@ -14,8 +14,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dtd_preparse.l b/epan/dtd_preparse.l
index e38cb46f39..b5ce8fbe84 100644
--- a/epan/dtd_preparse.l
+++ b/epan/dtd_preparse.l
@@ -19,8 +19,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/emem.c b/epan/emem.c
index 391a735fa5..f2ffa9adbb 100644
--- a/epan/emem.c
+++ b/epan/emem.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/emem.h b/epan/emem.h
index 60593ce273..c4c2f90e53 100644
--- a/epan/emem.h
+++ b/epan/emem.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/epan.c b/epan/epan.c
index 53022a305e..dd0b1b0104 100644
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -2,7 +2,7 @@
*
* $Id$
*
- * Ethereal Protocol Analyzer Library
+ * Wireshark Protocol Analyzer Library
*/
#ifdef HAVE_CONFIG_H
diff --git a/epan/epan.h b/epan/epan.h
index e89d82fae8..e43957ccd7 100644
--- a/epan/epan.h
+++ b/epan/epan.h
@@ -2,9 +2,9 @@
*
* $Id$
*
- * Ethereal Protocol Analyzer Library
+ * Wireshark Protocol Analyzer Library
*
- * Copyright (c) 2001 by Gerald Combs <gerald@ethereal.com>
+ * Copyright (c) 2001 by Gerald Combs <gerald@wireshark.org>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/epan/epan_dissect.h b/epan/epan_dissect.h
index 160c4b4c4b..5b0f2d9345 100644
--- a/epan/epan_dissect.h
+++ b/epan/epan_dissect.h
@@ -2,9 +2,9 @@
*
* $Id$
*
- * Ethereal Protocol Analyzer Library
+ * Wireshark Protocol Analyzer Library
*
- * Copyright (c) 2001 by Gerald Combs <gerald@ethereal.com>
+ * Copyright (c) 2001 by Gerald Combs <gerald@wireshark.org>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/epan/etypes.h b/epan/etypes.h
index 091a97e21b..6040f88aa2 100644
--- a/epan/etypes.h
+++ b/epan/etypes.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ex-opt.c b/epan/ex-opt.c
index 1b720736d5..f584324c8e 100644
--- a/epan/ex-opt.c
+++ b/epan/ex-opt.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ex-opt.h b/epan/ex-opt.h
index f51f94791f..9a0f207a55 100644
--- a/epan/ex-opt.h
+++ b/epan/ex-opt.h
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/expert.c b/epan/expert.c
index 06f1719097..edc27b37c2 100644
--- a/epan/expert.c
+++ b/epan/expert.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/expert.h b/epan/expert.h
index 87c56eb097..2a3a7e8f56 100644
--- a/epan/expert.h
+++ b/epan/expert.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/filesystem.c b/epan/filesystem.c
index d2b78fd13e..dd2c81c50c 100644
--- a/epan/filesystem.c
+++ b/epan/filesystem.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -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 Ethereal with
+ * applications (more than just Tethereal 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?
*
diff --git a/epan/filesystem.h b/epan/filesystem.h
index 650552e9a4..9a59a58e20 100644
--- a/epan/filesystem.h
+++ b/epan/filesystem.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/follow.c b/epan/follow.c
index f1dc7ccbad..a98b7fc214 100644
--- a/epan/follow.c
+++ b/epan/follow.c
@@ -4,8 +4,8 @@
*
* Copyright 1998 Mike Hall <mlh@io.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/follow.h b/epan/follow.h
index 013519d43e..af7fcb7df2 100644
--- a/epan/follow.h
+++ b/epan/follow.h
@@ -4,8 +4,8 @@
*
* Copyright 1998 Mike Hall <mlh@io.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@
#define MAX_IPADDR_LEN 16
-/* With MSVC and a libethereal.dll, we need a special declaration. */
+/* With MSVC and a libwireshark.dll, we need a special declaration. */
ETH_VAR_IMPORT gboolean incomplete_tcp_stream;
typedef struct _tcp_stream_chunk {
diff --git a/epan/frame_data.c b/epan/frame_data.c
index 9e25719c0c..b60f194e57 100644
--- a/epan/frame_data.c
+++ b/epan/frame_data.c
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/frame_data.h b/epan/frame_data.h
index 6b81dc9893..15e6057191 100644
--- a/epan/frame_data.h
+++ b/epan/frame_data.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/Makefile.am b/epan/ftypes/Makefile.am
index 580970cbb5..052925a979 100644
--- a/epan/ftypes/Makefile.am
+++ b/epan/ftypes/Makefile.am
@@ -2,7 +2,7 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
+# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
# Copyright 1998 Gerald Combs
#
diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c
index d67883cd53..9e390c3ce4 100644
--- a/epan/ftypes/ftype-bytes.c
+++ b/epan/ftypes/ftype-bytes.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftype-double.c b/epan/ftypes/ftype-double.c
index 460b4c5b13..0078beedee 100644
--- a/epan/ftypes/ftype-double.c
+++ b/epan/ftypes/ftype-double.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftype-guid.c b/epan/ftypes/ftype-guid.c
index 4a5e9645d5..17256c248a 100644
--- a/epan/ftypes/ftype-guid.c
+++ b/epan/ftypes/ftype-guid.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c
index 9656facbbf..8e354d4e67 100644
--- a/epan/ftypes/ftype-integer.c
+++ b/epan/ftypes/ftype-integer.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftype-ipv4.c b/epan/ftypes/ftype-ipv4.c
index d57894325c..045c9fbf10 100644
--- a/epan/ftypes/ftype-ipv4.c
+++ b/epan/ftypes/ftype-ipv4.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftype-none.c b/epan/ftypes/ftype-none.c
index 471e0a4d23..7d133f8462 100644
--- a/epan/ftypes/ftype-none.c
+++ b/epan/ftypes/ftype-none.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftype-pcre.c b/epan/ftypes/ftype-pcre.c
index 82bcc196de..4c4c4fdf90 100644
--- a/epan/ftypes/ftype-pcre.c
+++ b/epan/ftypes/ftype-pcre.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftype-string.c b/epan/ftypes/ftype-string.c
index d4525fc279..b24086363c 100644
--- a/epan/ftypes/ftype-string.c
+++ b/epan/ftypes/ftype-string.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftype-time.c b/epan/ftypes/ftype-time.c
index 2427ccb5d5..38e43d0d6a 100644
--- a/epan/ftypes/ftype-time.c
+++ b/epan/ftypes/ftype-time.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftype-tvbuff.c b/epan/ftypes/ftype-tvbuff.c
index 8e4a705059..c083ec3911 100644
--- a/epan/ftypes/ftype-tvbuff.c
+++ b/epan/ftypes/ftype-tvbuff.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftypes-int.h b/epan/ftypes/ftypes-int.h
index 133300369c..0e8154e400 100644
--- a/epan/ftypes/ftypes-int.h
+++ b/epan/ftypes/ftypes-int.h
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftypes.c b/epan/ftypes/ftypes.c
index d48389496b..a2305f97f9 100644
--- a/epan/ftypes/ftypes.c
+++ b/epan/ftypes/ftypes.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftypes.h b/epan/ftypes/ftypes.h
index a21feb5291..e3f1e2aa43 100644
--- a/epan/ftypes/ftypes.h
+++ b/epan/ftypes/ftypes.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/funnel.c b/epan/funnel.c
index 126df09958..185fe3dc20 100644
--- a/epan/funnel.c
+++ b/epan/funnel.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/funnel.h b/epan/funnel.h
index 9f7b37beaf..16508af124 100644
--- a/epan/funnel.h
+++ b/epan/funnel.h
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/gnuc_format_check.h b/epan/gnuc_format_check.h
index 31dcbeea89..83e3ba4b7d 100644
--- a/epan/gnuc_format_check.h
+++ b/epan/gnuc_format_check.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/greproto.h b/epan/greproto.h
index 88e5d0e230..ef74dcb1a4 100644
--- a/epan/greproto.h
+++ b/epan/greproto.h
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/guid-utils.h b/epan/guid-utils.h
index 1448ec4ddb..8161e2b5cd 100644
--- a/epan/guid-utils.h
+++ b/epan/guid-utils.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
*
* Copyright 1998 Gerald Combs
*
diff --git a/epan/h225-persistentdata.c b/epan/h225-persistentdata.c
index 4fa043a983..3b540dabe6 100644
--- a/epan/h225-persistentdata.c
+++ b/epan/h225-persistentdata.c
@@ -1,14 +1,14 @@
/*
* h225-persistentdata.c
- * Source for lists and hash tables used in ethereal's h225 dissector
+ * Source for lists and hash tables used in wireshark's h225 dissector
* for calculation of delays in h225-calls
*
* Copyright 2003 Lars Roland
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -127,7 +127,7 @@ h225ras_call_t * append_h225ras_call(h225ras_call_t *prev_call, packet_info *pin
/* Init routine for hash tables and delay calculation
- This routine will be called by Ethereal, before it
+ This routine will be called by Wireshark, before it
is (re-)dissecting a trace file from beginning.
We need to discard and init any state we've saved */
diff --git a/epan/h225-persistentdata.h b/epan/h225-persistentdata.h
index 5defb14874..9e60cec275 100644
--- a/epan/h225-persistentdata.h
+++ b/epan/h225-persistentdata.h
@@ -1,14 +1,14 @@
/*
* h225-persistentdata.h
- * Definitions for lists and hash tables used in ethereal's h225 dissector
+ * Definitions for lists and hash tables used in wireshark's h225 dissector
* for calculation of delays in h225-calls
*
* Copyright 2003 Lars Roland
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/iax2_codec_type.h b/epan/iax2_codec_type.h
index c373a35bf8..09b8613092 100644
--- a/epan/iax2_codec_type.h
+++ b/epan/iax2_codec_type.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/inet_aton.h b/epan/inet_aton.h
index deb7008c99..dfa043ca96 100644
--- a/epan/inet_aton.h
+++ b/epan/inet_aton.h
@@ -2,7 +2,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/inet_v6defs.h b/epan/inet_v6defs.h
index 1fe7f14223..dc770f89c5 100644
--- a/epan/inet_v6defs.h
+++ b/epan/inet_v6defs.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ip_opts.h b/epan/ip_opts.h
index 997983976a..cf233466b2 100644
--- a/epan/ip_opts.h
+++ b/epan/ip_opts.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ipproto.c b/epan/ipproto.c
index 90c6843de0..77ea982156 100644
--- a/epan/ipproto.c
+++ b/epan/ipproto.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ipproto.h b/epan/ipproto.h
index f9a82d7884..3e97c35029 100644
--- a/epan/ipproto.h
+++ b/epan/ipproto.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ipv4.c b/epan/ipv4.c
index 622d1e209b..47e668dcbd 100644
--- a/epan/ipv4.c
+++ b/epan/ipv4.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ipv4.h b/epan/ipv4.h
index 4a63db6142..39ff3de00d 100644
--- a/epan/ipv4.h
+++ b/epan/ipv4.h
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ipv6-utils.h b/epan/ipv6-utils.h
index 79a5d37fc1..85012102b0 100644
--- a/epan/ipv6-utils.h
+++ b/epan/ipv6-utils.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
*
* Copyright 1998 Gerald Combs
*
diff --git a/epan/lapd_sapi.h b/epan/lapd_sapi.h
index 7fe486dee5..cd8fcf0611 100644
--- a/epan/lapd_sapi.h
+++ b/epan/lapd_sapi.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2004 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/llcsaps.h b/epan/llcsaps.h
index bef8c21e56..875a030e44 100644
--- a/epan/llcsaps.h
+++ b/epan/llcsaps.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/make-sminmpec.pl b/epan/make-sminmpec.pl
index ec034a7359..dc473b1e8e 100755
--- a/epan/make-sminmpec.pl
+++ b/epan/make-sminmpec.pl
@@ -4,8 +4,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 2004 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/epan/nlpid.h b/epan/nlpid.h
index 0b9370d9bf..d01e4b072c 100644
--- a/epan/nlpid.h
+++ b/epan/nlpid.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/nstime.c b/epan/nstime.c
index e20159afcf..a60590ccc7 100644
--- a/epan/nstime.c
+++ b/epan/nstime.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/nstime.h b/epan/nstime.h
index 60fec42e01..8592539cb8 100644
--- a/epan/nstime.h
+++ b/epan/nstime.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/oid_resolv.c b/epan/oid_resolv.c
index 73e530a92c..c3de5e620f 100644
--- a/epan/oid_resolv.c
+++ b/epan/oid_resolv.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/oid_resolv.h b/epan/oid_resolv.h
index 7176a65efe..d770bebb93 100644
--- a/epan/oid_resolv.h
+++ b/epan/oid_resolv.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/osi-utils.c b/epan/osi-utils.c
index daca6afd21..df613783b9 100644
--- a/epan/osi-utils.c
+++ b/epan/osi-utils.c
@@ -6,8 +6,8 @@
* Laurent Deniel <laurent.deniel@free.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/osi-utils.h b/epan/osi-utils.h
index fc8565f032..3b13539364 100644
--- a/epan/osi-utils.h
+++ b/epan/osi-utils.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/oui.h b/epan/oui.h
index 1fcd7229da..59bab2f6d9 100644
--- a/epan/oui.h
+++ b/epan/oui.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 - 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/packet.c b/epan/packet.c
index 5e3c350c4a..6561d0724d 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/packet.h b/epan/packet.h
index 6445928aed..9a8b15871c 100644
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/packet_info.h b/epan/packet_info.h
index 185ffcdb11..9376b65ccd 100644
--- a/epan/packet_info.h
+++ b/epan/packet_info.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/pint.h b/epan/pint.h
index 400cd8d7eb..f5335caeff 100644
--- a/epan/pint.h
+++ b/epan/pint.h
@@ -4,7 +4,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/plugins.c b/epan/plugins.c
index 83c7e8998f..4d7b3a34ad 100644
--- a/epan/plugins.c
+++ b/epan/plugins.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -350,7 +350,7 @@ char *get_plugins_global_dir(const char *plugin_dir)
* On Windows, the data file directory is the installation
* directory; the plugins are stored under it.
*
- * Assume we're running the installed version of Ethereal;
+ * Assume we're running the installed version of Wireshark;
* on Windows, the data file directory is the directory
* in which the Ethereal binary resides.
*/
@@ -365,11 +365,11 @@ char *get_plugins_global_dir(const char *plugin_dir)
* refers to something that doesn't exist.
*
* Assume that means we're running, for example,
- * a version of Ethereal we've built in a source
+ * a version of Wireshark we've built in a source
* directory, and fall back on the default
* installation directory, so you can put the plugins
* somewhere so they can be used with this version
- * of Ethereal.
+ * of Wireshark.
*
* XXX - should we, instead, have the Windows build
* procedure create a subdirectory of the "plugins"
diff --git a/epan/plugins.h b/epan/plugins.h
index 7ae35c0615..0f1ead79ee 100644
--- a/epan/plugins.h
+++ b/epan/plugins.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ppptypes.h b/epan/ppptypes.h
index 352470946b..65a28d9ef2 100644
--- a/epan/ppptypes.h
+++ b/epan/ppptypes.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
*
diff --git a/epan/prefs-int.h b/epan/prefs-int.h
index e3aaabddfd..04cf25d5e6 100644
--- a/epan/prefs-int.h
+++ b/epan/prefs-int.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -40,7 +40,7 @@ struct pref_module {
/*
* Module used for protocol preferences. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
ETH_VAR_IMPORT module_t *protocols_module;
diff --git a/epan/prefs.c b/epan/prefs.c
index d3218ef1e4..4edd127376 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1398,7 +1398,7 @@ prefs_set_pref(char *prefarg)
* This applies to more than just captures, so it's not "capture.name_resolve";
* "capture.name_resolve" is supported on input for backwards compatibility.
*
- * It's not a preference for a particular part of Ethereal, it's used all
+ * It's not a preference for a particular part of Wireshark, it's used all
* over the place, so its name doesn't have two components.
*/
#define PRS_NAME_RESOLVE "name_resolve"
@@ -1815,7 +1815,7 @@ set_pref(gchar *pref_name, gchar *value)
/*
* XXX - "Diameter" rather than "diameter" was used in earlier
- * versions of Ethereal; if we didn't find the module, and its name
+ * versions of Wireshark; if we didn't find the module, and its name
* was "Diameter", look for "diameter" instead.
*
* In addition, the BEEP protocol used to be the BXXP protocol,
@@ -1851,7 +1851,7 @@ set_pref(gchar *pref_name, gchar *value)
/*
* XXX - "mgcp.display raw text toggle" and "mgcp.display dissect tree"
* rather than "mgcp.display_raw_text" and "mgcp.display_dissect_tree"
- * were used in earlier versions of Ethereal; if we didn't find the
+ * were used in earlier versions of Wireshark; if we didn't find the
* preference, it was an MGCP preference, and its name was
* "display raw text toggle" or "display dissect tree", look for
* "display_raw_text" or "display_dissect_tree" instead.
@@ -2158,7 +2158,7 @@ write_pref(gpointer data, gpointer user_data)
case PREF_ENUM:
/*
* For now, we save the "description" value, so that if we
- * save the preferences older versions of Ethereal can at
+ * save the preferences older versions of Wireshark can at
* least read preferences that they supported; we support
* either the short name or the description when reading
* the preferences file or a "-o" option.
@@ -2247,7 +2247,7 @@ write_prefs(char **pf_path_return)
pf = stdout;
}
- fputs("# Configuration file for Ethereal " VERSION ".\n"
+ 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);
diff --git a/epan/prefs.h b/epan/prefs.h
index a7d010a520..2f91c0233a 100644
--- a/epan/prefs.h
+++ b/epan/prefs.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/privileges.c b/epan/privileges.c
index af4de43c3c..857a99cd82 100644
--- a/epan/privileges.c
+++ b/epan/privileges.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2006 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/privileges.h b/epan/privileges.h
index a3fdae8691..3e82c8d813 100644
--- a/epan/privileges.h
+++ b/epan/privileges.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2006 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/proto.c b/epan/proto.c
index 2095ae0654..1fe74913eb 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -314,7 +314,7 @@ proto_init(const char *plugin_dir
ftypes_initialize();
/* Register one special-case FT_TEXT_ONLY field for use when
- converting ethereal to new-style proto_tree. These fields
+ converting wireshark to new-style proto_tree. These fields
are merely strings on the GUI tree; they are not filterable */
proto_register_field_array(-1, hf, array_length(hf));
@@ -557,7 +557,7 @@ proto_tree_set_visible(proto_tree *tree, gboolean visible)
/* Assume dissector set only its protocol fields.
This function is called by dissectors and allowes to speed up filtering
- in ethereal, if this function returns FALSE it is safe to reset tree to NULL
+ in wireshark, if this function returns FALSE it is safe to reset tree to NULL
and thus skip calling most of the expensive proto_tree_add_...()
functions.
If the tree is visible we implicitely assume the field is referenced.
diff --git a/epan/proto.h b/epan/proto.h
index 005ad4b625..3fef7b00bf 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -51,7 +51,7 @@
#include "tvbuff.h"
#include "ftypes/ftypes.h"
-/** The header-field index for the special text pseudo-field. Exported by libethereal.dll */
+/** The header-field index for the special text pseudo-field. Exported by libwireshark.dll */
ETH_VAR_IMPORT int hf_text_only;
/** the maximum length of a protocol field string representation */
@@ -208,7 +208,7 @@ typedef struct field_info {
* used in field_info.flags. */
/* HIDING PROTOCOL FIELDS IS DEPRECATED, IT'S CONSIDERED TO BE BAD GUI DESIGN! */
#define FI_HIDDEN 0x0001
-/** The protocol field should be displayed as "generated by Ethereal",
+/** The protocol field should be displayed as "generated by Wireshark",
* used in field_info.flags. */
#define FI_GENERATED 0x0002
@@ -283,10 +283,10 @@ typedef proto_node proto_item;
/* HIDING PROTOCOL FIELDS IS DEPRECATED, IT'S CONSIDERED TO BE BAD GUI DESIGN! */
#define PROTO_ITEM_SET_HIDDEN(proto_item) \
((proto_item) ? FI_SET_FLAG((proto_item)->finfo, FI_HIDDEN) : 0)
-/** is this protocol field generated by Ethereal (and not read from the packet data)? */
+/** is this protocol field generated by Wireshark (and not read from the packet data)? */
#define PROTO_ITEM_IS_GENERATED(proto_item) \
((proto_item) ? FI_GET_FLAG((proto_item)->finfo, FI_GENERATED) : 0)
-/** mark this protocol field as generated by Ethereal (and not read from the packet data) */
+/** mark this protocol field as generated by Wireshark (and not read from the packet data) */
#define PROTO_ITEM_SET_GENERATED(proto_item) \
((proto_item) ? FI_SET_FLAG((proto_item)->finfo, FI_GENERATED) : 0)
@@ -1495,11 +1495,11 @@ extern void proto_registrar_dump_fields(int format);
/** Points to the first element of an array of Booleans, indexed by
a subtree item type. That array element is TRUE if subtrees of
an item of that type are to be expanded. With MSVC and a
- libethereal.dll, we need a special declaration. */
+ libwireshark.dll, we need a special declaration. */
ETH_VAR_IMPORT gboolean *tree_is_expanded;
/** Number of elements in the tree_is_expanded array. With MSVC and a
- * libethereal.dll, we need a special declaration. */
+ * libwireshark.dll, we need a special declaration. */
ETH_VAR_IMPORT int num_tree_types;
/** glib doesn't have g_ptr_array_len of all things!*/
diff --git a/epan/ptvcursor.h b/epan/ptvcursor.h
index 6467bcdea9..8c14e4c21c 100644
--- a/epan/ptvcursor.h
+++ b/epan/ptvcursor.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/radius_dict.l b/epan/radius_dict.l
index 3170272bfe..ff2bfee3ed 100644
--- a/epan/radius_dict.l
+++ b/epan/radius_dict.l
@@ -14,8 +14,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/range.c b/epan/range.c
index 52af5540af..a5ede86a4f 100644
--- a/epan/range.c
+++ b/epan/range.c
@@ -6,8 +6,8 @@
* Dick Gooris <gooris@lucent.com>
* Ulf Lamping <ulf.lamping@web.de>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/range.h b/epan/range.h
index 1355c5058d..f3c3825d48 100644
--- a/epan/range.h
+++ b/epan/range.h
@@ -6,8 +6,8 @@
* Dick Gooris <gooris@lucent.com>
* Ulf Lamping <ulf.lamping@web.de>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/reassemble.c b/epan/reassemble.c
index de0105e2a1..39e9a42b3e 100644
--- a/epan/reassemble.c
+++ b/epan/reassemble.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/reassemble.h b/epan/reassemble.h
index 9c37cf058d..2937b8f1cf 100644
--- a/epan/reassemble.h
+++ b/epan/reassemble.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/report_err.h b/epan/report_err.h
index f3440bb141..c9686413c8 100644
--- a/epan/report_err.h
+++ b/epan/report_err.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/req_resp_hdrs.c b/epan/req_resp_hdrs.c
index fe34b820b4..cbc861de3e 100644
--- a/epan/req_resp_hdrs.c
+++ b/epan/req_resp_hdrs.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/req_resp_hdrs.h b/epan/req_resp_hdrs.h
index 841fbc390c..17d3ee35cb 100644
--- a/epan/req_resp_hdrs.h
+++ b/epan/req_resp_hdrs.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/rtp_pt.h b/epan/rtp_pt.h
index 890c433707..f684ff9e9a 100644
--- a/epan/rtp_pt.h
+++ b/epan/rtp_pt.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/sctpppids.h b/epan/sctpppids.h
index 6e213b3c85..aea8d5ecfd 100644
--- a/epan/sctpppids.h
+++ b/epan/sctpppids.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/sigcomp-udvm.c b/epan/sigcomp-udvm.c
index 8e6a8851f2..9a12759408 100644
--- a/epan/sigcomp-udvm.c
+++ b/epan/sigcomp-udvm.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/sigcomp-udvm.h b/epan/sigcomp-udvm.h
index 4cd45ad359..ac6f284649 100644
--- a/epan/sigcomp-udvm.h
+++ b/epan/sigcomp-udvm.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/sigcomp_state_hdlr.c b/epan/sigcomp_state_hdlr.c
index c2e9cba110..bc21fb0f14 100644
--- a/epan/sigcomp_state_hdlr.c
+++ b/epan/sigcomp_state_hdlr.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/sigcomp_state_hdlr.h b/epan/sigcomp_state_hdlr.h
index c23f24e763..96155a4b9b 100644
--- a/epan/sigcomp_state_hdlr.h
+++ b/epan/sigcomp_state_hdlr.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/slab.h b/epan/slab.h
index aecb20c7e2..6bed56d6af 100644
--- a/epan/slab.h
+++ b/epan/slab.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/sminmpec.h b/epan/sminmpec.h
index 018e5309a7..f217d9f196 100644
--- a/epan/sminmpec.h
+++ b/epan/sminmpec.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2004 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/sna-utils.c b/epan/sna-utils.c
index 132a5cfe4b..9bfd1ebb4e 100644
--- a/epan/sna-utils.c
+++ b/epan/sna-utils.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/stat_cmd_args.c b/epan/stat_cmd_args.c
index e116032095..8ab4a5ddd9 100644
--- a/epan/stat_cmd_args.c
+++ b/epan/stat_cmd_args.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/stat_cmd_args.h b/epan/stat_cmd_args.h
index 20297eb4dd..863f405add 100644
--- a/epan/stat_cmd_args.h
+++ b/epan/stat_cmd_args.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/stats_tree.c b/epan/stats_tree.c
index 5eec67c807..abd4202a98 100644
--- a/epan/stats_tree.c
+++ b/epan/stats_tree.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/stats_tree.h b/epan/stats_tree.h
index d3d81e0179..e1b005aa13 100644
--- a/epan/stats_tree.h
+++ b/epan/stats_tree.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/stats_tree_priv.h b/epan/stats_tree_priv.h
index 8f1ffd6c81..b6688e028f 100644
--- a/epan/stats_tree_priv.h
+++ b/epan/stats_tree_priv.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/stream.c b/epan/stream.c
index 70251011f8..ee8c561355 100644
--- a/epan/stream.c
+++ b/epan/stream.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/stream.h b/epan/stream.h
index 00e5e1cf38..2b4c33744a 100644
--- a/epan/stream.h
+++ b/epan/stream.h
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/strutil.c b/epan/strutil.c
index 60e653f32e..f36d48071b 100644
--- a/epan/strutil.c
+++ b/epan/strutil.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/strutil.h b/epan/strutil.h
index 2bd4e59f38..7ed68367b6 100644
--- a/epan/strutil.h
+++ b/epan/strutil.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/t35.c b/epan/t35.c
index ba718c5229..ac2b7c708f 100644
--- a/epan/t35.c
+++ b/epan/t35.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/t35.h b/epan/t35.h
index a9d8abf422..45f727e859 100644
--- a/epan/t35.h
+++ b/epan/t35.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/tap.c b/epan/tap.c
index b692fcd58d..7ff4cd4c71 100644
--- a/epan/tap.c
+++ b/epan/tap.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -82,7 +82,7 @@ static volatile tap_listener_t *tap_listener_queue=NULL;
/* **********************************************************************
* Init routine only called from epan at application startup
* ********************************************************************** */
-/* This function is called once when ethereal starts up and is used
+/* This function is called once when wireshark starts up and is used
to init any data structures we may need later.
*/
void
diff --git a/epan/tap.h b/epan/tap.h
index 2a8fa4cbc3..a08b39a0e1 100644
--- a/epan/tap.h
+++ b/epan/tap.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
#include "epan/epan.h"
-/* With MSVC and a libethereal.dll, we need a
+/* With MSVC and a libwireshark.dll, we need a
* special declaration of num_tap_filters.
*/
ETH_VAR_IMPORT int num_tap_filters;
diff --git a/epan/timestamp.c b/epan/timestamp.c
index b7cef811f6..a3d85b3c19 100644
--- a/epan/timestamp.c
+++ b/epan/timestamp.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/timestamp.h b/epan/timestamp.h
index f9f953219b..ac06c6b63c 100644
--- a/epan/timestamp.h
+++ b/epan/timestamp.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/to_str.c b/epan/to_str.c
index 7479ed311e..c7e03f4b05 100644
--- a/epan/to_str.c
+++ b/epan/to_str.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/to_str.h b/epan/to_str.h
index 4bbe5e9447..d4cbb1145e 100644
--- a/epan/to_str.h
+++ b/epan/to_str.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/tpg.c b/epan/tpg.c
index 5a29b8ba4a..d28325338b 100644
--- a/epan/tpg.c
+++ b/epan/tpg.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/tpg.h b/epan/tpg.h
index 4f0170e755..9367a81a60 100644
--- a/epan/tpg.h
+++ b/epan/tpg.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/tvbparse.c b/epan/tvbparse.c
index 5b2a02797d..7b0114ddba 100644
--- a/epan/tvbparse.c
+++ b/epan/tvbparse.c
@@ -4,8 +4,8 @@
*
* $Id$
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/tvbparse.h b/epan/tvbparse.h
index 2afc4eecfe..ec927b2d9d 100644
--- a/epan/tvbparse.h
+++ b/epan/tvbparse.h
@@ -7,8 +7,8 @@
*
* $Id$
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/tvbuff.c b/epan/tvbuff.c
index 39cb3e763e..3cee88e99c 100644
--- a/epan/tvbuff.c
+++ b/epan/tvbuff.c
@@ -16,8 +16,8 @@
* Code to convert IEEE floating point formats to native floating point
* derived from code Copyright (c) Ashok Narayanan, 2000
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1022,7 +1022,7 @@ tvb_memdup(tvbuff_t *tvb, gint offset, gint length)
*
* This function allocates memory from a buffer with packet lifetime.
* You do not have to free this buffer, it will be automatically freed
- * when ethereal starts decoding the next packet.
+ * when wireshark starts decoding the next packet.
* Do not use this function if you want the allocated memory to be persistent
* after the current packet has been dissected.
*/
@@ -1105,9 +1105,9 @@ tvb_get_ntoh64(tvbuff_t *tvb, gint offset)
* huge surprise).
*
* I don't know whether there are any other machines that
- * could run Ethereal and that don't use IEEE format.
+ * could run Wireshark and that don't use IEEE format.
* As far as I know, all of the main commercial microprocessor
- * families on which OSes that support Ethereal can run
+ * families on which OSes that support Wireshark can run
* use IEEE format (x86, 68k, SPARC, MIPS, PA-RISC, Alpha,
* IA-64, and so on).
*/
@@ -1745,7 +1745,7 @@ tvb_fake_unicode(tvbuff_t *tvb, int offset, int len, gboolean little_endian)
*
* This function allocates memory from a buffer with packet lifetime.
* You do not have to free this buffer, it will be automatically freed
- * when ethereal starts decoding the next packet.
+ * when wireshark starts decoding the next packet.
*/
char *
tvb_get_ephemeral_faked_unicode(tvbuff_t *tvb, int offset, int len, gboolean little_endian)
@@ -1853,7 +1853,7 @@ tvb_get_string(tvbuff_t *tvb, gint offset, gint length)
*
* This function allocates memory from a buffer with packet lifetime.
* You do not have to free this buffer, it will be automatically freed
- * when ethereal starts decoding the next packet.
+ * when wireshark starts decoding the next packet.
* Do not use this function if you want the allocated memory to be persistent
* after the current packet has been dissected.
*/
@@ -1905,7 +1905,7 @@ tvb_get_stringz(tvbuff_t *tvb, gint offset, gint *lengthp)
*
* This function allocates memory from a buffer with packet lifetime.
* You do not have to free this buffer, it will be automatically freed
- * when ethereal starts decoding the next packet.
+ * when wireshark starts decoding the next packet.
* Do not use this function if you want the allocated memory to be persistent
* after the current packet has been dissected.
*/
diff --git a/epan/tvbuff.h b/epan/tvbuff.h
index 144af28666..b4f809c3a7 100644
--- a/epan/tvbuff.h
+++ b/epan/tvbuff.h
@@ -13,8 +13,8 @@
*
* Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -414,7 +414,7 @@ extern gint tvb_strnlen(tvbuff_t*, gint offset, guint maxlength);
* be g_free() by the caller.
* tvb_get_ephemeral_faked_unicode() returns a buffer that does not need
* to be explicitely freed. Instead this buffer is
- * automatically freed when ethereal starts dissecting
+ * automatically freed when wireshark starts dissecting
* the next packet.
*/
extern char *tvb_fake_unicode(tvbuff_t *tvb, int offset, int len,
diff --git a/epan/value_string.c b/epan/value_string.c
index d42f69d682..a6fd925725 100644
--- a/epan/value_string.c
+++ b/epan/value_string.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/value_string.h b/epan/value_string.h
index 5bb264a492..ff9c107ec6 100644
--- a/epan/value_string.h
+++ b/epan/value_string.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/x264_prt_id.h b/epan/x264_prt_id.h
index 3cf75f352f..f1b273d506 100644
--- a/epan/x264_prt_id.h
+++ b/epan/x264_prt_id.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/xdlc.c b/epan/xdlc.c
index cb3c5af42f..362ad16a98 100644
--- a/epan/xdlc.c
+++ b/epan/xdlc.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/xdlc.h b/epan/xdlc.h
index fc924ef6ee..0f1612cc69 100644
--- a/epan/xdlc.h
+++ b/epan/xdlc.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/xmlstub.c b/epan/xmlstub.c
index 6ceb9c32be..b0b8aa3f0d 100644
--- a/epan/xmlstub.c
+++ b/epan/xmlstub.c
@@ -7,8 +7,8 @@
*
* Copyright (c) 2001 by David Frascone <dave@frascone.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998-2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or