April 2022 - gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: emerg call: tweak log, comments

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27901 ) Change subject: emerg call: tweak log, comments ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/gsm_04_08_rr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27901/comment/32c248a3_460088cb PS1, Line 1071: BSC I guess it should be MSC? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I01e457ae6a9a951a2525c2159cb5979a0cb8bd95 Gerrit-Change-Number: 27901 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Sat, 23 Apr 2022 23:46:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: emerg call: fix RR release cause for pre-emption

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27900 ) Change subject: emerg call: fix RR release cause for pre-emption ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0423621d15ace11a53ae1653e5e7f5cb93605edb Gerrit-Change-Number: 27900 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Sat, 23 Apr 2022 23:44:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: TC_emerg_premption: cosmetic

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27905 ) Change subject: bsc: TC_emerg_premption: cosmetic ...................................................................... bsc: TC_emerg_premption: cosmetic Rename chan_nr to first_tch, and more clearly show that the TCH that is released gets assigned to the emergency call. Related: OS#5534 Change-Id: I0c540d76eedfd4115b410921bf5a0b6c2d00b5c2 --- M bsc/BSC_Tests.ttcn 1 file changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/27905/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 3a40d8d..70743cc 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -8947,7 +8947,6 @@ var integer i; var integer chreq_total, chreq_nochan; var RSL_Message rx_rsl; - var RslChannelNr chan_nr; f_init(1); f_sleep(1.0); @@ -8959,7 +8958,7 @@ chreq_total := f_ctrl_get_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:total"); chreq_nochan := f_ctrl_get_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:no_channel"); for (i := 0; i < NUM_TCHF_PER_BTS + NUM_TCHH_PER_BTS + NUM_SDCCH_PER_BTS; i := i+1) { - chan_nr := f_chreq_act_ack('33'O, i); + f_chreq_act_ack('33'O, i); } IPA_RSL[0].clear; f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:total", @@ -8969,13 +8968,15 @@ f_ipa_tx(0, ts_RSL_CHAN_RQD('A5'O, 23)); /* Expect the BSC to release one (the first) TCH/F on the BTS */ - chan_nr := valueof(t_RslChanNr_Bm(1)); - f_expect_chan_rel(0, chan_nr, expect_rr_chan_rel := false, expect_rll_rel_req := false); + var RslChannelNr first_tch := valueof(t_RslChanNr_Bm(1)); + f_expect_chan_rel(0, first_tch, expect_rr_chan_rel := false, expect_rll_rel_req := false); - /* Expect the BSC to send activate/assign the a channel for the emergency call */ + /* Expect the BSC to send activate/assign the channel for the emergency call */ rx_rsl := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV)); - chan_nr := rx_rsl.ies[0].body.chan_nr; - f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 33)); + if (first_tch != rx_rsl.ies[0].body.chan_nr) { + setverdict(fail, "different TCH lchan activated than expected"); + } + f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(first_tch, 33)); rx_rsl := f_exp_ipa_rx(0, tr_RSL_IMM_ASSIGN(0)); f_shutdown_helper(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0c540d76eedfd4115b410921bf5a0b6c2d00b5c2 Gerrit-Change-Number: 27905 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: TC_emerg_premption: test RR rel cause

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27906 ) Change subject: bsc: TC_emerg_premption: test RR rel cause ...................................................................... bsc: TC_emerg_premption: test RR rel cause Related: OS#5534 Depends: I0423621d15ace11a53ae1653e5e7f5cb93605edb (osmo-bsc) Change-Id: I47e919edc25a8427f49d654f97f05e46a89da16d --- M bsc/BSC_Tests.ttcn 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/27906/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 70743cc..f06d7a1 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -8964,12 +8964,17 @@ f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:total", chreq_total + NUM_TCHF_PER_BTS + NUM_TCHH_PER_BTS + NUM_SDCCH_PER_BTS); + /* Send EST IND for the first TCH, so we get to test the RR release cause */ + var RslChannelNr first_tch := valueof(t_RslChanNr_Bm(1)); + var octetstring l3 := '00010203040506'O; + f_ipa_tx(0, ts_RSL_EST_IND(first_tch, valueof(ts_RslLinkID_DCCH(0)), l3)); + /* Send Channel request for emegergency call */ f_ipa_tx(0, ts_RSL_CHAN_RQD('A5'O, 23)); /* Expect the BSC to release one (the first) TCH/F on the BTS */ - var RslChannelNr first_tch := valueof(t_RslChanNr_Bm(1)); - f_expect_chan_rel(0, first_tch, expect_rr_chan_rel := false, expect_rll_rel_req := false); + f_expect_chan_rel(0, first_tch, expect_rr_chan_rel := true, expect_rll_rel_req := false, + expect_rr_cause := GSM48_RR_CAUSE_PREMPTIVE_REL); /* Expect the BSC to send activate/assign the channel for the emergency call */ rx_rsl := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I47e919edc25a8427f49d654f97f05e46a89da16d Gerrit-Change-Number: 27906 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: emerg call deny: log on LOGL_ERROR

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27904 ) Change subject: emerg call deny: log on LOGL_ERROR ...................................................................... emerg call deny: log on LOGL_ERROR Change-Id: Id6ea25484479bfc1728124df8fe8e2e03bcee3ec --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/04/27904/1 diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index be41b21..5d38be9 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -1060,14 +1060,14 @@ * VTY configuration does not permit. */ if (msg_type == GSM48_MT_CC_EMERG_SETUP) { if (msg->lchan->ts->trx->bts->si_common.rach_control.t2 & 0x4) { - LOG_LCHAN(msg->lchan, LOGL_NOTICE, "MS attempts EMERGENCY SETUP although EMERGENCY CALLS" + LOG_LCHAN(msg->lchan, LOGL_ERROR, "MS attempts EMERGENCY SETUP although EMERGENCY CALLS" " are not allowed in sysinfo (cfg: network / bts / rach emergency call allowed 0)\n"); lchan_release(msg->lchan, true, true, GSM48_RR_CAUSE_PROT_ERROR_UNSPC, gscon_last_eutran_plmn(msg->lchan->conn)); return; } if (!conn->sccp.msc->allow_emerg) { - LOG_LCHAN(msg->lchan, LOGL_NOTICE, "MS attempts EMERGENCY SETUP, but EMERGENCY CALLS are" + LOG_LCHAN(msg->lchan, LOGL_ERROR, "MS attempts EMERGENCY SETUP, but EMERGENCY CALLS are" " denied on this BSC (cfg: msc / allow-emergency deny)\n"); lchan_release(msg->lchan, true, true, GSM48_RR_CAUSE_PROT_ERROR_UNSPC, gscon_last_eutran_plmn(msg->lchan->conn)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id6ea25484479bfc1728124df8fe8e2e03bcee3ec Gerrit-Change-Number: 27904 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: emerg call: tweak log, comments

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27901 ) Change subject: emerg call: tweak log, comments ...................................................................... emerg call: tweak log, comments Change-Id: I01e457ae6a9a951a2525c2159cb5979a0cb8bd95 --- M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/gsm_04_08_rr.c 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/01/27901/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 0ede339..e94d688 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1960,7 +1960,7 @@ if (rqd->reason == GSM_CHREQ_REASON_EMERG) { if (bts->si_common.rach_control.t2 & 0x4) { LOG_BTS(bts, DRSL, LOGL_NOTICE, "CHAN RQD: MS attempts EMERGENCY CALL although EMERGENCY CALLS " - "are not allowed in sysinfo (spec violation by MS!)\n"); + "are not allowed in sysinfo (cfg: network / bts / rach emergency call allowed 0)\n"); rsl_tx_imm_ass_rej(bts, &rqd->ref); talloc_free(rqd); return 0; @@ -2067,7 +2067,7 @@ lchan_release(release_lchan, !!(release_lchan->conn), true, GSM48_RR_CAUSE_PREMPTIVE_REL, gscon_last_eutran_plmn(release_lchan->conn)); } else { - /* BTS is shutting down, give up... */ + /* if BTS has shut down, give up... */ if (rqd->release_lchan->ts->fi->state == TS_ST_NOT_INITIALIZED) return false; diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index d1d61d6..7c39901 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -1061,14 +1061,14 @@ if (msg_type == GSM48_MT_CC_EMERG_SETUP) { if (msg->lchan->ts->trx->bts->si_common.rach_control.t2 & 0x4) { LOG_LCHAN(msg->lchan, LOGL_NOTICE, "MS attempts EMERGENCY SETUP although EMERGENCY CALLS" - " are not allowed in sysinfo (spec violation by MS!)\n"); + " are not allowed in sysinfo (cfg: network / bts / rach emergency call allowed 0)\n"); lchan_release(msg->lchan, true, true, GSM48_RR_CAUSE_PREMPTIVE_REL, gscon_last_eutran_plmn(msg->lchan->conn)); break; } if (!conn->sccp.msc->allow_emerg) { LOG_LCHAN(msg->lchan, LOGL_NOTICE, "MS attempts EMERGENCY SETUP, but EMERGENCY CALLS are" - " denied on this BSC (check BTS config!)\n"); + " denied on this BSC (cfg: msc / allow-emergency deny)\n"); lchan_release(msg->lchan, true, true, GSM48_RR_CAUSE_PREMPTIVE_REL, gscon_last_eutran_plmn(msg->lchan->conn)); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I01e457ae6a9a951a2525c2159cb5979a0cb8bd95 Gerrit-Change-Number: 27901 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: emerg call deny: fix RR release cause

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27902 ) Change subject: emerg call deny: fix RR release cause ...................................................................... emerg call deny: fix RR release cause So far the we indicated pre-emption in the release cause of denying an emergency setup, instead indicate protocol error. When emergency calls are disallowed, it is not pre-emption (making room for an emergency call) but a protocol error (MS asks for emergency call when the network does not allow it). Related: OS#5534 Change-Id: Ia195621165cb7bbe33e6c2e915abc42ab16a2a4f --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/02/27902/1 diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 7c39901..714ef90 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -1062,14 +1062,14 @@ if (msg->lchan->ts->trx->bts->si_common.rach_control.t2 & 0x4) { LOG_LCHAN(msg->lchan, LOGL_NOTICE, "MS attempts EMERGENCY SETUP although EMERGENCY CALLS" " are not allowed in sysinfo (cfg: network / bts / rach emergency call allowed 0)\n"); - lchan_release(msg->lchan, true, true, GSM48_RR_CAUSE_PREMPTIVE_REL, + lchan_release(msg->lchan, true, true, GSM48_RR_CAUSE_PROT_ERROR_UNSPC, gscon_last_eutran_plmn(msg->lchan->conn)); break; } if (!conn->sccp.msc->allow_emerg) { LOG_LCHAN(msg->lchan, LOGL_NOTICE, "MS attempts EMERGENCY SETUP, but EMERGENCY CALLS are" " denied on this BSC (cfg: msc / allow-emergency deny)\n"); - lchan_release(msg->lchan, true, true, GSM48_RR_CAUSE_PREMPTIVE_REL, + lchan_release(msg->lchan, true, true, GSM48_RR_CAUSE_PROT_ERROR_UNSPC, gscon_last_eutran_plmn(msg->lchan->conn)); break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia195621165cb7bbe33e6c2e915abc42ab16a2a4f Gerrit-Change-Number: 27902 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: emerg call deny: do not dispatch dtap

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27903 ) Change subject: emerg call deny: do not dispatch dtap ...................................................................... emerg call deny: do not dispatch dtap These should return, not break, to skip dtap upon error. Change-Id: I065953f0380e142824ba30a842c86f9c598f89fe --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/27903/1 diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 714ef90..be41b21 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -1064,14 +1064,14 @@ " are not allowed in sysinfo (cfg: network / bts / rach emergency call allowed 0)\n"); lchan_release(msg->lchan, true, true, GSM48_RR_CAUSE_PROT_ERROR_UNSPC, gscon_last_eutran_plmn(msg->lchan->conn)); - break; + return; } if (!conn->sccp.msc->allow_emerg) { LOG_LCHAN(msg->lchan, LOGL_NOTICE, "MS attempts EMERGENCY SETUP, but EMERGENCY CALLS are" " denied on this BSC (cfg: msc / allow-emergency deny)\n"); lchan_release(msg->lchan, true, true, GSM48_RR_CAUSE_PROT_ERROR_UNSPC, gscon_last_eutran_plmn(msg->lchan->conn)); - break; + return; } } /* fall through */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I065953f0380e142824ba30a842c86f9c598f89fe Gerrit-Change-Number: 27903 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: emerg call: fix RR release cause for pre-emption

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27900 ) Change subject: emerg call: fix RR release cause for pre-emption ...................................................................... emerg call: fix RR release cause for pre-emption If an lchan needs to be released to make room for an emergency call, send the proper release cause ("pre-emption"). Related: OS#5534 Change-Id: I0423621d15ace11a53ae1653e5e7f5cb93605edb --- M src/osmo-bsc/abis_rsl.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/00/27900/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 03e409d..0ede339 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -2058,13 +2058,13 @@ "CHAN RQD/EMERGENCY-PRIORITY: inducing termination of lchan %s (state:%s) in favor of incoming EMERGENCY CALL!\n", gsm_lchan_name(release_lchan), osmo_fsm_inst_state_name(release_lchan->fi)); - lchan_release(release_lchan, !!(release_lchan->conn), true, 0, + lchan_release(release_lchan, !!(release_lchan->conn), true, GSM48_RR_CAUSE_PREMPTIVE_REL, gscon_last_eutran_plmn(release_lchan->conn)); /* Also release any overlapping VAMOS multiplexes on this lchan */ release_lchan = gsm_lchan_primary_to_vamos(release_lchan); if (release_lchan) - lchan_release(release_lchan, !!(release_lchan->conn), true, 0, + lchan_release(release_lchan, !!(release_lchan->conn), true, GSM48_RR_CAUSE_PREMPTIVE_REL, gscon_last_eutran_plmn(release_lchan->conn)); } else { /* BTS is shutting down, give up... */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0423621d15ace11a53ae1653e5e7f5cb93605edb Gerrit-Change-Number: 27900 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: e1oip: Add rate_ctr for rx + tx packet / byte count

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27899 ) Change subject: e1oip: Add rate_ctr for rx + tx packet / byte count ...................................................................... e1oip: Add rate_ctr for rx + tx packet / byte count This allows to monitor the traffic utilization of each e1oip line. Change-Id: Ifde6be0b7d3c5767b684cb8fbbc58bbd5cfb0714 --- M src/octoi/e1oip.c M src/octoi/e1oip.h M src/octoi/octoi_fsm.c M src/octoi/octoi_sock.c M src/octoi/octoi_sock.h 5 files changed, 63 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/99/27899/1 diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c index cd07178..a50626f 100644 --- a/src/octoi/e1oip.c +++ b/src/octoi/e1oip.c @@ -51,6 +51,10 @@ [LINE_CTR_E1oIP_RX_OUT_OF_ORDER] = { "e1oip:rx:pkt_out_of_order", "Packets out-of-order in IP->E1 direction"}, [LINE_CTR_E1oIP_RX_OUT_OF_WIN] = { "e1oip:rx:pkt_out_of_win", "Packets out-of-rx-window in IP->E1 direction"}, [LINE_CTR_E1oIP_CONNECT_ACCEPT] = { "e1oip:connect_accepted", "OCTOI connections entering accepted state" }, + [LINE_CTR_E1oIP_RX_BYTES] = { "e1oip:rx:packets", "Number of bytes received including UDP+IP header" }, + [LINE_CTR_E1oIP_RX_PACKETS] = { "e1oip:rx:packets", "Number of UDP packets received" }, + [LINE_CTR_E1oIP_TX_BYTES] = { "e1oip:tx:packets", "Number of bytes transmitted including UDP+IP header" }, + [LINE_CTR_E1oIP_TX_PACKETS] = { "e1oip:tx:packets", "Number of UDP packets transmitted" }, }; static const struct rate_ctr_group_desc iline_ctrg_desc = { @@ -82,6 +86,7 @@ static void fifo_threshold_cb(struct frame_fifo *fifo, unsigned int frames, void *priv) { struct e1oip_line *iline = priv; + struct octoi_peer *peer = iline->peer; struct msgb *msg; struct e1oip_tdm_hdr *eith; unsigned int n_frames = fifo->threshold; @@ -108,7 +113,7 @@ /* this situation cannot really happen: The FIFO called us that * a certain threshold is reached, but now it cannot provide * frames? */ - LOGPEER(iline->peer, LOGL_ERROR, + LOGPEER(peer, LOGL_ERROR, "frame_fifo_out failure for frame %u/%u\n", iline->e1o.next_seq + i, i); } } @@ -146,7 +151,9 @@ } /* send the packet to the peer */ - octoi_tx(iline->peer, E1OIP_MSGT_TDM_DATA, 0, msgb_data(msg), msgb_length(msg)); + octoi_tx(peer, E1OIP_MSGT_TDM_DATA, 0, msgb_data(msg), msgb_length(msg)); + iline_ctr_add(iline, LINE_CTR_E1oIP_TX_PACKETS, 1); + iline_ctr_add(iline, LINE_CTR_E1oIP_TX_BYTES, peer->sock->iph_udph_size + msgb_length(msg)); msgb_free(msg); /* update the local state */ diff --git a/src/octoi/e1oip.h b/src/octoi/e1oip.h index 3c5a478..da4716b 100644 --- a/src/octoi/e1oip.h +++ b/src/octoi/e1oip.h @@ -23,6 +23,10 @@ LINE_CTR_E1oIP_RX_OUT_OF_ORDER, LINE_CTR_E1oIP_RX_OUT_OF_WIN, LINE_CTR_E1oIP_CONNECT_ACCEPT, + LINE_CTR_E1oIP_RX_BYTES, + LINE_CTR_E1oIP_RX_PACKETS, + LINE_CTR_E1oIP_TX_BYTES, + LINE_CTR_E1oIP_TX_PACKETS, }; enum e1oip_line_stat { diff --git a/src/octoi/octoi_fsm.c b/src/octoi/octoi_fsm.c index 3431587..37d0259 100644 --- a/src/octoi/octoi_fsm.c +++ b/src/octoi/octoi_fsm.c @@ -26,6 +26,7 @@ #include "octoi_sock.h" #include "octoi_fsm.h" +#include "e1oip.h" const struct value_string octoi_fsm_event_names[] = { @@ -158,6 +159,12 @@ OSMO_ASSERT(msgb_l1(msg)); OSMO_ASSERT(msgb_l2(msg)); + if (peer->iline) { + iline_ctr_add(peer->iline, LINE_CTR_E1oIP_RX_PACKETS, 1); + iline_ctr_add(peer->iline, LINE_CTR_E1oIP_RX_BYTES, + peer->sock->iph_udph_size + msgb_length(msg)); + } + if (!octoi_msg_validate(fi, msg)) return -1; diff --git a/src/octoi/octoi_sock.c b/src/octoi/octoi_sock.c index 4805d7e..4245d80 100644 --- a/src/octoi/octoi_sock.c +++ b/src/octoi/octoi_sock.c @@ -40,6 +40,44 @@ #include "octoi_sock.h" #include "e1oip.h" +/* determine domain / AF of socket */ +static int sock_get_domain(int fd) +{ + int domain; + socklen_t dom_len = sizeof(domain); + int rc; + + rc = getsockopt(fd, SOL_SOCKET, SO_DOMAIN, &domain, &dom_len); + if (rc < 0) + return rc; + + return domain; +} + +/* typical number of bytes in IP + UDP header for given socket */ +static int sock_get_iph_udph_overhead(int fd) +{ + int rc = sock_get_domain(fd); + if (rc < 0) { + LOGP(DLINP, LOGL_ERROR, "Unable to determine domain of socket %d: %s\n", + fd, strerror(errno)); + goto assume_ipv4; + } + + switch (rc) { + case AF_INET6: + return 40 + 8; + case AF_INET: + return 20 + 8; + default: + LOGP(DLINP, LOGL_ERROR, "Unknown domain %d of socket %d\n", rc, fd); + break; + } + +assume_ipv4: + return 20 + 8; +} + /*********************************************************************** * transmit to remote peer ***********************************************************************/ @@ -400,6 +438,8 @@ LOGP(DLINP, LOGL_NOTICE, "OCTOI server socket at "OSMO_SOCKADDR_STR_FMT"\n", OSMO_SOCKADDR_STR_FMT_ARGS(local)); + sock->iph_udph_size = sock_get_iph_udph_overhead(sock->ofd.fd); + return sock; } @@ -441,6 +481,8 @@ LOGP(DLINP, LOGL_NOTICE, "OCTOI client socket to "OSMO_SOCKADDR_STR_FMT"\n", OSMO_SOCKADDR_STR_FMT_ARGS(remote)); + sock->iph_udph_size = sock_get_iph_udph_overhead(sock->ofd.fd); + /* create [the only] peer */ peer = alloc_peer(sock, (struct sockaddr *) &sa_remote, sizeof(sa_remote)); peer->cfg.remote = *remote; diff --git a/src/octoi/octoi_sock.h b/src/octoi/octoi_sock.h index b251864..17385e1 100644 --- a/src/octoi/octoi_sock.h +++ b/src/octoi/octoi_sock.h @@ -31,6 +31,7 @@ struct osmo_fd ofd; /* file descriptor */ struct llist_head peers; /* list of peers */ void *priv; + unsigned int iph_udph_size; /* size of IP + UDP header */ int (*rx_cb)(struct octoi_peer *peer, struct msgb *msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27899 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ifde6be0b7d3c5767b684cb8fbbc58bbd5cfb0714 Gerrit-Change-Number: 27899 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022