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

SV: Interpret reserve1 S bit 

The simulated bit of the reserve1 field is now interpreted.
This commit is contained in:
Aitor Garcia 2020-12-30 14:17:07 +00:00 committed by Wireshark GitLab Utility
parent bf81d7c16a
commit f26a2952e4
2 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
epan/dissectors/asn1/sv/packet-sv-template.c
View File

@ -54,6 +54,10 @@
/* see UCA Implementation Guideline for IEC 61850-9-2 */
#define Q_DERIVED (1U << 13)
/* Bit fields in the Reserved attributes */
#define F_RESERVE1_S_BIT 0x8000
void proto_register_sv(void);
void proto_reg_handoff_sv(void);
@ -66,6 +70,7 @@ static int proto_sv = -1;
static int hf_sv_appid = -1;
static int hf_sv_length = -1;
static int hf_sv_reserve1 = -1;
static int hf_sv_reserve1_s_bit = -1;
static int hf_sv_reserve2 = -1;
static int hf_sv_phmeas_instmag_i = -1;
static int hf_sv_phsmeas_q = -1;
@ -92,6 +97,8 @@ static int ett_sv = -1;
static int ett_phsmeas = -1;
static int ett_phsmeas_q = -1;
static int ett_gmidentity = -1;
static int ett_reserve1 = -1;
#include "packet-sv-ett.c"
@ -189,6 +196,12 @@ dissect_sv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* dat
guint sv_length = 0;
proto_item *item;
proto_tree *tree;
static int * const reserve1_flags[] = {
&hf_sv_reserve1_s_bit,
NULL
};
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
@ -206,7 +219,9 @@ dissect_sv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* dat
proto_tree_add_item_ret_uint(tree, hf_sv_length, tvb, offset + 2, 2, ENC_BIG_ENDIAN, &sv_length);
/* Reserved 1 */
proto_tree_add_item(tree, hf_sv_reserve1, tvb, offset + 4, 2, ENC_BIG_ENDIAN);
proto_tree_add_bitmask(tree, tvb, offset + 4, hf_sv_reserve1, ett_reserve1,
reserve1_flags, ENC_BIG_ENDIAN);
/* Reserved 2 */
proto_tree_add_item(tree, hf_sv_reserve2, tvb, offset + 6, 2, ENC_BIG_ENDIAN);
@ -240,6 +255,10 @@ void proto_register_sv(void) {
{ &hf_sv_reserve1,
{ "Reserved 1", "sv.reserve1", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_sv_reserve1_s_bit,
{ "Simulated", "sv.reserve1.s_bit",
FT_BOOLEAN, 16, NULL, F_RESERVE1_S_BIT, NULL, HFILL } },
{ &hf_sv_reserve2,
{ "Reserved 2", "sv.reserve2", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
@ -304,6 +323,7 @@ void proto_register_sv(void) {
&ett_phsmeas,
&ett_phsmeas_q,
&ett_gmidentity,
&ett_reserve1,
#include "packet-sv-ettarr.c"
};

32
epan/dissectors/packet-sv.c
View File

@ -62,6 +62,10 @@
/* see UCA Implementation Guideline for IEC 61850-9-2 */
#define Q_DERIVED (1U << 13)
/* Bit fields in the Reserved attributes */
#define F_RESERVE1_S_BIT 0x8000
void proto_register_sv(void);
void proto_reg_handoff_sv(void);
@ -74,6 +78,7 @@ static int proto_sv = -1;
static int hf_sv_appid = -1;
static int hf_sv_length = -1;
static int hf_sv_reserve1 = -1;
static int hf_sv_reserve1_s_bit = -1;
static int hf_sv_reserve2 = -1;
static int hf_sv_phmeas_instmag_i = -1;
static int hf_sv_phsmeas_q = -1;
@ -112,13 +117,15 @@ static int hf_sv_smpMod = -1; /* T_smpMod */
static int hf_sv_gmidData = -1; /* GmidData */
/*--- End of included file: packet-sv-hf.c ---*/
#line 89 "./asn1/sv/packet-sv-template.c"
#line 94 "./asn1/sv/packet-sv-template.c"
/* Initialize the subtree pointers */
static int ett_sv = -1;
static int ett_phsmeas = -1;
static int ett_phsmeas_q = -1;
static int ett_gmidentity = -1;
static int ett_reserve1 = -1;
/*--- Included file: packet-sv-ett.c ---*/
@ -129,7 +136,7 @@ static gint ett_sv_SEQUENCE_OF_ASDU = -1;
static gint ett_sv_ASDU = -1;
/*--- End of included file: packet-sv-ett.c ---*/
#line 97 "./asn1/sv/packet-sv-template.c"
#line 104 "./asn1/sv/packet-sv-template.c"
static expert_field ei_sv_mal_utctime = EI_INIT;
static expert_field ei_sv_zero_pdu = EI_INIT;
@ -472,7 +479,7 @@ dissect_sv_SampledValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
/*--- End of included file: packet-sv-fn.c ---*/
#line 180 "./asn1/sv/packet-sv-template.c"
#line 187 "./asn1/sv/packet-sv-template.c"
/*
* Dissect SV PDUs inside a PPDU.
@ -485,6 +492,12 @@ dissect_sv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* dat
guint sv_length = 0;
proto_item *item;
proto_tree *tree;
static int * const reserve1_flags[] = {
&hf_sv_reserve1_s_bit,
NULL
};
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
@ -502,7 +515,9 @@ dissect_sv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* dat
proto_tree_add_item_ret_uint(tree, hf_sv_length, tvb, offset + 2, 2, ENC_BIG_ENDIAN, &sv_length);
/* Reserved 1 */
proto_tree_add_item(tree, hf_sv_reserve1, tvb, offset + 4, 2, ENC_BIG_ENDIAN);
proto_tree_add_bitmask(tree, tvb, offset + 4, hf_sv_reserve1, ett_reserve1,
reserve1_flags, ENC_BIG_ENDIAN);
/* Reserved 2 */
proto_tree_add_item(tree, hf_sv_reserve2, tvb, offset + 6, 2, ENC_BIG_ENDIAN);
@ -536,6 +551,10 @@ void proto_register_sv(void) {
{ &hf_sv_reserve1,
{ "Reserved 1", "sv.reserve1", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_sv_reserve1_s_bit,
{ "Simulated", "sv.reserve1.s_bit",
FT_BOOLEAN, 16, NULL, F_RESERVE1_S_BIT, NULL, HFILL } },
{ &hf_sv_reserve2,
{ "Reserved 2", "sv.reserve2", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
@ -652,7 +671,7 @@ void proto_register_sv(void) {
NULL, HFILL }},
/*--- End of included file: packet-sv-hfarr.c ---*/
#line 299 "./asn1/sv/packet-sv-template.c"
#line 318 "./asn1/sv/packet-sv-template.c"
};
/* List of subtrees */
@ -661,6 +680,7 @@ void proto_register_sv(void) {
&ett_phsmeas,
&ett_phsmeas_q,
&ett_gmidentity,
&ett_reserve1,
/*--- Included file: packet-sv-ettarr.c ---*/
#line 1 "./asn1/sv/packet-sv-ettarr.c"
@ -670,7 +690,7 @@ void proto_register_sv(void) {
&ett_sv_ASDU,
/*--- End of included file: packet-sv-ettarr.c ---*/
#line 308 "./asn1/sv/packet-sv-template.c"
#line 328 "./asn1/sv/packet-sv-template.c"
};
static ei_register_info ei[] = {