---
src/gprs.c | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/src/gprs.c b/src/gprs.c
index 86d95bc..a867ea1 100644
--- a/src/gprs.c
+++ b/src/gprs.c
@@ -141,8 +141,8 @@ struct pri_context {
unsigned int id;
char *path;
char *key;
- char *proxy_host;
- uint16_t proxy_port;
+ char *host;
+ uint16_t port;
DBusMessage *pending;
struct ofono_gprs_primary_context context;
struct ofono_gprs_context *context_driver;
@@ -616,16 +616,16 @@ static void pri_parse_proxy(struct pri_context *ctx,
const char *proxy)
host += 3;
if (strcasecmp(scheme, "https") == 0)
- ctx->proxy_port = 443;
+ ctx->port = 443;
else if (strcasecmp(scheme, "http") == 0)
- ctx->proxy_port = 80;
+ ctx->port = 80;
else {
g_free(scheme);
return;
}
} else {
host = scheme;
- ctx->proxy_port = 80;
+ ctx->port = 80;
}
path = strchr(host, '/');
@@ -639,12 +639,12 @@ static void pri_parse_proxy(struct pri_context *ctx,
const char *proxy)
if (*end == '\0') {
*port = '\0';
- ctx->proxy_port = tmp;
+ ctx->port = tmp;
}
}
- g_free(ctx->proxy_host);
- ctx->proxy_host = g_strdup(host);
+ g_free(ctx->host);
+ ctx->host = g_strdup(host);
g_free(scheme);
}
@@ -728,7 +728,7 @@ done:
close(sk);
}
-static void pri_setproxy(const char *interface, const char *proxy)
+static void pri_add_host_route(const char *interface, const char *host)
{
struct rtentry rt;
struct sockaddr_in addr;
@@ -747,7 +747,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 = inet_addr(host);
memcpy(&rt.rt_dst, &addr, sizeof(rt.rt_dst));
memset(&addr, 0, sizeof(addr));
@@ -761,7 +761,7 @@ static void pri_setproxy(const char *interface, const char
*proxy)
memcpy(&rt.rt_genmask, &addr, sizeof(rt.rt_genmask));
if (ioctl(sk, SIOCADDRT, &rt) < 0)
- ofono_error("Failed to add proxy host route");
+ ofono_error("Failed to add host route");
close(sk);
}
@@ -788,12 +788,13 @@ static void pri_reset_context_settings(struct pri_context
*ctx)
pri_context_signal_settings(ctx, signal_ipv4, signal_ipv6);
- if (ctx->type == OFONO_GPRS_CONTEXT_TYPE_MMS) {
+ if (ctx->type == OFONO_GPRS_CONTEXT_TYPE_MMS ||
+ ctx->type == OFONO_GPRS_CONTEXT_TYPE_STK) {
pri_set_ipv4_addr(interface, NULL);
- g_free(ctx->proxy_host);
- ctx->proxy_host = NULL;
- ctx->proxy_port = 0;
+ g_free(ctx->host);
+ ctx->host = NULL;
+ ctx->port = 0;
}
pri_ifupdown(interface, FALSE);
@@ -811,12 +812,12 @@ static void pri_update_mms_context_settings(struct
pri_context *ctx)
pri_parse_proxy(ctx, ctx->message_proxy);
- DBG("proxy %s port %u", ctx->proxy_host, ctx->proxy_port);
+ DBG("host %s port %u", ctx->host, ctx->port);
pri_set_ipv4_addr(settings->interface, settings->ipv4->ip);
- if (ctx->proxy_host)
- pri_setproxy(settings->interface, ctx->proxy_host);
+ if (ctx->host)
+ pri_add_host_route(settings->interface, ctx->host);
}
static void append_context_properties(struct pri_context *ctx,
@@ -1366,7 +1367,7 @@ static void pri_context_destroy(gpointer userdata)
{
struct pri_context *ctx = userdata;
- g_free(ctx->proxy_host);
+ g_free(ctx->host);
g_free(ctx->path);
g_free(ctx);
}
@@ -3086,6 +3087,9 @@ unsigned int __ofono_gprs_add_pdp_context(struct
ofono_gprs *gprs,
context->context.proto = proto;
+ if (host)
+ context->host = g_strdup(host);
+
gprs->last_context_id = id;
gprs->contexts = g_slist_append(gprs->contexts, context);
@@ -3121,6 +3125,9 @@ static void activate_request_callback(const struct
ofono_error *error,
gc->settings->ipv4) {
pri_set_ipv4_addr(gc->settings->interface,
gc->settings->ipv4->ip);
+ if (ctx->host)
+ pri_add_host_route(gc->settings->interface,
+ ctx->host);
}
}
--
1.7.1
_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono
