[PATCH] emulator: add AT hook_control_cb() CB and register it

[PATCH] emulator: add AT hook_control_cb() CB and register it

[Guillaume Zajac]

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

---
 src/emulator.c |   44 +++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/emulator.c b/src/emulator.c
index c84f0a9..586c7ec 100644
--- a/src/emulator.c
+++ b/src/emulator.c
@@ -177,6 +177,41 @@ error:
 	g_at_server_send_final(em->server, G_AT_SERVER_RESULT_ERROR);
 }
 
+static void hook_control_cb(GAtServer *server, GAtServerRequestType type,
+			GAtResult *result, gpointer user_data)
+{
+	struct ofono_emulator *em = user_data;
+	GAtResultIter iter;
+	int val;
+
+	DBG("");
+
+	if (type != G_AT_SERVER_REQUEST_TYPE_SET)
+		goto error;
+
+	if (em->ppp == NULL)
+		goto error;
+
+	g_at_result_iter_init(&iter, result);
+	g_at_result_iter_next(&iter, "");
+
+	if (g_at_result_iter_next_number(&iter, &val) == FALSE)
+		goto error;
+
+	if (val != 0)
+		goto error;
+
+	g_at_ppp_unref(em->ppp);
+	em->ppp = NULL;
+
+	g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
+
+	return;
+
+error:
+	g_at_server_send_final(server, G_AT_SERVER_RESULT_ERROR);
+}
+
 static void brsf_cb(GAtServer *server, GAtServerRequestType type,
 			GAtResult *result, gpointer user_data)
 {
@@ -466,10 +501,13 @@ void ofono_emulator_register(struct ofono_emulator *em, int fd)
 
 	__ofono_atom_register(em->atom, emulator_unregister);
 
-	if (em->type == OFONO_EMULATOR_TYPE_DUN)
+	if (em->type == OFONO_EMULATOR_TYPE_DUN) {
 		g_at_server_register(em->server, "D", dial_cb, em, NULL);
-	else if (em->type == OFONO_EMULATOR_TYPE_HFP)
-		g_at_server_set_echo(em->server, FALSE);
+		g_at_server_register(em->server, "H", hook_control_cb, em, NULL);
+	} else {
+		if (em->type == OFONO_EMULATOR_TYPE_HFP)
+			g_at_server_set_echo(em->server, FALSE);
+	}
 }
 
 static void emulator_remove(struct ofono_atom *atom)
-- 
1.7.1

Re: [PATCH] emulator: add AT hook_control_cb() CB and register it

[Denis Kenzior]

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

Hi Guillaume,

On 03/24/2011 05:25 AM, Guillaume Zajac wrote:
> ---
>  src/emulator.c |   44 +++++++++++++++++++++++++++++++++++++++++---
>  1 files changed, 41 insertions(+), 3 deletions(-)
> 
> diff --git a/src/emulator.c b/src/emulator.c
> index c84f0a9..586c7ec 100644
> --- a/src/emulator.c
> +++ b/src/emulator.c
> @@ -177,6 +177,41 @@ error:
>  	g_at_server_send_final(em->server, G_AT_SERVER_RESULT_ERROR);
>  }
>  
> +static void hook_control_cb(GAtServer *server, GAtServerRequestType type,

Can you rename this dun_ath_cb, since this is pretty much dun specific

> +			GAtResult *result, gpointer user_data)
> +{
> +	struct ofono_emulator *em = user_data;
> +	GAtResultIter iter;
> +	int val;
> +
> +	DBG("");
> +
> +	if (type != G_AT_SERVER_REQUEST_TYPE_SET)
> +		goto error;

Wouldn't we be also getting G_AT_SERVER_REQUEST_TYPE_COMMAND_ONLY here?

> +
> +	if (em->ppp == NULL)
> +		goto error;
> +
> +	g_at_result_iter_init(&iter, result);
> +	g_at_result_iter_next(&iter, "");
> +
> +	if (g_at_result_iter_next_number(&iter, &val) == FALSE)
> +		goto error;
> +
> +	if (val != 0)
> +		goto error;
> +
> +	g_at_ppp_unref(em->ppp);
> +	em->ppp = NULL;
> +
> +	g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
> +
> +	return;
> +
> +error:
> +	g_at_server_send_final(server, G_AT_SERVER_RESULT_ERROR);
> +}
> +
>  static void brsf_cb(GAtServer *server, GAtServerRequestType type,
>  			GAtResult *result, gpointer user_data)
>  {
> @@ -466,10 +501,13 @@ void ofono_emulator_register(struct ofono_emulator *em, int fd)
>  
>  	__ofono_atom_register(em->atom, emulator_unregister);
>  
> -	if (em->type == OFONO_EMULATOR_TYPE_DUN)
> +	if (em->type == OFONO_EMULATOR_TYPE_DUN) {
>  		g_at_server_register(em->server, "D", dial_cb, em, NULL);
> -	else if (em->type == OFONO_EMULATOR_TYPE_HFP)
> -		g_at_server_set_echo(em->server, FALSE);
> +		g_at_server_register(em->server, "H", hook_control_cb, em, NULL);
> +	} else {
> +		if (em->type == OFONO_EMULATOR_TYPE_HFP)
> +			g_at_server_set_echo(em->server, FALSE);

I'd really prefer this to use a switch/case statement.

> +	}
>  }
>  
>  static void emulator_remove(struct ofono_atom *atom)

Regards,
-Denis

Re: [PATCH] emulator: add AT hook_control_cb() CB and register it

[Guillaume Zajac]

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

Hi Denis,

On 30/03/2011 05:49, Denis Kenzior wrote:
> Hi Guillaume,
>
> On 03/24/2011 05:25 AM, Guillaume Zajac wrote:
>> ---
>>   src/emulator.c |   44 +++++++++++++++++++++++++++++++++++++++++---
>>   1 files changed, 41 insertions(+), 3 deletions(-)
>>
>> diff --git a/src/emulator.c b/src/emulator.c
>> index c84f0a9..586c7ec 100644
>> --- a/src/emulator.c
>> +++ b/src/emulator.c
>> @@ -177,6 +177,41 @@ error:
>>   	g_at_server_send_final(em->server, G_AT_SERVER_RESULT_ERROR);
>>   }
>>
>> +static void hook_control_cb(GAtServer *server, GAtServerRequestType type,
> Can you rename this dun_ath_cb, since this is pretty much dun specific
Ok I will do it.
>> +			GAtResult *result, gpointer user_data)
>> +{
>> +	struct ofono_emulator *em = user_data;
>> +	GAtResultIter iter;
>> +	int val;
>> +
>> +	DBG("");
>> +
>> +	if (type != G_AT_SERVER_REQUEST_TYPE_SET)
>> +		goto error;
> Wouldn't we be also getting G_AT_SERVER_REQUEST_TYPE_COMMAND_ONLY here?
Sorry I forgot it. I will add thise case.
>> +
>> +	if (em->ppp == NULL)
>> +		goto error;
>> +
>> +	g_at_result_iter_init(&iter, result);
>> +	g_at_result_iter_next(&iter, "");
>> +
>> +	if (g_at_result_iter_next_number(&iter,&val) == FALSE)
>> +		goto error;
>> +
>> +	if (val != 0)
>> +		goto error;
>> +
>> +	g_at_ppp_unref(em->ppp);
>> +	em->ppp = NULL;
>> +
>> +	g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
>> +
>> +	return;
>> +
>> +error:
>> +	g_at_server_send_final(server, G_AT_SERVER_RESULT_ERROR);
>> +}
>> +
>>   static void brsf_cb(GAtServer *server, GAtServerRequestType type,
>>   			GAtResult *result, gpointer user_data)
>>   {
>> @@ -466,10 +501,13 @@ void ofono_emulator_register(struct ofono_emulator *em, int fd)
>>
>>   	__ofono_atom_register(em->atom, emulator_unregister);
>>
>> -	if (em->type == OFONO_EMULATOR_TYPE_DUN)
>> +	if (em->type == OFONO_EMULATOR_TYPE_DUN) {
>>   		g_at_server_register(em->server, "D", dial_cb, em, NULL);
>> -	else if (em->type == OFONO_EMULATOR_TYPE_HFP)
>> -		g_at_server_set_echo(em->server, FALSE);
>> +		g_at_server_register(em->server, "H", hook_control_cb, em, NULL);
>> +	} else {
>> +		if (em->type == OFONO_EMULATOR_TYPE_HFP)
>> +			g_at_server_set_echo(em->server, FALSE);
> I'd really prefer this to use a switch/case statement.
Ok.
>> +	}
>>   }
>>
>>   static void emulator_remove(struct ofono_atom *atom)

This patch is also in the set of patches I have sent for escape sequence 
detection because I needed it to complete gsmdial tests.
Should I resend the set of patches with this patch updated ? or I should 
wait for your feedback on the complete set of patches?

Kind regards,
Guillaume

Re: [PATCH] emulator: add AT hook_control_cb() CB and register it

[Denis Kenzior]

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

Hi Guillaume,

> This patch is also in the set of patches I have sent for escape sequence
> detection because I needed it to complete gsmdial tests.
> Should I resend the set of patches with this patch updated ? or I should
> wait for your feedback on the complete set of patches?
> 

Yes I noticed you put this patch in the other series after I sent the
review.  Please wait for my review of that series before resending.  I
will attempt to do that today.

Regards,
-Denis