aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--epan/dissectors/packet-fcoe.c2
-rw-r--r--epan/dissectors/packet-i2c.c4
-rw-r--r--epan/dissectors/packet-ieee802154.c20
-rw-r--r--epan/dissectors/packet-ipmi.c2
-rw-r--r--epan/dissectors/packet-rtps.c2
-rw-r--r--epan/dissectors/packet-rtps2.c2
-rw-r--r--epan/dissectors/packet-scriptingservice.c4
-rw-r--r--epan/dissectors/packet-xcsl.c2
8 files changed, 19 insertions, 19 deletions
diff --git a/epan/dissectors/packet-fcoe.c b/epan/dissectors/packet-fcoe.c
index 63e26b3f4c..d5dc0fc9d4 100644
--- a/epan/dissectors/packet-fcoe.c
+++ b/epan/dissectors/packet-fcoe.c
@@ -6,7 +6,7 @@
* $Id$
*
* Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Based on packet-fcip.c, Copyright 2001, Dinesh G Dutt (ddutt@cisco.com)
diff --git a/epan/dissectors/packet-i2c.c b/epan/dissectors/packet-i2c.c
index 420c63f9c0..8c4cae80ed 100644
--- a/epan/dissectors/packet-i2c.c
+++ b/epan/dissectors/packet-i2c.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-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index dff8ce99e3..98743c3cee 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -337,7 +337,7 @@ print_eui64_oui(guint64 addr)
* ieee802154_packet *packet - Packet info structure.
* tvbuff_t *tvb - pointer to buffer containing raw packet.
* packet_info *pinfo - pointer to packet information fields
- * proto_tree *tree - pointer to data tree ethereal uses to display packet.
+ * proto_tree *tree - pointer to data tree wireshark uses to display packet.
* ieee802154_packet *packet - IEEE 802.15.4 packet information.
* guint offset - offset into the tvb to find the FCF.
* RETURNS
@@ -400,7 +400,7 @@ dissect_ieee802154_fcf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee
* PARAMETERS
* tvbuff_t *tvb - pointer to buffer containing raw packet.
* packet_info *pinfo - pointer to packet information fields
- * proto_tree *tree - pointer to data tree ethereal uses to display packet.
+ * proto_tree *tree - pointer to data tree wireshark uses to display packet.
* RETURNS
* void
*---------------------------------------------------------------
@@ -469,7 +469,7 @@ dissect_ieee802154_nonask_phy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
* PARAMETERS
* tvbuff_t *tvb - pointer to buffer containing raw packet.
* packet_info *pinfo - pointer to packet information fields
- * proto_tree *tree - pointer to data tree ethereal uses to display packet.
+ * proto_tree *tree - pointer to data tree wireshark uses to display packet.
* RETURNS
* void
*---------------------------------------------------------------
@@ -490,7 +490,7 @@ dissect_ieee802154(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
* PARAMETERS
* tvbuff_t *tvb - pointer to buffer containing raw packet.
* packet_info *pinfo - pointer to packet information fields
- * proto_tree *tree - pointer to data tree ethereal uses to display packet.
+ * proto_tree *tree - pointer to data tree wireshark uses to display packet.
* RETURNS
* void
*---------------------------------------------------------------
@@ -524,7 +524,7 @@ dissect_ieee802154_nofcs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
* PARAMETERS
* tvbuff_t *tvb - pointer to buffer containing raw packet.
* packet_info *pinfo - pointer to packet information fields
- * proto_tree *tree - pointer to data tree ethereal uses to display packet.
+ * proto_tree *tree - pointer to data tree wireshark uses to display packet.
* RETURNS
* void
*---------------------------------------------------------------
@@ -540,7 +540,7 @@ dissect_ieee802154_cc24xx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
* NAME
* dissect_ieee802154_common
* DESCRIPTION
- * IEEE 802.15.4 packet dissection routine for Ethereal.
+ * IEEE 802.15.4 packet dissection routine for Wireshark.
* This function extracts all the information first before displaying.
* If payload exists, that portion will be passed into another dissector
* for further processing.
@@ -554,7 +554,7 @@ dissect_ieee802154_cc24xx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
* PARAMETERS
* tvbuff_t *tvb - pointer to buffer containing raw packet.
* packet_info *pinfo - pointer to packet information fields
- * proto_tree *tree - pointer to data tree ethereal uses to display packet.
+ * proto_tree *tree - pointer to data tree wireshark uses to display packet.
* guint options - bitwise or of dissector options (see DISSECT_IEEE802154_OPTION_xxx).
* RETURNS
* void
@@ -929,7 +929,7 @@ dissect_ieee802154_fcs:
* PARAMETERS
* tvbuff_t *tvb - pointer to buffer containing raw packet.
* packet_info *pinfo - pointer to packet information fields
- * proto_tree *tree - pointer to data tree ethereal uses to display packet.
+ * proto_tree *tree - pointer to data tree wireshark uses to display packet.
* ieee802154_packet *packet - IEEE 802.15.4 packet information.
* RETURNS
* void
@@ -1092,7 +1092,7 @@ dissect_ieee802154_beacon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i
* PARAMETERS
* tvbuff_t *tvb - pointer to buffer containing raw packet.
* packet_info *pinfo - pointer to packet information fields
- * proto_tree *tree - pointer to data tree Ethereal uses to display packet.
+ * proto_tree *tree - pointer to data tree Wireshark uses to display packet.
* ieee802154_packet *packet - IEEE 802.15.4 packet information.
* RETURNS
* void
@@ -1787,7 +1787,7 @@ void proto_register_ieee802154(void)
/* Register the subdissector list */
register_heur_dissector_list("wpan", &ieee802154_heur_subdissector_list);
- /* Register dissectors with Ethereal. */
+ /* Register dissectors with Wireshark. */
register_dissector("wpan", dissect_ieee802154, proto_ieee802154);
register_dissector("wpan_nofcs", dissect_ieee802154_nofcs, proto_ieee802154);
register_dissector("wpan_cc24xx", dissect_ieee802154_cc24xx, proto_ieee802154);
diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c
index 53726fe807..7f76d1c879 100644
--- a/epan/dissectors/packet-ipmi.c
+++ b/epan/dissectors/packet-ipmi.c
@@ -63,7 +63,7 @@ struct ipmi_netfn_root {
/* We need more than a conversation. Over the same RMCP session
(or IPMB), there may be several addresses/SWIDs. Thus, in a single
- Ethereal-maintained conversation we might need to find our own... */
+ Wireshark-maintained conversation we might need to find our own... */
struct ipmi_saved_data {
guint32 set_data;
guint32 saved_data[NSAVED_DATA];
diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c
index be964d0921..9253357385 100644
--- a/epan/dissectors/packet-rtps.c
+++ b/epan/dissectors/packet-rtps.c
@@ -18,7 +18,7 @@
* $Id$
*
* Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or modify
diff --git a/epan/dissectors/packet-rtps2.c b/epan/dissectors/packet-rtps2.c
index fc1e1b536b..bdd77917d7 100644
--- a/epan/dissectors/packet-rtps2.c
+++ b/epan/dissectors/packet-rtps2.c
@@ -11,7 +11,7 @@
* $Id$
*
* Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or modify
diff --git a/epan/dissectors/packet-scriptingservice.c b/epan/dissectors/packet-scriptingservice.c
index 649bb2e23d..c8c68f55e4 100644
--- a/epan/dissectors/packet-scriptingservice.c
+++ b/epan/dissectors/packet-scriptingservice.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/packet-xcsl.c b/epan/dissectors/packet-xcsl.c
index 5a4482af05..dffbf49b76 100644
--- a/epan/dissectors/packet-xcsl.c
+++ b/epan/dissectors/packet-xcsl.c
@@ -7,7 +7,7 @@
* $Id$
*
* Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or