diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-08-04 16:08:43 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-08-04 16:08:43 -0700 |
| commit | 1dc978c3865166dbbbd0ac938c3ac653d22d214d (patch) | |
| tree | 4f0f55a51705ec6e32bf53a060ec27650623a398 /src/core | |
| parent | 0c88065d4aae4a313bd427b1ae273fd7450e84ab (diff) | |
| parent | 63541a1de15736df2a0e428f5c427581296f9773 (diff) | |
Merge pull request #2791 from pmarks-net/uri
Return normalized IPv4 addresses from grpc_sockaddr_to_uri().
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/iomgr/sockaddr_utils.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/iomgr/sockaddr_utils.c b/src/core/iomgr/sockaddr_utils.c index 71ac12e87b..65ec1f94ac 100644 --- a/src/core/iomgr/sockaddr_utils.c +++ b/src/core/iomgr/sockaddr_utils.c @@ -170,6 +170,11 @@ int grpc_sockaddr_to_string(char **out, const struct sockaddr *addr, char *grpc_sockaddr_to_uri(const struct sockaddr *addr) { char *temp; char *result; + struct sockaddr_in addr_normalized; + + if (grpc_sockaddr_is_v4mapped(addr, &addr_normalized)) { + addr = (const struct sockaddr *)&addr_normalized; + } switch (addr->sa_family) { case AF_INET: |