8:01 p.m.
Search domains will be added before the service gets connected, thus
allow them to be set. The interface index ensures that correct search
domains will be used. This change also fixes issues where search domains
were not appended correctly to the DNS lookups.
Reported by Mike Purvis.
---
src/service.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/service.c b/src/service.c
index e3317dd..be38364 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1027,9 +1027,6 @@ static int searchdomain_add_all(struct connman_service *service)
{
int index, i = 0;
- if (!is_connected(service))
- return -ENOTCONN;
-
index = __connman_service_get_index(service);
if (index < 0)
return -ENXIO;
--
2.1.4
7:39 p.m.
New subject: [PATCH 0/2] Set search domains on connect
Hi,
Patch 1/2 obsoletes the previous patch called "service: Set search domains
regardless of connected state". Instead, ensure that search domains are
added at least once after a successful connection. The previously committed
patches ensure that search domains are updated properly when new nameservers
are added.
Patch 2/2 trivially moves code around to get rid of a somewhat useless
function declaration.
Cheers,
Patrik
Patrik Flykt (2):
service: Set search domains when connected
service: Move code around to avoid declaring a static function
src/service.c | 106 ++++++++++++++++++++++++++++++----------------------------
1 file changed, 55 insertions(+), 51 deletions(-)
--
2.1.4
7:39 p.m.
New subject: [PATCH 1/2] service: Set search domains when connected
Name servers have their own internal check and are added for either IPv4
or IPv6 before the service state is computed. As search domains apply to
both IPv4 and IPv6 name server lookups, the search domains are added when
the service is connected using either IPv4 or IPv6.
The previous changes ensure that search domains are properly added to
newly created nameservers. This change properly adds search domains the
first time the service gets to a connected state.
This also fixes missing search domains in resolv.conf when not using
DNS proxying as reported by Mike Purvis.
---
src/service.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/service.c b/src/service.c
index e3317dd..c79fca0 100644
--- a/src/service.c
+++ b/src/service.c
@@ -5320,6 +5320,10 @@ static int service_indicate_state(struct connman_service *service)
service->state = new_state;
state_changed(service);
+ if (!is_connected_state(service, old_state) &&
+ is_connected_state(service, new_state))
+ searchdomain_add_all(service);
+
switch(new_state) {
case CONNMAN_SERVICE_STATE_UNKNOWN:
--
2.1.4
8:48 p.m.
New subject: [PATCH 1/2] service: Set search domains when connected
Cool, thanks for addressing this— will try it out in v1.31.
On 26 November 2015 at 09:09, Patrik Flykt <patrik.flykt(a)linux.intel.com>
wrote:
Name servers have their own internal check and are added for either
IPv4
or IPv6 before the service state is computed. As search domains apply to
both IPv4 and IPv6 name server lookups, the search domains are added when
the service is connected using either IPv4 or IPv6.
The previous changes ensure that search domains are properly added to
newly created nameservers. This change properly adds search domains the
first time the service gets to a connected state.
This also fixes missing search domains in resolv.conf when not using
DNS proxying as reported by Mike Purvis.
---
src/service.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/service.c b/src/service.c
index e3317dd..c79fca0 100644
--- a/src/service.c
+++ b/src/service.c
@@ -5320,6 +5320,10 @@ static int service_indicate_state(struct
connman_service *service)
service->state = new_state;
state_changed(service);
+ if (!is_connected_state(service, old_state) &&
+ is_connected_state(service, new_state))
+ searchdomain_add_all(service);
+
switch(new_state) {
case CONNMAN_SERVICE_STATE_UNKNOWN:
--
2.1.4
_______________________________________________
connman mailing list
connman(a)lists.01.org
https://lists.01.org/mailman/listinfo/connman
1:41 p.m.
New subject: [PATCH 1/2] service: Set search domains when connected
On Thu, 2015-11-26 at 10:18 -0500, Mike Purvis wrote:
Cool, thanks for addressing this— will try it out in v1.31.
It'd be much better if you can try it out before we release 1.31. If you
notice it's still wrong after the release, you'll have to wait even
longer to get a release where it is correct... :-)
Cheers,
Patrik
7:39 p.m.
New subject: [PATCH 2/2] service: Move code around to avoid declaring a static function
No functional changes are introduced.
---
src/service.c | 102 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 51 insertions(+), 51 deletions(-)
diff --git a/src/service.c b/src/service.c
index c79fca0..abf0899 100644
--- a/src/service.c
+++ b/src/service.c
@@ -134,8 +134,6 @@ static struct connman_ipconfig *create_ip4config(struct
connman_service *service
static struct connman_ipconfig *create_ip6config(struct connman_service *service,
int index);
-static int searchdomain_add_all(struct connman_service *service);
-
struct find_data {
const char *path;
struct connman_service *service;
@@ -942,6 +940,56 @@ static bool nameserver_available(struct connman_service *service,
return false;
}
+static int searchdomain_add_all(struct connman_service *service)
+{
+ int index, i = 0;
+
+ if (!is_connected(service))
+ return -ENOTCONN;
+
+ index = __connman_service_get_index(service);
+ if (index < 0)
+ return -ENXIO;
+
+ if (service->domains) {
+ while (service->domains[i]) {
+ connman_resolver_append(index, service->domains[i],
+ NULL);
+ i++;
+ }
+
+ return 0;
+ }
+
+ if (service->domainname)
+ connman_resolver_append(index, service->domainname, NULL);
+
+ return 0;
+
+}
+
+static int searchdomain_remove_all(struct connman_service *service)
+{
+ int index, i = 0;
+
+ if (!is_connected(service))
+ return -ENOTCONN;
+
+ index = __connman_service_get_index(service);
+ if (index < 0)
+ return -ENXIO;
+
+ while (service->domains && service->domains[i]) {
+ connman_resolver_remove(index, service->domains[i], NULL);
+ i++;
+ }
+
+ if (service->domainname)
+ connman_resolver_remove(index, service->domainname, NULL);
+
+ return 0;
+}
+
static int nameserver_add(struct connman_service *service,
enum connman_ipconfig_type type,
const char *nameserver)
@@ -1020,55 +1068,7 @@ static int nameserver_remove_all(struct connman_service *service,
i++;
}
- return 0;
-}
-
-static int searchdomain_add_all(struct connman_service *service)
-{
- int index, i = 0;
-
- if (!is_connected(service))
- return -ENOTCONN;
-
- index = __connman_service_get_index(service);
- if (index < 0)
- return -ENXIO;
-
- if (service->domains) {
- while (service->domains[i]) {
- connman_resolver_append(index, service->domains[i],
- NULL);
- i++;
- }
-
- return 0;
- }
-
- if (service->domainname)
- connman_resolver_append(index, service->domainname, NULL);
-
- return 0;
-
-}
-
-static int searchdomain_remove_all(struct connman_service *service)
-{
- int index, i = 0;
-
- if (!is_connected(service))
- return -ENOTCONN;
-
- index = __connman_service_get_index(service);
- if (index < 0)
- return -ENXIO;
-
- while (service->domains && service->domains[i]) {
- connman_resolver_remove(index, service->domains[i], NULL);
- i++;
- }
-
- if (service->domainname)
- connman_resolver_remove(index, service->domainname, NULL);
+ searchdomain_remove_all(service);
return 0;
}
--
2.1.4
2:54 p.m.
New subject: [PATCH 0/2] Set search domains on connect
On Thu, 2015-11-26 at 16:09 +0200, Patrik Flykt wrote:
Hi,
Patch 1/2 obsoletes the previous patch called "service: Set search domains
regardless of connected state". Instead, ensure that search domains are
added at least once after a successful connection. The previously committed
patches ensure that search domains are updated properly when new nameservers
are added.
Patch 2/2 trivially moves code around to get rid of a somewhat useless
function declaration.
Both patches applied.
Patrik
1825
days inactive
1831
days old
6 comments
3 participants
participants (3)
-
Mike Purvis -
Patrik Flykt -
Patrik Flykt