diff options
| author | Evan Huus <eapache@gmail.com> | 2013-09-05 12:13:00 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-09-05 12:13:00 +0000 |
| commit | 3b6f55c579c23a12d609e81be0188f6448b832c4 (patch) | |
| tree | cd0af4382b66bb26ec8adb7d82adbdf3578501b7 /asn1/atn-ulcs/packet-atn-ulcs-template.h | |
| parent | c248e3c5b2d64f25bbec6973b5eea42a55a87bc7 (diff) | |
Convert atn-* dissectors to wmem. No emem in new code please!
svn path=/trunk/; revision=51780
Diffstat (limited to 'asn1/atn-ulcs/packet-atn-ulcs-template.h')
| -rw-r--r-- | asn1/atn-ulcs/packet-atn-ulcs-template.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/asn1/atn-ulcs/packet-atn-ulcs-template.h b/asn1/atn-ulcs/packet-atn-ulcs-template.h index 88a6a82cb6..7b09f8d283 100644 --- a/asn1/atn-ulcs/packet-atn-ulcs-template.h +++ b/asn1/atn-ulcs/packet-atn-ulcs-template.h @@ -33,6 +33,8 @@ #include "packet.h" +#include <epan/wmem/wmem.h> + /* IA5 charset (7-bit) for PER IA5 decoding */ static const gchar ia5alpha[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, \ @@ -45,7 +47,7 @@ static const gchar ia5alpha[] = { 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, \ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, '\0' }; - + enum msg_type { um, dm, @@ -78,7 +80,7 @@ atn_conversation_t * find_atn_conversation( address*, guint16, address*); - + /* struct for conversation data reconstruction used in AARQ and AARE */ /* if transport data is larger than 32 octets AARQ/AARE is contained */ /* within DT frames which have only dest_ref, but no src_ref */ @@ -91,8 +93,8 @@ typedef struct aarq_data_t { /* i.e. GND facility initialises cpcstart and cmcontact at the same time */ atn_conversation_t* cv; /* pointer to AARQ conversation */ } aarq_data_t; - -emem_tree_t *get_atn_conversation_tree(void); + +wmem_tree_t *get_atn_conversation_tree(void); guint32 get_aircraft_24_bit_address_from_nsap(packet_info *); int check_heur_msg_type(packet_info *); @@ -111,4 +113,3 @@ int check_heur_msg_type(packet_info *); * vi: set shiftwidth=2 tabstop=2 noexpandtab: * :indentSize=2:tabSize=2:noTabs=false: */ - |