diff options
| author | Pascal Quantin <pascal@wireshark.org> | 2020-12-29 21:16:39 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal@wireshark.org> | 2020-12-29 21:16:39 +0100 |
| commit | a9d4e70edccd6cc6fe0bbfee38139f4340209458 (patch) | |
| tree | 175232523b47f642c26598522535d7d5ec806e4a | |
| parent | 8454674581f6d98473f7870902bd4a42202a69ec (diff) | |
GOOSE: fix a duplicate FIELD_RENAME
| -rw-r--r-- | epan/dissectors/asn1/goose/goose.cnf | 9 | ||||
| -rw-r--r-- | epan/dissectors/packet-goose.c | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/epan/dissectors/asn1/goose/goose.cnf b/epan/dissectors/asn1/goose/goose.cnf index 6b3ab1131e..ab54932b36 100644 --- a/epan/dissectors/asn1/goose/goose.cnf +++ b/epan/dissectors/asn1/goose/goose.cnf @@ -10,12 +10,6 @@ #.NO_EMIT ONLY_VALS GOOSEpdu -#.FIELD_RENAME -GetReferenceRequestPdu/offset getReferenceRequest_offset - -#.FIELD_ATTR -GetReferenceRequestPdu/offset ABBREV=getReferenceRequest.offset - #.FN_BODY IECGoosePdu/simulation VAL_PTR = &value gboolean value; guint32 len = tvb_reported_length_remaining(tvb, offset); @@ -77,7 +71,7 @@ UtcTime TYPE = FT_STRING DISPLAY = BASE_NONE #.FIELD_RENAME -GetReferenceRequestPdu/offset getReferenceRequestPDU_offset +GetReferenceRequestPdu/offset getReferenceRequest_offset GSEMngtResponses/getGsReference gseMngtResponses_GetGSReference GSEMngtResponses/getGoReference gseMngtResponses_GetGOReference GSEMngtResponses/getGSSEDataOffset gseMngtResponses_GetGSSEDataOffset @@ -86,5 +80,6 @@ GSEMngtResponses/getGOOSEElementNumber gseMngtResponses_GetGOOSEElementNumber #.FIELD_ATTR IECGoosePdu/stNum TYPE = FT_UINT32 DISPLAY = BASE_DEC IECGoosePdu/sqNum TYPE = FT_UINT32 DISPLAY = BASE_DEC +GetReferenceRequestPdu/offset ABBREV=getReferenceRequest.offset #.END diff --git a/epan/dissectors/packet-goose.c b/epan/dissectors/packet-goose.c index 4a125d0743..62f86384b1 100644 --- a/epan/dissectors/packet-goose.c +++ b/epan/dissectors/packet-goose.c @@ -515,7 +515,7 @@ dissect_goose_GSEMngtPdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_goose_UtcTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 37 "./asn1/goose/goose.cnf" +#line 31 "./asn1/goose/goose.cnf" guint32 len; guint32 seconds; @@ -563,7 +563,7 @@ dissect_goose_UtcTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ static int dissect_goose_T_simulation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 20 "./asn1/goose/goose.cnf" +#line 14 "./asn1/goose/goose.cnf" gboolean value; guint32 len = tvb_reported_length_remaining(tvb, offset); int origin_offset = offset; |