Skip to content

Commit

Permalink
[dnsproxy] Remove VPN index list use as unnecessary. JB#48769
Browse files Browse the repository at this point in the history
Removed the use of VPN index list. This is because after the split
routing and default route functionality was combined there is no need
for the list anymore. The split routing status can handle the scenario
as it was intended.
  • Loading branch information
LaakkonenJussi committed Mar 17, 2021
1 parent 6b29293 commit 1b9ebd2
Showing 1 changed file with 0 additions and 24 deletions.
24 changes: 0 additions & 24 deletions connman/src/dnsproxy.c
Expand Up @@ -2569,8 +2569,6 @@ static struct server_data *create_server(int index,
{
struct server_data *data;
struct addrinfo hints, *rp;
struct connman_service *service;
GSList *vpn_index_list;
int ret;

DBG("index %d server %s", index, server);
Expand Down Expand Up @@ -2645,9 +2643,6 @@ static struct server_data *create_server(int index,
return NULL;
}

service = connman_service_get_default();
vpn_index_list = __connman_service_get_depending_vpn_index(service);

if (protocol == IPPROTO_UDP) {
if (__connman_service_index_is_default(data->index) ||
__connman_service_index_is_split_routing(
Expand All @@ -2656,19 +2651,11 @@ static struct server_data *create_server(int index,
DBG("Adding DNS server %s", data->server);

enable_fallback(false);
} else if (vpn_index_list && g_slist_index(vpn_index_list,
GINT_TO_POINTER(data->index)) != -1) {
data->enabled = true;
DBG("Adding DNS server of depending VPN %s",
data->server);
}

server_list = g_slist_append(server_list, data);
}

if (vpn_index_list)
g_slist_free(vpn_index_list);

return data;
}

Expand Down Expand Up @@ -2896,7 +2883,6 @@ static void dnsproxy_default_changed(struct connman_service *service)
bool server_enabled = false;
GSList *list;
int index;
GSList *vpn_index_list;

DBG("service %p", service);

Expand All @@ -2913,29 +2899,19 @@ static void dnsproxy_default_changed(struct connman_service *service)
if (index < 0)
return;

vpn_index_list = __connman_service_get_depending_vpn_index(service);

for (list = server_list; list; list = list->next) {
struct server_data *data = list->data;

if (data->index == index) {
DBG("Enabling DNS server %s", data->server);
data->enabled = true;
server_enabled = true;
} else if (vpn_index_list && g_slist_index(vpn_index_list,
GINT_TO_POINTER(data->index)) != -1) {
DBG("Enabling DNS server of depending VPN %s",
data->server);
data->enabled = true;
} else {
DBG("Disabling DNS server %s", data->server);
data->enabled = false;
}
}

if (vpn_index_list)
g_slist_free(vpn_index_list);

if (!server_enabled)
enable_fallback(true);

Expand Down

0 comments on commit 1b9ebd2

Please sign in to comment.