diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-07-27 08:10:31 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-07-27 08:10:31 +0000 |
| commit | ad7c4a4bbadb408c4b0b0cc385a3db17209a1c98 (patch) | |
| tree | ed17beb45e4ca4da9f7115a7761edfcf024252a8 /asn1/rrc | |
| parent | 3bfda44ae01b5f16bfd425afe19261e51f4d78b6 (diff) | |
From Jacob Nordgren and Rishie Sharma:
- Added basic support for tracking flows over reconfigured transport channels + mindor bugfixes
- small fix in rrc, and some small cleanups
svn path=/trunk/; revision=44062
Diffstat (limited to 'asn1/rrc')
| -rw-r--r-- | asn1/rrc/packet-rrc-template.c | 2 | ||||
| -rw-r--r-- | asn1/rrc/rrc.cnf | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/asn1/rrc/packet-rrc-template.c b/asn1/rrc/packet-rrc-template.c index 61ef2e1c2a..b38cf115d3 100644 --- a/asn1/rrc/packet-rrc-template.c +++ b/asn1/rrc/packet-rrc-template.c @@ -55,6 +55,7 @@ #define PFNAME "rrc" extern int proto_fp; /*Handler to FP*/ + GTree * hsdsch_muxed_flows; @@ -132,6 +133,7 @@ static tvbuff_t * hrnti; #define MAX_NUM_HSDHSCH_MACDFLOW 8 static guint8 num_chans_per_flow[MAX_NUM_HSDHSCH_MACDFLOW]; + #include "packet-rrc-fn.c" #include "packet-rrc.h" diff --git a/asn1/rrc/rrc.cnf b/asn1/rrc/rrc.cnf index a5925a67a0..f382b50f63 100644 --- a/asn1/rrc/rrc.cnf +++ b/asn1/rrc/rrc.cnf @@ -711,13 +711,13 @@ HNBName TYPE=FT_STRING DISPLAY=BASE_NONE #.FN_BODY MAC-d-FlowIdentity VAL_PTR = &flowd %(DEFAULT_BODY)s -#.FN_BODY SRB_InformationSetupList2_r6 +#.FN_BODY SRB-InformationSetupList2-r6 %(DEFAULT_BODY)s /*Clear memory*/ memset(num_chans_per_flow,0,sizeof(guint8)); -#.FN_BODY H_RNTI VAL_PTR = &hrnti +#.FN_BODY H-RNTI VAL_PTR = &hrnti |