forked from osmocom/wireshark
Get rid of check_col, while at it set ENC.
svn path=/trunk/; revision=39147
This commit is contained in:
Anders Broman
parent
4b952c1324
commit
fc447d3377
|
|
@ -215,7 +215,7 @@ dissect_beep_more(tvbuff_t *tvb, int offset,
|
|||
case BEEP_COMPLETE:
|
||||
|
||||
if (tree) {
|
||||
hidden_item = proto_tree_add_boolean(tree, hf_beep_complete, tvb, offset, 1, TRUE);
|
||||
hidden_item = proto_tree_add_boolean(tree, hf_beep_complete, tvb, offset, 1, ENC_LITTLE_ENDIAN);
|
||||
PROTO_ITEM_SET_HIDDEN(hidden_item);
|
||||
proto_tree_add_text(tree, tvb, offset, 1, "More: Complete");
|
||||
}
|
||||
|
|
@ -227,7 +227,7 @@ dissect_beep_more(tvbuff_t *tvb, int offset,
|
|||
case BEEP_INTERMEDIATE:
|
||||
|
||||
if (tree) {
|
||||
hidden_item = proto_tree_add_boolean(tree, hf_beep_intermediate, tvb, offset, 1, TRUE);
|
||||
hidden_item = proto_tree_add_boolean(tree, hf_beep_intermediate, tvb, offset, 1, ENC_LITTLE_ENDIAN);
|
||||
PROTO_ITEM_SET_HIDDEN(hidden_item);
|
||||
proto_tree_add_text(tree, tvb, offset, 1, "More: Intermediate");
|
||||
}
|
||||
|
|
@ -239,7 +239,7 @@ dissect_beep_more(tvbuff_t *tvb, int offset,
|
|||
default:
|
||||
|
||||
if (tree) {
|
||||
hidden_item = proto_tree_add_boolean(tree, hf_beep_proto_viol, tvb, offset, 1, TRUE);
|
||||
hidden_item = proto_tree_add_boolean(tree, hf_beep_proto_viol, tvb, offset, 1, ENC_LITTLE_ENDIAN);
|
||||
PROTO_ITEM_SET_HIDDEN(hidden_item);
|
||||
proto_tree_add_text(tree, tvb, offset, 1, "PROTOCOL VIOLATION: Expected More Flag (* or .)");
|
||||
}
|
||||
|
|
@ -265,7 +265,7 @@ static void dissect_beep_status(tvbuff_t *tvb, int offset,
|
|||
case '+':
|
||||
|
||||
if (tree) {
|
||||
hidden_item = proto_tree_add_boolean(tree, hf_beep_positive, tvb, offset, 1, TRUE);
|
||||
hidden_item = proto_tree_add_boolean(tree, hf_beep_positive, tvb, offset, 1, ENC_LITTLE_ENDIAN);
|
||||
PROTO_ITEM_SET_HIDDEN(hidden_item);
|
||||
proto_tree_add_text(tree, tvb, offset, 1, "Status: Positive");
|
||||
}
|
||||
|
|
@ -275,7 +275,7 @@ static void dissect_beep_status(tvbuff_t *tvb, int offset,
|
|||
case '-':
|
||||
|
||||
if (tree) {
|
||||
hidden_item = proto_tree_add_boolean(tree, hf_beep_negative, tvb, offset, 1, TRUE);
|
||||
hidden_item = proto_tree_add_boolean(tree, hf_beep_negative, tvb, offset, 1, ENC_LITTLE_ENDIAN);
|
||||
PROTO_ITEM_SET_HIDDEN(hidden_item);
|
||||
proto_tree_add_text(tree, tvb, offset, 1, "Status: Negative");
|
||||
}
|
||||
|
|
@ -334,7 +334,7 @@ check_term(tvbuff_t *tvb, int offset, proto_tree *tree)
|
|||
|
||||
if (tree) {
|
||||
proto_tree_add_text(tree, tvb, offset, 1, "Nonstandard Terminator: CR");
|
||||
hidden_item = proto_tree_add_boolean(tree, hf_beep_proto_viol, tvb, offset, 1, TRUE);
|
||||
hidden_item = proto_tree_add_boolean(tree, hf_beep_proto_viol, tvb, offset, 1, ENC_LITTLE_ENDIAN);
|
||||
PROTO_ITEM_SET_HIDDEN(hidden_item);
|
||||
}
|
||||
return 1;
|
||||
|
|
@ -344,7 +344,7 @@ check_term(tvbuff_t *tvb, int offset, proto_tree *tree)
|
|||
|
||||
if (tree) {
|
||||
proto_tree_add_text(tree, tvb, offset, 1, "Nonstandard Terminator: LF");
|
||||
hidden_item = proto_tree_add_boolean(tree, hf_beep_proto_viol, tvb, offset, 1, TRUE);
|
||||
hidden_item = proto_tree_add_boolean(tree, hf_beep_proto_viol, tvb, offset, 1, ENC_LITTLE_ENDIAN);
|
||||
PROTO_ITEM_SET_HIDDEN(hidden_item);
|
||||
}
|
||||
return 1;
|
||||
|
|
@ -354,7 +354,7 @@ check_term(tvbuff_t *tvb, int offset, proto_tree *tree)
|
|||
|
||||
if (tree) {
|
||||
proto_tree_add_text(tree, tvb, offset, 2, "PROTOCOL VIOLATION, Invalid Terminator: %s", tvb_format_text(tvb, offset, 2));
|
||||
hidden_item = proto_tree_add_boolean(tree, hf_beep_proto_viol, tvb, offset, 2, TRUE);
|
||||
hidden_item = proto_tree_add_boolean(tree, hf_beep_proto_viol, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
PROTO_ITEM_SET_HIDDEN(hidden_item);
|
||||
}
|
||||
return -1;
|
||||
|
|
@ -563,7 +563,7 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
|
||||
hdr = proto_item_add_subtree(ti, ett_header);
|
||||
|
||||
/*hidden_item = */proto_tree_add_boolean(hdr, hf_beep_req, tvb, offset, 3, TRUE);
|
||||
/*hidden_item = */proto_tree_add_boolean(hdr, hf_beep_req, tvb, offset, 3, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_text(hdr, tvb, offset, 3, "%s", cmd_temp);
|
||||
}
|
||||
|
||||
|
|
@ -682,7 +682,7 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
} else if (tvb_strneql(tvb, offset, "SEQ ", 4) == 0) {
|
||||
|
||||
if (tree) {
|
||||
/*hidden_item = */proto_tree_add_boolean(tree, hf_beep_seq, tvb, offset, 3, TRUE);
|
||||
/*hidden_item = */proto_tree_add_boolean(tree, hf_beep_seq, tvb, offset, 3, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_text(tree, tvb, offset, 3, "Command: SEQ");
|
||||
}
|
||||
|
||||
|
|
@ -735,7 +735,7 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
|
||||
tr = proto_item_add_subtree(ti, ett_trailer);
|
||||
|
||||
/*hidden_item = */proto_tree_add_boolean(tr, hf_beep_end, tvb, offset, 3, TRUE);
|
||||
/*hidden_item = */proto_tree_add_boolean(tr, hf_beep_end, tvb, offset, 3, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_text(tr, tvb, offset, 3, "Command: END");
|
||||
|
||||
}
|
||||
|
|
@ -886,13 +886,11 @@ dissect_beep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "BEEP");
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO)) { /* Check the type ... */
|
||||
|
||||
/* "tvb_format_text()" is passed a value that won't go past the end
|
||||
* of the packet, so it won't throw an exception. */
|
||||
col_add_str(pinfo->cinfo, COL_INFO, tvb_format_text(tvb, offset, tvb_length_remaining(tvb, offset)));
|
||||
|
||||
}
|
||||
/* "tvb_format_text()" is passed a value that won't go past the end
|
||||
* of the packet, so it won't throw an exception.
|
||||
*/
|
||||
col_add_str(pinfo->cinfo, COL_INFO, tvb_format_text(tvb, offset, tvb_length_remaining(tvb, offset)));
|
||||
|
||||
/* Here, we parse the message so we can retrieve the info we need, which
|
||||
* is that there is some payload left from a previous segment on the
|
||||
|
|
@ -906,7 +904,7 @@ dissect_beep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
if (tree) { /* Build the tree info ... */
|
||||
|
||||
ti = proto_tree_add_item(tree, proto_beep, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, proto_beep, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
|
||||
beep_tree = proto_item_add_subtree(ti, ett_beep);
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -98,15 +98,15 @@ dissect_calcappprotocol_message(tvbuff_t *message_tvb, packet_info *pinfo, proto
|
|||
guint8 type;
|
||||
|
||||
type = tvb_get_guint8(message_tvb, MESSAGE_TYPE_OFFSET);
|
||||
if (pinfo && (check_col(pinfo->cinfo, COL_INFO))) {
|
||||
if (pinfo) {
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(type, message_type_values, "Unknown CalcAppProtocol type"));
|
||||
}
|
||||
proto_tree_add_item(calcappprotocol_tree, hf_message_type, message_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, FALSE);
|
||||
proto_tree_add_item(calcappprotocol_tree, hf_message_flags, message_tvb, MESSAGE_FLAGS_OFFSET, MESSAGE_FLAGS_LENGTH, FALSE);
|
||||
proto_tree_add_item(calcappprotocol_tree, hf_message_length, message_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, FALSE);
|
||||
proto_tree_add_item(calcappprotocol_tree, hf_message_jobid, message_tvb, MESSAGE_JOBID_OFFSET, MESSAGE_JOBID_LENGTH, FALSE);
|
||||
proto_tree_add_item(calcappprotocol_tree, hf_message_jobsize, message_tvb, MESSAGE_JOBSIZE_OFFSET, MESSAGE_JOBSIZE_LENGTH, FALSE);
|
||||
proto_tree_add_item(calcappprotocol_tree, hf_message_completed, message_tvb, MESSAGE_COMPLETED_OFFSET, MESSAGE_COMPLETED_LENGTH, FALSE);
|
||||
proto_tree_add_item(calcappprotocol_tree, hf_message_type, message_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(calcappprotocol_tree, hf_message_flags, message_tvb, MESSAGE_FLAGS_OFFSET, MESSAGE_FLAGS_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(calcappprotocol_tree, hf_message_length, message_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(calcappprotocol_tree, hf_message_jobid, message_tvb, MESSAGE_JOBID_OFFSET, MESSAGE_JOBID_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(calcappprotocol_tree, hf_message_jobsize, message_tvb, MESSAGE_JOBSIZE_OFFSET, MESSAGE_JOBSIZE_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(calcappprotocol_tree, hf_message_completed, message_tvb, MESSAGE_COMPLETED_OFFSET, MESSAGE_COMPLETED_LENGTH, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -124,7 +124,7 @@ dissect_calcappprotocol(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *t
|
|||
necessary to generate protocol tree items. */
|
||||
if (tree) {
|
||||
/* create the calcappprotocol protocol tree */
|
||||
calcappprotocol_item = proto_tree_add_item(tree, proto_calcappprotocol, message_tvb, 0, -1, FALSE);
|
||||
calcappprotocol_item = proto_tree_add_item(tree, proto_calcappprotocol, message_tvb, 0, -1, ENC_BIG_ENDIAN);
|
||||
calcappprotocol_tree = proto_item_add_subtree(calcappprotocol_item, ett_calcappprotocol);
|
||||
} else {
|
||||
calcappprotocol_tree = NULL;
|
||||
|
|
|
|||
|
|
@ -423,7 +423,7 @@ static void dissect_cast_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
|
|||
/* In the interest of speed, if "tree" is NULL, don't do any work not
|
||||
* necessary to generate protocol tree items. */
|
||||
if (tree) {
|
||||
ti = proto_tree_add_item(tree, proto_cast, tvb, offset, hdr_data_length+8, FALSE);
|
||||
ti = proto_tree_add_item(tree, proto_cast, tvb, offset, hdr_data_length+8, ENC_BIG_ENDIAN);
|
||||
cast_tree = proto_item_add_subtree(ti, ett_cast);
|
||||
proto_tree_add_uint(cast_tree, hf_cast_data_length, tvb, offset, 4, hdr_data_length);
|
||||
proto_tree_add_uint(cast_tree, hf_cast_reserved, tvb, offset+4, 4, hdr_marker);
|
||||
|
|
@ -431,9 +431,7 @@ static void dissect_cast_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
|
|||
|
||||
messageid_str = val_to_str(data_messageid, message_id, "0x%08X (Unknown)");
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO)) {
|
||||
col_add_str(pinfo->cinfo, COL_INFO, messageid_str);
|
||||
}
|
||||
col_add_str(pinfo->cinfo, COL_INFO, messageid_str);
|
||||
|
||||
if (tree) {
|
||||
proto_tree_add_uint(cast_tree, hf_cast_messageid, tvb,offset+8, 4, data_messageid );
|
||||
|
|
@ -447,127 +445,127 @@ static void dissect_cast_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
|
|||
break;
|
||||
|
||||
case 0x1 : /* KeepAliveVersion */
|
||||
proto_tree_add_item(cast_tree, hf_cast_version, tvb, offset+12, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_version, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
|
||||
case 0x2 : /* KeepAliveVersionAck */
|
||||
proto_tree_add_item(cast_tree, hf_cast_version, tvb, offset+12, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_version, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
|
||||
case 0x3 : /* UpdateCapabilities */
|
||||
/* to do - this message is very large and will span multiple packets, it would be nice to someday */
|
||||
/* find out a way to join the next packet and get the complete message to decode */
|
||||
proto_tree_add_item(cast_tree, hf_cast_videoCapCount, tvb, offset+12, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_dataCapCount, tvb, offset+16, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_RTPPayloadFormat, tvb, offset+20, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_customPictureFormatCount, tvb, offset+24, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_videoCapCount, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_dataCapCount, tvb, offset+16, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_RTPPayloadFormat, tvb, offset+20, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_customPictureFormatCount, tvb, offset+24, 4, ENC_LITTLE_ENDIAN);
|
||||
count = offset+28;
|
||||
/* total of 120 bytes */
|
||||
for ( i = 0; i < MAX_CUSTOM_PICTURES; i++ ) {
|
||||
ti_sub = proto_tree_add_text(cast_tree, tvb, offset, 20, "customPictureFormat[%d]", i);
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_pictureWidth, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_pictureWidth, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_pictureHeight, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_pictureHeight, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_pixelAspectRatio, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_pixelAspectRatio, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_clockConversionCode, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_clockConversionCode, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_clockDivisor, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_clockDivisor, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
}
|
||||
ti_sub = proto_tree_add_text(cast_tree, tvb, offset, 8, "confResources");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_activeStreamsOnRegistration, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_activeStreamsOnRegistration, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_maxBW, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_maxBW, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_serviceResourceCount, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_serviceResourceCount, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
cast_sub_tree_sav = cast_sub_tree;
|
||||
/* total of 160 bytes */
|
||||
for ( i = 0; i < MAX_SERVICE_TYPE; i++ ) {
|
||||
ti_sub = proto_tree_add_text(cast_sub_tree_sav, tvb, offset, 20, "serviceResource[%d]", i);
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_layoutCount, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_layoutCount, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
cast_sub_tree_sav_sav = cast_sub_tree_sav;
|
||||
for ( t = 0; t < MAX_LAYOUT_WITH_SAME_SERVICE; t++ ) {
|
||||
ti_sub = proto_tree_add_text(cast_sub_tree_sav, tvb, offset, 20, "layouts[%d]", t);
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_layout, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_layout, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
}
|
||||
cast_sub_tree = cast_sub_tree_sav_sav;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_serviceNum, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_serviceNum, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_maxStreams, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_maxStreams, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_maxConferences, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_maxConferences, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_activeConferenceOnRegistration, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_activeConferenceOnRegistration, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
}
|
||||
/* total of 176 bytes */
|
||||
for ( i = 0; i < StationMaxVideoCapabilities; i++ ) {
|
||||
ti_sub = proto_tree_add_text(cast_tree, tvb, offset, 20, "vidCaps[%d]", i);
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_payloadCapability, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_payloadCapability, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_transmitOrReceive, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_transmitOrReceive, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_levelPreferenceCount, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_levelPreferenceCount, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
cast_sub_tree_sav = cast_sub_tree;
|
||||
for ( t = 0; t < MAX_LEVEL_PREFERENCE; t++ ) {
|
||||
ti_sub = proto_tree_add_text(cast_sub_tree_sav, tvb, offset, 20, "levelPreference[%d]", t);
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_transmitPreference, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_transmitPreference, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_format, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_format, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_maxBitRate, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_maxBitRate, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_minBitRate, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_minBitRate, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_MPI, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_MPI, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_serviceNumber, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_serviceNumber, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
}
|
||||
|
||||
/* H.261 */
|
||||
ti_sub = proto_tree_add_text(cast_sub_tree_sav, tvb, offset, 8, "h261VideoCapability");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_temporalSpatialTradeOffCapability, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_stillImageTransmission, tvb, count+4, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_temporalSpatialTradeOffCapability, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_stillImageTransmission, tvb, count+4, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* H.263 */
|
||||
ti_sub = proto_tree_add_text(cast_sub_tree_sav, tvb, offset, 8, "h263VideoCapability");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_h263_capability_bitfield, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_annexNandWFutureUse, tvb, count+4, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_h263_capability_bitfield, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_annexNandWFutureUse, tvb, count+4, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Vieo */
|
||||
ti_sub = proto_tree_add_text(cast_sub_tree_sav, tvb, offset, 8, "vieoVideoCapability");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_modelNumber, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_modelNumber, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_bandwidth, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_bandwidth, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
}
|
||||
/* total 80 bytes */
|
||||
for ( i = 0; i < StationMaxDataCapabilities; i++ ) {
|
||||
ti_sub = proto_tree_add_text(cast_tree, tvb, offset, 20, "dataCaps[%d]", i);
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_payloadCapability, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_payloadCapability, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_transmitOrReceive, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_transmitOrReceive, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_protocolDependentData, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_protocolDependentData, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_maxBitRate, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_maxBitRate, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count+= 4;
|
||||
}
|
||||
break;
|
||||
|
|
@ -576,153 +574,153 @@ static void dissect_cast_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
|
|||
break;
|
||||
|
||||
case 0x5 : /* OpenMultiMediaReceiveChannel */
|
||||
proto_tree_add_item(cast_tree, hf_cast_conferenceID, tvb, offset+12, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_passThruPartyID, tvb, offset+16, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_payloadCapability, tvb, offset+20, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_lineInstance, tvb, offset+24, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, offset+28, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_payload_rfc_number, tvb, offset+32, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_payloadType, tvb, offset+36, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_isConferenceCreator, tvb, offset+40, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_payloadCapability, tvb, offset+20, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_lineInstance, tvb, offset+24, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, offset+28, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_payload_rfc_number, tvb, offset+32, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_payloadType, tvb, offset+36, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_isConferenceCreator, tvb, offset+40, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* add audio part of union */
|
||||
ti_sub = proto_tree_add_text(cast_tree, tvb, offset, 12, "audioParameters");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_millisecondPacketSize, tvb, offset+44, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_echoCancelType, tvb, offset+48, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_g723BitRate, tvb, offset+52, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_millisecondPacketSize, tvb, offset+44, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_echoCancelType, tvb, offset+48, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_g723BitRate, tvb, offset+52, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* add video part of union */
|
||||
ti_sub = proto_tree_add_text(cast_tree, tvb, offset, 30, "videoParameters");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_bitRate, tvb, offset+44, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_pictureFormatCount, tvb, offset+48, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_bitRate, tvb, offset+44, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_pictureFormatCount, tvb, offset+48, 4, ENC_LITTLE_ENDIAN);
|
||||
cast_sub_tree_sav = cast_sub_tree;
|
||||
count = offset+52;
|
||||
for ( i = 0; i < MAX_PICTURE_FORMAT; i++ ) {
|
||||
ti_sub = proto_tree_add_text(cast_sub_tree_sav, tvb, offset, 8 * MAX_PICTURE_FORMAT, "pictureFormat[%d]", i);
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_format, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_format, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count += 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_MPI, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_MPI, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count += 4;
|
||||
}
|
||||
cast_sub_tree = cast_sub_tree_sav;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_confServiceNum, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_confServiceNum, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count += 4;
|
||||
|
||||
/* add H261 part of union */
|
||||
ti_sub = proto_tree_add_text(cast_sub_tree_sav, tvb, offset, 8, "h261VideoCapability");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_temporalSpatialTradeOffCapability, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_stillImageTransmission, tvb, count+4, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_temporalSpatialTradeOffCapability, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_stillImageTransmission, tvb, count+4, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* add H263 part of union */
|
||||
ti_sub = proto_tree_add_text(cast_sub_tree_sav, tvb, offset, 8, "h263VideoCapability");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_h263_capability_bitfield, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_annexNandWFutureUse, tvb, count+4, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_h263_capability_bitfield, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_annexNandWFutureUse, tvb, count+4, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* add Vieo part of union */
|
||||
ti_sub = proto_tree_add_text(cast_sub_tree_sav, tvb, offset, 8, "vieoVideoCapability");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_modelNumber, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_modelNumber, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count += 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_bandwidth, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_bandwidth, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* add data part of union */
|
||||
ti_sub = proto_tree_add_text(cast_tree, tvb, offset, 8, "dataParameters");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_protocolDependentData, tvb, offset+44, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_maxBitRate, tvb, offset+48, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_protocolDependentData, tvb, offset+44, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_maxBitRate, tvb, offset+48, 4, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
|
||||
case 0x6 : /* OpenMultiMediaReceiveChannelACK */
|
||||
proto_tree_add_item(cast_tree, hf_cast_ORCStatus, tvb, offset+12, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_ipAddress, tvb, offset+16, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_portNumber, tvb, offset+20, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_passThruPartyID, tvb, offset+24, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, offset+28, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_ORCStatus, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_ipAddress, tvb, offset+16, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_portNumber, tvb, offset+20, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_passThruPartyID, tvb, offset+24, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, offset+28, 4, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
|
||||
case 0x7 : /* CloseMultiMediaReceiveChannel */
|
||||
proto_tree_add_item(cast_tree, hf_cast_conferenceID, tvb, offset+12, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_passThruPartyID, tvb, offset+16, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, offset+20, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, offset+20, 4, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
|
||||
case 0x8 : /* StartMultiMediaTransmission */
|
||||
proto_tree_add_item(cast_tree, hf_cast_conferenceID, tvb, offset+12, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_passThruPartyID, tvb, offset+16, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_payloadCapability, tvb, offset+20, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_ipAddress, tvb, offset+24, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_portNumber, tvb, offset+28, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, offset+32, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_payload_rfc_number, tvb, offset+36, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_payloadType, tvb, offset+40, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_DSCPValue, tvb, offset+44, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_payloadCapability, tvb, offset+20, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_ipAddress, tvb, offset+24, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_portNumber, tvb, offset+28, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, offset+32, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_payload_rfc_number, tvb, offset+36, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_payloadType, tvb, offset+40, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_DSCPValue, tvb, offset+44, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* add video part of union */
|
||||
ti_sub = proto_tree_add_text(cast_tree, tvb, offset, 30, "videoParameters");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_bitRate, tvb, offset+48, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_pictureFormatCount, tvb, offset+52, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_bitRate, tvb, offset+48, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_pictureFormatCount, tvb, offset+52, 4, ENC_LITTLE_ENDIAN);
|
||||
cast_sub_tree_sav = cast_sub_tree;
|
||||
count = offset+56;
|
||||
for ( i = 0; i < MAX_PICTURE_FORMAT; i++ ) {
|
||||
ti_sub = proto_tree_add_text(cast_sub_tree_sav, tvb, offset, 8 * MAX_PICTURE_FORMAT, "pictureFormat[%d]", i);
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_format, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_format, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count += 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_MPI, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_MPI, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count += 4;
|
||||
}
|
||||
cast_sub_tree = cast_sub_tree_sav;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_confServiceNum, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_confServiceNum, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count += 4;
|
||||
|
||||
val = count;
|
||||
/* add H261 part of union */
|
||||
ti_sub = proto_tree_add_text(cast_sub_tree_sav, tvb, offset, 8, "h261VideoCapability");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_temporalSpatialTradeOffCapability, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_temporalSpatialTradeOffCapability, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count += 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_stillImageTransmission, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_stillImageTransmission, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* add H263 part of union */
|
||||
count = val;
|
||||
ti_sub = proto_tree_add_text(cast_sub_tree_sav, tvb, offset, 8, "h263VideoCapability");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_h263_capability_bitfield, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_h263_capability_bitfield, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count += 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_annexNandWFutureUse, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_annexNandWFutureUse, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* add Vieo part of union */
|
||||
count = val;
|
||||
ti_sub = proto_tree_add_text(cast_sub_tree_sav, tvb, offset, 8, "vieoVideoCapability");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_modelNumber, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_modelNumber, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
count += 4;
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_bandwidth, tvb, count, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_bandwidth, tvb, count, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* add data part of union */
|
||||
ti_sub = proto_tree_add_text(cast_tree, tvb, offset, 8, "dataParameters");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_protocolDependentData, tvb, offset+48, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_maxBitRate, tvb, offset+52, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_protocolDependentData, tvb, offset+48, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_maxBitRate, tvb, offset+52, 4, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
|
||||
case 0x9 : /* StopMultiMediaTransmission */
|
||||
proto_tree_add_item(cast_tree, hf_cast_conferenceID, tvb, offset+12, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_passThruPartyID, tvb, offset+16, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, offset+20, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, offset+20, 4, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
|
||||
case 0xA : /* MiscellaneousCommand */
|
||||
proto_tree_add_item(cast_tree, hf_cast_conferenceID, tvb, offset+12, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_passThruPartyID, tvb, offset+16, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, offset+20, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_miscCommandType, tvb, offset+24, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, offset+20, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_miscCommandType, tvb, offset+24, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* show videoFreezePicture */
|
||||
/* not sure of format */
|
||||
|
|
@ -733,71 +731,71 @@ static void dissect_cast_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
|
|||
/* show videoFastUpdateGOB */
|
||||
ti_sub = proto_tree_add_text(cast_tree, tvb, offset, 8, "videoFastUpdateGOB");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_firstGOB, tvb, offset+28, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_numberOfGOBs, tvb, offset+32, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_firstGOB, tvb, offset+28, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_numberOfGOBs, tvb, offset+32, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* show videoFastUpdateMB */
|
||||
ti_sub = proto_tree_add_text(cast_tree, tvb, offset, 8, "videoFastUpdateGOB");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_firstGOB, tvb, offset+28, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_firstMB, tvb, offset+32, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_numberOfMBs, tvb, offset+36, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_firstGOB, tvb, offset+28, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_firstMB, tvb, offset+32, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_numberOfMBs, tvb, offset+36, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* show lostPicture */
|
||||
ti_sub = proto_tree_add_text(cast_tree, tvb, offset, 8, "lostPicture");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_pictureNumber, tvb, offset+28, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_longTermPictureIndex, tvb, offset+32, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_pictureNumber, tvb, offset+28, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_longTermPictureIndex, tvb, offset+32, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* show lostPartialPicture */
|
||||
ti_sub = proto_tree_add_text(cast_tree, tvb, offset, 8, "lostPartialPicture");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_pictureNumber, tvb, offset+28, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_longTermPictureIndex, tvb, offset+32, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_firstMB, tvb, offset+36, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_numberOfMBs, tvb, offset+40, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_pictureNumber, tvb, offset+28, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_longTermPictureIndex, tvb, offset+32, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_firstMB, tvb, offset+36, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_numberOfMBs, tvb, offset+40, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* show recoveryReferencePicture */
|
||||
ti_sub = proto_tree_add_text(cast_tree, tvb, offset, 8, "recoveryReferencePicture");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_recoveryReferencePictureCount, tvb, offset+28, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_recoveryReferencePictureCount, tvb, offset+28, 4, ENC_LITTLE_ENDIAN);
|
||||
cast_sub_tree_sav = cast_sub_tree;
|
||||
for ( i = 0; i < MAX_REFERENCE_PICTURE; i++ ) {
|
||||
ti_sub = proto_tree_add_text(cast_sub_tree_sav, tvb, offset, 8, "recoveryReferencePicture[%d]", i);
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_pictureNumber, tvb, offset+32+(i*8), 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_longTermPictureIndex, tvb, offset+36+(i*8), 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_pictureNumber, tvb, offset+32+(i*8), 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_longTermPictureIndex, tvb, offset+36+(i*8), 4, ENC_LITTLE_ENDIAN);
|
||||
}
|
||||
|
||||
/* show temporalSpatialTradeOff */
|
||||
ti_sub = proto_tree_add_text(cast_tree, tvb, offset, 4, "temporalSpatialTradeOff");
|
||||
cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_temporalSpatialTradeOff, tvb, offset+28, 4, TRUE);
|
||||
proto_tree_add_item(cast_sub_tree, hf_cast_temporalSpatialTradeOff, tvb, offset+28, 4, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
|
||||
case 0xB : /* FlowControlCommand */
|
||||
proto_tree_add_item(cast_tree, hf_cast_conferenceID, tvb, offset+12, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_passThruPartyID, tvb, offset+16, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, offset+20, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_maxBitRate, tvb, offset+24, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_passThruPartyID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, offset+20, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_maxBitRate, tvb, offset+24, 4, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
|
||||
case 0xC : /* ClearConference */
|
||||
proto_tree_add_item(cast_tree, hf_cast_conferenceID, tvb, offset+12, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_serviceNum, tvb, offset+16, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_conferenceID, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_serviceNum, tvb, offset+16, 4, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
|
||||
case 0xD : /* CallState */
|
||||
proto_tree_add_item(cast_tree, hf_cast_callState, tvb, offset+12, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_lineInstance, tvb, offset+16, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, offset+20, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_privacy, tvb, offset+24, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_precedenceLv, tvb, offset+28, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_precedenceDm, tvb, offset+32, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callState, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_lineInstance, tvb, offset+16, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, offset+20, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_privacy, tvb, offset+24, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_precedenceLv, tvb, offset+28, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_precedenceDm, tvb, offset+32, 4, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
|
||||
case 0xE : /* RequestCallState */
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, offset+12, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
|
||||
case 0xF : /* RequestAllCallStates */
|
||||
|
|
@ -806,43 +804,43 @@ static void dissect_cast_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
|
|||
|
||||
case 0x10 : /* CallInfo */
|
||||
i = offset+12;
|
||||
proto_tree_add_item(cast_tree, hf_cast_callingPartyName, tvb, i, StationMaxNameSize, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callingPartyName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
|
||||
i += StationMaxNameSize;
|
||||
proto_tree_add_item(cast_tree, hf_cast_callingParty, tvb, i, StationMaxDirnumSize, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callingParty, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
|
||||
i += StationMaxDirnumSize;
|
||||
proto_tree_add_item(cast_tree, hf_cast_calledPartyName, tvb, i, StationMaxNameSize, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_calledPartyName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
|
||||
i += StationMaxNameSize;
|
||||
proto_tree_add_item(cast_tree, hf_cast_calledParty, tvb, i, StationMaxDirnumSize, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_calledParty, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
|
||||
i += StationMaxDirnumSize;
|
||||
proto_tree_add_item(cast_tree, hf_cast_lineInstance, tvb, i, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_lineInstance, tvb, i, 4, ENC_LITTLE_ENDIAN);
|
||||
i += 4;
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, i, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, i, 4, ENC_LITTLE_ENDIAN);
|
||||
i += 4;
|
||||
proto_tree_add_item(cast_tree, hf_cast_callType, tvb, i, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callType, tvb, i, 4, ENC_LITTLE_ENDIAN);
|
||||
i += 4;
|
||||
proto_tree_add_item(cast_tree, hf_cast_originalCalledPartyName, tvb, i, StationMaxNameSize, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_originalCalledPartyName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
|
||||
i += StationMaxNameSize;
|
||||
proto_tree_add_item(cast_tree, hf_cast_originalCalledParty, tvb, i, StationMaxDirnumSize, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_originalCalledParty, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
|
||||
i += StationMaxDirnumSize;
|
||||
proto_tree_add_item(cast_tree, hf_cast_lastRedirectingPartyName, tvb, i, StationMaxNameSize, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_lastRedirectingPartyName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
|
||||
i += StationMaxNameSize;
|
||||
proto_tree_add_item(cast_tree, hf_cast_lastRedirectingParty, tvb, i, StationMaxDirnumSize, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_lastRedirectingParty, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
|
||||
i += StationMaxDirnumSize;
|
||||
proto_tree_add_item(cast_tree, hf_cast_originalCdpnRedirectReason, tvb, i, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_originalCdpnRedirectReason, tvb, i, 4, ENC_LITTLE_ENDIAN);
|
||||
i += 4;
|
||||
proto_tree_add_item(cast_tree, hf_cast_lastRedirectingReason, tvb, i, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_lastRedirectingReason, tvb, i, 4, ENC_LITTLE_ENDIAN);
|
||||
i += 4;
|
||||
proto_tree_add_item(cast_tree, hf_cast_cgpnVoiceMailbox, tvb, i, StationMaxDirnumSize, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_cgpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
|
||||
i += StationMaxDirnumSize;
|
||||
proto_tree_add_item(cast_tree, hf_cast_cdpnVoiceMailbox, tvb, i, StationMaxDirnumSize, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_cdpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
|
||||
i += StationMaxDirnumSize;
|
||||
proto_tree_add_item(cast_tree, hf_cast_originalCdpnVoiceMailbox, tvb, i, StationMaxDirnumSize, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_originalCdpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
|
||||
i += StationMaxDirnumSize;
|
||||
proto_tree_add_item(cast_tree, hf_cast_lastRedirectingVoiceMailbox, tvb, i, StationMaxDirnumSize, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_lastRedirectingVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
|
||||
i += StationMaxDirnumSize;
|
||||
proto_tree_add_item(cast_tree, hf_cast_callInstance, tvb, i, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callInstance, tvb, i, 4, ENC_LITTLE_ENDIAN);
|
||||
i += 4;
|
||||
proto_tree_add_item(cast_tree, hf_cast_callSecurityStatus, tvb, i, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callSecurityStatus, tvb, i, 4, ENC_LITTLE_ENDIAN);
|
||||
i += 4;
|
||||
val = tvb_get_letohl( tvb, i);
|
||||
ti_sub = proto_tree_add_text(cast_tree, tvb, offset, 8, "partyPIRestrictionBits");
|
||||
|
|
@ -866,25 +864,25 @@ static void dissect_cast_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
|
|||
break;
|
||||
|
||||
case 0x11 : /* RequestCallInfo */
|
||||
proto_tree_add_item(cast_tree, hf_cast_lineInstance, tvb, offset+12, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_lineInstance, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
|
||||
case 0x12 : /* CallFocus */
|
||||
proto_tree_add_item(cast_tree, hf_cast_lineInstance, tvb, offset+12, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, offset+16, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_lineInstance, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_callIdentifier, tvb, offset+16, 4, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
|
||||
case 0x13 : /* MakeCall */
|
||||
proto_tree_add_item(cast_tree, hf_cast_calledParty, tvb, offset+12, StationMaxDirnumSize, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_lineInstance, tvb, offset+16, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_calledParty, tvb, offset+12, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(cast_tree, hf_cast_lineInstance, tvb, offset+16, 4, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
|
||||
case 0x14 : /* HangUp */
|
||||
proto_tree_add_item(cast_tree, hf_cast_lineInstance, tvb, offset+12, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_lineInstance, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
|
||||
case 0x15 : /* Answer */
|
||||
proto_tree_add_item(cast_tree, hf_cast_lineInstance, tvb, offset+12, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_lineInstance, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
|
||||
case 0x40 : /* keepAliveAck */
|
||||
|
|
@ -916,7 +914,7 @@ static void dissect_cast_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
|
|||
break;
|
||||
|
||||
case 0x47 : /* StreamStartMessageWithCodec */
|
||||
proto_tree_add_item(cast_tree, hf_cast_audio, tvb, offset+12, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_audio, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
|
||||
|
||||
|
|
@ -956,22 +954,22 @@ static void dissect_cast_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
|
|||
|
||||
case 0x90 : /* RemoteInfoRequest */
|
||||
i = offset+12;
|
||||
proto_tree_add_item(cast_tree, hf_cast_stationFriendlyName, tvb, i, StationMaxNameSize, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_stationFriendlyName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
|
||||
i += StationMaxNameSize;
|
||||
proto_tree_add_item(cast_tree, hf_cast_stationGUID, tvb, i, StationMaxNameSize, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_stationGUID, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
|
||||
i += StationMaxNameSize;
|
||||
proto_tree_add_item(cast_tree, hf_cast_requestorIpAddress, tvb, i, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_requestorIpAddress, tvb, i, 4, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
|
||||
case 0x91 : /* RemoteInfoResponse */
|
||||
i = offset+12;
|
||||
proto_tree_add_item(cast_tree, hf_cast_stationFriendlyName, tvb, i, StationMaxNameSize, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_stationFriendlyName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
|
||||
i += StationMaxNameSize;
|
||||
proto_tree_add_item(cast_tree, hf_cast_stationGUID, tvb, i, StationMaxNameSize, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_stationGUID, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
|
||||
i += StationMaxNameSize;
|
||||
proto_tree_add_item(cast_tree, hf_cast_stationIpAddress, tvb, i, 4, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_stationIpAddress, tvb, i, 4, ENC_LITTLE_ENDIAN);
|
||||
i += 4;
|
||||
proto_tree_add_item(cast_tree, hf_cast_directoryNumber, tvb, i, StationMaxNameSize, TRUE);
|
||||
proto_tree_add_item(cast_tree, hf_cast_directoryNumber, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -385,34 +385,34 @@ static int dissect_cfm_ccm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_tree *cfm_ccm_itu_tree;
|
||||
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_ccm_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_ccm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_RDI, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ccm_Reserved, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Interval, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_RDI, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ccm_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Interval, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
offset += 1;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_ccm_seq_number, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_ccm_seq_number, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_ccm_ma_ep_id, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_ccm_ma_ep_id, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
/* dissect CCM MAID */
|
||||
mi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_ccm_maid, tvb, offset, 48, FALSE);
|
||||
mi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_ccm_maid, tvb, offset, 48, ENC_BIG_ENDIAN);
|
||||
cfm_ccm_maid_tree = proto_item_add_subtree(mi, ett_cfm_ccm_maid);
|
||||
maid_offset = offset;
|
||||
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_format, tvb, maid_offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_format, tvb, maid_offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_maid_md_name_format = tvb_get_guint8(tvb, maid_offset);
|
||||
maid_offset += 1;
|
||||
if (cfm_maid_md_name_format != 1) {
|
||||
guint8 cfm_maid_md_name_length;
|
||||
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_length,
|
||||
tvb, maid_offset, 1, FALSE);
|
||||
tvb, maid_offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_maid_md_name_length = tvb_get_guint8(tvb, maid_offset);
|
||||
maid_offset += 1;
|
||||
if (cfm_maid_md_name_length) {
|
||||
|
|
@ -422,34 +422,34 @@ static int dissect_cfm_ccm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
/* the MD name of type MAC should be 8 octets but if
|
||||
* it isn't we are going to try and process it anyways.*/
|
||||
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_hex,
|
||||
tvb, maid_offset, cfm_maid_md_name_length, FALSE);
|
||||
tvb, maid_offset, cfm_maid_md_name_length, ENC_BIG_ENDIAN);
|
||||
} else {
|
||||
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_mac,
|
||||
tvb, maid_offset, 6, FALSE);
|
||||
tvb, maid_offset, 6, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_mac_id,
|
||||
tvb, maid_offset+6, 2, FALSE);
|
||||
tvb, maid_offset+6, 2, ENC_BIG_ENDIAN);
|
||||
}
|
||||
} else {
|
||||
/* MD name format is regular string or DNS string */
|
||||
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_string,
|
||||
tvb, maid_offset, cfm_maid_md_name_length, FALSE);
|
||||
tvb, maid_offset, cfm_maid_md_name_length, ENC_BIG_ENDIAN);
|
||||
}
|
||||
maid_offset += cfm_maid_md_name_length;
|
||||
}
|
||||
}
|
||||
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_ma_name_format, tvb, maid_offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_ma_name_format, tvb, maid_offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_maid_ma_name_format = tvb_get_guint8(tvb, maid_offset);
|
||||
maid_offset += 1;
|
||||
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_ma_name_length, tvb, maid_offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_ma_name_length, tvb, maid_offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_maid_ma_name_length = tvb_get_guint8(tvb, maid_offset);
|
||||
maid_offset += 1;
|
||||
if ((cfm_maid_ma_name_format == 2) ||
|
||||
(cfm_maid_ma_name_format == 32)) {
|
||||
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_ma_name_string,
|
||||
tvb, maid_offset, cfm_maid_ma_name_length, FALSE);
|
||||
tvb, maid_offset, cfm_maid_ma_name_length, ENC_BIG_ENDIAN);
|
||||
} else {
|
||||
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_ma_name_hex,
|
||||
tvb, maid_offset, cfm_maid_ma_name_length, FALSE);
|
||||
tvb, maid_offset, cfm_maid_ma_name_length, ENC_BIG_ENDIAN);
|
||||
}
|
||||
maid_offset += cfm_maid_ma_name_length;
|
||||
offset += 48;
|
||||
|
|
@ -457,20 +457,20 @@ static int dissect_cfm_ccm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
gint padding_length;
|
||||
padding_length = offset - maid_offset;
|
||||
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_padding,
|
||||
tvb, maid_offset, padding_length, FALSE);
|
||||
tvb, maid_offset, padding_length, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
/* Dissect 16 octets reserved for Y.1731, samples of the wrap-around frame counters */
|
||||
wi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_ccm_itu_t_y1731, tvb, offset, 16, FALSE);
|
||||
wi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_ccm_itu_t_y1731, tvb, offset, 16, ENC_BIG_ENDIAN);
|
||||
cfm_ccm_itu_tree = proto_item_add_subtree(wi, ett_cfm_ccm_itu);
|
||||
itu_offset = offset;
|
||||
proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_TxFCf, tvb, itu_offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_TxFCf, tvb, itu_offset, 4, ENC_BIG_ENDIAN);
|
||||
itu_offset += 4;
|
||||
proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_RxFCb, tvb, itu_offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_RxFCb, tvb, itu_offset, 4, ENC_BIG_ENDIAN);
|
||||
itu_offset += 4;
|
||||
proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_TxFCb, tvb, itu_offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_TxFCb, tvb, itu_offset, 4, ENC_BIG_ENDIAN);
|
||||
itu_offset += 4;
|
||||
proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_reserved, tvb, itu_offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_reserved, tvb, itu_offset, 4, ENC_BIG_ENDIAN);
|
||||
itu_offset += 4;
|
||||
|
||||
offset += 16;
|
||||
|
|
@ -482,14 +482,14 @@ static int dissect_cfm_lbm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_item *ti;
|
||||
proto_tree *cfm_pdu_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_lbm_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_lbm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lb_transaction_id, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lb_transaction_id, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -499,14 +499,14 @@ static int dissect_cfm_lbr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_item *ti;
|
||||
proto_tree *cfm_pdu_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_lbr_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_lbr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lb_transaction_id, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lb_transaction_id, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -518,24 +518,24 @@ static int dissect_cfm_ltm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_tree *cfm_pdu_tree;
|
||||
proto_tree *cfm_flag_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_ltm_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_ltm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_UseFDBonly, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ltm_Reserved, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_UseFDBonly, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ltm_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lt_transaction_id, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lt_transaction_id, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lt_ttl, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lt_ttl, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_ltm_orig_addr, tvb, offset, 6, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_ltm_orig_addr, tvb, offset, 6, ENC_BIG_ENDIAN);
|
||||
offset += 6;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_ltm_targ_addr, tvb, offset, 6, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_ltm_targ_addr, tvb, offset, 6, ENC_BIG_ENDIAN);
|
||||
offset += 6;
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -547,24 +547,24 @@ static int dissect_cfm_ltr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_tree *cfm_pdu_tree;
|
||||
proto_tree *cfm_flag_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_ltr_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_ltr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_UseFDBonly, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_FwdYes, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_TerminalMEP, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ltr_Reserved, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_UseFDBonly, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_FwdYes, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_TerminalMEP, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ltr_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lt_transaction_id, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lt_transaction_id, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lt_ttl, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lt_ttl, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_ltr_relay_action, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_ltr_relay_action, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -576,16 +576,16 @@ static int dissect_cfm_ais(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_tree *cfm_pdu_tree;
|
||||
proto_tree *cfm_flag_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_ais_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_ais_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ais_lck_Reserved, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ais_lck_Period, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ais_lck_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ais_lck_Period, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
return offset;
|
||||
|
|
@ -598,16 +598,16 @@ static int dissect_cfm_lck(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_tree *cfm_pdu_tree;
|
||||
proto_tree *cfm_flag_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_lck_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_lck_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ais_lck_Reserved, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ais_lck_Period, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ais_lck_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ais_lck_Period, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
return offset;
|
||||
|
|
@ -620,18 +620,18 @@ static int dissect_cfm_tst(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_tree *cfm_pdu_tree;
|
||||
proto_tree *cfm_flag_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_tst_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_tst_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_tst_sequence_num, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_tst_sequence_num, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
|
||||
return offset;
|
||||
|
|
@ -645,15 +645,15 @@ static int dissect_cfm_aps(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_tree *cfm_pdu_tree;
|
||||
proto_tree *cfm_flag_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_aps_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_aps_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
/* The APS data field was not defined at the time of this code being written
|
||||
|
|
@ -661,7 +661,7 @@ static int dissect_cfm_aps(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
* the TLV offset and perform a hex dump */
|
||||
cfm_tlv_offset = tvb_get_guint8(tvb, 3);
|
||||
if (cfm_tlv_offset > 0) {
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_aps_data, tvb, offset, cfm_tlv_offset, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_aps_data, tvb, offset, cfm_tlv_offset, ENC_BIG_ENDIAN);
|
||||
offset += cfm_tlv_offset;
|
||||
}
|
||||
|
||||
|
|
@ -677,30 +677,30 @@ static int dissect_cfm_raps(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
|
|||
proto_tree *cfm_flag_tree;
|
||||
proto_tree *raps_flag_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_raps_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_raps_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_req_st, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_req_st, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
ri = proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_flags, tvb, offset, 1, FALSE);
|
||||
ri = proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
raps_flag_tree = proto_item_add_subtree(ri, ett_cfm_raps_flags);
|
||||
proto_tree_add_item(raps_flag_tree, hf_cfm_raps_flags_rb, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(raps_flag_tree, hf_cfm_raps_flags_dnf, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(raps_flag_tree, hf_cfm_raps_flags_rb, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(raps_flag_tree, hf_cfm_raps_flags_dnf, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_node_id, tvb, offset, 6, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_node_id, tvb, offset, 6, ENC_BIG_ENDIAN);
|
||||
offset += 6;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_reserved, tvb, offset, 24, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_reserved, tvb, offset, 24, ENC_BIG_ENDIAN);
|
||||
offset += 24;
|
||||
|
||||
return offset;
|
||||
|
|
@ -714,20 +714,20 @@ static int dissect_cfm_mcc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_tree *cfm_pdu_tree;
|
||||
proto_tree *cfm_flag_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_mcc_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_mcc_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, ENC_BIG_ENDIAN);
|
||||
offset += 3;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
/* The MCC data field was not defined at the time of this code being written
|
||||
|
|
@ -737,7 +737,7 @@ static int dissect_cfm_mcc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
/* Remove OUI and subtype from the offset */
|
||||
cfm_tlv_offset -= 4;
|
||||
if (cfm_tlv_offset > 0) {
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_mcc_data, tvb, offset, cfm_tlv_offset, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_mcc_data, tvb, offset, cfm_tlv_offset, ENC_BIG_ENDIAN);
|
||||
offset += cfm_tlv_offset;
|
||||
}
|
||||
|
||||
|
|
@ -751,22 +751,22 @@ static int dissect_cfm_lmm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_tree *cfm_pdu_tree;
|
||||
proto_tree *cfm_flag_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_lmm_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_lmm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCf, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCf, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_RxFCf, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_RxFCf, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCb, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCb, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
|
||||
return offset;
|
||||
|
|
@ -779,22 +779,22 @@ static int dissect_cfm_lmr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_tree *cfm_pdu_tree;
|
||||
proto_tree *cfm_flag_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_lmr_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_lmr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCf, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCf, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_RxFCf, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_RxFCf, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCb, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCb, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
|
||||
return offset;
|
||||
|
|
@ -807,20 +807,20 @@ static int dissect_cfm_odm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_tree *cfm_pdu_tree;
|
||||
proto_tree *cfm_flag_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_odm_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_odm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_TxTimestampf, tvb, offset, 8, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_TxTimestampf, tvb, offset, 8, ENC_BIG_ENDIAN);
|
||||
offset += 8;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_RxTimestampf, tvb, offset, 8, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_RxTimestampf, tvb, offset, 8, ENC_BIG_ENDIAN);
|
||||
offset += 8;
|
||||
|
||||
return offset;
|
||||
|
|
@ -833,24 +833,24 @@ static int dissect_cfm_dmm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_tree *cfm_pdu_tree;
|
||||
proto_tree *cfm_flag_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_dmm_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_dmm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_TxTimestampf, tvb, offset, 8, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_TxTimestampf, tvb, offset, 8, ENC_BIG_ENDIAN);
|
||||
offset += 8;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_RxTimestampf, tvb, offset, 8, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_RxTimestampf, tvb, offset, 8, ENC_BIG_ENDIAN);
|
||||
offset += 8;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_TxTimestampb, tvb, offset, 8, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_TxTimestampb, tvb, offset, 8, ENC_BIG_ENDIAN);
|
||||
offset += 8;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_RxTimestampb, tvb, offset, 8, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_RxTimestampb, tvb, offset, 8, ENC_BIG_ENDIAN);
|
||||
offset += 8;
|
||||
|
||||
return offset;
|
||||
|
|
@ -863,24 +863,24 @@ static int dissect_cfm_dmr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_tree *cfm_pdu_tree;
|
||||
proto_tree *cfm_flag_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_dmr_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_dmr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_TxTimestampf, tvb, offset, 8, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_TxTimestampf, tvb, offset, 8, ENC_BIG_ENDIAN);
|
||||
offset += 8;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_RxTimestampf, tvb, offset, 8, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_RxTimestampf, tvb, offset, 8, ENC_BIG_ENDIAN);
|
||||
offset += 8;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_TxTimestampb, tvb, offset, 8, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_TxTimestampb, tvb, offset, 8, ENC_BIG_ENDIAN);
|
||||
offset += 8;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_RxTimestampb, tvb, offset, 8, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_RxTimestampb, tvb, offset, 8, ENC_BIG_ENDIAN);
|
||||
offset += 8;
|
||||
|
||||
return offset;
|
||||
|
|
@ -894,20 +894,20 @@ static int dissect_cfm_exm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_tree *cfm_pdu_tree;
|
||||
proto_tree *cfm_flag_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_exm_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_exm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, ENC_BIG_ENDIAN);
|
||||
offset += 3;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
/* The EXM data field was not defined at the time of this code being written
|
||||
|
|
@ -917,7 +917,7 @@ static int dissect_cfm_exm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
/* Remove OUI and subtype from the offset */
|
||||
cfm_tlv_offset -= 4;
|
||||
if (cfm_tlv_offset > 0) {
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_exm_exr_data, tvb, offset, cfm_tlv_offset, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_exm_exr_data, tvb, offset, cfm_tlv_offset, ENC_BIG_ENDIAN);
|
||||
offset += cfm_tlv_offset;
|
||||
}
|
||||
|
||||
|
|
@ -932,20 +932,20 @@ static int dissect_cfm_exr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_tree *cfm_pdu_tree;
|
||||
proto_tree *cfm_flag_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_exr_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_exr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, ENC_BIG_ENDIAN);
|
||||
offset += 3;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
/* The EXR data field was not defined at the time of this code being written
|
||||
|
|
@ -955,7 +955,7 @@ static int dissect_cfm_exr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
/* Remove OUI and subtype from the offset */
|
||||
cfm_tlv_offset -= 4;
|
||||
if (cfm_tlv_offset > 0) {
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_exm_exr_data, tvb, offset, cfm_tlv_offset, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_exm_exr_data, tvb, offset, cfm_tlv_offset, ENC_BIG_ENDIAN);
|
||||
offset += cfm_tlv_offset;
|
||||
}
|
||||
|
||||
|
|
@ -970,20 +970,20 @@ static int dissect_cfm_vsm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_tree *cfm_pdu_tree;
|
||||
proto_tree *cfm_flag_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_vsm_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_vsm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, ENC_BIG_ENDIAN);
|
||||
offset += 3;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
/* The VSM data field was not defined at the time of this code being written
|
||||
|
|
@ -993,7 +993,7 @@ static int dissect_cfm_vsm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
/* Remove OUI and subtype from the offset */
|
||||
cfm_tlv_offset -= 4;
|
||||
if (cfm_tlv_offset > 0) {
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_vsm_vsr_data, tvb, offset, cfm_tlv_offset, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_vsm_vsr_data, tvb, offset, cfm_tlv_offset, ENC_BIG_ENDIAN);
|
||||
offset += cfm_tlv_offset;
|
||||
}
|
||||
|
||||
|
|
@ -1008,20 +1008,20 @@ static int dissect_cfm_vsr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_tree *cfm_pdu_tree;
|
||||
proto_tree *cfm_flag_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_vsr_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_vsr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, ENC_BIG_ENDIAN);
|
||||
offset += 3;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
/* The VSR data field was not defined at the time of this code being written
|
||||
|
|
@ -1031,7 +1031,7 @@ static int dissect_cfm_vsr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
/* Remove OUI and subtype from the offset */
|
||||
cfm_tlv_offset -= 4;
|
||||
if (cfm_tlv_offset > 0) {
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_vsm_vsr_data, tvb, offset, cfm_tlv_offset, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_vsm_vsr_data, tvb, offset, cfm_tlv_offset, ENC_BIG_ENDIAN);
|
||||
offset += cfm_tlv_offset;
|
||||
}
|
||||
|
||||
|
|
@ -1045,26 +1045,26 @@ static int dissect_cfm_slm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_tree *cfm_pdu_tree;
|
||||
proto_tree *cfm_flag_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_slm_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_slm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_src_mep, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_src_mep, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_rsp_mep, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_rsp_mep, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_testid, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_testid, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_txfcf, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_txfcf, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_txfcb, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_txfcb, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
|
||||
return offset;
|
||||
|
|
@ -1077,26 +1077,26 @@ static int dissect_cfm_slr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
proto_tree *cfm_pdu_tree;
|
||||
proto_tree *cfm_flag_tree;
|
||||
|
||||
ti = proto_tree_add_item(tree, hf_cfm_slr_pdu, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_slr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
|
||||
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE);
|
||||
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_src_mep, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_src_mep, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_rsp_mep, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_rsp_mep, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_testid, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_testid, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_txfcf, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_txfcf, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_txfcb, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_txfcb, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
|
||||
return offset;
|
||||
|
|
@ -1118,10 +1118,8 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
/* provide info column with CFM packet type (opcode)*/
|
||||
cfm_pdu_type = tvb_get_guint8(tvb, 1);
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO)) {
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "Type %s",
|
||||
val_to_str(cfm_pdu_type, opcodetypenames, "Unknown (0x%02x)"));
|
||||
}
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "Type %s",
|
||||
val_to_str(cfm_pdu_type, opcodetypenames, "Unknown (0x%02x)"));
|
||||
|
||||
if (tree) { /* we are being asked for details */
|
||||
gint cfm_tlv_offset;
|
||||
|
|
@ -1129,7 +1127,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
proto_tree *cfm_tree;
|
||||
|
||||
/* isolate the payload of the packet */
|
||||
ti = proto_tree_add_item(tree, proto_cfm, tvb, 0, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, proto_cfm, tvb, 0, -1, ENC_BIG_ENDIAN);
|
||||
|
||||
|
||||
/* report type of CFM packet to base of dissection tree */
|
||||
|
|
@ -1138,10 +1136,10 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
/* dissecting the common CFM header */
|
||||
cfm_tree = proto_item_add_subtree(ti, ett_cfm);
|
||||
proto_tree_add_item(cfm_tree, hf_cfm_md_level, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_tree, hf_cfm_version, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_tree, hf_cfm_md_level, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(cfm_tree, hf_cfm_version, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
proto_tree_add_item(cfm_tree, hf_cfm_opcode, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_tree, hf_cfm_opcode, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
switch(cfm_pdu_type) {
|
||||
|
|
@ -1222,7 +1220,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
if ((cfm_tlv_offset == offset) && (cfm_tlv_offset > 3)) {
|
||||
proto_tree *cfm_all_tlvs_tree;
|
||||
guint8 cfm_tlv_type = 255;
|
||||
ti = proto_tree_add_item(tree, hf_cfm_all_tlvs, tvb, cfm_tlv_offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, hf_cfm_all_tlvs, tvb, cfm_tlv_offset, -1, ENC_BIG_ENDIAN);
|
||||
cfm_all_tlvs_tree = proto_item_add_subtree(ti, ett_cfm_all_tlvs);
|
||||
|
||||
while (cfm_tlv_type != END_TLV)
|
||||
|
|
@ -1246,10 +1244,10 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
cfm_tlv_type, cfm_tlv_length);
|
||||
cfm_tlv_tree = proto_item_add_subtree(fi, ett_cfm_tlv);
|
||||
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_cfm_tlv_type, tvb, cfm_tlv_offset, 1, FALSE);
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_cfm_tlv_type, tvb, cfm_tlv_offset, 1, ENC_BIG_ENDIAN);
|
||||
cfm_tlv_offset += 1;
|
||||
if (cfm_tlv_type != END_TLV) {
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_cfm_tlv_length, tvb, cfm_tlv_offset, 2, FALSE);
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_cfm_tlv_length, tvb, cfm_tlv_offset, 2, ENC_BIG_ENDIAN);
|
||||
cfm_tlv_offset += 2;
|
||||
|
||||
if (cfm_tlv_length != 0) {
|
||||
|
|
@ -1262,16 +1260,16 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
switch(cfm_tlv_type) {
|
||||
case SENDER_ID_TLV:
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_chassis_id_length,
|
||||
tvb, tlv_data_offset, 1, FALSE);
|
||||
tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN);
|
||||
tlv_chassis_id_length = tvb_get_guint8(tvb,tlv_data_offset);
|
||||
tlv_data_offset += 1;
|
||||
|
||||
if (tlv_chassis_id_length > 0) {
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_chassis_id_subtype,
|
||||
tvb, tlv_data_offset, 1, FALSE);
|
||||
tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += 1;
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_chassis_id,
|
||||
tvb, tlv_data_offset, tlv_chassis_id_length, FALSE);
|
||||
tvb, tlv_data_offset, tlv_chassis_id_length, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += tlv_chassis_id_length;
|
||||
}
|
||||
|
||||
|
|
@ -1280,12 +1278,12 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
if (cfm_tlv_length > (2 + tlv_chassis_id_length)) {
|
||||
guint8 tlv_ma_domain_length;
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_ma_domain_length,
|
||||
tvb, tlv_data_offset, 1, FALSE);
|
||||
tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN);
|
||||
tlv_ma_domain_length = tvb_get_guint8(tvb,tlv_data_offset);
|
||||
tlv_data_offset += 1;
|
||||
if (tlv_ma_domain_length > 0) {
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_ma_domain,
|
||||
tvb, tlv_data_offset, tlv_ma_domain_length, FALSE);
|
||||
tvb, tlv_data_offset, tlv_ma_domain_length, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += tlv_ma_domain_length;
|
||||
}
|
||||
|
||||
|
|
@ -1295,12 +1293,12 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
if (cfm_tlv_length > (2 + tlv_chassis_id_length + 1 + tlv_ma_domain_length)) {
|
||||
guint8 tlv_management_addr_length;
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_management_addr_length,
|
||||
tvb, tlv_data_offset, 1, FALSE);
|
||||
tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN);
|
||||
tlv_management_addr_length = tvb_get_guint8(tvb,tlv_data_offset);
|
||||
tlv_data_offset += 1;
|
||||
if (tlv_management_addr_length > 0) {
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_management_addr,
|
||||
tvb, tlv_data_offset, tlv_management_addr_length, FALSE);
|
||||
tvb, tlv_data_offset, tlv_management_addr_length, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += tlv_management_addr_length;
|
||||
}
|
||||
}
|
||||
|
|
@ -1308,25 +1306,25 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
break;
|
||||
case PORT_STAT_TLV:
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_port_status_value,
|
||||
tvb, tlv_data_offset, 1, FALSE);
|
||||
tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += 1;
|
||||
break;
|
||||
case DATA_TLV:
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_data_value,
|
||||
tvb, tlv_data_offset, cfm_tlv_length, FALSE);
|
||||
tvb, tlv_data_offset, cfm_tlv_length, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += cfm_tlv_length;
|
||||
break;
|
||||
case INTERF_STAT_TLV:
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_interface_status_value,
|
||||
tvb, tlv_data_offset, 1, FALSE);
|
||||
tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += 1;
|
||||
break;
|
||||
case REPLY_ING_TLV:
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_ingress_action,
|
||||
tvb, tlv_data_offset, 1, FALSE);
|
||||
tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += 1;
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_ingress_mac_address,
|
||||
tvb, tlv_data_offset, 6, FALSE);
|
||||
tvb, tlv_data_offset, 6, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += 6;
|
||||
|
||||
/* For the IEEE standard if the TLV length is greater than 7 then we have
|
||||
|
|
@ -1335,26 +1333,26 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
if (cfm_tlv_length > 7) {
|
||||
guint8 tlv_reply_ingress_portid_length;
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_ing_egr_portid_length,
|
||||
tvb, tlv_data_offset, 1, FALSE);
|
||||
tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN);
|
||||
tlv_reply_ingress_portid_length = tvb_get_guint8(tvb,tlv_data_offset);
|
||||
tlv_data_offset += 1;
|
||||
|
||||
if (tlv_reply_ingress_portid_length > 0) {
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_ing_egr_portid_subtype,
|
||||
tvb, tlv_data_offset, 1, FALSE);
|
||||
tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += 1;
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_ing_egr_portid,
|
||||
tvb, tlv_data_offset, tlv_reply_ingress_portid_length, FALSE);
|
||||
tvb, tlv_data_offset, tlv_reply_ingress_portid_length, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += tlv_reply_ingress_portid_length;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case REPLY_EGR_TLV:
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_egress_action,
|
||||
tvb, tlv_data_offset, 1, FALSE);
|
||||
tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += 1;
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_egress_mac_address,
|
||||
tvb, tlv_data_offset, 6, FALSE);
|
||||
tvb, tlv_data_offset, 6, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += 6;
|
||||
|
||||
/* For the IEEE standard if the TLV length is greater than 7 then we have
|
||||
|
|
@ -1363,40 +1361,40 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
if (cfm_tlv_length > 7) {
|
||||
guint8 tlv_reply_egress_portid_length;
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_ing_egr_portid_length,
|
||||
tvb, tlv_data_offset, 1, FALSE);
|
||||
tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN);
|
||||
tlv_reply_egress_portid_length = tvb_get_guint8(tvb,tlv_data_offset);
|
||||
tlv_data_offset += 1;
|
||||
|
||||
if (tlv_reply_egress_portid_length > 0) {
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_ing_egr_portid_subtype,
|
||||
tvb, tlv_data_offset, 1, FALSE);
|
||||
tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += 1;
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_ing_egr_portid,
|
||||
tvb, tlv_data_offset, tlv_reply_egress_portid_length, FALSE);
|
||||
tvb, tlv_data_offset, tlv_reply_egress_portid_length, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += tlv_reply_egress_portid_length;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case LTM_EGR_ID_TLV:
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltm_egress_id_unique_identifier,
|
||||
tvb, tlv_data_offset, 2, FALSE);
|
||||
tvb, tlv_data_offset, 2, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += 2;
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltm_egress_id_mac,
|
||||
tvb, tlv_data_offset, 6, FALSE);
|
||||
tvb, tlv_data_offset, 6, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += 6;
|
||||
break;
|
||||
case LTR_EGR_ID_TLV:
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltr_egress_last_id_unique_identifier,
|
||||
tvb, tlv_data_offset, 2, FALSE);
|
||||
tvb, tlv_data_offset, 2, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += 2;
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltr_egress_last_id_mac,
|
||||
tvb, tlv_data_offset, 6, FALSE);
|
||||
tvb, tlv_data_offset, 6, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += 6;
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltr_egress_next_id_unique_identifier,
|
||||
tvb, tlv_data_offset, 2, FALSE);
|
||||
tvb, tlv_data_offset, 2, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += 2;
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltr_egress_next_id_mac,
|
||||
tvb, tlv_data_offset, 6, FALSE);
|
||||
tvb, tlv_data_offset, 6, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += 6;
|
||||
break;
|
||||
case ORG_SPEC_TLV:
|
||||
|
|
@ -1405,13 +1403,13 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
*/
|
||||
if (cfm_tlv_length > 3) {
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_org_spec_oui,
|
||||
tvb, tlv_data_offset, 3, FALSE);
|
||||
tvb, tlv_data_offset, 3, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += 3;
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_org_spec_subtype,
|
||||
tvb, tlv_data_offset, 1, FALSE);
|
||||
tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += 1;
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_org_spec_value,
|
||||
tvb, tlv_data_offset, cfm_tlv_length-4, FALSE);
|
||||
tvb, tlv_data_offset, cfm_tlv_length-4, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset -= 4;
|
||||
}
|
||||
tlv_data_offset += cfm_tlv_length;
|
||||
|
|
@ -1423,7 +1421,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
* length which corresponds with the typical format for TLV's
|
||||
* until the recommendation is more clear in this regard. */
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_tst_test_pattern_type,
|
||||
tvb, tlv_data_offset, 1, FALSE);
|
||||
tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN);
|
||||
tlv_tst_test_pattern_type = tvb_get_guint8(tvb,tlv_data_offset);
|
||||
tlv_data_offset += 1;
|
||||
if (cfm_tlv_length > 0) {
|
||||
|
|
@ -1431,16 +1429,16 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
case 0:
|
||||
case 2:
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_tst_test_pattern,
|
||||
tvb, tlv_data_offset, cfm_tlv_length-1, FALSE);
|
||||
tvb, tlv_data_offset, cfm_tlv_length-1, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += cfm_tlv_length;
|
||||
break;
|
||||
case 1:
|
||||
case 3:
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_tst_test_pattern,
|
||||
tvb, tlv_data_offset, cfm_tlv_length-5, FALSE);
|
||||
tvb, tlv_data_offset, cfm_tlv_length-5, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += (cfm_tlv_length-5);
|
||||
proto_tree_add_item(cfm_tlv_tree, hf_tlv_tst_CRC32,
|
||||
tvb, tlv_data_offset, 4, FALSE);
|
||||
tvb, tlv_data_offset, 4, ENC_BIG_ENDIAN);
|
||||
tlv_data_offset += 4;
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -147,8 +147,7 @@ chdlctype(guint16 chdlc_type, tvbuff_t *tvb, int offset_after_chdlctype,
|
|||
|
||||
/* do lookup with the subdissector table */
|
||||
if (!dissector_try_uint(subdissector_table, chdlc_type, next_tvb, pinfo, tree)) {
|
||||
if (check_col(pinfo->cinfo, COL_PROTOCOL))
|
||||
col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "0x%04x", chdlc_type);
|
||||
col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "0x%04x", chdlc_type);
|
||||
call_dissector(data_handle,next_tvb, pinfo, tree);
|
||||
}
|
||||
}
|
||||
|
|
@ -188,7 +187,7 @@ dissect_chdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
proto = tvb_get_ntohs(tvb, 2);
|
||||
|
||||
if (tree) {
|
||||
ti = proto_tree_add_item(tree, proto_chdlc, tvb, 0, 4, FALSE);
|
||||
ti = proto_tree_add_item(tree, proto_chdlc, tvb, 0, 4, ENC_BIG_ENDIAN);
|
||||
fh_tree = proto_item_add_subtree(ti, ett_chdlc);
|
||||
|
||||
proto_tree_add_uint(fh_tree, hf_chdlc_addr, tvb, 0, 1, addr);
|
||||
|
|
@ -234,7 +233,7 @@ proto_register_chdlc(void)
|
|||
"CHDLC Frame Checksum Type",
|
||||
"The type of CHDLC frame checksum (none, 16-bit, 32-bit)",
|
||||
&chdlc_fcs_decode,
|
||||
fcs_options, FALSE);
|
||||
fcs_options, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -276,7 +275,7 @@ dissect_slarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
code = tvb_get_ntohl(tvb, 0);
|
||||
|
||||
if (tree) {
|
||||
ti = proto_tree_add_item(tree, proto_slarp, tvb, 0, 14, FALSE);
|
||||
ti = proto_tree_add_item(tree, proto_slarp, tvb, 0, 14, ENC_BIG_ENDIAN);
|
||||
slarp_tree = proto_item_add_subtree(ti, ett_slarp);
|
||||
}
|
||||
|
||||
|
|
@ -284,15 +283,13 @@ dissect_slarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
case SLARP_REQUEST:
|
||||
case SLARP_REPLY:
|
||||
if (check_col(pinfo->cinfo, COL_INFO)) {
|
||||
addr = tvb_get_ipv4(tvb, 4);
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "%s, from %s, mask %s",
|
||||
val_to_str(code, slarp_ptype_vals, "Unknown (%d)"),
|
||||
get_hostname(addr), tvb_ip_to_str(tvb, 8));
|
||||
}
|
||||
if (tree) {
|
||||
proto_tree_add_uint(slarp_tree, hf_slarp_ptype, tvb, 0, 4, code);
|
||||
proto_tree_add_item(slarp_tree, hf_slarp_address, tvb, 4, 4, FALSE);
|
||||
proto_tree_add_item(slarp_tree, hf_slarp_address, tvb, 4, 4, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_text(slarp_tree, tvb, 8, 4,
|
||||
"Netmask: %s", tvb_ip_to_str(tvb, 8));
|
||||
}
|
||||
|
|
@ -301,12 +298,10 @@ dissect_slarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
case SLARP_LINECHECK:
|
||||
mysequence = tvb_get_ntohl(tvb, 4);
|
||||
yoursequence = tvb_get_ntohl(tvb, 8);
|
||||
if (check_col(pinfo->cinfo, COL_INFO)) {
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO,
|
||||
"%s, outgoing sequence %u, returned sequence %u",
|
||||
val_to_str(code, slarp_ptype_vals, "Unknown (%d)"),
|
||||
mysequence, yoursequence);
|
||||
}
|
||||
if (tree) {
|
||||
proto_tree_add_uint(slarp_tree, hf_slarp_ptype, tvb, 0, 4, code);
|
||||
proto_tree_add_uint(slarp_tree, hf_slarp_mysequence, tvb, 4, 4,
|
||||
|
|
@ -317,8 +312,7 @@ dissect_slarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
break;
|
||||
|
||||
default:
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown packet type 0x%08X", code);
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown packet type 0x%08X", code);
|
||||
if (tree) {
|
||||
proto_tree_add_uint(slarp_tree, hf_slarp_ptype, tvb, 0, 4, code);
|
||||
call_dissector(data_handle, tvb_new_subset_remaining(tvb, 4), pinfo,
|
||||
|
|
|
|||
|
|
@ -612,7 +612,7 @@ dissect_cimd_operation(tvbuff_t *tvb, proto_tree *tree, gint etxp, guint16 check
|
|||
if (tree)
|
||||
{
|
||||
/* create display subtree for the protocol */
|
||||
cimd_item = proto_tree_add_item(tree, proto_cimd, tvb, 0, etxp + 1, TRUE);
|
||||
cimd_item = proto_tree_add_item(tree, proto_cimd, tvb, 0, etxp + 1, ENC_LITTLE_ENDIAN);
|
||||
cimd_tree = proto_item_add_subtree(cimd_item, ett_cimd);
|
||||
proto_tree_add_uint(cimd_tree, hf_cimd_opcode_indicator, tvb, CIMD_OC_OFFSET, CIMD_OC_LENGTH, OC);
|
||||
proto_tree_add_uint(cimd_tree, hf_cimd_packet_number_indicator, tvb, CIMD_PN_OFFSET, CIMD_PN_LENGTH, PN);
|
||||
|
|
@ -683,13 +683,10 @@ dissect_cimd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
/* Make entries in Protocol column on summary display */
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CIMD");
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
{
|
||||
if (checksumIsValid)
|
||||
col_add_str(pinfo->cinfo, COL_INFO, val_to_str(OC, vals_hdr_OC, "Unknown (%d)"));
|
||||
else
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "%s - %s", val_to_str(OC, vals_hdr_OC, "Unknown (%d)"), "invalid checksum");
|
||||
}
|
||||
if (checksumIsValid)
|
||||
col_add_str(pinfo->cinfo, COL_INFO, val_to_str(OC, vals_hdr_OC, "Unknown (%d)"));
|
||||
else
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "%s - %s", val_to_str(OC, vals_hdr_OC, "Unknown (%d)"), "invalid checksum");
|
||||
|
||||
dissect_cimd_operation(tvb, tree, etxp, checksum, last1, OC, PN);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1171,12 +1171,12 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt
|
|||
|
||||
/* Get the Vendor ID */
|
||||
temp_data = tvb_get_letohs( tvb, offset + pathpos + 2 );
|
||||
proto_tree_add_item( e_key_tree, hf_cip_vendor, tvb, offset + pathpos + 2, 2, TRUE);
|
||||
proto_tree_add_item( e_key_tree, hf_cip_vendor, tvb, offset + pathpos + 2, 2, ENC_LITTLE_ENDIAN);
|
||||
proto_item_append_text( qi, "VendorID: 0x%04X", temp_data );
|
||||
|
||||
/* Get Device Type */
|
||||
temp_data = tvb_get_letohs( tvb, offset + pathpos + 4 );
|
||||
proto_tree_add_item( e_key_tree, hf_cip_devtype, tvb, offset + pathpos + 4, 2, TRUE);
|
||||
proto_tree_add_item( e_key_tree, hf_cip_devtype, tvb, offset + pathpos + 4, 2, ENC_LITTLE_ENDIAN);
|
||||
proto_item_append_text( qi, ", DevTyp: 0x%04X", temp_data );
|
||||
|
||||
/* Product Code */
|
||||
|
|
@ -1767,12 +1767,9 @@ dissect_cip_generic_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int
|
|||
/* Request message */
|
||||
|
||||
/* Add service to info column */
|
||||
if(check_col(pinfo->cinfo, COL_INFO))
|
||||
{
|
||||
col_append_str( pinfo->cinfo, COL_INFO,
|
||||
val_to_str( ( tvb_get_guint8( tvb, offset ) & 0x7F ),
|
||||
cip_sc_vals , "Unknown Service (0x%02x)") );
|
||||
}
|
||||
col_append_str( pinfo->cinfo, COL_INFO,
|
||||
val_to_str( ( tvb_get_guint8( tvb, offset ) & 0x7F ),
|
||||
cip_sc_vals , "Unknown Service (0x%02x)") );
|
||||
|
||||
req_path_size = tvb_get_guint8( tvb, offset+1 )*2;
|
||||
|
||||
|
|
@ -1832,7 +1829,7 @@ dissect_cip_class_generic(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
if( tree )
|
||||
{
|
||||
/* Create display subtree for the protocol */
|
||||
ti = proto_tree_add_item(tree, proto_cip_class_generic, tvb, 0, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, proto_cip_class_generic, tvb, 0, -1, ENC_BIG_ENDIAN);
|
||||
class_tree = proto_item_add_subtree( ti, ett_cip_class_generic );
|
||||
|
||||
dissect_cip_generic_data( class_tree, tvb, 0, tvb_length(tvb), pinfo, ti );
|
||||
|
|
@ -2008,14 +2005,11 @@ typedef struct mr_mult_req_info {
|
|||
/* Request message */
|
||||
|
||||
/* Add service to info column */
|
||||
if(check_col(pinfo->cinfo, COL_INFO))
|
||||
{
|
||||
col_append_str( pinfo->cinfo, COL_INFO,
|
||||
val_to_str( ( tvb_get_guint8( tvb, offset ) & 0x7F ),
|
||||
cip_sc_vals, "Unknown Service (0x%02x)") );
|
||||
}
|
||||
col_append_str( pinfo->cinfo, COL_INFO,
|
||||
val_to_str( ( tvb_get_guint8( tvb, offset ) & 0x7F ),
|
||||
cip_sc_vals, "Unknown Service (0x%02x)") );
|
||||
|
||||
/* Add path size to tree */
|
||||
/* Add path size to tree */
|
||||
req_path_size = tvb_get_guint8( tvb, offset+1 )*2;
|
||||
|
||||
/* If there is any command specific data creat a sub-tree for it */
|
||||
|
|
@ -2148,7 +2142,7 @@ dissect_cip_class_mr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
if( tree )
|
||||
{
|
||||
/* Create display subtree for the protocol */
|
||||
ti = proto_tree_add_item(tree, proto_cip_class_mr, tvb, 0, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, proto_cip_class_mr, tvb, 0, -1, ENC_BIG_ENDIAN);
|
||||
class_tree = proto_item_add_subtree( ti, ett_cip_class_mr );
|
||||
|
||||
dissect_cip_mr_data( class_tree, tvb, 0, tvb_length(tvb), pinfo );
|
||||
|
|
@ -2193,19 +2187,19 @@ dissect_cip_cm_fwd_open_req(proto_tree *cmd_tree, tvbuff_t *tvb, int offset, gbo
|
|||
dissect_cip_cm_timeout(cmd_tree, tvb, offset);
|
||||
|
||||
/* Display originator to taget connection ID */
|
||||
proto_tree_add_item( cmd_tree, hf_cip_cm_ot_connid, tvb, offset+2, 4, TRUE);
|
||||
proto_tree_add_item( cmd_tree, hf_cip_cm_ot_connid, tvb, offset+2, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display target to originator connection ID */
|
||||
proto_tree_add_item( cmd_tree, hf_cip_cm_to_connid, tvb, offset+6, 4, TRUE);
|
||||
proto_tree_add_item( cmd_tree, hf_cip_cm_to_connid, tvb, offset+6, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display connection serial number */
|
||||
proto_tree_add_item( cmd_tree, hf_cip_cm_conn_serial_num, tvb, offset+10, 2, TRUE);
|
||||
proto_tree_add_item( cmd_tree, hf_cip_cm_conn_serial_num, tvb, offset+10, 2, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display the originator vendor id */
|
||||
proto_tree_add_item( cmd_tree, hf_cip_vendor, tvb, offset+12, 2, TRUE);
|
||||
proto_tree_add_item( cmd_tree, hf_cip_vendor, tvb, offset+12, 2, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display the originator serial number */
|
||||
proto_tree_add_item( cmd_tree, hf_cip_cm_orig_serial_num, tvb, offset+14, 4, TRUE);
|
||||
proto_tree_add_item( cmd_tree, hf_cip_cm_orig_serial_num, tvb, offset+14, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display the timeout multiplier */
|
||||
temp_data = tvb_get_guint8( tvb, offset+18 );
|
||||
|
|
@ -2414,23 +2408,23 @@ dissect_cip_cm_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_
|
|||
|
||||
/* Display originator to target connection ID */
|
||||
O2TConnID = tvb_get_letohl( tvb, offset+4+add_stat_size );
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_ot_connid, tvb, offset+4+add_stat_size, 4, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_ot_connid, tvb, offset+4+add_stat_size, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display target to originator connection ID */
|
||||
T2OConnID = tvb_get_letohl( tvb, offset+4+add_stat_size+4 );
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_to_connid, tvb, offset+4+add_stat_size+4, 4, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_to_connid, tvb, offset+4+add_stat_size+4, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display connection serial number */
|
||||
ConnSerialNumber = tvb_get_letohs( tvb, offset+4+add_stat_size+8 );
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_conn_serial_num, tvb, offset+4+add_stat_size+8, 2, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_conn_serial_num, tvb, offset+4+add_stat_size+8, 2, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display the originator vendor id */
|
||||
VendorID = tvb_get_letohs( tvb, offset+4+add_stat_size+10 );
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_vendor, tvb, offset+4+add_stat_size+10, 2, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_vendor, tvb, offset+4+add_stat_size+10, 2, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display the originator serial number */
|
||||
DeviceSerialNumber = tvb_get_letohl( tvb, offset+4+add_stat_size+12 );
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_orig_serial_num, tvb, offset+4+add_stat_size+12, 4, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_orig_serial_num, tvb, offset+4+add_stat_size+12, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display originator to target actual packet interval */
|
||||
temp_data = tvb_get_letohl( tvb, offset+4+add_stat_size+16 );
|
||||
|
|
@ -2473,15 +2467,15 @@ dissect_cip_cm_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_
|
|||
|
||||
/* Display connection serial number */
|
||||
ConnSerialNumber = tvb_get_letohs( tvb, offset+4+add_stat_size );
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_conn_serial_num, tvb, offset+4+add_stat_size, 2, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_conn_serial_num, tvb, offset+4+add_stat_size, 2, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display the originator vendor id */
|
||||
VendorID = tvb_get_letohs( tvb, offset+4+add_stat_size+2 );
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_vendor, tvb, offset+4+add_stat_size+2, 2, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_vendor, tvb, offset+4+add_stat_size+2, 2, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display the originator serial number */
|
||||
DeviceSerialNumber = tvb_get_letohl( tvb, offset+4+add_stat_size+4 );
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_orig_serial_num, tvb, offset+4+add_stat_size+4, 4, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_orig_serial_num, tvb, offset+4+add_stat_size+4, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display the application reply size */
|
||||
app_rep_size = tvb_get_guint8( tvb, offset+4+add_stat_size+8 ) * 2;
|
||||
|
|
@ -2520,25 +2514,25 @@ dissect_cip_cm_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_
|
|||
/* Get Connection owner response (Success) */
|
||||
|
||||
/* Display number of connections */
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_gco_conn, tvb, offset+4+add_stat_size, 1, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_gco_conn, tvb, offset+4+add_stat_size, 1, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display number of COO connections */
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_gco_coo_conn, tvb, offset+4+add_stat_size+1, 1, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_gco_coo_conn, tvb, offset+4+add_stat_size+1, 1, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display number of ROO connections */
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_gco_roo_conn, tvb, offset+4+add_stat_size+2, 1, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_gco_roo_conn, tvb, offset+4+add_stat_size+2, 1, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display Last Action */
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_gco_la, tvb, offset+4+add_stat_size+3, 1, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_gco_la, tvb, offset+4+add_stat_size+3, 1, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display connection serial number */
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_conn_serial_num, tvb, offset+4+add_stat_size+4, 2, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_conn_serial_num, tvb, offset+4+add_stat_size+4, 2, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display the originator vendor id */
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_vendor, tvb, offset+4+add_stat_size+6, 2, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_vendor, tvb, offset+4+add_stat_size+6, 2, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display the originator serial number */
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_orig_serial_num, tvb, offset+4+add_stat_size+8, 4, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_orig_serial_num, tvb, offset+4+add_stat_size+8, 4, ENC_LITTLE_ENDIAN);
|
||||
}
|
||||
break;
|
||||
case SC_GET_ATT_LIST:
|
||||
|
|
@ -2573,13 +2567,13 @@ dissect_cip_cm_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_
|
|||
/* Forward open and forward close error response look the same */
|
||||
|
||||
/* Display connection serial number */
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_conn_serial_num, tvb, offset+4+add_stat_size, 2, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_conn_serial_num, tvb, offset+4+add_stat_size, 2, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display the originator vendor id */
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_vendor, tvb, offset+4+add_stat_size+2, 2, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_vendor, tvb, offset+4+add_stat_size+2, 2, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display the originator serial number */
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_orig_serial_num, tvb, offset+4+add_stat_size+4, 4, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_orig_serial_num, tvb, offset+4+add_stat_size+4, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display remaining path size */
|
||||
temp_data = tvb_get_guint8( tvb, offset+4+add_stat_size+8 );
|
||||
|
|
@ -2610,12 +2604,9 @@ dissect_cip_cm_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_
|
|||
/* Request message */
|
||||
|
||||
/* Add service to info column */
|
||||
if(check_col(pinfo->cinfo, COL_INFO))
|
||||
{
|
||||
col_append_str( pinfo->cinfo, COL_INFO,
|
||||
val_to_str( ( tvb_get_guint8( tvb, offset ) & 0x7F ),
|
||||
cip_sc_vals_cm , "Unknown Service (0x%02x)") );
|
||||
}
|
||||
col_append_str( pinfo->cinfo, COL_INFO,
|
||||
val_to_str( ( tvb_get_guint8( tvb, offset ) & 0x7F ),
|
||||
cip_sc_vals_cm , "Unknown Service (0x%02x)") );
|
||||
req_path_size = tvb_get_guint8( tvb, offset+1 )*2;
|
||||
|
||||
/* If there is any command specific data creat a sub-tree for it */
|
||||
|
|
@ -2630,11 +2621,11 @@ dissect_cip_cm_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_
|
|||
{
|
||||
case SC_CM_FWD_OPEN:
|
||||
/* Forward open Request*/
|
||||
dissect_cip_cm_fwd_open_req(cmd_data_tree, tvb, offset+2+req_path_size, FALSE);
|
||||
dissect_cip_cm_fwd_open_req(cmd_data_tree, tvb, offset+2+req_path_size, ENC_BIG_ENDIAN);
|
||||
break;
|
||||
case SC_CM_LARGE_FWD_OPEN:
|
||||
/* Large Forward open Request*/
|
||||
dissect_cip_cm_fwd_open_req(cmd_data_tree, tvb, offset+2+req_path_size, TRUE);
|
||||
dissect_cip_cm_fwd_open_req(cmd_data_tree, tvb, offset+2+req_path_size, ENC_LITTLE_ENDIAN);
|
||||
break;
|
||||
case SC_CM_FWD_CLOSE:
|
||||
/* Forward Close Request */
|
||||
|
|
@ -2643,13 +2634,13 @@ dissect_cip_cm_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_
|
|||
dissect_cip_cm_timeout( cmd_data_tree, tvb, offset+2+req_path_size);
|
||||
|
||||
/* Display connection serial number */
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_conn_serial_num, tvb, offset+2+req_path_size+2, 2, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_conn_serial_num, tvb, offset+2+req_path_size+2, 2, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display the originator vendor id */
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_vendor, tvb, offset+2+req_path_size+4, 2, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_vendor, tvb, offset+2+req_path_size+4, 2, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Display the originator serial number */
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_orig_serial_num, tvb, offset+2+req_path_size+6, 4, TRUE);
|
||||
proto_tree_add_item( cmd_data_tree, hf_cip_cm_orig_serial_num, tvb, offset+2+req_path_size+6, 4, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Add the path size */
|
||||
conn_path_size = tvb_get_guint8( tvb, offset+2+req_path_size+10 )*2;
|
||||
|
|
@ -2783,7 +2774,7 @@ dissect_cip_class_cm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
if( tree )
|
||||
{
|
||||
/* Create display subtree for the protocol */
|
||||
ti = proto_tree_add_item(tree, proto_cip_class_cm, tvb, 0, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, proto_cip_class_cm, tvb, 0, -1, ENC_BIG_ENDIAN);
|
||||
class_tree = proto_item_add_subtree( ti, ett_cip_class_cm );
|
||||
|
||||
dissect_cip_cm_data( class_tree, tvb, 0, tvb_length(tvb), pinfo );
|
||||
|
|
@ -2825,10 +2816,10 @@ dissect_cip_cco_all_attribute_common( proto_tree *cmd_tree, tvbuff_t *tvb, int o
|
|||
tdi_tree = proto_item_add_subtree(tdii, ett_cco_tdi);
|
||||
|
||||
/* Target Vendor ID */
|
||||
proto_tree_add_item(tdi_tree, hf_cip_vendor, tvb, offset+2, 2, TRUE);
|
||||
proto_tree_add_item(tdi_tree, hf_cip_vendor, tvb, offset+2, 2, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Target Device Type */
|
||||
proto_tree_add_item(tdi_tree, hf_cip_devtype, tvb, offset+4, 2, TRUE);
|
||||
proto_tree_add_item(tdi_tree, hf_cip_devtype, tvb, offset+4, 2, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Target Product Code */
|
||||
temp_data = tvb_get_letohs( tvb, offset+6);
|
||||
|
|
@ -2923,7 +2914,7 @@ dissect_cip_cco_all_attribute_common( proto_tree *cmd_tree, tvbuff_t *tvb, int o
|
|||
|
||||
/* Connection Name */
|
||||
connection_name_size = tvb_get_guint8( tvb, offset+variable_data_size);
|
||||
str_connection_name = tvb_get_ephemeral_faked_unicode(tvb, offset+variable_data_size+2, connection_name_size, TRUE);
|
||||
str_connection_name = tvb_get_ephemeral_faked_unicode(tvb, offset+variable_data_size+2, connection_name_size, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_text(cmd_tree, tvb, offset+variable_data_size, connection_name_size+2, "Connection Name: %s", str_connection_name);
|
||||
|
||||
variable_data_size += ((connection_name_size*2)+2);
|
||||
|
|
@ -2953,11 +2944,11 @@ dissect_cip_cco_all_attribute_common( proto_tree *cmd_tree, tvbuff_t *tvb, int o
|
|||
|
||||
/* Proxy Vendor ID */
|
||||
temp_data = tvb_get_letohs( tvb, offset+variable_data_size);
|
||||
proto_tree_add_item(tdi_tree, hf_cip_vendor, tvb, offset+variable_data_size, 2, TRUE);
|
||||
proto_tree_add_item(tdi_tree, hf_cip_vendor, tvb, offset+variable_data_size, 2, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Proxy Device Type */
|
||||
temp_data = tvb_get_letohs( tvb, offset+variable_data_size+2);
|
||||
proto_tree_add_item(tdi_tree, hf_cip_devtype, tvb, offset+variable_data_size+2, 2, TRUE);
|
||||
proto_tree_add_item(tdi_tree, hf_cip_devtype, tvb, offset+variable_data_size+2, 2, ENC_LITTLE_ENDIAN);
|
||||
|
||||
/* Proxy Product Code */
|
||||
temp_data = tvb_get_letohs( tvb, offset+variable_data_size+4);
|
||||
|
|
@ -3193,12 +3184,9 @@ dissect_cip_cco_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item
|
|||
/* Request message */
|
||||
|
||||
/* Add service to info column */
|
||||
if(check_col(pinfo->cinfo, COL_INFO))
|
||||
{
|
||||
col_append_str( pinfo->cinfo, COL_INFO,
|
||||
val_to_str( ( service & 0x7F ),
|
||||
cip_sc_vals_cco , "Unknown Service (0x%02x)") );
|
||||
}
|
||||
col_append_str( pinfo->cinfo, COL_INFO,
|
||||
val_to_str( ( service & 0x7F ),
|
||||
cip_sc_vals_cco , "Unknown Service (0x%02x)") );
|
||||
req_path_size = tvb_get_guint8( tvb, offset+1 )*2;
|
||||
|
||||
/* If there is any command specific data create a sub-tree for it */
|
||||
|
|
@ -3280,7 +3268,7 @@ dissect_cip_class_cco(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
if( tree )
|
||||
{
|
||||
/* Create display subtree for the protocol */
|
||||
ti = proto_tree_add_item(tree, proto_cip_class_cco, tvb, 0, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, proto_cip_class_cco, tvb, 0, -1, ENC_BIG_ENDIAN);
|
||||
class_tree = proto_item_add_subtree( ti, ett_cip_class_cco );
|
||||
|
||||
dissect_cip_cco_data( class_tree, tvb, 0, tvb_length(tvb), pinfo );
|
||||
|
|
@ -3318,7 +3306,7 @@ dissect_cip_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, packet_info
|
|||
p_add_proto_data(pinfo->fd, proto_cip, preq_info);
|
||||
|
||||
/* Create display subtree for the protocol */
|
||||
ti = proto_tree_add_item(item_tree, proto_cip, tvb, 0, -1, FALSE);
|
||||
ti = proto_tree_add_item(item_tree, proto_cip, tvb, 0, -1, ENC_BIG_ENDIAN);
|
||||
cip_tree = proto_item_add_subtree( ti, ett_cip );
|
||||
|
||||
/* Add Service code & Request/Response tree */
|
||||
|
|
@ -3352,12 +3340,9 @@ dissect_cip_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, packet_info
|
|||
cip_gs_vals , "Unknown Response (%x)") );
|
||||
|
||||
/* Add reply status to info column */
|
||||
if(check_col(pinfo->cinfo, COL_INFO))
|
||||
{
|
||||
col_append_str( pinfo->cinfo, COL_INFO,
|
||||
val_to_str( ( tvb_get_guint8( tvb, offset+2 ) ),
|
||||
cip_gs_vals , "Unknown Response (%x)") );
|
||||
}
|
||||
col_append_str( pinfo->cinfo, COL_INFO,
|
||||
val_to_str( ( tvb_get_guint8( tvb, offset+2 ) ),
|
||||
cip_gs_vals , "Unknown Response (%x)") );
|
||||
|
||||
/* Add additional status size */
|
||||
proto_tree_add_text( status_tree, tvb, offset+3, 1, "Additional Status Size: %d (word)",
|
||||
|
|
|
|||
|
|
@ -151,11 +151,10 @@ dissect_sm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "SM");
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "Cisco SM Packet (%s)",
|
||||
val_to_str(sm_message_type, sm_message_type_value_info,"reserved"));
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "Cisco SM Packet (%s)",
|
||||
val_to_str(sm_message_type, sm_message_type_value_info,"reserved"));
|
||||
|
||||
ti = proto_tree_add_item(tree, proto_sm, tvb, offset, 0, FALSE);
|
||||
ti = proto_tree_add_item(tree, proto_sm, tvb, offset, 0, ENC_BIG_ENDIAN);
|
||||
sm_tree = proto_item_add_subtree(ti, ett_sm);
|
||||
|
||||
proto_tree_add_uint_format(sm_tree, hf_sm_sm_msg_type, tvb, offset, 4, sm_message_type,
|
||||
|
|
@ -163,7 +162,7 @@ dissect_sm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
offset = offset + 4;
|
||||
if (sm_message_type == MESSAGE_TYPE_PDU) {
|
||||
proto_tree_add_item(sm_tree, hf_sm_protocol, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(sm_tree, hf_sm_protocol, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
protocol = tvb_get_ntohs(tvb,offset);
|
||||
offset = offset + 2;
|
||||
switch(protocol){
|
||||
|
|
@ -172,7 +171,7 @@ dissect_sm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
if (!tree)
|
||||
return;
|
||||
/* Protocol 0x100/0x122 only contains a length and then an EISUP packet */
|
||||
proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
length = tvb_get_ntohs(tvb,offset);
|
||||
offset = offset + 2;
|
||||
proto_item_set_len(ti, 8);
|
||||
|
|
@ -192,26 +191,26 @@ dissect_sm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
* Protocol stack is RUDP->Cisco SM->SDP.
|
||||
* This implementation is PROPRIETARY
|
||||
*/
|
||||
proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
length = tvb_get_ntohs(tvb,offset);
|
||||
offset = offset + 2;
|
||||
proto_item_set_len(ti, length + offset);
|
||||
/* The next stuff seems to be IP addr */
|
||||
proto_tree_add_item(sm_tree, hf_sm_ip_addr, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(sm_tree, hf_sm_ip_addr, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset = offset + 4;
|
||||
/* This part looks to be the same per session */
|
||||
proto_tree_add_item(sm_tree, hf_sm_context, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(sm_tree, hf_sm_context, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset = offset +4;
|
||||
/* Some sort of message type? */
|
||||
proto_tree_add_item(sm_tree, hf_sm_eisup_msg_id, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(sm_tree, hf_sm_eisup_msg_id, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset = offset + 1;
|
||||
/* XXX Problem are tags 1 or two bytes???*/
|
||||
proto_tree_add_item(sm_tree, hf_sm_tag, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(sm_tree, hf_sm_tag, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
|
||||
tag = tvb_get_ntohs(tvb,offset);
|
||||
offset = offset +2;
|
||||
if (tag== 0x01ac) {
|
||||
proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
length = tvb_get_ntohs(tvb,offset);
|
||||
offset = offset +2;
|
||||
next_tvb = tvb_new_subset(tvb, offset, length, length);
|
||||
|
|
@ -225,25 +224,25 @@ dissect_sm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
if (!tree)
|
||||
return;
|
||||
/* XXX Reveres enginered so this may not be correct!!! */
|
||||
proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
length = tvb_get_ntohs(tvb,offset);
|
||||
offset = offset + 2;
|
||||
proto_item_set_len(ti, length + offset);
|
||||
/* The next stuff seems to be IP addr */
|
||||
proto_tree_add_item(sm_tree, hf_sm_ip_addr, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(sm_tree, hf_sm_ip_addr, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset = offset + 4;
|
||||
proto_tree_add_item(sm_tree, hf_sm_context, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(sm_tree, hf_sm_context, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset = offset +4;
|
||||
/* Some sort of message type? */
|
||||
proto_tree_add_item(sm_tree, hf_sm_eisup_msg_id, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(sm_tree, hf_sm_eisup_msg_id, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset = offset + 1;
|
||||
/* XXX Problem are tags 1 or two bytes???*/
|
||||
proto_tree_add_item(sm_tree, hf_sm_tag, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(sm_tree, hf_sm_tag, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
|
||||
tag = tvb_get_ntohs(tvb,offset);
|
||||
offset = offset +2;
|
||||
if (tag== 0x01ac) {
|
||||
proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
length = tvb_get_ntohs(tvb,offset);
|
||||
offset = offset +2;
|
||||
next_tvb = tvb_new_subset(tvb, offset, length, length);
|
||||
|
|
@ -253,7 +252,7 @@ dissect_sm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
}
|
||||
break;
|
||||
default:
|
||||
proto_tree_add_item(sm_tree, hf_sm_msg_id, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(sm_tree, hf_sm_msg_id, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset = offset +2;
|
||||
msg_type = tvb_get_ntohs(tvb,offset);
|
||||
proto_tree_add_uint_format(sm_tree, hf_sm_msg_type, tvb, offset, 2, msg_type,
|
||||
|
|
@ -261,11 +260,11 @@ dissect_sm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
msg_type);
|
||||
msg_type = tvb_get_ntohs(tvb,offset);
|
||||
offset = offset + 2;
|
||||
proto_tree_add_item(sm_tree, hf_sm_channel, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(sm_tree, hf_sm_channel, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset = offset + 2;
|
||||
proto_tree_add_item(sm_tree, hf_sm_bearer, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(sm_tree, hf_sm_bearer, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset = offset +2;
|
||||
proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
length = tvb_get_ntohs(tvb,offset);
|
||||
offset = offset +2;
|
||||
proto_item_set_len(ti, 16);
|
||||
|
|
|
|||
|
|
@ -122,11 +122,9 @@ dissect_cwids(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
*/
|
||||
pinfo->private_data = pd_save;
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO)) {
|
||||
col_append_str(pinfo->cinfo, COL_INFO,
|
||||
" [Malformed or short IEEE80211 subpacket] " );
|
||||
col_set_fence(pinfo->cinfo, COL_INFO);
|
||||
}
|
||||
col_append_str(pinfo->cinfo, COL_INFO,
|
||||
" [Malformed or short IEEE80211 subpacket] " );
|
||||
col_set_fence(pinfo->cinfo, COL_INFO);
|
||||
#if 0
|
||||
wlan_tvb = tvb_new_subset(tvb, offset, capturelen, capturelen);
|
||||
/* FIXME: Why does this throw an exception? */
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
if (cnf_proto_id == NLPID_NULL) {
|
||||
col_set_str(pinfo->cinfo, COL_INFO, "Inactive subset");
|
||||
if (tree) {
|
||||
ti = proto_tree_add_item(tree, proto_clnp, tvb, P_CLNP_PROTO_ID, 1, FALSE);
|
||||
ti = proto_tree_add_item(tree, proto_clnp, tvb, P_CLNP_PROTO_ID, 1, ENC_BIG_ENDIAN);
|
||||
clnp_tree = proto_item_add_subtree(ti, ett_clnp);
|
||||
proto_tree_add_uint_format(clnp_tree, hf_clnp_id, tvb, P_CLNP_PROTO_ID, 1,
|
||||
cnf_proto_id,
|
||||
|
|
@ -247,7 +247,7 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
opt_len = cnf_hdr_len;
|
||||
|
||||
if (tree) {
|
||||
ti = proto_tree_add_item(tree, proto_clnp, tvb, 0, cnf_hdr_len, FALSE);
|
||||
ti = proto_tree_add_item(tree, proto_clnp, tvb, 0, cnf_hdr_len, ENC_BIG_ENDIAN);
|
||||
clnp_tree = proto_item_add_subtree(ti, ett_clnp);
|
||||
proto_tree_add_uint(clnp_tree, hf_clnp_id, tvb, P_CLNP_PROTO_ID, 1,
|
||||
cnf_proto_id);
|
||||
|
|
@ -303,8 +303,7 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
we set it otherwise. */
|
||||
|
||||
if (tvb_length(tvb) < cnf_hdr_len) {
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "%s NPDU %s", pdu_type_string, flag_string);
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "%s NPDU %s", pdu_type_string, flag_string);
|
||||
}
|
||||
|
||||
segment_length = tvb_get_ntohs(tvb, P_CLNP_SEGLEN);
|
||||
|
|
@ -472,9 +471,8 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
if (next_tvb == NULL) {
|
||||
/* Just show this as a segment. */
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "Fragmented %s NPDU %s(off=%u)",
|
||||
pdu_type_string, flag_string, segment_offset);
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "Fragmented %s NPDU %s(off=%u)",
|
||||
pdu_type_string, flag_string, segment_offset);
|
||||
|
||||
/* As we haven't reassembled anything, we haven't changed "pi", so
|
||||
we don't have to restore it. */
|
||||
|
|
@ -511,8 +509,8 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
/* The payload is the header and "none, some, or all of the data
|
||||
part of the discarded PDU", i.e. it's like an ICMP error;
|
||||
dissect it as a CLNP PDU. */
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "%s NPDU %s", pdu_type_string, flag_string);
|
||||
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "%s NPDU %s", pdu_type_string, flag_string);
|
||||
next_length = tvb_length_remaining(tvb, offset);
|
||||
if (next_length != 0) {
|
||||
/* We have payload; dissect it. */
|
||||
|
|
@ -541,8 +539,7 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
break;
|
||||
}
|
||||
}
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "%s NPDU %s", pdu_type_string, flag_string);
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "%s NPDU %s", pdu_type_string, flag_string);
|
||||
call_dissector(data_handle,next_tvb, pinfo, tree);
|
||||
pinfo->fragmented = save_fragmented;
|
||||
} /* dissect_clnp */
|
||||
|
|
|
|||
|
|
@ -350,7 +350,7 @@ cmpp_msg_id(proto_tree *tree, tvbuff_t *tvb, gint field, gint offset)
|
|||
proto_tree *sub_tree;
|
||||
char *strval;
|
||||
|
||||
pi = proto_tree_add_item(tree, field, tvb, offset, 8, FALSE);
|
||||
pi = proto_tree_add_item(tree, field, tvb, offset, 8, ENC_BIG_ENDIAN);
|
||||
sub_tree = proto_item_add_subtree(pi, ett_msg_id);
|
||||
|
||||
month = (tvb_get_guint8(tvb, offset) & 0xF0) >> 4;
|
||||
|
|
@ -475,7 +475,7 @@ cmpp_deliver_report(proto_tree *tree, tvbuff_t *tvb, gint field, guint offset)
|
|||
proto_item *pi;
|
||||
proto_tree *sub_tree;
|
||||
|
||||
pi = proto_tree_add_item(tree, field, tvb, offset, CMPP_DELIVER_REPORT_LEN, FALSE);
|
||||
pi = proto_tree_add_item(tree, field, tvb, offset, CMPP_DELIVER_REPORT_LEN, ENC_BIG_ENDIAN);
|
||||
sub_tree = proto_item_add_subtree(pi, ett_deliver_report);
|
||||
cmpp_msg_id(sub_tree, tvb, hf_cmpp_msg_id, offset);
|
||||
offset += 8;
|
||||
|
|
@ -576,14 +576,11 @@ dissect_cmpp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
/* Make entries in Protocol column and Info column on summary display */
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMPP");
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
{
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "%s. ", command_str);
|
||||
}
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "%s. ", command_str);
|
||||
|
||||
if (tree)
|
||||
{
|
||||
ti = proto_tree_add_item(tree, proto_cmpp, tvb, 0, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, proto_cmpp, tvb, 0, -1, ENC_BIG_ENDIAN);
|
||||
|
||||
cmpp_tree = proto_item_add_subtree(ti, ett_cmpp);
|
||||
|
||||
|
|
|
|||
|
|
@ -89,12 +89,9 @@ static void dissect_cnip (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
type = tvb_get_guint8(tvb, 3);
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
{
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO,"Priority: %s Type: %s",
|
||||
(pinfo->destport == 1629 )? "urgent":"normal",
|
||||
val_to_str_const(type, type_tuple, "Unknown"));
|
||||
}
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO,"Priority: %s Type: %s",
|
||||
(pinfo->destport == 1629 )? "urgent":"normal",
|
||||
val_to_str_const(type, type_tuple, "Unknown"));
|
||||
|
||||
exth_len = tvb_get_guint8(tvb, 4);
|
||||
pf_pcode = tvb_get_guint8(tvb, 5) & 0x1F;
|
||||
|
|
@ -103,19 +100,19 @@ static void dissect_cnip (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
offset = 0;
|
||||
|
||||
/* Take whole packet for now, we'll adjust it later */
|
||||
ti = proto_tree_add_item(tree, proto_cnip, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, proto_cnip, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cnip_tree = proto_item_add_subtree(ti, ett_cnip);
|
||||
|
||||
proto_tree_add_item(cnip_tree, hf_cnip_len, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(cnip_tree, hf_cnip_len, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
proto_tree_add_item(cnip_tree, hf_cnip_ver, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cnip_tree, hf_cnip_ver, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cnip_tree, hf_cnip_type, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cnip_tree, hf_cnip_type, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cnip_tree, hf_cnip_exth, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(cnip_tree, hf_cnip_exth, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1;
|
||||
|
||||
{
|
||||
|
|
@ -125,20 +122,20 @@ static void dissect_cnip (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
NULL
|
||||
};
|
||||
proto_tree_add_bitmask(cnip_tree, tvb, offset, hf_cnip_pf,
|
||||
ett_pf, pf_fields, FALSE);
|
||||
ett_pf, pf_fields, ENC_BIG_ENDIAN);
|
||||
}
|
||||
offset += 1;
|
||||
|
||||
proto_tree_add_item(cnip_tree, hf_cnip_vcode, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(cnip_tree, hf_cnip_vcode, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
proto_tree_add_item(cnip_tree, hf_cnip_sessid, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cnip_tree, hf_cnip_sessid, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
|
||||
proto_tree_add_item(cnip_tree, hf_cnip_seqno, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cnip_tree, hf_cnip_seqno, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
|
||||
proto_tree_add_item(cnip_tree, hf_cnip_tstamp, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(cnip_tree, hf_cnip_tstamp, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
|
||||
/* Jump over any unknown header extensions */
|
||||
|
|
|
|||
|
|
@ -139,11 +139,11 @@ static const value_string message_type_values[] = {
|
|||
static void
|
||||
dissect_componentstatusprotocol_componentassociation_message(tvbuff_t *message_tvb, proto_tree *message_tree)
|
||||
{
|
||||
proto_tree_add_item(message_tree, hf_componentassociation_receiverid, message_tvb, COMPONENTASSOCIATION_RECEIVERID_OFFSET, COMPONENTASSOCIATION_RECEIVERID_LENGTH, FALSE);
|
||||
proto_tree_add_item(message_tree, hf_componentassociation_duration, message_tvb, COMPONENTASSOCIATION_DURATION_OFFSET, COMPONENTASSOCIATION_DURATION_LENGTH, FALSE);
|
||||
proto_tree_add_item(message_tree, hf_componentassociation_flags, message_tvb, COMPONENTASSOCIATION_FLAGS_OFFSET, COMPONENTASSOCIATION_FLAGS_LENGTH, FALSE);
|
||||
proto_tree_add_item(message_tree, hf_componentassociation_protocolid, message_tvb, COMPONENTASSOCIATION_PROTOCOLID_OFFSET, COMPONENTASSOCIATION_PROTOCOLID_LENGTH, FALSE);
|
||||
proto_tree_add_item(message_tree, hf_componentassociation_ppid, message_tvb, COMPONENTASSOCIATION_PPID_OFFSET, COMPONENTASSOCIATION_PPID_LENGTH, FALSE);
|
||||
proto_tree_add_item(message_tree, hf_componentassociation_receiverid, message_tvb, COMPONENTASSOCIATION_RECEIVERID_OFFSET, COMPONENTASSOCIATION_RECEIVERID_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(message_tree, hf_componentassociation_duration, message_tvb, COMPONENTASSOCIATION_DURATION_OFFSET, COMPONENTASSOCIATION_DURATION_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(message_tree, hf_componentassociation_flags, message_tvb, COMPONENTASSOCIATION_FLAGS_OFFSET, COMPONENTASSOCIATION_FLAGS_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(message_tree, hf_componentassociation_protocolid, message_tvb, COMPONENTASSOCIATION_PROTOCOLID_OFFSET, COMPONENTASSOCIATION_PROTOCOLID_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(message_tree, hf_componentassociation_ppid, message_tvb, COMPONENTASSOCIATION_PPID_OFFSET, COMPONENTASSOCIATION_PPID_LENGTH, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -157,11 +157,11 @@ dissect_componentstatusprotocol_componentstatusreport_message(tvbuff_t *message_
|
|||
int i;
|
||||
gint offset;
|
||||
|
||||
proto_tree_add_item(message_tree, hf_componentstatusreport_reportinterval, message_tvb, COMPONENTSTATUSREPORT_REPORTINTERVAL_OFFSET, COMPONENTSTATUSREPORT_REPORTINTERVAL_LENGTH, FALSE);
|
||||
proto_tree_add_item(message_tree, hf_componentstatusreport_location, message_tvb, COMPONENTSTATUSREPORT_LOCATION_OFFSET, COMPONENTSTATUSREPORT_LOCATION_LENGTH, FALSE);
|
||||
proto_tree_add_item(message_tree, hf_componentstatusreport_status, message_tvb, COMPONENTSTATUSREPORT_STATUS_OFFSET, COMPONENTSTATUSREPORT_STATUS_LENGTH, FALSE);
|
||||
proto_tree_add_item(message_tree, hf_componentstatusreport_workload, message_tvb, COMPONENTSTATUSREPORT_WORKLOAD_OFFSET, COMPONENTSTATUSREPORT_WORKLOAD_LENGTH, FALSE);
|
||||
proto_tree_add_item(message_tree, hf_componentstatusreport_associations, message_tvb, COMPONENTSTATUSREPORT_ASSOCIATIONS_OFFSET, COMPONENTSTATUSREPORT_ASSOCIATIONS_LENGTH, FALSE);
|
||||
proto_tree_add_item(message_tree, hf_componentstatusreport_reportinterval, message_tvb, COMPONENTSTATUSREPORT_REPORTINTERVAL_OFFSET, COMPONENTSTATUSREPORT_REPORTINTERVAL_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(message_tree, hf_componentstatusreport_location, message_tvb, COMPONENTSTATUSREPORT_LOCATION_OFFSET, COMPONENTSTATUSREPORT_LOCATION_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(message_tree, hf_componentstatusreport_status, message_tvb, COMPONENTSTATUSREPORT_STATUS_OFFSET, COMPONENTSTATUSREPORT_STATUS_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(message_tree, hf_componentstatusreport_workload, message_tvb, COMPONENTSTATUSREPORT_WORKLOAD_OFFSET, COMPONENTSTATUSREPORT_WORKLOAD_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(message_tree, hf_componentstatusreport_associations, message_tvb, COMPONENTSTATUSREPORT_ASSOCIATIONS_OFFSET, COMPONENTSTATUSREPORT_ASSOCIATIONS_LENGTH, ENC_BIG_ENDIAN);
|
||||
|
||||
/* associations = tvb_get_ntohs(message_tvb, COMPONENTSTATUSREPORT_ASSOCIATIONS_OFFSET); */
|
||||
offset = COMPONENTSTATUSREPORT_ASSOCIATIONARRAY_OFFSET;
|
||||
|
|
@ -186,15 +186,13 @@ dissect_componentstatusprotocol_message(tvbuff_t *message_tvb, packet_info *pinf
|
|||
guint8 type;
|
||||
|
||||
type = tvb_get_guint8(message_tvb, MESSAGE_TYPE_OFFSET);
|
||||
if (pinfo && (check_col(pinfo->cinfo, COL_INFO))) {
|
||||
col_add_str(pinfo->cinfo, COL_INFO, val_to_str(type, message_type_values, "Unknown ComponentStatusProtocol type"));
|
||||
}
|
||||
proto_tree_add_item(componentstatusprotocol_tree, hf_message_type, message_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, FALSE);
|
||||
proto_tree_add_item(componentstatusprotocol_tree, hf_message_flags, message_tvb, MESSAGE_FLAGS_OFFSET, MESSAGE_FLAGS_LENGTH, FALSE);
|
||||
proto_tree_add_item(componentstatusprotocol_tree, hf_message_length, message_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, FALSE);
|
||||
proto_tree_add_item(componentstatusprotocol_tree, hf_message_version, message_tvb, MESSAGE_VERSION_OFFSET, MESSAGE_VERSION_LENGTH, FALSE);
|
||||
proto_tree_add_item(componentstatusprotocol_tree, hf_message_senderid, message_tvb, MESSAGE_SENDERID_OFFSET, MESSAGE_SENDERID_LENGTH, FALSE);
|
||||
proto_tree_add_item(componentstatusprotocol_tree, hf_message_sendertimestamp, message_tvb, MESSAGE_SENDERTIMESTAMP_OFFSET, MESSAGE_SENDERTIMESTAMP_LENGTH, FALSE);
|
||||
col_add_str(pinfo->cinfo, COL_INFO, val_to_str(type, message_type_values, "Unknown ComponentStatusProtocol type"));
|
||||
proto_tree_add_item(componentstatusprotocol_tree, hf_message_type, message_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(componentstatusprotocol_tree, hf_message_flags, message_tvb, MESSAGE_FLAGS_OFFSET, MESSAGE_FLAGS_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(componentstatusprotocol_tree, hf_message_length, message_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(componentstatusprotocol_tree, hf_message_version, message_tvb, MESSAGE_VERSION_OFFSET, MESSAGE_VERSION_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(componentstatusprotocol_tree, hf_message_senderid, message_tvb, MESSAGE_SENDERID_OFFSET, MESSAGE_SENDERID_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(componentstatusprotocol_tree, hf_message_sendertimestamp, message_tvb, MESSAGE_SENDERTIMESTAMP_OFFSET, MESSAGE_SENDERTIMESTAMP_LENGTH, ENC_BIG_ENDIAN);
|
||||
switch (type) {
|
||||
case COMPONENTSTATUS_COMPONENTSTATUSREPORT_MESSAGE_TYPE:
|
||||
dissect_componentstatusprotocol_componentstatusreport_message(message_tvb, componentstatusprotocol_tree);
|
||||
|
|
@ -232,7 +230,7 @@ dissect_componentstatusprotocol(tvbuff_t *message_tvb, packet_info *pinfo, proto
|
|||
necessary to generate protocol tree items. */
|
||||
if (tree) {
|
||||
/* create the componentstatusprotocol protocol tree */
|
||||
componentstatusprotocol_item = proto_tree_add_item(tree, proto_componentstatusprotocol, message_tvb, 0, -1, FALSE);
|
||||
componentstatusprotocol_item = proto_tree_add_item(tree, proto_componentstatusprotocol, message_tvb, 0, -1, ENC_BIG_ENDIAN);
|
||||
componentstatusprotocol_tree = proto_item_add_subtree(componentstatusprotocol_item, ett_componentstatusprotocol);
|
||||
} else {
|
||||
componentstatusprotocol_tree = NULL;
|
||||
|
|
|
|||
|
|
@ -271,18 +271,18 @@ dissect_cpfi_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
}
|
||||
|
||||
/* add word 1 components to the protocol tree */
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_word_one , tvb, 0, 4, FALSE);
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_word_one , tvb, 0, 4, ENC_BIG_ENDIAN);
|
||||
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_frame_type, tvb, 0, 4, FALSE);
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_source , tvb, 0, 4, FALSE);
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_dest , tvb, 0, 4, FALSE);
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_SOF_type , tvb, 0, 4, FALSE);
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_speed , tvb, 0, 4, FALSE);
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_OPM_error , tvb, 0, 4, FALSE);
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_from_LCM , tvb, 0, 4, FALSE);
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_frame_type, tvb, 0, 4, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_source , tvb, 0, 4, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_dest , tvb, 0, 4, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_SOF_type , tvb, 0, 4, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_speed , tvb, 0, 4, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_OPM_error , tvb, 0, 4, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_from_LCM , tvb, 0, 4, ENC_BIG_ENDIAN);
|
||||
|
||||
/* add word 2 components to the protocol tree */
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_word_two , tvb, 4, 4, FALSE);
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_word_two , tvb, 4, 4, ENC_BIG_ENDIAN);
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -301,8 +301,8 @@ dissect_cpfi_footer(tvbuff_t *tvb, proto_tree *tree)
|
|||
}
|
||||
|
||||
if (extra_tree) {
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_CRC_32 , tvb, 0, 4, FALSE);
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_EOF_type, tvb, 4, 4, FALSE);
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_CRC_32 , tvb, 0, 4, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(extra_tree, hf_cpfi_EOF_type, tvb, 4, 4, ENC_BIG_ENDIAN);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -354,7 +354,7 @@ dissect_cpfi(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree)
|
|||
necessary to generate protocol tree items. */
|
||||
if (tree) {
|
||||
/* create the protocol tree */
|
||||
cpfi_item = proto_tree_add_item(tree, proto_cpfi, message_tvb, 0, -1, FALSE);
|
||||
cpfi_item = proto_tree_add_item(tree, proto_cpfi, message_tvb, 0, -1, ENC_BIG_ENDIAN);
|
||||
cpfi_tree = proto_item_add_subtree(cpfi_item, ett_cpfi);
|
||||
}
|
||||
|
||||
|
|
@ -375,10 +375,7 @@ dissect_cpfi(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
/* add more info, now that FC added it's */
|
||||
proto_item_append_text(cpfi_item, direction_and_port_string, left, arrow, right);
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
{
|
||||
col_prepend_fstr(pinfo->cinfo, COL_INFO, direction_and_port_string, left, arrow, right);
|
||||
}
|
||||
col_prepend_fstr(pinfo->cinfo, COL_INFO, direction_and_port_string, left, arrow, right);
|
||||
|
||||
/* Do the footer */
|
||||
footer_tvb = tvb_new_subset(message_tvb, 8+body_length, length, 8);
|
||||
|
|
|
|||
|
|
@ -225,12 +225,11 @@ dissect_cpha(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
hdr.filler = g_ntohs(hdr.filler);
|
||||
opcode = g_ntohs(hdr.opcode);
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "CPHAv%d: %s",
|
||||
hdr.ha_protocol_ver, opcode2str_short(opcode));
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "CPHAv%d: %s",
|
||||
hdr.ha_protocol_ver, opcode2str_short(opcode));
|
||||
|
||||
if (tree) {
|
||||
ti = proto_tree_add_item(tree, proto_cphap, tvb, offset, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, proto_cphap, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
cpha_tree = proto_item_add_subtree(ti, ett_cphap);
|
||||
}
|
||||
if (tree) {
|
||||
|
|
|
|||
|
|
@ -240,38 +240,36 @@ dissect_csm_encaps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CSM_ENCAPS");
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO)) {
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
|
||||
if (CSM_ENCAPS_CTRL_ACK&control)
|
||||
{
|
||||
if (CSM_ENCAPS_CTRL_ACK_TO_HOST&control)
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "<-- ACK Ch: 0x%04X, Seq: %2d (To Host)", channel, sequence);
|
||||
else
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "--> ACK Ch: 0x%04X, Seq: %2d (From Host)", channel, sequence);
|
||||
}
|
||||
if (CSM_ENCAPS_CTRL_ACK&control)
|
||||
{
|
||||
if (CSM_ENCAPS_CTRL_ACK_TO_HOST&control)
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "<-- ACK Ch: 0x%04X, Seq: %2d (To Host)", channel, sequence);
|
||||
else
|
||||
{
|
||||
str_function_name= csm_fc(function_code, class_type);
|
||||
if ((type == CSM_ENCAPS_TYPE_RESPONSE) || (csm_to_host(function_code, class_type)))
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "<-- %-35s Ch: 0x%04X, Seq: %2d (To Host)", str_function_name, channel, sequence);
|
||||
else
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "--> %-35s Ch: 0x%04X, Seq: %2d (From Host)", str_function_name, channel, sequence);
|
||||
g_free(str_function_name);
|
||||
}
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "--> ACK Ch: 0x%04X, Seq: %2d (From Host)", channel, sequence);
|
||||
}
|
||||
else
|
||||
{
|
||||
str_function_name= csm_fc(function_code, class_type);
|
||||
if ((type == CSM_ENCAPS_TYPE_RESPONSE) || (csm_to_host(function_code, class_type)))
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "<-- %-35s Ch: 0x%04X, Seq: %2d (To Host)", str_function_name, channel, sequence);
|
||||
else
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "--> %-35s Ch: 0x%04X, Seq: %2d (From Host)", str_function_name, channel, sequence);
|
||||
g_free(str_function_name);
|
||||
}
|
||||
|
||||
|
||||
if (tree) {
|
||||
ti = proto_tree_add_item(tree, proto_csm_encaps, tvb, 0, -1, FALSE);
|
||||
ti = proto_tree_add_item(tree, proto_csm_encaps, tvb, 0, -1, ENC_BIG_ENDIAN);
|
||||
csm_encaps_tree = proto_item_add_subtree(ti, ett_csm_encaps);
|
||||
|
||||
|
||||
|
||||
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_opcode, tvb, 0, 2, FALSE);
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_seq, tvb, 2, 1, FALSE);
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_opcode, tvb, 0, 2, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_seq, tvb, 2, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
subitem = proto_tree_add_uint(csm_encaps_tree, hf_csm_encaps_ctrl, tvb, 3, 1, control);
|
||||
csm_encaps_control_tree = proto_item_add_subtree(subitem, ett_csm_encaps_control);
|
||||
|
|
@ -280,66 +278,66 @@ dissect_csm_encaps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
proto_tree_add_boolean(csm_encaps_control_tree, hf_csm_encaps_ctrl_ack_suppress, tvb, 3, 1, control);
|
||||
proto_tree_add_boolean(csm_encaps_control_tree, hf_csm_encaps_ctrl_endian, tvb, 3, 1, control);
|
||||
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_channel, tvb, 4, 2, FALSE);
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_length, tvb, 6, 1, FALSE);
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_index, tvb, 7, 1, FALSE);
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_class, tvb, 9, 1, FALSE);
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_type, tvb, 8, 1, FALSE);
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_function_code, tvb, 10, 2, TRUE);
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_channel, tvb, 4, 2, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_length, tvb, 6, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_index, tvb, 7, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_class, tvb, 9, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_type, tvb, 8, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_function_code, tvb, 10, 2, ENC_LITTLE_ENDIAN);
|
||||
|
||||
i=6;
|
||||
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_reserved, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_reserved, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length)
|
||||
{
|
||||
if (show_error_param)
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param_error, tvb, 12 + i-6, 2, TRUE);
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param_error, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN);
|
||||
else
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param1, tvb, 12 + i-6, 2, TRUE);
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param1, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN);
|
||||
i+=2;
|
||||
}
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param2, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param3, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param4, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param5, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param6, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param7, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param8, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param9, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param10, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param11, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param12, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param13, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param14, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param15, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param16, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param17, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param18, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param19, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param20, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param21, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param22, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param23, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param24, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param25, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param26, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param27, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param28, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param29, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param30, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param31, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param32, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param33, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param34, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param35, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param36, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param37, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param38, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param39, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param40, tvb, 12 + i-6, 2, TRUE); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param2, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param3, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param4, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param5, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param6, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param7, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param8, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param9, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param10, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param11, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param12, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param13, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param14, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param15, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param16, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param17, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param18, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param19, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param20, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param21, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param22, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param23, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param24, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param25, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param26, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param27, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param28, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param29, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param30, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param31, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param32, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param33, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param34, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param35, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param36, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param37, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param38, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param39, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
if (i<length) proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param40, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN); i+=2;
|
||||
|
||||
for (; i<length; i+=2)
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param, tvb, 12 + i-6, 2, TRUE);
|
||||
proto_tree_add_item(csm_encaps_tree, hf_csm_encaps_param, tvb, 12 + i-6, 2, ENC_LITTLE_ENDIAN);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -256,9 +256,7 @@ static int dissect_control_get_recmaster_reply(packet_info *pinfo, proto_tree *t
|
|||
{
|
||||
proto_tree_add_uint(tree, hf_ctdb_recmaster, tvb, 0, 0, status);
|
||||
|
||||
if(check_col(pinfo->cinfo, COL_INFO)){
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, " RecMaster:%d", status);
|
||||
}
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, " RecMaster:%d", status);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -273,10 +271,8 @@ static int dissect_control_get_recmode_reply(packet_info *pinfo, proto_tree *tre
|
|||
{
|
||||
proto_tree_add_uint(tree, hf_ctdb_recmode, tvb, 0, 0, status);
|
||||
|
||||
if(check_col(pinfo->cinfo, COL_INFO)){
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, " RecMode:%s",
|
||||
val_to_str(status, recmode_vals, "Unknown:%d"));
|
||||
}
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, " RecMode:%s",
|
||||
val_to_str(status, recmode_vals, "Unknown:%d"));
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -304,7 +300,7 @@ static int dissect_control_get_nodemap_reply(packet_info *pinfo _U_, proto_tree
|
|||
offset+=4;
|
||||
|
||||
/* here comes a sockaddr_in but we only store ipv4 addresses in it */
|
||||
proto_tree_add_item(tree, hf_ctdb_node_ip, tvb, offset+4, 4, FALSE);
|
||||
proto_tree_add_item(tree, hf_ctdb_node_ip, tvb, offset+4, 4, ENC_BIG_ENDIAN);
|
||||
offset+=16;
|
||||
}
|
||||
|
||||
|
|
@ -324,9 +320,7 @@ static int dissect_control_process_exist_request(packet_info *pinfo, proto_tree
|
|||
}
|
||||
offset+=4;
|
||||
|
||||
if(check_col(pinfo->cinfo, COL_INFO)){
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, " pid:%d", pid);
|
||||
}
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, " pid:%d", pid);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -711,11 +705,9 @@ dissect_ctdb_req_control(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot
|
|||
}
|
||||
offset+=4;
|
||||
|
||||
if(check_col(pinfo->cinfo, COL_INFO)){
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "%s Request %d->%d",
|
||||
val_to_str(opcode, ctrl_opcode_vals, "Unknown:%d"),
|
||||
src, dst);
|
||||
}
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "%s Request %d->%d",
|
||||
val_to_str(opcode, ctrl_opcode_vals, "Unknown:%d"),
|
||||
src, dst);
|
||||
|
||||
/* srvid */
|
||||
offset=(offset+7)&0xfffff8; /* fixup alignment*/
|
||||
|
|
@ -819,11 +811,9 @@ dissect_ctdb_reply_control(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr
|
|||
item=proto_tree_add_uint(tree, hf_ctdb_ctrl_opcode, tvb, 0, 0, ctdb_control->opcode);
|
||||
PROTO_ITEM_SET_GENERATED(item);
|
||||
|
||||
if(check_col(pinfo->cinfo, COL_INFO)){
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "%s Reply %d->%d",
|
||||
val_to_str(ctdb_control->opcode, ctrl_opcode_vals, "Unknown:%d"),
|
||||
src, dst);
|
||||
}
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "%s Reply %d->%d",
|
||||
val_to_str(ctdb_control->opcode, ctrl_opcode_vals, "Unknown:%d"),
|
||||
src, dst);
|
||||
|
||||
|
||||
/* status */
|
||||
|
|
@ -1059,11 +1049,9 @@ dissect_ctdb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
}
|
||||
offset+=4;
|
||||
|
||||
if(check_col(pinfo->cinfo, COL_INFO)){
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "%s %d->%d",
|
||||
val_to_str(opcode, ctdb_opcodes, "Unknown:%d"),
|
||||
src, dst);
|
||||
}
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "%s %d->%d",
|
||||
val_to_str(opcode, ctdb_opcodes, "Unknown:%d"),
|
||||
src, dst);
|
||||
|
||||
switch(opcode){
|
||||
case CTDB_REQ_CALL:
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ dissect_cups(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
if (tree) {
|
||||
ti = proto_tree_add_item(tree, proto_cups, tvb, offset, -1,
|
||||
FALSE);
|
||||
ENC_BIG_ENDIAN);
|
||||
cups_tree = proto_item_add_subtree(ti, ett_cups);
|
||||
}
|
||||
|
||||
|
|
@ -215,11 +215,10 @@ dissect_cups(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
proto_tree_add_text(cups_tree, tvb, offset, len,
|
||||
"URI: %.*s",
|
||||
(guint16) len, str);
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO,
|
||||
"%.*s (%s)",
|
||||
(guint16) len, str,
|
||||
val_to_str(state, cups_state_values, "0x%x"));
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO,
|
||||
"%.*s (%s)",
|
||||
(guint16) len, str,
|
||||
val_to_str(state, cups_state_values, "0x%x"));
|
||||
offset = next_offset;
|
||||
|
||||
if (!cups_tree)
|
||||
|
|
|
|||
Loading…
Reference in New Issue