diff options
| author | Harald Welte <laforge@osmocom.org> | 2020-11-29 17:39:19 +0100 |
|---|---|---|
| committer | laforge <laforge@osmocom.org> | 2021-01-18 14:07:48 +0000 |
| commit | 603f404e41a95e20d39ee64b649c8c19777caa8f (patch) | |
| tree | 506a2c2e54b52060a232074d87bfd7edc04c8db3 /src/gb/gprs_ns2.c | |
| parent | 509047ba5d2daf2cecfa198d0dca1430c8257294 (diff) | |
gprs_ns2: Give NS-VC FSMs a proper name/identifier
Log output without a proper identifier is mostly useless.
Change-Id: Id9d5b0684584d03685900c6298fe70246793de14
Closes: OS#4876
Diffstat (limited to 'src/gb/gprs_ns2.c')
| -rw-r--r-- | src/gb/gprs_ns2.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 813bd584..7c517aad 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -486,9 +486,10 @@ void ns2_prim_status_ind(struct gprs_ns2_nse *nse, * \param[in] bind The 'bind' on which we operate * \param[in] nse The NS Entity on which we operate * \param[in] initiater - if this is an incoming remote (!initiater) or a local outgoing connection (initater) + * \param[in] id - human-readable identifier * \return newly allocated NS-VC on success; NULL on error */ struct gprs_ns2_vc *ns2_vc_alloc(struct gprs_ns2_vc_bind *bind, struct gprs_ns2_nse *nse, bool initiater, - enum gprs_ns2_vc_mode vc_mode) + enum gprs_ns2_vc_mode vc_mode, const char *id) { /* Sanity check */ OSMO_ASSERT(bind->ll == nse->ll); @@ -511,7 +512,7 @@ struct gprs_ns2_vc *ns2_vc_alloc(struct gprs_ns2_vc_bind *bind, struct gprs_ns2_ nsvc->statg = osmo_stat_item_group_alloc(nsvc, &nsvc_statg_desc, bind->nsi->rate_ctr_idx); if (!nsvc->statg) goto err_group; - if (!gprs_ns2_vc_fsm_alloc(nsvc, NULL, initiater)) + if (!gprs_ns2_vc_fsm_alloc(nsvc, id, initiater)) goto err_statg; bind->nsi->rate_ctr_idx++; @@ -791,6 +792,7 @@ enum gprs_ns2_cs ns2_create_vc(struct gprs_ns2_vc_bind *bind, enum gprs_ns2_vc_mode vc_mode; uint16_t nsvci; uint16_t nsei; + char idbuf[32]; int rc, tlv; @@ -907,8 +909,11 @@ enum gprs_ns2_cs ns2_create_vc(struct gprs_ns2_vc_bind *bind, return GPRS_NS2_CS_SKIPPED; } + nsvci = tlvp_val16be(&tp, NS_IE_VCI); vc_mode = gprs_ns2_dialect_to_vc_mode(dialect); - nsvc = ns2_vc_alloc(bind, nse, false, vc_mode); + snprintf(idbuf, sizeof(idbuf), "%s-NSE%05u-NSVC%05u", gprs_ns2_lltype_str(nse->ll), + nse->nsei, nsvci); + nsvc = ns2_vc_alloc(bind, nse, false, vc_mode, idbuf); if (!nsvc) return GPRS_NS2_CS_SKIPPED; |