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

Create/use a number of extended value-strings; 

Use FT_BOOLEAN instead of FT_UINT16 with 'ptp_bool_vals' value_string array;
Add editor modelines;
Do some whitespace & formatting changes.

svn path=/trunk/; revision=53477
This commit is contained in:
Bill Meier 2013-11-21 17:12:05 +00:00
parent 64c687346b
commit 774b7caa05
1 changed files with 258 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

183
epan/dissectors/packet-ptp.c
View File

@ -341,7 +341,10 @@ static const value_string ptp_managementMessageKey_vals[] = {
{PTP_MM_DISABLE_BURST , "PTP_MM_DISABLE_BURST"},
{PTP_MM_ENABLE_BURST , "PTP_MM_ENABLE_BURST"},
{PTP_MM_SET_TIME , "PTP_MM_SET_TIME"},
{0, NULL } };
{0, NULL }
};
static value_string_ext ptp_managementMessageKey_vals_ext =
VALUE_STRING_EXT_INIT(ptp_managementMessageKey_vals);
/* same again but better readable text for info column */
static const value_string ptp_managementMessageKey_infocolumn_vals[] = {
@ -373,7 +376,10 @@ static const value_string ptp_managementMessageKey_infocolumn_vals[] = {
{PTP_MM_DISABLE_BURST , "Disable Burst"},
{PTP_MM_ENABLE_BURST , "Enable Burst"},
{PTP_MM_SET_TIME , "Set Time"},
{0, NULL } };
{0, NULL }
};
static value_string_ext ptp_managementMessageKey_infocolumn_vals_ext =
VALUE_STRING_EXT_INIT(ptp_managementMessageKey_infocolumn_vals);
/* END managementMessage definitions */
@ -426,7 +432,10 @@ static const value_string ptp_communicationid_vals[] = {
{PTP_PCI , "PCI bus"},
{PTP_VXI , "VXI bus"},
{PTP_DEFAULT , "Default value"},
{0, NULL } };
{0, NULL }
};
static value_string_ext ptp_communicationid_vals_ext =
VALUE_STRING_EXT_INIT(ptp_communicationid_vals);
/* END CommunicationId definitions */
@ -447,7 +456,8 @@ static const value_string ptp_control_vals[] = {
{PTP_DELAY_RESP_MESSAGE , "Delay_Resp Message"},
{PTP_MANAGEMENT_MESSAGE , "Management Message"},
{PTP_OTHER_MESSAGE , "Other Message"},
{0, NULL } };
{0, NULL }
};
/* END PTP message types */
@ -460,17 +470,11 @@ static const value_string ptp_control_vals[] = {
static const value_string ptp_messagetype_vals[] = {
{PTP_MESSAGETYPE_EVENT , "Event Message"},
{PTP_MESSAGETYPE_GENERAL , "General Message"},
{0, NULL } };
{0, NULL }
};
/* END channel values for the PTP_MESSAGETYPE field */
/* Channel values for boolean vals (FLAGS)*/
static const value_string ptp_bool_vals[] = {
{1, "True"},
{0, "False"},
{0, NULL }};
/**********************************************************/
/* Initialize the protocol and registered fields */
/**********************************************************/
@ -1031,7 +1035,10 @@ static const value_string ptp_v2_managementID_vals[] = {
{PTP_V2_MM_ID_PRIMARY_DOMAIN ,"PRIMARY_DOMAIN"},
{PTP_V2_MM_ID_DELAY_MECHANISM ,"DELAY_MECHANISM"},
{PTP_V2_MM_ID_LOG_MIN_PDELAY_REQ_INTERVAL ,"LOG_MIN_PDELAY_REQ_INTERVAL"},
{0 ,NULL} };
{0 ,NULL}
};
static value_string_ext ptp_v2_managementID_vals_ext =
VALUE_STRING_EXT_INIT(ptp_v2_managementID_vals);
/* same again but better readable text for info column */
static const value_string ptp_v2_managementID_infocolumn_vals[] = {
@ -1082,7 +1089,10 @@ static const value_string ptp_v2_managementID_infocolumn_vals[] = {
{PTP_V2_MM_ID_PRIMARY_DOMAIN ,"Primary domain"},
{PTP_V2_MM_ID_DELAY_MECHANISM ,"Delay mechanism"},
{PTP_V2_MM_ID_LOG_MIN_PDELAY_REQ_INTERVAL ,"Log min pdelay req. interval"},
{0 , NULL} };
{0 , NULL}
};
static value_string_ext ptp_v2_managementID_infocolumn_vals_ext =
VALUE_STRING_EXT_INIT(ptp_v2_managementID_infocolumn_vals);
static const value_string ptp_v2_TLV_type_vals[] = {
{PTP_V2_TLV_TYPE_RESERVED ,"Reserved"},
@ -1099,11 +1109,15 @@ static const value_string ptp_v2_TLV_type_vals[] = {
{PTP_V2_TLV_TYPE_AUTHENTICATION_CHALLENGE ,"Authentication challenge"},
{PTP_V2_TLV_TYPE_SECURITY_ASSOCIATION_UPDATE ,"Security association update"},
{PTP_V2_TLV_TYPE_CUM_FREQ_SCALE_FACTOR_OFFSET ,"Cum. freq. scale factor offset"},
{0 , NULL} };
{0 , NULL}
};
static value_string_ext ptp_v2_TLV_type_vals_ext =
VALUE_STRING_EXT_INIT(ptp_v2_TLV_type_vals);
static const value_string ptp_as_TLV_oid_vals[] = {
{PTP_AS_TLV_OID_TYPE_802 ,"IEEE 802"},
{0 , NULL} };
{0 , NULL}
};
static const value_string ptp2_networkProtocol_vals[] = {
{0x0000, "Reserved"},
@ -1116,7 +1130,10 @@ static const value_string ptp2_networkProtocol_vals[] = {
{0x0007, "Reserved"},
{0xFFFE, "Unknown Protocol"},
{0xFFFF, "Reserved"},
{0, NULL } };
{0, NULL }
};
static value_string_ext ptp2_networkProtocol_vals_ext =
VALUE_STRING_EXT_INIT(ptp2_networkProtocol_vals);
static const value_string ptp_v2_messageid_vals[] = {
@ -1132,6 +1149,8 @@ static const value_string ptp_v2_messageid_vals[] = {
{PTP_V2_MANAGEMENT_MESSAGE, "Management Message"},
{0, NULL }
};
static value_string_ext ptp_v2_messageid_vals_ext =
VALUE_STRING_EXT_INIT(ptp_v2_messageid_vals);
static const value_string ptp_v2_clockaccuracy_vals[] = {
{0x20, "The time is accurate to within 25 ns"},
@ -1158,6 +1177,8 @@ static const value_string ptp_v2_clockaccuracy_vals[] = {
{0xFF, "reserved"},
{0, NULL }
};
static value_string_ext ptp_v2_clockaccuracy_vals_ext =
VALUE_STRING_EXT_INIT(ptp_v2_clockaccuracy_vals);
static const value_string ptp_v2_timesource_vals[] = {
{0x10, "ATOMIC_CLOCK"},
@ -1171,6 +1192,8 @@ static const value_string ptp_v2_timesource_vals[] = {
{0xFF, "reserved"},
{0, NULL }
};
static value_string_ext ptp_v2_timesource_vals_ext =
VALUE_STRING_EXT_INIT(ptp_v2_timesource_vals);
static const value_string ptp_v2_mm_action_vals[] = {
{0x0, "GET"},
@ -1194,6 +1217,8 @@ static const value_string ptp2_severityCode_vals[] = {
{0xFF, "Reserved"},
{0, NULL}
};
static value_string_ext ptp2_severityCode_vals_ext =
VALUE_STRING_EXT_INIT(ptp2_severityCode_vals);
static const value_string ptp2_portState_vals[] = {
{0x01, "INITIALIZING"},
@ -1207,6 +1232,8 @@ static const value_string ptp2_portState_vals[] = {
{0x09, "SLAVE"},
{0, NULL}
};
static value_string_ext ptp2_portState_vals_ext =
VALUE_STRING_EXT_INIT(ptp2_portState_vals);
static const value_string ptp2_delayMechanism_vals[] = {
{0x01, "E2E"},
@ -1228,6 +1255,8 @@ static const value_string ptp2_managementErrorId_vals[] = {
{0xFFFF, "Reserved"},
{0, NULL}
};
static value_string_ext ptp2_managementErrorId_vals_ext =
VALUE_STRING_EXT_INIT(ptp2_managementErrorId_vals);
static const value_string ptp2_organizationExtensionOrgId_vals[] = {
{PTP_V2_OE_ORG_ID_IEEE_C37_238, "IEEE C37.238"},
@ -1650,8 +1679,8 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
case PTP_MANAGEMENT_MESSAGE:{
col_add_fstr(pinfo->cinfo, COL_INFO, "Management Message (%s)",
val_to_str(ptp_mm_messagekey,
ptp_managementMessageKey_infocolumn_vals,
val_to_str_ext(ptp_mm_messagekey,
&ptp_managementMessageKey_infocolumn_vals_ext,
"Unknown message key %u"));
break;
}
@ -2328,14 +2357,11 @@ dissect_ptp_v2_timeInterval(tvbuff_t *tvb, guint16 *cur_offset, proto_tree *tree
static void
dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
guint8 ptp_v2_transport_specific = 0;
guint8 ptp_v2_messageid = 0;
guint16 ptp_v2_mm_managementId = 0;
guint8 ptp_v2_management_action = 0;
guint8 ptp_v2_transport_specific;
guint8 ptp_v2_messageid;
guint64 timeStamp;
guint16 temp;
/* Set up structures needed to add the protocol subtree and manage it */
proto_item *ti, *transportspecific_ti, *flags_ti, *managementData_ti, *clockType_ti, *protocolAddress_ti;
proto_tree *ptp_tree, *ptp_transportspecific_tree, *ptp_flags_tree, *ptp_managementData_tree,
@ -2361,27 +2387,35 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
switch(tlv_type)
{
case PTP_V2_TLV_TYPE_MANAGEMENT:
{
guint16 ptp_v2_mm_managementId;
guint8 ptp_v2_management_action;
/* Get the managementId */
ptp_v2_mm_managementId = tvb_get_ntohs(tvb, PTP_V2_MM_TLV_MANAGEMENTID_OFFSET);
ptp_v2_management_action = 0x0F & tvb_get_guint8(tvb, PTP_V2_MM_ACTION_OFFSET);
col_add_fstr(pinfo->cinfo, COL_INFO, "Management (%s) %s",
val_to_str(ptp_v2_mm_managementId, ptp_v2_managementID_infocolumn_vals, "Unknown management Id %u"),
val_to_str_ext(ptp_v2_mm_managementId, &ptp_v2_managementID_infocolumn_vals_ext, "Unknown management Id %u"),
val_to_str(ptp_v2_management_action, ptp_v2_mm_action_vals, "Unknown Action %u"));
break;
}
case PTP_V2_TLV_TYPE_MANAGEMENT_ERROR_STATUS:
{
guint16 ptp_v2_mm_managementId;
/* Get the managementErrorId */
ptp_v2_mm_managementId = tvb_get_ntohs(tvb, PTP_V2_MM_TLV_MANAGEMENTERRORID_OFFSET);
col_add_fstr(pinfo->cinfo, COL_INFO, "Management Error Message (%s)", val_to_str(ptp_v2_mm_managementId,
ptp2_managementErrorId_vals, "Unknown Error Id %u"));
col_add_fstr(pinfo->cinfo, COL_INFO, "Management Error Message (%s)",
val_to_str_ext(ptp_v2_mm_managementId, &ptp2_managementErrorId_vals_ext, "Unknown Error Id %u"));
break;
}
default:
col_add_str(pinfo->cinfo, COL_INFO, val_to_str(ptp_v2_messageid, ptp_v2_messageid_vals, "Unknown PTP Message (%u)"));
col_add_str(pinfo->cinfo, COL_INFO,
val_to_str_ext(ptp_v2_messageid, &ptp_v2_messageid_vals_ext, "Unknown PTP Message (%u)"));
break;
}
}
else
{
col_add_str(pinfo->cinfo, COL_INFO, val_to_str(ptp_v2_messageid, ptp_v2_messageid_vals, "Unknown PTP Message (%u)"));
col_add_str(pinfo->cinfo, COL_INFO, val_to_str_ext(ptp_v2_messageid, &ptp_v2_messageid_vals_ext, "Unknown PTP Message (%u)"));
}
if (tree) {
@ -2539,8 +2573,8 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
PTP_V2_AN_TLV_OFFSET + tlv_total_length,
tlv_length + PTP_V2_AN_TLV_DATA_OFFSET,
"%s TLV",
val_to_str(tlv_type,
ptp_v2_TLV_type_vals,
val_to_str_ext(tlv_type,
&ptp_v2_TLV_type_vals_ext,
"Unknown (%u)"));
ptp_tlv_tree = proto_item_add_subtree(tlv_ti, ett_ptp_v2_tlv);
@ -3951,7 +3985,7 @@ proto_register_ptp(void)
},
{ &hf_ptp_sourcecommunicationtechnology,
{ "sourceCommunicationTechnology", "ptp.sourcecommunicationtechnology",
FT_UINT8, BASE_DEC, VALS(ptp_communicationid_vals), 0x00,
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ptp_communicationid_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_sourceuuid,
@ -3982,37 +4016,37 @@ proto_register_ptp(void)
},
{ &hf_ptp_flags_li61,
{ "PTP_LI61", "ptp.flags.li61",
FT_UINT16, BASE_DEC, VALS(ptp_bool_vals), PTP_FLAGS_LI61_BITMASK,
FT_BOOLEAN, 16, NULL, PTP_FLAGS_LI61_BITMASK,
NULL, HFILL }
},
{ &hf_ptp_flags_li59,
{ "PTP_LI59", "ptp.flags.li59",
FT_UINT16, BASE_DEC, VALS(ptp_bool_vals), PTP_FLAGS_LI59_BITMASK,
FT_BOOLEAN, 16, NULL, PTP_FLAGS_LI59_BITMASK,
NULL, HFILL }
},
{ &hf_ptp_flags_boundary_clock,
{ "PTP_BOUNDARY_CLOCK", "ptp.flags.boundary_clock",
FT_UINT16, BASE_DEC, VALS(ptp_bool_vals), PTP_FLAGS_BOUNDARY_CLOCK_BITMASK,
FT_BOOLEAN, 16, NULL, PTP_FLAGS_BOUNDARY_CLOCK_BITMASK,
NULL, HFILL }
},
{ &hf_ptp_flags_assist,
{ "PTP_ASSIST", "ptp.flags.assist",
FT_UINT16, BASE_DEC, VALS(ptp_bool_vals), PTP_FLAGS_ASSIST_BITMASK,
FT_BOOLEAN, 16, NULL, PTP_FLAGS_ASSIST_BITMASK,
NULL, HFILL }
},
{ &hf_ptp_flags_ext_sync,
{ "PTP_EXT_SYNC", "ptp.flags.ext_sync",
FT_UINT16, BASE_DEC, VALS(ptp_bool_vals), PTP_FLAGS_EXT_SYNC_BITMASK,
FT_BOOLEAN, 16, NULL, PTP_FLAGS_EXT_SYNC_BITMASK,
NULL, HFILL }
},
{ &hf_ptp_flags_parent,
{ "PTP_PARENT_STATS", "ptp.flags.parent_stats",
FT_UINT16, BASE_DEC, VALS(ptp_bool_vals), PTP_FLAGS_PARENT_STATS_BITMASK,
FT_BOOLEAN, 16, NULL, PTP_FLAGS_PARENT_STATS_BITMASK,
NULL, HFILL }
},
{ &hf_ptp_flags_sync_burst,
{ "PTP_SYNC_BURST", "ptp.flags.sync_burst",
FT_UINT16, BASE_DEC, VALS(ptp_bool_vals), PTP_FLAGS_SYNC_BURST_BITMASK,
FT_BOOLEAN, 16, NULL, PTP_FLAGS_SYNC_BURST_BITMASK,
NULL, HFILL }
},
/* END OF THE FLAG-FIELD */
@ -4045,7 +4079,7 @@ proto_register_ptp(void)
},
{ &hf_ptp_sdr_grandmastercommunicationtechnology,
{ "grandmasterCommunicationTechnology", "ptp.sdr.grandmastercommunicationtechnology",
FT_UINT8, BASE_DEC, VALS(ptp_communicationid_vals), 0x00,
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ptp_communicationid_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_sdr_grandmasterclockuuid,
@ -4115,7 +4149,7 @@ proto_register_ptp(void)
},
{ &hf_ptp_sdr_parentcommunicationtechnology,
{ "parentCommunicationTechnology", "ptp.sdr.parentcommunicationtechnology",
FT_UINT8, BASE_DEC, VALS(ptp_communicationid_vals), 0x00,
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ptp_communicationid_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_sdr_parentuuid,
@ -4182,7 +4216,7 @@ proto_register_ptp(void)
},
{ &hf_ptp_dr_requestingsourcecommunicationtechnology,
{ "requestingSourceCommunicationTechnology", "ptp.dr.requestingsourcecommunicationtechnology",
FT_UINT8, BASE_DEC, VALS(ptp_communicationid_vals), 0x00,
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ptp_communicationid_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_dr_requestingsourceuuid,
@ -4203,7 +4237,7 @@ proto_register_ptp(void)
/* offsets for management (=mm) messages */
{ &hf_ptp_mm_targetcommunicationtechnology,
{ "targetCommunicationTechnology", "ptp.mm.targetcommunicationtechnology",
FT_UINT8, BASE_DEC, VALS(ptp_communicationid_vals), 0x00,
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ptp_communicationid_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_mm_targetuuid,
@ -4228,7 +4262,7 @@ proto_register_ptp(void)
},
{ &hf_ptp_mm_managementmessagekey,
{ "managementMessageKey", "ptp.mm.managementmessagekey",
FT_UINT8, BASE_DEC, VALS(ptp_managementMessageKey_vals), 0x00,
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ptp_managementMessageKey_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_mm_parameterlength,
@ -4247,7 +4281,7 @@ proto_register_ptp(void)
/* ptp_mm_clock_identity (parameterlength = 64) */
{ &hf_ptp_mm_clock_identity_clockcommunicationtechnology,
{ "clockCommunicationTechnology", "ptp.mm.clock.identity.clockcommunicationtechnology",
FT_UINT8, BASE_DEC, VALS(ptp_communicationid_vals), 0x00,
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ptp_communicationid_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_mm_clock_identity_clockuuidfield,
@ -4281,7 +4315,7 @@ proto_register_ptp(void)
/* ptp_mm_default_data_set (parameterlength = 76) */
{ &hf_ptp_mm_default_data_set_clockcommunicationtechnology,
{ "clockCommunicationTechnology", "ptp.mm.default.data.set.clockcommunicationtechnology",
FT_UINT8, BASE_DEC, VALS(ptp_communicationid_vals), 0x00,
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ptp_communicationid_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_mm_default_data_set_clockuuidfield,
@ -4424,7 +4458,7 @@ proto_register_ptp(void)
/* ptp_mm_parent_data_set (parameterlength = 90) */
{ &hf_ptp_mm_parent_data_set_parentcommunicationtechnology,
{ "parentCommunicationTechnology", "ptp.mm.parent.data.set.parentcommunicationtechnology",
FT_UINT8, BASE_DEC, VALS(ptp_communicationid_vals), 0x00,
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ptp_communicationid_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_mm_parent_data_set_parentuuid,
@ -4479,7 +4513,7 @@ proto_register_ptp(void)
},
{ &hf_ptp_mm_parent_data_set_grandmastercommunicationtechnology,
{ "grandmasterCommunicationTechnology", "ptp.mm.parent.data.set.grandmastercommunicationtechnology",
FT_UINT8, BASE_DEC, VALS(ptp_communicationid_vals), 0x00,
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ptp_communicationid_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_mm_parent_data_set_grandmasteruuidfield,
@ -4545,7 +4579,7 @@ proto_register_ptp(void)
},
{ &hf_ptp_mm_port_data_set_portcommunicationtechnology,
{ "portCommunicationTechnology", "ptp.mm.port.data.set.portcommunicationtechnology",
FT_UINT8, BASE_DEC, VALS(ptp_communicationid_vals), 0x00,
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ptp_communicationid_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_mm_port_data_set_portuuidfield,
@ -4672,7 +4706,7 @@ proto_register_ptp(void)
{ &hf_ptp_mm_foreign_data_set_foreignmastercommunicationtechnology,
{ "foreignMasterCommunicationTechnology",
"ptp.mm.foreign.data.set.foreignmastercommunicationtechnology",
FT_UINT8, BASE_DEC, VALS(ptp_communicationid_vals), 0x00,
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ptp_communicationid_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_mm_foreign_data_set_foreignmasteruuidfield,
@ -4735,7 +4769,7 @@ proto_register_ptp(void)
},
{ &hf_ptp_v2_messageid,
{ "messageId", "ptp.v2.messageid",
FT_UINT8, BASE_HEX, VALS(ptp_v2_messageid_vals), 0x0F,
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &ptp_v2_messageid_vals_ext, 0x0F,
NULL, HFILL }
},
{ &hf_ptp_v2_versionptp,
@ -4879,7 +4913,7 @@ proto_register_ptp(void)
},
{ &hf_ptp_v2_an_timesource,
{ "TimeSource", "ptp.v2.timesource",
FT_UINT8, BASE_HEX, VALS(ptp_v2_timesource_vals), 0x00,
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &ptp_v2_timesource_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_v2_an_localstepsremoved,
@ -4899,7 +4933,7 @@ proto_register_ptp(void)
},
{ &hf_ptp_v2_an_grandmasterclockaccuracy,
{ "grandmasterClockAccuracy", "ptp.v2.an.grandmasterclockaccuracy",
FT_UINT8, BASE_HEX, VALS(ptp_v2_clockaccuracy_vals), 0x00,
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &ptp_v2_clockaccuracy_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_v2_an_grandmasterclockvariance,
@ -4921,7 +4955,7 @@ proto_register_ptp(void)
/* Fields for PTP_Announce TLVs */
{ &hf_ptp_v2_an_tlv_tlvtype,
{ "tlvType", "ptp.v2.an.tlvType",
FT_UINT16, BASE_DEC, VALS(ptp_v2_TLV_type_vals), 0x00,
FT_UINT16, BASE_DEC | BASE_EXT_STRING, &ptp_v2_TLV_type_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_v2_an_tlv_lengthfield,
@ -5051,7 +5085,7 @@ proto_register_ptp(void)
/* Fields for PTP_Follow_up TLVs */
{ &hf_ptp_as_fu_tlv_tlvtype,
{ "tlvType", "ptp.as.fu.tlvType",
FT_UINT16, BASE_DEC, VALS(ptp_v2_TLV_type_vals), 0x00,
FT_UINT16, BASE_DEC | BASE_EXT_STRING, &ptp_v2_TLV_type_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_as_fu_tlv_lengthfield,
@ -5209,7 +5243,7 @@ proto_register_ptp(void)
},
{ &hf_ptp_v2_sig_tlv_tlvType,
{ "tlvType", "ptp.v2.sig.tlv.tlvType",
FT_UINT16, BASE_DEC, VALS(ptp_v2_TLV_type_vals), 0x00,
FT_UINT16, BASE_DEC | BASE_EXT_STRING, &ptp_v2_TLV_type_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_v2_sig_tlv_lengthField,
@ -5224,7 +5258,7 @@ proto_register_ptp(void)
},
{ &hf_ptp_v2_sig_tlv_messageType,
{ "messageType", "ptp.v2.sig.tlv.messageType",
FT_UINT8, BASE_HEX, VALS(ptp_v2_messageid_vals), 0xF0,
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &ptp_v2_messageid_vals_ext, 0xF0,
NULL, HFILL }
},
{ &hf_ptp_v2_sig_tlv_logInterMessagePeriod,
@ -5256,7 +5290,7 @@ proto_register_ptp(void)
/* Fields for PTP_Signalling (=sig) TLVs */
{ &hf_ptp_as_sig_tlv_tlvtype,
{ "tlvType", "ptp.as.sig.tlvType",
FT_UINT16, BASE_DEC, VALS(ptp_v2_TLV_type_vals), 0x00,
FT_UINT16, BASE_DEC | BASE_EXT_STRING, &ptp_v2_TLV_type_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_as_sig_tlv_lengthfield,
@ -5334,7 +5368,7 @@ proto_register_ptp(void)
/* Management TLV */
{ &hf_ptp_v2_mm_tlvType,
{ "tlvType", "ptp.v2.mm.tlvType",
FT_UINT16, BASE_DEC, VALS(ptp_v2_TLV_type_vals), 0x00,
FT_UINT16, BASE_DEC | BASE_EXT_STRING, &ptp_v2_TLV_type_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_v2_mm_lengthField,
@ -5344,7 +5378,7 @@ proto_register_ptp(void)
},
{ &hf_ptp_v2_mm_managementId,
{ "managementId", "ptp.v2.mm.managementId",
FT_UINT16, BASE_DEC, VALS(ptp_v2_managementID_vals), 0x00,
FT_UINT16, BASE_DEC | BASE_EXT_STRING, &ptp_v2_managementID_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_v2_mm_data,
@ -5416,7 +5450,7 @@ proto_register_ptp(void)
},
{ &hf_ptp_v2_mm_protocolAddress_networkProtocol,
{ "network protocol", "ptp.v2.mm.networkProtocol",
FT_UINT16, BASE_DEC, VALS(ptp2_networkProtocol_vals), 0x00,
FT_UINT16, BASE_DEC | BASE_EXT_STRING, &ptp2_networkProtocol_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_v2_mm_protocolAddress_length,
@ -5498,7 +5532,7 @@ proto_register_ptp(void)
},
{ &hf_ptp_v2_mm_severityCode,
{ "severity code", "ptp.v2.mm.severityCode",
FT_UINT8, BASE_DEC, VALS(ptp2_severityCode_vals), 0x00,
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ptp2_severityCode_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_v2_mm_faultName,
@ -5560,7 +5594,7 @@ proto_register_ptp(void)
},
{ &hf_ptp_v2_mm_clockAccuracy,
{ "Clock accuracy", "ptp.v2.mm.clockaccuracy",
FT_UINT8, BASE_HEX, VALS(ptp_v2_clockaccuracy_vals), 0x00,
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &ptp_v2_clockaccuracy_vals_ext, 0x00,
NULL, HFILL }
},
@ -5596,7 +5630,7 @@ proto_register_ptp(void)
},
{ &hf_ptp_v2_mm_clockaccuracy,
{ "Clock accuracy", "ptp.v2.mm.clockaccuracy",
FT_UINT8, BASE_HEX, VALS(ptp_v2_clockaccuracy_vals), 0x00,
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &ptp_v2_clockaccuracy_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_v2_mm_clockvariance,
@ -5666,7 +5700,7 @@ proto_register_ptp(void)
},
{ &hf_ptp_v2_mm_grandmasterclockaccuracy,
{ "Grandmaster clock accuracy", "ptp.v2.mm.grandmasterclockaccuracy",
FT_UINT8, BASE_HEX, VALS(ptp_v2_clockaccuracy_vals), 0x00,
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &ptp_v2_clockaccuracy_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_v2_mm_grandmasterclockvariance,
@ -5716,7 +5750,7 @@ proto_register_ptp(void)
},
{ &hf_ptp_v2_mm_timesource,
{ "TimeSource", "ptp.v2.mm.timesource",
FT_UINT8, BASE_HEX, VALS(ptp_v2_timesource_vals), 0x00,
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &ptp_v2_timesource_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_v2_mm_offset_ns,
@ -5746,7 +5780,7 @@ proto_register_ptp(void)
},
{ &hf_ptp_v2_mm_portState,
{ "Port state", "ptp.v2.mm.portState",
FT_UINT8, BASE_DEC, VALS(ptp2_portState_vals), 0x00,
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ptp2_portState_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_v2_mm_logMinDelayReqInterval,
@ -5807,7 +5841,7 @@ proto_register_ptp(void)
{ &hf_ptp_v2_mm_managementErrorId,
{ "managementErrorId", "ptp.v2.mm.managementErrorId",
FT_UINT16, BASE_DEC, VALS(ptp2_managementErrorId_vals), 0x00,
FT_UINT16, BASE_DEC | BASE_EXT_STRING, &ptp2_managementErrorId_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_ptp_v2_mm_displayData,
@ -5931,3 +5965,16 @@ proto_reg_handoff_ptp(void)
dissector_add_uint("udp.port", GENERAL_PORT_PTP, general_port_ptp_handle);
dissector_add_uint("ethertype", ETHERTYPE_PTP, ethertype_ptp_handle);
}
/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 4
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true:
*/