Chiebot-Mirror
/
grpc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add a grpc_ipv6_loopback_available() test utility, and only run IPv6-specific

Browse Source 
tests on machines that support AF_INET6 sockets bound to ::1.

Listening on :: or connecting to a mapped address should always work.
	Change on 2014/12/10 by pmarks <pmarks@google.com>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=81837056
pull/1/merge
pmarks 10 years ago committed by Jan Tattermusch
parent c9e80fb26a
commit 465554e5b6
7 changed files with 157 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Makefile
  2. 1
      build.json
  3. 64
      test/core/echo/echo_test.c
  4. 21
      test/core/end2end/dualstack_socket_test.c
  5. 55
      test/core/util/ipv6.c
  6. 41
      test/core/util/ipv6.h
  7. 2
      vsprojects/vs2013/grpc_test_util.vcxproj

1
Makefile
Unescape View File

@ -750,6 +750,7 @@ clean_libgrpc:
LIBGRPC_TEST_UTIL_SRC = \
test/core/util/grpc_profiler.c \
test/core/util/ipv6.c \
test/core/util/parse_hexstring.c \
test/core/util/port_posix.c \
test/core/util/slice_splitter.c \

1
build.json
Unescape View File

@ -271,6 +271,7 @@
"vs_project_guid": "{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}",
"src": [
"test/core/util/grpc_profiler.c",
"test/core/util/ipv6.c",
"test/core/util/parse_hexstring.c",
"test/core/util/port_posix.c",
"test/core/util/slice_splitter.c",

64
test/core/echo/echo_test.c
Unescape View File

@ -42,12 +42,33 @@
#include <grpc/support/alloc.h>
#include <grpc/support/host_port.h>
#include <grpc/support/log.h>
#include <grpc/support/string.h>
#include "test/core/util/ipv6.h"
#include "test/core/util/port.h"
static const char *const kHosts[] = {
"127.0.0.1", "::1", "::ffff:127.0.0.1", "localhost",
};
int test_client(const char *root, const char *host, int port) {
char *args[3];
int status;
pid_t cli;
cli = fork();
if (cli == 0) {
gpr_asprintf(&args[0], "%s/echo_client", root);
gpr_join_host_port(&args[1], host, port);
args[2] = 0;
execv(args[0], args);
gpr_free(args[0]);
gpr_free(args[1]);
return 1;
}
/* wait for client */
gpr_log(GPR_INFO, "Waiting for client: %s", host);
if (waitpid(cli, &status, 0) == -1) return 2;
if (!WIFEXITED(status)) return 4;
if (WEXITSTATUS(status)) return WEXITSTATUS(status);
return 0;
}
int main(int argc, char **argv) {
char *me = argv[0];
@ -56,8 +77,13 @@ int main(int argc, char **argv) {
int port = grpc_pick_unused_port_or_die();
char *args[3];
int status;
pid_t svr, cli;
int i;
pid_t svr;
int ret;
int do_ipv6 = 1;
if (!grpc_ipv6_loopback_available()) {
gpr_log(GPR_INFO, "Can't bind to ::1. Skipping IPv6 tests.");
do_ipv6 = 0;
}
/* figure out where we are */
if (lslash) {
memcpy(root, me, lslash - me);
@ -80,26 +106,18 @@ int main(int argc, char **argv) {
/* wait a little */
sleep(2);
/* start the clients */
for (i = 0; i < sizeof(kHosts) / sizeof(*kHosts); i++) {
cli = fork();
if (cli == 0) {
gpr_asprintf(&args[0], "%s/echo_client", root);
gpr_join_host_port(&args[1], kHosts[i], port);
args[2] = 0;
execv(args[0], args);
gpr_free(args[0]);
gpr_free(args[1]);
return 1;
}
/* wait for client */
printf("waiting for client: %s\n", kHosts[i]);
if (waitpid(cli, &status, 0) == -1) return 2;
if (!WIFEXITED(status)) return 4;
if (WEXITSTATUS(status)) return WEXITSTATUS(status);
ret = test_client(root, "127.0.0.1", port);
if (ret != 0) return ret;
ret = test_client(root, "::ffff:127.0.0.1", port);
if (ret != 0) return ret;
ret = test_client(root, "localhost", port);
if (ret != 0) return ret;
if (do_ipv6) {
ret = test_client(root, "::1", port);
if (ret != 0) return ret;
}
/* wait for server */
printf("waiting for server\n");
gpr_log(GPR_INFO, "Waiting for server");
kill(svr, SIGINT);
if (waitpid(svr, &status, 0) == -1) return 2;
if (!WIFEXITED(status)) return 4;

21
test/core/end2end/dualstack_socket_test.c
Unescape View File

@ -37,6 +37,7 @@
#include <grpc/support/host_port.h>
#include <grpc/support/log.h>
#include "test/core/end2end/cq_verifier.h"
#include "test/core/util/ipv6.h"
#include "test/core/util/port.h"
#include "test/core/util/test_config.h"
@ -168,31 +169,41 @@ void test_connect(const char *server_host, const char *client_host, int port,
}
int main(int argc, char **argv) {
int do_ipv6 = 1;
int i;
grpc_test_init(argc, argv);
grpc_init();
if (!grpc_ipv6_loopback_available()) {
gpr_log(GPR_INFO, "Can't bind to ::1. Skipping IPv6 tests.");
do_ipv6 = 0;
}
for (i = 0; i <= 1; i++) {
/* For coverage, test with and without dualstack sockets. */
grpc_forbid_dualstack_sockets_for_testing = i;
/* :: and 0.0.0.0 are handled identically. */
test_connect("::", "127.0.0.1", grpc_pick_unused_port_or_die(), 1);
test_connect("::", "::1", grpc_pick_unused_port_or_die(), 1);
test_connect("::", "::ffff:127.0.0.1", grpc_pick_unused_port_or_die(), 1);
test_connect("::", "localhost", grpc_pick_unused_port_or_die(), 1);
test_connect("0.0.0.0", "127.0.0.1", grpc_pick_unused_port_or_die(), 1);
test_connect("0.0.0.0", "::1", grpc_pick_unused_port_or_die(), 1);
test_connect("0.0.0.0", "::ffff:127.0.0.1", grpc_pick_unused_port_or_die(),
1);
test_connect("0.0.0.0", "localhost", grpc_pick_unused_port_or_die(), 1);
if (do_ipv6) {
test_connect("::", "::1", grpc_pick_unused_port_or_die(), 1);
test_connect("0.0.0.0", "::1", grpc_pick_unused_port_or_die(), 1);
}
/* These only work when the families agree. */
test_connect("::1", "::1", grpc_pick_unused_port_or_die(), 1);
test_connect("::1", "127.0.0.1", grpc_pick_unused_port_or_die(), 0);
test_connect("127.0.0.1", "127.0.0.1", grpc_pick_unused_port_or_die(), 1);
test_connect("127.0.0.1", "::1", grpc_pick_unused_port_or_die(), 0);
if (do_ipv6) {
test_connect("::1", "::1", grpc_pick_unused_port_or_die(), 1);
test_connect("::1", "127.0.0.1", grpc_pick_unused_port_or_die(), 0);
test_connect("127.0.0.1", "::1", grpc_pick_unused_port_or_die(), 0);
}
}

55
test/core/util/ipv6.c
Unescape View File

@ -0,0 +1,55 @@
/*
*
* Copyright 2014, Google Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#include "test/core/util/ipv6.h"
#include <netinet/in.h>
#include <string.h>
#include <sys/socket.h>
#include <unistd.h>
int grpc_ipv6_loopback_available() {
int ok = 0;
int fd = socket(AF_INET6, SOCK_STREAM, 0);
if (fd >= 0) {
struct sockaddr_in6 addr;
memset(&addr, 0, sizeof(addr));
addr.sin6_family = AF_INET6;
addr.sin6_addr.s6_addr[15] = 1; /* [::1]:0 */
if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) == 0) {
ok = 1;
}
close(fd);
}
return ok;
}

41
test/core/util/ipv6.h
Unescape View File

@ -0,0 +1,41 @@
/*
*
* Copyright 2014, Google Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#ifndef __GRPC_TEST_UTIL_IPV6_H__
#define __GRPC_TEST_UTIL_IPV6_H__
/* Returns true if we're able to create an AF_INET6 socket bound to ::1 on an
arbitrary port. */
int grpc_ipv6_loopback_available();
#endif /* __GRPC_TEST_UTIL_IPV6_H__ */

2
vsprojects/vs2013/grpc_test_util.vcxproj
Unescape View File

@ -77,6 +77,8 @@
<ItemGroup>
<ClCompile Include="..\..\test\core\util\grpc_profiler.c">
</ClCompile>
<ClCompile Include="..\..\test\core\util\ipv6.c">
</ClCompile>
<ClCompile Include="..\..\test\core\util\parse_hexstring.c">
</ClCompile>
<ClCompile Include="..\..\test\core\util\port_posix.c">

Write Preview
Loading…
Cancel
Save