Ethereal->Wireshark
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 28 May 2006 16:32:49 +0000 (16:32 +0000)
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 28 May 2006 16:32:49 +0000 (16:32 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18231 f5534014-38df-0310-8fa8-9805f1628bb7

51 files changed:
plugins/Makefile.nmake
plugins/asn1/packet-asn1.c
plugins/docsis/packet-bpkmattr.c
plugins/docsis/packet-bpkmreq.c
plugins/docsis/packet-bpkmrsp.c
plugins/docsis/packet-dccack.c
plugins/docsis/packet-dccreq.c
plugins/docsis/packet-dccrsp.c
plugins/docsis/packet-dcd.c
plugins/docsis/packet-docsis.c
plugins/docsis/packet-dsaack.c
plugins/docsis/packet-dsareq.c
plugins/docsis/packet-dsarsp.c
plugins/docsis/packet-dscack.c
plugins/docsis/packet-dscreq.c
plugins/docsis/packet-dscrsp.c
plugins/docsis/packet-dsdreq.c
plugins/docsis/packet-dsdrsp.c
plugins/docsis/packet-intrngreq.c
plugins/docsis/packet-macmgmt.c
plugins/docsis/packet-map.c
plugins/docsis/packet-regack.c
plugins/docsis/packet-regreq.c
plugins/docsis/packet-regrsp.c
plugins/docsis/packet-rngreq.c
plugins/docsis/packet-rngrsp.c
plugins/docsis/packet-tlv.c
plugins/docsis/packet-type29ucd.c
plugins/docsis/packet-uccreq.c
plugins/docsis/packet-uccrsp.c
plugins/docsis/packet-ucd.c
plugins/docsis/packet-vendor.c
plugins/giop/packet-coseventcomm.c
plugins/h223/packet-h223.c
plugins/h223/packet-srp.c
plugins/irda/packet-irda.c
plugins/lua/elua.c
plugins/lua/elua.h
plugins/lua/elua_dumper.c
plugins/lua/elua_field.c
plugins/lua/elua_gui.c
plugins/lua/elua_pinfo.c
plugins/lua/elua_plugin.c
plugins/lua/elua_proto.c
plugins/lua/elua_tap.c
plugins/lua/elua_tree.c
plugins/lua/elua_tvb.c
plugins/mate/mate_setup.c
plugins/mate/packet-mate.c
plugins/rlm/packet-rlm.c
plugins/v5ua/packet-v5ua.c

index 7577fb372f1de130530d867837563553beff075d..71785175fd63766c4dfc0fb62eb0a8f6b23b70a8 100644 (file)
@@ -320,7 +320,7 @@ maintainer-clean: distclean
        cd ..
 
 ################################################################################
-# copy all plugins to /plugins/$(VERSION), so Ethereal will load them, when
+# copy all plugins to /plugins/$(VERSION), so Wireshark will load them, when
 # started from within the source tree.
 ################################################################################
 
index 762794ae101615f57b50f33cc1600900a17f0caa..21554954535053c40575e25cdaf944ec62114c22 100644 (file)
@@ -29,7 +29,7 @@
 
 /**************************************************************************
  * This plugin will dissect BER encoded ASN.1 messages in UDP packets or in
- * a TCP stream. It relies on ethereal to do defragmentation and re-assembly
+ * a TCP stream. It relies on wireshark to do defragmentation and re-assembly
  * to construct complete messages.
  *
  * To produce packet display with good annotations it needs to know about
@@ -47,7 +47,7 @@
  *  - cd /tmp
  *  - snacc -u /usr/include/snacc/asn1/asn-useful.asn1 -T tbl.tt /usr/include/snacc/asn1/tbl.asn1
  *  - od -Ax -tx1 tbl.tt | text2pcap -T 801,801 - tbl.tt.pcap
- *  - ethereal tbl.tt.pcap
+ *  - wireshark tbl.tt.pcap
  *      GUI: Edit->Preferences->Protocols->ASN1
  *             type table file: /tmp/tbl.tt
  *             PDU name: TBL
@@ -158,7 +158,7 @@ static gboolean asn1_full = FALSE; /* show full names */
 static guint type_recursion_level = 1; /* eliminate 1 level of references */
 static char *asn1_logfile = NULL;
 
-#define ASN1LOGFILE "ethereal.log"
+#define ASN1LOGFILE "wireshark.log"
 
 /* PDU counter, for correlation between GUI display and log file in debug mode */
 static int pcount = 0;
@@ -309,8 +309,8 @@ static const char *tbl_types_asn1[] = {
 
                       /* 19 */ "INVALID entry",
 };
-/* conversion from snacc type to appropriate ethereal type */
-static guint tbl_types_ethereal[] = {
+/* conversion from snacc type to appropriate wireshark type */
+static guint tbl_types_wireshark[] = {
                       /*  0 */ FT_BOOLEAN,     /* TBL_BOOLEAN */
                       /*  1 */ FT_UINT32,      /* TBL_INTEGER */
                       /*  2 */ FT_UINT32,      /* TBL_BITSTRING */
@@ -335,7 +335,7 @@ static guint tbl_types_ethereal[] = {
                       /* 19 */ FT_NONE,        /* TBL_INVALID */
 };
 
-static const char *tbl_types_ethereal_txt[] = {
+static const char *tbl_types_wireshark_txt[] = {
                       /*  0 */ "FT_BOOLEAN",   /* TBL_BOOLEAN */
                       /*  1 */ "FT_UINT32",    /* TBL_INTEGER */
                       /*  2 */ "FT_UINT32",    /* TBL_BITSTRING */
@@ -373,9 +373,9 @@ struct _PDUinfo {
        gint typenum;
        gint basetype;          /* parent type */
        gint mytype;            /* original type number, typenum may have gone through a reference */
-       gint value_id;          /* ethereal field id for the value in this PDU */
-       gint type_id;           /* ethereal field id for the type of this PDU */
-       hf_register_info value_hf; /* ethereal field info for this value */
+       gint value_id;          /* wireshark field id for the value in this PDU */
+       gint type_id;           /* wireshark field id for the type of this PDU */
+       hf_register_info value_hf; /* wireshark field info for this value */
 };
 
 
@@ -1020,7 +1020,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                      asn1_close(&asn1, &offset); /* mark where we are now */
                      if (asn1_debug) {
                              if ( (props.value_id == -1) ||
-                                  (tbl_types_ethereal[props.type] != FT_UINT32) )
+                                  (tbl_types_wireshark[props.type] != FT_UINT32) )
                                        /* unknown or unexpected: just text */
                                        proto_tree_add_text(pt, tvb, boffset,
                                                        offset - boffset, textfmt_d, boffset,
@@ -1037,7 +1037,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                              }
                      } else {
                              if ( (props.value_id == -1) ||
-                                  (tbl_types_ethereal[props.type] != FT_UINT32) )
+                                  (tbl_types_wireshark[props.type] != FT_UINT32) )
                                        /* unknown or unexpected, just text */
                                        proto_tree_add_text(pt, tvb, boffset,
                                                        offset - boffset,
@@ -1059,7 +1059,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                      ename = getPDUenum(&props, boffset, cls, tag, value);
                      if (asn1_debug) {
                              if ( (props.value_id == -1) ||
-                                  (tbl_types_ethereal[props.type] != FT_UINT32) )
+                                  (tbl_types_wireshark[props.type] != FT_UINT32) )
                                        /* unknown or unexpected, just text */
                                        proto_tree_add_text(pt, tvb, boffset,
                                                        offset - boffset,
@@ -1076,7 +1076,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                              }
                      } else {
                              if ( (props.value_id == -1) ||
-                                  (tbl_types_ethereal[props.type] != FT_UINT32) )
+                                  (tbl_types_wireshark[props.type] != FT_UINT32) )
                                        /* unknown or unexpected, just text */
                                        proto_tree_add_text(pt, tvb, boffset,
                                                        offset - boffset,
@@ -1097,7 +1097,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                      asn1_close(&asn1, &offset); /* mark where we are now */
                      if (asn1_debug) {
                              if ( (props.value_id == -1) ||
-                                  (tbl_types_ethereal[props.type] != FT_BOOLEAN) )
+                                  (tbl_types_wireshark[props.type] != FT_BOOLEAN) )
                                        /* unknown or unexpected, just text */
                                        proto_tree_add_text(pt, tvb, boffset,
                                                        offset - boffset,
@@ -1114,7 +1114,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                              }
                      } else {
                              if ( (props.value_id == -1) ||
-                                  (tbl_types_ethereal[props.type] != FT_BOOLEAN) )
+                                  (tbl_types_wireshark[props.type] != FT_BOOLEAN) )
                                        /* unknown or unexpected, just text */
                                        proto_tree_add_text(pt, tvb, boffset,
                                                        offset - boffset,
@@ -1146,7 +1146,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                      ename = showoctets(octets, len, (tag == ASN1_OTS) ? 4 : 0 );
                      if (asn1_debug) {
                              if ( (props.value_id == -1) ||
-                                  (tbl_types_ethereal[props.type] != FT_STRINGZ) )
+                                  (tbl_types_wireshark[props.type] != FT_STRINGZ) )
                                        /* unknown or unexpected, just text */
                                        proto_tree_add_text(pt, tvb, boffset,
                                                        offset - boffset,
@@ -1163,7 +1163,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                              }
                      } else {
                              if ( (props.value_id == -1) ||
-                                  (tbl_types_ethereal[props.type] != FT_STRINGZ) )
+                                  (tbl_types_wireshark[props.type] != FT_STRINGZ) )
                                        /* unknown or unexpected, just text */
                                        proto_tree_add_text(pt, tvb, boffset,
                                                        offset - boffset,
@@ -1187,7 +1187,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                      ename = showbitnames(bits, (con*8)-unused, &props, offset);
                      if (asn1_debug) {
                              if ( (props.value_id == -1) ||
-                                  (tbl_types_ethereal[props.type] != FT_UINT32) )
+                                  (tbl_types_wireshark[props.type] != FT_UINT32) )
                                        /* unknown or unexpected, just text */
                                        proto_tree_add_text(pt, tvb, boffset,
                                                        offset - boffset,
@@ -1207,7 +1207,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
 
                      } else {
                              if ( (props.value_id == -1) ||
-                                  (tbl_types_ethereal[props.type] != FT_UINT32) )
+                                  (tbl_types_wireshark[props.type] != FT_UINT32) )
                                        /* unknown or unexpected, just text */
                                        proto_tree_add_text(pt, tvb, boffset,
                                                        offset - boffset,
@@ -1300,7 +1300,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                      ename = showoid(oid, con);
                      if (asn1_debug) {
                              if ( (props.value_id == -1) ||
-                                  (tbl_types_ethereal[props.type] != FT_BYTES) )
+                                  (tbl_types_wireshark[props.type] != FT_BYTES) )
                                      /* unknown or unexpected, just text */
                                      proto_tree_add_text(pt, tvb, boffset, offset - boffset, textfmt_s,
                                                          boffset, clsstr, constr, tagstr, tname, name,
@@ -1315,7 +1315,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                              }
                      } else {
                              if ( (props.value_id == -1) ||
-                                  (tbl_types_ethereal[props.type] != FT_BYTES) )
+                                  (tbl_types_wireshark[props.type] != FT_BYTES) )
                                        /* unknown or unexpected, just text */
                                        proto_tree_add_text(pt, tvb, boffset,
                                                        offset - boffset,
@@ -1382,7 +1382,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                                asn1_close(&asn1, &offset); /* mark where we are now */
                                if (asn1_debug) {
                                        if ( (props.value_id == -1) ||
-                                            (tbl_types_ethereal[props.type] != FT_UINT32) )
+                                            (tbl_types_wireshark[props.type] != FT_UINT32) )
                                                /* unknown or unexpected, just text */
                                                proto_tree_add_text(pt, tvb,
                                                            boffset, offset - boffset,
@@ -1399,7 +1399,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                                        }
                                } else {
                                        if ( (props.value_id == -1) ||
-                                            (tbl_types_ethereal[props.type] != FT_UINT32) )
+                                            (tbl_types_wireshark[props.type] != FT_UINT32) )
                                                /* unknown or unexpected, just text */
                                                proto_tree_add_text(pt, tvb,
                                                            boffset, offset - boffset,
@@ -1423,7 +1423,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                                ename = getPDUenum(&props, boffset, cls, tag, value);
                                if (asn1_debug) {
                                        if ( (props.value_id == -1) ||
-                                            (tbl_types_ethereal[props.type] != FT_UINT32) )
+                                            (tbl_types_wireshark[props.type] != FT_UINT32) )
                                                /* unknown or unexpected, just text */
                                                proto_tree_add_text(pt, tvb,
                                                           boffset, offset - boffset,
@@ -1440,7 +1440,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                                        }
                                } else {
                                        if ( (props.value_id == -1) ||
-                                            (tbl_types_ethereal[props.type] != FT_UINT32) )
+                                            (tbl_types_wireshark[props.type] != FT_UINT32) )
                                                /* unknown or unexpected, just text */
                                                proto_tree_add_text(pt, tvb,
                                                           boffset, offset - boffset,
@@ -1464,7 +1464,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                                ename = showbitnames(bits, (con*8)-unused, &props, offset);
                                if (asn1_debug) {
                                        if ( (props.value_id == -1) ||
-                                            (tbl_types_ethereal[props.type] != FT_UINT32) )
+                                            (tbl_types_wireshark[props.type] != FT_UINT32) )
                                                /* unknown or unexpected, just text */
                                                proto_tree_add_text(pt, tvb,
                                                            boffset, offset - boffset,
@@ -1485,7 +1485,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                                        }
                                } else {
                                        if ( (props.value_id == -1) ||
-                                            (tbl_types_ethereal[props.type] != FT_UINT32) )
+                                            (tbl_types_wireshark[props.type] != FT_UINT32) )
                                                /* unknown or unexpected, just text */
                                                proto_tree_add_text(pt, tvb, boffset, offset - boffset,
                                                            "(%s)%s: %s:%s", tname, name,
@@ -1509,7 +1509,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                                asn1_close(&asn1, &offset); /* mark where we are now */
                                if (asn1_debug) {
                                        if ( (props.value_id == -1) ||
-                                            (tbl_types_ethereal[props.type] != FT_BOOLEAN) )
+                                            (tbl_types_wireshark[props.type] != FT_BOOLEAN) )
                                                /* unknown or unexpected, just text */
                                                proto_tree_add_text(pt, tvb,
                                                            boffset, offset - boffset,
@@ -1528,7 +1528,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                                        }
                                } else {
                                        if ( (props.value_id == -1) ||
-                                            (tbl_types_ethereal[props.type] != FT_BOOLEAN) )
+                                            (tbl_types_wireshark[props.type] != FT_BOOLEAN) )
                                                /* unknown or unexpected, just text */
                                                proto_tree_add_text(pt, tvb,
                                                            boffset, offset - boffset,
@@ -1569,7 +1569,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                                ename = showoctets(octets, len, 2); /* convert octets to printable */
                                if (asn1_debug) {
                                        if ( (props.value_id == -1) ||
-                                            (tbl_types_ethereal[props.type] != FT_STRINGZ) )
+                                            (tbl_types_wireshark[props.type] != FT_STRINGZ) )
                                                /* unknown or unexpected, just text */
                                                proto_tree_add_text(pt, tvb,
                                                            boffset, offset - boffset,
@@ -1586,7 +1586,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in
                                        }
                                } else {
                                        if ( (props.value_id == -1) ||
-                                            (tbl_types_ethereal[props.type] != FT_STRINGZ) )
+                                            (tbl_types_wireshark[props.type] != FT_STRINGZ) )
                                                /* unknown or unexpected, just text */
                                                proto_tree_add_text(pt, tvb, boffset, offset - boffset,
                                                            "(%s)%s: %s", tname, name, ename);
@@ -2934,7 +2934,7 @@ tbl_typeref(guint n, GNode *pdu, GNode *tree, guint fullindex)
                /* names do not have a fullname */
                if (asn1_verbose) g_message("%*s*collection T %s", n*2, empty, p->name);
                        /* read the enumeration [save min-max somewhere ?] */
-               p->value_hf.hfinfo.type = tbl_types_ethereal[p->type]; /* XXX change field type... */
+               p->value_hf.hfinfo.type = tbl_types_wireshark[p->type]; /* XXX change field type... */
 
                proto_register_field_array(proto_asn1, &(p->value_hf) , 1);
 
@@ -2944,7 +2944,7 @@ tbl_typeref(guint n, GNode *pdu, GNode *tree, guint fullindex)
                        g_message("regtype1: %3d %3d [%3d] F%2.2x (%s)%s %s %s -> id=%d",
                                  p->mytype, p->typenum, p->basetype, p->flags, p->typename,
                                  p->name, p->fullname,
-                                 tbl_types_ethereal_txt[p->type], p->value_id);
+                                 tbl_types_wireshark_txt[p->type], p->value_id);
                p1 = p;
                nvals = 0;
                while((q = g_node_next_sibling(q))) {
@@ -2977,7 +2977,7 @@ tbl_typeref(guint n, GNode *pdu, GNode *tree, guint fullindex)
 
        case TBL_CHOICE:
                if (p->value_id == -1) { /* not yet registered ..... */
-                       p->value_hf.hfinfo.type = tbl_types_ethereal[p->type];
+                       p->value_hf.hfinfo.type = tbl_types_wireshark[p->type];
                        proto_register_field_array(proto_asn1, &(p->value_hf) , 1);
 
                        save_reference(p);
@@ -2986,14 +2986,14 @@ tbl_typeref(guint n, GNode *pdu, GNode *tree, guint fullindex)
                                g_message("regtype2: %3d %3d [%3d] F%2.2x (%s)%s %s %s -> id=%d",
                                          p->mytype, p->typenum, p->basetype, p->flags, p->typename,
                                          p->name, p->fullname,
-                                         tbl_types_ethereal_txt[p->type], p->value_id);
+                                         tbl_types_wireshark_txt[p->type], p->value_id);
                }
                tbl_type(n, pdu, q, fullindex);
                break;
 
        default:
                if (p->value_id == -1) { /* not yet registered ..... */
-                       p->value_hf.hfinfo.type = tbl_types_ethereal[p->type];
+                       p->value_hf.hfinfo.type = tbl_types_wireshark[p->type];
                        proto_register_field_array(proto_asn1, &(p->value_hf) , 1);
 
                        save_reference(p);
@@ -3002,7 +3002,7 @@ tbl_typeref(guint n, GNode *pdu, GNode *tree, guint fullindex)
                                g_message("regtype3: %3d %3d [%3d] F%2.2x (%s)%s %s %s -> id=%d",
                                          p->mytype, p->typenum, p->basetype, p->flags, p->typename,
                                          p->name, p->fullname,
-                                         tbl_types_ethereal_txt[p->type], p->value_id);
+                                         tbl_types_wireshark_txt[p->type], p->value_id);
                }
                tbl_type(n, pdu, g_node_next_sibling(q), fullindex);
        }
@@ -3075,7 +3075,7 @@ tbl_type(guint n, GNode *pdu, GNode *list, guint fullindex) /* indent, pdu, sour
                        p->value_hf.p_id = &(p->value_id);
                        p->value_hf.hfinfo.name = p->fullname;
                        p->value_hf.hfinfo.abbrev = p->fullname;
-                       p->value_hf.hfinfo.type = tbl_types_ethereal[p->type];
+                       p->value_hf.hfinfo.type = tbl_types_wireshark[p->type];
                        p->value_hf.hfinfo.display = BASE_DEC;
                        p->value_hf.hfinfo.blurb = p->fullname;
                        /* all the other fields are already 0 ! */
@@ -3090,7 +3090,7 @@ tbl_type(guint n, GNode *pdu, GNode *list, guint fullindex) /* indent, pdu, sour
                                        g_message("register: %3d %3d [%3d] F%2.2x (%s)%s %s %s -> id=%d",
                                                  p->mytype, p->typenum, p->basetype, p->flags,
                                                  p->typename, p->name, p->fullname,
-                                                 tbl_types_ethereal_txt[p->type], p->value_id);
+                                                 tbl_types_wireshark_txt[p->type], p->value_id);
                        }
 
                        q = g_node_first_child(list);
@@ -3247,7 +3247,7 @@ tbl_type(guint n, GNode *pdu, GNode *list, guint fullindex) /* indent, pdu, sour
                                g_message("regist-2: %3d %3d [%3d] F%2.2x (%s)%s %s %s -> id=%d",
                                          p->mytype, p->typenum, p->basetype, p->flags, p->typename,
                                          p->name, p->fullname,
-                                         tbl_types_ethereal_txt[p->type], p->value_id);
+                                         tbl_types_wireshark_txt[p->type], p->value_id);
                        }
                list = g_node_next_sibling(list);
        }
@@ -3377,7 +3377,7 @@ build_pdu_tree(const char *pduname)
        info->value_hf.p_id = &(info->value_id);
        info->value_hf.hfinfo.name = info->fullname;
        info->value_hf.hfinfo.abbrev = info->fullname;
-       info->value_hf.hfinfo.type = tbl_types_ethereal[info->type];
+       info->value_hf.hfinfo.type = tbl_types_wireshark[info->type];
        info->value_hf.hfinfo.display = BASE_DEC;
        info->value_hf.hfinfo.blurb = info->fullname;
 
@@ -3425,7 +3425,7 @@ build_pdu_tree(const char *pduname)
                        info->value_hf.p_id = &(info->value_id);
                        info->value_hf.hfinfo.name = info->fullname;
                        info->value_hf.hfinfo.abbrev = info->fullname;
-                       info->value_hf.hfinfo.type = tbl_types_ethereal[info->type];
+                       info->value_hf.hfinfo.type = tbl_types_wireshark[info->type];
                        info->value_hf.hfinfo.display = BASE_DEC;
                        info->value_hf.hfinfo.blurb = info->fullname;
 
@@ -3506,7 +3506,7 @@ build_pdu_tree(const char *pduname)
 
 
 #ifdef DISSECTOR_WITH_GUI
-/* This cannot work in tethereal.... don't include for now */
+/* This cannot work in twireshark.... don't include for now */
 #if GTK_MAJOR_VERSION >= 2
 #define SHOWPDU        /* this needs GTK2 */
 #endif
index 4652d62dd58c0e3dc0dae2b44a951c4d9f750e1d..77a5f92a066faf6eaa41dbfaaf06930aca3c30cc 100644 (file)
@@ -384,7 +384,7 @@ dissect_bpkmattr (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.
index e87c2f62f8e192664e62992e318e459fd974dc4c..f8364b343ee18c81db6df09e657a9b7af5fe3fdc 100644 (file)
@@ -114,7 +114,7 @@ dissect_bpkmreq (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.
index ee2ad21aad4f207da4db02e9a94fd8da39019781..4ee0c0d67692247ac1e1d7320024866b65ec4b3e 100644 (file)
@@ -115,7 +115,7 @@ dissect_bpkmrsp (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.
index e55296cdea73c7a952f8e54375b85686b0c07a32..edd5be45828027040ac38d5401d83c060a7c3b96 100644 (file)
@@ -114,7 +114,7 @@ dissect_dccack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
     }                          /* if (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.
index 1f3c74d77ee540a991b26ef5d7d3516fa40c3c49..3acf74bfd67f149b870ecede67dc2765db44586e 100644 (file)
@@ -381,7 +381,7 @@ dissect_dccreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
     }                          /* if (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.
index d43891eecd3ebb66180092cd5d68b015818f6856..70ad4809a272dab868281a3246cd5aab84d8e8c0 100644 (file)
@@ -174,7 +174,7 @@ dissect_dccrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
     }                          /* if (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.
index 1bfa44e8458360e54ee8f73c7b5db30cc5f4a53d..ebfd5b7fca25db2d27dbfad6607315f19af33071 100644 (file)
@@ -561,7 +561,7 @@ dissect_dcd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
     }                          /* if (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.
index 29c31109b546532b2bc1580cdbd20ad2758501e4..7388fc60f64e2a95c31ad1ab98e5d00e4dddd6f3 100644 (file)
@@ -41,7 +41,7 @@
  * be specified for some interfaces on some platforms; for Ethernet
  * interfaces, it allows DOCSIS to be specified.  If an Ethernet capture
  * is done with a link-layer type of DOCSIS, the file will have a link-
- * layer type of DLT_DOCSIS; Ethereal will treat the frames in that capture
+ * layer type of DLT_DOCSIS; Wireshark will treat the frames in that capture
  * as DOCSIS frames.
  */
 
@@ -571,7 +571,7 @@ dissect_docsis (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.
index a0841dba3f43abf3498aae1edd5d2d7a216cb879..a79fd302df4c470fa2ecd7071a77d3687bec09f1 100644 (file)
@@ -92,7 +92,7 @@ dissect_dsaack (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.
index ae74928360b49bfcae2600a37d3787889663c097..84e7dce3762e4fcb863f595832de692acab915b7 100644 (file)
@@ -85,7 +85,7 @@ dissect_dsareq (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.
index a8a963b3a9c0e9cb87130493427e7b34eb8857bf..65bdd69eabf9f707b95e26d341c3dd3b7ef8f8d7 100644 (file)
@@ -95,7 +95,7 @@ dissect_dsarsp (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.
index eaa6e448f623345eb4884ef039e8aea97cd1a7d0..882c6b12adf63e93fa939bc50f1d5813c0e9cbad 100644 (file)
@@ -94,7 +94,7 @@ dissect_dscack (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.
index 091104cfee3f4c1ec6fd0d111404d2bd38bfbb9f..68fcdebec75e554687cbe6472f2dee3d7fb78f9f 100644 (file)
@@ -86,7 +86,7 @@ dissect_dscreq (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.
index 5f126cd139fe4737a0f0ae09a62b26c95e19e490..b24627ff127b92f9309dd019227cfa4b0e74d419 100644 (file)
@@ -93,7 +93,7 @@ dissect_dscrsp (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.
index 586fb56ffd0ee051c07d3629f32ef0151596c22d..b24aa4e669ff1f83cfca836b30f38b4accfae394 100644 (file)
@@ -90,7 +90,7 @@ dissect_dsdreq (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.
index 2185a44bd6123514cb38ba2ba7f55023aa8aef86..ce0875158cf0db34b40d81c53e5fab188f67b15b 100644 (file)
@@ -89,7 +89,7 @@ dissect_dsdrsp (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.
index 94504ed2d4eea6e06baed745ba0475501565a4fe..cdd3d6e5281429bab33cf8184c35bd801d0010be 100644 (file)
@@ -86,7 +86,7 @@ dissect_intrngreq (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.
index fbf6c2cdea4b803642e4f5c69ea6aba577333bb5..67704181ce6cc385cee99f0bd8d8fedcc9c0056e 100644 (file)
@@ -189,7 +189,7 @@ dissect_macmgmt (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.
index f65be587adba8543d8186034cca80432bcd0fdb4..49c1a50e748faf50a4ae70fd56fb4c69fff88bf5 100644 (file)
@@ -173,7 +173,7 @@ dissect_map (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.
index 1ef5d1e26b2ad7da5f3b16dd8faa0b8457bcca02..7a2a3b86b714414fcc6dfe452594b89786f05ad0 100644 (file)
@@ -92,7 +92,7 @@ dissect_regack (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.
index b4bceb2b74ff6bfd077e1ae865c76df1f28d28da..57a06dd0b6ea9c207217b978afcd8f4054c3d746 100644 (file)
@@ -87,7 +87,7 @@ dissect_regreq (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.
index 36c238b938981dd9a906312f30e0d9db501a12ea..94471cee9ff6584e5fff578a77f959e3cafef5b5 100644 (file)
@@ -90,7 +90,7 @@ dissect_regrsp (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.
index c0dfe477ca50c25f7f90c6c434e6caeda4d44c60..cb056ffcdf04d6b900181732e56cfe7b4d6fda8d 100644 (file)
@@ -90,7 +90,7 @@ dissect_rngreq (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.
index 0c5551343f43be33cd7f96cf6c723bff3a3b9378..d2687f97077e9cf742d458cd26df674c114ac834 100644 (file)
@@ -197,7 +197,7 @@ dissect_rngrsp (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.
index 2f2836af163fc9d20eb8adb6267f972f8dd4faff..ef1a35624712102287a8142400ecf0d10b180fbc 100644 (file)
@@ -2087,7 +2087,7 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, 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.
index 3295c86a55fbd0a7369a4ae7ac6ae769e9840cab..041e32fe87150ea18696646a114cac3c22116b01 100644 (file)
@@ -822,7 +822,7 @@ dissect_type29ucd (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.
index d9dafd30e94e2a6cc2268b1110da93012d464ce1..07fee12ffdfc555de5570ef7ffcd9a7649c2c6cb 100644 (file)
@@ -87,7 +87,7 @@ dissect_uccreq (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.
index 5efb27c2a5e557c9c599b65724c86870f2f6642c..da7bd6fbe9e2eeca22eca1d2d2fc8fef22aa5af1 100644 (file)
@@ -80,7 +80,7 @@ dissect_uccrsp (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.
index d0f27bde6871e2798b4225c9c9a4b4eedba51cab..83be89b58867a3f5d3547bfe0b55a0161016d1a1 100644 (file)
@@ -648,7 +648,7 @@ static void
    
 }
 
-/* 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.
index 7c89fde427937c303912756b0245d4bbbde1742a..00b157ece3da66d151bdf20417af21c8718b2d8e 100644 (file)
@@ -224,7 +224,7 @@ dissect_cisco (tvbuff_t * tvb, proto_tree * tree, gint vsif_len)
 
 
 
-/* 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.
index 1e66c82ade91bcacc147c4b650b111c08e7186eb..5c877eefe0863d80922dce3810d19f67deb58010 100644 (file)
@@ -795,7 +795,7 @@ static gboolean dissect_coseventcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tr
 
 
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 
 void proto_register_giop_coseventcomm(void) {
 
index 9b6a5327699579801aaacbe452d1cf01ecdd0d69..db646cc557557851e0bef40124ee7dc37ae8203c 100644 (file)
 
 #define PROTO_TAG_H223 "H223"
 
-/* Ethereal ID of the H.223 protocol */
+/* Wireshark ID of the H.223 protocol */
 static int proto_h223 = -1;
 
-/* The following hf_* variables are used to hold the ethereal IDs of
+/* The following hf_* variables are used to hold the Wireshark IDs of
  * our header fields; they are filled out when we call
  * proto_register_field_array() in proto_register_h223()
  */
index f79d5692f79006660cc303bd60164e95ef4280d1..1530b8541caea6932995e17b28cd2fc498606d78 100644 (file)
 
 #include "packet-srp.h"
 
-/* Ethereal ID of the protocols */
+/* Wireshark ID of the protocols */
 static int proto_srp = -1;
 static int proto_ccsrl = -1;
 
-/* The following hf_* variables are used to hold the ethereal IDs of
+/* The following hf_* variables are used to hold the Wireshark IDs of
  * our header fields; they are filled out when we call
  * proto_register_field_array() in proto_register_srp()
  */
index def83e109a4ad8ac5b4d78d6d02ca1d1f058b15b..4a7c8fbf3ceb6afa88638c438880bcaf76ca53a1 100644 (file)
@@ -1940,7 +1940,7 @@ static void init_irda(void)
 
 
 /*
- * Register the protocol with Ethereal
+ * Register the protocol with Wireshark
  * This format is required because a script is used to build the C function
  *  that calls all the protocol registrations.
  */
index 6564688237c9d10ff79a110085654ee042b1728e..da5ab57d56c04fe72b1bdb8ca53158d2f15bb365 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * packet-lua.c
  *
- * Ethereal's interface to the Lua Programming Language
+ * Wireshark's interface to the Lua Programming Language
  *
  * (c) 2006, Luis E. Garcia Ontanon <luis.ontanon@gmail.com>
  *
index 03d4b588c99b897250626d6c8c9af9485fc486e3..287c8e2769bbbce6c4ea8890f7540b879744b843 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * packet-lua.h
  *
- * Ethereal's interface to the Lua Programming Language
+ * Wireshark's interface to the Lua Programming Language
  *
  * (c) 2006, Luis E. Garcia Ontanon <luis.ontanon@gmail.com>
  *
index 202bcacf091e67cd9552b5ff274ae52974d826c3..2d0e75f9cebe83d16ceccffb2748c22a0329e318 100644 (file)
@@ -1,7 +1,7 @@
 /*
  *  lua_dumper.c
  *
- * Ethereal's interface to the Lua Programming Language
+ * Wireshark's interface to the Lua Programming Language
  *
  * (c) 2006, Luis E. Garcia Ontanon <luis.ontanon@gmail.com>
  *
index 37d3fed17bb797d83261d2d923dc6ad821765d47..d65df90f73003d532c2660123e9423c7cd27d148 100644 (file)
@@ -1,7 +1,7 @@
 /*
  *  elua_field.c
  *
- * Ethereal's interface to the Lua Programming Language
+ * Wireshark's interface to the Lua Programming Language
  *
  * (c) 2006, Luis E. Garcia Ontanon <luis.ontanon@gmail.com>
  *
index fd9b384137db1252e7387297bea73a934609f6be..79c03e9274b048a3444b00c34371d5f354e6ae5b 100644 (file)
@@ -499,7 +499,7 @@ ELUA_FUNCTION elua_retap_packets(lua_State* L) {
        if ( ops->retap_packets ) {
                ops->retap_packets();
        } else {
-               ELUA_ERROR(elua_retap_packets, "does not work on tethereal");
+               ELUA_ERROR(elua_retap_packets, "does not work on tWireshark");
        }
        
        return 0;
index 37b2e856884cf8d7e35b159affc39d33914763d6..f569d1782e4532c9b01fdc32ca09480884d90958 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * lua_pinfo.c
  *
- * Ethereal's interface to the Lua Programming Language
+ * Wireshark's interface to the Lua Programming Language
  *
  * (c) 2006, Luis E. Garcia Ontanon <luis.ontanon@gmail.com>
  *
index 6f646c23a53e8497bf78ef31f2aa25fff659ba01..9cddf1062ae2246e4cdef595888d572923e7e962 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * plugin.c
  *
- * Ethereal's interface to the Lua Programming Language
+ * Wireshark's interface to the Lua Programming Language
  *
  * (c) 2006, Luis E. Garcia Ontanon <luis.ontanon@gmail.com>
  *
index d6d3a8decfcfbf468355d52abf41ad2eaac6c971..3144f3101e41a1dead272ecee302072c078d4d52 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * lua_proto.c
  *
- * Ethereal's interface to the Lua Programming Language
+ * wireshark's interface to the Lua Programming Language
  *
  * (c) 2006, Luis E. Garcia Ontanon <luis.ontanon@gmail.com>
  *
index 3ed4eb5fd884ee2f14ca76fbedf6010be08f9ab3..451ec6867e95bb5b7570689f8596ee4cd828c03b 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * lua_tap.c
  *
- * Ethereal's interface to the Lua Programming Language
+ * Wireshark's interface to the Lua Programming Language
  *
  * (c) 2006, Luis E. Garcia Ontanon <luis.ontanon@gmail.com>
  *
@@ -272,7 +272,7 @@ static int Tap_newindex(lua_State* L) {
                function tap.packet(pinfo,tvb,userdata) ... end
        */
        /* ELUA_ATTRIBUTE Tap_draw WO A function that will be called once every few seconds to redraw the gui objects
-                               in tethereal this funtion is called oly at the very end of the capture file.
+                               in twireshark this funtion is called oly at the very end of the capture file.
        
                function tap.draw(userdata) ... end
        */
index e2d8e23074d2029618813c539cbc9084e02ef477..9eb1866929c4636cd891c5e822b3d179b75c1390 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * elua_tree.c
  *
- * Ethereal's interface to the Lua Programming Language
+ * Wireshark's interface to the Lua Programming Language
  *
  * (c) 2006, Luis E. Garcia Ontanon <luis.ontanon@gmail.com>
  *
index 1cbb61badba42e0395856af09d2b1190bbe873ab..6a48d107a2c048a0e3a91d2d2cf16f4aa5e5cdf4 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * lua_tvb.c
  *
- * Ethereal's interface to the Lua Programming Language
+ * Wireshark's interface to the Lua Programming Language
  *
  * (c) 2006, Luis E. Garcia Ontanon <luis.ontanon@gmail.com>
  *
@@ -287,7 +287,7 @@ int ByteArray_register(lua_State* L) {
  *
  * a Tvb represents a tvbuff_t in Lua. 
  * a TvbRange represents a range in a tvb (tvb,offset,lenght) it's main purpose is to do bounds checking, 
- *            it helps too simplifing argument passing to Tree. In ethereal terms this is worthless nothing
+ *            it helps too simplifing argument passing to Tree. In wireshark terms this is worthless nothing
  *            not already done by the TVB itself. In lua's terms is necessary to avoid abusing TRY{}CATCH(){}
  *            via preemptive bounds checking. 
  *
index 95ccd8e26d5d91f46983bfca10749e98128d637a..f0fa63145c1b82f65f3e180d6933f5e76df1b75e 100644 (file)
@@ -919,7 +919,7 @@ extern mate_config* mate_make_config(const gchar* filename, int mate_hfid) {
                analyze_config();
        } else {
                report_failure("MATE failed to configue!\n"
-                                          "It is recommended that you fix your config and restart ethereal.\n"
+                                          "It is recommended that you fix your config and restart wireshark.\n"
                                           "The reported error is:\n%s\n",matecfg->config_error->str);
                
                /* if (matecfg) destroy_mate_config(matecfg,FALSE); */
index 3de641a5680f93b6ca0c6ecef4e00d7e3bbbf91a..d4132cace1ba6f53b351c540f92349df8472a7e4 100644 (file)
@@ -327,7 +327,7 @@ proto_reg_handoff_mate(void)
                
                if (current_mate_config_filename) {
                        report_failure("Mate cannot reconfigure itself.\n"
-                                                  "for changes to be applied you have to restart ethereal\n");
+                                                  "for changes to be applied you have to restart wireshark\n");
                        return;
                } 
                
index cbe18d69e49aed93655bf802e62e5246c4c13ea2..ce98977efa213baf970c8b3d9bb55277d8360460 100644 (file)
@@ -166,7 +166,7 @@ dissect_rlm(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.
index 45e308431274ea2b63c454f17a07da2b53a4d523..cd26d16aa55d1d5e3878d019006350ef118ea368 100644 (file)
@@ -1965,7 +1965,7 @@ dissect_v5ua(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. */