Wireshark-commits: [Wireshark-commits] master becc442: wsutil: fix WS_INET_ADDRSTRLEN definition on
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: Fri, 11 May 2018 18:24:28 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=becc442da9d16e09d7a961cf8b47262e9071e98d
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

becc442 by Peter Wu (peter@xxxxxxxxxxxxx):

    wsutil: fix WS_INET_ADDRSTRLEN definition on Windows
    
    On Windows, epan/addr_resolv.c has a different definition of structures
    "hashipv4_t" (and "hashipv6_t") because the size of the "ip" member is
    dependent on "WS_INET_ADDRSTRLEN". A mismatch resulted in two different
    structures where the "name" field got shifted (resulting in empty names
    in the resolved addresses table due to leading nul bytes).
    
    Since including ws2tcpip.h for the appropriate definition results in
    various compile errors (config.h, packet-dcerpc-misc.h, ...) and the
    larger definition is actually not needed, just use constants again.
    
    Bug: 14667
    Change-Id: I4f8b300eb977be55f16ac40cacc78a5549e2732f
    Fixes: v2.5.0rc0-1503-gde1b26a3c6 ("More ws_inet_ntop() tweaks.")
    Reviewed-on: https://code.wireshark.org/review/27453
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  17190a1   List some removed features in the release notes.
    adds  becc442   wsutil: fix WS_INET_ADDRSTRLEN definition on Windows


Summary of changes:
 wsutil/inet_addr.h | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)