diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | builds/msvc/tests/tests.vcxproj | 14 | ||||
| -rw-r--r-- | builds/msvc/tests/tests.vcxproj.filters | 3 | ||||
| -rw-r--r-- | tests/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/tests.cpp | 6 | ||||
| -rw-r--r-- | tests/wireformat.cpp | 110 |
6 files changed, 137 insertions, 1 deletions
@@ -39,6 +39,7 @@ tests/linger tests/max_sockets tests/emptyctx tests/polltimeo +tests/wireformat src/platform.hpp* src/stamp-h1 perf/local_lat diff --git a/builds/msvc/tests/tests.vcxproj b/builds/msvc/tests/tests.vcxproj index cfa07a8..a3a4434 100644 --- a/builds/msvc/tests/tests.vcxproj +++ b/builds/msvc/tests/tests.vcxproj @@ -72,6 +72,16 @@ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Link> + <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Link> + <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\..\..\tests\emptyctx.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> @@ -146,6 +156,10 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> </ClCompile> + <ClCompile Include="..\..\..\tests\wireformat.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> </ItemGroup> <ItemGroup> <ProjectReference Include="..\libxs\libxs.vcxproj"> diff --git a/builds/msvc/tests/tests.vcxproj.filters b/builds/msvc/tests/tests.vcxproj.filters index ce84e6c..02d202b 100644 --- a/builds/msvc/tests/tests.vcxproj.filters +++ b/builds/msvc/tests/tests.vcxproj.filters @@ -56,6 +56,9 @@ <ClCompile Include="..\..\..\tests\polltimeo.cpp"> <Filter>Header Files</Filter> </ClCompile> + <ClCompile Include="..\..\..\tests\wireformat.cpp"> + <Filter>Header Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <Filter Include="Header Files"> diff --git a/tests/Makefile.am b/tests/Makefile.am index 1514746..817b0c1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -20,7 +20,8 @@ noinst_PROGRAMS = pair_inproc \ timeo \ max_sockets \ emptyctx \ - polltimeo + polltimeo \ + wireformat pair_inproc_SOURCES = pair_inproc.cpp testutil.hpp pair_tcp_SOURCES = pair_tcp.cpp testutil.hpp @@ -40,5 +41,6 @@ timeo_SOURCES = timeo.cpp testutil.hpp max_sockets_SOURCES = max_sockets.cpp emptyctx_SOURCES = emptyctx.cpp polltimeo_SOURCES = polltimeo.cpp testutil.hpp +wireformat_SOURCES = wireformat.cpp TESTS = $(noinst_PROGRAMS) diff --git a/tests/tests.cpp b/tests/tests.cpp index ca1b2eb..d4756ab 100644 --- a/tests/tests.cpp +++ b/tests/tests.cpp @@ -99,6 +99,10 @@ #include "polltimeo.cpp" #undef XS_TEST_MAIN +#define XS_TEST_MAIN wireformat +#include "wireformat.cpp" +#undef XS_TEST_MAIN + int main () { int rc; @@ -137,6 +141,8 @@ int main () assert (rc == 0); rc = polltimeo (); assert (rc == 0); + rc = wireformat (); + assert (rc == 0); fprintf (stderr, "SUCCESS\n"); sleep (1); diff --git a/tests/wireformat.cpp b/tests/wireformat.cpp new file mode 100644 index 0000000..1177798 --- /dev/null +++ b/tests/wireformat.cpp @@ -0,0 +1,110 @@ +/* + Copyright (c) 2012 250bpm s.r.o. + Copyright (c) 2012 Paul Colomiets + Copyright (c) 2012 Other contributors as noted in the AUTHORS file + + This file is part of Crossroads I/O project. + + Crossroads I/O is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + Crossroads is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "testutil.hpp" + +#if defined XS_HAVE_WINDOWS +#include <winsock2.h> +#else +#include <sys/socket.h> +#include <netinet/tcp.h> +#include <netinet/in.h> +#include <arpa/inet.h> +#endif + +int XS_TEST_MAIN () +{ + fprintf (stderr, "wire format test running...\n"); + +#if defined XS_HAVE_WINDOWS + WSADATA info; + int wsarc = WSAStartup (MAKEWORD(1,1), &info); + assert (wsarc == 0); +#endif + + // Create the basic infrastructure. + void *ctx = xs_init (); + assert (ctx); + void *push = xs_socket (ctx, XS_PUSH); + assert (push); + void *pull = xs_socket (ctx, XS_PULL); + assert (push); + + // Bind the peer and get the message. + int rc = xs_bind (pull, "tcp://127.0.0.1:5560"); + assert (rc == 0); + rc = xs_bind (push, "tcp://127.0.0.1:5561"); + assert (rc == 0); + + // Connect to the peer using raw sockets. + int rpush = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + struct sockaddr_in address; + address.sin_family = AF_INET; + address.sin_addr.s_addr = inet_addr ("127.0.0.1"); + address.sin_port = htons (5560); + rc = connect(rpush, (struct sockaddr*) &address, sizeof (address)); + assert (rc == 0); + + int rpull = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP); + address.sin_family = AF_INET; + address.sin_addr.s_addr = inet_addr ("127.0.0.1"); + address.sin_port = htons (5561); + rc = connect (rpull, (struct sockaddr*) &address, sizeof (address)); + assert (rc == 0); + + // Let's send some data and check if it arrived + rc = send (rpush, "\x04\0abc", 5, 0); + assert (rc == 5); + unsigned char buf [3]; + unsigned char buf2 [3]; + rc = xs_recv (pull, buf, sizeof (buf), 0); + assert (rc == 3); + assert (!memcmp (buf, "abc", 3)); + + // Let's push this data into another socket + rc = xs_send (push, buf, sizeof (buf), 0); + assert (rc == 3); + rc = recv (rpull, (char*) buf2, sizeof (buf2), 0); + assert (rc == 3); + assert (!memcmp (buf2, "\x04\0abc", 3)); + +#if defined XS_HAVE_WINDOWS + rc = closesocket (rpush); + assert (rc != SOCKET_ERROR); + rc = closesocket(rpull); + assert (rc != SOCKET_ERROR); + WSACleanup (); +#else + rc = close (rpush); + assert (rc == 0); + rc = close (rpull); + assert (rc == 0); +#endif + rc = xs_close (pull); + assert (rc == 0); + rc = xs_close (push); + assert (rc == 0); + + rc = xs_term (ctx); + assert (rc == 0); + + return 0 ; +} |