diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2007-07-13 11:25:53 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2007-07-13 11:25:53 +0000 |
| commit | 6659588f60dfff4b58c23f2b27bf1309c3baf2bb (patch) | |
| tree | 1a3309269d9ab4681859e99d1c680fdf26150203 /asn1/q932 | |
| parent | b989e08afd3412df954db6f1ba9a3a19f9762780 (diff) | |
- get rid of anonymous unions
- move some structures from packet-per and packet-q932-ros to asn1.h
svn path=/trunk/; revision=22295
Diffstat (limited to 'asn1/q932')
| -rw-r--r-- | asn1/q932/packet-q932-ros-template.c | 4 | ||||
| -rw-r--r-- | asn1/q932/packet-q932-ros-template.h | 12 | ||||
| -rw-r--r-- | asn1/q932/packet-q932-template.c | 2 |
3 files changed, 5 insertions, 13 deletions
diff --git a/asn1/q932/packet-q932-ros-template.c b/asn1/q932/packet-q932-ros-template.c index 944b97fdc0..ff1e6746f6 100644 --- a/asn1/q932/packet-q932-ros-template.c +++ b/asn1/q932/packet-q932-ros-template.c @@ -55,7 +55,7 @@ int proto_rose = -1; static dissector_handle_t data_handle = NULL; /* Gloabl variables */ -static rose_context *rose_ctx; +static rose_ctx_t *rose_ctx; static gint32 code_choice; static guint32 code_local; @@ -68,7 +68,7 @@ static tvbuff_t *arg_next_tvb, *res_next_tvb, *err_next_tvb; #include "packet-q932-ros-fn.c" /*--- dissect_rose_apdu -----------------------------------------------------*/ -int dissect_rose_apdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rose_context *rctx) { +int dissect_rose_apdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rose_ctx_t *rctx) { if (rctx) rose_ctx = rctx; return dissect_ROS_PDU(tvb, pinfo, tree); diff --git a/asn1/q932/packet-q932-ros-template.h b/asn1/q932/packet-q932-ros-template.h index f6bb01c553..585ca58d9f 100644 --- a/asn1/q932/packet-q932-ros-template.h +++ b/asn1/q932/packet-q932-ros-template.h @@ -26,17 +26,9 @@ #ifndef PACKET_ROSE_H #define PACKET_ROSE_H -#include "epan/packet.h" +#include "epan/asn1.h" -typedef struct _rose_context { - int apdu_depth; - dissector_table_t arg_global_dissector_table; - dissector_table_t arg_local_dissector_table; - dissector_table_t res_global_dissector_table; - dissector_table_t res_local_dissector_table; -} rose_context; - -int dissect_rose_apdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rose_context *rctx); +int dissect_rose_apdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rose_ctx_t *rctx); #endif /* PACKET_ROSE_H */ diff --git a/asn1/q932/packet-q932-template.c b/asn1/q932/packet-q932-template.c index 1c7ffe08a1..32b1b5174e 100644 --- a/asn1/q932/packet-q932-template.c +++ b/asn1/q932/packet-q932-template.c @@ -58,7 +58,7 @@ static gint ett_q932_ie = -1; /* Preferences */ /* ROSE context */ -static rose_context q932_rose_ctx; +static rose_ctx_t q932_rose_ctx; /* Subdissectors */ static dissector_handle_t data_handle = NULL; |