Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9f39ab9 authored by kschulz's avatar kschulz Committed by Zhihai Xu
Browse files

RFCOMM: fix connection timeout during security setup 

The RFC_T2_TIMEOUT used in rfc_mx_conf_cnf is replaced with RFCOMM_CONN_TIMEOUT,
increasing the timeout value from 20 sec to 120 sec.

Bug: 11523955
Change-Id: I992f3d20e9e4c6465850dcf1f52af0b7d39dd893
parent be7d4b28

system/stack/rfcomm/rfc_mx_fsm.c

+6 −2
Original line number Diff line number Diff line
@@ -614,7 +614,9 @@ static void rfc_mx_conf_cnf (tRFC_MCB *p_mcb, tL2CAP_CFG_INFO *p_cfg) 
        else

        {

            p_mcb->state = RFC_MX_STATE_WAIT_SABME;

            rfc_timer_start (p_mcb, RFC_T2_TIMEOUT);

            rfc_timer_start (p_mcb, RFCOMM_CONN_TIMEOUT); /* - increased from T2=20 to CONN=120

                                                to allow the user more than 10 sec to type in the

                                                pin which can be e.g. 16 digits */

        }

    }

}
@@ -657,7 +659,9 @@ static void rfc_mx_conf_ind (tRFC_MCB *p_mcb, tL2CAP_CFG_INFO *p_cfg) 
        else

        {

            p_mcb->state = RFC_MX_STATE_WAIT_SABME;

            rfc_timer_start (p_mcb, RFC_T2_TIMEOUT);

            rfc_timer_start (p_mcb, RFCOMM_CONN_TIMEOUT); /* - increased from T2=20 to CONN=120

                                                to allow the user more than 10 sec to type in the

                                                pin which can be e.g. 16 digits */

        }

    }

}