colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iface-modem-simple: fix connection attempt start place

Browse Source 
The 'ENABLE + 1' step is 'WAIT_FOR_ENABLED' really, and that should be
only used when the current state is not a final one. If we're already
enabled, or registered, or connected, then jump to 'REGISTER' right
away.
This commit is contained in:
Aleksander Morgado
2021-12-17 11:09:14 +01:00
parent 1199fa934d
commit 1ffd693f54
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mm-iface-modem-simple.c
View File

@@ -765,17 +765,18 @@ connect_auth_ready (MMBaseModem *self,
case MM_MODEM_STATE_ENABLING:
case MM_MODEM_STATE_DISCONNECTING:
/* If we are transitioning to the ENABLED/REGISTERED state,
* wait to get there before going on */
case MM_MODEM_STATE_SEARCHING:
case MM_MODEM_STATE_CONNECTING:
/* Wait to get to a final state before going on */
ctx->step = CONNECTION_STEP_WAIT_FOR_ENABLED;
break;
case MM_MODEM_STATE_ENABLED:
case MM_MODEM_STATE_SEARCHING:
case MM_MODEM_STATE_REGISTERED:
case MM_MODEM_STATE_CONNECTING:
case MM_MODEM_STATE_CONNECTED:
ctx->step = CONNECTION_STEP_ENABLE + 1;
/* If we are at least already enabled, start at the registration check
* right away */
ctx->step = CONNECTION_STEP_REGISTER;
break;
default: