generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-04 04:10:00 +01:00
Code Issues Projects Releases Wiki Activity

allow vanilla socket security tests to run on Windows

Browse Source 
- add ws2tcpip.h
- alias close->closesocket
- increment port in sec_null test
This commit is contained in:
Min RK
2014-12-03 13:58:49 -08:00
parent efed3d010d
commit 5a8b46e375
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_security_curve.cpp
View File

@@ -20,7 +20,9 @@
#include "testutil.hpp" #include "testutil.hpp"
#if defined (ZMQ_HAVE_WINDOWS) #if defined (ZMQ_HAVE_WINDOWS)
# include <winsock2.h> # include <winsock2.h>
# include <ws2tcpip.h>
# include <stdexcept> # include <stdexcept>
# define close closesocket
#else #else
# include <sys/socket.h> # include <sys/socket.h>
# include <netinet/in.h> # include <netinet/in.h>

6
tests/test_security_null.cpp
View File

@@ -20,7 +20,9 @@
#include "testutil.hpp" #include "testutil.hpp"
#if defined (ZMQ_HAVE_WINDOWS) #if defined (ZMQ_HAVE_WINDOWS)
# include <winsock2.h> # include <winsock2.h>
# include <ws2tcpip.h>
# include <stdexcept> # include <stdexcept>
# define close closesocket
#else #else
# include <sys/socket.h> # include <sys/socket.h>
# include <netinet/in.h> # include <netinet/in.h>
@@ -138,14 +140,14 @@ int main (void)
assert (server); assert (server);
rc = zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "WRONG", 5); rc = zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "WRONG", 5);
assert (rc == 0); assert (rc == 0);
rc = zmq_bind (server, "tcp://127.0.0.1:9002"); rc = zmq_bind (server, "tcp://127.0.0.1:9003");
assert (rc == 0); assert (rc == 0);
struct sockaddr_in ip4addr; struct sockaddr_in ip4addr;
int s; int s;
ip4addr.sin_family = AF_INET; ip4addr.sin_family = AF_INET;
ip4addr.sin_port = htons(9002); ip4addr.sin_port = htons(9003);
inet_pton(AF_INET, "127.0.0.1", &ip4addr.sin_addr); inet_pton(AF_INET, "127.0.0.1", &ip4addr.sin_addr);
s = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP); s = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);

2
tests/test_security_plain.cpp
View File

@@ -20,7 +20,9 @@
#include "testutil.hpp" #include "testutil.hpp"
#if defined (ZMQ_HAVE_WINDOWS) #if defined (ZMQ_HAVE_WINDOWS)
# include <winsock2.h> # include <winsock2.h>
# include <ws2tcpip.h>
# include <stdexcept> # include <stdexcept>
# define close closesocket
#else #else
# include <sys/socket.h> # include <sys/socket.h>
# include <netinet/in.h> # include <netinet/in.h>