[PATCH] gprs: Setup route for mmsc if there's no mms proxy

[Slava Monich]

And don't setup mms route at all if mmsc/proxy host name is not in
dotted IPv4 format.
---
 src/gprs.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/gprs.c b/src/gprs.c
index 05ab499..9c643b9 100644
--- a/src/gprs.c
+++ b/src/gprs.c
@@ -585,13 +585,16 @@ static void pri_context_signal_settings(struct 
pri_context *ctx,
                                context_settings_append_ipv6);
 }
 
-static void pri_parse_proxy(struct pri_context *ctx, const char *proxy)
+static gboolean pri_parse_proxy(struct pri_context *ctx, const char *proxy)
 {
        char *scheme, *host, *port, *path;
 
+       if (proxy[0] == 0)
+               return FALSE;
+
        scheme = g_strdup(proxy);
        if (scheme == NULL)
-               return;
+               return FALSE;
 
        host = strstr(scheme, "://");
        if (host != NULL) {
@@ -604,7 +607,7 @@ static void pri_parse_proxy(struct pri_context *ctx, const 
char *proxy)
                        ctx->proxy_port = 80;
                else {
                        g_free(scheme);
-                       return;
+                       return FALSE;
                }
        } else {
                host = scheme;
@@ -626,10 +629,16 @@ static void pri_parse_proxy(struct pri_context *ctx, 
const char *proxy)
                }
        }
 
+       if (host[0] == 0) {
+               g_free(scheme);
+               return FALSE;
+       }
+
        g_free(ctx->proxy_host);
        ctx->proxy_host = g_strdup(host);
 
        g_free(scheme);
+       return TRUE;
 }
 
 static void pri_ifupdown(const char *interface, ofono_bool_t active)
@@ -715,11 +724,16 @@ static void pri_setproxy(const char *interface, const 
char *proxy)
 {
        struct rtentry rt;
        struct sockaddr_in addr;
+       in_addr_t proxy_addr;
        int sk;
 
        if (interface == NULL)
                return;
 
+       proxy_addr = inet_addr(proxy);
+       if (proxy_addr == INADDR_NONE)
+               return;
+
        sk = socket(PF_INET, SOCK_DGRAM, 0);
        if (sk < 0)
                return;
@@ -730,7 +744,7 @@ static void pri_setproxy(const char *interface, const char 
*proxy)
 
        memset(&addr, 0, sizeof(addr));
        addr.sin_family = AF_INET;
-       addr.sin_addr.s_addr = inet_addr(proxy);
+       addr.sin_addr.s_addr = proxy_addr;
        memcpy(&rt.rt_dst, &addr, sizeof(rt.rt_dst));
 
        memset(&addr, 0, sizeof(addr));
@@ -792,7 +806,8 @@ static void pri_update_mms_context_settings(struct 
pri_context *ctx)
        if (ctx->message_proxy)
                settings->ipv4->proxy = g_strdup(ctx->message_proxy);
 
-       pri_parse_proxy(ctx, ctx->message_proxy);
+       if (!pri_parse_proxy(ctx, ctx->message_proxy))
+               pri_parse_proxy(ctx, ctx->message_center);
 
        DBG("proxy %s port %u", ctx->proxy_host, ctx->proxy_port);
 
-- 
1.8.3.2

_______________________________________________
ofono mailing list
ofono@ofono.org
https://lists.ofono.org/mailman/listinfo/ofono