diff options
| author | lego <lego@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-08-25 01:14:24 +0000 |
|---|---|---|
| committer | lego <lego@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-08-25 01:14:24 +0000 |
| commit | ac32510733f639531388f5ef83986f783e5a5b77 (patch) | |
| tree | 55d9c884242ed55ed057163c987103803043bc8a /epan/dissectors/packet-cops.c | |
| parent | f704c0f368901cc9e1c36fb462f518376e8a3791 (diff) | |
get users of oid_resolv to use the new oids, rollout packet-snmp.c
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22651 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-cops.c')
| -rw-r--r-- | epan/dissectors/packet-cops.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index 0e216c7e34..1e0177e53b 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -74,7 +74,7 @@ # include <net-snmp/config_api.h> #endif /* HAVE_NET_SNMP */ -#include <epan/dissectors/format-oid.h> +#include <epan/oids.h> #include <epan/prefs.h> #include <epan/expert.h> #include <epan/asn1.h> @@ -1347,7 +1347,7 @@ static guchar*format_asn_value (struct variable_list *variable, subid_t *variabl size_t out_len=0; /*Get the ASN.1 type etc. from the PIB-MIB. If unsuccessful use the type from packet*/ - subtree = get_tree(variable_oid,variable_oid_length, subtree); + subtree = get_tree((void*)variable_oid,variable_oid_length, subtree); if (subtree->type == 0) variable->type= type_from_packet; @@ -1562,8 +1562,7 @@ static int decode_cops_pr_asn1_data(tvbuff_t *tvb,packet_info *pinfo, guint32 of offset = dissect_ber_identifier(pinfo, tree, tvb, offset, &class, &pc, &ber_tag); offset = dissect_ber_length(pinfo, tree, tvb, offset, &vb_length, &ind); oid_buf = tvb_get_ptr(tvb, vb_value_start, vb_length); - vb_oid = ep_alloc((vb_length+1) * sizeof(gulong)); - vb_oid_length = oid_to_subid_buf(oid_buf, vb_length, vb_oid, ((vb_length+1) * sizeof(gulong))); + vb_oid_length = oid_encoded2subid(oid_buf, vb_length, &vb_oid); offset = offset + vb_length; length = offset - vb_value_start; |