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

broadband-bearer: fix logic looking for unused CID

Browse Source 
When looking for the first unused CID, we should also consider those
contexts defined with a different PDP type, not just the ones with the
same PDP type.
This commit is contained in:
Aleksander Morgado
2019-09-13 18:13:26 +00:00
committed by Dan Williams
parent e7881e4e29
commit 80703b667b
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-broadband-bearer.c
+11 -10
View File
@@ -892,22 +892,23 @@ parse_pdp_list (MMBaseModem *modem,
break;
}
/* If an unused CID was not found yet and the previous CID is not (CID - 1),
* this means that (previous CID + 1) is an unused CID that can be used.
* This logic will allow us using unused CIDs that are available in the gaps
* between already defined contexts.
*/
if (!unused_cid && prev_cid && ((prev_cid + 1) < pdp->cid)) {
unused_cid = prev_cid + 1;
mm_dbg ("Found the first unused PDP context with CID %u", unused_cid);
}
/* PDP with no APN set? we may use that one if no exact match found */
else if ((!pdp->apn || !pdp->apn[0]) && !ctx->blank_cid) {
if ((!pdp->apn || !pdp->apn[0]) && !ctx->blank_cid) {
ctx->blank_cid = pdp->cid;
mm_dbg ("Found the first PDP context with no APN with CID %u", ctx->blank_cid);
}
}
/* If an unused CID was not found yet and the previous CID is not (CID - 1),
* this means that (previous CID + 1) is an unused CID that can be used.
* This logic will allow us using unused CIDs that are available in the gaps
* between already defined contexts.
*/
if (!unused_cid && prev_cid && ((prev_cid + 1) < pdp->cid)) {
unused_cid = prev_cid + 1;
mm_dbg ("Found the first unused PDP context with CID %u", unused_cid);
}
/* Update previous CID value to the current CID for use in the next loop,
* unless an unused CID was already found.
*/