[PATCH 01/14] test: fix bug in test-ss-control-cs

[PATCH 01/14] test: fix bug in test-ss-control-cs

[Gustavo F. Padovan]

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

---
 test/test-ss-control-cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/test/test-ss-control-cs b/test/test-ss-control-cs
index bf59789..e04a4a0 100755
--- a/test/test-ss-control-cs
+++ b/test/test-ss-control-cs
@@ -29,7 +29,7 @@ if __name__ == "__main__":
 
         cs.connect_to_signal("PropertyChanged", property_changed)
 
-	ss = dbus.Interface(bus.get_object('org.ofono', modems[0]),
+	ss = dbus.Interface(bus.get_object('org.ofono', modems[0][0]),
 							'org.ofono.SupplementaryServices')
 
 	print_properties(cs)
-- 
1.7.3.2

[PATCH 02/14] atmodem: use macros for CLIP validity

[Gustavo F. Padovan]

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

---
 drivers/atmodem/voicecall.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c
index c04bd69..a2ee49d 100644
--- a/drivers/atmodem/voicecall.c
+++ b/drivers/atmodem/voicecall.c
@@ -39,6 +39,8 @@
 #include "gatchat.h"
 #include "gatresult.h"
 
+#include  "common.h"
+
 #include "atmodem.h"
 
 /* Amount of ms we wait between CLCC calls */
@@ -710,9 +712,9 @@ static void clip_notify(GAtResult *result, gpointer user_data)
 		return;
 
 	if (strlen(num) > 0)
-		validity = 0;
+		validity = CLIP_VALIDITY_VALID;
 	else
-		validity = 2;
+		validity = CLIP_VALIDITY_NOT_AVAILABLE;
 
 	/* Skip subaddr, satype and alpha */
 	g_at_result_iter_skip_next(&iter);
-- 
1.7.3.2

[PATCH 03/14] atmodem: cleanup DBG messages

[Gustavo F. Padovan]

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

---
 drivers/atmodem/call-settings.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/atmodem/call-settings.c b/drivers/atmodem/call-settings.c
index 05c9438..7e1b422 100644
--- a/drivers/atmodem/call-settings.c
+++ b/drivers/atmodem/call-settings.c
@@ -164,7 +164,7 @@ static void clip_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	g_at_result_iter_skip_next(&iter);
 	g_at_result_iter_next_number(&iter, &status);
 
-	DBG("clip_query_cb: network: %d", status);
+	DBG("network: %d", status);
 
 	cb(&error, status, cbd->data);
 }
@@ -214,7 +214,7 @@ static void colp_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	g_at_result_iter_skip_next(&iter);
 	g_at_result_iter_next_number(&iter, &status);
 
-	DBG("colp_query_cb: network: %d", status);
+	DBG("network: %d", status);
 
 	cb(&error, status, cbd->data);
 }
@@ -263,7 +263,7 @@ static void clir_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	g_at_result_iter_next_number(&iter, &override);
 	g_at_result_iter_next_number(&iter, &network);
 
-	DBG("clir_query_cb: override: %d, network: %d", override, network);
+	DBG("override: %d, network: %d", override, network);
 
 	cb(&error, override, network, cbd->data);
 }
@@ -343,7 +343,7 @@ static void colr_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	if (g_at_result_iter_next_number(&iter, &status) == FALSE)
 		goto error;
 
-	DBG("colr_query_cb: network: %d", status);
+	DBG("network: %d", status);
 
 	cb(&error, status, cbd->data);
 	return;
-- 
1.7.3.2

[PATCH 04/14] TODO: Add onwer to CNAP task

[Gustavo F. Padovan]

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

---
 TODO |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/TODO b/TODO
index 6cf7202..290932e 100644
--- a/TODO
+++ b/TODO
@@ -249,6 +249,7 @@ Supplementary Services
 
   Priority: Low
   Complexity: C2
+  Owner: Gustavo F Padovan <padovan@profusion.mobi>
 
 - User to User Signaling (UUS) support
 
-- 
1.7.3.2

[PATCH 05/14] include: add CNAP fields and defines

[Gustavo F. Padovan]

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

---
 include/types.h |    3 +++
 src/common.h    |    7 +++++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/include/types.h b/include/types.h
index ba2481f..de15437 100644
--- a/include/types.h
+++ b/include/types.h
@@ -77,6 +77,7 @@ struct ofono_error {
 };
 
 #define OFONO_MAX_PHONE_NUMBER_LENGTH 20
+#define OFONO_MAX_CALLER_NAME_LENGTH 80
 
 struct ofono_phone_number {
 	char number[OFONO_MAX_PHONE_NUMBER_LENGTH + 1];
@@ -90,7 +91,9 @@ struct ofono_call {
 	int status;
 	ofono_bool_t mpty;
 	struct ofono_phone_number phone_number;
+	char name[OFONO_MAX_CALLER_NAME_LENGTH + 1];
 	int clip_validity;
+	int cnap_validity;
 };
 
 struct ofono_network_time {
diff --git a/src/common.h b/src/common.h
index 8b5798a..c8e7070 100644
--- a/src/common.h
+++ b/src/common.h
@@ -48,6 +48,13 @@ enum clip_validity {
 	CLIP_VALIDITY_NOT_AVAILABLE = 2
 };
 
+/* 27.007 Section 7.30 */
+enum cnap_validity {
+	CNAP_VALIDITY_VALID = 0,
+	CNAP_VALIDITY_WITHHELD = 1,
+	CNAP_VALIDITY_NOT_AVAILABLE = 2
+};
+
 /* 27.007 Section 7.18 */
 enum call_status {
 	CALL_STATUS_ACTIVE = 0,
-- 
1.7.3.2

[PATCH 06/14] voicecall: add support for CNAP

[Gustavo F. Padovan]

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

Enable oFono to get a info about the Calling Name.
---
 src/voicecall.c |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 53 insertions(+), 0 deletions(-)

diff --git a/src/voicecall.c b/src/voicecall.c
index dbf3e9a..84d45f9 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -178,6 +178,17 @@ static const char *phone_and_clip_to_string(const struct ofono_phone_number *n,
 	return phone_number_to_string(n);
 }
 
+static const char *cnap_to_string(const char *name, int cnap_validity)
+{
+	if (cnap_validity == CNAP_VALIDITY_WITHHELD && !strlen(name))
+		return "withheld";
+
+	if (cnap_validity == CNAP_VALIDITY_NOT_AVAILABLE)
+		return "";
+
+	return name;
+}
+
 static const char *time_to_str(const time_t *t)
 {
 	static char buf[128];
@@ -323,16 +334,24 @@ static void append_voicecall_properties(struct voicecall *v,
 	const char *status;
 	const char *callerid;
 	const char *timestr;
+	char buf[OFONO_MAX_CALLER_NAME_LENGTH + 1];
+	char *name;
 	ofono_bool_t mpty;
 
 	status = call_status_to_string(call->status);
 	callerid = phone_number_to_string(&call->phone_number);
 
+	strncpy(buf, call->name, OFONO_MAX_CALLER_NAME_LENGTH);
+	buf[OFONO_MAX_CALLER_NAME_LENGTH] = '\0';
+	name = buf;
+
 	ofono_dbus_dict_append(dict, "State", DBUS_TYPE_STRING, &status);
 
 	ofono_dbus_dict_append(dict, "LineIdentification",
 				DBUS_TYPE_STRING, &callerid);
 
+	ofono_dbus_dict_append(dict, "Name", DBUS_TYPE_STRING, &name);
+
 	if (call->status == CALL_STATUS_ACTIVE ||
 			call->status == CALL_STATUS_HELD ||
 			(call->status == CALL_STATUS_DISCONNECTED &&
@@ -723,6 +742,38 @@ static void voicecall_set_call_lineid(struct voicecall *v,
 						DBUS_TYPE_STRING, &lineid_str);
 }
 
+static void voicecall_set_call_name(struct voicecall *v,
+					const char *name,
+					int cnap_validity)
+{
+	struct ofono_call *call = v->call;
+	DBusConnection *conn = ofono_dbus_get_connection();
+	const char *path;
+	const char *name_str;
+
+	if (!strcmp(call->name, name) &&
+		call->cnap_validity == cnap_validity)
+		return;
+
+	/* For plugins that don't keep state, ignore */
+	if (call->cnap_validity == CNAP_VALIDITY_VALID &&
+		cnap_validity == CNAP_VALIDITY_NOT_AVAILABLE)
+		return;
+
+	strncpy(call->name, name, OFONO_MAX_CALLER_NAME_LENGTH);
+	call->name[OFONO_MAX_CALLER_NAME_LENGTH] = '\0';
+	call->cnap_validity = cnap_validity;
+
+	path = voicecall_build_path(v->vc, call);
+
+	name_str = cnap_to_string(name, cnap_validity);
+
+	ofono_dbus_signal_property_changed(conn, path,
+						OFONO_VOICECALL_INTERFACE,
+						"Name",
+						DBUS_TYPE_STRING, &name_str);
+}
+
 static gboolean voicecall_dbus_register(struct voicecall *v)
 {
 	DBusConnection *conn = ofono_dbus_get_connection();
@@ -1838,6 +1889,8 @@ void ofono_voicecall_notify(struct ofono_voicecall *vc,
 		voicecall_set_call_status(l->data, call->status);
 		voicecall_set_call_lineid(l->data, &call->phone_number,
 						call->clip_validity);
+		voicecall_set_call_name(l->data, call->name,
+						call->cnap_validity);
 
 		return;
 	}
-- 
1.7.3.2

[PATCH 07/14] doc: add Name property

[Gustavo F. Padovan]

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

---
 doc/voicecall-api.txt |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/doc/voicecall-api.txt b/doc/voicecall-api.txt
index f0ba316..a0242ab 100644
--- a/doc/voicecall-api.txt
+++ b/doc/voicecall-api.txt
@@ -87,6 +87,11 @@ Properties	string LineIdentification [readonly]
 			"override category" option was not provisioned for
 			the current subscriber.
 
+		string Name [readonly]
+
+			Contains the Name Identification information returned
+			by the network, if present.
+
 		boolean Multiparty [readonly]
 
 			Contains the indication if the voice call is part
-- 
1.7.3.2

[PATCH 08/14] atmodem: Add CNAP parsing to voicecall

[Gustavo F. Padovan]

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

---
 drivers/atmodem/voicecall.c |   47 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 47 insertions(+), 0 deletions(-)

diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c
index a2ee49d..41fd901 100644
--- a/drivers/atmodem/voicecall.c
+++ b/drivers/atmodem/voicecall.c
@@ -746,6 +746,51 @@ static void clip_notify(GAtResult *result, gpointer user_data)
 	}
 }
 
+static void cnap_notify(GAtResult *result, gpointer user_data)
+{
+	struct ofono_voicecall *vc = user_data;
+	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+	GAtResultIter iter;
+	const char *name;
+	int validity;
+	GSList *l;
+	struct ofono_call *call;
+
+	l = g_slist_find_custom(vd->calls, GINT_TO_POINTER(4),
+				at_util_call_compare_by_status);
+	if (l == NULL) {
+		ofono_error("CNAP for unknown call");
+		return;
+	}
+
+	g_at_result_iter_init(&iter, result);
+
+	if (!g_at_result_iter_next(&iter, "+CNAP:"))
+		return;
+
+	if (!g_at_result_iter_next_string(&iter, &name))
+		return;
+
+	if (strlen(name) > 0)
+		validity = CNAP_VALIDITY_VALID;
+	else
+		validity = CNAP_VALIDITY_NOT_AVAILABLE;
+
+	/* If we have CNI validity field, override our guessed value */
+	g_at_result_iter_next_number(&iter, &validity);
+
+	DBG("%s %d", name, validity);
+
+	call = l->data;
+
+	strncpy(call->name, name,
+		OFONO_MAX_CALLER_NAME_LENGTH);
+	call->name[OFONO_MAX_CALLER_NAME_LENGTH] = '\0';
+	call->cnap_validity = validity;
+
+	ofono_voicecall_notify(vc, call);
+}
+
 static void ccwa_notify(GAtResult *result, gpointer user_data)
 {
 	struct ofono_voicecall *vc = user_data;
@@ -864,6 +909,7 @@ static void at_voicecall_initialized(gboolean ok, GAtResult *result,
 	g_at_chat_register(vd->chat, "RING", ring_notify, FALSE, vc, NULL);
 	g_at_chat_register(vd->chat, "+CRING:", cring_notify, FALSE, vc, NULL);
 	g_at_chat_register(vd->chat, "+CLIP:", clip_notify, FALSE, vc, NULL);
+	g_at_chat_register(vd->chat, "+CNAP:", cnap_notify, FALSE, vc, NULL);
 	g_at_chat_register(vd->chat, "+CCWA:", ccwa_notify, FALSE, vc, NULL);
 
 	/* Modems with 'better' call progress indicators should
@@ -899,6 +945,7 @@ static int at_voicecall_probe(struct ofono_voicecall *vc, unsigned int vendor,
 
 	g_at_chat_send(vd->chat, "AT+CRC=1", NULL, NULL, NULL, NULL);
 	g_at_chat_send(vd->chat, "AT+CLIP=1", NULL, NULL, NULL, NULL);
+	g_at_chat_send(vd->chat, "AT+CNAP=1", NULL, NULL, NULL, NULL);
 	g_at_chat_send(vd->chat, "AT+COLP=1", NULL, NULL, NULL, NULL);
 	g_at_chat_send(vd->chat, "AT+VTD?", NULL,
 				vtd_query_cb, vc, NULL);
-- 
1.7.3.2

[PATCH 09/14] call-settings: fix coding style

[Gustavo F. Padovan]

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

---
 src/call-settings.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/call-settings.c b/src/call-settings.c
index 49a7fb0..2bf54d3 100644
--- a/src/call-settings.c
+++ b/src/call-settings.c
@@ -103,9 +103,9 @@ static const char *clip_status_to_string(int status)
 		return "disabled";
 	case CLIP_STATUS_PROVISIONED:
 		return "enabled";
-	default:
-		return "unknown";
 	}
+
+	return "unknown";
 }
 
 static const char *colp_status_to_string(int status)
@@ -115,9 +115,9 @@ static const char *colp_status_to_string(int status)
 		return "disabled";
 	case COLP_STATUS_PROVISIONED:
 		return "enabled";
-	default:
-		return "unknown";
 	}
+
+	return "unknown";
 }
 
 static const char *colr_status_to_string(int status)
@@ -127,9 +127,9 @@ static const char *colr_status_to_string(int status)
 		return "disabled";
 	case COLR_STATUS_PROVISIONED:
 		return "enabled";
-	default:
-		return "unknown";
 	}
+
+	return "unknown";
 }
 
 static const char *hide_callerid_to_string(int status)
@@ -141,9 +141,9 @@ static const char *hide_callerid_to_string(int status)
 		return "enabled";
 	case OFONO_CLIR_OPTION_SUPPRESSION:
 		return "disabled";
-	default:
-		return "default";
 	}
+
+	return "default";
 }
 
 static const char *clir_status_to_string(int status)
@@ -157,9 +157,9 @@ static const char *clir_status_to_string(int status)
 		return "on";
 	case CLIR_STATUS_TEMPORARY_ALLOWED:
 		return "off";
-	default:
-		return "unknown";
 	}
+
+	return "unknown";
 }
 
 static void set_clir_network(struct ofono_call_settings *cs, int clir)
-- 
1.7.3.2

[PATCH 10/14] include: add cnap_query callback

[Gustavo F. Padovan]

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

---
 include/call-settings.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/call-settings.h b/include/call-settings.h
index 77e0440..c1ff668 100644
--- a/include/call-settings.h
+++ b/include/call-settings.h
@@ -46,6 +46,8 @@ struct ofono_call_settings_driver {
 	void (*remove)(struct ofono_call_settings *cs);
 	void (*clip_query)(struct ofono_call_settings *cs,
 				ofono_call_settings_status_cb_t cb, void *data);
+	void (*cnap_query)(struct ofono_call_settings *cs,
+				ofono_call_settings_status_cb_t cb, void *data);
 	void (*colp_query)(struct ofono_call_settings *cs,
 				ofono_call_settings_status_cb_t cb, void *data);
 	void (*clir_query)(struct ofono_call_settings *cs,
-- 
1.7.3.2

[PATCH 11/14] call-settings: add CNAP support

[Gustavo F. Padovan]

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

---
 src/call-settings.c |  102 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 93 insertions(+), 9 deletions(-)

diff --git a/src/call-settings.c b/src/call-settings.c
index 2bf54d3..b6c3924 100644
--- a/src/call-settings.c
+++ b/src/call-settings.c
@@ -55,6 +55,13 @@ enum clip_status {
 	CLIP_STATUS_UNKNOWN
 };
 
+/* 27.007 Section 7.30 */
+enum cnap_status {
+	CNAP_STATUS_NOT_PROVISIONED = 0,
+	CNAP_STATUS_PROVISIONED,
+	CNAP_STATUS_UNKNOWN
+};
+
 /* 27.007 Section 7.8 */
 enum colp_status {
 	COLP_STATUS_NOT_PROVISIONED = 0,
@@ -71,6 +78,7 @@ enum colr_status {
 
 enum call_setting_type {
 	CALL_SETTING_TYPE_CLIP = 0,
+	CALL_SETTING_TYPE_CNAP,
 	CALL_SETTING_TYPE_COLP,
 	CALL_SETTING_TYPE_COLR,
 	CALL_SETTING_TYPE_CLIR,
@@ -81,6 +89,7 @@ struct ofono_call_settings {
 	int clir;
 	int colr;
 	int clip;
+	int cnap;
 	int colp;
 	int clir_setting;
 	int cw;
@@ -108,6 +117,18 @@ static const char *clip_status_to_string(int status)
 	return "unknown";
 }
 
+static const char *cnap_status_to_string(int status)
+{
+	switch (status) {
+	case CNAP_STATUS_NOT_PROVISIONED:
+		return "disabled";
+	case CNAP_STATUS_PROVISIONED:
+		return "enabled";
+	}
+
+	return "unknown";
+}
+
 static const char *colp_status_to_string(int status)
 {
 	switch (status) {
@@ -228,6 +249,28 @@ static void set_clip(struct ofono_call_settings *cs, int clip)
 						DBUS_TYPE_STRING, &str);
 }
 
+static void set_cnap(struct ofono_call_settings *cs, int cnap)
+{
+	DBusConnection *conn;
+	const char *path;
+	const char *str;
+
+	if (cs->cnap == cnap)
+		return;
+
+	cs->cnap = cnap;
+
+	conn = ofono_dbus_get_connection();
+	path = __ofono_atom_get_path(cs->atom);
+
+	str = cnap_status_to_string(cnap);
+
+	ofono_dbus_signal_property_changed(conn, path,
+						OFONO_CALL_SETTINGS_INTERFACE,
+						"CallingNamePresentation",
+						DBUS_TYPE_STRING, &str);
+}
+
 static void set_colp(struct ofono_call_settings *cs, int colp)
 {
 	DBusConnection *conn;
@@ -520,7 +563,7 @@ static void generate_ss_query_reply(struct ofono_call_settings *cs,
 	__ofono_dbus_pending_reply(&cs->pending, reply);
 }
 
-static void clip_colp_colr_ss_query_cb(const struct ofono_error *error,
+static void clip_cnap_colp_colr_ss_query_cb(const struct ofono_error *error,
 					int status, void *data)
 {
 	struct ofono_call_settings *cs = data;
@@ -542,6 +585,13 @@ static void clip_colp_colr_ss_query_cb(const struct ofono_error *error,
 		context = "CallingLinePresentation";
 		break;
 
+	case CALL_SETTING_TYPE_CNAP:
+		set_cnap(cs, status);
+		value = cnap_status_to_string(status);
+		context = "CallingNamePresentation";
+		break;
+
+
 	case CALL_SETTING_TYPE_COLP:
 		set_colp(cs, status);
 		value = colp_status_to_string(status);
@@ -557,14 +607,14 @@ static void clip_colp_colr_ss_query_cb(const struct ofono_error *error,
 	default:
 		__ofono_dbus_pending_reply(&cs->pending,
 				__ofono_error_failed(cs->pending));
-		ofono_error("Unknown type during COLR/COLP/CLIP ss");
+		ofono_error("Unknown type during COLR/COLP/CLIP/CNAP ss");
 		return;
 	};
 
 	generate_ss_query_reply(cs, context, value);
 }
 
-static gboolean clip_colp_colr_ss(int type,
+static gboolean clip_cnap_colp_colr_ss(int type,
 				const char *sc, const char *sia,
 				const char *sib, const char *sic,
 				const char *dn, DBusMessage *msg, void *data)
@@ -587,6 +637,9 @@ static gboolean clip_colp_colr_ss(int type,
 	if (!strcmp(sc, "30")) {
 		cs->ss_setting = CALL_SETTING_TYPE_CLIP;
 		query_op = cs->driver->clip_query;
+	} else if (!strcmp(sc, "300")) {
+		cs->ss_setting = CALL_SETTING_TYPE_CNAP;
+		query_op = cs->driver->cnap_query;
 	} else if (!strcmp(sc, "76")) {
 		cs->ss_setting = CALL_SETTING_TYPE_COLP;
 		query_op = cs->driver->colp_query;
@@ -612,11 +665,11 @@ static gboolean clip_colp_colr_ss(int type,
 		return TRUE;
 	}
 
-	DBG("Received CLIP/COLR/COLP query ss control");
+	DBG("Received CLIP/CNAP/COLR/COLP query ss control");
 
 	cs->pending = dbus_message_ref(msg);
 
-	query_op(cs, clip_colp_colr_ss_query_cb, cs);
+	query_op(cs, clip_cnap_colp_colr_ss_query_cb, cs);
 
 	return TRUE;
 }
@@ -762,15 +815,19 @@ static gboolean clir_ss_control(int type,
 
 static void cs_register_ss_controls(struct ofono_call_settings *cs)
 {
-	__ofono_ussd_ssc_register(cs->ussd, "30", clip_colp_colr_ss, cs, NULL);
+	__ofono_ussd_ssc_register(cs->ussd, "30", clip_cnap_colp_colr_ss,
+								cs, NULL);
 	__ofono_ussd_ssc_register(cs->ussd, "31", clir_ss_control, cs, NULL);
-	__ofono_ussd_ssc_register(cs->ussd, "76", clip_colp_colr_ss, cs, NULL);
+	__ofono_ussd_ssc_register(cs->ussd, "76", clip_cnap_colp_colr_ss,
+								cs, NULL);
+	__ofono_ussd_ssc_register(cs->ussd, "300", clip_cnap_colp_colr_ss,
+								cs, NULL);
 
 	__ofono_ussd_ssc_register(cs->ussd, "43", cw_ss_control, cs, NULL);
 
 	if (cs->driver->colr_query)
 		__ofono_ussd_ssc_register(cs->ussd, "77",
-						clip_colp_colr_ss, cs, NULL);
+					clip_cnap_colp_colr_ss, cs, NULL);
 }
 
 static void cs_unregister_ss_controls(struct ofono_call_settings *cs)
@@ -778,6 +835,7 @@ static void cs_unregister_ss_controls(struct ofono_call_settings *cs)
 	__ofono_ussd_ssc_unregister(cs->ussd, "30");
 	__ofono_ussd_ssc_unregister(cs->ussd, "31");
 	__ofono_ussd_ssc_unregister(cs->ussd, "76");
+	__ofono_ussd_ssc_unregister(cs->ussd, "300");
 
 	__ofono_ussd_ssc_unregister(cs->ussd, "43");
 
@@ -812,6 +870,10 @@ static DBusMessage *generate_get_properties_reply(struct ofono_call_settings *cs
 	ofono_dbus_dict_append(&dict, "CallingLinePresentation",
 				DBUS_TYPE_STRING, &str);
 
+	str = cnap_status_to_string(cs->clip);
+	ofono_dbus_dict_append(&dict, "CallingNamePresentation",
+				DBUS_TYPE_STRING, &str);
+
 	str = colp_status_to_string(cs->colp);
 	ofono_dbus_dict_append(&dict, "CalledLinePresentation",
 				DBUS_TYPE_STRING, &str);
@@ -872,6 +934,27 @@ static void query_clir(struct ofono_call_settings *cs)
 	cs->driver->clir_query(cs, cs_clir_callback, cs);
 }
 
+static void cs_cnap_callback(const struct ofono_error *error,
+				int state, void *data)
+{
+	struct ofono_call_settings *cs = data;
+
+	if (error->type == OFONO_ERROR_TYPE_NO_ERROR)
+		set_cnap(cs, state);
+
+	query_clir(cs);
+}
+
+static void query_cnap(struct ofono_call_settings *cs)
+{
+	if (cs->driver->cnap_query == NULL) {
+		query_clir(cs);
+		return;
+	}
+
+	cs->driver->cnap_query(cs, cs_cnap_callback, cs);
+}
+
 static void cs_clip_callback(const struct ofono_error *error,
 				int state, void *data)
 {
@@ -880,7 +963,7 @@ static void cs_clip_callback(const struct ofono_error *error,
 	if (error->type == OFONO_ERROR_TYPE_NO_ERROR)
 		set_clip(cs, state);
 
-	query_clir(cs);
+	query_cnap(cs);
 }
 
 static void query_clip(struct ofono_call_settings *cs)
@@ -1260,6 +1343,7 @@ struct ofono_call_settings *ofono_call_settings_create(struct ofono_modem *modem
 
 	/* Set all the settings to unknown state */
 	cs->clip = 2;
+	cs->cnap = 2;
 	cs->clir = 2;
 	cs->colp = 2;
 	cs->colr = 2;
-- 
1.7.3.2

[PATCH 12/14] doc: add CallingNamePresentation property to CallSettings

[Gustavo F. Padovan]

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

---
 doc/call-settings-api.txt |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/doc/call-settings-api.txt b/doc/call-settings-api.txt
index e98ce0c..a454621 100644
--- a/doc/call-settings-api.txt
+++ b/doc/call-settings-api.txt
@@ -30,6 +30,18 @@ Properties	string CallingLinePresentation [readonly]
 				"enabled",
 				"unknown"
 
+		string CallingNamePresentation [readonly]
+
+			Contains the value of the calling name identification
+			presentation property.  The value indicates
+			the state of the CNAP supplementary service in the
+			network.  If enabled, the network will provide
+			the name of the calling party for incoming calls.
+			Possible values are:
+				"disabled",
+				"enabled",
+				"unknown"
+
 		string CalledLinePresentation [readonly]
 
 			Contains the value of the connected line identification
-- 
1.7.3.2

[PATCH 13/14] atmodem: add CNAP to call-settings

[Gustavo F. Padovan]

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

---
 drivers/atmodem/call-settings.c |   53 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 53 insertions(+), 0 deletions(-)

diff --git a/drivers/atmodem/call-settings.c b/drivers/atmodem/call-settings.c
index 7e1b422..b3e8ea6 100644
--- a/drivers/atmodem/call-settings.c
+++ b/drivers/atmodem/call-settings.c
@@ -45,6 +45,7 @@ static const char *colp_prefix[] = { "+COLP:", NULL };
 static const char *clip_prefix[] = { "+CLIP:", NULL };
 static const char *ccwa_prefix[] = { "+CCWA:", NULL };
 static const char *colr_prefix[] = { "+COLR:", NULL };
+static const char *cnap_prefix[] = { "+CNAP:", NULL };
 
 static void ccwa_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
@@ -188,6 +189,57 @@ error:
 	CALLBACK_WITH_FAILURE(cb, -1, data);
 }
 
+static void cnap_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_call_settings_status_cb_t cb = cbd->cb;
+	struct ofono_error error;
+	GAtResultIter iter;
+	int status;
+
+	decode_at_error(&error, g_at_result_final_response(result));
+
+	if (!ok) {
+		cb(&error, -1, cbd->data);
+		return;
+	}
+
+	g_at_result_iter_init(&iter, result);
+
+	if (g_at_result_iter_next(&iter, "+CNAP:") == FALSE)
+		goto error;
+
+	if (g_at_result_iter_next_number(&iter, &status) == FALSE)
+		goto error;
+
+	DBG("network: %d", status);
+
+	cb(&error, status, cbd->data);
+	return;
+
+error:
+	CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
+}
+
+static void at_cnap_query(struct ofono_call_settings *cs,
+				ofono_call_settings_status_cb_t cb, void *data)
+{
+	GAtChat *chat = ofono_call_settings_get_data(cs);
+	struct cb_data *cbd = cb_data_new(cb, data);
+
+	if (cbd == NULL)
+		goto error;
+
+	if (g_at_chat_send(chat, "AT+CNAP?", cnap_prefix,
+				cnap_query_cb, cbd, g_free) > 0)
+		return;
+
+error:
+	g_free(cbd);
+
+	CALLBACK_WITH_FAILURE(cb, -1, data);
+}
+
 static void colp_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
@@ -404,6 +456,7 @@ static struct ofono_call_settings_driver driver = {
 	.probe = at_call_settings_probe,
 	.remove = at_call_settings_remove,
 	.clip_query = at_clip_query,
+	.cnap_query = at_cnap_query,
 	.colp_query = at_colp_query,
 	.clir_query = at_clir_query,
 	.clir_set = at_clir_set,
-- 
1.7.3.2

[PATCH 14/14] test: add CNAP to test-ss-control-cs

[Gustavo F. Padovan]

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

---
 test/test-ss-control-cs |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/test/test-ss-control-cs b/test/test-ss-control-cs
index e04a4a0..35db591 100755
--- a/test/test-ss-control-cs
+++ b/test/test-ss-control-cs
@@ -55,6 +55,9 @@ if __name__ == "__main__":
 	print "Query CLIP"
 	print ss.Initiate("*#30#")
 
+	print "Query CNAP"
+	print ss.Initiate("*#300#")
+
 	print "Query COLP"
 	print ss.Initiate("*#76#")
 
-- 
1.7.3.2

Re: [PATCH 01/14] test: fix bug in test-ss-control-cs

[Denis Kenzior]

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

Hi Gustavo,

On 12/06/2010 02:12 PM, Gustavo F. Padovan wrote:
> ---
>  test/test-ss-control-cs |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis

Re: [PATCH 03/14] atmodem: cleanup DBG messages

[Denis Kenzior]

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

Hi Gustavo,

On 12/06/2010 02:12 PM, Gustavo F. Padovan wrote:
> ---
>  drivers/atmodem/call-settings.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis

Re: [PATCH 02/14] atmodem: use macros for CLIP validity

[Denis Kenzior]

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

Hi Gustavo,

On 12/06/2010 02:12 PM, Gustavo F. Padovan wrote:
> ---
>  drivers/atmodem/voicecall.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis

Re: [PATCH 04/14] TODO: Add onwer to CNAP task

[Denis Kenzior]

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

Hi Gustavo,

On 12/06/2010 02:12 PM, Gustavo F. Padovan wrote:
> ---
>  TODO |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 

Patch seems to be no longer necessary.

Regards,
-Denis

Re: [PATCH 05/14] include: add CNAP fields and defines

[Denis Kenzior]

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

Hi Gustavo,

On 12/06/2010 02:12 PM, Gustavo F. Padovan wrote:
> ---
>  include/types.h |    3 +++
>  src/common.h    |    7 +++++++
>  2 files changed, 10 insertions(+), 0 deletions(-)
> 

Patch has been applied, but I broke this up into two patches.

Regards,
-Denis

Re: [PATCH 06/14] voicecall: add support for CNAP

[Denis Kenzior]

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

Hi Gustavo,

On 12/06/2010 02:12 PM, Gustavo F. Padovan wrote:
> Enable oFono to get a info about the Calling Name.
> ---
>  src/voicecall.c |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 files changed, 53 insertions(+), 0 deletions(-)
> 

Patch has been applied thanks.  I added a few minor style fixes afterwards.

Regards,
-Denis

Re: [PATCH 07/14] doc: add Name property

[Denis Kenzior]

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

Hi Gustavo,

On 12/06/2010 02:12 PM, Gustavo F. Padovan wrote:
> ---
>  doc/voicecall-api.txt |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis

Re: [PATCH 08/14] atmodem: Add CNAP parsing to voicecall

[Denis Kenzior]

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

Hi Gustavo,

On 12/06/2010 02:12 PM, Gustavo F. Padovan wrote:
> ---
>  drivers/atmodem/voicecall.c |   47 +++++++++++++++++++++++++++++++++++++++++++
>  1 files changed, 47 insertions(+), 0 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis

Re: [PATCH 09/14] call-settings: fix coding style

[Denis Kenzior]

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

Hi Gustavo,

On 12/06/2010 02:12 PM, Gustavo F. Padovan wrote:
> ---
>  src/call-settings.c |   20 ++++++++++----------
>  1 files changed, 10 insertions(+), 10 deletions(-)

Patch has been applied, thanks.

Regards,
-Denis

Re: [PATCH 10/14] include: add cnap_query callback

[Denis Kenzior]

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

Hi Gustavo,

On 12/06/2010 02:12 PM, Gustavo F. Padovan wrote:
> ---
>  include/call-settings.h |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis

Re: [PATCH 11/14] call-settings: add CNAP support

[Denis Kenzior]

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

Hi Gustavo,

On 12/06/2010 02:12 PM, Gustavo F. Padovan wrote:
> ---
>  src/call-settings.c |  102 ++++++++++++++++++++++++++++++++++++++++++++++----
>  1 files changed, 93 insertions(+), 9 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis

Re: [PATCH 12/14] doc: add CallingNamePresentation property to CallSettings

[Denis Kenzior]

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

Hi Gustavo,

On 12/06/2010 02:12 PM, Gustavo F. Padovan wrote:
> ---
>  doc/call-settings-api.txt |   12 ++++++++++++
>  1 files changed, 12 insertions(+), 0 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis

Re: [PATCH 13/14] atmodem: add CNAP to call-settings

[Denis Kenzior]

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

Hi Gustavo,

On 12/06/2010 02:12 PM, Gustavo F. Padovan wrote:
> ---
>  drivers/atmodem/call-settings.c |   53 +++++++++++++++++++++++++++++++++++++++
>  1 files changed, 53 insertions(+), 0 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis

Re: [PATCH 14/14] test: add CNAP to test-ss-control-cs

[Denis Kenzior]

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

Hi Gustavo,

On 12/06/2010 02:12 PM, Gustavo F. Padovan wrote:
> ---
>  test/test-ss-control-cs |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis