diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2015-03-22 13:10:30 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-03-24 05:13:46 +0000 |
| commit | cc4bce537bdd92ec10c0bf26432f3bb2396ac4a6 (patch) | |
| tree | 4a37a85ca57088f6f564f08a8c2d9853950573ba /epan | |
| parent | 693304bf537ac15cb55ab30088ed559e918977d2 (diff) | |
ftsanity.py: make it work with modern tshark
Broken since 4ac2441d7c7371249a3422fc2e67b8ad98aa6631 ("Coalesce "-G
fields2" and "-G fields3" into "-G fields").
This patch fixes Python3 compatibility, fixes handling of the changed
output and option and prints the faulting line on assertion error. It
also updates two dissectors which had tabs in their description,
breaking the output.
Tested with Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3.
Change-Id: Ifcd0d0eb092b357eca357cd53f2e1348ebf8885c
Reviewed-on: https://code.wireshark.org/review/7791
Reviewed-by: Gilbert Ramirez <gram@alumni.rice.edu>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-atn-ulcs.c | 14 | ||||
| -rw-r--r-- | epan/dissectors/packet-ceph.c | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/epan/dissectors/packet-atn-ulcs.c b/epan/dissectors/packet-atn-ulcs.c index fd9f70978b..88f3bbddad 100644 --- a/epan/dissectors/packet-atn-ulcs.c +++ b/epan/dissectors/packet-atn-ulcs.c @@ -183,7 +183,7 @@ static int dissect_ACSE_apdu_PDU( tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, - void *data _U_); + void *data _U_); guint32 dissect_per_object_descriptor_t( tvbuff_t *tvb, @@ -2082,7 +2082,7 @@ dissect_atn_ulcs( tvb, offset, 1, - value_ses_pres, + value_ses_pres, "%s (0x%02x)", val_to_str( value_ses_pres & ATN_SES_PRES_MASK , atn_pres_vals, "?"), value_pres); @@ -2511,8 +2511,7 @@ void proto_register_atn_ulcs (void) BASE_HEX, VALS(srf_b1), 0x01, - "Determines if transport connection reject is \ - transient or persistent", + "Determines if transport connection reject is transient or persistent", HFILL}}, {&hf_atn_ses_param_b2, { "SRF Parameter B2", @@ -2521,8 +2520,7 @@ void proto_register_atn_ulcs (void) BASE_HEX, VALS(srf_b2), 0x02, - "Determines if transport connection is \ - retained or released", + "Determines if transport connection is retained or released", HFILL}}, { &hf_atn_pres_err, { "Error Code", "atn-ulcs.pres.cpr-error", @@ -2573,12 +2571,12 @@ void proto_register_atn_ulcs (void) &ett_atn_ulcs_AttributeTypeAndValue, /*--- End of included file: packet-atn-ulcs-ettarr.c ---*/ -#line 851 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 849 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" &ett_atn_ses, &ett_atn_pres, &ett_atn_acse, &ett_atn_ulcs - }; + }; proto_atn_ulcs = proto_register_protocol ( ATN_ULCS_PROTO , diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c index 65a2c15f85..8484be0c20 100644 --- a/epan/dissectors/packet-ceph.c +++ b/epan/dissectors/packet-ceph.c @@ -10467,7 +10467,7 @@ proto_register_ceph(void) } }, { &ei_msg_unknown, { "ceph.msg_unknown", PI_UNDECODED, PI_WARN, - "Unknown message type. This most likely means that the dissector " + "Unknown message type. This most likely means that the dissector " "is out of date. However it could also be an error by the " "sender ", EXPFILL } }, |