aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2006-05-22 08:14:01 +0000
committerRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2006-05-22 08:14:01 +0000
commitf0b33a47893e76488561e57d6c2dce07a1295d4b (patch)
tree94060daf713860116bedfbe9673d9a057b4a0824 /asn1
parent92552c2d765dcf89883392fcd11556d54f2843e5 (diff)
ethereal->wireshark updates
svn path=/trunk/; revision=18206
Diffstat (limited to 'asn1')
-rw-r--r--asn1/snmp/packet-snmp-template.c2
-rw-r--r--asn1/snmp/snmp.asn4
2 files changed, 3 insertions, 3 deletions
diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c
index a6ed72e7ad..071b6a4ed0 100644
--- a/asn1/snmp/packet-snmp-template.c
+++ b/asn1/snmp/packet-snmp-template.c
@@ -1284,7 +1284,7 @@ process_prefs(void)
}
/*
- * Cannot check if MIBS is already set, as it could be set by Ethereal.
+ * Cannot check if MIBS is already set, as it could be set by Wireshark.
*
* If we have a list of modules to load, put that list in MIBS,
* otherwise clear MIBS.
diff --git a/asn1/snmp/snmp.asn b/asn1/snmp/snmp.asn
index 5626538d57..d9095666d3 100644
--- a/asn1/snmp/snmp.asn
+++ b/asn1/snmp/snmp.asn
@@ -52,7 +52,7 @@ SimpleSyntax ::=
objectID-value ObjectID-value,
empty Empty
- -- Added from RFC 1155 for Ethereal
+ -- Added from RFC 1155 for Wireshark
}
String-value ::= OCTET STRING (SIZE (0..65535))
@@ -68,7 +68,7 @@ Integer32 ::= INTEGER (-2147483648..2147483647)
ObjectID-value ::= OBJECT IDENTIFIER
Empty ::= NULL
- -- Added from RFC 1155 for Ethereal
+ -- Added from RFC 1155 for Wireshark
-- application-wide types