Merge pull request #281 from tigeli/update11

[rilmodem] fix issue with only one nameserver being provided
2015-02-23 10:09:59 +01:00 · 2015-02-20 22:17:03 +02:00
1 changed files with 4 additions and 9 deletions
--- a/ofono/drivers/rilmodem/gprs-context.c
+++ b/ofono/drivers/rilmodem/gprs-context.c
@@ -126,7 +126,6 @@ static void ril_gprs_split_dns_by_protocol(char **dns_array, char ***dns_addr,
 {
 	const char ipv6_delimiter = ':';
 	const char ip_delimiter = '.';
-	const char dns_delimiter = ',';
 	char *temp = NULL;
 	char *temp1 = NULL;
 	char *dnsip = NULL;
@@ -162,15 +161,11 @@ static void ril_gprs_split_dns_by_protocol(char **dns_array, char ***dns_addr,
 		}
 	}

-	if (dnsip){
-		if (strchr(dnsip,dns_delimiter))
-			*dns_addr = g_strsplit(dnsip, ",", dnsip_len);
-	}
+	if (dnsip)
+		*dns_addr = g_strsplit(dnsip, ",", dnsip_len);

-	if (dnsipv6) {
-		if (strchr(dnsipv6,dns_delimiter))
-			*dns_ipv6_addr = g_strsplit(dnsipv6, ",", dnsipv6_len);
-	}
+	if (dnsipv6)
+		*dns_ipv6_addr = g_strsplit(dnsipv6, ",", dnsipv6_len);

 	g_free(dnsip);
 	g_free(dnsipv6);
Author	SHA1	Message	Date
Pasi Sjöholm	c16b3c01ee	Merge pull request #281 from tigeli/update11 [rilmodem] fix issue with only one nameserver being provided	2015-02-23 10:09:59 +01:00
Pasi Sjöholm	273e95ab85	[rilmodem] fix issue with only one nameserver being provided No need to check if we have multiple nameserver provided by the context, single one is enough.	2015-02-20 22:17:03 +02:00