diff options
Diffstat (limited to 'epan/dissectors/asn1/ulp')
| -rw-r--r-- | epan/dissectors/asn1/ulp/packet-ulp-template.c | 88 | ||||
| -rw-r--r-- | epan/dissectors/asn1/ulp/ulp.cnf | 124 |
2 files changed, 107 insertions, 105 deletions
diff --git a/epan/dissectors/asn1/ulp/packet-ulp-template.c b/epan/dissectors/asn1/ulp/packet-ulp-template.c index f231deb6..2a14fcad 100644 --- a/epan/dissectors/asn1/ulp/packet-ulp-template.c +++ b/epan/dissectors/asn1/ulp/packet-ulp-template.c @@ -21,10 +21,12 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/asn1.h> +#include <epan/tfs.h> +#include <epan/unit_strings.h> +#include <wsutil/array.h> #include "packet-per.h" #include "packet-tcp.h" -#include "packet-gsm_map.h" #include "packet-e164.h" #include "packet-e212.h" @@ -44,27 +46,27 @@ static dissector_handle_t lpp_handle; #define ULP_PORT 7275 /* Initialize the protocol and registered fields */ -static int proto_ulp = -1; +static int proto_ulp; #define ULP_HEADER_SIZE 2 -static gboolean ulp_desegment = TRUE; +static bool ulp_desegment = true; #include "packet-ulp-hf.c" -static int hf_ulp_mobile_directory_number = -1; -static int hf_ulp_ganssTimeModels_bit0 = -1; -static int hf_ulp_ganssTimeModels_bit1 = -1; -static int hf_ulp_ganssTimeModels_bit2 = -1; -static int hf_ulp_ganssTimeModels_bit3 = -1; -static int hf_ulp_ganssTimeModels_bit4 = -1; -static int hf_ulp_ganssTimeModels_spare = -1; +static int hf_ulp_mobile_directory_number; +static int hf_ulp_ganssTimeModels_bit0; +static int hf_ulp_ganssTimeModels_bit1; +static int hf_ulp_ganssTimeModels_bit2; +static int hf_ulp_ganssTimeModels_bit3; +static int hf_ulp_ganssTimeModels_bit4; +static int hf_ulp_ganssTimeModels_spare; /* Initialize the subtree pointers */ -static gint ett_ulp = -1; -static gint ett_ulp_setid = -1; -static gint ett_ulp_thirdPartyId = -1; -static gint ett_ulp_ganssTimeModels = -1; +static int ett_ulp; +static int ett_ulp_setid; +static int ett_ulp_thirdPartyId; +static int ett_ulp_ganssTimeModels; #include "packet-ulp-ett.c" static dissector_handle_t ulp_tcp_handle; @@ -89,7 +91,7 @@ static const value_string ulp_ganss_sbas_id_vals[] = { }; static void -ulp_ganssDataBitInterval_fmt(gchar *s, guint32 v) +ulp_ganssDataBitInterval_fmt(char *s, uint32_t v) { if (v == 15) { snprintf(s, ITEM_LABEL_LENGTH, "Time interval is not specified (15)"); @@ -101,13 +103,13 @@ ulp_ganssDataBitInterval_fmt(gchar *s, guint32 v) } static void -ulp_ExtendedEphemeris_validity_fmt(gchar *s, guint32 v) +ulp_ExtendedEphemeris_validity_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%uh (%u)", 4*v, v); } static void -ulp_PositionEstimate_latitude_fmt(gchar *s, guint32 v) +ulp_PositionEstimate_latitude_fmt(char *s, uint32_t v) { double latitude = ((double)v*90)/pow(2,23); @@ -115,15 +117,15 @@ ulp_PositionEstimate_latitude_fmt(gchar *s, guint32 v) } static void -ulp_PositionEstimate_longitude_fmt(gchar *s, guint32 v) +ulp_PositionEstimate_longitude_fmt(char *s, uint32_t v) { - double longitude = ((double)(gint32)v*360)/pow(2,24); + double longitude = ((double)(int32_t)v*360)/pow(2,24); snprintf(s, ITEM_LABEL_LENGTH, "%g degrees (%u)", longitude, v); } static void -ulp_NMRelement_rxLev_fmt(gchar *s, guint32 v) +ulp_NMRelement_rxLev_fmt(char *s, uint32_t v) { if (v == 0) { snprintf(s, ITEM_LABEL_LENGTH, "RxLev < -110dBm (0)"); @@ -135,7 +137,7 @@ ulp_NMRelement_rxLev_fmt(gchar *s, guint32 v) } static void -ulp_UTRA_CarrierRSSI_fmt(gchar *s, guint32 v) +ulp_UTRA_CarrierRSSI_fmt(char *s, uint32_t v) { if (v == 0) { snprintf(s, ITEM_LABEL_LENGTH, "RSSI < -100dBm (0)"); @@ -149,7 +151,7 @@ ulp_UTRA_CarrierRSSI_fmt(gchar *s, guint32 v) } static void -ulp_PrimaryCCPCH_RSCP_fmt(gchar *s, guint32 v) +ulp_PrimaryCCPCH_RSCP_fmt(char *s, uint32_t v) { if (v == 0) { snprintf(s, ITEM_LABEL_LENGTH, "RSCP < -115dBm (0)"); @@ -163,7 +165,7 @@ ulp_PrimaryCCPCH_RSCP_fmt(gchar *s, guint32 v) } static void -ulp_CPICH_Ec_N0_fmt(gchar *s, guint32 v) +ulp_CPICH_Ec_N0_fmt(char *s, uint32_t v) { if (v == 0) { snprintf(s, ITEM_LABEL_LENGTH, "CPICH Ec/N0 < -24dB (0)"); @@ -177,7 +179,7 @@ ulp_CPICH_Ec_N0_fmt(gchar *s, guint32 v) } static void -ulp_CPICH_RSCP_fmt(gchar *s, guint32 v) +ulp_CPICH_RSCP_fmt(char *s, uint32_t v) { if (v == 123) { snprintf(s, ITEM_LABEL_LENGTH, "CPICH RSCP < -120dBm (123)"); @@ -193,7 +195,7 @@ ulp_CPICH_RSCP_fmt(gchar *s, guint32 v) } static void -ulp_QoP_horacc_fmt(gchar *s, guint32 v) +ulp_QoP_horacc_fmt(char *s, uint32_t v) { double uncertainty = 10*(pow(1.1, (double)v)-1); @@ -205,7 +207,7 @@ ulp_QoP_horacc_fmt(gchar *s, guint32 v) } static void -ulp_QoP_veracc_fmt(gchar *s, guint32 v) +ulp_QoP_veracc_fmt(char *s, uint32_t v) { double uncertainty = 45*(pow(1.025, (double)v)-1); @@ -213,7 +215,7 @@ ulp_QoP_veracc_fmt(gchar *s, guint32 v) } static void -ulp_QoP_delay_fmt(gchar *s, guint32 v) +ulp_QoP_delay_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%gs (%u)", pow(2, (double)v), v); } @@ -224,13 +226,13 @@ static const true_false_string ulp_vertical_dir_val = { }; static void -ulp_RelativeTime_fmt(gchar *s, guint32 v) +ulp_RelativeTime_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%.2fs (%u)", 0.01*v, v); } static void -ulp_RSRP_Range_fmt(gchar *s, guint32 v) +ulp_RSRP_Range_fmt(char *s, uint32_t v) { if (v == 0) { snprintf(s, ITEM_LABEL_LENGTH, "RSRP < -140dBm (0)"); @@ -242,7 +244,7 @@ ulp_RSRP_Range_fmt(gchar *s, guint32 v) } static void -ulp_RSRQ_Range_fmt(gchar *s, guint32 v) +ulp_RSRQ_Range_fmt(char *s, uint32_t v) { if (v == 0) { snprintf(s, ITEM_LABEL_LENGTH, "RSRQ < -19.5dB (0)"); @@ -254,31 +256,31 @@ ulp_RSRQ_Range_fmt(gchar *s, guint32 v) } static void -ulp_SignalDelta_fmt(gchar *s, guint32 v) +ulp_SignalDelta_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%sdB (%u)", v ? "0.5" : "0", v); } static void -ulp_locationAccuracy_fmt(gchar *s, guint32 v) +ulp_locationAccuracy_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%.1fm (%u)", 0.1*v, v); } static void -ulp_WimaxRTD_fmt(gchar *s, guint32 v) +ulp_WimaxRTD_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%.2fus (%u)", 0.01*v, v); } static void -ulp_WimaxNMR_rssi_fmt(gchar *s, guint32 v) +ulp_WimaxNMR_rssi_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%.2fdBm (%u)", -103.75+(0.25*v), v); } static void -ulp_UTRAN_gpsReferenceTimeUncertainty_fmt(gchar *s, guint32 v) +ulp_UTRAN_gpsReferenceTimeUncertainty_fmt(char *s, uint32_t v) { double uncertainty = 0.0022*(pow(1.18, (double)v)-1); @@ -294,22 +296,22 @@ static const value_string ulp_ganss_time_id_vals[] = { }; static void -ulp_utran_GANSSTimingOfCell_fmt(gchar *s, guint32 v) +ulp_utran_GANSSTimingOfCell_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%.2fus (%u)", 0.25*v, v); } static void -ulp_Coordinate_latitude_fmt(gchar *s, guint32 v) +ulp_Coordinate_latitude_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%f degrees (%u)", ((float)v/8388607.0)*90, v); } static void -ulp_Coordinate_longitude_fmt(gchar *s, guint32 v) +ulp_Coordinate_longitude_fmt(char *s, uint32_t v) { - gint32 longitude = (gint32) v; + int32_t longitude = (int32_t) v; snprintf(s, ITEM_LABEL_LENGTH, "%f degrees (%d)", ((float)longitude/8388608.0)*180, longitude); @@ -320,8 +322,8 @@ ulp_Coordinate_longitude_fmt(gchar *s, guint32 v) typedef struct { - guint8 notif_enc_type; - guint8 ganss_req_gen_data_ganss_id; + uint8_t notif_enc_type; + uint8_t ganss_req_gen_data_ganss_id; } ulp_private_data_t; static ulp_private_data_t* ulp_get_private_data(asn1_ctx_t *actx) @@ -335,7 +337,7 @@ static ulp_private_data_t* ulp_get_private_data(asn1_ctx_t *actx) #include "packet-ulp-fn.c" -static guint +static unsigned get_ulp_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U_) { /* PDU length = Message length */ @@ -390,7 +392,7 @@ void proto_register_ulp(void) { }; /* List of subtrees */ - static gint *ett[] = { + static int *ett[] = { &ett_ulp, &ett_ulp_setid, &ett_ulp_thirdPartyId, diff --git a/epan/dissectors/asn1/ulp/ulp.cnf b/epan/dissectors/asn1/ulp/ulp.cnf index 69a36d87..5efa44c1 100644 --- a/epan/dissectors/asn1/ulp/ulp.cnf +++ b/epan/dissectors/asn1/ulp/ulp.cnf @@ -43,7 +43,7 @@ Coordinate/longitude coordinateLongitude #.FN_BODY UlpMessage VAL_PTR = &UlpMessage -guint32 UlpMessage; +uint32_t UlpMessage; %(DEFAULT_BODY)s @@ -58,11 +58,11 @@ guint32 UlpMessage; %(DEFAULT_BODY)s #.FN_BODY EncodingType VAL_PTR=&val - guint32 val; + uint32_t val; ulp_private_data_t *ulp_priv = ulp_get_private_data(actx); %(DEFAULT_BODY)s - ulp_priv->notif_enc_type = (guint8) val; + ulp_priv->notif_enc_type = (uint8_t) val; #.FN_BODY Notification/requestorId VAL_PTR=&val_tvb HF_INDEX=-1 tvbuff_t *val_tvb; @@ -129,10 +129,10 @@ Notification/requestorId TYPE=FT_STRING DISPLAY=BASE_NONE Notification/clientName TYPE=FT_STRING DISPLAY=BASE_NONE #.TYPE_ATTR -NavigationModel/gpsToe DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_hours +NavigationModel/gpsToe DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_hours) #.TYPE_ATTR -NavigationModel/toeLimit DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_hours +NavigationModel/toeLimit DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_hours) #.FN_BODY PosPayLoad/rrlpPayload VAL_PTR = &rrlp_tvb tvbuff_t *rrlp_tvb; @@ -144,19 +144,19 @@ NavigationModel/toeLimit DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_hours } #.TYPE_ATTR -PeriodicParams/intervalBetweenFixes DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +PeriodicParams/intervalBetweenFixes DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_ATTR -PeriodicParams/startTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +PeriodicParams/startTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_ATTR -AreaEventParams/startTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +AreaEventParams/startTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_ATTR -AreaEventParams/stopTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +AreaEventParams/stopTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_ATTR -RepeatedReportingParams/minimumIntervalTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +RepeatedReportingParams/minimumIntervalTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.FN_BODY WLANAreaId/apMACAddress VAL_PTR=&val_tvb HF_INDEX=-1 tvbuff_t *val_tvb; @@ -173,16 +173,16 @@ WLANAreaId/apMACAddress TYPE=FT_ETHER GANSSSignalsDescription/ganssId STRINGS=VALS(ulp_ganss_id_vals) #.TYPE_ATTR -TimeStamp/relativeTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +TimeStamp/relativeTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_ATTR -ReportingCriteria/minTimeInterval DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +ReportingCriteria/minTimeInterval DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_ATTR -TimeWindow/startTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_minutes +TimeWindow/startTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_minutes) #.TYPE_ATTR -TimeWindow/stopTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_minutes +TimeWindow/stopTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_minutes) #.TYPE_ATTR GANSSPositionMethod/ganssId STRINGS=VALS(ulp_ganss_id_vals) @@ -199,11 +199,11 @@ GANSSPositionMethod/ganssId STRINGS=VALS(ulp_ganss_id_vals) GANSSPositionMethod/ganssSBASid TYPE=FT_UINT8 DISPLAY=BASE_DEC STRINGS=VALS(ulp_ganss_sbas_id_vals) #.FN_BODY GanssReqGenericData/ganssId VAL_PTR=&val - guint32 val; + uint32_t val; ulp_private_data_t *ulp_priv = ulp_get_private_data(actx); %(DEFAULT_BODY)s - ulp_priv->ganss_req_gen_data_ganss_id = (guint8) val; + ulp_priv->ganss_req_gen_data_ganss_id = (uint8_t) val; #.TYPE_ATTR GanssReqGenericData/ganssId STRINGS=VALS(ulp_ganss_id_vals) @@ -244,7 +244,7 @@ GanssReqGenericData/ganssSBASid TYPE=FT_UINT8 DISPLAY=BASE_DEC STRINGS=VALS(ulp_ } #.FN_BODY GanssNavigationModelData/ganssToe VAL_PTR=&val - guint32 val; + uint32_t val; ulp_private_data_t *ulp_priv = ulp_get_private_data(actx); %(DEFAULT_BODY)s @@ -258,7 +258,7 @@ GanssReqGenericData/ganssSBASid TYPE=FT_UINT8 DISPLAY=BASE_DEC STRINGS=VALS(ulp_ } #.FN_BODY GanssNavigationModelData/t-toeLimit VAL_PTR=&val - guint32 val; + uint32_t val; ulp_private_data_t *ulp_priv = ulp_get_private_data(actx); %(DEFAULT_BODY)s @@ -272,7 +272,7 @@ GanssReqGenericData/ganssSBASid TYPE=FT_UINT8 DISPLAY=BASE_DEC STRINGS=VALS(ulp_ } #.TYPE_ATTR -GanssDataBits/ganssTODmin DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +GanssDataBits/ganssTODmin DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_ATTR ReqDataBitAssistanceList/ganssDataBitInterval DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_ganssDataBitInterval_fmt) @@ -306,7 +306,7 @@ ExtendedEphemeris/validity DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_ExtendedEphem proto_tree *subtree; subtree = proto_item_add_subtree(actx->created_item, ett_ulp_setid); - proto_tree_add_item(subtree, hf_ulp_mobile_directory_number, mdn_tvb, 0, 8, ENC_BCD_DIGITS_0_9); + proto_tree_add_item(subtree, hf_ulp_mobile_directory_number, mdn_tvb, 0, 8, ENC_BCD_DIGITS_0_9|ENC_LITTLE_ENDIAN); } #.FN_BODY SETId/imsi VAL_PTR=&imsi_tvb @@ -316,7 +316,7 @@ ExtendedEphemeris/validity DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_ExtendedEphem proto_tree *subtree; subtree = proto_item_add_subtree(actx->created_item, ett_ulp_setid); - dissect_e212_imsi(imsi_tvb, actx->pinfo, subtree, 0, 8, FALSE); + dissect_e212_imsi(imsi_tvb, actx->pinfo, subtree, 0, 8, false); } #.TYPE_ATTR @@ -336,13 +336,13 @@ PositionEstimate/uncertainty/uncertaintySemiMajor DISPLAY=BASE_CUSTOM STRINGS=CF PositionEstimate/uncertainty/uncertaintySemiMinor DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_QoP_horacc_fmt) #.TYPE_ATTR -PositionEstimate/uncertainty/orientationMajorAxis DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_degree_degrees +PositionEstimate/uncertainty/orientationMajorAxis DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_degree_degrees) #.TYPE_ATTR -PositionEstimate/confidence DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_percent +PositionEstimate/confidence DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_percent) #.TYPE_ATTR -AltitudeInfo/altitude DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_meters +AltitudeInfo/altitude DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_meters) #.TYPE_ATTR AltitudeInfo/altUncertainty DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_QoP_veracc_fmt) @@ -369,13 +369,13 @@ QoP/horacc DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_QoP_horacc_fmt) QoP/veracc DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_QoP_veracc_fmt) #.TYPE_ATTR -QoP/maxLocAge DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +QoP/maxLocAge DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_ATTR QoP/delay DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_QoP_delay_fmt) #.TYPE_ATTR -QoP/ver2-responseTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +QoP/ver2-responseTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.FN_BODY Horvel/bearing VAL_PTR=&val_tvb HF_INDEX=-1 tvbuff_t *val_tvb; @@ -386,7 +386,7 @@ QoP/ver2-responseTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds } #.TYPE_ATTR -Horvel/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_degree_degrees +Horvel/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_degree_degrees) #.FN_BODY Horvel/horspeed VAL_PTR=&val_tvb HF_INDEX=-1 tvbuff_t *val_tvb; @@ -397,7 +397,7 @@ Horvel/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_d } #.TYPE_ATTR -Horvel/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_kmh +Horvel/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_kmh) #.FN_BODY Horandvervel/verdirect VAL_PTR=&val_tvb HF_INDEX=-1 tvbuff_t *val_tvb; @@ -419,7 +419,7 @@ Horandvervel/verdirect TYPE=FT_BOOLEAN STRINGS=TFS(&ulp_vertical_dir_val) } #.TYPE_ATTR -Horandvervel/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_degree_degrees +Horandvervel/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_degree_degrees) #.FN_BODY Horandvervel/horspeed VAL_PTR=&val_tvb HF_INDEX=-1 tvbuff_t *val_tvb; @@ -430,7 +430,7 @@ Horandvervel/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&u } #.TYPE_ATTR -Horandvervel/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_kmh +Horandvervel/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_kmh) #.FN_BODY Horandvervel/verspeed VAL_PTR=&val_tvb HF_INDEX=-1 tvbuff_t *val_tvb; @@ -441,7 +441,7 @@ Horandvervel/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=& } #.TYPE_ATTR -Horandvervel/verspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_kmh +Horandvervel/verspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_kmh) #.FN_BODY Horveluncert/bearing VAL_PTR=&val_tvb HF_INDEX=-1 tvbuff_t *val_tvb; @@ -452,7 +452,7 @@ Horandvervel/verspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&u } #.TYPE_ATTR -Horveluncert/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_degree_degrees +Horveluncert/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_degree_degrees) #.FN_BODY Horveluncert/horspeed VAL_PTR=&val_tvb HF_INDEX=-1 tvbuff_t *val_tvb; @@ -463,7 +463,7 @@ Horveluncert/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&u } #.TYPE_ATTR -Horveluncert/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_kmh +Horveluncert/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_kmh) #.FN_BODY Horveluncert/uncertspeed VAL_PTR=&val_tvb HF_INDEX=-1 tvbuff_t *val_tvb; @@ -474,7 +474,7 @@ Horveluncert/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=& } #.TYPE_ATTR -Horveluncert/uncertspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_kmh +Horveluncert/uncertspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_kmh) #.FN_BODY Horandveruncert/verdirect VAL_PTR=&val_tvb HF_INDEX=-1 tvbuff_t *val_tvb; @@ -496,7 +496,7 @@ Horandveruncert/verdirect TYPE=FT_BOOLEAN STRINGS=TFS(&ulp_vertical_dir_val) } #.TYPE_ATTR -Horandveruncert/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_degree_degrees +Horandveruncert/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_degree_degrees) #.FN_BODY Horandveruncert/horspeed VAL_PTR=&val_tvb HF_INDEX=-1 tvbuff_t *val_tvb; @@ -507,7 +507,7 @@ Horandveruncert/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS } #.TYPE_ATTR -Horandveruncert/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_kmh +Horandveruncert/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_kmh) #.FN_BODY Horandveruncert/verspeed VAL_PTR=&val_tvb HF_INDEX=-1 tvbuff_t *val_tvb; @@ -518,7 +518,7 @@ Horandveruncert/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRING } #.TYPE_ATTR -Horandveruncert/verspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_kmh +Horandveruncert/verspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_kmh) #.FN_BODY Horandveruncert/horuncertspeed VAL_PTR=&val_tvb HF_INDEX=-1 tvbuff_t *val_tvb; @@ -529,7 +529,7 @@ Horandveruncert/verspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS } #.TYPE_ATTR -Horandveruncert/horuncertspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_kmh +Horandveruncert/horuncertspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_kmh) #.FN_BODY Horandveruncert/veruncertspeed VAL_PTR=&val_tvb HF_INDEX=-1 tvbuff_t *val_tvb; @@ -540,7 +540,7 @@ Horandveruncert/horuncertspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_UNIT_STRING S } #.TYPE_ATTR -Horandveruncert/veruncertspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_kmh +Horandveruncert/veruncertspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_kmh) #.TYPE_ATTR RelativeTime DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_RelativeTime_fmt) @@ -574,28 +574,28 @@ RSRQ-Range DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_RSRQ_Range_fmt) WlanAPInformation/apMACAddress TYPE=FT_ETHER #.TYPE_ATTR -WlanAPInformation/apTransmitPower DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm +WlanAPInformation/apTransmitPower DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_dbm) #.TYPE_ATTR -WlanAPInformation/apAntennaGain DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbi +WlanAPInformation/apAntennaGain DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_dbi) #.TYPE_ATTR -WlanAPInformation/apSignaltoNoise DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +WlanAPInformation/apSignaltoNoise DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR -WlanAPInformation/apSignalStrength DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm +WlanAPInformation/apSignalStrength DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_dbm) #.TYPE_ATTR -WlanAPInformation/setTransmitPower DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm +WlanAPInformation/setTransmitPower DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_dbm) #.TYPE_ATTR -WlanAPInformation/setAntennaGain DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbi +WlanAPInformation/setAntennaGain DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_dbi) #.TYPE_ATTR -WlanAPInformation/setSignaltoNoise DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +WlanAPInformation/setSignaltoNoise DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR -WlanAPInformation/setSignalStrength DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm +WlanAPInformation/setSignalStrength DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_dbm) #.TYPE_ATTR WlanAPInformation/apSignalStrengthDelta DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_SignalDelta_fmt) @@ -650,16 +650,16 @@ WimaxNMR/relDelaystd DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_WimaxRTD_fmt) WimaxNMR/rssi DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_WimaxNMR_rssi_fmt) #.TYPE_ATTR -WimaxNMR/rSSIstd DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +WimaxNMR/rSSIstd DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR WimaxNMR/bSTxPower DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_WimaxNMR_rssi_fmt) #.TYPE_ATTR -WimaxNMR/cinr DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +WimaxNMR/cinr DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR -WimaxNMR/cINRstd DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +WimaxNMR/cINRstd DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR UTRAN-GPSReferenceTimeAssistance/gpsReferenceTimeUncertainty DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_UTRAN_gpsReferenceTimeUncertainty_fmt) @@ -671,7 +671,7 @@ UTRAN-GPSReferenceTimeResult/gpsReferenceTimeUncertainty DISPLAY=BASE_CUSTOM STR UTRAN-GANSSReferenceTimeAssistance/ganssTimeID STRINGS=VALS(ulp_ganss_time_id_vals) #.TYPE_ATTR -UTRAN-GANSSReferenceTime/ganssTOD DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +UTRAN-GANSSReferenceTime/ganssTOD DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_ATTR UTRAN-GANSSReferenceTime/utran-GANSSTimingOfCell DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_utran_GANSSTimingOfCell_fmt) @@ -698,12 +698,12 @@ SET-GANSSReferenceTime/ganss-TODUncertainty ulp_UTRAN_gpsReferenceTimeUncertaint #.FN_BODY ThirdPartyID/sip-uri # asn2wrs does not handle '%' in the restricted string ( Has to be there twice) offset = dissect_per_restricted_character_string(tvb, offset, actx, tree, hf_index, - 1, 255, FALSE, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:./-_~%%#@?", 72, + 1, 255, false, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:./-_~%%#@?", 72, NULL); #.FN_BODY ThirdPartyID/ims-public-identity # asn2wrs does not handle '%' in the restricted string ( Has to be there twice) offset = dissect_per_restricted_character_string(tvb, offset, actx, tree, hf_index, - 1, 255, FALSE, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:./-_~%%#@?", 72, + 1, 255, false, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:./-_~%%#@?", 72, NULL); #.FN_BODY ThirdPartyID/mdn VAL_PTR=&mdn_tvb tvbuff_t *mdn_tvb; @@ -712,20 +712,20 @@ SET-GANSSReferenceTime/ganss-TODUncertainty ulp_UTRAN_gpsReferenceTimeUncertaint proto_tree *subtree; subtree = proto_item_add_subtree(actx->created_item, ett_ulp_thirdPartyId); - proto_tree_add_string(subtree, hf_ulp_mobile_directory_number, mdn_tvb, 0, 8, tvb_bcd_dig_to_str(actx->pinfo->pool, mdn_tvb, 0, 8, NULL, FALSE)); + proto_tree_add_string(subtree, hf_ulp_mobile_directory_number, mdn_tvb, 0, 8, tvb_bcd_dig_to_str(actx->pinfo->pool, mdn_tvb, 0, 8, NULL, false)); } #.FN_BODY ThirdPartyID/uri # asn2wrs does not handle '%' in the restricted string ( Has to be there twice) offset = dissect_per_restricted_character_string(tvb, offset, actx, tree, hf_index, - 1, 255, FALSE, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./-_~%%#", 69, + 1, 255, false, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./-_~%%#", 69, NULL); #.TYPE_ATTR -ReportingCap/minInt DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +ReportingCap/minInt DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_ATTR -ReportingCap/maxInt DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_minutes +ReportingCap/maxInt DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_minutes) #.TYPE_ATTR Coordinate/latitude DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_Coordinate_latitude_fmt) @@ -734,18 +734,18 @@ Coordinate/latitude DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_Coordinate_latitude_ Coordinate/longitude DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_Coordinate_longitude_fmt) #.TYPE_ATTR -CircularArea/radius DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_meters +CircularArea/radius DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_meters) #.TYPE_ATTR -EllipticalArea/semiMajor DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_meters +EllipticalArea/semiMajor DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_meters) #.TYPE_ATTR -EllipticalArea/semiMinor DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_meters +EllipticalArea/semiMinor DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_meters) #.TYPE_ATTR -EllipticalArea/angle DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_degree_degrees +EllipticalArea/angle DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_degree_degrees) #.TYPE_ATTR -PolygonArea/polygonHysteresis DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_meters +PolygonArea/polygonHysteresis DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_meters) #.END |