[PATCH ppp] ppp: Apply configuration options from a DCE request if ACK it

[PATCH ppp] ppp: Apply configuration options from a DCE request if ACK it

[s.e.golubtsov]

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

From: Sergei Golubtsov <s.e.golubtsov@gmail.com>

Apply configuration options if the DCE sends a PPP LCP configure request
and the DTE is going to ACK the request. Otherwise some options such as
the ACCM may not correspond to the configuration negotiated with the
DCE.
---
 gatchat/ppp_cp.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gatchat/ppp_cp.c b/gatchat/ppp_cp.c
index f3f2cc4f..371055e4 100644
--- a/gatchat/ppp_cp.c
+++ b/gatchat/ppp_cp.c
@@ -660,9 +660,12 @@ static void pppcp_generate_event(struct pppcp_data *data,
 	if (actions & SCR)
 		pppcp_send_configure_request(data);
 
-	if (actions & SCA)
+	if (actions & SCA) {
+		/* Apply local options */
+		if (data->driver->rca)
+			data->driver->rca(data, packet);
 		pppcp_send_configure_ack(data, packet);
-	else if (actions & SCN)
+	} else if (actions & SCN)
 		pppcp_send_configure_nak(data, packet);
 
 	if (actions & STR)
-- 
2.17.1

Re: [PATCH ppp] ppp: Apply configuration options from a DCE request if ACK it

[Denis Kenzior]

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

Hi Sergei,

On 1/1/21 3:04 PM, s.e.golubtsov(a)gmail.com wrote:
> From: Sergei Golubtsov <s.e.golubtsov@gmail.com>
> 
> Apply configuration options if the DCE sends a PPP LCP configure request
> and the DTE is going to ACK the request. Otherwise some options such as
> the ACCM may not correspond to the configuration negotiated with the
> DCE.
> ---
>   gatchat/ppp_cp.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/gatchat/ppp_cp.c b/gatchat/ppp_cp.c
> index f3f2cc4f..371055e4 100644
> --- a/gatchat/ppp_cp.c
> +++ b/gatchat/ppp_cp.c
> @@ -660,9 +660,12 @@ static void pppcp_generate_event(struct pppcp_data *data,
>   	if (actions & SCR)
>   		pppcp_send_configure_request(data);
>   
> -	if (actions & SCA)
> +	if (actions & SCA) {
> +		/* Apply local options */
> +		if (data->driver->rca)
> +			data->driver->rca(data, packet);

So this is incorrect.  You're applying options of the wrong 'side'.  See my 
reply in the other thread for  a more detailed explanation.

>   		pppcp_send_configure_ack(data, packet);
> -	else if (actions & SCN)
> +	} else if (actions & SCN)
>   		pppcp_send_configure_nak(data, packet);
>   
>   	if (actions & STR)
> 

Regards,
-Denis