From: Dragos Tatulea <dragos@endocode.com>
To: ofono@ofono.org
Subject: [PATCH 17/19] ubloxmodem: support authentication
Date: Wed, 09 Mar 2016 16:44:58 +0100 [thread overview]
Message-ID: <1457538300-7183-18-git-send-email-dragos@endocode.com> (raw)
In-Reply-To: <1457538300-7183-1-git-send-email-dragos@endocode.com>
[-- Attachment #1: Type: text/plain, Size: 3251 bytes --]
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, 59 insertions(+), 2 deletions(-)
diff --git a/drivers/ubloxmodem/gprs-context.c b/drivers/ubloxmodem/gprs-context.c
index b6eaa5e..bc100d6 100644
--- a/drivers/ubloxmodem/gprs-context.c
+++ b/drivers/ubloxmodem/gprs-context.c
@@ -49,6 +49,9 @@ struct gprs_context_data {
unsigned int active_context;
unsigned int gprs_cid;
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;
};
@@ -326,9 +329,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");
+ release_context_id(gcd->active_context);
+ 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)
@@ -352,13 +404,18 @@ static void ublox_gprs_activate_primary(struct ofono_gprs_context *gc,
gcd->cb = cb;
gcd->cb_data = data;
+ gcd->auth_method = ctx->auth_method;
gcd->gprs_cid = ctx->cid;
memcpy(gcd->apn, ctx->apn, sizeof(ctx->apn));
- if (gcd->active_context == ublox_data.default_context_id)
+ if (gcd->active_context == ublox_data.default_context_id) {
/* Default context already active, only read details. */
ublox_post_activation(gc);
- else
+ } else 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);
}
--
2.5.0
next prev parent reply other threads:[~2016-03-09 15:44 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-09 15:44 [PATCH 00/19] Support for U-Blox Toby L2 modems Dragos Tatulea
2016-03-09 15:44 ` [PATCH 01/19] plugins/udevng: support the U-Blox TOBY-L2 series Dragos Tatulea
2016-03-10 14:00 ` Denis Kenzior
2016-03-09 15:44 ` [PATCH 02/19] plugins/udevng: support different interface strings to detect TOBY series Dragos Tatulea
2016-03-10 14:01 ` Denis Kenzior
2016-03-09 15:44 ` [PATCH 03/19] plugins/udevng: ublox: set model string Dragos Tatulea
2016-03-10 14:04 ` Denis Kenzior
2016-03-09 15:44 ` [PATCH 04/19] include: vendor.h: add vendor for ublox toby Dragos Tatulea
2016-03-10 14:05 ` Denis Kenzior
2016-03-09 15:44 ` [PATCH 05/19] plugins/ublox: allow enabling of TOBY L2 modems Dragos Tatulea
2016-03-10 14:11 ` Denis Kenzior
2016-03-09 15:44 ` [PATCH 06/19] plugins/ublox: use vendor from structure instead of fixed Dragos Tatulea
2016-03-09 15:44 ` [PATCH 07/19] atmodem: ublox: EPS now supported by newer ublox Dragos Tatulea
2016-03-10 14:29 ` Denis Kenzior
2016-03-10 14:43 ` Denis Kenzior
2016-03-09 15:44 ` [PATCH 08/19] atmodem: add support for U-Blox TOBY L2 modems Dragos Tatulea
2016-03-10 14:34 ` Denis Kenzior
2016-03-10 14:38 ` Dragos Tatulea
2016-03-09 15:44 ` [PATCH 09/19] atmodem: work around CGREG issues in UBlox Toby L2 Dragos Tatulea
2016-03-10 14:40 ` Denis Kenzior
2016-03-09 15:44 ` [PATCH 10/19] ubloxmodem: add Toby L2 gprs context driver Dragos Tatulea
2016-03-09 15:44 ` [PATCH 11/19] gprs-context.h: add function for setting APN Dragos Tatulea
2016-03-09 15:44 ` [PATCH 12/19] gprs: allow APN updates from gprs-context driver Dragos Tatulea
2016-03-09 15:44 ` [PATCH 13/19] ubloxmodem: push back APN into gprs context Dragos Tatulea
2016-03-09 15:44 ` [PATCH 14/19] plugins/ublox: give names to model ids Dragos Tatulea
2016-03-09 15:44 ` [PATCH 15/19] plugins/ublox: enable ubloxmodem driver when possible Dragos Tatulea
2016-03-09 15:44 ` [PATCH 16/19] plugins/ublox: support more internet contexts Dragos Tatulea
2016-03-09 15:44 ` Dragos Tatulea [this message]
2016-03-09 15:44 ` [PATCH 18/19] plugins/ublox: read network mode Dragos Tatulea
2016-03-09 15:45 ` [PATCH 19/19] ubloxmodem: add routed mode support Dragos Tatulea
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1457538300-7183-18-git-send-email-dragos@endocode.com \
--to=dragos@endocode.com \
--cc=ofono@ofono.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox