diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-10-07 17:00:30 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-10-07 17:00:30 -0700 |
| commit | 93d4983ccf8297c01829cd18b51ab46fba674477 (patch) | |
| tree | a7c5a0a415f30517a725410e1aac3ade9634d394 /pcap-rpcap.c | |
| parent | 799d0bd20e34928200ba90a686e31cbfba80ea83 (diff) | |
socket() and accept() return INVALID_SOCKET on errors.
On Windows, you're supposed to check against INVALID_SOCKET. On UN*X,
you're supposed to check against -1, but, on UN*X, we define
INVALID_SOCKET to be -1 so you can compare against INVALID_SOCKET on
both platforms.
That means that sock_open() should return INVALID_SOCKET on errors as
well.
Diffstat (limited to 'pcap-rpcap.c')
| -rw-r--r-- | pcap-rpcap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pcap-rpcap.c b/pcap-rpcap.c index d2dda54e..8ceb0b19 100644 --- a/pcap-rpcap.c +++ b/pcap-rpcap.c @@ -2210,7 +2210,7 @@ pcap_findalldevs_ex_remote(char *source, struct pcap_rmtauth *auth, pcap_if_t ** return -1; } - if ((sockctrl = sock_open(addrinfo, SOCKOPEN_CLIENT, 0, errbuf, PCAP_ERRBUF_SIZE)) == -1) + if ((sockctrl = sock_open(addrinfo, SOCKOPEN_CLIENT, 0, errbuf, PCAP_ERRBUF_SIZE)) == INVALID_SOCKET) { freeaddrinfo(addrinfo); return -1; @@ -2564,7 +2564,7 @@ SOCKET pcap_remoteact_accept(const char *address, const char *port, const char * } - if ((sockmain = sock_open(addrinfo, SOCKOPEN_SERVER, 1, errbuf, PCAP_ERRBUF_SIZE)) == -1) + if ((sockmain = sock_open(addrinfo, SOCKOPEN_SERVER, 1, errbuf, PCAP_ERRBUF_SIZE)) == INVALID_SOCKET) { SOCK_ASSERT(errbuf, 1); freeaddrinfo(addrinfo); @@ -2582,7 +2582,7 @@ SOCKET pcap_remoteact_accept(const char *address, const char *port, const char * closesocket(sockmain); sockmain = 0; - if (sockctrl == -1) + if (sockctrl == INVALID_SOCKET) { sock_geterror("accept(): ", errbuf, PCAP_ERRBUF_SIZE); return -2; |