aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--asn1/h248/packet-h248-template.c4
-rw-r--r--asn1/h248/packet-h248-template.h4
-rw-r--r--asn1/umts_rrc/packet-umts_rrc-template.c4
-rw-r--r--asn1/umts_rrc/packet-umts_rrc-template.h4
-rw-r--r--asn1/umts_rrc_Internode-defs/packet-umts_rrc_internode-defs-template.c4
-rw-r--r--asn1/umts_rrc_Internode-defs/packet-umts_rrc_internode-defs-template.h4
-rw-r--r--asn1/umts_rrc_ies/packet-umts_rrc_ies-template.c4
-rw-r--r--asn1/umts_rrc_ies/packet-umts_rrc_ies-template.h4
-rw-r--r--asn1/umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.c4
-rw-r--r--asn1/umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.h4
-rw-r--r--epan/dissectors/packet-dtls.c2
-rw-r--r--epan/dissectors/packet-exec.c2
-rw-r--r--epan/dissectors/packet-h248_3gpp.c4
-rw-r--r--epan/dissectors/packet-h248_annex_c.c4
-rw-r--r--epan/dissectors/packet-h248_annex_e.c4
-rw-r--r--epan/dissectors/packet-h248_q1950.c4
-rw-r--r--epan/dissectors/packet-image-png.c4
-rw-r--r--epan/dissectors/packet-jpeg.c4
-rw-r--r--epan/dissectors/packet-lsc.c6
-rw-r--r--epan/dissectors/packet-ssl.c2
-rw-r--r--gtk/camel_counter.c2
21 files changed, 39 insertions, 39 deletions
diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c
index 05cfb8d82d..8ab8aba525 100644
--- a/asn1/h248/packet-h248-template.c
+++ b/asn1/h248/packet-h248-template.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.com>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/asn1/h248/packet-h248-template.h b/asn1/h248/packet-h248-template.h
index 1b25510f46..21c87d9c68 100644
--- a/asn1/h248/packet-h248-template.h
+++ b/asn1/h248/packet-h248-template.h
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.com>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/asn1/umts_rrc/packet-umts_rrc-template.c b/asn1/umts_rrc/packet-umts_rrc-template.c
index b35c83a2d5..8afe9ec24f 100644
--- a/asn1/umts_rrc/packet-umts_rrc-template.c
+++ b/asn1/umts_rrc/packet-umts_rrc-template.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.com>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/asn1/umts_rrc/packet-umts_rrc-template.h b/asn1/umts_rrc/packet-umts_rrc-template.h
index 5d98ba5831..640616dbf2 100644
--- a/asn1/umts_rrc/packet-umts_rrc-template.h
+++ b/asn1/umts_rrc/packet-umts_rrc-template.h
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.com>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/asn1/umts_rrc_Internode-defs/packet-umts_rrc_internode-defs-template.c b/asn1/umts_rrc_Internode-defs/packet-umts_rrc_internode-defs-template.c
index 8adf10e929..f34fbdafa0 100644
--- a/asn1/umts_rrc_Internode-defs/packet-umts_rrc_internode-defs-template.c
+++ b/asn1/umts_rrc_Internode-defs/packet-umts_rrc_internode-defs-template.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.com>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/asn1/umts_rrc_Internode-defs/packet-umts_rrc_internode-defs-template.h b/asn1/umts_rrc_Internode-defs/packet-umts_rrc_internode-defs-template.h
index e5e29293da..63474fdbb9 100644
--- a/asn1/umts_rrc_Internode-defs/packet-umts_rrc_internode-defs-template.h
+++ b/asn1/umts_rrc_Internode-defs/packet-umts_rrc_internode-defs-template.h
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.com>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/asn1/umts_rrc_ies/packet-umts_rrc_ies-template.c b/asn1/umts_rrc_ies/packet-umts_rrc_ies-template.c
index 727cb0b87e..0c0ce79989 100644
--- a/asn1/umts_rrc_ies/packet-umts_rrc_ies-template.c
+++ b/asn1/umts_rrc_ies/packet-umts_rrc_ies-template.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.com>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/asn1/umts_rrc_ies/packet-umts_rrc_ies-template.h b/asn1/umts_rrc_ies/packet-umts_rrc_ies-template.h
index 9d6bcc8cfd..21aabc1f1e 100644
--- a/asn1/umts_rrc_ies/packet-umts_rrc_ies-template.h
+++ b/asn1/umts_rrc_ies/packet-umts_rrc_ies-template.h
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.com>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/asn1/umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.c b/asn1/umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.c
index a60d0f9c24..24aa47dc0e 100644
--- a/asn1/umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.c
+++ b/asn1/umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.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.com>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/asn1/umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.h b/asn1/umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.h
index 973841ff24..95bf0f5cbe 100644
--- a/asn1/umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.h
+++ b/asn1/umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.h
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.com>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c
index 3af625f2be..04a237f26e 100644
--- a/epan/dissectors/packet-dtls.c
+++ b/epan/dissectors/packet-dtls.c
@@ -1858,7 +1858,7 @@ looks_like_dtls(tvbuff_t *tvb, guint32 offset)
/*********************************************************************
*
- * Standard Ethereal Protocol Registration and housekeeping
+ * Standard Wireshark Protocol Registration and housekeeping
*
*********************************************************************/
void
diff --git a/epan/dissectors/packet-exec.c b/epan/dissectors/packet-exec.c
index c1675e8ad1..737f4d3807 100644
--- a/epan/dissectors/packet-exec.c
+++ b/epan/dissectors/packet-exec.c
@@ -5,7 +5,7 @@
* $Id$
*
* Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * By Gerald Combs <gerald@wireshark.com>
* Copyright 1998 Gerald Combs
*
* Based on BSD rexecd code/man page and parts of packet-rlogin.c
diff --git a/epan/dissectors/packet-h248_3gpp.c b/epan/dissectors/packet-h248_3gpp.c
index 4de4d45796..e7b531ac0d 100644
--- a/epan/dissectors/packet-h248_3gpp.c
+++ b/epan/dissectors/packet-h248_3gpp.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.com>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c
index d2fc470548..a615c48750 100644
--- a/epan/dissectors/packet-h248_annex_c.c
+++ b/epan/dissectors/packet-h248_annex_c.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.com>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-h248_annex_e.c b/epan/dissectors/packet-h248_annex_e.c
index 86cfcb4885..5c97b6d010 100644
--- a/epan/dissectors/packet-h248_annex_e.c
+++ b/epan/dissectors/packet-h248_annex_e.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.com>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-h248_q1950.c b/epan/dissectors/packet-h248_q1950.c
index ec7c5f2eed..6b47d23cea 100644
--- a/epan/dissectors/packet-h248_q1950.c
+++ b/epan/dissectors/packet-h248_q1950.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.com>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-image-png.c b/epan/dissectors/packet-image-png.c
index c8ad3759cc..2e83709462 100644
--- a/epan/dissectors/packet-image-png.c
+++ b/epan/dissectors/packet-image-png.c
@@ -6,8 +6,8 @@
*
* Copyright 2006 Ronnie Sahlberg
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.com>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-jpeg.c b/epan/dissectors/packet-jpeg.c
index 5a11d6e285..0591c80e27 100644
--- a/epan/dissectors/packet-jpeg.c
+++ b/epan/dissectors/packet-jpeg.c
@@ -9,8 +9,8 @@
* Copyright 2001,
* Francisco Javier Cabello Torres, <fjcabello@vtools.es>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.com>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-lsc.c b/epan/dissectors/packet-lsc.c
index e294e91eb3..fda01d4948 100644
--- a/epan/dissectors/packet-lsc.c
+++ b/epan/dissectors/packet-lsc.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.com>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -351,7 +351,7 @@ dissect_lsc_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
dissect_lsc_common);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_lsc(void)
{
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c
index 376a6884fc..bd8cac999d 100644
--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
@@ -3342,7 +3342,7 @@ ssl_looks_like_valid_pct_handshake(tvbuff_t *tvb, guint32 offset,
/*********************************************************************
*
- * Standard Ethereal Protocol Registration and housekeeping
+ * Standard Wireshark Protocol Registration and housekeeping
*
*********************************************************************/
void
diff --git a/gtk/camel_counter.c b/gtk/camel_counter.c
index 600eac0e75..cf3754d822 100644
--- a/gtk/camel_counter.c
+++ b/gtk/camel_counter.c
@@ -169,7 +169,7 @@ static void gtk_camelcounter_init(const char *optarg, void *userdata _U_)
gtk_camelcounter_reset(p_camelcounter);
- p_camelcounter->win=window_new(GTK_WINDOW_TOPLEVEL, "Ethereal: CAMEL counters");
+ p_camelcounter->win=window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: CAMEL counters");
gtk_window_set_default_size(GTK_WINDOW(p_camelcounter->win), 500, 300);
p_camelcounter->vbox=gtk_vbox_new(FALSE, 3);