- RNSAP calls RRC through dissector handle instead of direct function call

- PER dissectors regenerated

svn path=/trunk/; revision=21919

1 files changed, 23 insertions, 23 deletions

diff --git a/epan/dissectors/packet-ulp.c b/epan/dissectors/packet-ulp.c
index b2eb87cb3d..2af7e09e8d 100644
--- a/epan/dissectors/packet-ulp.c
+++ b/epan/dissectors/packet-ulp.c
@@ -161,11 +161,11 @@ static int hf_ulp_sessionId = -1;                 /* INTEGER_0_65535 */
 static int hf_ulp_setId = -1;                     /* SETId */
 static int hf_ulp_msisdn = -1;                    /* OCTET_STRING_SIZE_8 */
 static int hf_ulp_mdn = -1;                       /* OCTET_STRING_SIZE_8 */
-static int hf_ulp_min1 = -1;                      /* BIT_STRING_SIZE_34 */
+static int hf_ulp_min_01 = -1;                    /* BIT_STRING_SIZE_34 */
 static int hf_ulp_imsi = -1;                      /* OCTET_STRING_SIZE_8 */
 static int hf_ulp_nai = -1;                       /* IA5String_SIZE_1_1000 */
 static int hf_ulp_iPAddress = -1;                 /* IPAddress */
-static int hf_ulp_sessionID1 = -1;                /* OCTET_STRING_SIZE_4 */
+static int hf_ulp_sessionID_01 = -1;              /* OCTET_STRING_SIZE_4 */
 static int hf_ulp_slpId = -1;                     /* SLPAddress */
 static int hf_ulp_ipv4Address = -1;               /* OCTET_STRING_SIZE_4 */
 static int hf_ulp_ipv6Address = -1;               /* OCTET_STRING_SIZE_16 */
@@ -222,13 +222,13 @@ static int hf_ulp_utra_CarrierRSSI = -1;          /* UTRA_CarrierRSSI */
 static int hf_ulp_cellMeasuredResultsList = -1;   /* CellMeasuredResultsList */
 static int hf_ulp_CellMeasuredResultsList_item = -1;  /* CellMeasuredResults */
 static int hf_ulp_cellIdentity = -1;              /* INTEGER_0_268435455 */
-static int hf_ulp_modeSpecificInfo1 = -1;         /* T_modeSpecificInfo1 */
-static int hf_ulp_fdd1 = -1;                      /* T_fdd */
+static int hf_ulp_modeSpecificInfo_01 = -1;       /* T_modeSpecificInfo_01 */
+static int hf_ulp_fdd_01 = -1;                    /* T_fdd */
 static int hf_ulp_primaryCPICH_Info = -1;         /* PrimaryCPICH_Info */
 static int hf_ulp_cpich_Ec_N0 = -1;               /* CPICH_Ec_N0 */
 static int hf_ulp_cpich_RSCP = -1;                /* CPICH_RSCP */
 static int hf_ulp_pathloss = -1;                  /* Pathloss */
-static int hf_ulp_tdd1 = -1;                      /* T_tdd */
+static int hf_ulp_tdd_01 = -1;                    /* T_tdd */
 static int hf_ulp_cellParametersID = -1;          /* CellParametersID */
 static int hf_ulp_proposedTGSN = -1;              /* TGSN */
 static int hf_ulp_primaryCCPCH_RSCP = -1;         /* PrimaryCCPCH_RSCP */
@@ -305,7 +305,7 @@ static gint ett_ulp_MeasuredResultsList = -1;
 static gint ett_ulp_MeasuredResults = -1;
 static gint ett_ulp_CellMeasuredResultsList = -1;
 static gint ett_ulp_CellMeasuredResults = -1;
-static gint ett_ulp_T_modeSpecificInfo1 = -1;
+static gint ett_ulp_T_modeSpecificInfo_01 = -1;
 static gint ett_ulp_T_fdd = -1;
 static gint ett_ulp_T_tdd = -1;
 static gint ett_ulp_TimeslotISCP_List = -1;
@@ -459,7 +459,7 @@ static const value_string ulp_SETId_vals[] = {
 static const per_choice_t SETId_choice[] = {
   {   0, &hf_ulp_msisdn          , ASN1_EXTENSION_ROOT    , dissect_ulp_OCTET_STRING_SIZE_8 },
   {   1, &hf_ulp_mdn             , ASN1_EXTENSION_ROOT    , dissect_ulp_OCTET_STRING_SIZE_8 },
-  {   2, &hf_ulp_min1            , ASN1_EXTENSION_ROOT    , dissect_ulp_BIT_STRING_SIZE_34 },
+  {   2, &hf_ulp_min_01          , ASN1_EXTENSION_ROOT    , dissect_ulp_BIT_STRING_SIZE_34 },
   {   3, &hf_ulp_imsi            , ASN1_EXTENSION_ROOT    , dissect_ulp_OCTET_STRING_SIZE_8 },
   {   4, &hf_ulp_nai             , ASN1_EXTENSION_ROOT    , dissect_ulp_IA5String_SIZE_1_1000 },
   {   5, &hf_ulp_iPAddress       , ASN1_EXTENSION_ROOT    , dissect_ulp_IPAddress },
@@ -525,7 +525,7 @@ dissect_ulp_SLPAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
 
 
 static const per_sequence_t SlpSessionID_sequence[] = {
-  { &hf_ulp_sessionID1      , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_ulp_OCTET_STRING_SIZE_4 },
+  { &hf_ulp_sessionID_01    , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_ulp_OCTET_STRING_SIZE_4 },
   { &hf_ulp_slpId           , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_ulp_SLPAddress },
   { NULL, 0, 0, NULL }
 };
@@ -1163,22 +1163,22 @@ dissect_ulp_T_tdd(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto
 }
 
 
-static const value_string ulp_T_modeSpecificInfo1_vals[] = {
+static const value_string ulp_T_modeSpecificInfo_01_vals[] = {
   {   0, "fdd" },
   {   1, "tdd" },
   { 0, NULL }
 };
 
-static const per_choice_t T_modeSpecificInfo1_choice[] = {
-  {   0, &hf_ulp_fdd1            , ASN1_NO_EXTENSIONS     , dissect_ulp_T_fdd },
-  {   1, &hf_ulp_tdd1            , ASN1_NO_EXTENSIONS     , dissect_ulp_T_tdd },
+static const per_choice_t T_modeSpecificInfo_01_choice[] = {
+  {   0, &hf_ulp_fdd_01          , ASN1_NO_EXTENSIONS     , dissect_ulp_T_fdd },
+  {   1, &hf_ulp_tdd_01          , ASN1_NO_EXTENSIONS     , dissect_ulp_T_tdd },
   { 0, NULL, 0, NULL }
 };
 
 static int
-dissect_ulp_T_modeSpecificInfo1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_ulp_T_modeSpecificInfo_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
-                                 ett_ulp_T_modeSpecificInfo1, T_modeSpecificInfo1_choice,
+                                 ett_ulp_T_modeSpecificInfo_01, T_modeSpecificInfo_01_choice,
                                  NULL);
 
   return offset;
@@ -1187,7 +1187,7 @@ dissect_ulp_T_modeSpecificInfo1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
 
 static const per_sequence_t CellMeasuredResults_sequence[] = {
   { &hf_ulp_cellIdentity    , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_ulp_INTEGER_0_268435455 },
-  { &hf_ulp_modeSpecificInfo1, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_ulp_T_modeSpecificInfo1 },
+  { &hf_ulp_modeSpecificInfo_01, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_ulp_T_modeSpecificInfo_01 },
   { NULL, 0, 0, NULL }
 };
 
@@ -2504,7 +2504,7 @@ void proto_register_ulp(void) {
       { "mdn", "ulp.mdn",
         FT_BYTES, BASE_HEX, NULL, 0,
         "ulp.OCTET_STRING_SIZE_8", HFILL }},
-    { &hf_ulp_min1,
+    { &hf_ulp_min_01,
       { "min", "ulp.min",
         FT_BYTES, BASE_HEX, NULL, 0,
         "ulp.BIT_STRING_SIZE_34", HFILL }},
@@ -2520,7 +2520,7 @@ void proto_register_ulp(void) {
       { "iPAddress", "ulp.iPAddress",
         FT_UINT32, BASE_DEC, VALS(ulp_IPAddress_vals), 0,
         "ulp.IPAddress", HFILL }},
-    { &hf_ulp_sessionID1,
+    { &hf_ulp_sessionID_01,
       { "sessionID", "ulp.sessionID",
         FT_BYTES, BASE_HEX, NULL, 0,
         "ulp.OCTET_STRING_SIZE_4", HFILL }},
@@ -2748,11 +2748,11 @@ void proto_register_ulp(void) {
       { "cellIdentity", "ulp.cellIdentity",
         FT_UINT32, BASE_DEC, NULL, 0,
         "ulp.INTEGER_0_268435455", HFILL }},
-    { &hf_ulp_modeSpecificInfo1,
+    { &hf_ulp_modeSpecificInfo_01,
       { "modeSpecificInfo", "ulp.modeSpecificInfo",
-        FT_UINT32, BASE_DEC, VALS(ulp_T_modeSpecificInfo1_vals), 0,
-        "ulp.T_modeSpecificInfo1", HFILL }},
-    { &hf_ulp_fdd1,
+        FT_UINT32, BASE_DEC, VALS(ulp_T_modeSpecificInfo_01_vals), 0,
+        "ulp.T_modeSpecificInfo_01", HFILL }},
+    { &hf_ulp_fdd_01,
       { "fdd", "ulp.fdd",
         FT_NONE, BASE_NONE, NULL, 0,
         "ulp.T_fdd", HFILL }},
@@ -2772,7 +2772,7 @@ void proto_register_ulp(void) {
       { "pathloss", "ulp.pathloss",
         FT_UINT32, BASE_DEC, NULL, 0,
         "ulp.Pathloss", HFILL }},
-    { &hf_ulp_tdd1,
+    { &hf_ulp_tdd_01,
       { "tdd", "ulp.tdd",
         FT_NONE, BASE_NONE, NULL, 0,
         "ulp.T_tdd", HFILL }},
@@ -2914,7 +2914,7 @@ void proto_register_ulp(void) {
     &ett_ulp_MeasuredResults,
     &ett_ulp_CellMeasuredResultsList,
     &ett_ulp_CellMeasuredResults,
-    &ett_ulp_T_modeSpecificInfo1,
+    &ett_ulp_T_modeSpecificInfo_01,
     &ett_ulp_T_fdd,
     &ett_ulp_T_tdd,
     &ett_ulp_TimeslotISCP_List,