osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

ULP: use unit strings 

Change-Id: Id6cca5fa5b7547a43488e0bd83bb150ef008f48e
Reviewed-on: https://code.wireshark.org/review/19309
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Pascal Quantin 2016-12-16 23:33:49 +01:00 committed by Michael Mann
parent 166e129e7e
commit da5cad4d68
4 changed files with 325 additions and 730 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

229
epan/dissectors/asn1/ulp/ulp.cnf
View File

@ -21,8 +21,8 @@ FrequencyInfo/modeSpecificInfo/fdd fdd_fr
FrequencyInfo/modeSpecificInfo/tdd tdd_fr
SlpSessionID/sessionID sessionSlpID
SETId/min minsi
Coordinate/latitude CoordinateLatitude
Coordinate/longitude CoordinateLongitude
Coordinate/latitude coordinateLatitude
Coordinate/longitude coordinateLongitude
#.END
#.FN_HDR ULP-PDU
@ -127,13 +127,11 @@ Notification/requestorId TYPE=FT_STRING DISPLAY=STR_UNICODE
#.TYPE_ATTR
Notification/clientName TYPE=FT_STRING DISPLAY=STR_UNICODE
#.FN_BODY NavigationModel/gpsToe
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " hr");
#.TYPE_ATTR
NavigationModel/gpsToe DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_hours
#.FN_BODY NavigationModel/toeLimit
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " hr");
#.TYPE_ATTR
NavigationModel/toeLimit DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_hours
#.FN_BODY PosPayLoad/rrlpPayload VAL_PTR = &rrlp_tvb
tvbuff_t *rrlp_tvb;
@ -144,25 +142,20 @@ Notification/clientName TYPE=FT_STRING DISPLAY=STR_UNICODE
call_dissector(rrlp_handle, rrlp_tvb, %(ACTX)s->pinfo, tree);
}
#.FN_BODY PeriodicParams/intervalBetweenFixes
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " s");
#.TYPE_ATTR
PeriodicParams/intervalBetweenFixes DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.FN_BODY PeriodicParams/startTime
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " s");
#.TYPE_ATTR
PeriodicParams/startTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.FN_BODY AreaEventParams/startTime
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " s");
#.TYPE_ATTR
AreaEventParams/startTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.FN_BODY AreaEventParams/stopTime
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " s");
#.TYPE_ATTR
AreaEventParams/stopTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.FN_BODY RepeatedReportingParams/minimumIntervalTime
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " s");
#.TYPE_ATTR
RepeatedReportingParams/minimumIntervalTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.FN_BODY WLANAreaId/apMACAddress VAL_PTR=&val_tvb HF_INDEX=-1
tvbuff_t *val_tvb;
@ -178,21 +171,17 @@ WLANAreaId/apMACAddress TYPE=FT_ETHER
#.TYPE_ATTR
GANSSSignalsDescription/ganssId STRINGS=VALS(ulp_ganss_id_vals)
#.FN_BODY TimeStamp/relativeTime
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " s");
#.TYPE_ATTR
TimeStamp/relativeTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.FN_BODY ReportingCriteria/minTimeInterval
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " s");
#.TYPE_ATTR
ReportingCriteria/minTimeInterval DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.FN_BODY TimeWindow/startTime
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " min");
#.TYPE_ATTR
TimeWindow/startTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_minutes
#.FN_BODY TimeWindow/stopTime
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " min");
#.TYPE_ATTR
TimeWindow/stopTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_minutes
#.TYPE_ATTR
GANSSPositionMethod/ganssId STRINGS=VALS(ulp_ganss_id_vals)
@ -248,9 +237,9 @@ GanssReqGenericData/ganssSBASid TYPE=FT_UINT8 DISPLAY=BASE_DEC STRINGS=VALS(ulp_
%(DEFAULT_BODY)s
if (ulp_priv->ganss_req_gen_data_ganss_id != 4) {
/* Not GLONASS */
proto_item_append_text(actx->created_item, " wk");
proto_item_append_text(actx->created_item, "wk");
} else {
proto_item_append_text(actx->created_item, " d");
proto_item_append_text(actx->created_item, "d");
}
#.FN_BODY GanssNavigationModelData/ganssToe VAL_PTR=&val
@ -262,9 +251,9 @@ GanssReqGenericData/ganssSBASid TYPE=FT_UINT8 DISPLAY=BASE_DEC STRINGS=VALS(ulp_
#.FN_FTR GanssNavigationModelData/ganssToe
if (ulp_priv->ganss_req_gen_data_ganss_id != 4) {
/* Not GLONASS */
proto_item_append_text(actx->created_item, " h");
proto_item_append_text(actx->created_item, "h");
} else {
proto_item_set_text(actx->created_item, "%u min (%u)", 15*val, val);
proto_item_set_text(actx->created_item, "%umin (%u)", 15*val, val);
}
#.FN_BODY GanssNavigationModelData/t-toeLimit VAL_PTR=&val
@ -276,14 +265,13 @@ GanssReqGenericData/ganssSBASid TYPE=FT_UINT8 DISPLAY=BASE_DEC STRINGS=VALS(ulp_
#.FN_FTR GanssNavigationModelData/t-toeLimit
if (ulp_priv->ganss_req_gen_data_ganss_id != 4) {
/* Not GLONASS */
proto_item_append_text(actx->created_item, " h");
proto_item_append_text(actx->created_item, "h");
} else {
proto_item_set_text(actx->created_item, "%u min (%u)", 30*val, val);
proto_item_set_text(actx->created_item, "%umin (%u)", 30*val, val);
}
#.FN_BODY GanssDataBits/ganssTODmin
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " s");
#.TYPE_ATTR
GanssDataBits/ganssTODmin DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.TYPE_ATTR
ReqDataBitAssistanceList/ganssDataBitInterval DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_ganssDataBitInterval_fmt)
@ -346,16 +334,14 @@ PositionEstimate/uncertainty/uncertaintySemiMajor DISPLAY=BASE_CUSTOM STRINGS=CF
#.TYPE_ATTR
PositionEstimate/uncertainty/uncertaintySemiMinor DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_QoP_horacc_fmt)
#.FN_BODY PositionEstimate/uncertainty/orientationMajorAxis
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " degrees");
#.TYPE_ATTR
PositionEstimate/uncertainty/orientationMajorAxis DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_degree_degrees
#.FN_FTR PositionEstimate/confidence
proto_item_append_text(actx->created_item, "%%");
#.TYPE_ATTR
PositionEstimate/confidence DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_percent
#.FN_BODY AltitudeInfo/altitude
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " m");
#.TYPE_ATTR
AltitudeInfo/altitude DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_meters
#.TYPE_ATTR
AltitudeInfo/altUncertainty DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_QoP_veracc_fmt)
@ -381,9 +367,8 @@ QoP/horacc DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_QoP_horacc_fmt)
#.TYPE_ATTR
QoP/veracc DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_QoP_veracc_fmt)
#.FN_BODY QoP/maxLocAge
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " s");
#.TYPE_ATTR
QoP/maxLocAge DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.TYPE_ATTR
QoP/delay DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_QoP_delay_fmt)
@ -394,11 +379,10 @@ QoP/delay DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_QoP_delay_fmt)
%(DEFAULT_BODY)s
if (val_tvb) {
actx->created_item = proto_tree_add_bits_item(tree, hf_index, val_tvb, 0, 9, ENC_BIG_ENDIAN);
proto_item_append_text(actx->created_item, " degrees");
}
#.TYPE_ATTR
Horvel/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC
Horvel/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_degree_degrees
#.FN_BODY Horvel/horspeed VAL_PTR=&val_tvb HF_INDEX=-1
tvbuff_t *val_tvb;
@ -406,11 +390,10 @@ Horvel/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC
%(DEFAULT_BODY)s
if (val_tvb) {
actx->created_item = proto_tree_add_item(tree, hf_index, val_tvb, 0, 2, ENC_BIG_ENDIAN);
proto_item_append_text(actx->created_item, " km/h");
}
#.TYPE_ATTR
Horvel/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC
Horvel/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_kmh
#.FN_BODY Horandvervel/verdirect VAL_PTR=&val_tvb HF_INDEX=-1
tvbuff_t *val_tvb;
@ -429,11 +412,10 @@ Horandvervel/verdirect TYPE=FT_BOOLEAN STRINGS=TFS(&ulp_vertical_dir_val)
%(DEFAULT_BODY)s
if (val_tvb) {
actx->created_item = proto_tree_add_bits_item(tree, hf_index, val_tvb, 0, 9, ENC_BIG_ENDIAN);
proto_item_append_text(actx->created_item, " degrees");
}
#.TYPE_ATTR
Horandvervel/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC
Horandvervel/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_degree_degrees
#.FN_BODY Horandvervel/horspeed VAL_PTR=&val_tvb HF_INDEX=-1
tvbuff_t *val_tvb;
@ -441,11 +423,10 @@ Horandvervel/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC
%(DEFAULT_BODY)s
if (val_tvb) {
actx->created_item = proto_tree_add_item(tree, hf_index, val_tvb, 0, 2, ENC_BIG_ENDIAN);
proto_item_append_text(actx->created_item, " km/h");
}
#.TYPE_ATTR
Horandvervel/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC
Horandvervel/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_kmh
#.FN_BODY Horandvervel/verspeed VAL_PTR=&val_tvb HF_INDEX=-1
tvbuff_t *val_tvb;
@ -453,11 +434,10 @@ Horandvervel/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC
%(DEFAULT_BODY)s
if (val_tvb) {
actx->created_item = proto_tree_add_item(tree, hf_index, val_tvb, 0, 1, ENC_BIG_ENDIAN);
proto_item_append_text(actx->created_item, " km/h");
}
#.TYPE_ATTR
Horandvervel/verspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC
Horandvervel/verspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_kmh
#.FN_BODY Horveluncert/bearing VAL_PTR=&val_tvb HF_INDEX=-1
tvbuff_t *val_tvb;
@ -465,11 +445,10 @@ Horandvervel/verspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC
%(DEFAULT_BODY)s
if (val_tvb) {
actx->created_item = proto_tree_add_bits_item(tree, hf_index, val_tvb, 0, 9, ENC_BIG_ENDIAN);
proto_item_append_text(actx->created_item, " degrees");
}
#.TYPE_ATTR
Horveluncert/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC
Horveluncert/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_degree_degrees
#.FN_BODY Horveluncert/horspeed VAL_PTR=&val_tvb HF_INDEX=-1
tvbuff_t *val_tvb;
@ -477,11 +456,10 @@ Horveluncert/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC
%(DEFAULT_BODY)s
if (val_tvb) {
actx->created_item = proto_tree_add_item(tree, hf_index, val_tvb, 0, 2, ENC_BIG_ENDIAN);
proto_item_append_text(actx->created_item, " km/h");
}
#.TYPE_ATTR
Horveluncert/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC
Horveluncert/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_kmh
#.FN_BODY Horveluncert/uncertspeed VAL_PTR=&val_tvb HF_INDEX=-1
tvbuff_t *val_tvb;
@ -489,11 +467,10 @@ Horveluncert/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC
%(DEFAULT_BODY)s
if (val_tvb) {
actx->created_item = proto_tree_add_item(tree, hf_index, val_tvb, 0, 1, ENC_BIG_ENDIAN);
proto_item_append_text(actx->created_item, " km/h");
}
#.TYPE_ATTR
Horveluncert/uncertspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC
Horveluncert/uncertspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_kmh
#.FN_BODY Horandveruncert/verdirect VAL_PTR=&val_tvb HF_INDEX=-1
tvbuff_t *val_tvb;
@ -512,11 +489,10 @@ Horandveruncert/verdirect TYPE=FT_BOOLEAN STRINGS=TFS(&ulp_vertical_dir_val)
%(DEFAULT_BODY)s
if (val_tvb) {
actx->created_item = proto_tree_add_bits_item(tree, hf_index, val_tvb, 0, 9, ENC_BIG_ENDIAN);
proto_item_append_text(actx->created_item, " degrees");
}
#.TYPE_ATTR
Horandveruncert/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC
Horandveruncert/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_degree_degrees
#.FN_BODY Horandveruncert/horspeed VAL_PTR=&val_tvb HF_INDEX=-1
tvbuff_t *val_tvb;
@ -524,11 +500,10 @@ Horandveruncert/bearing TYPE=FT_UINT16 DISPLAY=BASE_DEC
%(DEFAULT_BODY)s
if (val_tvb) {
actx->created_item = proto_tree_add_item(tree, hf_index, val_tvb, 0, 2, ENC_BIG_ENDIAN);
proto_item_append_text(actx->created_item, " km/h");
}
#.TYPE_ATTR
Horandveruncert/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC
Horandveruncert/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_kmh
#.FN_BODY Horandveruncert/verspeed VAL_PTR=&val_tvb HF_INDEX=-1
tvbuff_t *val_tvb;
@ -536,11 +511,10 @@ Horandveruncert/horspeed TYPE=FT_UINT16 DISPLAY=BASE_DEC
%(DEFAULT_BODY)s
if (val_tvb) {
actx->created_item = proto_tree_add_item(tree, hf_index, val_tvb, 0, 1, ENC_BIG_ENDIAN);
proto_item_append_text(actx->created_item, " km/h");
}
#.TYPE_ATTR
Horandveruncert/verspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC
Horandveruncert/verspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_kmh
#.FN_BODY Horandveruncert/horuncertspeed VAL_PTR=&val_tvb HF_INDEX=-1
tvbuff_t *val_tvb;
@ -548,11 +522,10 @@ Horandveruncert/verspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC
%(DEFAULT_BODY)s
if (val_tvb) {
actx->created_item = proto_tree_add_item(tree, hf_index, val_tvb, 0, 1, ENC_BIG_ENDIAN);
proto_item_append_text(actx->created_item, " km/h");
}
#.TYPE_ATTR
Horandveruncert/horuncertspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC
Horandveruncert/horuncertspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_kmh
#.FN_BODY Horandveruncert/veruncertspeed VAL_PTR=&val_tvb HF_INDEX=-1
tvbuff_t *val_tvb;
@ -560,11 +533,10 @@ Horandveruncert/horuncertspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC
%(DEFAULT_BODY)s
if (val_tvb) {
actx->created_item = proto_tree_add_item(tree, hf_index, val_tvb, 0, 1, ENC_BIG_ENDIAN);
proto_item_append_text(actx->created_item, " km/h");
}
#.TYPE_ATTR
Horandveruncert/veruncertspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC
Horandveruncert/veruncertspeed TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_kmh
#.TYPE_ATTR
RelativeTime DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_RelativeTime_fmt)
@ -597,37 +569,29 @@ RSRQ-Range DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_RSRQ_Range_fmt)
#.TYPE_ATTR
WlanAPInformation/apMACAddress TYPE=FT_ETHER
#.FN_BODY WlanAPInformation/apTransmitPower
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " dBm");
#.TYPE_ATTR
WlanAPInformation/apTransmitPower DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
#.FN_BODY WlanAPInformation/apAntennaGain
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " dBi");
#.TYPE_ATTR
WlanAPInformation/apAntennaGain DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbi
#.FN_BODY WlanAPInformation/apSignaltoNoise
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " dB");
#.TYPE_ATTR
WlanAPInformation/apSignaltoNoise DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
#.FN_BODY WlanAPInformation/apSignalStrength
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " dBm");
#.TYPE_ATTR
WlanAPInformation/apSignalStrength DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
#.FN_BODY WlanAPInformation/setTransmitPower
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " dBm");
#.TYPE_ATTR
WlanAPInformation/setTransmitPower DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
#.FN_BODY WlanAPInformation/setAntennaGain
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " dBi");
#.TYPE_ATTR
WlanAPInformation/setAntennaGain DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbi
#.FN_BODY WlanAPInformation/setSignaltoNoise
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " dB");
#.TYPE_ATTR
WlanAPInformation/setSignaltoNoise DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
#.FN_BODY WlanAPInformation/setSignalStrength
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " dBm");
#.TYPE_ATTR
WlanAPInformation/setSignalStrength DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
#.TYPE_ATTR
WlanAPInformation/apSignalStrengthDelta DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_SignalDelta_fmt)
@ -681,20 +645,17 @@ WimaxNMR/relDelaystd DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_WimaxRTD_fmt)
#.TYPE_ATTR
WimaxNMR/rssi DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_WimaxNMR_rssi_fmt)
#.FN_BODY WimaxNMR/rSSIstd
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " dB");
#.TYPE_ATTR
WimaxNMR/rSSIstd DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
#.TYPE_ATTR
WimaxNMR/bSTxPower DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_WimaxNMR_rssi_fmt)
#.FN_BODY WimaxNMR/cinr
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " dB");
#.TYPE_ATTR
WimaxNMR/cinr DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
#.FN_BODY WimaxNMR/cINRstd
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " dB");
#.TYPE_ATTR
WimaxNMR/cINRstd DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
#.TYPE_ATTR
UTRAN-GPSReferenceTimeAssistance/gpsReferenceTimeUncertainty DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_UTRAN_gpsReferenceTimeUncertainty_fmt)
@ -705,9 +666,8 @@ UTRAN-GPSReferenceTimeResult/gpsReferenceTimeUncertainty DISPLAY=BASE_CUSTOM STR
#.TYPE_ATTR
UTRAN-GANSSReferenceTimeAssistance/ganssTimeID STRINGS=VALS(ulp_ganss_time_id_vals)
#.FN_BODY UTRAN-GANSSReferenceTime/ganssTOD
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " s");
#.TYPE_ATTR
UTRAN-GANSSReferenceTime/ganssTOD DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.TYPE_ATTR
UTRAN-GANSSReferenceTime/utran-GANSSTimingOfCell DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_utran_GANSSTimingOfCell_fmt)
@ -757,13 +717,11 @@ SET-GANSSReferenceTime/ganss-TODUncertainty ulp_UTRAN_gpsReferenceTimeUncertaint
1, 255, FALSE, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./-_~%%#", 69,
NULL);
#.FN_BODY ReportingCap/minInt
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " s");
#.TYPE_ATTR
ReportingCap/minInt DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.FN_BODY ReportingCap/maxInt
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " min");
#.TYPE_ATTR
ReportingCap/maxInt DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_minutes
#.TYPE_ATTR
Coordinate/latitude DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_Coordinate_latitude_fmt)
@ -771,24 +729,19 @@ Coordinate/latitude DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_Coordinate_latitude_
#.TYPE_ATTR
Coordinate/longitude DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_Coordinate_longitude_fmt)
#.FN_BODY CircularArea/radius
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " m");
#.TYPE_ATTR
CircularArea/radius DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_meters
#.FN_BODY EllipticalArea/semiMajor
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " m");
#.TYPE_ATTR
EllipticalArea/semiMajor DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_meters
#.FN_BODY EllipticalArea/semiMinor
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " m");
#.TYPE_ATTR
EllipticalArea/semiMinor DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_meters
#.FN_BODY EllipticalArea/angle
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " degrees");
#.TYPE_ATTR
EllipticalArea/angle DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_degree_degrees
#.FN_BODY PolygonArea/polygonHysteresis
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " m");
#.TYPE_ATTR
PolygonArea/polygonHysteresis DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_meters
#.END

812
epan/dissectors/packet-ulp.c
View File

File diff suppressed because it is too large Load Diff

7
epan/unit_strings.c
View File

@ -53,7 +53,12 @@ const unit_name_string units_byte_bytes = { " byte", " bytes" };
const unit_name_string units_octet_octets = { " octet", " octets" };
const unit_name_string units_word_words = { " word", " words" };
const unit_name_string units_tick_ticks = { " tick", " ticks" };
const unit_name_string units_meters = { "m", NULL };
const unit_name_string units_meter_meters = { " meter", " meters" };
const unit_name_string units_hour_hours = { " hour", " hours" };
const unit_name_string units_hours = { "h", NULL };
const unit_name_string units_minute_minutes = { " minute", " minutes" };
const unit_name_string units_minutes = { "min", NULL };
const unit_name_string units_second_seconds = { " second", " seconds" };
const unit_name_string units_seconds = { "s", NULL };
const unit_name_string units_millisecond_milliseconds = { " millisecond", " milliseconds" };
@ -61,10 +66,12 @@ const unit_name_string units_milliseconds = { "ms", NULL };
const unit_name_string units_microsecond_microseconds = { " microsecond", " microseconds" };
const unit_name_string units_microseconds = { UTF8_MICRO_SIGN "s", NULL };
const unit_name_string units_nanosecond_nanoseconds = { " nanosecond", " nanoseconds" };
const unit_name_string units_nanoseconds = { "ns", NULL };
const unit_name_string units_nanometers = { "nm", NULL };
const unit_name_string units_degree_degrees = { " degree", " degrees" };
const unit_name_string units_decibels = { "dB", NULL };
const unit_name_string units_dbm = { "dBm", NULL };
const unit_name_string units_dbi = { "dBi", NULL };
const unit_name_string units_percent = { "%", NULL };
const unit_name_string units_khz = { "kHz", NULL };
const unit_name_string units_mhz = { "MHz", NULL };

7
epan/unit_strings.h
View File

@ -52,7 +52,12 @@ WS_DLL_PUBLIC const unit_name_string units_byte_bytes;
WS_DLL_PUBLIC const unit_name_string units_octet_octets;
WS_DLL_PUBLIC const unit_name_string units_word_words;
WS_DLL_PUBLIC const unit_name_string units_tick_ticks;
WS_DLL_PUBLIC const unit_name_string units_meters;
WS_DLL_PUBLIC const unit_name_string units_meter_meters;
WS_DLL_PUBLIC const unit_name_string units_hour_hours;
WS_DLL_PUBLIC const unit_name_string units_hours;
WS_DLL_PUBLIC const unit_name_string units_minute_minutes;
WS_DLL_PUBLIC const unit_name_string units_minutes;
WS_DLL_PUBLIC const unit_name_string units_second_seconds; // full unit name "second[s?]"
WS_DLL_PUBLIC const unit_name_string units_seconds; //only seconds abbreviation "s"
WS_DLL_PUBLIC const unit_name_string units_millisecond_milliseconds; // full unit name "millisecond[s?]"
@ -60,10 +65,12 @@ WS_DLL_PUBLIC const unit_name_string units_milliseconds; //only seconds a
WS_DLL_PUBLIC const unit_name_string units_microsecond_microseconds; // full unit name "microsecond[s?]"
WS_DLL_PUBLIC const unit_name_string units_microseconds; //only seconds abbreviation "us"
WS_DLL_PUBLIC const unit_name_string units_nanosecond_nanoseconds; // full unit name "nanosecond[s?]"
WS_DLL_PUBLIC const unit_name_string units_nanoseconds; //only seconds abbreviation "ns"
WS_DLL_PUBLIC const unit_name_string units_nanometers;
WS_DLL_PUBLIC const unit_name_string units_degree_degrees;
WS_DLL_PUBLIC const unit_name_string units_decibels;
WS_DLL_PUBLIC const unit_name_string units_dbm;
WS_DLL_PUBLIC const unit_name_string units_dbi;
WS_DLL_PUBLIC const unit_name_string units_percent;
WS_DLL_PUBLIC const unit_name_string units_khz;
WS_DLL_PUBLIC const unit_name_string units_ghz;