Wireshark · Wireshark-commits: [Wireshark-commits] master 5fbcfd6: Clean up some UN*X-vs-Windows socket issues.

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

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

Commits:

5fbcfd6 by Guy Harris (guy@xxxxxxxxxxxx):

    Clean up some UN*X-vs-Windows socket issues.
    
    Have a wsutil/socket.h file, for inclusion by everything that uses
    sockets, that contains the UN*X-vs-Windows #includes and #defines to
    hide some UN*X-sockets vs. Winsock API differences.  That stuff mostly
    comes from from extcap/extcap-base.h; have that file just include
    wsutil/socket.h rather than defining that stuff itself.
    
    Include it in sharkd_daemon.c.  Use socklen_t for the size of things to
    pass to bind() as the last argument; wsutil/socket.h defines it as int
    on Windows.
    
    Ignore sharkd in Git.
    
    Change-Id: I3f2171b7aa613717f52305f62bfd7d43e0172dc6
    Reviewed-on: https://code.wireshark.org/review/19796
    Petri-Dish: Guy Harris <guy@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  1165dfc   Make some variables 64-bit, to avoid overflows.
    adds  5fbcfd6   Clean up some UN*X-vs-Windows socket issues.


Summary of changes:
 .gitignore                                         |    1 +
 extcap/extcap-base.h                               |   28 +-------
 sharkd_daemon.c                                    |   25 +------
 wsutil/Makefile.am                                 |    1 +
 epan/dissectors/packet-nt-oui.c => wsutil/socket.h |   71 ++++++++++++--------
 5 files changed, 48 insertions(+), 78 deletions(-)
 copy epan/dissectors/packet-nt-oui.c => wsutil/socket.h (54%)