diff options
| author |  murgatroid99 <michael.lumish@gmail.com> | 2015-01-21 16:05:54 -0800 |
|---|---|---|
| committer | murgatroid99 <michael.lumish@gmail.com> | 2015-01-21 16:05:54 -0800 |
| commit | 9ef3d04bfff61041ad5b9df7883fb3e30f205c65 (patch) | |
| tree | fe14afcc54bbf77862203d950019f527abd22d35 /src/core | |
| parent | b2aad16ea732af9b9126a869f648efbcc9fb87e7 (diff) | |
| parent | 2021d031687418fe4fe09d2e2efcdc4b3e833ffc (diff) | |
Merge branch 'master' of github.com:google/grpc
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/security/server_secure_chttp2.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/core/security/server_secure_chttp2.c b/src/core/security/server_secure_chttp2.c index 931fa95651..9dd4327822 100644 --- a/src/core/security/server_secure_chttp2.c +++ b/src/core/security/server_secure_chttp2.c @@ -93,6 +93,8 @@ int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr) { grpc_tcp_server *tcp = NULL; size_t i; int count = 0; + int port_num = -1; + int port_temp; resolved = grpc_blocking_resolve_address(addr, "https"); if (!resolved) { @@ -105,9 +107,15 @@ int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr) { } for (i = 0; i < resolved->naddrs; i++) { - if (grpc_tcp_server_add_port(tcp, - (struct sockaddr *)&resolved->addrs[i].addr, - resolved->addrs[i].len)) { + port_temp = grpc_tcp_server_add_port( + tcp, (struct sockaddr *)&resolved->addrs[i].addr, + resolved->addrs[i].len); + if (port_temp >= 0) { + if (port_num == -1) { + port_num = port_temp; + } else { + GPR_ASSERT(port_num == port_temp); + } count++; } } @@ -125,7 +133,7 @@ int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr) { /* Register with the server only upon success */ grpc_server_add_listener(server, tcp, start, destroy); - return 1; + return port_num; /* Error path: cleanup and return */ error: |