diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-05-22 11:53:12 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-05-22 11:53:12 +0000 |
| commit | ec5ec34f1f828c1a5e2b4042b9b9d79854d0b762 (patch) | |
| tree | 96c7961a37271c782b71e4f015420b07a05c32fb /asn1/nbap/packet-nbap-template.c | |
| parent | 1d41075db164add7546d83517651a224e80835ca (diff) | |
| download | wireshark-ec5ec34f1f828c1a5e2b4042b9b9d79854d0b762.tar.gz | |
Collect and use E-DCH data.
svn path=/trunk/; revision=42779
Diffstat (limited to 'asn1/nbap/packet-nbap-template.c')
| -rw-r--r-- | asn1/nbap/packet-nbap-template.c | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c index fda7192e58..7602e3b5a7 100644 --- a/asn1/nbap/packet-nbap-template.c +++ b/asn1/nbap/packet-nbap-template.c @@ -50,7 +50,7 @@ #define PFNAME "nbap" /* Debug */ -#if 1 +#if 0 #define nbap_debug0(str) g_warning(str) #define nbap_debug1(str,p1) g_warning(str,p1) #define nbap_debug2(str,p1,p2) g_warning(str,p1,p2) @@ -84,6 +84,9 @@ static int ett_nbap_TransportLayerAddress_nsap = -1; #include "packet-nbap-ett.c" + +extern int proto_fp; + /* * Structure to build information needed to dissect the FP flow beeing set up. */ @@ -110,6 +113,25 @@ typedef struct }nbap_dch_chanel_info_t; nbap_dch_chanel_info_t nbap_dch_chnl_info[maxNrOfDCHs]; + +/* Struct to collect E-DCH data in a packet + * As the address data comes before the ddi entries + * we save the address to be able to find the conversation and update the + * conversation data. + */ +typedef struct +{ + address crnc_address; + guint16 crnc_port; + gint no_ddi_entries; + guint8 edch_ddi[MAX_EDCH_DDIS]; + guint edch_macd_pdu_size[MAX_EDCH_DDIS]; + guint8 edch_type; /* 1 means T2 */ + +} nbap_edch_chanel_info_t; + +nbap_edch_chanel_info_t nbap_edch_chanel_info[maxNrOfEDCHMACdFlows]; + gint g_num_dch_in_flow; /* maxNrOfTFs INTEGER ::= 32 */ gint g_dchs_in_flow_list[maxNrOfTFs]; @@ -121,7 +143,8 @@ static guint32 ProcedureCode; static guint32 ProtocolIE_ID; static guint32 ddMode; static const gchar *ProcedureID; -static guint32 t_dch_id, dch_id, prev_dch_id, commonphysicalchannelid, e_dch_macdflow_id, hsdsch_macdflow_id; +static guint32 t_dch_id, dch_id, prev_dch_id, commonphysicalchannelid, e_dch_macdflow_id, hsdsch_macdflow_id, e_dch_ddi_value; +static guint32 MACdPDU_Size; static guint num_items; static gboolean show_conv_data_collection = TRUE; |