diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-12-28 21:22:32 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2019-01-04 01:46:46 +0000 |
| commit | 1035d90c1761d4ab94c998908a475a8dbc09b50c (patch) | |
| tree | 0f2d22b8039c4a7bc1cfac1a9bba51bc9bf13d3c /src/libvlr | |
| parent | 3350bf9f78253eb9f647c8377b6446a4fc7b26e8 (diff) | |
fix vlr ops.subscr_assoc re-association
In rare cases, a conn is already associated with a subscriber. So far, we
abort()ed on that, bringing the entire osmo-msc down. Rather log an error and
keep the service running.
In vlr.ops.subscr_assoc, add success/failure return value, and abort the
LU/PARQ on error.
I haven't figured out in detail yet why/how a subscriber would re-launch a
LU/PARQ on a conn that is already associated, so far it is merely clear that we
do not want to crash the MSC if that happens. A log is in OS#3742.
Related: OS#3742, OS#3743
Change-Id: Ic0d54644bc735700220b1ef3a4384c217d57d20f
Diffstat (limited to 'src/libvlr')
| -rw-r--r-- | src/libvlr/vlr_access_req_fsm.c | 16 | ||||
| -rw-r--r-- | src/libvlr/vlr_lu_fsm.c | 3 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index 3a0760d84..3b4028524 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -72,7 +72,7 @@ struct proc_arq_priv { bool implicitly_accepted_parq_by_ciphering_cmd; }; -static void assoc_par_with_subscr(struct osmo_fsm_inst *fi, struct vlr_subscr *vsub) +static int assoc_par_with_subscr(struct osmo_fsm_inst *fi, struct vlr_subscr *vsub) { struct proc_arq_priv *par = fi->priv; struct vlr_instance *vlr = par->vlr; @@ -81,7 +81,7 @@ static void assoc_par_with_subscr(struct osmo_fsm_inst *fi, struct vlr_subscr *v par->vsub = vsub; /* Tell MSC to associate this subscriber with the given * connection */ - vlr->ops.subscr_assoc(par->msc_conn_ref, par->vsub); + return vlr->ops.subscr_assoc(par->msc_conn_ref, par->vsub); } static const char *vlr_proc_arq_result_name(const struct osmo_fsm_inst *fi) @@ -371,8 +371,10 @@ static void proc_arq_vlr_fn_init(struct osmo_fsm_inst *fi, GSM48_REJECT_NETWORK_FAILURE); } vsub->proc_arq_fsm = fi; - assoc_par_with_subscr(fi, vsub); - proc_arq_vlr_fn_post_imsi(fi); + if (assoc_par_with_subscr(fi, vsub) != 0) + proc_arq_fsm_done(fi, GSM48_REJECT_NETWORK_FAILURE); + else + proc_arq_vlr_fn_post_imsi(fi); vlr_subscr_put(vsub); return; } @@ -414,8 +416,10 @@ static void proc_arq_vlr_fn_w_obt_imsi(struct osmo_fsm_inst *fi, proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR); return; } - assoc_par_with_subscr(fi, vsub); - proc_arq_vlr_fn_post_imsi(fi); + if (assoc_par_with_subscr(fi, vsub)) + proc_arq_fsm_done(fi, GSM48_REJECT_NETWORK_FAILURE); + else + proc_arq_vlr_fn_post_imsi(fi); vlr_subscr_put(vsub); } diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index e635305fa..b00f8cef0 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -954,7 +954,8 @@ static int assoc_lfp_with_sub(struct osmo_fsm_inst *fi, struct vlr_subscr *vsub) lfp->vsub = vsub; /* Tell MSC to associate this subscriber with the given * connection */ - vlr->ops.subscr_assoc(lfp->msc_conn_ref, lfp->vsub); + if (vlr->ops.subscr_assoc(lfp->msc_conn_ref, lfp->vsub)) + lu_fsm_failure(fi, GSM48_REJECT_NETWORK_FAILURE); return 0; } |