Skip to contentSkip to conversation

gsmdial: add support for different authentication methods selection

PATCH In review [email protected] 2 participants 2 messages Jan 1, 2021 – Jan 4, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gsmdial: add support for different authentication methods selection

From: Sergei Golubtsov <[email protected]>

Selection capability for authentication method via a command line argument has been added

---
 gatchat/gsmdial.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
gatchat/gsmdial.c +13 -0
index 60e4f245..0407f97c 100644
@@ -53,6 +53,7 @@ static gint option_cid = 0;
 static gchar *option_apn = NULL;
 static gint option_offmode = 0;
 static gboolean option_legacy = FALSE;
+static gchar *option_auth_method;
 static gchar *option_username = NULL;
 static gchar *option_password = NULL;
 static gchar *option_pppdump = NULL;
@@ -369,6 +370,14 @@ static void connect_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	}
 	g_at_ppp_set_debug(ppp, gsmdial_debug, "PPP");
 
+	GAtPPPAuthMethod auth_method = G_AT_PPP_AUTH_METHOD_CHAP;
+	if (strcmp(option_auth_method, "PAP") == 0) {
+		auth_method = G_AT_PPP_AUTH_METHOD_PAP;
+	} else if (strcmp(option_auth_method, "NONE") == 0) {
+		auth_method = G_AT_PPP_AUTH_METHOD_NONE;
+	}
+	g_at_ppp_set_auth_method(ppp, auth_method);
+
 	g_at_ppp_set_credentials(ppp, option_username, option_password);
 
 	g_at_ppp_set_acfc_enabled(ppp, option_acfc);
@@ -677,6 +686,10 @@ static GOptionEntry options[] = {
 				"Use ATD*99***<cid>#" },
 	{ "bluetooth", 'b', 0, G_OPTION_ARG_NONE, &option_bluetooth,
 				"Use only ATD*99" },
+	{ "auth", 'A', 0, G_OPTION_ARG_STRING, &option_auth_method,
+				"Specify the authentication method for the PPP"
+				" connection: CHAP, PAP or NONE. CHAP is used"
+				" by default." },
 	{ "username", 'u', 0, G_OPTION_ARG_STRING, &option_username,
 				"Specify PPP username" },
 	{ "password", 'w', 0, G_OPTION_ARG_STRING, &option_password,
Signature · 1 line
2.17.1
#1 lore raw

Hi Sergei,

Quoted 8 lines · s.e.golubtsov(a)gmail.com

From: Sergei Golubtsov <[email protected]>

Selection capability for authentication method via a command line argument has been added

---
  gatchat/gsmdial.c | 13 +++++++++++++
  1 file changed, 13 insertions(+)

denkenz(a)localhost ~/ofono-master $ make
make --no-print-directory all-am
CC gatchat/gsmdial.o
gatchat/gsmdial.c: In function ‘connect_cb’:
gatchat/gsmdial.c:373:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]

   373 |  GAtPPPAuthMethod auth_method = G_AT_PPP_AUTH_METHOD_CHAP;
       |  ^~~~~~~~~~~~~~~~

cc1: all warnings being treated as errors make[1]: *** [Makefile:4078: gatchat/gsmdial.o] Error 1
make: *** [Makefile:2376: all] Error 2

Quoted 14 lines
gatchat/gsmdial.c +1 -0
index 60e4f245..0407f97c 100644
@@ -53,6 +53,7 @@ static gint option_cid = 0;
  static gchar *option_apn = NULL;
  static gint option_offmode = 0;
  static gboolean option_legacy = FALSE;
+static gchar *option_auth_method;
  static gchar *option_username = NULL;
  static gchar *option_password = NULL;
  static gchar *option_pppdump = NULL;
@@ -369,6 +370,14 @@ static void connect_cb(gboolean ok, GAtResult *result, gpointer user_data)
  	}

gatchat/gsmdial.c static void connect_cb(gboolean ok, GAtResult *result, gpointer user_data) · line 380

Quoted 10 lines
gatchat/gsmdial.c +8 -0
  	g_at_ppp_set_debug(ppp, gsmdial_debug, "PPP");
 
+	GAtPPPAuthMethod auth_method = G_AT_PPP_AUTH_METHOD_CHAP;
+	if (strcmp(option_auth_method, "PAP") == 0) {
+		auth_method = G_AT_PPP_AUTH_METHOD_PAP;
+	} else if (strcmp(option_auth_method, "NONE") == 0) {
+		auth_method = G_AT_PPP_AUTH_METHOD_NONE;
+	}
+	g_at_ppp_set_auth_method(ppp, auth_method);
+

Also please refer to doc/coding-style.txt item M1.

Quoted 5 lines
gatchat/gsmdial.c +0 -0
  	g_at_ppp_set_credentials(ppp, option_username, option_password);
 
  	g_at_ppp_set_acfc_enabled(ppp, option_acfc);

gatchat/gsmdial.c static GOptionEntry options[] = { · line 695

Quoted 10 lines
gatchat/gsmdial.c +4 -0
@@ -677,6 +686,10 @@ static GOptionEntry options[] = {
  				"Use ATD*99***<cid>#" },
  	{ "bluetooth", 'b', 0, G_OPTION_ARG_NONE, &option_bluetooth,
  				"Use only ATD*99" },
+	{ "auth", 'A', 0, G_OPTION_ARG_STRING, &option_auth_method,
+				"Specify the authentication method for the PPP"
+				" connection: CHAP, PAP or NONE. CHAP is used"
+				" by default." },
  	{ "username", 'u', 0, G_OPTION_ARG_STRING, &option_username,
  				"Specify PPP username" },
  	{ "password", 'w', 0, G_OPTION_ARG_STRING, &option_password,

Regards,
-Denis