-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request grpc#6124 from dgquintas/ip_parse_refactor
Factored out parse functions from sockaddr_resolver
- Loading branch information
Showing
18 changed files
with
237 additions
and
97 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| /* | ||
| * | ||
| * Copyright 2016, 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 "src/core/ext/client_config/parse_address.h" | ||
|
|
||
| #include <stdio.h> | ||
| #include <string.h> | ||
| #ifdef GPR_HAVE_UNIX_SOCKET | ||
| #include <sys/un.h> | ||
| #endif | ||
|
|
||
| #include <grpc/support/alloc.h> | ||
| #include <grpc/support/host_port.h> | ||
| #include <grpc/support/log.h> | ||
| #include <grpc/support/string_util.h> | ||
|
|
||
| #ifdef GPR_HAVE_UNIX_SOCKET | ||
| int parse_unix(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len) { | ||
| struct sockaddr_un *un = (struct sockaddr_un *)addr; | ||
|
|
||
| un->sun_family = AF_UNIX; | ||
| strcpy(un->sun_path, uri->path); | ||
| *len = strlen(un->sun_path) + sizeof(un->sun_family) + 1; | ||
|
|
||
| return 1; | ||
| } | ||
| #endif | ||
|
|
||
| int parse_ipv4(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len) { | ||
| const char *host_port = uri->path; | ||
| char *host; | ||
| char *port; | ||
| int port_num; | ||
| int result = 0; | ||
| struct sockaddr_in *in = (struct sockaddr_in *)addr; | ||
|
|
||
| if (*host_port == '/') ++host_port; | ||
| if (!gpr_split_host_port(host_port, &host, &port)) { | ||
| return 0; | ||
| } | ||
|
|
||
| memset(in, 0, sizeof(*in)); | ||
| *len = sizeof(*in); | ||
| in->sin_family = AF_INET; | ||
| if (inet_pton(AF_INET, host, &in->sin_addr) == 0) { | ||
| gpr_log(GPR_ERROR, "invalid ipv4 address: '%s'", host); | ||
| goto done; | ||
| } | ||
|
|
||
| if (port != NULL) { | ||
| if (sscanf(port, "%d", &port_num) != 1 || port_num < 0 || | ||
| port_num > 65535) { | ||
| gpr_log(GPR_ERROR, "invalid ipv4 port: '%s'", port); | ||
| goto done; | ||
| } | ||
| in->sin_port = htons((uint16_t)port_num); | ||
| } else { | ||
| gpr_log(GPR_ERROR, "no port given for ipv4 scheme"); | ||
| goto done; | ||
| } | ||
|
|
||
| result = 1; | ||
| done: | ||
| gpr_free(host); | ||
| gpr_free(port); | ||
| return result; | ||
| } | ||
|
|
||
| int parse_ipv6(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len) { | ||
| const char *host_port = uri->path; | ||
| char *host; | ||
| char *port; | ||
| int port_num; | ||
| int result = 0; | ||
| struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)addr; | ||
|
|
||
| if (*host_port == '/') ++host_port; | ||
| if (!gpr_split_host_port(host_port, &host, &port)) { | ||
| return 0; | ||
| } | ||
|
|
||
| memset(in6, 0, sizeof(*in6)); | ||
| *len = sizeof(*in6); | ||
| in6->sin6_family = AF_INET6; | ||
| if (inet_pton(AF_INET6, host, &in6->sin6_addr) == 0) { | ||
| gpr_log(GPR_ERROR, "invalid ipv6 address: '%s'", host); | ||
| goto done; | ||
| } | ||
|
|
||
| if (port != NULL) { | ||
| if (sscanf(port, "%d", &port_num) != 1 || port_num < 0 || | ||
| port_num > 65535) { | ||
| gpr_log(GPR_ERROR, "invalid ipv6 port: '%s'", port); | ||
| goto done; | ||
| } | ||
| in6->sin6_port = htons((uint16_t)port_num); | ||
| } else { | ||
| gpr_log(GPR_ERROR, "no port given for ipv6 scheme"); | ||
| goto done; | ||
| } | ||
|
|
||
| result = 1; | ||
| done: | ||
| gpr_free(host); | ||
| gpr_free(port); | ||
| return result; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /* | ||
| * | ||
| * Copyright 2015, 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_CORE_EXT_CLIENT_CONFIG_PARSE_ADDRESS_H | ||
| #define GRPC_CORE_EXT_CLIENT_CONFIG_PARSE_ADDRESS_H | ||
|
|
||
| #include <stddef.h> | ||
|
|
||
| #include "src/core/ext/client_config/uri_parser.h" | ||
| #include "src/core/lib/iomgr/sockaddr.h" | ||
|
|
||
| #ifdef GPR_HAVE_UNIX_SOCKET | ||
| /** Populate \a addr and \a len from \a uri, whose path is expected to contain a | ||
| * unix socket path. Returns true upon success. */ | ||
| int parse_unix(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len); | ||
| #endif | ||
|
|
||
| /** Populate /a addr and \a len from \a uri, whose path is expected to contain a | ||
| * host:port pair. Returns true upon success. */ | ||
| int parse_ipv4(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len); | ||
|
|
||
| /** Populate /a addr and \a len from \a uri, whose path is expected to contain a | ||
| * host:port pair. Returns true upon success. */ | ||
| int parse_ipv6(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len); | ||
|
|
||
| #endif /* GRPC_CORE_EXT_CLIENT_CONFIG_PARSE_ADDRESS_H */ |
Oops, something went wrong.