swmodem: Add support for IPv6 and IPv4v6 contexts

This commit is contained in:
Marcel Holtmann 2012-03-21 22:09:03 -07:00
parent 9abf49fa2b
commit 63acbad39a
1 changed files with 18 additions and 5 deletions

View File

@ -151,8 +151,8 @@ static void sw_gprs_activate_primary(struct ofono_gprs_context *gc,
{ {
struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
struct cb_data *cbd = cb_data_new(cb, data); struct cb_data *cbd = cb_data_new(cb, data);
char buf[64]; char buf[OFONO_GPRS_MAX_APN_LENGTH + 128];
int len; int len = 0;
DBG("cid %u", ctx->cid); DBG("cid %u", ctx->cid);
@ -160,11 +160,24 @@ static void sw_gprs_activate_primary(struct ofono_gprs_context *gc,
cbd->user = gc; cbd->user = gc;
len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IP\"", ctx->cid); switch (ctx->proto) {
case OFONO_GPRS_PROTO_IP:
len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IP\"",
ctx->cid);
break;
case OFONO_GPRS_PROTO_IPV6:
len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IPV6\"",
ctx->cid);
break;
case OFONO_GPRS_PROTO_IPV4V6:
len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IPV4V6\"",
ctx->cid);
break;
}
if (ctx->apn) if (ctx->apn)
snprintf(buf + len, sizeof(buf) - len - 3, ",\"%s\"", snprintf(buf + len, sizeof(buf) - len - 3,
ctx->apn); ",\"%s\"", ctx->apn);
if (g_at_chat_send(gcd->chat, buf, none_prefix, if (g_at_chat_send(gcd->chat, buf, none_prefix,
at_cgdcont_cb, cbd, g_free) > 0) at_cgdcont_cb, cbd, g_free) > 0)