laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27810 )
Change subject: octo: give rate_ctr / stat_items meaningful identifiers ......................................................................
octo: give rate_ctr / stat_items meaningful identifiers
We don't want useless identifiers like 'E1oIP line 5518' but something that we can understand, like the user account name, or in absence of that, at least the IP/port.
Change-Id: Ibd98b9606a1d9d5b76d63be83eb3df9e431ab3ad --- M src/octoi/e1oip.c M src/octoi/e1oip.h M src/octoi/octoi_srv_fsm.c 3 files changed, 9 insertions(+), 1 deletion(-)
Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved
diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c index 490b7f4..27eb201 100644 --- a/src/octoi/e1oip.c +++ b/src/octoi/e1oip.c @@ -261,9 +261,14 @@ return 0; }
-/* TODO: more meaningful identifiers? */ static int g_ctr_idx = 0;
+void e1oip_line_set_name(struct e1oip_line *iline, const char *name) +{ + rate_ctr_group_set_name(iline->ctrs, name); + osmo_stat_item_group_set_name(iline->stats, name); +} + struct e1oip_line *e1oip_line_alloc(struct octoi_peer *peer) { struct e1oip_line *iline; @@ -278,6 +283,7 @@
iline->ctrs = rate_ctr_group_alloc(iline, &iline_ctrg_desc, ctr_idx); iline->stats = osmo_stat_item_group_alloc(iline, &iline_stats_desc, ctr_idx); + e1oip_line_set_name(iline, peer->name);
iline->cfg.batching_factor = 32; iline->cfg.prefill_frame_count = 400; /* 50ms */ diff --git a/src/octoi/e1oip.h b/src/octoi/e1oip.h index 50ed9ff..54fbadd 100644 --- a/src/octoi/e1oip.h +++ b/src/octoi/e1oip.h @@ -57,6 +57,7 @@ };
struct e1oip_line *e1oip_line_alloc(struct octoi_peer *peer); +void e1oip_line_set_name(struct e1oip_line *line, const char *name); void e1oip_line_destroy(struct e1oip_line *iline);
int e1oip_rcvmsg_tdm_data(struct e1oip_line *iline, struct msgb *msg); diff --git a/src/octoi/octoi_srv_fsm.c b/src/octoi/octoi_srv_fsm.c index 07dc1a7..9f1019a 100644 --- a/src/octoi/octoi_srv_fsm.c +++ b/src/octoi/octoi_srv_fsm.c @@ -114,6 +114,7 @@ goto reject; } osmo_talloc_replace_string(st->peer, &st->peer->name, acc->user_id); + e1oip_line_set_name(st->peer->iline, acc->user_id); osmo_fsm_inst_state_chg(fi, SRV_ST_ACCEPTED, 0, 0); octoi_tx_service_ack(st->peer, st->service, "TODO-SRV", PACKAGE_NAME, PACKAGE_VERSION, st->capability_flags);
-
laforge