change a whole bunch of ethereal into wireshark

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18196 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/format-oid.h b/epan/dissectors/format-oid.h
index f74c41c0a7e35471f583a10788708eecc6998d5e..33d2f48cfb0a48153c9a2818318f21e6730a720d 100644 (file)
--- a/epan/dissectors/format-oid.h
+++ b/epan/dissectors/format-oid.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 Didier Jorand
  *
  * This program is free software; you can redistribute it and/or

diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c
index 9090448c7659c1041958039501e4c88fca1629c0..f9d70c6e3f17e5a158b3213a6be588e1d2908b2c 100644 (file)
--- a/epan/dissectors/packet-3com-njack.c
+++ b/epan/dissectors/packet-3com-njack.c
@@ -5,8 +5,8 @@
  *
  * Copyright 2005 Joerg Mayer (see AUTHORS file)
  *
- * 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-3com-xns.c b/epan/dissectors/packet-3com-xns.c
index cbbe699d5641092ad9ac8cc82077655554fa11bc..c61a2f9819f21068229cda1d4e59e60dddacf4f2 100644 (file)
--- a/epan/dissectors/packet-3com-xns.c
+++ b/epan/dissectors/packet-3com-xns.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/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c
index fb58fb7aed80ca7b9852e518c3ef119dfd5a1ff8..e75ae5dd655b1013f2e935640d9b2e8d264c3789 100644 (file)
--- a/epan/dissectors/packet-3g-a11.c
+++ b/epan/dissectors/packet-3g-a11.c
@@ -13,8 +13,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
@@ -1509,7 +1509,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   return tvb_length(tvb);
 } /* dissect_a11 */
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void proto_register_a11(void)
 {                 
 

diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c
index 2231732ef7bf4fd35f6514f727dd9c9702bd0cf9..4a0ec69646309da1060827c5c753a90dfed195fa 100644 (file)
--- a/epan/dissectors/packet-9p.c
+++ b/epan/dissectors/packet-9p.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
  *
  * File permission bits decoding taken from packet-nfs.c
@@ -675,7 +675,7 @@ static void dissect_9P_dm(tvbuff_t * tvb,  proto_item * item,int offset,int iscr
        decode_boolean_bitfield(dm,      01, 32, "Execute permission for others", "no Execute permission for others"));
 }
 
-/* Register 9P with Ethereal */
+/* Register 9P with Wireshark */
 void proto_register_9P(void)
 {
        static hf_register_info hf[] = {

diff --git a/epan/dissectors/packet-MAP_DialoguePDU.c b/epan/dissectors/packet-MAP_DialoguePDU.c
index 66d87f561935e9f0cb118327e6ce3894425ae0bb..f221cfcdf4e2b2938693a00a30e4b5e1f61e1688 100644 (file)
--- a/epan/dissectors/packet-MAP_DialoguePDU.c
+++ b/epan/dissectors/packet-MAP_DialoguePDU.c
@@ -1,5 +1,5 @@
 /* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler    */
 /* ./packet-MAP_DialoguePDU.c                                                 */
 /* ../../tools/asn2eth.py -X -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */
 
@@ -11,8 +11,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-MAP_DialoguePDU.h b/epan/dissectors/packet-MAP_DialoguePDU.h
index d12bb8cc8b4ff555c9dbe0855e9880ec7b2bbd3f..857b9660a3fc60cf510c863e9bd244f7ba31bbfa 100644 (file)
--- a/epan/dissectors/packet-MAP_DialoguePDU.h
+++ b/epan/dissectors/packet-MAP_DialoguePDU.h
@@ -1,5 +1,5 @@
 /* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler    */
 /* ./packet-MAP_DialoguePDU.h                                                 */
 /* ../../tools/asn2eth.py -X -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */
 
@@ -11,8 +11,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-aarp.c b/epan/dissectors/packet-aarp.c
index 56aab63808333c6eb57c016c29df8849a4b805a1..5162de44489655ffee79109507ec2318052204d3 100644 (file)
--- a/epan/dissectors/packet-aarp.c
+++ b/epan/dissectors/packet-aarp.c
@@ -5,8 +5,8 @@
  *
  * Simon Wilkinson <sxw@dcs.ed.ac.uk>
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998
  *
  * This program is free software; you can redistribute it and/or

diff --git a/epan/dissectors/packet-acap.c b/epan/dissectors/packet-acap.c
index aee315dd2c6cb9e83cff8c02604b3d9a32d7b7f9..60d95c13d9a0d1fe9c9740ac732926cca9ec4143 100644 (file)
--- a/epan/dissectors/packet-acap.c
+++ b/epan/dissectors/packet-acap.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
  *
  * Copied from packet-imap.c

diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c
index ebdae1f39c4f89f9922b9b62a4d97c7eb9ff3b70..1a024fdd54301e5ece78cca04dda0d71c7148abc 100644 (file)
--- a/epan/dissectors/packet-acp133.c
+++ b/epan/dissectors/packet-acp133.c
@@ -1,5 +1,5 @@
 /* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler    */
 /* .\packet-acp133.c                                                          */
 /* ../../tools/asn2eth.py -X -b -e -p acp133 -c acp133.cnf -s packet-acp133-template acp133.asn */
 
@@ -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/dissectors/packet-acp133.h b/epan/dissectors/packet-acp133.h
index d4d4989394452723b92c3920e292e6efbc6bb08b..46f3ea462b84feab0c170345ae8ff9c081f7b5e8 100644 (file)
--- a/epan/dissectors/packet-acp133.h
+++ b/epan/dissectors/packet-acp133.h
@@ -1,5 +1,5 @@
 /* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler    */
 /* .\packet-acp133.h                                                          */
 /* ../../tools/asn2eth.py -X -b -e -p acp133 -c acp133.cnf -s packet-acp133-template acp133.asn */
 
@@ -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/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index 4452ec806df088ed9fd0ba2646732f6233e45d74..fdef7060b05c504986d0ea7c6f9efd9c3d4161cc 100644 (file)
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -1,5 +1,5 @@
 /* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler    */
 /* ./packet-acse.c                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn */
 
@@ -23,8 +23,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-acse.h b/epan/dissectors/packet-acse.h
index dd679fdd04f72551bbd41bbfb1567eb4253ff8ed..e0ef3d6cb20ea68b87bfe753466fc6475e6de0c4 100644 (file)
--- a/epan/dissectors/packet-acse.h
+++ b/epan/dissectors/packet-acse.h
@@ -1,5 +1,5 @@
 /* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler    */
 /* ./packet-acse.h                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn */
 
@@ -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/dissectors/packet-actrace.c b/epan/dissectors/packet-actrace.c
index a446c9d0f9f41c685b52f5a7604a04e5bcabbe17..6d885f0b5c3bc5f2446a02af9c8fb121f4b5d4bc 100644 (file)
--- a/epan/dissectors/packet-actrace.c
+++ b/epan/dissectors/packet-actrace.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 1999 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or

diff --git a/epan/dissectors/packet-actrace.h b/epan/dissectors/packet-actrace.h
index 7c1ec5ef49bc577e7dfb571c128c911bbacd2334..3d0432efab77650c1bf60e2613e5471d22280bf5 100644 (file)
--- a/epan/dissectors/packet-actrace.h
+++ b/epan/dissectors/packet-actrace.h
@@ -5,8 +5,8 @@
  *
  * Copyright (c) 2005 by Alejandro Vaquero <alejandro.vaquero@verso.com>
  *
- * 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/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c
index 39a4802381ebe51347b4a5417e428673fb91f94b..1c1ab347212092d4b231bbae56126d27d3289d36 100644 (file)
--- a/epan/dissectors/packet-afp.c
+++ b/epan/dissectors/packet-afp.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
  *
  * Copied from README.developer

diff --git a/epan/dissectors/packet-afp.h b/epan/dissectors/packet-afp.h
index 57e8bb80e6ce88141f60375b45d56ba0cf9d1303..f7b608a0ada69f394737cecf4daf7312657ea38c 100644 (file)
--- a/epan/dissectors/packet-afp.h
+++ b/epan/dissectors/packet-afp.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/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c
index 544bcf3d8207f42d5c0370d452e5342d9e384fef..f61531b54eee25b82c0e1c89c5a469163c350793 100644 (file)
--- a/epan/dissectors/packet-afs.c
+++ b/epan/dissectors/packet-afs.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
  *
  * Copied from packet-tftp.c

diff --git a/epan/dissectors/packet-afs.h b/epan/dissectors/packet-afs.h
index 6569b08c9b675d39a059634ffe0e383fc2d7e63a..29a78d1065df34b1015e3132b438f637a434ab1e 100644 (file)
--- a/epan/dissectors/packet-afs.h
+++ b/epan/dissectors/packet-afs.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/dissectors/packet-aim-admin.c b/epan/dissectors/packet-aim-admin.c
index 774868d6e432032c833e9528f74f95ccc3bf429f..59d9d4d4c39ef2021cb723e950286f3dbc554097 100644 (file)
--- a/epan/dissectors/packet-aim-admin.c
+++ b/epan/dissectors/packet-aim-admin.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
@@ -98,7 +98,7 @@ static const aim_subtype aim_fnac_family_admin[] = {
   { 0, NULL, NULL }
 };
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim_admin(void)
 {

diff --git a/epan/dissectors/packet-aim-adverts.c b/epan/dissectors/packet-aim-adverts.c
index d272b2241cfa54b40cdc582fbe3411f3edf9a572..2bd329cbe7163b5aecd92d8eb4ace9b51de439f1 100644 (file)
--- a/epan/dissectors/packet-aim-adverts.c
+++ b/epan/dissectors/packet-aim-adverts.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
@@ -58,7 +58,7 @@ static int proto_aim_adverts = -1;
 /* Initialize the subtree pointers */
 static gint ett_aim_adverts      = -1;
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim_adverts(void)
 {

diff --git a/epan/dissectors/packet-aim-bos.c b/epan/dissectors/packet-aim-bos.c
index ff52f15d41fa15c2152eefd445cdff70f9de7b2a..563f52051d6192d83253e00b4aa527acbd51a1ff 100644 (file)
--- a/epan/dissectors/packet-aim-bos.c
+++ b/epan/dissectors/packet-aim-bos.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
@@ -95,7 +95,7 @@ static int dissect_aim_bos_buddyname(tvbuff_t *tvb, packet_info *pinfo, proto_tr
        return offset;
 }
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim_bos(void)
 {

diff --git a/epan/dissectors/packet-aim-buddylist.c b/epan/dissectors/packet-aim-buddylist.c
index 1c4af05deb46afd29be13c09debe8a5c5da4630e..e9ed91de1ff672a80f3d91488718415fe285ae67 100644 (file)
--- a/epan/dissectors/packet-aim-buddylist.c
+++ b/epan/dissectors/packet-aim-buddylist.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
@@ -141,7 +141,7 @@ static const aim_subtype aim_fnac_family_buddylist[] = {
        { 0, NULL, NULL }
 };
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim_buddylist(void)
 {

diff --git a/epan/dissectors/packet-aim-chat.c b/epan/dissectors/packet-aim-chat.c
index 9b59b39fa4d4918fe5981bf25d41b67a66824570..db42102309ceb6b4e5ba0d2c4b8111cb1ac92d57 100644 (file)
--- a/epan/dissectors/packet-aim-chat.c
+++ b/epan/dissectors/packet-aim-chat.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
@@ -135,7 +135,7 @@ static const aim_subtype aim_fnac_family_chat[] = {
   { 0, NULL, NULL }
 };
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim_chat(void)
 {

diff --git a/epan/dissectors/packet-aim-chatnav.c b/epan/dissectors/packet-aim-chatnav.c
index cfc3aec2e4840a049dad7cbee6e107df7ed8a3d0..a5f69b5122fd2be6b9e5d3b6f822931a0f77ae29 100644 (file)
--- a/epan/dissectors/packet-aim-chatnav.c
+++ b/epan/dissectors/packet-aim-chatnav.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
@@ -59,7 +59,7 @@ static int proto_aim_chatnav = -1;
 
 static int ett_aim_chatnav = -1;
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim_chatnav(void)
 {

diff --git a/epan/dissectors/packet-aim-directory.c b/epan/dissectors/packet-aim-directory.c
index e59f6cb801b93fea4af7e7cc44f081accc6d544c..65875f4a2d4ccb3da71452bb98667ab43e980fb9 100644 (file)
--- a/epan/dissectors/packet-aim-directory.c
+++ b/epan/dissectors/packet-aim-directory.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
@@ -63,7 +63,7 @@ static const aim_subtype aim_fnac_family_directory[] = {
 };
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim_directory(void)
 {

diff --git a/epan/dissectors/packet-aim-email.c b/epan/dissectors/packet-aim-email.c
index dc1287e2cdbf570e4e87bf7dc995acf45854ac84..f69d4eb4dcbcee3a7a7b87cc0df32aff84e4ec78 100644 (file)
--- a/epan/dissectors/packet-aim-email.c
+++ b/epan/dissectors/packet-aim-email.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
@@ -54,7 +54,7 @@ static int proto_aim_email = -1;
 /* Initialize the subtree pointers */
 static gint ett_aim_email      = -1;
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim_email(void)
 {

diff --git a/epan/dissectors/packet-aim-generic.c b/epan/dissectors/packet-aim-generic.c
index dd237ca00f1c55770ca35b7863b210d781af056a..86a3985a2f71fad1c36f9f2593351805b8ea6c5c 100644 (file)
--- a/epan/dissectors/packet-aim-generic.c
+++ b/epan/dissectors/packet-aim-generic.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
@@ -465,7 +465,7 @@ static const aim_subtype aim_fnac_family_generic[] = {
 };
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim_generic(void)
 {

diff --git a/epan/dissectors/packet-aim-icq.c b/epan/dissectors/packet-aim-icq.c
index f73b3ffe94af733132856a07f16c6df712198c72..e41800d2e94aad35fa6381c8358b97a998a44e66 100644 (file)
--- a/epan/dissectors/packet-aim-icq.c
+++ b/epan/dissectors/packet-aim-icq.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
@@ -214,7 +214,7 @@ static const aim_subtype aim_fnac_family_icq[] = {
 };
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim_icq(void)
 {

diff --git a/epan/dissectors/packet-aim-invitation.c b/epan/dissectors/packet-aim-invitation.c
index 6d6134f3296af3c97615a2a7be8add5b4fcf8c1b..680c2985050f47f99897b28e27e03c28be1e5c5a 100644 (file)
--- a/epan/dissectors/packet-aim-invitation.c
+++ b/epan/dissectors/packet-aim-invitation.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
@@ -60,7 +60,7 @@ static const aim_subtype aim_fnac_family_invitation[] = {
 
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim_invitation(void)
 {

diff --git a/epan/dissectors/packet-aim-location.c b/epan/dissectors/packet-aim-location.c
index b7bfe42728ea64e6dd54eba913f9f1a6dd0964d2..d4c8b019accd4745305d8b7faa1635cff7622074 100644 (file)
--- a/epan/dissectors/packet-aim-location.c
+++ b/epan/dissectors/packet-aim-location.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/dissectors/packet-aim-messaging.c b/epan/dissectors/packet-aim-messaging.c
index ba5c761c17240c827223b026c8e4e3f60f99f8c7..de7ec3abfaf11178f874c2ff2e2d27a148aabe73 100644 (file)
--- a/epan/dissectors/packet-aim-messaging.c
+++ b/epan/dissectors/packet-aim-messaging.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
@@ -535,7 +535,7 @@ static const aim_subtype aim_fnac_family_messaging[] = {
 
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim_messaging(void)
 {

diff --git a/epan/dissectors/packet-aim-oft.c b/epan/dissectors/packet-aim-oft.c
index b196d32fefa28e4f9771e77469f5d560b2d3e5fa..746e4368bb79bc55d4a401d49f4aa2e594b156b4 100644 (file)
--- a/epan/dissectors/packet-aim-oft.c
+++ b/epan/dissectors/packet-aim-oft.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
@@ -80,7 +80,7 @@ static int ett_aim_sendfile = -1;*/
  */
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim_oft(void)
 {

diff --git a/epan/dissectors/packet-aim-popup.c b/epan/dissectors/packet-aim-popup.c
index 2bccc8d4ec9a365f3a58e6e1b96b330b63a93c24..9b55bbf683350d18c8707404d3073b4270771f08 100644 (file)
--- a/epan/dissectors/packet-aim-popup.c
+++ b/epan/dissectors/packet-aim-popup.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
@@ -76,7 +76,7 @@ static const aim_subtype aim_fnac_family_popup[] = {
 };
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim_popup(void)
 {

diff --git a/epan/dissectors/packet-aim-signon.c b/epan/dissectors/packet-aim-signon.c
index 4758f601f9fb2ec65605f322d6454f082e46f94f..6f323fd443f117e5baba4669df413e802549ed5c 100644 (file)
--- a/epan/dissectors/packet-aim-signon.c
+++ b/epan/dissectors/packet-aim-signon.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
@@ -153,7 +153,7 @@ static const aim_subtype aim_fnac_family_signon[] = {
 };
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim_signon(void)
 {

diff --git a/epan/dissectors/packet-aim-ssi.c b/epan/dissectors/packet-aim-ssi.c
index 4809511b88de17d13a4656abb08cc4b896b16dbd..d95f9050574d5abd7eb074e58869e8c8365e345d 100644 (file)
--- a/epan/dissectors/packet-aim-ssi.c
+++ b/epan/dissectors/packet-aim-ssi.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
@@ -209,7 +209,7 @@ static const aim_subtype aim_fnac_family_ssi[] = {
 };
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim_ssi(void)
 {

diff --git a/epan/dissectors/packet-aim-sst.c b/epan/dissectors/packet-aim-sst.c
index 6d83dbefa79f05cf272dedca645cc1a8facdecb4..ca033416298edc4aab2d5ae19314eb7c3648ebdb 100644 (file)
--- a/epan/dissectors/packet-aim-sst.c
+++ b/epan/dissectors/packet-aim-sst.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
@@ -146,7 +146,7 @@ static const aim_subtype aim_fnac_family_sst[] = {
 };
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim_sst(void)
 {

diff --git a/epan/dissectors/packet-aim-stats.c b/epan/dissectors/packet-aim-stats.c
index 9758cea57570ad83ea5c3164b2046c0c670884bc..06d96e57dcab93d4039d6cb8ba02ccf536ecab7b 100644 (file)
--- a/epan/dissectors/packet-aim-stats.c
+++ b/epan/dissectors/packet-aim-stats.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
@@ -56,7 +56,7 @@ static const aim_subtype aim_fnac_family_stats[] = {
 };
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim_stats(void)
 {

diff --git a/epan/dissectors/packet-aim-translate.c b/epan/dissectors/packet-aim-translate.c
index 7d3943fefbb75f42e09800dd0ac18476ef7cc357..45af9e4bab275cd5f18f4df2ec018683fc3c9a1d 100644 (file)
--- a/epan/dissectors/packet-aim-translate.c
+++ b/epan/dissectors/packet-aim-translate.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
@@ -53,7 +53,7 @@ static const aim_subtype aim_fnac_family_translate[] = {
   { 0, NULL, NULL }
 };
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim_translate(void)
 {

diff --git a/epan/dissectors/packet-aim-userlookup.c b/epan/dissectors/packet-aim-userlookup.c
index 6d7385716da0f951fc0fab313903b7e631b47033..1d01be116fee1994ab710cb761547723acbd1215 100644 (file)
--- a/epan/dissectors/packet-aim-userlookup.c
+++ b/epan/dissectors/packet-aim-userlookup.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
@@ -67,7 +67,7 @@ static const aim_subtype aim_fnac_family_userlookup[] = {
   { 0, NULL, NULL }
 };
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim_userlookup(void)
 {

diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c
index a49ad74e4d3d4cac9b815c88d0c9d758fc77fb27..7740f778e4dd2e35d73f5276406cbd82409d507e 100644 (file)
--- a/epan/dissectors/packet-aim.c
+++ b/epan/dissectors/packet-aim.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
@@ -1310,7 +1310,7 @@ int dissect_aim_tlv_list(tvbuff_t *tvb, packet_info *pinfo,
     return offset;
 }
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aim(void)
 {

diff --git a/epan/dissectors/packet-aim.h b/epan/dissectors/packet-aim.h
index bd50f806be85169a96fd9d0406bd8544fd0b7189..e5a69d831b926b79850259f7d8193c3187209192 100644 (file)
--- a/epan/dissectors/packet-aim.h
+++ b/epan/dissectors/packet-aim.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/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c
index cfa603b34757aac0e722dd78834927c75838eb8e..cbaa742be03ac59a2e84e7f816908444920da418 100644 (file)
--- a/epan/dissectors/packet-ajp13.c
+++ b/epan/dissectors/packet-ajp13.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
@@ -45,7 +45,7 @@
  * You need to be looking at: jk/doc/AJP13.html in the
  * jakarta-tomcat-connectors repository.
  *
- * If you're an ethereal dissector guru, then you can skip the rest of
+ * If you're an wireshark dissector guru, then you can skip the rest of
  * this. I'm writing it all down because I've written 3 dissectors so
  * far and every time I've forgotten it all and had to re-learn it
  * from scratch. Not this time, damnit.
@@ -83,9 +83,9 @@
  * order. Users don't normally care, because the low-level kernel
  * networking code takes care of reassembling them properly. But we're
  * looking at raw network packets, aren't we? The stuff on the
- * wire. Ethereal has been getting better and better at helping
+ * wire. Wireshark has been getting better and better at helping
  * dissectors with this. I'm a little fuzzy on the details, but my
- * uderstanding is that ethereal now contains a fairly substantial
+ * uderstanding is that wireshark now contains a fairly substantial
  * user-space TCP/IP stack so it can re-assemble the data. But I might
  * be wrong. Since AJP13 is going to be used either on the loopback
  * interface or on a LAN, it isn't likely to be a big issues anyway.
@@ -97,12 +97,12 @@
  * obviously possible, but a royal pain. During the "phase one"
  * in-order pass you have to keep track of a bunch of offsets and
  * store which PDU goes with which TCP segment. Luckly, recent
- * (0.9.4+) versions of ethereal provide the "tcp_dissect_pdus()"
+ * (0.9.4+) versions of wireshark provide the "tcp_dissect_pdus()"
  * function that takes care of much of the work. See the comments in
  * packet-tcp.c, the example code in packet-dns.c, or check the
  * ethereal-dev archives for details.
  *
- * 3) Ethereal isn't guaranteed to see all the data. I'm a little
+ * 3) Wireshark isn't guaranteed to see all the data. I'm a little
  * unclear on all the possible failure modes, but it comes down to: a)
  * Not your fault: it's an imperfect world, we're eavesdroppers, and
  * stuff happens. We might totally miss packets or get garbled
@@ -630,7 +630,7 @@ display_req_forward(tvbuff_t *tvb, packet_info *pinfo,
 
 
 
-/* main dissector function. ethereal calls it for segments in both
+/* main dissector function. wireshark calls it for segments in both
  * directions.
  */
 static void

diff --git a/epan/dissectors/packet-alcap.c b/epan/dissectors/packet-alcap.c
index c64bc0dbda49bf357c9da36d81140377e45dea8c..45bfe3aec0029d0b373ba69f4f5870024a47be8f 100644 (file)
--- a/epan/dissectors/packet-alcap.c
+++ b/epan/dissectors/packet-alcap.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/packet-alcap.h b/epan/dissectors/packet-alcap.h
index 9ed413333a544d9ccd4a281ae0c332d95205c6d3..2cc34ae7755e9d36678c04f169f863a57af892e9 100644 (file)
--- a/epan/dissectors/packet-alcap.h
+++ b/epan/dissectors/packet-alcap.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/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c
index 494c4fd330e7eb3bc62ea60b6b2225f5f5b63fc2..352d6b00df426956e64b43cb7ab0b87bfbcdc204 100644 (file)
--- a/epan/dissectors/packet-amr.c
+++ b/epan/dissectors/packet-amr.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
@@ -282,7 +282,7 @@ dissect_amr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 }
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 /* If this dissector uses sub-dissector registration add a registration routine.
    This format is required because a script is used to find these routines and
    create the code that calls these routines.

diff --git a/epan/dissectors/packet-ans.c b/epan/dissectors/packet-ans.c
index 213c0a973596697148cec07fe73bb621b02f3039..deda44e4fe8130e6841e730cf095fe17bdf23bde 100644 (file)
--- a/epan/dissectors/packet-ans.c
+++ b/epan/dissectors/packet-ans.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 2003 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or

diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c
index 172e5749dfe64748526bce2a8ef0ef643380dfb9..67f8ff634bf99043f2235b727b407b6932d6c920 100644 (file)
--- a/epan/dissectors/packet-ansi_637.c
+++ b/epan/dissectors/packet-ansi_637.c
@@ -11,8 +11,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
@@ -1777,7 +1777,7 @@ dissect_ansi_637_trans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     }
 }
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_ansi_637(void)
 {

diff --git a/epan/dissectors/packet-ansi_683.c b/epan/dissectors/packet-ansi_683.c
index 7a9b2617552974300ebfd81c48b0da650425d512..a75115d1926f4042528671b09bc22044dccf380b 100644 (file)
--- a/epan/dissectors/packet-ansi_683.c
+++ b/epan/dissectors/packet-ansi_683.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
@@ -1999,7 +1999,7 @@ dissect_ansi_683(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 }
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_ansi_683(void)
 {

diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c
index 54db5b633d78e07f658aadfa7da017044c6fa6c6..15c0527e69a4a0d043264ae48f576e2805ded81b 100644 (file)
--- a/epan/dissectors/packet-ansi_801.c
+++ b/epan/dissectors/packet-ansi_801.c
@@ -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
@@ -834,7 +834,7 @@ dissect_ansi_801(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 }
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_ansi_801(void)
 {

diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c
index 87d82d855f83f9b50db1958d56980ab79a73240b..cbe98a45507ce79b4cc82e0da796ef04e610def6 100644 (file)
--- a/epan/dissectors/packet-ansi_a.c
+++ b/epan/dissectors/packet-ansi_a.c
@@ -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
@@ -8204,7 +8204,7 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 }
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_ansi_a(void)
 {

diff --git a/epan/dissectors/packet-ansi_a.h b/epan/dissectors/packet-ansi_a.h
index 9c49486aff3963af18e22d8591eb15986e3b7b4d..35179b7d347872fd7c0c4d7bb4a19ad82e17d50d 100644 (file)
--- a/epan/dissectors/packet-ansi_a.h
+++ b/epan/dissectors/packet-ansi_a.h
@@ -5,8 +5,8 @@
  * Copyright 2003, Michael Lum <mlum [AT] telostech.com>,
  * In association with Telos Technology Inc.
  *
- * 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
@@ -36,7 +36,7 @@ typedef struct _ansi_a_tap_rec_t {
 /*
  * the following allows TAP code access to the messages
  * without having to duplicate it. With MSVC and a 
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
  */
 ETH_VAR_IMPORT const value_string ansi_a_ios401_bsmap_strings[];
 ETH_VAR_IMPORT const value_string ansi_a_ios401_dtap_strings[];

diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c
index 5f009b2ac7934e2de166ce3e0cb6cadc3d8b7f48..e7ad223cf889d9aff546d30b739d41f6a3dceb53 100644 (file)
--- a/epan/dissectors/packet-ansi_map.c
+++ b/epan/dissectors/packet-ansi_map.c
@@ -81,8 +81,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
@@ -13016,7 +13016,7 @@ dissect_ansi_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 }
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_ansi_map(void)
 {

diff --git a/epan/dissectors/packet-ansi_map.h b/epan/dissectors/packet-ansi_map.h
index db7e4e9f79162c4b12a7c9f73be5017eca8363c5..3d9177ca8c1e2a00d5572a7cf339ef791fcf0c33 100644 (file)
--- a/epan/dissectors/packet-ansi_map.h
+++ b/epan/dissectors/packet-ansi_map.h
@@ -5,8 +5,8 @@
  * Copyright 2003, Michael Lum <mlum [AT] telostech.com>,
  * In association with Telos Technology Inc.
  *
- * 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
@@ -35,7 +35,7 @@ typedef struct _ansi_map_tap_rec_t {
 /*
  * the following allows TAP code access to the messages
  * without having to duplicate it. With MSVC and a 
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
  */
 ETH_VAR_IMPORT const value_string ansi_map_opr_code_strings[];
 

diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c
index f2f705e4026cdee2f3e5f2aae9c8ac1d4f48eabe..d228933504baf858e7e1e30315980cc10781fc54 100644 (file)
--- a/epan/dissectors/packet-aodv.c
+++ b/epan/dissectors/packet-aodv.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
@@ -839,7 +839,7 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 }
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_aodv(void)
 {

diff --git a/epan/dissectors/packet-ap1394.c b/epan/dissectors/packet-ap1394.c
index 98866ef628d7b4d60807538c78785283077ca9dd..1b19d4e8205b2bd5ea85ce405f219728f9bb99eb 100644 (file)
--- a/epan/dissectors/packet-ap1394.c
+++ b/epan/dissectors/packet-ap1394.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/dissectors/packet-ap1394.h b/epan/dissectors/packet-ap1394.h
index f8f8cbc0ab462412ce2730a68a7421e43a51885b..db4efb11939f42ddf51a0c8234ba67f2d36b67ea 100644 (file)
--- a/epan/dissectors/packet-ap1394.h
+++ b/epan/dissectors/packet-ap1394.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/dissectors/packet-app-pkix-cert.c b/epan/dissectors/packet-app-pkix-cert.c
index efd69cde5e30f517f82aefb6ceb781171da3681d..7e82e08e61d69d2a11834a8d12fc759b53eaf636 100644 (file)
--- a/epan/dissectors/packet-app-pkix-cert.c
+++ b/epan/dissectors/packet-app-pkix-cert.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
@@ -69,7 +69,7 @@ dissect_cert(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 }
 
 
-/****************** Register the protocol with Ethereal ******************/
+/****************** Register the protocol with Wireshark ******************/
 
 
 /* This format is required because a script is used to build the C function

diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c
index e030e755a38f5a4aa2926de7dfdcee4fb4ed2d73..9badf3ef064d04643584cb8df056dc47611683e4 100644 (file)
--- a/epan/dissectors/packet-arcnet.c
+++ b/epan/dissectors/packet-arcnet.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/dissectors/packet-arcnet.h b/epan/dissectors/packet-arcnet.h
index 7047671e51c0dd2c5324526bb99510ca1523ab50..c6632ec469c0bc3ef75b10030c3e430c7f9b727f 100644 (file)
--- a/epan/dissectors/packet-arcnet.h
+++ b/epan/dissectors/packet-arcnet.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/dissectors/packet-armagetronad.c b/epan/dissectors/packet-armagetronad.c
index b2e7080a81e1ba07d3b523cab8b087f37162ee22..e50c40248c8c85fd088fedf0e0d03aef35a40b31 100644 (file)
--- a/epan/dissectors/packet-armagetronad.c
+++ b/epan/dissectors/packet-armagetronad.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/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c
index 227f66ffcc958d5f037f14addccd1565bd673ff4..9e1bcc1988008a95e1b50a41da56f4bd5734dd2a 100644 (file)
--- a/epan/dissectors/packet-arp.c
+++ b/epan/dissectors/packet-arp.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/dissectors/packet-arp.h b/epan/dissectors/packet-arp.h
index 721c024d9e264001e09ed18f986b23f374e7254d..793d2a44cd56aad8129cf9981e91df8725a29cdc 100644 (file)
--- a/epan/dissectors/packet-arp.h
+++ b/epan/dissectors/packet-arp.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/dissectors/packet-aruba-adp.c b/epan/dissectors/packet-aruba-adp.c
index 1103462709edd4761d2d6723f214ab1212486800..840dbce27b67e16c6d255c2e8edc1b67c785c04d 100644 (file)
--- a/epan/dissectors/packet-aruba-adp.c
+++ b/epan/dissectors/packet-aruba-adp.c
@@ -5,8 +5,8 @@
  *
  * Giles Scott < gscott <at> arubanetworks dot 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/dissectors/packet-asap.c b/epan/dissectors/packet-asap.c
index 8d3ff3b49f90284ac97e97f97b6205644f7d9d59..edb3ae5384b17403742b41d1e931d073ffdf88c4 100644 (file)
--- a/epan/dissectors/packet-asap.c
+++ b/epan/dissectors/packet-asap.c
@@ -15,8 +15,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
@@ -691,7 +691,7 @@ dissect_asap(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree)
   dissect_asap_message(message_tvb, pinfo, asap_tree);
 }
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_asap(void)
 {

diff --git a/epan/dissectors/packet-ascend.c b/epan/dissectors/packet-ascend.c
index a1274b2e4d2015a12d479d556abebb95f2d2e2a7..d9b439ba7fdc487cc8107362f432c08db9ebe8be 100644 (file)
--- a/epan/dissectors/packet-ascend.c
+++ b/epan/dissectors/packet-ascend.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>
  *
  * 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/dissectors/packet-asf.c b/epan/dissectors/packet-asf.c
index 95ae78616c3da84fda18d41e98dafa9a69ccff3b..ec01becd1e98ddfbb50b21f6d6972e3be1cf888d 100644 (file)
--- a/epan/dissectors/packet-asf.c
+++ b/epan/dissectors/packet-asf.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
  *
  * Copied from packet-rmcp.c

diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c
index 8cc889e20f65f9e9be03c81281cb010ee445670f..87d7226469b1f4080f3bcbcfc3b3d4399627212b 100644 (file)
--- a/epan/dissectors/packet-atalk.c
+++ b/epan/dissectors/packet-atalk.c
@@ -6,8 +6,8 @@
  *
  * Simon Wilkinson <sxw@dcs.ed.ac.uk>
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998
  *
  * This program is free software; you can redistribute it and/or

diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c
index 900877a387b5e6e8c9f08fd08b48026ee860a906..368c796e6e9c7b0f3c371340fe8862a37282f6ff 100644 (file)
--- a/epan/dissectors/packet-atm.c
+++ b/epan/dissectors/packet-atm.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/dissectors/packet-atm.h b/epan/dissectors/packet-atm.h
index 3e60eeeafe74f480391f3ff39376395bdc02470b..2c6f04213a223d5412f2e55bff776a019b6cd5a1 100644 (file)
--- a/epan/dissectors/packet-atm.h
+++ b/epan/dissectors/packet-atm.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/dissectors/packet-auto_rp.c b/epan/dissectors/packet-auto_rp.c
index 6fdce8bb32ca5a2361cf6ec51dde7489f4d74cc8..19f9e8952b008a612c8bcd7d67f83e99fd662d52 100644 (file)
--- a/epan/dissectors/packet-auto_rp.c
+++ b/epan/dissectors/packet-auto_rp.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/dissectors/packet-ax4000.c b/epan/dissectors/packet-ax4000.c
index ae63cfad3476f7b3d4c50d2d381442b1806d5bfa..e76d406d5b4be72a7a0452fbf7b5b5611545869b 100644 (file)
--- a/epan/dissectors/packet-ax4000.c
+++ b/epan/dissectors/packet-ax4000.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
@@ -104,7 +104,7 @@ dissect_ax4000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 /* If this protocol has a sub-dissector call it here, see section 1.8 */
 }
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 
 /* this format is require because a script is used to build the C function
    that calls all the protocol registration.

diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c
index 0ae3eb2a4bb7a5bd4f67c8c4b782e4a906b8e24f..f43ee67592655ded34cc56d9dd03cd2edffc760e 100644 (file)
--- a/epan/dissectors/packet-bacapp.c
+++ b/epan/dissectors/packet-bacapp.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
  *
  * Copied from README.developer,v 1.23

diff --git a/epan/dissectors/packet-bacapp.h b/epan/dissectors/packet-bacapp.h
index d02f507a0a58a41a4e7c14ead0698e28098d83e3..2a37e449c6429a8d711a985ba6659197fbfa4ab8 100644 (file)
--- a/epan/dissectors/packet-bacapp.h
+++ b/epan/dissectors/packet-bacapp.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
  *
  * Copied from README.developer,v 1.23

diff --git a/epan/dissectors/packet-bacnet.c b/epan/dissectors/packet-bacnet.c
index 571bcce368e7eed416d7cb2b2128c58bd6d931d0..cb2966a57ba4c18eaf342c55a519827cd0ff6cd3 100644 (file)
--- a/epan/dissectors/packet-bacnet.c
+++ b/epan/dissectors/packet-bacnet.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
  *
  * Copied from README.developer,v 1.23

diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c
index a16486391104e0c2ba8f5851be973bdc522054ba..3eaf2a4f2ca9abee8ff74a95434d7011c6f38ac6 100644 (file)
--- a/epan/dissectors/packet-beep.c
+++ b/epan/dissectors/packet-beep.c
@@ -9,7 +9,7 @@
  * Original BXXP dissector developed with funding from InvisibleWorlds
  * (www.invisibleworlds.com) via Collab.Net.
  *
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
  * By Gerald Combs
  * Copyright 1999 Gerald Combs
  *

diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 8f28d1aab8e160981a3e8487e5ddb241de9c12a0..bb2a7b3313b1049bb95ed0a660446b57a1ecf413 100644 (file)
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -31,8 +31,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
@@ -372,7 +372,7 @@ call_ber_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *p
                if (oid == NULL)
                        item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "BER: No OID supplied to call_ber_oid_callback");
                else
-                       item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "BER: Dissector for OID:%s not implemented. Contact Ethereal developers if you want this supported", oid);
+                       item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "BER: Dissector for OID:%s not implemented. Contact Wireshark developers if you want this supported", oid);
                if(item){
                        next_tree=proto_item_add_subtree(item, ett_ber_unknown);
                }

diff --git a/epan/dissectors/packet-ber.h b/epan/dissectors/packet-ber.h
index eed005120067dbf54e6dbcd8224fa3bcd4ea6851..182d8b04501e6974952ea31b23935dcb4f78c70c 100644 (file)
--- a/epan/dissectors/packet-ber.h
+++ b/epan/dissectors/packet-ber.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/dissectors/packet-bfd.c b/epan/dissectors/packet-bfd.c
index e1098ea5c6df964f2be494f35404415829327abd..f822a7cd25bd0a8497b975471c99b270d027cb0a 100644 (file)
--- a/epan/dissectors/packet-bfd.c
+++ b/epan/dissectors/packet-bfd.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
@@ -297,7 +297,7 @@ static void dissect_bfd_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
     return;
 }
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void proto_register_bfd(void)
 {
 

diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c
index 39b14dabebfd69e12baf7622aada37049a80aa36..5e71734f1c0dcffd9a26dcb5cbf55f3062a15e83 100644 (file)
--- a/epan/dissectors/packet-bgp.c
+++ b/epan/dissectors/packet-bgp.c
@@ -22,8 +22,8 @@
  * Destination Preference Attribute for BGP (work in progress)
  * RFC1863 A BGP/IDRP Route Server alternative to a full mesh routing
  *
- * 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-bgp.h b/epan/dissectors/packet-bgp.h
index 0b59ab5b5c497932ab435ab8057616bf7ea04e8a..b712fc4f79031c447a00e575eb9a90149125edd8 100644 (file)
--- a/epan/dissectors/packet-bgp.h
+++ b/epan/dissectors/packet-bgp.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/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c
index c76ed44480015a598ec0f5f88cea2545a3bde89e..48316c6232332f869b5341642b8b50d929580209 100644 (file)
--- a/epan/dissectors/packet-bittorrent.c
+++ b/epan/dissectors/packet-bittorrent.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
  *
  * Copied from packet-pop.c

diff --git a/epan/dissectors/packet-bofl.c b/epan/dissectors/packet-bofl.c
index 3a9e9dd2f79cddc4b4141502a491be3b7fa41dd3..20ef24da8ba4872c45c5c5fe9a3ef35426900ccd 100644 (file)
--- a/epan/dissectors/packet-bofl.c
+++ b/epan/dissectors/packet-bofl.c
@@ -4,7 +4,7 @@
  *
  * $Id$
  *
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@unicom.net>
  * Copyright 1998 Gerald Combs
  *

diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index 5607361e1e94933e94d615851d800db7235982d9..aa266384d79f6671501d874c8f54054a7bbef94c 100644 (file)
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -33,8 +33,8 @@
  * CableHome(TM) 1.1 Specification
  *     http://www.cablelabs.com/projects/cablehome/downloads/specs/CH-SP-CH1.1-I11-060407.pdf
  *
- * 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-bootparams.c b/epan/dissectors/packet-bootparams.c
index 3634a82a11d1d217f2ae4f039e9c64be124fa02a..9dd28daa2a344eba9f4eb4cb8f2b02720e357a96 100644 (file)
--- a/epan/dissectors/packet-bootparams.c
+++ b/epan/dissectors/packet-bootparams.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 packet-smb.c

diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c
index caa23d609801eb985257efe414e4a947bb3179d5..769a7863e96f7b857ea5c3c699beb49e7c1e43c0 100644 (file)
--- a/epan/dissectors/packet-bpdu.c
+++ b/epan/dissectors/packet-bpdu.c
@@ -5,8 +5,8 @@
  *
  * Copyright 1999 Christophe Tronche <ch.tronche@computer.org>
  *
- * 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
@@ -344,7 +344,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     default:
       proto_tree_add_text(bpdu_tree, tvb, BPDU_VERSION_IDENTIFIER, 1,
-                          "   (Warning: this version of Ethereal only knows about versions 0, 2 & 3)");
+                          "   (Warning: this version of Wireshark only knows about versions 0, 2 & 3)");
       break;
     }
     proto_tree_add_uint(bpdu_tree, hf_bpdu_type, tvb, BPDU_TYPE, 1, bpdu_type);

diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c
index 3ce60b84044bce10af93dc8112dd1c0cda4b3784..1a74ccca7cfe2ff5a30dd203d248ff0fd4f68d7d 100644 (file)
--- a/epan/dissectors/packet-brdwlk.c
+++ b/epan/dissectors/packet-brdwlk.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
@@ -390,7 +390,7 @@ brdwlk_init(void)
     first_pkt = TRUE;
 }
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 
 /* this format is require because a script is used to build the C function
    that calls all the protocol registration.

diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c
index f565c4d203ac8c4168cb7ac55e15f7f4aa8862ca..7078a15b71e4515afd1bddf608be2db12508d217 100644 (file)
--- a/epan/dissectors/packet-bssap.c
+++ b/epan/dissectors/packet-bssap.c
@@ -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
@@ -2116,7 +2116,7 @@ dissect_bssap_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     return(TRUE);
 }
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_bssap(void)
 {

diff --git a/epan/dissectors/packet-bssap.h b/epan/dissectors/packet-bssap.h
index 63a2ce3df6ba049fb6b68f9749bfecd43e7e8d33..43cbc73bf449a7ab9b1bd61eb745d6e03452847f 100644 (file)
--- a/epan/dissectors/packet-bssap.h
+++ b/epan/dissectors/packet-bssap.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-bssgp.c b/epan/dissectors/packet-bssgp.c
index d34e27144f605b8e3913499fa36352bb899bfeef..d3416119632c87aa6ee9ffe7d5c4e2b9ca308604 100644 (file)
--- a/epan/dissectors/packet-bssgp.c
+++ b/epan/dissectors/packet-bssgp.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/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c
index c21046b250e473961dc0e56c3dc26fd8942803c0..1a09c8cb90a6b44b32117e2d3a39484bd4b2fe9c 100644 (file)
--- a/epan/dissectors/packet-bthci_acl.c
+++ b/epan/dissectors/packet-bthci_acl.c
@@ -3,13 +3,13 @@
  * Copyright 2002, Christoph Scholz <scholz@cs.uni-bonn.de>
  *  From: http://affix.sourceforge.net/archive/ethereal_affix-3.patch
  *
- * Refactored for ethereal checkin
+ * Refactored for wireshark checkin
  *   Ronnie Sahlberg 2006
  *
  * $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-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c
index b6f03b0122010c9e01fd573cdc1291b85b9e5d8f..0b890564e3463e9ee47c9a086cba920a965d7569 100644 (file)
--- a/epan/dissectors/packet-bthci_cmd.c
+++ b/epan/dissectors/packet-bthci_cmd.c
@@ -3,13 +3,13 @@
  * Copyright 2002, Christoph Scholz <scholz@cs.uni-bonn.de>
  *  From: http://affix.sourceforge.net/archive/ethereal_affix-3.patch
  *
- * Refactored for ethereal checkin
+ * Refactored for wireshark checkin
  *   Ronnie Sahlberg 2006
  *
  * $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
@@ -1268,7 +1268,7 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 }
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 
 /* this format is require because a script is used to build the C function
    that calls all the protocol registration.

diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c
index a46f502126714d600a6a56088aa603dde63aadb8..47cafce84c75583d769cd8c444bdc1abfe2750d4 100644 (file)
--- a/epan/dissectors/packet-bthci_evt.c
+++ b/epan/dissectors/packet-bthci_evt.c
@@ -3,14 +3,14 @@
  * Copyright 2002, Christoph Scholz <scholz@cs.uni-bonn.de>
  *  From: http://affix.sourceforge.net/archive/ethereal_affix-3.patch
  *
- * Refactored for ethereal checkin
+ * Refactored for wireshark checkin
  *   Ronnie Sahlberg 2006
  *
  *
  * $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
@@ -1591,7 +1591,7 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 }
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 
 /* this format is require because a script is used to build the C function
    that calls all the protocol registration.

diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c
index 00a2ccedbaf078fbe9987fbc83d1fdf7152fe586..ac41d6cb1d78053b5415db5cacc1c78f333b34ab 100644 (file)
--- a/epan/dissectors/packet-btl2cap.c
+++ b/epan/dissectors/packet-btl2cap.c
@@ -3,13 +3,13 @@
  * Copyright 2002, Christoph Scholz <scholz@cs.uni-bonn.de>
  *  From: http://affix.sourceforge.net/archive/ethereal_affix-3.patch
  *
- * Refactored for ethereal checkin
+ * Refactored for wireshark checkin
  *   Ronnie Sahlberg 2006
  *
  * $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
@@ -649,7 +649,7 @@ static void dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 }
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_btl2cap(void)
 {                 

diff --git a/epan/dissectors/packet-btl2cap.h b/epan/dissectors/packet-btl2cap.h
index 5288ce70f819587d0ab85aa43e4c8845f60a1b14..01464e5864b904e2909a6216647e4d5c06cf236e 100644 (file)
--- a/epan/dissectors/packet-btl2cap.h
+++ b/epan/dissectors/packet-btl2cap.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/dissectors/packet-bvlc.c b/epan/dissectors/packet-bvlc.c
index 0f92c5c6fad1bb630a7966f5dfd859ad0e82c68c..19d5fb8fb2d5aa9cf9ce2e067ecd56d1f862a981 100644 (file)
--- a/epan/dissectors/packet-bvlc.c
+++ b/epan/dissectors/packet-bvlc.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
  *
  * Copied from README.developer,v 1.23
@@ -421,6 +421,6 @@ proto_reg_handoff_bvlc(void)
  * a violation of this protocol.
  *
  * This dissector does not analyse UDP packets other than on port 0xBAC0.
- * If you changed your BACnet port locally, use the ethereal feature
+ * If you changed your BACnet port locally, use the wireshark feature
  * "Decode As".
  */

diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index 6194aced0cdca468fad5850eb004739036537922..0b06de168cd95b1347592d52837421b407a9ae41 100644 (file)
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -1,5 +1,5 @@
 /* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler    */
 /* .\packet-camel.c                                                           */
 /* ../../tools/asn2eth.py -X -b -e -p camel -c camel.cnf -s packet-camel-template camel.asn */
 
@@ -17,8 +17,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-camel.h b/epan/dissectors/packet-camel.h
index be8dddd309049a5aee3df0b547ae0a3e333a6889..5848e1d5f06460db94feb9dcff7aeefd103b2bed 100644 (file)
--- a/epan/dissectors/packet-camel.h
+++ b/epan/dissectors/packet-camel.h
@@ -1,5 +1,5 @@
 /* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler    */
 /* .\packet-camel.h                                                           */
 /* ../../tools/asn2eth.py -X -b -e -p camel -c camel.cnf -s packet-camel-template camel.asn */
 
@@ -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/dissectors/packet-cast.c b/epan/dissectors/packet-cast.c
index 49077b9ae40d1051a94ee42f60275c1895851fd1..8af644186f24d7de97af9957864f5f58595a615f 100644 (file)
--- a/epan/dissectors/packet-cast.c
+++ b/epan/dissectors/packet-cast.c
@@ -1089,7 +1089,7 @@ static void dissect_cast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   tcp_dissect_pdus(tvb, pinfo, tree, cast_desegment, 4, get_cast_pdu_len, dissect_cast_pdu);
 }
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_cast(void)
 {

diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index 77d9f8eb952698e5f17787c2bd396774d055c68b..c3def29f5665f3e2ca024c3d74dbefe3bcba1bca 100644 (file)
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.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
@@ -158,7 +158,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 
     /* Note that the first item of pinfo->pseudo_header->dct2000 will contain
-       the pseudo-header needed (in some cases) by the ethereal dissector */
+       the pseudo-header needed (in some cases) by the wireshark dissector */
 
 
     /***********************************************************************/
@@ -290,9 +290,9 @@ void proto_register_catapult_dct2000(void)
             }
         },
         { &hf_catapult_dct2000_encap,
-            { "Ethereal encapsulation",
+            { "Wireshark encapsulation",
               "dct2000.encapsulation", FT_UINT8, BASE_DEC, VALS(encap_vals), 0x0,
-              "Ethereal encapsulation used", HFILL
+              "Wireshark encapsulation used", HFILL
             }
         },
         { &hf_catapult_dct2000_unparsed_data,

diff --git a/epan/dissectors/packet-ccsds.c b/epan/dissectors/packet-ccsds.c
index cc9fc8a245f1ae7056fb1e365c18ffe2e0a6bb14..d515ab753b7fa0202d53d242177ad74cd1cbb32b 100644 (file)
--- a/epan/dissectors/packet-ccsds.c
+++ b/epan/dissectors/packet-ccsds.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
@@ -141,7 +141,7 @@ dissect_ccsds(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 }
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 /* this format is require because a script is used to build the C function
    that calls all the protocol registration.
 */

diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c
index d22b44863cf622118f230ed3fd2719d250a05acd..4e3630356c6e70ce53e0aab375ad17365c740727 100644 (file)
--- a/epan/dissectors/packet-cdp.c
+++ b/epan/dissectors/packet-cdp.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/dissectors/packet-cdt.c b/epan/dissectors/packet-cdt.c
index db17a8ded1c2f12777857d2498de59e4b37a9267..79c6dde2a5daaad03778933b9994777b5a414e3e 100644 (file)
--- a/epan/dissectors/packet-cdt.c
+++ b/epan/dissectors/packet-cdt.c
@@ -1,5 +1,5 @@
 /* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler    */
 /* ./packet-cdt.c                                                             */
 /* ../../tools/asn2eth.py -X -b -e -p cdt -c cdt.cnf -s packet-cdt-template cdt.asn */
 
@@ -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/dissectors/packet-cdt.h b/epan/dissectors/packet-cdt.h
index 454d4ad36253cfb157bbad758a79f331c62ad0ef..5055825f4f7df994c6b3128424e416e6bc024fad 100644 (file)
--- a/epan/dissectors/packet-cdt.h
+++ b/epan/dissectors/packet-cdt.h
@@ -1,5 +1,5 @@
 /* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler    */
 /* ./packet-cdt.h                                                             */
 /* ../../tools/asn2eth.py -X -b -e -p cdt -c cdt.cnf -s packet-cdt-template cdt.asn */
 
@@ -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/dissectors/packet-cgmp.c b/epan/dissectors/packet-cgmp.c
index d3611c71906d4150846e16f2ce9d38f817988d60..f788508649a5211f76078dc5837ab7f1a90c3552 100644 (file)
--- a/epan/dissectors/packet-cgmp.c
+++ b/epan/dissectors/packet-cgmp.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/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c
index 8067feef35b250ecb19cf47aee014651b20eef06..85ca020f3d095bb3a0165ed9639a17be096e7301 100644 (file)
--- a/epan/dissectors/packet-chdlc.c
+++ b/epan/dissectors/packet-chdlc.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/dissectors/packet-chdlc.h b/epan/dissectors/packet-chdlc.h
index 262b80a21b3fa662d8b718480275f324b449056f..f46664d299320a3040d9a84b69cde5c68fa645e0 100644 (file)
--- a/epan/dissectors/packet-chdlc.h
+++ b/epan/dissectors/packet-chdlc.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/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c
index 37ca092f76bd1e3357571deec3f14a22ce0030b9..ecfcd0a4ab2ff8dd5cb6cff861622700e6ed5771 100644 (file)
--- a/epan/dissectors/packet-cigi.c
+++ b/epan/dissectors/packet-cigi.c
@@ -6,8 +6,8 @@
  *
  * $Id: README.developer 15753 2005-09-10 19:43:41Z guy $
  *
- * 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
@@ -4890,7 +4890,7 @@ tvb_get_fixed_point(tvbuff_t *tvb, int offset, gint byte_order)
     return fixed / 128.0F;
 }
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 void
 proto_register_cigi(void)
 {                 

diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c
index 52d595ebdffa95f010c0a77eaed0a7e32b2df88c..623e816e3c8adf7b52874dd1c9dde7d89c829dfe 100644 (file)
--- a/epan/dissectors/packet-cimd.c
+++ b/epan/dissectors/packet-cimd.c
@@ -10,8 +10,8 @@
  * Refer to the AUTHORS file or the AUTHORS section in the man page
  * for contacting the author(s) of this file.
  *
- * 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-cimd.h b/epan/dissectors/packet-cimd.h
index 6a376e838c3bc9757357e7dd10787dbcf25f3bb9..bf54e31f9c06d3a2c14cf051fd9d0aa669d79401 100644 (file)
--- a/epan/dissectors/packet-cimd.h
+++ b/epan/dissectors/packet-cimd.h
@@ -10,8 +10,8 @@
  * Refer to the AUTHORS file or the AUTHORS section in the man page
  * for contacting the author(s) of this file.
  *
- * 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-cip.c b/epan/dissectors/packet-cip.c
index 6e1077e631d0720d3209a0ee4ab2c417b9200b0d..0c9bb146e595e99e44d5825127cf0cdc457fd250 100644 (file)
--- a/epan/dissectors/packet-cip.c
+++ b/epan/dissectors/packet-cip.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/packet-cip.h b/epan/dissectors/packet-cip.h
index f5e64b16f702568364104f651a2bb28a258bd4f5..1345f376bb7276efd942ac3387e92f161a56fb20 100644 (file)
--- a/epan/dissectors/packet-cip.h
+++ b/epan/dissectors/packet-cip.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/dissectors/packet-cisco-oui.c b/epan/dissectors/packet-cisco-oui.c
index 276e160e20f0e31dff0c2f127a86bead4cff3d8a..92bbfc8beba6c07f855b48288ce2dcd13efc5612 100644 (file)
--- a/epan/dissectors/packet-cisco-oui.c
+++ b/epan/dissectors/packet-cisco-oui.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/dissectors/packet-cisco-wireless.c b/epan/dissectors/packet-cisco-wireless.c
index 08d0ee64f96db39b41fbe9c3ee7c1a97e23e9eb9..0915091a26a63b3a656344e8b758dfdecb3f32d9 100644 (file)
--- a/epan/dissectors/packet-cisco-wireless.c
+++ b/epan/dissectors/packet-cisco-wireless.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/dissectors/packet-clearcase.c b/epan/dissectors/packet-clearcase.c
index 8f654bf38ff181792db9b655d714ab024971e975..6ffe0f8bd6c5ea3cd1bc2e3eeac81a71d8f356fe 100644 (file)
--- a/epan/dissectors/packet-clearcase.c
+++ b/epan/dissectors/packet-clearcase.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/dissectors/packet-clearcase.h b/epan/dissectors/packet-clearcase.h
index 9d80c0e8f70a9740a95022359eaff876da92e72b..2a8338c004a40f691d4fc5ced60f380ecb561e1c 100644 (file)
--- a/epan/dissectors/packet-clearcase.h
+++ b/epan/dissectors/packet-clearcase.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/dissectors/packet-clip.c b/epan/dissectors/packet-clip.c
index cae6dd198288747c0e8401c512e3b1a197b1ff27..669b2d8648cf08397f8ea00a9e14796a4382b89f 100644 (file)
--- a/epan/dissectors/packet-clip.c
+++ b/epan/dissectors/packet-clip.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>
  *
  * This file created by Thierry Andry <Thierry.Andry@advalvas.be>
  * from nearly-the-same packet-raw.c created by Mike Hall <mlh@io.com>

diff --git a/epan/dissectors/packet-clip.h b/epan/dissectors/packet-clip.h
index efc0ea66ffa248500eb5f0c1762bfa12128ce8ab..d901dd7a39a52e722b8582a618429416319cfb70 100644 (file)