[PATCH_v2 0/4] CDMA-connman add username and password properties

[PATCH_v2 0/4] CDMA-connman add username and password properties

[Guillaume Zajac]

[-- Attachment #1: Type: text/plain, Size: 753 bytes --]

Change log from v1:
	- username and password storage is now very similar to gprs one.
	- rework logic flow.

Guillaume Zajac (4):
  cdma-connman: pass username and password to drivers while activating
    cdma-connman
  cdma-connman: add username and password, pass them to drivers
  driver cdma-connman: pass credentials into activate function
  test: add script to set credentials for cdma connection

 drivers/cdmamodem/connman.c  |    9 +++++++
 include/cdma-connman.h       |    5 ++++
 src/cdma-connman.c           |   48 +++++++++++++++++++++++++++++++++++++++++-
 test/create-cdma-credentials |   29 +++++++++++++++++++++++++
 4 files changed, 90 insertions(+), 1 deletions(-)
 create mode 100755 test/create-cdma-credentials

[PATCH_v2 1/4] cdma-connman: pass username and password to drivers while activating cdma-connman

[Guillaume Zajac]

[-- Attachment #1: Type: text/plain, Size: 961 bytes --]

---
 include/cdma-connman.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/include/cdma-connman.h b/include/cdma-connman.h
index 22252e0..6a1c9ff 100644
--- a/include/cdma-connman.h
+++ b/include/cdma-connman.h
@@ -30,6 +30,9 @@ extern "C" {
 
 struct ofono_cdma_connman;
 
+#define OFONO_CDMA_CONNMAN_MAX_USERNAME_LENGTH 63
+#define OFONO_CDMA_CONNMAN_MAX_PASSWORD_LENGTH 255
+
 typedef void (*ofono_cdma_connman_cb_t)(const struct ofono_error *error,
 						void *data);
 typedef void (*ofono_cdma_connman_up_cb_t)(const struct ofono_error *error,
@@ -47,6 +50,8 @@ struct ofono_cdma_connman_driver {
 						void *data);
 	void (*remove)(struct ofono_cdma_connman *cm);
 	void (*activate)(struct ofono_cdma_connman *cm,
+						const char *username,
+						const char *password,
 						ofono_cdma_connman_up_cb_t cb,
 						void *data);
 	void (*deactivate)(struct ofono_cdma_connman *cm,
-- 
1.7.1

[PATCH_v2 2/4] cdma-connman: add username and password, pass them to drivers

[Guillaume Zajac]

[-- Attachment #1: Type: text/plain, Size: 3017 bytes --]

---
 src/cdma-connman.c |   48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 47 insertions(+), 1 deletions(-)

diff --git a/src/cdma-connman.c b/src/cdma-connman.c
index 3321b87..4466dee 100644
--- a/src/cdma-connman.c
+++ b/src/cdma-connman.c
@@ -57,6 +57,8 @@ struct ofono_cdma_connman {
 	const struct ofono_cdma_connman_driver *driver;
 	void *driver_data;
 	struct ofono_atom *atom;
+	char username[OFONO_CDMA_CONNMAN_MAX_USERNAME_LENGTH + 1];
+	char password[OFONO_CDMA_CONNMAN_MAX_PASSWORD_LENGTH + 1];
 };
 
 static void cdma_connman_settings_free(struct cdma_connman_settings *settings)
@@ -371,6 +373,36 @@ static DBusMessage *cdma_connman_get_properties(DBusConnection *conn,
 	return reply;
 }
 
+static DBusMessage *cdma_connman_set_username(struct ofono_cdma_connman *cm,
+					DBusConnection *conn, DBusMessage *msg,
+					const char *username)
+{
+	if (strlen(username) > OFONO_CDMA_CONNMAN_MAX_USERNAME_LENGTH)
+		return __ofono_error_invalid_format(msg);
+
+	if (g_str_equal(username, cm->username))
+		return dbus_message_new_method_return(msg);
+
+	strcpy(cm->username, username);
+
+	return dbus_message_new_method_return(msg);
+}
+
+static DBusMessage *cdma_connman_set_password(struct ofono_cdma_connman *cm,
+					DBusConnection *conn, DBusMessage *msg,
+					const char *password)
+{
+	if (strlen(password) > OFONO_CDMA_CONNMAN_MAX_PASSWORD_LENGTH)
+		return __ofono_error_invalid_format(msg);
+
+	if (g_str_equal(password, cm->password))
+		return dbus_message_new_method_return(msg);
+
+	strcpy(cm->password, password);
+
+	return dbus_message_new_method_return(msg);
+}
+
 static DBusMessage *cdma_connman_set_property(DBusConnection *conn,
 					DBusMessage *msg, void *data)
 {
@@ -379,6 +411,7 @@ static DBusMessage *cdma_connman_set_property(DBusConnection *conn,
 	DBusMessageIter var;
 	const char *property;
 	dbus_bool_t value;
+	const char *str;
 
 	DBG("");
 
@@ -416,11 +449,24 @@ static DBusMessage *cdma_connman_set_property(DBusConnection *conn,
 
 		/* TODO: add logic to support CDMA Network Registration */
 		if (value)
-			cm->driver->activate(cm, activate_callback, cm);
+			cm->driver->activate(cm, cm->username, cm->password,
+						activate_callback, cm);
 		else
 			cm->driver->deactivate(cm, deactivate_callback, cm);
 
 		return dbus_message_new_method_return(msg);
+	} else if (!strcmp(property, "Username")) {
+		if (dbus_message_iter_get_arg_type(&var) != DBUS_TYPE_STRING)
+			return __ofono_error_invalid_args(msg);
+
+		dbus_message_iter_get_basic(&var, &str);
+		return cdma_connman_set_username(cm, conn, msg, str);
+	} else if (!strcmp(property, "Password")) {
+		if (dbus_message_iter_get_arg_type(&var) != DBUS_TYPE_STRING)
+			return __ofono_error_invalid_args(msg);
+
+		dbus_message_iter_get_basic(&var, &str);
+		return cdma_connman_set_password(cm, conn, msg, str);
 	}
 
 	/* TODO: Dormant property. Not yet supported. */
-- 
1.7.1

[PATCH_v2 3/4] driver cdma-connman: pass credentials into activate function

[Guillaume Zajac]

[-- Attachment #1: Type: text/plain, Size: 1530 bytes --]

---
 drivers/cdmamodem/connman.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/drivers/cdmamodem/connman.c b/drivers/cdmamodem/connman.c
index 14c78b1..ce9a748 100644
--- a/drivers/cdmamodem/connman.c
+++ b/drivers/cdmamodem/connman.c
@@ -56,6 +56,8 @@ struct connman_data {
 	GAtChat *chat;
 	GAtPPP *ppp;
 	enum state state;
+	char username[OFONO_CDMA_CONNMAN_MAX_USERNAME_LENGTH + 1];
+	char password[OFONO_CDMA_CONNMAN_MAX_PASSWORD_LENGTH + 1];
 	union {
 		ofono_cdma_connman_cb_t down_cb;	/* Down callback */
 		ofono_cdma_connman_up_cb_t up_cb;	/* Up callback */
@@ -145,6 +147,8 @@ static gboolean setup_ppp(struct ofono_cdma_connman *cm)
 	g_at_ppp_set_connect_function(cd->ppp, ppp_connect, cm);
 	g_at_ppp_set_disconnect_function(cd->ppp, ppp_disconnect, cm);
 
+	g_at_ppp_set_credentials(cd->ppp, cd->username, cd->password);
+
 	/* open the ppp connection */
 	g_at_ppp_open(cd->ppp, io);
 
@@ -175,6 +179,8 @@ static void atd_cb(gboolean ok, GAtResult *result, gpointer user_data)
 }
 
 static void cdma_connman_activate(struct ofono_cdma_connman *cm,
+					const char *username,
+					const char *password,
 					ofono_cdma_connman_up_cb_t cb,
 					void *data)
 {
@@ -185,6 +191,9 @@ static void cdma_connman_activate(struct ofono_cdma_connman *cm,
 
 	cd->up_cb = cb;
 	cd->cb_data = data;
+	strcpy(cd->username, username);
+	strcpy(cd->password, password);
+
 	cd->state = STATE_ENABLING;
 
 	sprintf(buf, "ATD#777");
-- 
1.7.1

[PATCH_v2 4/4] test: add script to set credentials for cdma connection

[Guillaume Zajac]

[-- Attachment #1: Type: text/plain, Size: 1138 bytes --]

---
 test/create-cdma-credentials |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)
 create mode 100755 test/create-cdma-credentials

diff --git a/test/create-cdma-credentials b/test/create-cdma-credentials
new file mode 100755
index 0000000..0f52a98
--- /dev/null
+++ b/test/create-cdma-credentials
@@ -0,0 +1,29 @@
+#!/usr/bin/python
+
+import dbus
+import sys
+
+bus = dbus.SystemBus()
+
+manager = dbus.Interface(bus.get_object('org.ofono', '/'),
+						'org.ofono.Manager')
+
+modems = manager.GetModems()
+
+for path, properties in modems:
+	if "org.ofono.cdma.ConnectionManager" not in properties["Interfaces"]:
+		continue
+
+	cm = dbus.Interface(bus.get_object('org.ofono', path),
+					'org.ofono.cdma.ConnectionManager')
+
+	print "Connecting CDMA Packet Data Service on modem %s..." % path
+
+	if len(sys.argv) > 1:
+		cm.SetProperty("Username", (sys.argv[1]))
+		print "Setting Username to %s" % (sys.argv[1])
+
+	if len(sys.argv) > 2:
+		cm.SetProperty("Password", (sys.argv[2]))
+		print "Setting Password to %s" % (sys.argv[2])
+
-- 
1.7.1

Re: [PATCH_v2 1/4] cdma-connman: pass username and password to drivers while activating cdma-connman

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

Hi Guillaume,

On 07/20/2011 11:40 PM, Guillaume Zajac wrote:
> ---
>  include/cdma-connman.h |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 

Patch has been applied with a modified commit message.  Please
re-familiarize yourself with doc/coding-style item M5.

Regards,
-Denis

Re: [PATCH_v2 2/4] cdma-connman: add username and password, pass them to drivers

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 1630 bytes --]

Hi Guillaume,

On 07/20/2011 11:40 PM, Guillaume Zajac wrote:
> ---
>  src/cdma-connman.c |   48 +++++++++++++++++++++++++++++++++++++++++++++++-
>  1 files changed, 47 insertions(+), 1 deletions(-)
> 

I applied this patch, with a follow on commit afterwards:

> @@ -371,6 +373,36 @@ static DBusMessage *cdma_connman_get_properties(DBusConnection *conn,
>  	return reply;
>  }
>  
> +static DBusMessage *cdma_connman_set_username(struct ofono_cdma_connman *cm,
> +					DBusConnection *conn, DBusMessage *msg,
> +					const char *username)
> +{
> +	if (strlen(username) > OFONO_CDMA_CONNMAN_MAX_USERNAME_LENGTH)
> +		return __ofono_error_invalid_format(msg);
> +
> +	if (g_str_equal(username, cm->username))
> +		return dbus_message_new_method_return(msg);
> +
> +	strcpy(cm->username, username);
> +
> +	return dbus_message_new_method_return(msg);

When you're changing a property, you really must signal PropertyChanged
as well.

> +}
> +
> +static DBusMessage *cdma_connman_set_password(struct ofono_cdma_connman *cm,
> +					DBusConnection *conn, DBusMessage *msg,
> +					const char *password)
> +{
> +	if (strlen(password) > OFONO_CDMA_CONNMAN_MAX_PASSWORD_LENGTH)
> +		return __ofono_error_invalid_format(msg);
> +
> +	if (g_str_equal(password, cm->password))
> +		return dbus_message_new_method_return(msg);
> +
> +	strcpy(cm->password, password);
> +
> +	return dbus_message_new_method_return(msg);

same comment as above.

> +}
> +
>  static DBusMessage *cdma_connman_set_property(DBusConnection *conn,
>  					DBusMessage *msg, void *data)
>  {

Regards,
-Denis

Re: [PATCH_v2 3/4] driver cdma-connman: pass credentials into activate function

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 256 bytes --]

Hi Guillaume,

On 07/20/2011 11:40 PM, Guillaume Zajac wrote:
> ---
>  drivers/cdmamodem/connman.c |    9 +++++++++
>  1 files changed, 9 insertions(+), 0 deletions(-)
> 

Patch has been applied with a modified commit message.

Regards,
-Denis

Re: [PATCH_v2 4/4] test: add script to set credentials for cdma connection

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 539 bytes --]

Hi Guillaume,

On 07/20/2011 11:40 PM, Guillaume Zajac wrote:
> ---
>  test/create-cdma-credentials |   29 +++++++++++++++++++++++++++++
>  1 files changed, 29 insertions(+), 0 deletions(-)
>  create mode 100755 test/create-cdma-credentials

Can you rename this script to cdma-set-credentials?  I want to follow
our current convention and prefix all cdma related test scripts with cdma.

Also, you are forgetting Makefile.am changes here, the script should be
added to the relevant section in Makefile.am.

Regards,
-Denis