mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-02-13 04:27:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support IPv6 link-local addresses

Browse source 
Use `getaddrinfo` in `parse_address` instead of `inet_pton`.
Display Ipv6 addresses with scope identifiers correctly in `get_ip`
functions using `if_indextoname`.
This commit is contained in:
dsee 2024-02-25 09:19:11 +01:00 • committed by Wim Taymans
parent c3d3e6f48b
commit 4888b35284
9 changed files with 107 additions and 275 deletions
Download patch file Download diff file Expand all files Collapse all files

81
src/modules/network-utils.h Normal file
View file

@ -0,0 +1,81 @@
#ifndef NETWORK_UTILS_H
#define NETWORK_UTILS_H
#include <stdio.h>
#include <netdb.h>
#include <string.h>
#include <arpa/inet.h>
#include <net/if.h>
#include <errno.h>
static int parse_address(const char *address, uint16_t port,
struct sockaddr_storage *addr, socklen_t *len)
{
struct addrinfo hints;
struct addrinfo *result, *rp;
int res;
char port_str[6];
snprintf(port_str, sizeof(port_str), "%u", port);
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_DGRAM;
hints.ai_flags = AI_NUMERICHOST | AI_NUMERICSERV;
res = getaddrinfo(address, port_str, &hints, &result);
if (res != 0) {
return -EINVAL;
}
for (rp = result; rp != NULL; rp = rp->ai_next) {
memcpy(addr, rp->ai_addr, rp->ai_addrlen);
*len = rp->ai_addrlen;
break;
}
freeaddrinfo(result);
return 0;
}
static int get_ip(const struct sockaddr_storage *sa, char *ip, size_t len, bool *ip4, uint16_t *port)
{
if (sa->ss_family == AF_INET) {
struct sockaddr_in *in = (struct sockaddr_in*)sa;
inet_ntop(sa->ss_family, &in->sin_addr, ip, len);
if (port)
*port = ntohs(in->sin_port);
} else if (sa->ss_family == AF_INET6) {
struct sockaddr_in6 *in = (struct sockaddr_in6*)sa;
inet_ntop(sa->ss_family, &in->sin6_addr, ip, len);
if (port)
*port = ntohs(in->sin6_port);
if (in->sin6_scope_id == 0 || len <= 1) {
goto finish;
}
size_t curlen = strlen(ip);
if (len-(curlen+1) >= IFNAMSIZ) {
ip += curlen+1;
ip[-1] = '%';
if (if_indextoname(in->sin6_scope_id, ip) == NULL) {
ip[-1] = 0;
}
}
} else
return -EINVAL;
finish:
if (ip4)
*ip4 = sa->ss_family == AF_INET;
return 0;
}
static inline char *get_ip_fmt(const struct sockaddr_storage *sa, char *ip, size_t len)
{
if (get_ip(sa, ip, len, NULL, NULL) != 0) {
snprintf(ip, len, "invalid ip");
}
return ip;
}
#endif /* NETWORK_UTILS_H */