__connman_service_set_search_domains() can now handle the situation
where the previous function was needed.
---
src/connman.h | 2 --
src/dhcpv6.c | 2 +-
src/service.c | 12 ------------
3 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/src/connman.h b/src/connman.h
index 34dec86..aac6a0b 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -695,8 +695,6 @@ int __connman_service_set_ignore(struct connman_service
*service,
bool ignore);
void __connman_service_set_search_domains(struct connman_service *service,
char **domains);
-void __connman_service_update_search_domains(struct connman_service *service,
- char **domains);
void __connman_service_set_string(struct connman_service *service,
const char *key, const char *value);
diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index bdb3b98..db9feb6 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -505,7 +505,7 @@ static int set_other_addresses(GDHCPClient *dhcp_client,
for (i = 0, list = option; list;
list = list->next, i++)
domains[i] = g_strdup(list->data);
- __connman_service_update_search_domains(service,
domains);
+ __connman_service_set_search_domains(service, domains);
g_strfreev(domains);
}
}
diff --git a/src/service.c b/src/service.c
index 1ad2529..74e5c33 100644
--- a/src/service.c
+++ b/src/service.c
@@ -4972,18 +4972,6 @@ void __connman_service_set_search_domains(struct
connman_service *service,
searchdomain_add_all(service);
}
-/*
- * This variant is used when domain search list is updated via
- * dhcp and in that case the service is not yet fully connected so
- * we cannot do same things as what the set() variant is doing.
- */
-void __connman_service_update_search_domains(struct connman_service *service,
- char **domains)
-{
- g_strfreev(service->domains);
- service->domains = g_strdupv(domains);
-}
-
static void service_complete(struct connman_service *service)
{
reply_pending(service, EIO);
--
2.1.4
_______________________________________________
connman mailing list
[email protected]
https://lists.connman.net/mailman/listinfo/connman
