[PATCH] Add CNAP support (callerid name presentation) to isimodem

[PATCH] Add CNAP support (callerid name presentation) to isimodem

[Antoine Reversat]

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

---
 drivers/isimodem/voicecall.c |   39 ++++++++++++++++++++++++++++++++++++++-
 src/voicecall.c              |    4 ++--
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c
index 0a32f27..e778f23 100644
--- a/drivers/isimodem/voicecall.c
+++ b/drivers/isimodem/voicecall.c
@@ -56,8 +56,10 @@ struct isi_call {
 	uint8_t cause;
 	uint8_t addr_type;
 	uint8_t presentation;
+	uint8_t name_presentation;
 	uint8_t reason;
 	char address[20];
+	char name[20];
 	char addr_pad[4];
 };
 
@@ -231,6 +233,7 @@ static void isi_call_origin_address_sb_proc(struct isi_voicecall *ivc,
 		isi_call_any_address_sb_proc(ivc, call, sb);
 }
 
+
 static void isi_call_destination_address_sb_proc(struct isi_voicecall *ivc,
 							struct isi_call *call,
 							GIsiSubBlockIter *sb)
@@ -239,6 +242,29 @@ static void isi_call_destination_address_sb_proc(struct isi_voicecall *ivc,
 		isi_call_any_address_sb_proc(ivc, call, sb);
 }
 
+static void isi_call_origin_info_sb_proc(struct isi_voicecall *ivc,
+						struct isi_call *call,
+						GIsiSubBlockIter *sb)
+{
+	uint8_t pres;
+	uint8_t id;
+	uint8_t len;
+	char *name;
+    
+	if (!g_isi_sb_iter_get_byte(sb, &pres, 2) ||
+			!g_isi_sb_iter_get_byte(sb, &id, 6) ||
+			!g_isi_sb_iter_get_byte(sb, &len, 7) ||
+			!g_isi_sb_iter_get_alpha_tag(sb, &name, 2 * len, 8))
+		return;
+    
+
+    DBG("Got name %s", name);
+	call->name_presentation = pres;
+	strncpy(call->name, name, sizeof(call->name));
+
+	g_free(name);
+}
+
 static void isi_call_mode_sb_proc(struct isi_voicecall *ivc,
 					struct isi_call *call,
 					GIsiSubBlockIter *sb)
@@ -396,13 +422,19 @@ static struct ofono_call isi_call_as_ofono_call(const struct isi_call *call)
 	ocall.status = isi_call_status_to_clcc(call);
 
 	memcpy(number->number, call->address, sizeof(number->number));
+	memcpy(ocall.name, call->name, sizeof(ocall.name));
+
 
 	number->type = 0x80 | call->addr_type;
 	ocall.clip_validity = call->presentation & 3;
+    ocall.cnap_validity = call->name_presentation & 3;
 
 	if (ocall.clip_validity == 0 && strlen(number->number) == 0)
 		ocall.clip_validity = 2;
 
+	if (ocall.cnap_validity == 0 && strlen(call->name) == 0)
+		ocall.cnap_validity = 2;
+
 	return ocall;
 }
 
@@ -513,11 +545,12 @@ static void isi_call_notify(struct ofono_voicecall *ovc, struct isi_call *call)
 
 	ocall = isi_call_as_ofono_call(call);
 
-	DBG("id=%u,%s,%u,\"%s\",%u,%u",
+	DBG("id=%u,%s,%u,\"%s\",\"%s\",%u,%u",
 		ocall.id,
 		ocall.direction ? "terminated" : "originated",
 		ocall.status,
 		ocall.phone_number.number,
+        ocall.name,
 		ocall.phone_number.type,
 		ocall.clip_validity);
 
@@ -622,6 +655,10 @@ static void isi_call_status_ind_cb(const GIsiMessage *msg, void *data)
 			isi_call_origin_address_sb_proc(ivc, call, &iter);
 			break;
 
+        case CALL_ORIGIN_INFO:
+			isi_call_origin_info_sb_proc(ivc, call, &iter);
+			break;
+
 		case CALL_GSM_DETAILED_CAUSE:
 		case CALL_DESTINATION_PRE_ADDRESS:
 		case CALL_DESTINATION_POST_ADDRESS:
diff --git a/src/voicecall.c b/src/voicecall.c
index 4606668..b608394 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -1951,8 +1951,8 @@ void ofono_voicecall_notify(struct ofono_voicecall *vc,
 	struct ofono_call *newcall;
 
 	DBG("Got a voicecall event, status: %d, id: %u, number: %s"
-			" called_number: %s", call->status, call->id,
-			call->phone_number.number, call->called_number.number);
+			" called_number: %s, name: %s", call->status, call->id,
+			call->phone_number.number, call->called_number.number, call->name);
 
 	l = g_slist_find_custom(vc->call_list, GUINT_TO_POINTER(call->id),
 				call_compare_by_id);
-- 
1.7.1

Re: [PATCH] Add CNAP support (callerid name presentation) to isimodem

[Gustavo F. Padovan]

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

Hi Antoine,

* Antoine Reversat <a.reversat@gmail.com> [2011-02-22 14:31:24 -0500]:

> ---
>  drivers/isimodem/voicecall.c |   39 ++++++++++++++++++++++++++++++++++++++-
>  src/voicecall.c              |    4 ++--
>  2 files changed, 40 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c
> index 0a32f27..e778f23 100644
> --- a/drivers/isimodem/voicecall.c
> +++ b/drivers/isimodem/voicecall.c
> @@ -56,8 +56,10 @@ struct isi_call {
>  	uint8_t cause;
>  	uint8_t addr_type;
>  	uint8_t presentation;
> +	uint8_t name_presentation;
>  	uint8_t reason;
>  	char address[20];
> +	char name[20];
>  	char addr_pad[4];
>  };
>  
> @@ -231,6 +233,7 @@ static void isi_call_origin_address_sb_proc(struct isi_voicecall *ivc,
>  		isi_call_any_address_sb_proc(ivc, call, sb);
>  }
>  
> +

Unrelated change here. Please remove.

>  static void isi_call_destination_address_sb_proc(struct isi_voicecall *ivc,
>  							struct isi_call *call,
>  							GIsiSubBlockIter *sb)
> @@ -239,6 +242,29 @@ static void isi_call_destination_address_sb_proc(struct isi_voicecall *ivc,
>  		isi_call_any_address_sb_proc(ivc, call, sb);
>  }
>  
> +static void isi_call_origin_info_sb_proc(struct isi_voicecall *ivc,
> +						struct isi_call *call,
> +						GIsiSubBlockIter *sb)
> +{
> +	uint8_t pres;
> +	uint8_t id;
> +	uint8_t len;
> +	char *name;
> +    

Spaces here.

> +	if (!g_isi_sb_iter_get_byte(sb, &pres, 2) ||
> +			!g_isi_sb_iter_get_byte(sb, &id, 6) ||
> +			!g_isi_sb_iter_get_byte(sb, &len, 7) ||
> +			!g_isi_sb_iter_get_alpha_tag(sb, &name, 2 * len, 8))
> +		return;


Isn't this better:

	if (!g_isi_sb_iter_get_byte())
		return;
	if (!g_isi_sb_iter_get_byte())
		return;
	if (!g_isi_sb_iter_get_byte())
		return;
	if (!g_isi_sb_iter_get_alpha_tag())
		return;

> +    

spaces here.

> +
> +    DBG("Got name %s", name);

and here.

> +	call->name_presentation = pres;
> +	strncpy(call->name, name, sizeof(call->name));
> +
> +	g_free(name);
> +}
> +
>  static void isi_call_mode_sb_proc(struct isi_voicecall *ivc,
>  					struct isi_call *call,
>  					GIsiSubBlockIter *sb)
> @@ -396,13 +422,19 @@ static struct ofono_call isi_call_as_ofono_call(const struct isi_call *call)
>  	ocall.status = isi_call_status_to_clcc(call);
>  
>  	memcpy(number->number, call->address, sizeof(number->number));
> +	memcpy(ocall.name, call->name, sizeof(ocall.name));
> +

Extra blank line here.

>  
>  	number->type = 0x80 | call->addr_type;
>  	ocall.clip_validity = call->presentation & 3;
> +    ocall.cnap_validity = call->name_presentation & 3;

spaces here.

>  
>  	if (ocall.clip_validity == 0 && strlen(number->number) == 0)
>  		ocall.clip_validity = 2;
>  
> +	if (ocall.cnap_validity == 0 && strlen(call->name) == 0)
> +		ocall.cnap_validity = 2;
> +
>  	return ocall;
>  }
>  
> @@ -513,11 +545,12 @@ static void isi_call_notify(struct ofono_voicecall *ovc, struct isi_call *call)
>  
>  	ocall = isi_call_as_ofono_call(call);
>  
> -	DBG("id=%u,%s,%u,\"%s\",%u,%u",
> +	DBG("id=%u,%s,%u,\"%s\",\"%s\",%u,%u",
>  		ocall.id,
>  		ocall.direction ? "terminated" : "originated",
>  		ocall.status,
>  		ocall.phone_number.number,
> +        ocall.name,

Spaces here.

>  		ocall.phone_number.type,
>  		ocall.clip_validity);
>  
> @@ -622,6 +655,10 @@ static void isi_call_status_ind_cb(const GIsiMessage *msg, void *data)
>  			isi_call_origin_address_sb_proc(ivc, call, &iter);
>  			break;
>  
> +        case CALL_ORIGIN_INFO:

Extra spaces here.

> +			isi_call_origin_info_sb_proc(ivc, call, &iter);
> +			break;
> +
>  		case CALL_GSM_DETAILED_CAUSE:
>  		case CALL_DESTINATION_PRE_ADDRESS:
>  		case CALL_DESTINATION_POST_ADDRESS:
> diff --git a/src/voicecall.c b/src/voicecall.c
> index 4606668..b608394 100644
> --- a/src/voicecall.c
> +++ b/src/voicecall.c
> @@ -1951,8 +1951,8 @@ void ofono_voicecall_notify(struct ofono_voicecall *vc,
>  	struct ofono_call *newcall;
>  
>  	DBG("Got a voicecall event, status: %d, id: %u, number: %s"
> -			" called_number: %s", call->status, call->id,
> -			call->phone_number.number, call->called_number.number);
> +			" called_number: %s, name: %s", call->status, call->id,
> +			call->phone_number.number, call->called_number.number, call->name);

Code over 80 characters.

-- 
Gustavo F. Padovan
http://profusion.mobi

Re: [PATCH] Add CNAP support (callerid name presentation) to isimodem

[Antoine Reversat]

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

On Tue, Feb 22, 2011 at 4:22 PM, Gustavo F. Padovan
<padovan@profusion.mobi> wrote:
> Hi Antoine,

Hi

>> +     if (!g_isi_sb_iter_get_byte(sb, &pres, 2) ||
>> +                     !g_isi_sb_iter_get_byte(sb, &id, 6) ||
>> +                     !g_isi_sb_iter_get_byte(sb, &len, 7) ||
>> +                     !g_isi_sb_iter_get_alpha_tag(sb, &name, 2 * len, 8))
>> +             return;
>
>
> Isn't this better:
>
>        if (!g_isi_sb_iter_get_byte())
>                return;
>        if (!g_isi_sb_iter_get_byte())
>                return;
>        if (!g_isi_sb_iter_get_byte())
>                return;
>        if (!g_isi_sb_iter_get_alpha_tag())
>                return;

It is better, my code is based on isi_call_any_address_sb_proc which
has the same construct. I guess I'll fix both then.

>

I'll fix the rest and resend the patch, thanks.

[PATCH] Add CNAP support for isimodem

[Antoine Reversat]

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

---
 drivers/isimodem/voicecall.c |   50 +++++++++++++++++++++++++++++++++++++----
 src/voicecall.c              |    5 ++-
 2 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c
index 0a32f27..37b0eb3 100644
--- a/drivers/isimodem/voicecall.c
+++ b/drivers/isimodem/voicecall.c
@@ -56,8 +56,10 @@ struct isi_call {
 	uint8_t cause;
 	uint8_t addr_type;
 	uint8_t presentation;
+	uint8_t name_presentation;
 	uint8_t reason;
 	char address[20];
+	char name[20];
 	char addr_pad[4];
 };
 
@@ -210,10 +212,13 @@ static void isi_call_any_address_sb_proc(struct isi_voicecall *ivc,
 	uint8_t len;
 	char *addr;
 
-	if (!g_isi_sb_iter_get_byte(sb, &type, 2) ||
-			!g_isi_sb_iter_get_byte(sb, &pres, 3) ||
-			!g_isi_sb_iter_get_byte(sb, &len, 5) ||
-			!g_isi_sb_iter_get_alpha_tag(sb, &addr, 2 * len, 6))
+	if (!g_isi_sb_iter_get_byte(sb, &type, 2))
+		return;
+	if (!g_isi_sb_iter_get_byte(sb, &pres, 3))
+		return;
+	if (!g_isi_sb_iter_get_byte(sb, &len, 5))
+		return;
+	if (!g_isi_sb_iter_get_alpha_tag(sb, &addr, 2 * len, 6))
 		return;
 
 	call->addr_type = type | 0x80;
@@ -239,6 +244,31 @@ static void isi_call_destination_address_sb_proc(struct isi_voicecall *ivc,
 		isi_call_any_address_sb_proc(ivc, call, sb);
 }
 
+static void isi_call_origin_info_sb_proc(struct isi_voicecall *ivc,
+						struct isi_call *call,
+						GIsiSubBlockIter *sb)
+{
+	uint8_t pres;
+	uint8_t id;
+	uint8_t len;
+	char *name;
+
+	if (!g_isi_sb_iter_get_byte(sb, &pres, 2))
+		return;
+	if (!g_isi_sb_iter_get_byte(sb, &id, 6))
+		return;
+	if (!g_isi_sb_iter_get_byte(sb, &len, 7))
+		return;
+	if (!g_isi_sb_iter_get_alpha_tag(sb, &name, 2 * len, 8))
+		return;
+
+	DBG("Got name %s", name);
+	call->name_presentation = pres;
+	strncpy(call->name, name, sizeof(call->name));
+
+	g_free(name);
+}
+
 static void isi_call_mode_sb_proc(struct isi_voicecall *ivc,
 					struct isi_call *call,
 					GIsiSubBlockIter *sb)
@@ -396,13 +426,18 @@ static struct ofono_call isi_call_as_ofono_call(const struct isi_call *call)
 	ocall.status = isi_call_status_to_clcc(call);
 
 	memcpy(number->number, call->address, sizeof(number->number));
+	memcpy(ocall.name, call->name, sizeof(ocall.name));
 
 	number->type = 0x80 | call->addr_type;
 	ocall.clip_validity = call->presentation & 3;
+    ocall.cnap_validity = call->name_presentation & 3;
 
 	if (ocall.clip_validity == 0 && strlen(number->number) == 0)
 		ocall.clip_validity = 2;
 
+	if (ocall.cnap_validity == 0 && strlen(call->name) == 0)
+		ocall.cnap_validity = 2;
+
 	return ocall;
 }
 
@@ -513,11 +548,12 @@ static void isi_call_notify(struct ofono_voicecall *ovc, struct isi_call *call)
 
 	ocall = isi_call_as_ofono_call(call);
 
-	DBG("id=%u,%s,%u,\"%s\",%u,%u",
+	DBG("id=%u,%s,%u,\"%s\",\"%s\",%u,%u",
 		ocall.id,
 		ocall.direction ? "terminated" : "originated",
 		ocall.status,
 		ocall.phone_number.number,
+		ocall.name,
 		ocall.phone_number.type,
 		ocall.clip_validity);
 
@@ -622,6 +658,10 @@ static void isi_call_status_ind_cb(const GIsiMessage *msg, void *data)
 			isi_call_origin_address_sb_proc(ivc, call, &iter);
 			break;
 
+		case CALL_ORIGIN_INFO:
+			isi_call_origin_info_sb_proc(ivc, call, &iter);
+			break;
+
 		case CALL_GSM_DETAILED_CAUSE:
 		case CALL_DESTINATION_PRE_ADDRESS:
 		case CALL_DESTINATION_POST_ADDRESS:
diff --git a/src/voicecall.c b/src/voicecall.c
index d6e8539..ec001c0 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -1951,8 +1951,9 @@ void ofono_voicecall_notify(struct ofono_voicecall *vc,
 	struct ofono_call *newcall;
 
 	DBG("Got a voicecall event, status: %d, id: %u, number: %s"
-			" called_number: %s", call->status, call->id,
-			call->phone_number.number, call->called_number.number);
+			" called_number: %s, called_name %s", call->status,
+			call->id, call->phone_number.number,
+			call->called_number.number, call->name);
 
 	l = g_slist_find_custom(vc->call_list, GUINT_TO_POINTER(call->id),
 				call_compare_by_id);
-- 
1.7.1

Re: [PATCH] Add CNAP support for isimodem

[Antoine Reversat]

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

This one should be clean. Sorry it created a new email. I specified a
message-id but it don't see it as a reply to my mail in gmail here.

On Fri, Feb 25, 2011 at 11:28 AM, Antoine Reversat <a.reversat@gmail.com> wrote:
> ---
>  drivers/isimodem/voicecall.c |   50 +++++++++++++++++++++++++++++++++++++----
>  src/voicecall.c              |    5 ++-
>  2 files changed, 48 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c
> index 0a32f27..37b0eb3 100644
> --- a/drivers/isimodem/voicecall.c
> +++ b/drivers/isimodem/voicecall.c
> @@ -56,8 +56,10 @@ struct isi_call {
>        uint8_t cause;
>        uint8_t addr_type;
>        uint8_t presentation;
> +       uint8_t name_presentation;
>        uint8_t reason;
>        char address[20];
> +       char name[20];
>        char addr_pad[4];
>  };
>
> @@ -210,10 +212,13 @@ static void isi_call_any_address_sb_proc(struct isi_voicecall *ivc,
>        uint8_t len;
>        char *addr;
>
> -       if (!g_isi_sb_iter_get_byte(sb, &type, 2) ||
> -                       !g_isi_sb_iter_get_byte(sb, &pres, 3) ||
> -                       !g_isi_sb_iter_get_byte(sb, &len, 5) ||
> -                       !g_isi_sb_iter_get_alpha_tag(sb, &addr, 2 * len, 6))
> +       if (!g_isi_sb_iter_get_byte(sb, &type, 2))
> +               return;
> +       if (!g_isi_sb_iter_get_byte(sb, &pres, 3))
> +               return;
> +       if (!g_isi_sb_iter_get_byte(sb, &len, 5))
> +               return;
> +       if (!g_isi_sb_iter_get_alpha_tag(sb, &addr, 2 * len, 6))
>                return;
>
>        call->addr_type = type | 0x80;
> @@ -239,6 +244,31 @@ static void isi_call_destination_address_sb_proc(struct isi_voicecall *ivc,
>                isi_call_any_address_sb_proc(ivc, call, sb);
>  }
>
> +static void isi_call_origin_info_sb_proc(struct isi_voicecall *ivc,
> +                                               struct isi_call *call,
> +                                               GIsiSubBlockIter *sb)
> +{
> +       uint8_t pres;
> +       uint8_t id;
> +       uint8_t len;
> +       char *name;
> +
> +       if (!g_isi_sb_iter_get_byte(sb, &pres, 2))
> +               return;
> +       if (!g_isi_sb_iter_get_byte(sb, &id, 6))
> +               return;
> +       if (!g_isi_sb_iter_get_byte(sb, &len, 7))
> +               return;
> +       if (!g_isi_sb_iter_get_alpha_tag(sb, &name, 2 * len, 8))
> +               return;
> +
> +       DBG("Got name %s", name);
> +       call->name_presentation = pres;
> +       strncpy(call->name, name, sizeof(call->name));
> +
> +       g_free(name);
> +}
> +
>  static void isi_call_mode_sb_proc(struct isi_voicecall *ivc,
>                                        struct isi_call *call,
>                                        GIsiSubBlockIter *sb)
> @@ -396,13 +426,18 @@ static struct ofono_call isi_call_as_ofono_call(const struct isi_call *call)
>        ocall.status = isi_call_status_to_clcc(call);
>
>        memcpy(number->number, call->address, sizeof(number->number));
> +       memcpy(ocall.name, call->name, sizeof(ocall.name));
>
>        number->type = 0x80 | call->addr_type;
>        ocall.clip_validity = call->presentation & 3;
> +    ocall.cnap_validity = call->name_presentation & 3;
>
>        if (ocall.clip_validity == 0 && strlen(number->number) == 0)
>                ocall.clip_validity = 2;
>
> +       if (ocall.cnap_validity == 0 && strlen(call->name) == 0)
> +               ocall.cnap_validity = 2;
> +
>        return ocall;
>  }
>
> @@ -513,11 +548,12 @@ static void isi_call_notify(struct ofono_voicecall *ovc, struct isi_call *call)
>
>        ocall = isi_call_as_ofono_call(call);
>
> -       DBG("id=%u,%s,%u,\"%s\",%u,%u",
> +       DBG("id=%u,%s,%u,\"%s\",\"%s\",%u,%u",
>                ocall.id,
>                ocall.direction ? "terminated" : "originated",
>                ocall.status,
>                ocall.phone_number.number,
> +               ocall.name,
>                ocall.phone_number.type,
>                ocall.clip_validity);
>
> @@ -622,6 +658,10 @@ static void isi_call_status_ind_cb(const GIsiMessage *msg, void *data)
>                        isi_call_origin_address_sb_proc(ivc, call, &iter);
>                        break;
>
> +               case CALL_ORIGIN_INFO:
> +                       isi_call_origin_info_sb_proc(ivc, call, &iter);
> +                       break;
> +
>                case CALL_GSM_DETAILED_CAUSE:
>                case CALL_DESTINATION_PRE_ADDRESS:
>                case CALL_DESTINATION_POST_ADDRESS:
> diff --git a/src/voicecall.c b/src/voicecall.c
> index d6e8539..ec001c0 100644
> --- a/src/voicecall.c
> +++ b/src/voicecall.c
> @@ -1951,8 +1951,9 @@ void ofono_voicecall_notify(struct ofono_voicecall *vc,
>        struct ofono_call *newcall;
>
>        DBG("Got a voicecall event, status: %d, id: %u, number: %s"
> -                       " called_number: %s", call->status, call->id,
> -                       call->phone_number.number, call->called_number.number);
> +                       " called_number: %s, called_name %s", call->status,
> +                       call->id, call->phone_number.number,
> +                       call->called_number.number, call->name);
>
>        l = g_slist_find_custom(vc->call_list, GUINT_TO_POINTER(call->id),
>                                call_compare_by_id);
> --
> 1.7.1
>
>

Re: [PATCH] Add CNAP support for isimodem

[Antoine Reversat]

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

Should I have made a second patch for the code cleanup to
isi_call_any_address_sb_proc ?

On Fri, Feb 25, 2011 at 11:33 AM, Antoine Reversat <a.reversat@gmail.com> wrote:
> This one should be clean. Sorry it created a new email. I specified a
> message-id but it don't see it as a reply to my mail in gmail here.
>
> On Fri, Feb 25, 2011 at 11:28 AM, Antoine Reversat <a.reversat@gmail.com> wrote:
>> ---
>>  drivers/isimodem/voicecall.c |   50 +++++++++++++++++++++++++++++++++++++----
>>  src/voicecall.c              |    5 ++-
>>  2 files changed, 48 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c
>> index 0a32f27..37b0eb3 100644
>> --- a/drivers/isimodem/voicecall.c
>> +++ b/drivers/isimodem/voicecall.c
>> @@ -56,8 +56,10 @@ struct isi_call {
>>        uint8_t cause;
>>        uint8_t addr_type;
>>        uint8_t presentation;
>> +       uint8_t name_presentation;
>>        uint8_t reason;
>>        char address[20];
>> +       char name[20];
>>        char addr_pad[4];
>>  };
>>
>> @@ -210,10 +212,13 @@ static void isi_call_any_address_sb_proc(struct isi_voicecall *ivc,
>>        uint8_t len;
>>        char *addr;
>>
>> -       if (!g_isi_sb_iter_get_byte(sb, &type, 2) ||
>> -                       !g_isi_sb_iter_get_byte(sb, &pres, 3) ||
>> -                       !g_isi_sb_iter_get_byte(sb, &len, 5) ||
>> -                       !g_isi_sb_iter_get_alpha_tag(sb, &addr, 2 * len, 6))
>> +       if (!g_isi_sb_iter_get_byte(sb, &type, 2))
>> +               return;
>> +       if (!g_isi_sb_iter_get_byte(sb, &pres, 3))
>> +               return;
>> +       if (!g_isi_sb_iter_get_byte(sb, &len, 5))
>> +               return;
>> +       if (!g_isi_sb_iter_get_alpha_tag(sb, &addr, 2 * len, 6))
>>                return;
>>
>>        call->addr_type = type | 0x80;
>> @@ -239,6 +244,31 @@ static void isi_call_destination_address_sb_proc(struct isi_voicecall *ivc,
>>                isi_call_any_address_sb_proc(ivc, call, sb);
>>  }
>>
>> +static void isi_call_origin_info_sb_proc(struct isi_voicecall *ivc,
>> +                                               struct isi_call *call,
>> +                                               GIsiSubBlockIter *sb)
>> +{
>> +       uint8_t pres;
>> +       uint8_t id;
>> +       uint8_t len;
>> +       char *name;
>> +
>> +       if (!g_isi_sb_iter_get_byte(sb, &pres, 2))
>> +               return;
>> +       if (!g_isi_sb_iter_get_byte(sb, &id, 6))
>> +               return;
>> +       if (!g_isi_sb_iter_get_byte(sb, &len, 7))
>> +               return;
>> +       if (!g_isi_sb_iter_get_alpha_tag(sb, &name, 2 * len, 8))
>> +               return;
>> +
>> +       DBG("Got name %s", name);
>> +       call->name_presentation = pres;
>> +       strncpy(call->name, name, sizeof(call->name));
>> +
>> +       g_free(name);
>> +}
>> +
>>  static void isi_call_mode_sb_proc(struct isi_voicecall *ivc,
>>                                        struct isi_call *call,
>>                                        GIsiSubBlockIter *sb)
>> @@ -396,13 +426,18 @@ static struct ofono_call isi_call_as_ofono_call(const struct isi_call *call)
>>        ocall.status = isi_call_status_to_clcc(call);
>>
>>        memcpy(number->number, call->address, sizeof(number->number));
>> +       memcpy(ocall.name, call->name, sizeof(ocall.name));
>>
>>        number->type = 0x80 | call->addr_type;
>>        ocall.clip_validity = call->presentation & 3;
>> +    ocall.cnap_validity = call->name_presentation & 3;
>>
>>        if (ocall.clip_validity == 0 && strlen(number->number) == 0)
>>                ocall.clip_validity = 2;
>>
>> +       if (ocall.cnap_validity == 0 && strlen(call->name) == 0)
>> +               ocall.cnap_validity = 2;
>> +
>>        return ocall;
>>  }
>>
>> @@ -513,11 +548,12 @@ static void isi_call_notify(struct ofono_voicecall *ovc, struct isi_call *call)
>>
>>        ocall = isi_call_as_ofono_call(call);
>>
>> -       DBG("id=%u,%s,%u,\"%s\",%u,%u",
>> +       DBG("id=%u,%s,%u,\"%s\",\"%s\",%u,%u",
>>                ocall.id,
>>                ocall.direction ? "terminated" : "originated",
>>                ocall.status,
>>                ocall.phone_number.number,
>> +               ocall.name,
>>                ocall.phone_number.type,
>>                ocall.clip_validity);
>>
>> @@ -622,6 +658,10 @@ static void isi_call_status_ind_cb(const GIsiMessage *msg, void *data)
>>                        isi_call_origin_address_sb_proc(ivc, call, &iter);
>>                        break;
>>
>> +               case CALL_ORIGIN_INFO:
>> +                       isi_call_origin_info_sb_proc(ivc, call, &iter);
>> +                       break;
>> +
>>                case CALL_GSM_DETAILED_CAUSE:
>>                case CALL_DESTINATION_PRE_ADDRESS:
>>                case CALL_DESTINATION_POST_ADDRESS:
>> diff --git a/src/voicecall.c b/src/voicecall.c
>> index d6e8539..ec001c0 100644
>> --- a/src/voicecall.c
>> +++ b/src/voicecall.c
>> @@ -1951,8 +1951,9 @@ void ofono_voicecall_notify(struct ofono_voicecall *vc,
>>        struct ofono_call *newcall;
>>
>>        DBG("Got a voicecall event, status: %d, id: %u, number: %s"
>> -                       " called_number: %s", call->status, call->id,
>> -                       call->phone_number.number, call->called_number.number);
>> +                       " called_number: %s, called_name %s", call->status,
>> +                       call->id, call->phone_number.number,
>> +                       call->called_number.number, call->name);
>>
>>        l = g_slist_find_custom(vc->call_list, GUINT_TO_POINTER(call->id),
>>                                call_compare_by_id);
>> --
>> 1.7.1
>>
>>
>

Re: [PATCH] Add CNAP support for isimodem

[Gustavo F. Padovan]

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

Hy Antoine,

Top posting is not allowed on this mailing list. Please stop using it.

* Antoine Reversat <a.reversat@gmail.com> [2011-02-25 11:33:49 -0500]:

> This one should be clean. Sorry it created a new email. I specified a
> message-id but it don't see it as a reply to my mail in gmail here.

Get yourself a proper mail client. Your message shows a reply of the previous
patch.

> 
> On Fri, Feb 25, 2011 at 11:28 AM, Antoine Reversat <a.reversat@gmail.com> wrote:
> > ---
> >  drivers/isimodem/voicecall.c |   50 +++++++++++++++++++++++++++++++++++++----
> >  src/voicecall.c              |    5 ++-
> >  2 files changed, 48 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c
> > index 0a32f27..37b0eb3 100644
> > --- a/drivers/isimodem/voicecall.c
> > +++ b/drivers/isimodem/voicecall.c
> > @@ -56,8 +56,10 @@ struct isi_call {
> >        uint8_t cause;
> >        uint8_t addr_type;
> >        uint8_t presentation;
> > +       uint8_t name_presentation;
> >        uint8_t reason;
> >        char address[20];
> > +       char name[20];
> >        char addr_pad[4];
> >  };
> >
> > @@ -210,10 +212,13 @@ static void isi_call_any_address_sb_proc(struct isi_voicecall *ivc,
> >        uint8_t len;
> >        char *addr;
> >
> > -       if (!g_isi_sb_iter_get_byte(sb, &type, 2) ||
> > -                       !g_isi_sb_iter_get_byte(sb, &pres, 3) ||
> > -                       !g_isi_sb_iter_get_byte(sb, &len, 5) ||
> > -                       !g_isi_sb_iter_get_alpha_tag(sb, &addr, 2 * len, 6))
> > +       if (!g_isi_sb_iter_get_byte(sb, &type, 2))
> > +               return;
> > +       if (!g_isi_sb_iter_get_byte(sb, &pres, 3))
> > +               return;
> > +       if (!g_isi_sb_iter_get_byte(sb, &len, 5))
> > +               return;
> > +       if (!g_isi_sb_iter_get_alpha_tag(sb, &addr, 2 * len, 6))

A separate patch for this change.

-- 
Gustavo F. Padovan
http://profusion.mobi

Re: [PATCH] Add CNAP support for isimodem

[Antoine Reversat]

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

On Fri, Feb 25, 2011 at 11:53 AM, Gustavo F. Padovan
<padovan@profusion.mobi> wrote:
> Hy Antoine,
>
> Top posting is not allowed on this mailing list. Please stop using it.

Sorry about that.

>
> A separate patch for this change.
>

Will do.

> --
> Gustavo F. Padovan
> http://profusion.mobi
> _______________________________________________
> ofono mailing list
> ofono(a)ofono.org
> http://lists.ofono.org/listinfo/ofono
>

[PATCH 1/2] Clean up isi_call_any_address_sb_proc

[Antoine Reversat]

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

---
 drivers/isimodem/voicecall.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c
index 0a32f27..0ad4dfb 100644
--- a/drivers/isimodem/voicecall.c
+++ b/drivers/isimodem/voicecall.c
@@ -210,10 +210,13 @@ static void isi_call_any_address_sb_proc(struct isi_voicecall *ivc,
 	uint8_t len;
 	char *addr;
 
-	if (!g_isi_sb_iter_get_byte(sb, &type, 2) ||
-			!g_isi_sb_iter_get_byte(sb, &pres, 3) ||
-			!g_isi_sb_iter_get_byte(sb, &len, 5) ||
-			!g_isi_sb_iter_get_alpha_tag(sb, &addr, 2 * len, 6))
+	if (!g_isi_sb_iter_get_byte(sb, &type, 2))
+		return;
+	if (!g_isi_sb_iter_get_byte(sb, &pres, 3))
+		return;
+	if (!g_isi_sb_iter_get_byte(sb, &len, 5))
+		return;
+	if (!g_isi_sb_iter_get_alpha_tag(sb, &addr, 2 * len, 6))
 		return;
 
 	call->addr_type = type | 0x80;
-- 
1.7.1

[PATCH 2/2] Add CNAP support for isimodem

[Antoine Reversat]

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

---
 drivers/isimodem/voicecall.c |   39 ++++++++++++++++++++++++++++++++++++++-
 src/voicecall.c              |    5 +++--
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c
index 0ad4dfb..37b0eb3 100644
--- a/drivers/isimodem/voicecall.c
+++ b/drivers/isimodem/voicecall.c
@@ -56,8 +56,10 @@ struct isi_call {
 	uint8_t cause;
 	uint8_t addr_type;
 	uint8_t presentation;
+	uint8_t name_presentation;
 	uint8_t reason;
 	char address[20];
+	char name[20];
 	char addr_pad[4];
 };
 
@@ -242,6 +244,31 @@ static void isi_call_destination_address_sb_proc(struct isi_voicecall *ivc,
 		isi_call_any_address_sb_proc(ivc, call, sb);
 }
 
+static void isi_call_origin_info_sb_proc(struct isi_voicecall *ivc,
+						struct isi_call *call,
+						GIsiSubBlockIter *sb)
+{
+	uint8_t pres;
+	uint8_t id;
+	uint8_t len;
+	char *name;
+
+	if (!g_isi_sb_iter_get_byte(sb, &pres, 2))
+		return;
+	if (!g_isi_sb_iter_get_byte(sb, &id, 6))
+		return;
+	if (!g_isi_sb_iter_get_byte(sb, &len, 7))
+		return;
+	if (!g_isi_sb_iter_get_alpha_tag(sb, &name, 2 * len, 8))
+		return;
+
+	DBG("Got name %s", name);
+	call->name_presentation = pres;
+	strncpy(call->name, name, sizeof(call->name));
+
+	g_free(name);
+}
+
 static void isi_call_mode_sb_proc(struct isi_voicecall *ivc,
 					struct isi_call *call,
 					GIsiSubBlockIter *sb)
@@ -399,13 +426,18 @@ static struct ofono_call isi_call_as_ofono_call(const struct isi_call *call)
 	ocall.status = isi_call_status_to_clcc(call);
 
 	memcpy(number->number, call->address, sizeof(number->number));
+	memcpy(ocall.name, call->name, sizeof(ocall.name));
 
 	number->type = 0x80 | call->addr_type;
 	ocall.clip_validity = call->presentation & 3;
+    ocall.cnap_validity = call->name_presentation & 3;
 
 	if (ocall.clip_validity == 0 && strlen(number->number) == 0)
 		ocall.clip_validity = 2;
 
+	if (ocall.cnap_validity == 0 && strlen(call->name) == 0)
+		ocall.cnap_validity = 2;
+
 	return ocall;
 }
 
@@ -516,11 +548,12 @@ static void isi_call_notify(struct ofono_voicecall *ovc, struct isi_call *call)
 
 	ocall = isi_call_as_ofono_call(call);
 
-	DBG("id=%u,%s,%u,\"%s\",%u,%u",
+	DBG("id=%u,%s,%u,\"%s\",\"%s\",%u,%u",
 		ocall.id,
 		ocall.direction ? "terminated" : "originated",
 		ocall.status,
 		ocall.phone_number.number,
+		ocall.name,
 		ocall.phone_number.type,
 		ocall.clip_validity);
 
@@ -625,6 +658,10 @@ static void isi_call_status_ind_cb(const GIsiMessage *msg, void *data)
 			isi_call_origin_address_sb_proc(ivc, call, &iter);
 			break;
 
+		case CALL_ORIGIN_INFO:
+			isi_call_origin_info_sb_proc(ivc, call, &iter);
+			break;
+
 		case CALL_GSM_DETAILED_CAUSE:
 		case CALL_DESTINATION_PRE_ADDRESS:
 		case CALL_DESTINATION_POST_ADDRESS:
diff --git a/src/voicecall.c b/src/voicecall.c
index d6e8539..ec001c0 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -1951,8 +1951,9 @@ void ofono_voicecall_notify(struct ofono_voicecall *vc,
 	struct ofono_call *newcall;
 
 	DBG("Got a voicecall event, status: %d, id: %u, number: %s"
-			" called_number: %s", call->status, call->id,
-			call->phone_number.number, call->called_number.number);
+			" called_number: %s, called_name %s", call->status,
+			call->id, call->phone_number.number,
+			call->called_number.number, call->name);
 
 	l = g_slist_find_custom(vc->call_list, GUINT_TO_POINTER(call->id),
 				call_compare_by_id);
-- 
1.7.1

Re: [PATCH 1/2] Clean up isi_call_any_address_sb_proc

[Denis Kenzior]

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

Hi Antoine,

On 02/25/2011 11:10 AM, Antoine Reversat wrote:
> ---
>  drivers/isimodem/voicecall.c |   11 +++++++----
>  1 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c
> index 0a32f27..0ad4dfb 100644
> --- a/drivers/isimodem/voicecall.c
> +++ b/drivers/isimodem/voicecall.c
> @@ -210,10 +210,13 @@ static void isi_call_any_address_sb_proc(struct isi_voicecall *ivc,
>  	uint8_t len;
>  	char *addr;
>  
> -	if (!g_isi_sb_iter_get_byte(sb, &type, 2) ||
> -			!g_isi_sb_iter_get_byte(sb, &pres, 3) ||
> -			!g_isi_sb_iter_get_byte(sb, &len, 5) ||
> -			!g_isi_sb_iter_get_alpha_tag(sb, &addr, 2 * len, 6))
> +	if (!g_isi_sb_iter_get_byte(sb, &type, 2))
> +		return;
> +	if (!g_isi_sb_iter_get_byte(sb, &pres, 3))
> +		return;
> +	if (!g_isi_sb_iter_get_byte(sb, &len, 5))
> +		return;
> +	if (!g_isi_sb_iter_get_alpha_tag(sb, &addr, 2 * len, 6))
>  		return;

This is indeed the preferred structure, however please note
doc/coding-style.txt rule M1.

>  
>  	call->addr_type = type | 0x80;

Regards,
-Denis

Re: [PATCH 2/2] Add CNAP support for isimodem

[Denis Kenzior]

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

Hi Antoine,

On 02/25/2011 11:10 AM, Antoine Reversat wrote:
> ---
>  drivers/isimodem/voicecall.c |   39 ++++++++++++++++++++++++++++++++++++++-
>  src/voicecall.c              |    5 +++--
>  2 files changed, 41 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c
> index 0ad4dfb..37b0eb3 100644
> --- a/drivers/isimodem/voicecall.c
> +++ b/drivers/isimodem/voicecall.c
> @@ -56,8 +56,10 @@ struct isi_call {
>  	uint8_t cause;
>  	uint8_t addr_type;
>  	uint8_t presentation;
> +	uint8_t name_presentation;
>  	uint8_t reason;
>  	char address[20];
> +	char name[20];
>  	char addr_pad[4];
>  };
>  
> @@ -242,6 +244,31 @@ static void isi_call_destination_address_sb_proc(struct isi_voicecall *ivc,
>  		isi_call_any_address_sb_proc(ivc, call, sb);
>  }
>  
> +static void isi_call_origin_info_sb_proc(struct isi_voicecall *ivc,
> +						struct isi_call *call,
> +						GIsiSubBlockIter *sb)
> +{
> +	uint8_t pres;
> +	uint8_t id;
> +	uint8_t len;
> +	char *name;
> +
> +	if (!g_isi_sb_iter_get_byte(sb, &pres, 2))
> +		return;
> +	if (!g_isi_sb_iter_get_byte(sb, &id, 6))
> +		return;
> +	if (!g_isi_sb_iter_get_byte(sb, &len, 7))
> +		return;
> +	if (!g_isi_sb_iter_get_alpha_tag(sb, &name, 2 * len, 8))
> +		return;
> +

Rule M1 please.

> +	DBG("Got name %s", name);
> +	call->name_presentation = pres;
> +	strncpy(call->name, name, sizeof(call->name));
> +
> +	g_free(name);
> +}
> +
>  static void isi_call_mode_sb_proc(struct isi_voicecall *ivc,
>  					struct isi_call *call,
>  					GIsiSubBlockIter *sb)
> @@ -399,13 +426,18 @@ static struct ofono_call isi_call_as_ofono_call(const struct isi_call *call)
>  	ocall.status = isi_call_status_to_clcc(call);
>  
>  	memcpy(number->number, call->address, sizeof(number->number));
> +	memcpy(ocall.name, call->name, sizeof(ocall.name));
>  
>  	number->type = 0x80 | call->addr_type;
>  	ocall.clip_validity = call->presentation & 3;
> +    ocall.cnap_validity = call->name_presentation & 3;

This looks like it has spaces instead of tabs for indentation.

>  
>  	if (ocall.clip_validity == 0 && strlen(number->number) == 0)
>  		ocall.clip_validity = 2;
>  
> +	if (ocall.cnap_validity == 0 && strlen(call->name) == 0)
> +		ocall.cnap_validity = 2;
> +
>  	return ocall;
>  }
>  
> @@ -516,11 +548,12 @@ static void isi_call_notify(struct ofono_voicecall *ovc, struct isi_call *call)
>  
>  	ocall = isi_call_as_ofono_call(call);
>  
> -	DBG("id=%u,%s,%u,\"%s\",%u,%u",
> +	DBG("id=%u,%s,%u,\"%s\",\"%s\",%u,%u",
>  		ocall.id,
>  		ocall.direction ? "terminated" : "originated",
>  		ocall.status,
>  		ocall.phone_number.number,
> +		ocall.name,
>  		ocall.phone_number.type,
>  		ocall.clip_validity);
>  
> @@ -625,6 +658,10 @@ static void isi_call_status_ind_cb(const GIsiMessage *msg, void *data)
>  			isi_call_origin_address_sb_proc(ivc, call, &iter);
>  			break;
>  
> +		case CALL_ORIGIN_INFO:
> +			isi_call_origin_info_sb_proc(ivc, call, &iter);
> +			break;
> +
>  		case CALL_GSM_DETAILED_CAUSE:
>  		case CALL_DESTINATION_PRE_ADDRESS:
>  		case CALL_DESTINATION_POST_ADDRESS:

I'm assuming you have tested this and it is correctly reporting CNAP
indications?

> diff --git a/src/voicecall.c b/src/voicecall.c
> index d6e8539..ec001c0 100644
> --- a/src/voicecall.c
> +++ b/src/voicecall.c
> @@ -1951,8 +1951,9 @@ void ofono_voicecall_notify(struct ofono_voicecall *vc,
>  	struct ofono_call *newcall;
>  
>  	DBG("Got a voicecall event, status: %d, id: %u, number: %s"
> -			" called_number: %s", call->status, call->id,
> -			call->phone_number.number, call->called_number.number);
> +			" called_number: %s, called_name %s", call->status,
> +			call->id, call->phone_number.number,
> +			call->called_number.number, call->name);
>  
>  	l = g_slist_find_custom(vc->call_list, GUINT_TO_POINTER(call->id),
>  				call_compare_by_id);

Please send this chunk as a separate patch.  In general we prefer to
have patches split up by directories.  See HACKING document in ofono
git, specifically the Submitting Patches section.

Regards,
-Denis