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

module-rtp: Change IGMP recovery log line levels from info to debug

Browse source 
The associated cases where IGMP membership is silently dropped may happen
infrequently. But when they do, these log lines can occur at a large
volume. To not spam the logs in such cases, change the log level from
info to debug.

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
This commit is contained in:
Carlos Rafael Giani 2025-11-10 14:50:36 +01:00
parent 8df58db415
commit 60c47e96a8
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/modules/module-rtp-sap.c
View file

@ -981,7 +981,7 @@ static void on_igmp_recovery_timer_event(void *data)
}
pw_net_get_ip(&impl->igmp_recovery.mcast_addr, addr, sizeof(addr), NULL, NULL);
pw_log_info("IGMP recovery triggered for %s", addr);
pw_log_debug("IGMP recovery triggered for %s", addr);
/* Force IGMP membership refresh by leaving the group first, then rejoin */
if (impl->igmp_recovery.is_ipv6) {
@ -994,10 +994,10 @@ static void on_igmp_recovery_timer_event(void *data)
res = setsockopt(impl->igmp_recovery.socket_fd, IPPROTO_IPV6, IPV6_LEAVE_GROUP,
&mr6, sizeof(mr6));
if (SPA_LIKELY(res == 0)) {
pw_log_info("left IPv6 multicast group");
pw_log_debug("left IPv6 multicast group");
} else {
if (errno == EADDRNOTAVAIL) {
pw_log_info("attempted to leave IPv6 multicast group, but "
pw_log_debug("attempted to leave IPv6 multicast group, but "
"membership was already silently dropped");
} else {
pw_log_warn("failed to leave IPv6 multicast group: %m");
@ -1009,7 +1009,7 @@ static void on_igmp_recovery_timer_event(void *data)
if (res < 0) {
pw_log_warn("failed to re-join IPv6 multicast group: %m");
} else {
pw_log_info("re-joined IPv6 multicast group successfully");
pw_log_debug("re-joined IPv6 multicast group successfully");
}
} else {
struct ip_mreqn mr4;
@ -1021,10 +1021,10 @@ static void on_igmp_recovery_timer_event(void *data)
res = setsockopt(impl->igmp_recovery.socket_fd, IPPROTO_IP, IP_DROP_MEMBERSHIP,
&mr4, sizeof(mr4));
if (SPA_LIKELY(res == 0)) {
pw_log_info("left IPv4 multicast group");
pw_log_debug("left IPv4 multicast group");
} else {
if (errno == EADDRNOTAVAIL) {
pw_log_info("attempted to leave IPv4 multicast group, but "
pw_log_debug("attempted to leave IPv4 multicast group, but "
"membership was already silently dropped");
} else {
pw_log_warn("failed to leave IPv4 multicast group: %m");
@ -1036,7 +1036,7 @@ static void on_igmp_recovery_timer_event(void *data)
if (res < 0) {
pw_log_warn("failed to re-join IPv4 multicast group: %m");
} else {
pw_log_info("re-joined IPv4 multicast group successfully");
pw_log_debug("re-joined IPv4 multicast group successfully");
}
}

16
src/modules/module-rtp-source.c
View file

@ -349,10 +349,10 @@ static int rejoin_igmp_group(struct spa_loop *loop, bool async, uint32_t seq,
res = setsockopt(impl->igmp_recovery.socket_fd, IPPROTO_IPV6, IPV6_LEAVE_GROUP,
&mr6, sizeof(mr6));
if (SPA_LIKELY(res == 0)) {
pw_log_info("left IPv6 multicast group");
pw_log_debug("left IPv6 multicast group");
} else {
if (errno == EADDRNOTAVAIL) {
pw_log_info("attempted to leave IPv6 multicast group, but "
pw_log_debug("attempted to leave IPv6 multicast group, but "
"membership was already silently dropped");
} else {
pw_log_warn("failed to leave IPv6 multicast group: %m");
@ -364,7 +364,7 @@ static int rejoin_igmp_group(struct spa_loop *loop, bool async, uint32_t seq,
if (res < 0) {
pw_log_warn("failed to re-join IPv6 multicast group: %m");
} else {
pw_log_info("re-joined IPv6 multicast group successfully");
pw_log_debug("re-joined IPv6 multicast group successfully");
}
} else {
struct ip_mreqn mr4;
@ -376,10 +376,10 @@ static int rejoin_igmp_group(struct spa_loop *loop, bool async, uint32_t seq,
res = setsockopt(impl->igmp_recovery.socket_fd, IPPROTO_IP, IP_DROP_MEMBERSHIP,
&mr4, sizeof(mr4));
if (SPA_LIKELY(res == 0)) {
pw_log_info("left IPv4 multicast group");
pw_log_debug("left IPv4 multicast group");
} else {
if (errno == EADDRNOTAVAIL) {
pw_log_info("attempted to leave IPv4 multicast group, but "
pw_log_debug("attempted to leave IPv4 multicast group, but "
"membership was already silently dropped");
} else {
pw_log_warn("failed to leave IPv4 multicast group: %m");
@ -391,7 +391,7 @@ static int rejoin_igmp_group(struct spa_loop *loop, bool async, uint32_t seq,
if (res < 0) {
pw_log_warn("failed to re-join IPv4 multicast group: %m");
} else {
pw_log_info("re-joined IPv4 multicast group successfully");
pw_log_debug("re-joined IPv4 multicast group successfully");
}
}
@ -433,7 +433,7 @@ static void on_igmp_recovery_timer_event(void *data)
}
pw_net_get_ip(&impl->igmp_recovery.mcast_addr, addr, sizeof(addr), NULL, NULL);
pw_log_info("starting IGMP recovery for %s", addr);
pw_log_debug("starting IGMP recovery for %s", addr);
/* Run the actual recovery in the data loop, since recovery involves
* rejoining the socket to the IGMP group. By running this in the
@ -446,7 +446,7 @@ static void on_igmp_recovery_timer_event(void *data)
res = pw_loop_locked(impl->data_loop, rejoin_igmp_group, 1, NULL, 0, impl);
if (SPA_LIKELY(res == 0)) {
pw_log_info("IGMP recovery for %s finished", addr);
pw_log_debug("IGMP recovery for %s finished", addr);
} else {
pw_log_error("error while finishing IGMP recovery for %s: %s",
addr, spa_strerror(res));