aboutsummaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/cinterion/mm-broadband-bearer-cinterion.c6
-rw-r--r--plugins/huawei/mm-broadband-bearer-huawei.c12
-rw-r--r--plugins/icera/mm-broadband-bearer-icera.c10
-rw-r--r--plugins/option/mm-broadband-bearer-hso.c10
-rw-r--r--plugins/sierra/mm-broadband-bearer-sierra.c10
-rw-r--r--plugins/ublox/mm-broadband-bearer-ublox.c4
6 files changed, 26 insertions, 26 deletions
diff --git a/plugins/cinterion/mm-broadband-bearer-cinterion.c b/plugins/cinterion/mm-broadband-bearer-cinterion.c
index b3b1d240..676bbbd9 100644
--- a/plugins/cinterion/mm-broadband-bearer-cinterion.c
+++ b/plugins/cinterion/mm-broadband-bearer-cinterion.c
@@ -233,9 +233,9 @@ build_auth_string (MMBroadbandBearerCinterion *self,
if (!has_user && !has_passwd)
return NULL;
- /* If user/passwd given, default to PAP */
- mm_obj_dbg (self, "APN user/password given but no authentication type explicitly requested: defaulting to 'PAP'");
- encoded_auth = BEARER_CINTERION_AUTH_PAP;
+ /* If user/passwd given, default to CHAP (more common than PAP) */
+ mm_obj_dbg (self, "APN user/password given but no authentication type explicitly requested: defaulting to 'CHAP'");
+ encoded_auth = BEARER_CINTERION_AUTH_CHAP;
}
quoted_user = mm_port_serial_at_quote_string (user ? user : "");
diff --git a/plugins/huawei/mm-broadband-bearer-huawei.c b/plugins/huawei/mm-broadband-bearer-huawei.c
index ca20c655..6548ae7f 100644
--- a/plugins/huawei/mm-broadband-bearer-huawei.c
+++ b/plugins/huawei/mm-broadband-bearer-huawei.c
@@ -391,17 +391,17 @@ connect_3gpp_context_step (GTask *task)
if (!user && !passwd)
command = g_strdup_printf ("AT^NDISDUP=1,1,\"%s\"",
apn == NULL ? "" : apn);
- else if (encoded_auth == MM_BEARER_HUAWEI_AUTH_NONE)
- command = g_strdup_printf ("AT^NDISDUP=1,1,\"%s\",\"%s\",\"%s\"",
- apn == NULL ? "" : apn,
- user == NULL ? "" : user,
- passwd == NULL ? "" : passwd);
- else
+ else {
+ if (encoded_auth == MM_BEARER_HUAWEI_AUTH_NONE) {
+ encoded_auth = MM_BEARER_HUAWEI_AUTH_CHAP;
+ mm_obj_dbg (self, "using default (CHAP) authentication method");
+ }
command = g_strdup_printf ("AT^NDISDUP=1,1,\"%s\",\"%s\",\"%s\",%d",
apn == NULL ? "" : apn,
user == NULL ? "" : user,
passwd == NULL ? "" : passwd,
encoded_auth);
+ }
mm_base_modem_at_command_full (ctx->modem,
ctx->primary,
diff --git a/plugins/icera/mm-broadband-bearer-icera.c b/plugins/icera/mm-broadband-bearer-icera.c
index 48bcf49a..caa8567f 100644
--- a/plugins/icera/mm-broadband-bearer-icera.c
+++ b/plugins/icera/mm-broadband-bearer-icera.c
@@ -734,14 +734,14 @@ authenticate (GTask *task)
guint icera_auth;
if (allowed_auth == MM_BEARER_ALLOWED_AUTH_UNKNOWN) {
- mm_obj_dbg (self, "using default (PAP) authentication method");
- icera_auth = 1;
- } else if (allowed_auth & MM_BEARER_ALLOWED_AUTH_PAP) {
- mm_obj_dbg (self, "using PAP authentication method");
- icera_auth = 1;
+ mm_obj_dbg (self, "using default (CHAP) authentication method");
+ icera_auth = 2;
} else if (allowed_auth & MM_BEARER_ALLOWED_AUTH_CHAP) {
mm_obj_dbg (self, "using CHAP authentication method");
icera_auth = 2;
+ } else if (allowed_auth & MM_BEARER_ALLOWED_AUTH_PAP) {
+ mm_obj_dbg (self, "using PAP authentication method");
+ icera_auth = 1;
} else {
gchar *str;
diff --git a/plugins/option/mm-broadband-bearer-hso.c b/plugins/option/mm-broadband-bearer-hso.c
index 3ca5cd77..a5702c01 100644
--- a/plugins/option/mm-broadband-bearer-hso.c
+++ b/plugins/option/mm-broadband-bearer-hso.c
@@ -526,14 +526,14 @@ authenticate (GTask *task)
guint hso_auth;
if (allowed_auth == MM_BEARER_ALLOWED_AUTH_UNKNOWN) {
- mm_obj_dbg (self, "using default (PAP) authentication method");
- hso_auth = 1;
- } else if (allowed_auth & MM_BEARER_ALLOWED_AUTH_PAP) {
- mm_obj_dbg (self, "using PAP authentication method");
- hso_auth = 1;
+ mm_obj_dbg (self, "using default (CHAP) authentication method");
+ hso_auth = 2;
} else if (allowed_auth & MM_BEARER_ALLOWED_AUTH_CHAP) {
mm_obj_dbg (self, "using CHAP authentication method");
hso_auth = 2;
+ } else if (allowed_auth & MM_BEARER_ALLOWED_AUTH_PAP) {
+ mm_obj_dbg (self, "using PAP authentication method");
+ hso_auth = 1;
} else {
gchar *str;
diff --git a/plugins/sierra/mm-broadband-bearer-sierra.c b/plugins/sierra/mm-broadband-bearer-sierra.c
index 24bde739..db9fdead 100644
--- a/plugins/sierra/mm-broadband-bearer-sierra.c
+++ b/plugins/sierra/mm-broadband-bearer-sierra.c
@@ -338,14 +338,14 @@ dial_3gpp_context_step (GTask *task)
guint sierra_auth;
if (allowed_auth == MM_BEARER_ALLOWED_AUTH_UNKNOWN) {
- mm_obj_dbg (self, "using default (PAP) authentication method");
- sierra_auth = 1;
- } else if (allowed_auth & MM_BEARER_ALLOWED_AUTH_PAP) {
- mm_obj_dbg (self, "using PAP authentication method");
- sierra_auth = 1;
+ mm_obj_dbg (self, "using default (CHAP) authentication method");
+ sierra_auth = 2;
} else if (allowed_auth & MM_BEARER_ALLOWED_AUTH_CHAP) {
mm_obj_dbg (self, "using CHAP authentication method");
sierra_auth = 2;
+ } else if (allowed_auth & MM_BEARER_ALLOWED_AUTH_PAP) {
+ mm_obj_dbg (self, "using PAP authentication method");
+ sierra_auth = 1;
} else {
gchar *str;
diff --git a/plugins/ublox/mm-broadband-bearer-ublox.c b/plugins/ublox/mm-broadband-bearer-ublox.c
index 1e2ea4d5..1b209841 100644
--- a/plugins/ublox/mm-broadband-bearer-ublox.c
+++ b/plugins/ublox/mm-broadband-bearer-ublox.c
@@ -498,10 +498,10 @@ authenticate_3gpp (GTask *task)
mm_obj_dbg (self, "using automatic authentication method");
if (self->priv->allowed_auths & MM_UBLOX_BEARER_ALLOWED_AUTH_AUTO)
ublox_auth = 3;
- else if (self->priv->allowed_auths & MM_UBLOX_BEARER_ALLOWED_AUTH_PAP)
- ublox_auth = 1;
else if (self->priv->allowed_auths & MM_UBLOX_BEARER_ALLOWED_AUTH_CHAP)
ublox_auth = 2;
+ else if (self->priv->allowed_auths & MM_UBLOX_BEARER_ALLOWED_AUTH_PAP)
+ ublox_auth = 1;
else if (self->priv->allowed_auths & MM_UBLOX_BEARER_ALLOWED_AUTH_NONE)
ublox_auth = 0;
} else if (allowed_auth & MM_BEARER_ALLOWED_AUTH_PAP) {
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-06-09 11:05:49 +0000