Wireshark-commits: [Wireshark-commits] master 59816ef: Make the Flex scanners and YACC parser in li
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 3 Apr 2016 22:21:44 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=59816ef00c6dd09532d80b393ba03f8194aba236
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

59816ef by Guy Harris (guy@xxxxxxxxxxxx):

    Make the Flex scanners and YACC parser in libraries reentrant.
    
    master-branch libpcap now generates a reentrant Flex scanner and
    Bison/Berkeley YACC parser for capture filter expressions, so it
    requires versions of Flex and Bison/Berkeley YACC that support that.
    
    We might as well do the same.  For libwiretap, it means we could
    actually have multiple K12 text or Ascend/Lucent text files open at the
    same time.  For libwireshark, it might not be as useful, as we only read
    configuration files at startup (which should only happen once, in one
    thread) or on demand (in which case, if we ever support multiple threads
    running libwireshark, we'd need a mutex to ensure that only one file
    reads it), but it's still the right thing to do.
    
    We also require a version of Flex that can write out a header file, so
    we change the runlex script to generate the header file ourselves. This
    means we require a version of Flex new enough to support --header-file.
    
    Clean up some other stuff encountered in the process.
    
    Change-Id: Id23078c6acea549a52fc687779bb55d715b55c16
    Reviewed-on: https://code.wireshark.org/review/14719
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  e42a43b   LTE RRC: upgrade dissector to v13.1.0
    adds  59816ef   Make the Flex scanners and YACC parser in libraries reentrant.


Summary of changes:
 cmake/modules/FindLEX.cmake          |   10 +-
 epan/Makefile.am                     |    3 +-
 epan/dfilter/dfilter-int.h           |    8 +-
 epan/dfilter/dfilter.c               |   37 ++-
 epan/dfilter/scanner.l               |   75 +++--
 epan/diam_dict.l                     |  537 +++++++++++++++++++++-------------
 epan/dtd_parse.h                     |    1 -
 epan/dtd_parse.l                     |  151 ++++++----
 epan/dtd_preparse.l                  |  165 +++++++----
 epan/radius_dict.l                   |  449 ++++++++++++++++------------
 epan/uat_load.l                      |  267 +++++++++++------
 plugins/mate/Makefile.am             |    3 +-
 plugins/mate/mate_parser.l           |  275 ++++++++++-------
 plugins/wimaxasncp/Makefile.am       |    4 +
 plugins/wimaxasncp/wimaxasncp_dict.l |  447 +++++++++++++++++-----------
 tools/runlex.sh                      |   91 +++---
 ui/Makefile.am                       |    2 +
 ui/gtk/file_import_dlg.c             |    7 +-
 ui/qt/import_text_dialog.cpp         |    8 +-
 ui/text_import.c                     |   20 +-
 ui/text_import.h                     |    2 +-
 ui/text_import_scanner.l             |   42 ++-
 wiretap/Makefile.am                  |    6 +-
 wiretap/ascend-int.h                 |   43 +--
 wiretap/ascend.y                     |  395 ++++++++++---------------
 wiretap/ascend_scanner.l             |  126 +++++---
 wiretap/ascendtext.c                 |  133 ++++++++-
 wiretap/k12text.l                    |  268 +++++++++++------
 28 files changed, 2185 insertions(+), 1390 deletions(-)