Wireshark · Wireshark-commits: [Wireshark-commits] master-2.6 7157a5b: wsutil: fix WS_INET_ADDRSTRLEN definition on Windows

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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7157a5b4a6c95183131f9351cdbfe45354301730
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.6
Repository: wireshark

Commits:

7157a5b 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>
    (cherry picked from commit becc442da9d16e09d7a961cf8b47262e9071e98d)
    Reviewed-on: https://code.wireshark.org/review/27460
    

Actions performed:

    from  08d9d1b3  Ensure test directories are included with git archive
    adds  7157a5b   wsutil: fix WS_INET_ADDRSTRLEN definition on Windows


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