If username and password specified, issue an UAUTHREQ
command with the configured authentication method, selected cid
and credentials.
---
drivers/ubloxmodem/gprs-context.c | 61 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 60 insertions(+), 1 deletion(-)
diff --git a/drivers/ubloxmodem/gprs-context.c
b/drivers/ubloxmodem/gprs-context.c
index 4b8fb6c..1a410b0 100644
--- a/drivers/ubloxmodem/gprs-context.c
+++ b/drivers/ubloxmodem/gprs-context.c
@@ -48,6 +48,9 @@ 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;
};
@@ -259,9 +262,58 @@ static void ublox_activate_ctx(struct ofono_gprs_context
*gc)
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) {
+ ofono_error("can't authenticate");
+ gcd->active_context = 0;
+ callback_with_error(gcd, result);
+
+ return;
+ }
+
+ ublox_activate_ctx(gc);
+}
+
#define UBLOX_MAX_USER_LEN 50
#define UBLOX_MAX_PASS_LEN 50
+static void ublox_authenticate(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)
@@ -285,9 +337,16 @@ 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));
- ublox_activate_ctx(gc);
+ if (strlen(ctx->username) && strlen(ctx->password)) {
+ memcpy(gcd->username, ctx->username, sizeof(ctx->username));
+ memcpy(gcd->password, ctx->password, sizeof(ctx->password));
+ ublox_authenticate(gc);
+ } else
+ ublox_activate_ctx(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