Wireshark-commits: [Wireshark-commits] master-2.2 20c1327: VXLAN: Fix conflict for hf fields

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 20 Nov 2016 13:06:52 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=20c13278798f07c8f2739957362a2eedb5d71a77
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

20c1327 by Alexis La Goutte (alexis.lagoutte@xxxxxxxxx):

    VXLAN: Fix conflict for hf fields
    
    'vxlan.flags_reserved' exists multiple times with NOT compatible types: FT_UINT8 and FT_BOOLEAN
    
    Change-Id: I98d296393796defc5741c41a496432eb8f927be2
    Reviewed-on: https://code.wireshark.org/review/18881
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit ded081ccecfbba91cacabba70d69a7eb36a5288d)
    Reviewed-on: https://code.wireshark.org/review/18892
    

Actions performed:

    from  56ccabc   Create /etc/paths.d and /etc/manpaths.d if they don't exist.
    adds  20c1327   VXLAN: Fix conflict for hf fields


Summary of changes:
 epan/dissectors/packet-vxlan.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)