X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FINet%2FRawINetSocketHandle.test.cc;h=ccafb81a394e1e0339590a67080aa5a96fec673b;hb=61b2e2ea5cb50df90931acf3fcd840493ba762a9;hp=1b5908a625e1eaf50c8c49e8f67559ac75698eca;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git diff --git a/senf/Socket/Protocols/INet/RawINetSocketHandle.test.cc b/senf/Socket/Protocols/INet/RawINetSocketHandle.test.cc index 1b5908a..ccafb81 100644 --- a/senf/Socket/Protocols/INet/RawINetSocketHandle.test.cc +++ b/senf/Socket/Protocols/INet/RawINetSocketHandle.test.cc @@ -90,12 +90,12 @@ namespace { sin.sin_family = AF_INET; sin.sin_port = htons(0); sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - + int sockrec = socket(PF_INET,SOCK_RAW,47); if (sockrec<0) fail("server_v4","socket(rec)"); int socksend = socket(PF_INET,SOCK_RAW,48); if (socksend<0) fail("server_v4","socket(send)"); - + char buffer[1024]; while (1) { int n = read(sockrec,buffer,1024); @@ -115,7 +115,7 @@ namespace { ::memset(&sin,0,sizeof(sin)); sin.sin6_family = AF_INET6; sin.sin6_port = htons(0); - inet_pton(AF_INET6, "::1", &sin.sin6_addr); + inet_pton(AF_INET6, "::1", &sin.sin6_addr); int sockrec6 = socket(PF_INET6,SOCK_RAW,47); if (sockrec6<0) fail("server_v6","socket(rec)"); int socksend6 = socket(PF_INET6,SOCK_RAW,48); @@ -137,10 +137,11 @@ namespace { } -BOOST_AUTO_UNIT_TEST(RawV4ClientSocketHandle) +SENF_AUTO_UNIT_TEST(RawV4ClientSocketHandle) { if (getuid() != 0) { BOOST_WARN_MESSAGE(false, "Cannot test senf::RawV4SocketHandle as non-root user"); + BOOST_CHECK( true ); return; } try { @@ -155,7 +156,7 @@ BOOST_AUTO_UNIT_TEST(RawV4ClientSocketHandle) SENF_CHECK_NO_THROW( sock.writeto(senf::INet4SocketAddress("127.0.0.1:0"), test) ); senf::RawV4ClientSocketHandle sockrec(48); //IPPROTO_GRE+1 std::string in = sockrec.read(); - BOOST_CHECK_EQUAL(in.substr(20), test); + BOOST_CHECK_EQUAL(in.substr(20), test); SENF_CHECK_NO_THROW( sock.writeto(senf::INet4SocketAddress("127.0.0.1:0"),"QUIT")); //sock.close(); //sockrec.close(); @@ -166,10 +167,11 @@ BOOST_AUTO_UNIT_TEST(RawV4ClientSocketHandle) } } -BOOST_AUTO_UNIT_TEST(RawV6ClientSocketHandle) +SENF_AUTO_UNIT_TEST(RawV6ClientSocketHandle) { if (getuid() != 0) { BOOST_WARN_MESSAGE(false, "Cannot test senf::RawV6SocketHandle as non-root user"); + BOOST_CHECK( true ); return; } try { @@ -185,7 +187,7 @@ BOOST_AUTO_UNIT_TEST(RawV6ClientSocketHandle) SENF_CHECK_NO_THROW( sock.writeto(senf::INet6SocketAddress("[::1]:0"), test) ); senf::RawV6ClientSocketHandle sockrec(48); //IPPROTO_GRE+1 std::string in = sockrec.read(); - BOOST_CHECK_EQUAL(in, test); + BOOST_CHECK_EQUAL(in, test); SENF_CHECK_NO_THROW( sock.writeto(senf::INet6SocketAddress("[::1]:0"),"QUIT")); alarm(0); } catch (...) {