TT#14008 don't use internal function when not necessary

Change-Id: Ia18b90094d7f52628c72f4cc3d0247a2eb06541a
pull/1439/head
Richard Fuchs 4 years ago
parent 30c2de8e0f
commit cfaa029b00

@ -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);

@ -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 {

@ -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));
}

Loading…
Cancel
Save