[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=62a149c5a4c75039b6564978e74db1ab7a65ca1e
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

62a149c by Hadriel Kaplan (hadriel@xxxxxxxxxxxxxxxxx):

    Lua accessor for Protocol field type gets wrong data
    
    When a Lua dissector/tap accesses the value of a Field of FT_PROTOCOL ftype, the
    returned ByteArray contains the wrong data.  Also, calling such a field's
    tostring() method returns a string of "(unknown)" instead of the hex of the
    data.
    
    Conflicts:
    	epan/wslua/wslua_field.c
    
    Bug: 10801
    Change-Id: I8a0642dc0e41af444d211bbe4106cd21207084a6
    Reviewed-on: https://code.wireshark.org/review/6003
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Hadriel Kaplan <hadrielk@xxxxxxxxx>
    Tested-by: Hadriel Kaplan <hadrielk@xxxxxxxxx>
    (cherry picked from commit ceeeea089ac68366d520eaf332fed4231ce8831e)
    Reviewed-on: https://code.wireshark.org/review/6135
    Petri-Dish: Hadriel Kaplan <hadrielk@xxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  1266276   [Automatic manuf, services and enterprise-numbers update for 2014-12-28]
    adds  62a149c   Lua accessor for Protocol field type gets wrong data


Summary of changes:
 epan/wslua/wslua_field.c |   32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)