forked from osmocom/wireshark
Convert 'encoding' parameter of certain proto_tree_add_item() calls in asn1 dissectors:
Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as the encoding parameter for proto_tree_add_item() calls which directly reference an item in hf[] which has a type of: FT_UINT8 FT_UINT16 FT_UINT24 FT_UINT32 FT_UINT64 FT_INT8 FT_INT16 FT_INT24 FT_INT32 FT_INT64 FT_FLOAT FT_DOUBLE svn path=/trunk/; revision=39294
This commit is contained in:
parent
594f1efcdd
commit
e2996ceabe
|
@ -734,11 +734,11 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
|
|||
subtree = proto_item_add_subtree(actx->created_item, ett_digitstype);
|
||||
|
||||
/* Octet 1 */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_type_of_digits, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_type_of_digits, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* Octet 2 */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitHG, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_si, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitHG, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_si, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitD, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_navail, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_pi, tvb, offset, 1, FALSE);
|
||||
|
@ -746,8 +746,8 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
|
|||
offset++;
|
||||
/* Octet 3 */
|
||||
octet = tvb_get_guint8(tvb,offset);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_np, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_digits_enc, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_np, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_digits_enc, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* Octet 4 - */
|
||||
switch(octet>>4){
|
||||
|
@ -756,7 +756,7 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
|
|||
case 1:
|
||||
/* BCD Coding */
|
||||
octet_len = tvb_get_guint8(tvb,offset);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_nr_digits, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_nr_digits, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
if(octet_len == 0)
|
||||
return;
|
||||
offset++;
|
||||
|
@ -767,7 +767,7 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
|
|||
case 2:
|
||||
/* IA5 Coding */
|
||||
octet_len = tvb_get_guint8(tvb,offset);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_nr_digits, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_nr_digits, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
if(octet_len == 0)
|
||||
return;
|
||||
offset++;
|
||||
|
@ -791,7 +791,7 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
|
|||
case 6:/* Land Mobile Numbering (ITU-T Rec. E.212) */
|
||||
case 7:/* Private Numbering Plan */
|
||||
octet_len = tvb_get_guint8(tvb,offset);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_nr_digits, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_nr_digits, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
if(octet_len == 0)
|
||||
return;
|
||||
offset++;
|
||||
|
@ -873,7 +873,7 @@ dissect_ansi_map_subaddress(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
/* Type of Subaddress (octet 1, bits E-G) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_subaddr_type, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_subaddr_type, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Odd/Even Indicator (O/E) (octet 1, bit D) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_subaddr_odd_even, tvb, offset, 1, FALSE);
|
||||
|
||||
|
@ -971,13 +971,13 @@ dissect_ansi_map_alertcode(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
/* Pitch (octet 1, bits G-H) */
|
||||
proto_tree_add_item(subtree, hf_ansi_alertcode_pitch, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_alertcode_pitch, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Cadence (octet 1, bits A-F) */
|
||||
proto_tree_add_item(subtree, hf_ansi_alertcode_cadence, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_alertcode_cadence, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
|
||||
/* Alert Action (octet 2, bits A-C) */
|
||||
proto_tree_add_item(subtree, hf_ansi_alertcode_alertaction, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_alertcode_alertaction, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
/* 6.5.2.4 AlertResult */
|
||||
|
@ -1127,20 +1127,20 @@ dissect_ansi_map_announcementcode(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
|
|||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
|
||||
/* Tone (octet 1) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_announcementcode_tone, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_announcementcode_tone, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* Class (octet 2, bits A-D) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_announcementcode_class, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_announcementcode_class, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* Standard Announcement (octet 3) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_announcementcode_std_ann, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_announcementcode_std_ann, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* Custom Announcement ( octet 4 )
|
||||
e. The assignment of this octet is left to bilateral agreement. When a Custom
|
||||
Announcement is specified it takes precedence over either the Standard
|
||||
Announcement or Tone
|
||||
*/
|
||||
proto_tree_add_item(subtree, hf_ansi_map_announcementcode_cust_ann, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_announcementcode_cust_ann, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
/* 6.5.2.8 AuthenticationCapability Updated N.S0003*/
|
||||
|
@ -1181,9 +1181,9 @@ dissect_ansi_map_authorizationperiod(tvbuff_t *tvb, packet_info *pinfo _U_, prot
|
|||
|
||||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_authorizationperiod_period, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_authorizationperiod_period, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_value, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_value, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
/* 6.5.2.15 AvailabilityType */
|
||||
|
@ -1204,14 +1204,14 @@ dissect_ansi_map_billingid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
|
||||
proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset = offset + 2;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* ID Number */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_idno, tvb, offset, 3, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_idno, tvb, offset, 3, ENC_BIG_ENDIAN);
|
||||
offset = offset + 3;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_segcount, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_segcount, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
|
||||
|
@ -1262,46 +1262,46 @@ dissect_ansi_map_callingfeaturesindicator(tvbuff_t *tvb, packet_info *pinfo _U_,
|
|||
|
||||
|
||||
/* Calling Number Identification Restriction Override FeatureActivity CNIROver-FA (Octet 3 bits GH ) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cniroverfa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cniroverfa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Calling Number Identification Restriction: FeatureActivity CNIR-FA (Octet 3 bits EF ) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cnirfa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cnirfa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Calling Number Identification Presentation: FeatureActivity CNIP2-FA (Octet 3 bits CD ) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cnip2fa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cnip2fa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Calling Number Identification Presentation: FeatureActivity CNIP1-FA (Octet 3 bits AB ) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cnip1fa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cnip1fa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
length--;
|
||||
if ( length == 0)
|
||||
return;
|
||||
offset++;
|
||||
|
||||
/* USCF divert to voice mail: FeatureActivity USCFvm-FA (Octet 4 bits GH ) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_uscfvmfa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_uscfvmfa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Answer Hold: FeatureActivity AH-FA (Octet 4 bits EF ) N.S0029-0 v1.0 */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_ahfa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_ahfa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Data Privacy Feature Activity DP-FA (Octet 4 bits CD ) N.S0008-0 v 1.0 */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_dpfa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_dpfa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Priority Call Waiting FeatureActivity PCW-FA (Octet 4 bits AB ) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_pcwfa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_pcwfa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
length--;
|
||||
if ( length == 0)
|
||||
return;
|
||||
offset++;
|
||||
|
||||
/* USCF divert to mobile station provided DN:FeatureActivity.USCFms-FA (Octet 5 bits AB ) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_uscfmsfa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_uscfmsfa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* USCF divert to network registered DN:FeatureActivity. USCFnr-FA (Octet 5 bits CD )*/
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_uscfnrfa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_uscfnrfa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* CDMA-Packet Data Service: FeatureActivity. CPDS-FA (Octet 5 bits EF ) N.S0029-0 v1.0*/
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cpdsfa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cpdsfa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* CDMA-Concurrent Service:FeatureActivity. CCS-FA (Octet 5 bits GH ) N.S0029-0 v1.0*/
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_ccsfa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_ccsfa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
length--;
|
||||
if ( length == 0)
|
||||
return;
|
||||
offset++;
|
||||
|
||||
/* TDMA Enhanced Privacy and Encryption:FeatureActivity.TDMA EPE-FA (Octet 6 bits AB ) N.S0029-0 v1.0*/
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_epefa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_epefa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
|
||||
|
@ -1450,26 +1450,26 @@ dissect_ansi_map_cdmachanneldata(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
|
|||
subtree = proto_item_add_subtree(actx->created_item, ett_cdmachanneldata);
|
||||
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitH, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_Frame_Offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_Frame_Offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* CDMA Channel Number */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_CDMA_ch_no, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_CDMA_ch_no, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset = offset + 2;
|
||||
length = length -2;
|
||||
/* Band Class */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitH, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_band_cls, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_band_cls, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Long Code Mask */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b6, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b6, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b5, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b5, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b4, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b4, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b3, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b3, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b2, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b2, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b1, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b1, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
length = length - 6;
|
||||
if (length == 0)
|
||||
return;
|
||||
|
@ -1477,9 +1477,9 @@ dissect_ansi_map_cdmachanneldata(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
|
|||
/* NP_EXT */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_np_ext, tvb, offset, 1, FALSE);
|
||||
/* Nominal Power */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_nominal_pwr, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_nominal_pwr, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Number Preamble */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_nr_preamble, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_nr_preamble, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
/* 6.5.2.31 CDMACodeChannel */
|
||||
|
@ -1524,11 +1524,11 @@ dissect_ansi_map_cdmastationclassmark(tvbuff_t *tvb, packet_info *pinfo _U_, pro
|
|||
proto_tree_add_item(subtree, hf_ansi_map_cdmastationclassmark_dmi, tvb, offset, 1, FALSE);
|
||||
/* Slotted Mode Indicator: (SMI) (octet 1, bit F) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmastationclassmark_smi, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitED, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitED, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Analog Transmission: (DTX) (octet 1, bit C) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmastationclassmark_dtx, tvb, offset, 1, FALSE);
|
||||
/* Power Class: (PC) (octet 1, bits A and B) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmastationclassmark_pc, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmastationclassmark_pc, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
/* 6.5.2.47 ChannelData */
|
||||
/* Discontinuous Transmission Mode (DTX) (octet 1, bits E and D) */
|
||||
|
@ -1551,15 +1551,15 @@ dissect_ansi_map_channeldata(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
|
|||
subtree = proto_item_add_subtree(actx->created_item, ett_channeldata);
|
||||
|
||||
/* SAT Color Code (SCC) (octet 1, bits H and G) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_channeldata_scc, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_channeldata_scc, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Discontinuous Transmission Mode (DTX) (octet 1, bits E and D) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_channeldata_dtx, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_channeldata_dtx, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Voice Mobile Attenuation Code (VMAC) (octet 1, bits A - C)*/
|
||||
proto_tree_add_item(subtree, hf_ansi_map_channeldata_vmac, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_channeldata_vmac, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
offset++;
|
||||
/* Channel Number (CHNO) ( octet 2 and 3 ) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_channeldata_chno, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_channeldata_chno, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
|
||||
|
@ -1608,20 +1608,20 @@ dissect_ansi_map_controlchanneldata(tvbuff_t *tvb, packet_info *pinfo _U_, proto
|
|||
subtree = proto_item_add_subtree(actx->created_item, ett_controlchanneldata);
|
||||
|
||||
/* Digital Color Code (DCC) (octet 1, bit H and G) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_dcc, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitFED, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_dcc, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitFED, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Control Mobile Attenuation Code (CMAC) (octet 1, bit A - C) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_cmac, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_cmac, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* Channel Number (CHNO) ( octet 2 and 3 ) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_chno, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_chno, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
/* Supplementary Digital Color Codes (SDCC1 and SDCC2) */
|
||||
offset = offset +2;
|
||||
/* SDCC1 ( octet 4, bit D and C )*/
|
||||
proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_sdcc1, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitHGFE, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_sdcc1, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitHGFE, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* SDCC2 ( octet 4, bit A and B )*/
|
||||
proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_sdcc2, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_sdcc2, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
|
||||
|
@ -1664,9 +1664,9 @@ dissect_ansi_map_deniedauthorizationperiod(tvbuff_t *tvb, packet_info *pinfo _U_
|
|||
|
||||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_deniedauthorizationperiod_period, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_deniedauthorizationperiod_period, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_value, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_value, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
|
||||
|
@ -1699,11 +1699,11 @@ dissect_ansi_map_extendedmscid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_extendedmscid);
|
||||
/* Type (octet 1) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_msc_type, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_msc_type, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset = offset + 2;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
/* 6.5.2.65 ExtendedSystemMyTypeCode */
|
||||
|
@ -1717,7 +1717,7 @@ dissect_ansi_map_extendedsystemmytypecode(tvbuff_t *tvb, packet_info *pinfo _U_,
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_extendedsystemmytypecode);
|
||||
/* Type (octet 1) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_msc_type, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_msc_type, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
offset = dissect_ansi_map_SystemMyTypeCode(TRUE, tvb, offset, actx, subtree, hf_ansi_map_systemMyTypeCode);
|
||||
}
|
||||
|
@ -1772,11 +1772,11 @@ dissect_ansi_map_intermsccircuitid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_
|
|||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
/* Trunk Group Number (G) Octet 1 */
|
||||
octet = tvb_get_guint8(tvb,offset);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_tgn, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_tgn, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* Trunk Member Number (M) Octet2 */
|
||||
octet2 = tvb_get_guint8(tvb,offset);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_tmn, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_tmn, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_item_append_text(actx->created_item, " (G %u/M %u)", octet, octet2);
|
||||
}
|
||||
|
||||
|
@ -1799,10 +1799,10 @@ dissect_ansi_map_messagewaitingnotificationcount(tvbuff_t *tvb, packet_info *pin
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
/* Type of messages (octet 1) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationcount_tom, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationcount_tom, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* Number of Messages Waiting (octet 2) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationcount_no_mw, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationcount_no_mw, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
|
||||
|
@ -1837,11 +1837,11 @@ dissect_ansi_map_messagewaitingnotificationtype(tvbuff_t *tvb, packet_info *pinf
|
|||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
|
||||
/* Message Waiting Indication (MWI) (octet 1, bits C and D) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationtype_mwi, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationtype_mwi, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Alert Pip Tone (APT) (octet 1, bit B) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationtype_apt, tvb, offset, 1, FALSE);
|
||||
/* Pip Tone (PT) (octet 1, bit A) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationtype_pt, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationtype_pt, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
/* 6.5.2.81 MobileIdentificationNumber */
|
||||
|
@ -1857,9 +1857,9 @@ dissect_ansi_map_mscid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
|
||||
|
||||
proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset = offset + 2;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
|
||||
|
@ -1874,13 +1874,13 @@ dissect_ansi_map_mslocation(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
|
|||
subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
|
||||
|
||||
/* Latitude in tenths of a second octet 1 - 3 */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_mslocation_lat, tvb, offset, 3, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_mslocation_lat, tvb, offset, 3, ENC_BIG_ENDIAN);
|
||||
offset = offset + 3;
|
||||
/* Longitude in tenths of a second octet 4 - 6 */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_mslocation_long, tvb, offset, 3, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_mslocation_long, tvb, offset, 3, ENC_BIG_ENDIAN);
|
||||
offset = offset + 3;
|
||||
/* Resolution in units of 1 foot octet 7, octet 8 optional */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_mslocation_res, tvb, offset, -1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_mslocation_res, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
/* 6.5.2.85 NAMPSCallMode */
|
||||
|
@ -1930,9 +1930,9 @@ dissect_ansi_map_nampschanneldata(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
|
|||
subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
|
||||
|
||||
/* Color Code Indicator (CCIndicator) (octet 1, bits C, D, and E) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_nampschanneldata_CCIndicator, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_nampschanneldata_CCIndicator, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Narrow Analog Voice Channel Assignment (NAVCA) (octet 1, bits A and B) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_nampschanneldata_navca, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_nampschanneldata_navca, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
|
||||
|
@ -2277,7 +2277,7 @@ dissect_ansi_map_pacaindicator(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_pacaindicator);
|
||||
/* PACA Level (octet 1, bits B-E) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_PACA_Level, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_PACA_Level, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Permanent Activation (PA) (octet 1, bit A) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_pacaindicator_pa, tvb, offset, 1, FALSE);
|
||||
}
|
||||
|
@ -2301,7 +2301,7 @@ dissect_ansi_map_pc_ssn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
/* Type (octet 1) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_msc_type, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_msc_type, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* Point Code Member Number octet 2 */
|
||||
b1 = tvb_get_guint8(tvb,offset);
|
||||
|
@ -2328,15 +2328,15 @@ dissect_ansi_map_pilotbillingid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
/* First Originating MarketID octet 1 and 2 */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset = offset + 2;
|
||||
/* First Originating Switch Number octet 3*/
|
||||
proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* ID Number */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_idno, tvb, offset, 3, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_idno, tvb, offset, 3, ENC_BIG_ENDIAN);
|
||||
offset = offset + 3;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_segcount, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_segcount, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
/* 6.5.2.96 PreferredLanguageIndicator */
|
||||
|
@ -2480,10 +2480,10 @@ dissect_ansi_map_sms_originationrestrictions(tvbuff_t *tvb, packet_info *pinfo _
|
|||
|
||||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_sms_originationrestrictions);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitHGFE, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitHGFE, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_sms_originationrestrictions_fmc, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_sms_originationrestrictions_direct, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_sms_originationrestrictions_default, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_sms_originationrestrictions_default, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
|
||||
|
@ -2574,7 +2574,7 @@ dissect_ansi_map_systemcapabilities(tvbuff_t *tvb, packet_info *pinfo _U_, proto
|
|||
|
||||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_systemcapabilities);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitHG, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitHG, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_systemcapabilities_dp, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_systemcapabilities_ssd, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_systemcapabilities_cave, tvb, offset, 1, FALSE);
|
||||
|
@ -2669,17 +2669,17 @@ dissect_ansi_map_terminationtriggers(tvbuff_t *tvb, packet_info *pinfo _U_, prot
|
|||
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitH, tvb, offset, 1, FALSE);
|
||||
/* No Page Response (NPR) (octet 1, bits E and F) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_npr, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_npr, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* No Answer (NA) (octet 1, bits G and H) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_na, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_na, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Routing Failure (RF) (octet 1, bits C and D) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_rf, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_rf, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Busy (octet 1, bits A and B) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_busy, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_busy, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
|
||||
/* None Reachable (NR) (octet 2, bit A) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_nr, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_nr, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
/* 6.5.2.160 TransactionCapability (TIA/EIA-41.5-D, page 5-315) */
|
||||
|
@ -2785,7 +2785,7 @@ dissect_ansi_map_transactioncapability(tvbuff_t *tvb, packet_info *pinfo _U_, pr
|
|||
/* TerminationList (TL) (octet 2, bit E) */
|
||||
proto_tree_add_item(subtree, hf_ansi_trans_cap_tl, tvb, offset, 1, FALSE);
|
||||
/* Multiple Terminations (octet 2, bits A-D) */
|
||||
proto_tree_add_item(subtree, hf_ansi_trans_cap_multerm, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_trans_cap_multerm, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
/* 6.5.2.162 UniqueChallengeReport */
|
||||
|
@ -3114,10 +3114,10 @@ static const value_string ansi_map_TDMABandwidth_vals[] = {
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
/ Trunk Group Number (G) Octet 1 /
|
||||
proto_tree_add_item(subtree, hf_ansi_map_tgn, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_tgn, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/ Trunk Member Number (M) Octet2 /
|
||||
proto_tree_add_item(subtree, hf_ansi_map_tmn, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_tmn, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
*/
|
||||
/* 6.5.2.as ChangeServiceAttributes N.S0008-0 v 1.0 */
|
||||
|
@ -3374,10 +3374,10 @@ dissect_ansi_map_controlnetworkid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_controlnetworkid);
|
||||
/* MarketID octet 1 and 2 */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset = offset + 2;
|
||||
/* Switch Number octet 3*/
|
||||
proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
}
|
||||
|
||||
|
|
|
@ -135,19 +135,19 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa
|
|||
/* RFC2510 TCP transport */
|
||||
ti = proto_tree_add_item(tree, proto_cmp, tvb, offset, 5, FALSE);
|
||||
tcptrans_tree = proto_item_add_subtree(ti, ett_cmp);
|
||||
proto_tree_add_item(tree, hf_cmp_tcptrans_len, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(tree, hf_cmp_tcptrans_len, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
proto_tree_add_item(tree, hf_cmp_tcptrans_type, tvb, offset++, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_cmp_tcptrans_type, tvb, offset++, 1, ENC_BIG_ENDIAN);
|
||||
} else {
|
||||
/* post RFC2510 TCP transport - the former "type" field is now "version" */
|
||||
ti = proto_tree_add_text(tree, tvb, offset, 7, "TCP transport");
|
||||
tcptrans_tree = proto_item_add_subtree(ti, ett_cmp);
|
||||
pdu_type=tvb_get_guint8(tvb, 6);
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_len, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_len, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans10_version, tvb, offset++, 1, FALSE);
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans10_flags, tvb, offset++, 1, FALSE);
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_type, tvb, offset++, 1, FALSE);
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans10_version, tvb, offset++, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans10_flags, tvb, offset++, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_type, tvb, offset++, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
col_add_str (pinfo->cinfo, COL_INFO, val_to_str (pdu_type, cmp_pdu_types, "0x%x"));
|
||||
|
@ -159,7 +159,7 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa
|
|||
offset += tvb_length_remaining(tvb, offset);
|
||||
break;
|
||||
case CMP_TYPE_POLLREP:
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_poll_ref, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_poll_ref, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
|
||||
ts.secs = tvb_get_ntohl(tvb, 4);
|
||||
|
@ -168,13 +168,13 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa
|
|||
offset += 4;
|
||||
break;
|
||||
case CMP_TYPE_POLLREQ:
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_poll_ref, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_poll_ref, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
break;
|
||||
case CMP_TYPE_NEGPOLLREP:
|
||||
break;
|
||||
case CMP_TYPE_PARTIALMSGREP:
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_next_poll_ref, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_next_poll_ref, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
|
||||
ts.secs = tvb_get_ntohl(tvb, 4);
|
||||
|
|
|
@ -317,17 +317,17 @@ dissect_gsm_map_ext_qos_subscribed(tvbuff_t *tvb, packet_info *pinfo _U_, proto_
|
|||
6-13.
|
||||
*/
|
||||
/* Allocation/Retention Priority */
|
||||
proto_tree_add_item(subtree, hf_gsm_map_ext_qos_subscribed_pri, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_gsm_map_ext_qos_subscribed_pri, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
|
||||
/* Quality of Service Octets 6-13.( Octet 2 - 9 Here) */
|
||||
|
||||
/* Traffic class, octet 6 (see 3GPP TS 23.107) Bits 8 7 6 */
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_traffic_cls, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_traffic_cls, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Delivery order, octet 6 (see 3GPP TS 23.107) Bits 5 4 */
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_del_order, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_del_order, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Delivery of erroneous SDUs, octet 6 (see 3GPP TS 23.107) Bits 3 2 1 */
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_del_of_err_sdu, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_del_of_err_sdu, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
|
||||
/* Maximum SDU size, octet 7 (see 3GPP TS 23.107) */
|
||||
|
@ -375,15 +375,15 @@ dissect_gsm_map_ext_qos_subscribed(tvbuff_t *tvb, packet_info *pinfo _U_, proto_
|
|||
}
|
||||
offset++;
|
||||
/* Residual Bit Error Rate (BER), octet 10 (see 3GPP TS 23.107) Bits 8 7 6 5 */
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_ber, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_ber, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* SDU error ratio, octet 10 (see 3GPP TS 23.107) */
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_sdu_err_rat, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_sdu_err_rat, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
|
||||
/* Transfer delay, octet 11 (See 3GPP TS 23.107) Bits 8 7 6 5 4 3 */
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_transfer_delay, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_transfer_delay, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Traffic handling priority, octet 11 (see 3GPP TS 23.107) Bits 2 1 */
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_traff_hdl_pri, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_traff_hdl_pri, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
|
||||
/* Guaranteed bit rate for uplink, octet 12 (See 3GPP TS 23.107)
|
||||
|
@ -612,16 +612,16 @@ dissect_cbs_data_coding_scheme(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
|
|||
|
||||
octet = tvb_get_guint8(tvb,0);
|
||||
coding_grp = octet >>4;
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
sms_encoding = SMS_ENCODING_NOT_SET;
|
||||
switch (coding_grp){
|
||||
case 0:
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp0_lang, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp0_lang, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
sms_encoding = SMS_ENCODING_7BIT;
|
||||
break;
|
||||
case 1:
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp1_lang, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp1_lang, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
if ((octet & 0x0f)== 0){
|
||||
sms_encoding = SMS_ENCODING_7BIT_LANG;
|
||||
}else{
|
||||
|
@ -629,11 +629,11 @@ dissect_cbs_data_coding_scheme(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
|
|||
}
|
||||
break;
|
||||
case 2:
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp2_lang, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp2_lang, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
sms_encoding = SMS_ENCODING_7BIT;
|
||||
break;
|
||||
case 3:
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp3_lang, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp3_lang, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
sms_encoding = SMS_ENCODING_7BIT;
|
||||
break;
|
||||
/* Coding_grp 01xx */
|
||||
|
@ -647,9 +647,9 @@ dissect_cbs_data_coding_scheme(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
|
|||
/* FALLTHRU */
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp4_7_comp, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp4_7_class_ind, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp4_7_char_set, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp4_7_char_set, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
if ((octet & 0x10)== 0x10){
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp4_7_class, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp4_7_class, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
/* Bits 3 and 2 indicate the character set being used, */
|
||||
character_set = (octet&0x0c)>>2;
|
||||
|
@ -679,8 +679,8 @@ dissect_cbs_data_coding_scheme(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
|
|||
break;
|
||||
case 9:
|
||||
/* Message with User Data Header (UDH) structure:*/
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp4_7_char_set, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp4_7_class, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp4_7_char_set, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp4_7_class, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
character_set = (octet&0x0c)>>2;
|
||||
switch (character_set){
|
||||
case 0:
|
||||
|
@ -720,8 +720,8 @@ dissect_cbs_data_coding_scheme(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
|
|||
break;
|
||||
case 15:
|
||||
/* Data coding / message handling */
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp15_mess_code, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp15_class, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp15_mess_code, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp15_class, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
character_set = (octet&0x04)>>2;
|
||||
if (character_set == 0){
|
||||
sms_encoding = SMS_ENCODING_7BIT;
|
||||
|
@ -744,8 +744,8 @@ dissect_gsm_map_msisdn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
|
|||
guint8 np;
|
||||
|
||||
proto_tree_add_item(tree, hf_gsm_map_extension, tvb, 0,1,FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_nature_of_number, tvb, 0,1,FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_number_plan, tvb, 0,1,FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_nature_of_number, tvb, 0,1,ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tree, hf_gsm_map_number_plan, tvb, 0,1,ENC_BIG_ENDIAN);
|
||||
|
||||
digit_str = unpack_digits(tvb, 1);
|
||||
|
||||
|
|
|
@ -180,10 +180,10 @@ static void dissect_idmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_t
|
|||
|
||||
/* now check the segment fields */
|
||||
|
||||
proto_tree_add_item(tree, hf_idmp_version, tvb, offset, 1, FALSE); offset++;
|
||||
proto_tree_add_item(tree, hf_idmp_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset++;
|
||||
proto_tree_add_item(tree, hf_idmp_final, tvb, offset, 1, FALSE);
|
||||
idmp_final = tvb_get_guint8(tvb, offset); offset++;
|
||||
proto_tree_add_item(tree, hf_idmp_length, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(tree, hf_idmp_length, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
idmp_length = tvb_get_ntohl(tvb, offset); offset += 4;
|
||||
|
||||
if(idmp_reassemble) {
|
||||
|
|
|
@ -1292,7 +1292,7 @@ dissect_krb5_PW_SALT(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
* is such an MS blob or not.
|
||||
*/
|
||||
proto_tree_add_item(tree, hf_krb_smb_nt_status, tvb, offset, 4,
|
||||
TRUE);
|
||||
ENC_LITTLE_ENDIAN);
|
||||
nt_status=tvb_get_letohl(tvb, offset);
|
||||
if(nt_status && check_col(actx->pinfo->cinfo, COL_INFO)) {
|
||||
col_append_fstr(actx->pinfo->cinfo, COL_INFO,
|
||||
|
@ -1303,11 +1303,11 @@ dissect_krb5_PW_SALT(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
offset += 4;
|
||||
|
||||
proto_tree_add_item(tree, hf_krb_smb_unknown, tvb, offset, 4,
|
||||
TRUE);
|
||||
ENC_LITTLE_ENDIAN);
|
||||
offset += 4;
|
||||
|
||||
proto_tree_add_item(tree, hf_krb_smb_unknown, tvb, offset, 4,
|
||||
TRUE);
|
||||
ENC_LITTLE_ENDIAN);
|
||||
offset += 4;
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -412,7 +412,7 @@ static int dissect_mscldap_ntver_flags(proto_tree *parent_tree, tvbuff_t *tvb, i
|
|||
gboolean one_bit_set = FALSE;
|
||||
|
||||
flags=tvb_get_letohl(tvb, offset);
|
||||
item=proto_tree_add_item(parent_tree, hf_mscldap_ntver_flags, tvb, offset, 4, TRUE);
|
||||
item=proto_tree_add_item(parent_tree, hf_mscldap_ntver_flags, tvb, offset, 4, ENC_LITTLE_ENDIAN);
|
||||
if(parent_tree){
|
||||
tree = proto_item_add_subtree(item, ett_mscldap_ntver_flags);
|
||||
}
|
||||
|
@ -1226,7 +1226,7 @@ static int dissect_mscldap_netlogon_flags(proto_tree *parent_tree, tvbuff_t *tvb
|
|||
gboolean one_bit_set = FALSE;
|
||||
|
||||
flags=tvb_get_letohl(tvb, offset);
|
||||
item=proto_tree_add_item(parent_tree, hf_mscldap_netlogon_flags, tvb, offset, 4, TRUE);
|
||||
item=proto_tree_add_item(parent_tree, hf_mscldap_netlogon_flags, tvb, offset, 4, ENC_LITTLE_ENDIAN);
|
||||
if(parent_tree){
|
||||
tree = proto_item_add_subtree(item, ett_mscldap_netlogon_flags);
|
||||
}
|
||||
|
@ -1420,11 +1420,11 @@ static void dissect_NetLogon_PDU(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
|
|||
subtree = proto_item_add_subtree(item, ett_mscldap_ipdetails);
|
||||
|
||||
/* get sockaddr family */
|
||||
proto_tree_add_item(subtree, hf_mscldap_netlogon_ipaddress_family, tvb, offset, 2, TRUE);
|
||||
proto_tree_add_item(subtree, hf_mscldap_netlogon_ipaddress_family, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset +=2;
|
||||
|
||||
/* get sockaddr port */
|
||||
proto_tree_add_item(subtree, hf_mscldap_netlogon_ipaddress_port, tvb, offset, 2, TRUE);
|
||||
proto_tree_add_item(subtree, hf_mscldap_netlogon_ipaddress_port, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset +=2;
|
||||
|
||||
/* get IP address */
|
||||
|
@ -1449,11 +1449,11 @@ static void dissect_NetLogon_PDU(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
|
|||
offset = dissect_mscldap_ntver_flags(tree, tvb, offset);
|
||||
|
||||
/* LM Token */
|
||||
proto_tree_add_item(tree, hf_mscldap_netlogon_lm_token, tvb, offset, 2, TRUE);
|
||||
proto_tree_add_item(tree, hf_mscldap_netlogon_lm_token, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
/* NT Token */
|
||||
proto_tree_add_item(tree, hf_mscldap_netlogon_nt_token, tvb, offset, 2, TRUE);
|
||||
proto_tree_add_item(tree, hf_mscldap_netlogon_nt_token, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
}
|
||||
|
|
|
@ -301,34 +301,34 @@ dissect_mpeg_pes_header_data(tvbuff_t *tvb, packet_info *pinfo,
|
|||
}
|
||||
if (flags & COPY_INFO_FLAG) {
|
||||
proto_tree_add_item(tree, hf_mpeg_pes_copy_info, tvb,
|
||||
offset, 1, FALSE);
|
||||
offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
}
|
||||
if (flags & CRC_FLAG) {
|
||||
proto_tree_add_item(tree, hf_mpeg_pes_crc, tvb,
|
||||
offset, 2, FALSE);
|
||||
offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
}
|
||||
|
||||
if (flags & EXTENSION_FLAG) {
|
||||
int flags2 = tvb_get_guint8(tvb, offset);
|
||||
proto_tree_add_item(tree, hf_mpeg_pes_extension_flags, tvb,
|
||||
offset, 1, FALSE);
|
||||
offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
|
||||
if (flags2 & PRIVATE_DATA_FLAG) {
|
||||
proto_tree_add_item(tree, hf_mpeg_pes_private_data, tvb,
|
||||
offset, 2, FALSE);
|
||||
offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
}
|
||||
if (flags2 & PACK_LENGTH_FLAG) {
|
||||
proto_tree_add_item(tree, hf_mpeg_pes_pack_length, tvb,
|
||||
offset, 1, FALSE);
|
||||
offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
}
|
||||
if (flags2 & SEQUENCE_FLAG) {
|
||||
proto_tree_add_item(tree, hf_mpeg_pes_sequence, tvb,
|
||||
offset, 2, FALSE);
|
||||
offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
}
|
||||
if (flags2 & PSTD_BUFFER_FLAG) {
|
||||
|
@ -339,7 +339,7 @@ dissect_mpeg_pes_header_data(tvbuff_t *tvb, packet_info *pinfo,
|
|||
}
|
||||
if (flags2 & EXTENSION_FLAG2) {
|
||||
proto_tree_add_item(tree, hf_mpeg_pes_extension2, tvb,
|
||||
offset, 2, FALSE);
|
||||
offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
}
|
||||
}
|
||||
|
@ -372,7 +372,7 @@ dissect_mpeg_pes_pack_header(tvbuff_t *tvb, gint offset,
|
|||
|
||||
stuffing_length = tvb_get_guint8(tvb, offset / 8) & 0x07;
|
||||
proto_tree_add_item(tree, hf_mpeg_pes_stuffing_length, tvb,
|
||||
offset / 8, 1, FALSE);
|
||||
offset / 8, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1 * 8;
|
||||
|
||||
if (stuffing_length > 0) {
|
||||
|
|
|
@ -525,14 +525,14 @@ dissect_qsig_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
|
|||
/*--- dissect_qsig_transit_counter_ie ---------------------------------------*/
|
||||
static int
|
||||
dissect_qsig_transit_counter_ie(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int length _U_) {
|
||||
proto_tree_add_item(tree, hf_qsig_tc, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_qsig_tc, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
return offset;
|
||||
}
|
||||
/*--- dissect_qsig_party_category_ie ----------------------------------------*/
|
||||
static int
|
||||
dissect_qsig_party_category_ie(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int length _U_) {
|
||||
proto_tree_add_item(tree, hf_qsig_pc, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_qsig_pc, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
return offset;
|
||||
}
|
||||
|
@ -557,9 +557,9 @@ dissect_qsig_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int codeset
|
|||
val_to_str(ie_type, VALS(qsig_str_ie_type[codeset]), "unknown (0x%02X)"));
|
||||
ie_tree = proto_item_add_subtree(ti_ie, ett_qsig_ie);
|
||||
proto_tree_add_item(ie_tree, *hf_qsig_ie_type_arr[codeset], tvb, offset, 1, FALSE);
|
||||
hidden_item = proto_tree_add_item(ie_tree, hf_qsig_ie_type, tvb, offset, 1, FALSE);
|
||||
hidden_item = proto_tree_add_item(ie_tree, hf_qsig_ie_type, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
PROTO_ITEM_SET_HIDDEN(hidden_item);
|
||||
proto_tree_add_item(ie_tree, hf_qsig_ie_len, tvb, offset + 1, 1, FALSE);
|
||||
proto_tree_add_item(ie_tree, hf_qsig_ie_len, tvb, offset + 1, 1, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
if (tvb_length_remaining(tvb, offset) <= 0)
|
||||
return;
|
||||
|
|
|
@ -100,8 +100,8 @@ dissect_smrse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
col_add_str(pinfo->cinfo, COL_INFO, val_to_str(tag, tag_vals,"Unknown Tag:0x%02x"));
|
||||
|
||||
proto_tree_add_item(tree, hf_smrse_reserved, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_smrse_length, tvb, 1, 2, FALSE);
|
||||
proto_tree_add_item(tree, hf_smrse_tag, tvb, 3, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_smrse_length, tvb, 1, 2, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tree, hf_smrse_tag, tvb, 3, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
switch(tag){
|
||||
case 1:
|
||||
|
|
|
@ -1020,19 +1020,19 @@ dissect_spnego_krb5_cfx_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo
|
|||
/* EC */
|
||||
ec = tvb_get_ntohs(tvb, offset);
|
||||
proto_tree_add_item(tree, hf_spnego_krb5_cfx_ec, tvb, offset, 2,
|
||||
FALSE);
|
||||
ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
/* RRC */
|
||||
rrc = tvb_get_ntohs(tvb, offset);
|
||||
proto_tree_add_item(tree, hf_spnego_krb5_cfx_rrc, tvb, offset, 2,
|
||||
FALSE);
|
||||
ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
/* sequence number */
|
||||
|
||||
proto_tree_add_item(tree, hf_spnego_krb5_cfx_seq, tvb, offset, 8,
|
||||
FALSE);
|
||||
ENC_BIG_ENDIAN);
|
||||
offset += 8;
|
||||
|
||||
/* Checksum of plaintext padded data */
|
||||
|
@ -1138,7 +1138,7 @@ dissect_spnego_krb5_cfx_getmic_base(tvbuff_t *tvb, int offset, packet_info *pinf
|
|||
/* sequence number */
|
||||
|
||||
proto_tree_add_item(tree, hf_spnego_krb5_cfx_seq, tvb, offset, 8,
|
||||
FALSE);
|
||||
ENC_BIG_ENDIAN);
|
||||
offset += 8;
|
||||
|
||||
/* Checksum of plaintext padded data */
|
||||
|
|
|
@ -168,7 +168,7 @@ dissect_PhsMeas1(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tv
|
|||
value = tvb_get_ntohl(tvb, offset);
|
||||
qual = tvb_get_ntohl(tvb, offset + 4);
|
||||
|
||||
proto_tree_add_item(subtree, hf_sv_phmeas_instmag_i, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(subtree, hf_sv_phmeas_instmag_i, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_bitmask(subtree, tvb, offset + 4, hf_sv_phsmeas_q, ett_phsmeas_q, q_flags, FALSE);
|
||||
|
||||
if (i < IEC61850_SV_MAX_PHSMEAS_ENTRIES) {
|
||||
|
@ -209,19 +209,19 @@ dissect_sv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
|
||||
/* APPID */
|
||||
if (tree && tvb_reported_length_remaining(tvb, offset) >= 2)
|
||||
proto_tree_add_item(tree, hf_sv_appid, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(tree, hf_sv_appid, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
|
||||
/* Length */
|
||||
if (tree && tvb_reported_length_remaining(tvb, offset) >= 4)
|
||||
proto_tree_add_item(tree, hf_sv_length, tvb, offset + 2, 2, FALSE);
|
||||
proto_tree_add_item(tree, hf_sv_length, tvb, offset + 2, 2, ENC_BIG_ENDIAN);
|
||||
|
||||
/* Reserved 1 */
|
||||
if (tree && tvb_reported_length_remaining(tvb, offset) >= 6)
|
||||
proto_tree_add_item(tree, hf_sv_reserve1, tvb, offset + 4, 2, FALSE);
|
||||
proto_tree_add_item(tree, hf_sv_reserve1, tvb, offset + 4, 2, ENC_BIG_ENDIAN);
|
||||
|
||||
/* Reserved 2 */
|
||||
if (tree && tvb_reported_length_remaining(tvb, offset) >= 8)
|
||||
proto_tree_add_item(tree, hf_sv_reserve2, tvb, offset + 6, 2, FALSE);
|
||||
proto_tree_add_item(tree, hf_sv_reserve2, tvb, offset + 6, 2, ENC_BIG_ENDIAN);
|
||||
|
||||
offset = 8;
|
||||
while (tree && tvb_reported_length_remaining(tvb, offset) > 0){
|
||||
|
|
|
@ -502,7 +502,7 @@ dissect_tetra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
/* Timer */
|
||||
txtimer = tvb_get_letohl(tvb, offset);
|
||||
tetra_sub_item = proto_tree_add_item(tetra_header_tree, hf_tetra_timer, tvb, offset, 4, TRUE);
|
||||
tetra_sub_item = proto_tree_add_item(tetra_header_tree, hf_tetra_timer, tvb, offset, 4, ENC_LITTLE_ENDIAN);
|
||||
tslot = ((txtimer & 0x7800) >> 11);
|
||||
if(tslot==4)
|
||||
tslot = 3;
|
||||
|
|
|
@ -1522,11 +1522,11 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
|
|||
subtree = proto_item_add_subtree(actx->created_item, ett_digitstype);
|
||||
|
||||
/* Octet 1 */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_type_of_digits, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_type_of_digits, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* Octet 2 */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitHG, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_si, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitHG, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_si, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitD, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_navail, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_pi, tvb, offset, 1, FALSE);
|
||||
|
@ -1534,8 +1534,8 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
|
|||
offset++;
|
||||
/* Octet 3 */
|
||||
octet = tvb_get_guint8(tvb,offset);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_np, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_digits_enc, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_np, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_digits_enc, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* Octet 4 - */
|
||||
switch(octet>>4){
|
||||
|
@ -1544,7 +1544,7 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
|
|||
case 1:
|
||||
/* BCD Coding */
|
||||
octet_len = tvb_get_guint8(tvb,offset);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_nr_digits, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_nr_digits, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
if(octet_len == 0)
|
||||
return;
|
||||
offset++;
|
||||
|
@ -1555,7 +1555,7 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
|
|||
case 2:
|
||||
/* IA5 Coding */
|
||||
octet_len = tvb_get_guint8(tvb,offset);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_nr_digits, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_nr_digits, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
if(octet_len == 0)
|
||||
return;
|
||||
offset++;
|
||||
|
@ -1579,7 +1579,7 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
|
|||
case 6:/* Land Mobile Numbering (ITU-T Rec. E.212) */
|
||||
case 7:/* Private Numbering Plan */
|
||||
octet_len = tvb_get_guint8(tvb,offset);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_nr_digits, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_nr_digits, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
if(octet_len == 0)
|
||||
return;
|
||||
offset++;
|
||||
|
@ -1661,7 +1661,7 @@ dissect_ansi_map_subaddress(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
/* Type of Subaddress (octet 1, bits E-G) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_subaddr_type, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_subaddr_type, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Odd/Even Indicator (O/E) (octet 1, bit D) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_subaddr_odd_even, tvb, offset, 1, FALSE);
|
||||
|
||||
|
@ -1759,13 +1759,13 @@ dissect_ansi_map_alertcode(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
/* Pitch (octet 1, bits G-H) */
|
||||
proto_tree_add_item(subtree, hf_ansi_alertcode_pitch, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_alertcode_pitch, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Cadence (octet 1, bits A-F) */
|
||||
proto_tree_add_item(subtree, hf_ansi_alertcode_cadence, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_alertcode_cadence, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
|
||||
/* Alert Action (octet 2, bits A-C) */
|
||||
proto_tree_add_item(subtree, hf_ansi_alertcode_alertaction, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_alertcode_alertaction, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
/* 6.5.2.4 AlertResult */
|
||||
|
@ -1915,20 +1915,20 @@ dissect_ansi_map_announcementcode(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
|
|||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
|
||||
/* Tone (octet 1) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_announcementcode_tone, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_announcementcode_tone, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* Class (octet 2, bits A-D) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_announcementcode_class, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_announcementcode_class, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* Standard Announcement (octet 3) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_announcementcode_std_ann, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_announcementcode_std_ann, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* Custom Announcement ( octet 4 )
|
||||
e. The assignment of this octet is left to bilateral agreement. When a Custom
|
||||
Announcement is specified it takes precedence over either the Standard
|
||||
Announcement or Tone
|
||||
*/
|
||||
proto_tree_add_item(subtree, hf_ansi_map_announcementcode_cust_ann, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_announcementcode_cust_ann, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
/* 6.5.2.8 AuthenticationCapability Updated N.S0003*/
|
||||
|
@ -1969,9 +1969,9 @@ dissect_ansi_map_authorizationperiod(tvbuff_t *tvb, packet_info *pinfo _U_, prot
|
|||
|
||||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_authorizationperiod_period, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_authorizationperiod_period, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_value, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_value, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
/* 6.5.2.15 AvailabilityType */
|
||||
|
@ -1992,14 +1992,14 @@ dissect_ansi_map_billingid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
|
||||
proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset = offset + 2;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* ID Number */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_idno, tvb, offset, 3, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_idno, tvb, offset, 3, ENC_BIG_ENDIAN);
|
||||
offset = offset + 3;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_segcount, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_segcount, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
|
||||
|
@ -2050,46 +2050,46 @@ dissect_ansi_map_callingfeaturesindicator(tvbuff_t *tvb, packet_info *pinfo _U_,
|
|||
|
||||
|
||||
/* Calling Number Identification Restriction Override FeatureActivity CNIROver-FA (Octet 3 bits GH ) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cniroverfa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cniroverfa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Calling Number Identification Restriction: FeatureActivity CNIR-FA (Octet 3 bits EF ) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cnirfa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cnirfa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Calling Number Identification Presentation: FeatureActivity CNIP2-FA (Octet 3 bits CD ) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cnip2fa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cnip2fa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Calling Number Identification Presentation: FeatureActivity CNIP1-FA (Octet 3 bits AB ) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cnip1fa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cnip1fa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
length--;
|
||||
if ( length == 0)
|
||||
return;
|
||||
offset++;
|
||||
|
||||
/* USCF divert to voice mail: FeatureActivity USCFvm-FA (Octet 4 bits GH ) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_uscfvmfa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_uscfvmfa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Answer Hold: FeatureActivity AH-FA (Octet 4 bits EF ) N.S0029-0 v1.0 */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_ahfa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_ahfa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Data Privacy Feature Activity DP-FA (Octet 4 bits CD ) N.S0008-0 v 1.0 */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_dpfa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_dpfa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Priority Call Waiting FeatureActivity PCW-FA (Octet 4 bits AB ) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_pcwfa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_pcwfa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
length--;
|
||||
if ( length == 0)
|
||||
return;
|
||||
offset++;
|
||||
|
||||
/* USCF divert to mobile station provided DN:FeatureActivity.USCFms-FA (Octet 5 bits AB ) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_uscfmsfa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_uscfmsfa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* USCF divert to network registered DN:FeatureActivity. USCFnr-FA (Octet 5 bits CD )*/
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_uscfnrfa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_uscfnrfa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* CDMA-Packet Data Service: FeatureActivity. CPDS-FA (Octet 5 bits EF ) N.S0029-0 v1.0*/
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cpdsfa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cpdsfa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* CDMA-Concurrent Service:FeatureActivity. CCS-FA (Octet 5 bits GH ) N.S0029-0 v1.0*/
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_ccsfa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_ccsfa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
length--;
|
||||
if ( length == 0)
|
||||
return;
|
||||
offset++;
|
||||
|
||||
/* TDMA Enhanced Privacy and Encryption:FeatureActivity.TDMA EPE-FA (Octet 6 bits AB ) N.S0029-0 v1.0*/
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_epefa, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_epefa, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
|
||||
|
@ -2238,26 +2238,26 @@ dissect_ansi_map_cdmachanneldata(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
|
|||
subtree = proto_item_add_subtree(actx->created_item, ett_cdmachanneldata);
|
||||
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitH, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_Frame_Offset, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_Frame_Offset, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* CDMA Channel Number */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_CDMA_ch_no, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_CDMA_ch_no, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset = offset + 2;
|
||||
length = length -2;
|
||||
/* Band Class */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitH, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_band_cls, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_band_cls, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Long Code Mask */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b6, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b6, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b5, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b5, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b4, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b4, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b3, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b3, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b2, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b2, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b1, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b1, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
length = length - 6;
|
||||
if (length == 0)
|
||||
return;
|
||||
|
@ -2265,9 +2265,9 @@ dissect_ansi_map_cdmachanneldata(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
|
|||
/* NP_EXT */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_np_ext, tvb, offset, 1, FALSE);
|
||||
/* Nominal Power */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_nominal_pwr, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_nominal_pwr, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Number Preamble */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_nr_preamble, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_nr_preamble, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
/* 6.5.2.31 CDMACodeChannel */
|
||||
|
@ -2312,11 +2312,11 @@ dissect_ansi_map_cdmastationclassmark(tvbuff_t *tvb, packet_info *pinfo _U_, pro
|
|||
proto_tree_add_item(subtree, hf_ansi_map_cdmastationclassmark_dmi, tvb, offset, 1, FALSE);
|
||||
/* Slotted Mode Indicator: (SMI) (octet 1, bit F) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmastationclassmark_smi, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitED, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitED, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Analog Transmission: (DTX) (octet 1, bit C) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmastationclassmark_dtx, tvb, offset, 1, FALSE);
|
||||
/* Power Class: (PC) (octet 1, bits A and B) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmastationclassmark_pc, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_cdmastationclassmark_pc, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
/* 6.5.2.47 ChannelData */
|
||||
/* Discontinuous Transmission Mode (DTX) (octet 1, bits E and D) */
|
||||
|
@ -2339,15 +2339,15 @@ dissect_ansi_map_channeldata(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
|
|||
subtree = proto_item_add_subtree(actx->created_item, ett_channeldata);
|
||||
|
||||
/* SAT Color Code (SCC) (octet 1, bits H and G) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_channeldata_scc, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_channeldata_scc, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Discontinuous Transmission Mode (DTX) (octet 1, bits E and D) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_channeldata_dtx, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_channeldata_dtx, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Voice Mobile Attenuation Code (VMAC) (octet 1, bits A - C)*/
|
||||
proto_tree_add_item(subtree, hf_ansi_map_channeldata_vmac, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_channeldata_vmac, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
offset++;
|
||||
/* Channel Number (CHNO) ( octet 2 and 3 ) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_channeldata_chno, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_channeldata_chno, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
|
||||
|
@ -2396,20 +2396,20 @@ dissect_ansi_map_controlchanneldata(tvbuff_t *tvb, packet_info *pinfo _U_, proto
|
|||
subtree = proto_item_add_subtree(actx->created_item, ett_controlchanneldata);
|
||||
|
||||
/* Digital Color Code (DCC) (octet 1, bit H and G) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_dcc, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitFED, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_dcc, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitFED, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Control Mobile Attenuation Code (CMAC) (octet 1, bit A - C) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_cmac, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_cmac, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* Channel Number (CHNO) ( octet 2 and 3 ) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_chno, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_chno, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
/* Supplementary Digital Color Codes (SDCC1 and SDCC2) */
|
||||
offset = offset +2;
|
||||
/* SDCC1 ( octet 4, bit D and C )*/
|
||||
proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_sdcc1, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitHGFE, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_sdcc1, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitHGFE, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* SDCC2 ( octet 4, bit A and B )*/
|
||||
proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_sdcc2, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_sdcc2, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
|
||||
|
@ -2452,9 +2452,9 @@ dissect_ansi_map_deniedauthorizationperiod(tvbuff_t *tvb, packet_info *pinfo _U_
|
|||
|
||||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_deniedauthorizationperiod_period, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_deniedauthorizationperiod_period, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_value, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_value, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
|
||||
|
@ -2487,11 +2487,11 @@ dissect_ansi_map_extendedmscid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_extendedmscid);
|
||||
/* Type (octet 1) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_msc_type, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_msc_type, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset = offset + 2;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
/* 6.5.2.65 ExtendedSystemMyTypeCode */
|
||||
|
@ -2505,7 +2505,7 @@ dissect_ansi_map_extendedsystemmytypecode(tvbuff_t *tvb, packet_info *pinfo _U_,
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_extendedsystemmytypecode);
|
||||
/* Type (octet 1) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_msc_type, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_msc_type, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
offset = dissect_ansi_map_SystemMyTypeCode(TRUE, tvb, offset, actx, subtree, hf_ansi_map_systemMyTypeCode);
|
||||
}
|
||||
|
@ -2560,11 +2560,11 @@ dissect_ansi_map_intermsccircuitid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_
|
|||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
/* Trunk Group Number (G) Octet 1 */
|
||||
octet = tvb_get_guint8(tvb,offset);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_tgn, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_tgn, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* Trunk Member Number (M) Octet2 */
|
||||
octet2 = tvb_get_guint8(tvb,offset);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_tmn, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_tmn, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_item_append_text(actx->created_item, " (G %u/M %u)", octet, octet2);
|
||||
}
|
||||
|
||||
|
@ -2587,10 +2587,10 @@ dissect_ansi_map_messagewaitingnotificationcount(tvbuff_t *tvb, packet_info *pin
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
/* Type of messages (octet 1) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationcount_tom, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationcount_tom, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* Number of Messages Waiting (octet 2) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationcount_no_mw, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationcount_no_mw, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
|
||||
|
@ -2625,11 +2625,11 @@ dissect_ansi_map_messagewaitingnotificationtype(tvbuff_t *tvb, packet_info *pinf
|
|||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
|
||||
/* Message Waiting Indication (MWI) (octet 1, bits C and D) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationtype_mwi, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationtype_mwi, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Alert Pip Tone (APT) (octet 1, bit B) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationtype_apt, tvb, offset, 1, FALSE);
|
||||
/* Pip Tone (PT) (octet 1, bit A) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationtype_pt, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationtype_pt, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
/* 6.5.2.81 MobileIdentificationNumber */
|
||||
|
@ -2645,9 +2645,9 @@ dissect_ansi_map_mscid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
|
||||
|
||||
proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset = offset + 2;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
|
||||
|
@ -2662,13 +2662,13 @@ dissect_ansi_map_mslocation(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
|
|||
subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
|
||||
|
||||
/* Latitude in tenths of a second octet 1 - 3 */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_mslocation_lat, tvb, offset, 3, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_mslocation_lat, tvb, offset, 3, ENC_BIG_ENDIAN);
|
||||
offset = offset + 3;
|
||||
/* Longitude in tenths of a second octet 4 - 6 */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_mslocation_long, tvb, offset, 3, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_mslocation_long, tvb, offset, 3, ENC_BIG_ENDIAN);
|
||||
offset = offset + 3;
|
||||
/* Resolution in units of 1 foot octet 7, octet 8 optional */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_mslocation_res, tvb, offset, -1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_mslocation_res, tvb, offset, -1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
/* 6.5.2.85 NAMPSCallMode */
|
||||
|
@ -2718,9 +2718,9 @@ dissect_ansi_map_nampschanneldata(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
|
|||
subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
|
||||
|
||||
/* Color Code Indicator (CCIndicator) (octet 1, bits C, D, and E) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_nampschanneldata_CCIndicator, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_nampschanneldata_CCIndicator, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Narrow Analog Voice Channel Assignment (NAVCA) (octet 1, bits A and B) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_nampschanneldata_navca, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_nampschanneldata_navca, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
|
||||
|
@ -3065,7 +3065,7 @@ dissect_ansi_map_pacaindicator(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_pacaindicator);
|
||||
/* PACA Level (octet 1, bits B-E) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_PACA_Level, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_PACA_Level, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Permanent Activation (PA) (octet 1, bit A) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_pacaindicator_pa, tvb, offset, 1, FALSE);
|
||||
}
|
||||
|
@ -3089,7 +3089,7 @@ dissect_ansi_map_pc_ssn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
/* Type (octet 1) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_msc_type, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_msc_type, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* Point Code Member Number octet 2 */
|
||||
b1 = tvb_get_guint8(tvb,offset);
|
||||
|
@ -3116,15 +3116,15 @@ dissect_ansi_map_pilotbillingid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
/* First Originating MarketID octet 1 and 2 */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset = offset + 2;
|
||||
/* First Originating Switch Number octet 3*/
|
||||
proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/* ID Number */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_idno, tvb, offset, 3, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_idno, tvb, offset, 3, ENC_BIG_ENDIAN);
|
||||
offset = offset + 3;
|
||||
proto_tree_add_item(subtree, hf_ansi_map_segcount, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_segcount, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
/* 6.5.2.96 PreferredLanguageIndicator */
|
||||
|
@ -3268,10 +3268,10 @@ dissect_ansi_map_sms_originationrestrictions(tvbuff_t *tvb, packet_info *pinfo _
|
|||
|
||||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_sms_originationrestrictions);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitHGFE, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitHGFE, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_sms_originationrestrictions_fmc, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_sms_originationrestrictions_direct, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_sms_originationrestrictions_default, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_sms_originationrestrictions_default, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
}
|
||||
|
||||
|
@ -3362,7 +3362,7 @@ dissect_ansi_map_systemcapabilities(tvbuff_t *tvb, packet_info *pinfo _U_, proto
|
|||
|
||||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_systemcapabilities);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitHG, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitHG, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_systemcapabilities_dp, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_systemcapabilities_ssd, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_systemcapabilities_cave, tvb, offset, 1, FALSE);
|
||||
|
@ -3457,17 +3457,17 @@ dissect_ansi_map_terminationtriggers(tvbuff_t *tvb, packet_info *pinfo _U_, prot
|
|||
|
||||
proto_tree_add_item(subtree, hf_ansi_map_reservedBitH, tvb, offset, 1, FALSE);
|
||||
/* No Page Response (NPR) (octet 1, bits E and F) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_npr, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_npr, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* No Answer (NA) (octet 1, bits G and H) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_na, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_na, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Routing Failure (RF) (octet 1, bits C and D) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_rf, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_rf, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Busy (octet 1, bits A and B) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_busy, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_busy, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
|
||||
/* None Reachable (NR) (octet 2, bit A) */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_nr, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_nr, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
/* 6.5.2.160 TransactionCapability (TIA/EIA-41.5-D, page 5-315) */
|
||||
|
@ -3573,7 +3573,7 @@ dissect_ansi_map_transactioncapability(tvbuff_t *tvb, packet_info *pinfo _U_, pr
|
|||
/* TerminationList (TL) (octet 2, bit E) */
|
||||
proto_tree_add_item(subtree, hf_ansi_trans_cap_tl, tvb, offset, 1, FALSE);
|
||||
/* Multiple Terminations (octet 2, bits A-D) */
|
||||
proto_tree_add_item(subtree, hf_ansi_trans_cap_multerm, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_trans_cap_multerm, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
/* 6.5.2.162 UniqueChallengeReport */
|
||||
|
@ -3902,10 +3902,10 @@ static const value_string ansi_map_TDMABandwidth_vals[] = {
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
|
||||
/ Trunk Group Number (G) Octet 1 /
|
||||
proto_tree_add_item(subtree, hf_ansi_map_tgn, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_tgn, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
/ Trunk Member Number (M) Octet2 /
|
||||
proto_tree_add_item(subtree, hf_ansi_map_tmn, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_tmn, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
*/
|
||||
/* 6.5.2.as ChangeServiceAttributes N.S0008-0 v 1.0 */
|
||||
|
@ -4162,10 +4162,10 @@ dissect_ansi_map_controlnetworkid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
|
|||
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_controlnetworkid);
|
||||
/* MarketID octet 1 and 2 */
|
||||
proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset = offset + 2;
|
||||
/* Switch Number octet 3*/
|
||||
proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
}
|
||||
|
||||
|
|
|
@ -1517,19 +1517,19 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa
|
|||
/* RFC2510 TCP transport */
|
||||
ti = proto_tree_add_item(tree, proto_cmp, tvb, offset, 5, FALSE);
|
||||
tcptrans_tree = proto_item_add_subtree(ti, ett_cmp);
|
||||
proto_tree_add_item(tree, hf_cmp_tcptrans_len, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(tree, hf_cmp_tcptrans_len, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
proto_tree_add_item(tree, hf_cmp_tcptrans_type, tvb, offset++, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_cmp_tcptrans_type, tvb, offset++, 1, ENC_BIG_ENDIAN);
|
||||
} else {
|
||||
/* post RFC2510 TCP transport - the former "type" field is now "version" */
|
||||
ti = proto_tree_add_text(tree, tvb, offset, 7, "TCP transport");
|
||||
tcptrans_tree = proto_item_add_subtree(ti, ett_cmp);
|
||||
pdu_type=tvb_get_guint8(tvb, 6);
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_len, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_len, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans10_version, tvb, offset++, 1, FALSE);
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans10_flags, tvb, offset++, 1, FALSE);
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_type, tvb, offset++, 1, FALSE);
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans10_version, tvb, offset++, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans10_flags, tvb, offset++, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_type, tvb, offset++, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
col_add_str (pinfo->cinfo, COL_INFO, val_to_str (pdu_type, cmp_pdu_types, "0x%x"));
|
||||
|
@ -1541,7 +1541,7 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa
|
|||
offset += tvb_length_remaining(tvb, offset);
|
||||
break;
|
||||
case CMP_TYPE_POLLREP:
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_poll_ref, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_poll_ref, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
|
||||
ts.secs = tvb_get_ntohl(tvb, 4);
|
||||
|
@ -1550,13 +1550,13 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa
|
|||
offset += 4;
|
||||
break;
|
||||
case CMP_TYPE_POLLREQ:
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_poll_ref, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_poll_ref, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
break;
|
||||
case CMP_TYPE_NEGPOLLREP:
|
||||
break;
|
||||
case CMP_TYPE_PARTIALMSGREP:
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_next_poll_ref, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_next_poll_ref, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
|
||||
ts.secs = tvb_get_ntohl(tvb, 4);
|
||||
|
|
|
@ -2331,17 +2331,17 @@ dissect_gsm_map_ext_qos_subscribed(tvbuff_t *tvb, packet_info *pinfo _U_, proto_
|
|||
6-13.
|
||||
*/
|
||||
/* Allocation/Retention Priority */
|
||||
proto_tree_add_item(subtree, hf_gsm_map_ext_qos_subscribed_pri, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_gsm_map_ext_qos_subscribed_pri, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
|
||||
/* Quality of Service Octets 6-13.( Octet 2 - 9 Here) */
|
||||
|
||||
/* Traffic class, octet 6 (see 3GPP TS 23.107) Bits 8 7 6 */
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_traffic_cls, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_traffic_cls, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Delivery order, octet 6 (see 3GPP TS 23.107) Bits 5 4 */
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_del_order, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_del_order, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Delivery of erroneous SDUs, octet 6 (see 3GPP TS 23.107) Bits 3 2 1 */
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_del_of_err_sdu, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_del_of_err_sdu, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
|
||||
/* Maximum SDU size, octet 7 (see 3GPP TS 23.107) */
|
||||
|
@ -2389,15 +2389,15 @@ dissect_gsm_map_ext_qos_subscribed(tvbuff_t *tvb, packet_info *pinfo _U_, proto_
|
|||
}
|
||||
offset++;
|
||||
/* Residual Bit Error Rate (BER), octet 10 (see 3GPP TS 23.107) Bits 8 7 6 5 */
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_ber, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_ber, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* SDU error ratio, octet 10 (see 3GPP TS 23.107) */
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_sdu_err_rat, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_sdu_err_rat, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
|
||||
/* Transfer delay, octet 11 (See 3GPP TS 23.107) Bits 8 7 6 5 4 3 */
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_transfer_delay, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_transfer_delay, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
/* Traffic handling priority, octet 11 (see 3GPP TS 23.107) Bits 2 1 */
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_traff_hdl_pri, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(subtree, hf_gsm_map_qos_traff_hdl_pri, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
|
||||
/* Guaranteed bit rate for uplink, octet 12 (See 3GPP TS 23.107)
|
||||
|
@ -2626,16 +2626,16 @@ dissect_cbs_data_coding_scheme(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
|
|||
|
||||
octet = tvb_get_guint8(tvb,0);
|
||||
coding_grp = octet >>4;
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
sms_encoding = SMS_ENCODING_NOT_SET;
|
||||
switch (coding_grp){
|
||||
case 0:
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp0_lang, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp0_lang, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
sms_encoding = SMS_ENCODING_7BIT;
|
||||
break;
|
||||
case 1:
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp1_lang, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp1_lang, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
if ((octet & 0x0f)== 0){
|
||||
sms_encoding = SMS_ENCODING_7BIT_LANG;
|
||||
}else{
|
||||
|
@ -2643,11 +2643,11 @@ dissect_cbs_data_coding_scheme(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
|
|||
}
|
||||
break;
|
||||
case 2:
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp2_lang, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp2_lang, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
sms_encoding = SMS_ENCODING_7BIT;
|
||||
break;
|
||||
case 3:
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp3_lang, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp3_lang, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
sms_encoding = SMS_ENCODING_7BIT;
|
||||
break;
|
||||
/* Coding_grp 01xx */
|
||||
|
@ -2661,9 +2661,9 @@ dissect_cbs_data_coding_scheme(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
|
|||
/* FALLTHRU */
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp4_7_comp, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp4_7_class_ind, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp4_7_char_set, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp4_7_char_set, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
if ((octet & 0x10)== 0x10){
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp4_7_class, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp4_7_class, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
/* Bits 3 and 2 indicate the character set being used, */
|
||||
character_set = (octet&0x0c)>>2;
|
||||
|
@ -2693,8 +2693,8 @@ dissect_cbs_data_coding_scheme(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
|
|||
break;
|
||||
case 9:
|
||||
/* Message with User Data Header (UDH) structure:*/
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp4_7_char_set, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp4_7_class, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp4_7_char_set, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp4_7_class, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
character_set = (octet&0x0c)>>2;
|
||||
switch (character_set){
|
||||
case 0:
|
||||
|
@ -2734,8 +2734,8 @@ dissect_cbs_data_coding_scheme(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
|
|||
break;
|
||||
case 15:
|
||||
/* Data coding / message handling */
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp15_mess_code, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp15_class, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp15_mess_code, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tree, hf_gsm_map_cbs_coding_grp15_class, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
character_set = (octet&0x04)>>2;
|
||||
if (character_set == 0){
|
||||
sms_encoding = SMS_ENCODING_7BIT;
|
||||
|
@ -2758,8 +2758,8 @@ dissect_gsm_map_msisdn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
|
|||
guint8 np;
|
||||
|
||||
proto_tree_add_item(tree, hf_gsm_map_extension, tvb, 0,1,FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_nature_of_number, tvb, 0,1,FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_number_plan, tvb, 0,1,FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_nature_of_number, tvb, 0,1,ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tree, hf_gsm_map_number_plan, tvb, 0,1,ENC_BIG_ENDIAN);
|
||||
|
||||
digit_str = unpack_digits(tvb, 1);
|
||||
|
||||
|
|
|
@ -662,10 +662,10 @@ static void dissect_idmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_t
|
|||
|
||||
/* now check the segment fields */
|
||||
|
||||
proto_tree_add_item(tree, hf_idmp_version, tvb, offset, 1, FALSE); offset++;
|
||||
proto_tree_add_item(tree, hf_idmp_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset++;
|
||||
proto_tree_add_item(tree, hf_idmp_final, tvb, offset, 1, FALSE);
|
||||
idmp_final = tvb_get_guint8(tvb, offset); offset++;
|
||||
proto_tree_add_item(tree, hf_idmp_length, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(tree, hf_idmp_length, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
idmp_length = tvb_get_ntohl(tvb, offset); offset += 4;
|
||||
|
||||
if(idmp_reassemble) {
|
||||
|
|
|
@ -631,7 +631,7 @@ static int dissect_mscldap_ntver_flags(proto_tree *parent_tree, tvbuff_t *tvb, i
|
|||
gboolean one_bit_set = FALSE;
|
||||
|
||||
flags=tvb_get_letohl(tvb, offset);
|
||||
item=proto_tree_add_item(parent_tree, hf_mscldap_ntver_flags, tvb, offset, 4, TRUE);
|
||||
item=proto_tree_add_item(parent_tree, hf_mscldap_ntver_flags, tvb, offset, 4, ENC_LITTLE_ENDIAN);
|
||||
if(parent_tree){
|
||||
tree = proto_item_add_subtree(item, ett_mscldap_ntver_flags);
|
||||
}
|
||||
|
@ -4190,7 +4190,7 @@ static int dissect_mscldap_netlogon_flags(proto_tree *parent_tree, tvbuff_t *tvb
|
|||
gboolean one_bit_set = FALSE;
|
||||
|
||||
flags=tvb_get_letohl(tvb, offset);
|
||||
item=proto_tree_add_item(parent_tree, hf_mscldap_netlogon_flags, tvb, offset, 4, TRUE);
|
||||
item=proto_tree_add_item(parent_tree, hf_mscldap_netlogon_flags, tvb, offset, 4, ENC_LITTLE_ENDIAN);
|
||||
if(parent_tree){
|
||||
tree = proto_item_add_subtree(item, ett_mscldap_netlogon_flags);
|
||||
}
|
||||
|
@ -4384,11 +4384,11 @@ static void dissect_NetLogon_PDU(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
|
|||
subtree = proto_item_add_subtree(item, ett_mscldap_ipdetails);
|
||||
|
||||
/* get sockaddr family */
|
||||
proto_tree_add_item(subtree, hf_mscldap_netlogon_ipaddress_family, tvb, offset, 2, TRUE);
|
||||
proto_tree_add_item(subtree, hf_mscldap_netlogon_ipaddress_family, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset +=2;
|
||||
|
||||
/* get sockaddr port */
|
||||
proto_tree_add_item(subtree, hf_mscldap_netlogon_ipaddress_port, tvb, offset, 2, TRUE);
|
||||
proto_tree_add_item(subtree, hf_mscldap_netlogon_ipaddress_port, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset +=2;
|
||||
|
||||
/* get IP address */
|
||||
|
@ -4413,11 +4413,11 @@ static void dissect_NetLogon_PDU(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
|
|||
offset = dissect_mscldap_ntver_flags(tree, tvb, offset);
|
||||
|
||||
/* LM Token */
|
||||
proto_tree_add_item(tree, hf_mscldap_netlogon_lm_token, tvb, offset, 2, TRUE);
|
||||
proto_tree_add_item(tree, hf_mscldap_netlogon_lm_token, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
/* NT Token */
|
||||
proto_tree_add_item(tree, hf_mscldap_netlogon_nt_token, tvb, offset, 2, TRUE);
|
||||
proto_tree_add_item(tree, hf_mscldap_netlogon_nt_token, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
}
|
||||
|
|
|
@ -742,34 +742,34 @@ dissect_mpeg_pes_header_data(tvbuff_t *tvb, packet_info *pinfo,
|
|||
}
|
||||
if (flags & COPY_INFO_FLAG) {
|
||||
proto_tree_add_item(tree, hf_mpeg_pes_copy_info, tvb,
|
||||
offset, 1, FALSE);
|
||||
offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
}
|
||||
if (flags & CRC_FLAG) {
|
||||
proto_tree_add_item(tree, hf_mpeg_pes_crc, tvb,
|
||||
offset, 2, FALSE);
|
||||
offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
}
|
||||
|
||||
if (flags & EXTENSION_FLAG) {
|
||||
int flags2 = tvb_get_guint8(tvb, offset);
|
||||
proto_tree_add_item(tree, hf_mpeg_pes_extension_flags, tvb,
|
||||
offset, 1, FALSE);
|
||||
offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
|
||||
if (flags2 & PRIVATE_DATA_FLAG) {
|
||||
proto_tree_add_item(tree, hf_mpeg_pes_private_data, tvb,
|
||||
offset, 2, FALSE);
|
||||
offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
}
|
||||
if (flags2 & PACK_LENGTH_FLAG) {
|
||||
proto_tree_add_item(tree, hf_mpeg_pes_pack_length, tvb,
|
||||
offset, 1, FALSE);
|
||||
offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
}
|
||||
if (flags2 & SEQUENCE_FLAG) {
|
||||
proto_tree_add_item(tree, hf_mpeg_pes_sequence, tvb,
|
||||
offset, 2, FALSE);
|
||||
offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
}
|
||||
if (flags2 & PSTD_BUFFER_FLAG) {
|
||||
|
@ -780,7 +780,7 @@ dissect_mpeg_pes_header_data(tvbuff_t *tvb, packet_info *pinfo,
|
|||
}
|
||||
if (flags2 & EXTENSION_FLAG2) {
|
||||
proto_tree_add_item(tree, hf_mpeg_pes_extension2, tvb,
|
||||
offset, 2, FALSE);
|
||||
offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
}
|
||||
}
|
||||
|
@ -813,7 +813,7 @@ dissect_mpeg_pes_pack_header(tvbuff_t *tvb, gint offset,
|
|||
|
||||
stuffing_length = tvb_get_guint8(tvb, offset / 8) & 0x07;
|
||||
proto_tree_add_item(tree, hf_mpeg_pes_stuffing_length, tvb,
|
||||
offset / 8, 1, FALSE);
|
||||
offset / 8, 1, ENC_BIG_ENDIAN);
|
||||
offset += 1 * 8;
|
||||
|
||||
if (stuffing_length > 0) {
|
||||
|
|
|
@ -12533,14 +12533,14 @@ dissect_qsig_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
|
|||
/*--- dissect_qsig_transit_counter_ie ---------------------------------------*/
|
||||
static int
|
||||
dissect_qsig_transit_counter_ie(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int length _U_) {
|
||||
proto_tree_add_item(tree, hf_qsig_tc, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_qsig_tc, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
return offset;
|
||||
}
|
||||
/*--- dissect_qsig_party_category_ie ----------------------------------------*/
|
||||
static int
|
||||
dissect_qsig_party_category_ie(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int length _U_) {
|
||||
proto_tree_add_item(tree, hf_qsig_pc, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_qsig_pc, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
return offset;
|
||||
}
|
||||
|
@ -12565,9 +12565,9 @@ dissect_qsig_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int codeset
|
|||
val_to_str(ie_type, VALS(qsig_str_ie_type[codeset]), "unknown (0x%02X)"));
|
||||
ie_tree = proto_item_add_subtree(ti_ie, ett_qsig_ie);
|
||||
proto_tree_add_item(ie_tree, *hf_qsig_ie_type_arr[codeset], tvb, offset, 1, FALSE);
|
||||
hidden_item = proto_tree_add_item(ie_tree, hf_qsig_ie_type, tvb, offset, 1, FALSE);
|
||||
hidden_item = proto_tree_add_item(ie_tree, hf_qsig_ie_type, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
PROTO_ITEM_SET_HIDDEN(hidden_item);
|
||||
proto_tree_add_item(ie_tree, hf_qsig_ie_len, tvb, offset + 1, 1, FALSE);
|
||||
proto_tree_add_item(ie_tree, hf_qsig_ie_len, tvb, offset + 1, 1, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
if (tvb_length_remaining(tvb, offset) <= 0)
|
||||
return;
|
||||
|
|
|
@ -528,8 +528,8 @@ dissect_smrse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
col_add_str(pinfo->cinfo, COL_INFO, val_to_str(tag, tag_vals,"Unknown Tag:0x%02x"));
|
||||
|
||||
proto_tree_add_item(tree, hf_smrse_reserved, tvb, 0, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_smrse_length, tvb, 1, 2, FALSE);
|
||||
proto_tree_add_item(tree, hf_smrse_tag, tvb, 3, 1, FALSE);
|
||||
proto_tree_add_item(tree, hf_smrse_length, tvb, 1, 2, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tree, hf_smrse_tag, tvb, 3, 1, ENC_BIG_ENDIAN);
|
||||
|
||||
switch(tag){
|
||||
case 1:
|
||||
|
|
|
@ -1501,19 +1501,19 @@ dissect_spnego_krb5_cfx_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo
|
|||
/* EC */
|
||||
ec = tvb_get_ntohs(tvb, offset);
|
||||
proto_tree_add_item(tree, hf_spnego_krb5_cfx_ec, tvb, offset, 2,
|
||||
FALSE);
|
||||
ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
/* RRC */
|
||||
rrc = tvb_get_ntohs(tvb, offset);
|
||||
proto_tree_add_item(tree, hf_spnego_krb5_cfx_rrc, tvb, offset, 2,
|
||||
FALSE);
|
||||
ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
/* sequence number */
|
||||
|
||||
proto_tree_add_item(tree, hf_spnego_krb5_cfx_seq, tvb, offset, 8,
|
||||
FALSE);
|
||||
ENC_BIG_ENDIAN);
|
||||
offset += 8;
|
||||
|
||||
/* Checksum of plaintext padded data */
|
||||
|
@ -1619,7 +1619,7 @@ dissect_spnego_krb5_cfx_getmic_base(tvbuff_t *tvb, int offset, packet_info *pinf
|
|||
/* sequence number */
|
||||
|
||||
proto_tree_add_item(tree, hf_spnego_krb5_cfx_seq, tvb, offset, 8,
|
||||
FALSE);
|
||||
ENC_BIG_ENDIAN);
|
||||
offset += 8;
|
||||
|
||||
/* Checksum of plaintext padded data */
|
||||
|
|
|
@ -199,7 +199,7 @@ dissect_PhsMeas1(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tv
|
|||
value = tvb_get_ntohl(tvb, offset);
|
||||
qual = tvb_get_ntohl(tvb, offset + 4);
|
||||
|
||||
proto_tree_add_item(subtree, hf_sv_phmeas_instmag_i, tvb, offset, 4, FALSE);
|
||||
proto_tree_add_item(subtree, hf_sv_phmeas_instmag_i, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_bitmask(subtree, tvb, offset + 4, hf_sv_phsmeas_q, ett_phsmeas_q, q_flags, FALSE);
|
||||
|
||||
if (i < IEC61850_SV_MAX_PHSMEAS_ENTRIES) {
|
||||
|
@ -386,19 +386,19 @@ dissect_sv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
|
||||
/* APPID */
|
||||
if (tree && tvb_reported_length_remaining(tvb, offset) >= 2)
|
||||
proto_tree_add_item(tree, hf_sv_appid, tvb, offset, 2, FALSE);
|
||||
proto_tree_add_item(tree, hf_sv_appid, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
|
||||
/* Length */
|
||||
if (tree && tvb_reported_length_remaining(tvb, offset) >= 4)
|
||||
proto_tree_add_item(tree, hf_sv_length, tvb, offset + 2, 2, FALSE);
|
||||
proto_tree_add_item(tree, hf_sv_length, tvb, offset + 2, 2, ENC_BIG_ENDIAN);
|
||||
|
||||
/* Reserved 1 */
|
||||
if (tree && tvb_reported_length_remaining(tvb, offset) >= 6)
|
||||
proto_tree_add_item(tree, hf_sv_reserve1, tvb, offset + 4, 2, FALSE);
|
||||
proto_tree_add_item(tree, hf_sv_reserve1, tvb, offset + 4, 2, ENC_BIG_ENDIAN);
|
||||
|
||||
/* Reserved 2 */
|
||||
if (tree && tvb_reported_length_remaining(tvb, offset) >= 8)
|
||||
proto_tree_add_item(tree, hf_sv_reserve2, tvb, offset + 6, 2, FALSE);
|
||||
proto_tree_add_item(tree, hf_sv_reserve2, tvb, offset + 6, 2, ENC_BIG_ENDIAN);
|
||||
|
||||
offset = 8;
|
||||
while (tree && tvb_reported_length_remaining(tvb, offset) > 0){
|
||||
|
|
|
@ -9241,7 +9241,7 @@ dissect_tetra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
/* Timer */
|
||||
txtimer = tvb_get_letohl(tvb, offset);
|
||||
tetra_sub_item = proto_tree_add_item(tetra_header_tree, hf_tetra_timer, tvb, offset, 4, TRUE);
|
||||
tetra_sub_item = proto_tree_add_item(tetra_header_tree, hf_tetra_timer, tvb, offset, 4, ENC_LITTLE_ENDIAN);
|
||||
tslot = ((txtimer & 0x7800) >> 11);
|
||||
if(tslot==4)
|
||||
tslot = 3;
|
||||
|
|
Loading…
Reference in New Issue