diff options
| author | Luis Ontanon <luis.ontanon@gmail.com> | 2007-08-25 01:14:24 +0000 |
|---|---|---|
| committer | Luis Ontanon <luis.ontanon@gmail.com> | 2007-08-25 01:14:24 +0000 |
| commit | 00c5e48a17040bbeff107c98ce365633724ad9fe (patch) | |
| tree | 55d9c884242ed55ed057163c987103803043bc8a /plugins/asn1 | |
| parent | fb082a9a3c738c4707245cd7a5bdf564683a968f (diff) | |
get users of oid_resolv to use the new oids, rollout packet-snmp.c
svn path=/trunk/; revision=22651
Diffstat (limited to 'plugins/asn1')
| -rw-r--r-- | plugins/asn1/asn1.c | 3 | ||||
| -rw-r--r-- | plugins/asn1/asn1.h | 2 | ||||
| -rw-r--r-- | plugins/asn1/packet-asn1.c | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/plugins/asn1/asn1.c b/plugins/asn1/asn1.c index 394d14b63a..3c711f7ef8 100644 --- a/plugins/asn1/asn1.c +++ b/plugins/asn1/asn1.c @@ -66,10 +66,13 @@ #include <glib.h> +#define subid_t guint32 /* ugly hack to get it to compile this symbol should be suppressed! */ + #include <epan/tvbuff.h> #include <plugins/asn1/asn1.h> #include <epan/emem.h> + /* * NAME: asn1_open [API] * SYNOPSIS: void asn1_open diff --git a/plugins/asn1/asn1.h b/plugins/asn1/asn1.h index e07783fa19..880575930f 100644 --- a/plugins/asn1/asn1.h +++ b/plugins/asn1/asn1.h @@ -125,8 +125,6 @@ struct _ASN1_SCK int offset; /* Current offset in tvbuff */ }; -#include <epan/dissectors/format-oid.h> - extern void asn1_open (ASN1_SCK *asn1, tvbuff_t *tvb, int offset); extern void asn1_close (ASN1_SCK *asn1, int *offset); extern int asn1_octet_decode (ASN1_SCK *asn1, guchar *ch); diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c index aebb63eda9..85fed297e8 100644 --- a/plugins/asn1/packet-asn1.c +++ b/plugins/asn1/packet-asn1.c @@ -82,6 +82,7 @@ #include <epan/report_err.h> #include <epan/emem.h> #include <epan/dissectors/packet-tcp.h> +#include <epan/oids.h> #include <plugins/asn1/asn1.h> #include <wiretap/file_util.h> |