URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=da8b4fdf174505f00e399f5fdf0aeec73b4eb4de
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark
Commits:
da8b4fd by Guy Harris (guy@xxxxxxxxxxxx):
Don't distinguish between PARSED_NONRECORD and PARSE_FAILED.
If we got no bytes of data from a putative packet, the file isn't a
valid Ascend file, regardless of whether the parser failed or not. Just
have parse_ascend() return a Boolean, TRUE if we got a packet and FALSE
if not, and, in the case where we got no data but the parser didn't
fail, provide "no data returned by parse" as the error string.
(We weren't actually distinguishing between them when we called
parse_ascend() - we were treating all non-PARSED_RECORD returns as an
error.)
Change-Id: I85a3e318015258f6a62c8d23ac2f906e28789982
Reviewed-on: https://code.wireshark.org/review/17130
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
(cherry picked from commit 45a8861b1ed6d394de786e276db8998ea0ea0efc)
Reviewed-on: https://code.wireshark.org/review/17131
Actions performed:
from 2ea7620 Make it a little clearer what ascend_open() is doing.
adds da8b4fd Don't distinguish between PARSED_NONRECORD and PARSE_FAILED.
Summary of changes:
wiretap/ascendtext.c | 39 ++++++++++++++++++---------------------
1 file changed, 18 insertions(+), 21 deletions(-)