diff options
| author | Vadim Yanitskiy <axilirator@gmail.com> | 2020-01-25 10:49:14 +0700 |
|---|---|---|
| committer | Vadim Yanitskiy <axilirator@gmail.com> | 2020-01-25 10:52:26 +0700 |
| commit | baf71a72ecbdb6b69bedced43853cf6c032ed492 (patch) | |
| tree | 43a4a32a4fbcad4f7756777bf96a56fa7bbd835a /include | |
| parent | ffc7f39f016091e19eedb18528228927e198a9c1 (diff) | |
libvlr: use generic osmo_tdef API for T3250, T3260, and T3270
These timers so far were implemented as a list of unsigned integers,
which has never been initialized to any reasonable defaults. Since
they are used as state timeouts in several FSMs, we might end up
staying in some state forever.
Let's migrate to generic osmo_tdef API and use default values from
table 11.2 of 3GPP TS 24.008. This way the user can introspect and
change their values from the VTY / configuration file.
Change-Id: Ia8cf98da0aea0e626c5ff088a833d7359c43847f
Related: OS#4368
Diffstat (limited to 'include')
| -rw-r--r-- | include/osmocom/msc/msc_common.h | 1 | ||||
| -rw-r--r-- | include/osmocom/msc/vlr.h | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/include/osmocom/msc/msc_common.h b/include/osmocom/msc/msc_common.h index bd85722cd..8a43e69a3 100644 --- a/include/osmocom/msc/msc_common.h +++ b/include/osmocom/msc/msc_common.h @@ -10,6 +10,7 @@ struct gsm_network; struct vlr_subscr; extern struct osmo_tdef_group msc_tdef_group[]; +extern struct osmo_tdef msc_tdefs_vlr[]; #define MSC_HLR_REMOTE_IP_DEFAULT "127.0.0.1" #define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index d22e3ec41..615c6c874 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -252,13 +252,6 @@ struct vlr_ops { int (*subscr_assoc)(void *msc_conn_ref, struct vlr_subscr *vsub); }; -enum vlr_timer { - VLR_T_3250, - VLR_T_3260, - VLR_T_3270, - _NUM_VLR_TIMERS -}; - /* An instance of the VLR codebase */ struct vlr_instance { struct llist_head subscribers; @@ -275,7 +268,6 @@ struct vlr_instance { bool auth_reuse_old_sets_on_error; bool parq_retrieve_imsi; bool is_ps; - uint32_t timer[_NUM_VLR_TIMERS]; } cfg; /* A free-form pointer for use by the caller */ void *user_ctx; |