If username and password specified, issue an UAUTHREQ
command with the configured authentication method, selected cid
and credentials.
---
drivers/ubloxmodem/gprs-context.c | 86 +++++++++++++++++++++++++++++++++++++--
1 file changed, 82 insertions(+), 4 deletions(-)
diff --git a/drivers/ubloxmodem/gprs-context.c
b/drivers/ubloxmodem/gprs-context.c
index a3d9743..3e20421 100644
--- a/drivers/ubloxmodem/gprs-context.c
+++ b/drivers/ubloxmodem/gprs-context.c
@@ -47,6 +47,10 @@ static const char *cgcontrdp_prefix[] = { "+CGCONTRDP:",
NULL };
struct gprs_context_data {
GAtChat *chat;
unsigned int active_context;
+ char apn[OFONO_GPRS_MAX_APN_LENGTH + 1];
+ char username[OFONO_GPRS_MAX_USERNAME_LENGTH + 1];
+ char password[OFONO_GPRS_MAX_PASSWORD_LENGTH + 1];
+ enum ofono_gprs_auth_method auth_method;
ofono_gprs_context_cb_t cb;
void *cb_data;
};
@@ -230,7 +234,7 @@ static void cgdcont_cb(gboolean ok, GAtResult *result,
gpointer user_data)
CALLBACK_WITH_FAILURE(gcd->cb, gcd->cb_data);
}
-static void ublox_send_cgdcont(struct ofono_gprs_context *gc, const char *apn)
+static void ublox_send_cgdcont(struct ofono_gprs_context *gc)
{
struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
char buf[OFONO_GPRS_MAX_APN_LENGTH + 128];
@@ -239,8 +243,8 @@ static void ublox_send_cgdcont(struct ofono_gprs_context
*gc, const char *apn)
len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IP\"",
gcd->active_context);
- if (apn)
- snprintf(buf + len, sizeof(buf) - len - 3, ",\"%s\"", apn);
+ if (gcd->apn)
+ snprintf(buf + len, sizeof(buf) - len - 3, ",\"%s\"", gcd->apn);
if (g_at_chat_send(gcd->chat, buf, none_prefix,
cgdcont_cb, gc, NULL) > 0)
@@ -249,11 +253,67 @@ static void ublox_send_cgdcont(struct ofono_gprs_context
*gc, const char *apn)
CALLBACK_WITH_FAILURE(gcd->cb, gcd->cb_data);
}
+static void uauthreq_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct ofono_gprs_context *gc = user_data;
+ struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+
+ DBG("ok %d", ok);
+
+ if (!ok) {
+ struct ofono_error error;
+
+ gcd->active_context = 0;
+
+ decode_at_error(&error, g_at_result_final_response(result));
+ gcd->cb(&error, gcd->cb_data);
+
+ return;
+ }
+
+ ublox_send_cgdcont(gc);
+}
+
+#define UBLOX_MAX_USER_LEN 50
+#define UBLOX_MAX_PASS_LEN 50
+
+static void ublox_send_uauthreq(struct ofono_gprs_context *gc)
+{
+ struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+ char buf[UBLOX_MAX_USER_LEN + UBLOX_MAX_PASS_LEN + 32];
+ unsigned auth_method;
+
+ switch (gcd->auth_method) {
+ case OFONO_GPRS_AUTH_METHOD_PAP:
+ auth_method = 1;
+ break;
+ case OFONO_GPRS_AUTH_METHOD_CHAP:
+ auth_method = 2;
+ break;
+ default:
+ ofono_error("Unsupported auth type %u", gcd->auth_method);
+ goto error;
+ }
+
+ snprintf(buf, sizeof(buf), "AT+UAUTHREQ=%u,%u,\"%s\",\"%s\"",
+ gcd->active_context, auth_method,
+ gcd->username, gcd->password);
+
+ /* If this failed, we will see it during context activation. */
+ if (g_at_chat_send(gcd->chat, buf, none_prefix,
+ uauthreq_cb, gc, NULL) > 0)
+ return;
+
+error:
+ CALLBACK_WITH_FAILURE(gcd->cb, gcd->cb_data);
+}
+
static void ublox_gprs_activate_primary(struct ofono_gprs_context *gc,
const struct ofono_gprs_primary_context *ctx,
ofono_gprs_context_cb_t cb, void *data)
{
struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+ size_t u_len, p_len;
/* IPv6 support not implemented */
if (ctx->proto != OFONO_GPRS_PROTO_IP) {
@@ -273,8 +333,26 @@ static void ublox_gprs_activate_primary(struct
ofono_gprs_context *gc,
gcd->cb = cb;
gcd->cb_data = data;
+ gcd->auth_method = ctx->auth_method;
+ memcpy(gcd->apn, ctx->apn, sizeof(ctx->apn));
+
+ u_len = strlen(ctx->username);
+ p_len = strlen(ctx->password);
+
+ if (u_len && p_len) {
+ if (u_len >= UBLOX_MAX_USER_LEN ||
+ p_len >= UBLOX_MAX_PASS_LEN) {
+ ofono_error("Toby L2: user or password length too big");
+ CALLBACK_WITH_FAILURE(cb, data);
+
+ return;
+ }
- ublox_send_cgdcont(gc, ctx->apn);
+ memcpy(gcd->username, ctx->username, sizeof(gcd->username));
+ memcpy(gcd->password, ctx->password, sizeof(gcd->password));
+ ublox_send_uauthreq(gc);
+ } else
+ ublox_send_cgdcont(gc);
}
static void cgact_disable_cb(gboolean ok, GAtResult *result, gpointer
user_data)
--
2.5.0
_______________________________________________
ofono mailing list
[email protected]
https://lists.ofono.org/mailman/listinfo/ofono