diff --git a/daemon/call.c b/daemon/call.c index 1e465800e..fed3d2282 100644 --- a/daemon/call.c +++ b/daemon/call.c @@ -2029,9 +2029,9 @@ get: if (G_UNLIKELY(!media->logical_intf)) { /* legacy support */ if (!str_cmp(ifname, "internal")) - media->desired_family = __get_socket_family_enum(SF_IP4); + media->desired_family = get_socket_family_enum(SF_IP4); else if (!str_cmp(ifname, "external")) - media->desired_family = __get_socket_family_enum(SF_IP6); + media->desired_family = get_socket_family_enum(SF_IP6); else ilog(LOG_WARNING, "Interface '"STR_FORMAT"' not found, using default", STR_FMT(ifname)); media->logical_intf = get_logical_interface(NULL, media->desired_family, num_ports); diff --git a/daemon/main.c b/daemon/main.c index 0aacb7181..8609a4805 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -202,7 +202,7 @@ static void __find_if_name(char *s, struct ifaddrs *ifas, GQueue *addrs) { addr = g_slice_alloc(sizeof(*addr)); if (ifa->ifa_addr->sa_family == AF_INET) { struct sockaddr_in *sin = (void *) ifa->ifa_addr; - addr->family = __get_socket_family_enum(SF_IP4); + addr->family = get_socket_family_enum(SF_IP4); addr->u.ipv4 = sin->sin_addr; } else if (ifa->ifa_addr->sa_family == AF_INET6) { @@ -212,7 +212,7 @@ static void __find_if_name(char *s, struct ifaddrs *ifas, GQueue *addrs) { g_slice_free1(sizeof(*addr), addr); continue; } - addr->family = __get_socket_family_enum(SF_IP6); + addr->family = get_socket_family_enum(SF_IP6); addr->u.ipv6 = sin->sin6_addr; } else { diff --git a/daemon/media_socket.c b/daemon/media_socket.c index 9b273e8a5..131b30a9b 100644 --- a/daemon/media_socket.c +++ b/daemon/media_socket.c @@ -768,10 +768,10 @@ struct local_intf *get_any_interface_address(const struct logical_intf *lif, soc ifa = get_interface_address(lif, fam); if (ifa) return ifa; - ifa = get_interface_address(lif, __get_socket_family_enum(SF_IP4)); + ifa = get_interface_address(lif, get_socket_family_enum(SF_IP4)); if (ifa) return ifa; - return get_interface_address(lif, __get_socket_family_enum(SF_IP6)); + return get_interface_address(lif, get_socket_family_enum(SF_IP6)); }