mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

netjack2: implement ifname in the driver

Browse source 
See #4666
This commit is contained in:
Wim Taymans 2025-04-28 11:13:14 +02:00
parent 3a231a807d
commit 5a00232cdf
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/modules/module-netjack2-driver.c
View file

@ -705,7 +705,7 @@ static bool is_multicast(struct sockaddr *sa, socklen_t salen)
static int make_socket(struct sockaddr_storage *src, socklen_t src_len, static int make_socket(struct sockaddr_storage *src, socklen_t src_len,
struct sockaddr_storage *dst, socklen_t dst_len, struct sockaddr_storage *dst, socklen_t dst_len,
bool loop, int ttl, int dscp) bool loop, int ttl, int dscp, const char *ifname)
{ {
int af, fd, val, res; int af, fd, val, res;
struct timeval timeout; struct timeval timeout;
@ -721,7 +721,13 @@ static int make_socket(struct sockaddr_storage *src, socklen_t src_len,
pw_log_error("setsockopt failed: %m"); pw_log_error("setsockopt failed: %m");
goto error; goto error;
} }
#ifdef SO_BINDTODEVICE
if (ifname && setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, ifname, strlen(ifname)) < 0) {
res = -errno;
pw_log_error("setsockopt(SO_BINDTODEVICE) failed: %m");
goto error;
}
#endif
#ifdef SO_PRIORITY #ifdef SO_PRIORITY
val = 6; val = 6;
if (setsockopt(fd, SOL_SOCKET, SO_PRIORITY, &val, sizeof(val)) < 0) if (setsockopt(fd, SOL_SOCKET, SO_PRIORITY, &val, sizeof(val)) < 0)
@ -981,9 +987,11 @@ static int create_netjack2_socket(struct impl *impl)
impl->ttl = pw_properties_get_uint32(impl->props, "net.ttl", DEFAULT_NET_TTL); impl->ttl = pw_properties_get_uint32(impl->props, "net.ttl", DEFAULT_NET_TTL);
impl->loop = pw_properties_get_bool(impl->props, "net.loop", DEFAULT_NET_LOOP); impl->loop = pw_properties_get_bool(impl->props, "net.loop", DEFAULT_NET_LOOP);
impl->dscp = pw_properties_get_uint32(impl->props, "net.dscp", DEFAULT_NET_DSCP); impl->dscp = pw_properties_get_uint32(impl->props, "net.dscp", DEFAULT_NET_DSCP);
str = pw_properties_get(impl->props, "local.ifname");
fd = make_socket(&impl->src_addr, impl->src_len, fd = make_socket(&impl->src_addr, impl->src_len,
&impl->dst_addr, impl->dst_len, impl->loop, impl->ttl, impl->dscp); &impl->dst_addr, impl->dst_len, impl->loop, impl->ttl, impl->dscp,
str);
if (fd < 0) { if (fd < 0) {
res = -errno; res = -errno;
pw_log_error("can't create socket: %s", spa_strerror(res)); pw_log_error("can't create socket: %s", spa_strerror(res));

3
src/modules/module-netjack2-manager.c
View file

@ -1082,8 +1082,7 @@ static int create_netjack2_socket(struct impl *impl)
impl->dscp = pw_properties_get_uint32(impl->props, "net.dscp", DEFAULT_NET_DSCP); impl->dscp = pw_properties_get_uint32(impl->props, "net.dscp", DEFAULT_NET_DSCP);
str = pw_properties_get(impl->props, "local.ifname"); str = pw_properties_get(impl->props, "local.ifname");
fd = make_announce_socket(&impl->src_addr, impl->src_len, fd = make_announce_socket(&impl->src_addr, impl->src_len, str);
pw_properties_get(impl->props, "local.ifname"));
if (fd < 0) { if (fd < 0) {
res = fd; res = fd;
pw_log_error("can't create socket: %s", spa_strerror(res)); pw_log_error("can't create socket: %s", spa_strerror(res));