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

Change in simtrace2[master]: simtrace2-tool: hack: kick the comms by sending a fake message

by James Tavares

James Tavares has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26864 ) Change subject: simtrace2-tool: hack: kick the comms by sending a fake message ...................................................................... simtrace2-tool: hack: kick the comms by sending a fake message This is a workaround until the root cause of the communications failure between simtrace2-tool and simtrace2 firmware is identified. Additional details provided on simtrace mailing list. Change-Id: I40fa06bee5d8194516497e16597e069124ddf0fb --- M host/include/osmocom/simtrace2/simtrace2_api.h M host/lib/simtrace2_api.c M host/src/simtrace2-tool.c 3 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/64/26864/1 diff --git a/host/include/osmocom/simtrace2/simtrace2_api.h b/host/include/osmocom/simtrace2/simtrace2_api.h index d658d16..3a7e5ae 100644 --- a/host/include/osmocom/simtrace2/simtrace2_api.h +++ b/host/include/osmocom/simtrace2/simtrace2_api.h @@ -44,6 +44,7 @@ int osmo_st2_slot_tx_msg(struct osmo_st2_slot *slot, struct msgb *msg, uint8_t msg_class, uint8_t msg_type); +int osmo_st2_generic_do_error_none(struct osmo_st2_cardem_inst *ci); int osmo_st2_cardem_request_card_insert(struct osmo_st2_cardem_inst *ci, bool inserted); int osmo_st2_cardem_request_pb_and_rx(struct osmo_st2_cardem_inst *ci, uint8_t pb, uint8_t le); diff --git a/host/lib/simtrace2_api.c b/host/lib/simtrace2_api.c index 4ad7eb7..beb6de4 100644 --- a/host/lib/simtrace2_api.c +++ b/host/lib/simtrace2_api.c @@ -155,6 +155,24 @@ } /*********************************************************************** + * Generic protocol + ***********************************************************************/ + +/*! \brief Send an empty DO_ERROR message to the simtrace2 board */ +int osmo_st2_generic_do_error_none(struct osmo_st2_cardem_inst *ci) +{ + struct msgb *msg = st_msgb_alloc(); + struct cardemu_usb_msg_error *err; + + LOGSLOT(ci->slot, LOGL_NOTICE, "<= %s\n", __func__); + + err = (struct cardemu_usb_msg_error *) msgb_put(msg, sizeof(*err)); + memset(err, 0, sizeof(*err)); + + return osmo_st2_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_GENERIC, SIMTRACE_CMD_DO_ERROR); +} + +/*********************************************************************** * Card Emulation protocol ***********************************************************************/ diff --git a/host/src/simtrace2-tool.c b/host/src/simtrace2-tool.c index d92638f..407eac9 100644 --- a/host/src/simtrace2-tool.c +++ b/host/src/simtrace2-tool.c @@ -297,6 +297,10 @@ fprintf(stderr, "can't obtain EP addrs; rc=%d\n", rc); goto close_exit; } + + // HACK: kick the board with a fake message to get subsequent messages to be accepted + // TODO: figure out the real problem, and remove this + osmo_st2_generic_do_error_none(ci); } if (argc - optind <= 0) { -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I40fa06bee5d8194516497e16597e069124ddf0fb Gerrit-Change-Number: 26864 Gerrit-PatchSet: 1 Gerrit-Owner: James Tavares <jtavares(a)kvh.com> Gerrit-MessageType: newchange

1 year, 5 months

3
5
0 0

Change in osmo-pcu[master]: WIP: llc: schedule frames to MS based on SAPI priority

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27627 ) Change subject: WIP: llc: schedule frames to MS based on SAPI priority ...................................................................... Patch Set 1: (3 comments) File src/llc.h: https://gerrit.osmocom.org/c/osmo-pcu/+/27627/comment/6d6517e7_94c95273 PS1, Line 37: union This line as well as the address field can be moved out of the conditional block to avoid duplication. File src/llc.c: https://gerrit.osmocom.org/c/osmo-pcu/+/27627/comment/82fc5a97_ecf7b419 PS1, Line 99: int i For the sake of consistency with llc_queue_clear(), it should be unsigned. https://gerrit.osmocom.org/c/osmo-pcu/+/27627/comment/4f82228a_f118a575 PS1, Line 112: Unusual formatting. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie8bd91eeac4fa7487d4f11b808dea95737041c7e Gerrit-Change-Number: 27627 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 18:54:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-pcu[master]: llc: Move static functions below related object

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27626 ) Change subject: llc: Move static functions below related object ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27626 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If781e66c6e8a119cc22948c82167ceb90270ea6d Gerrit-Change-Number: 27626 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 18:44:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-pcu[master]: llc: Convert to C

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27623 ) Change subject: llc: Convert to C ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I250680ba581167d7398b2f734769c756cbb61c48 Gerrit-Change-Number: 27623 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 18:43:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-pcu[master]: llc: Convert to C: s/m_//g

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27622 ) Change subject: llc: Convert to C: s/m_//g ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia5272841392110b87725e87a7e6824c17a70d6d1 Gerrit-Change-Number: 27622 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 18:43:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: Ensure message length is sufficient for respective header

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27624 ) Change subject: abis_rsl: Ensure message length is sufficient for respective header ...................................................................... abis_rsl: Ensure message length is sufficient for respective header Change-Id: I63b64f1f241de3a76f9b66ed2cf524cc88933062 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 17 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 6681875..822d39a 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1502,6 +1502,9 @@ int rc = 0; struct e1inp_sign_link *sign_link = msg->dst; + if (msgb_l2len(msg) < sizeof(*rslh)) + return -EINVAL; + if (rslh->ie_chan != RSL_IE_CHAN_NR) { LOGP(DRSL, LOGL_ERROR, "Rx RSL DCHAN: invalid RSL header, expecting Channel Number IE tag, got 0x%x\n", @@ -1602,6 +1605,9 @@ struct tlv_parsed tp; struct e1inp_sign_link *sign_link = msg->dst; + if (msgb_l2len(msg) < sizeof(*rslh)) + return -EINVAL; + rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg)-sizeof(*rslh)); LOGP(DRSL, LOGL_ERROR, "%s ERROR REPORT%s\n", @@ -2403,6 +2409,9 @@ struct rate_ctr_group *bts_ctrs = sign_link->trx->bts->bts_ctrs; int rc = 0; + if (msgb_l2len(msg) < sizeof(*rslh)) + return -EINVAL; + msg->lchan = lchan_lookup(sign_link->trx, rslh->chan_nr, "Abis RSL rx CCHAN: "); @@ -2472,8 +2481,12 @@ struct e1inp_sign_link *sign_link = msg->dst; struct abis_rsl_rll_hdr *rllh = msgb_l2(msg); int rc = 0; - uint8_t sapi = rllh->link_id & 0x7; + uint8_t sapi; + if (msgb_l2len(msg) < sizeof(*rllh)) + return -1; + + sapi = rllh->link_id & 0x7; msg->lchan = lchan_lookup(sign_link->trx, rllh->chan_nr, "Abis RSL rx RLL: "); switch (rllh->c.msg_type) { @@ -2895,6 +2908,9 @@ struct abis_rsl_rll_hdr *rllh = msgb_l2(msg); int rc = 0; + if (msgb_l2len(msg) < sizeof(*rllh)) + return -EINVAL; + msg->lchan = lchan_lookup(sign_link->trx, rllh->chan_nr, "Abis RSL rx IPACC: "); 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I63b64f1f241de3a76f9b66ed2cf524cc88933062 Gerrit-Change-Number: 27624 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: always check return value of rsl_tlv_parse()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27620 ) Change subject: abis_rsl: always check return value of rsl_tlv_parse() ...................................................................... abis_rsl: always check return value of rsl_tlv_parse() Change-Id: Id022628934e7d51ce66cb255baa88f24bf5c918a Related: SYS#5905 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 61 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 822d39a..0776b8a 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1221,7 +1221,12 @@ return -EINVAL; } - rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } + cause_p = rsl_cause(&tp); LOG_LCHAN(lchan, LOGL_ERROR, "CHANNEL ACTIVATE NACK%s\n", rsl_cause_name(&tp)); @@ -1241,7 +1246,12 @@ struct tlv_parsed tp; const uint8_t *cause_p; - rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } + cause_p = rsl_cause(&tp); LOG_LCHAN(lchan, LOGL_ERROR, "CONNECTION FAIL%s\n", rsl_cause_name(&tp)); @@ -1385,7 +1395,11 @@ memset(mr, 0, sizeof(*mr)); mr->lchan = msg->lchan; - rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } if (!TLVP_PRESENT(&tp, RSL_IE_MEAS_RES_NR) || !TLVP_PRESENT(&tp, RSL_IE_UPLINK_MEAS) || @@ -1466,7 +1480,11 @@ .msg = msg, }; - rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } if (TLVP_PRESENT(&tp, RSL_IE_ACCESS_DELAY)) d.access_delay = TLVP_VAL(&tp, RSL_IE_ACCESS_DELAY); @@ -1608,7 +1626,11 @@ if (msgb_l2len(msg) < sizeof(*rslh)) return -EINVAL; - rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg)-sizeof(*rslh)); + if (rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg) - sizeof(*rslh)) < 0) { + LOGP(DRSL, LOGL_ERROR, "%s Failed to parse RSL %s\n", + gsm_trx_name(sign_link->trx), rsl_or_ipac_msg_name(rslh->msg_type)); + return -EINVAL; + } LOGP(DRSL, LOGL_ERROR, "%s ERROR REPORT%s\n", gsm_trx_name(sign_link->trx), rsl_cause_name(&tp)); @@ -1625,7 +1647,7 @@ struct gsm_bts_trx *trx = sign_link->trx; struct gsm_lchan *lchan; int ts_nr; - int rc, i; + int i; LOGP(DRSL, LOGL_DEBUG, "%s Rx Resource Indication\n", gsm_trx_name(trx)); @@ -1639,9 +1661,9 @@ } } - rc = rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg) - sizeof(*rslh)); - if (rc < 0) { - LOGP(DRSL, LOGL_ERROR, "Rx Resource Indication: failed to parse the message\n"); + if (rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg) - sizeof(*rslh)) < 0) { + LOGP(DRSL, LOGL_ERROR, "%s Failed to parse RSL %s\n", + gsm_trx_name(trx), rsl_or_ipac_msg_name(rslh->msg_type)); return -EINVAL; } @@ -2361,7 +2383,12 @@ struct tlv_parsed tp; uint8_t slot_count; - rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg) - sizeof(*rslh)); + if (rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg) - sizeof(*rslh)) < 0) { + LOGP(DRSL, LOGL_ERROR, "%s Failed to parse RSL %s\n", + gsm_trx_name(sign_link->trx), rsl_or_ipac_msg_name(rslh->c.msg_type)); + return -EINVAL; + } + if (!TLVP_PRESENT(&tp, RSL_IE_CBCH_LOAD_INFO)) { LOG_BTS(bts, DRSL, LOGL_ERROR, "CBCH LOAD IND without mandatory CBCH Load Info IE\n"); return -1; @@ -2452,7 +2479,12 @@ struct abis_rsl_rll_hdr *rllh = msgb_l2(msg); uint8_t rlm_cause; - rsl_tlv_parse(&tp, rllh->data, msgb_l2len(msg) - sizeof(*rllh)); + if (rsl_tlv_parse(&tp, rllh->data, msgb_l2len(msg) - sizeof(*rllh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(rllh->c.msg_type)); + return -EINVAL; + } + if (!TLVP_PRESENT(&tp, RSL_IE_RLM_CAUSE)) { LOG_LCHAN(msg->lchan, LOGL_ERROR, "ERROR INDICATION without mandantory cause.\n"); return -1; @@ -2822,7 +2854,12 @@ * address and port number to which it has bound the given logical * channel */ - rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } + if (!TLVP_PRESENT(&tv, RSL_IE_IPAC_LOCAL_PORT) || !TLVP_PRESENT(&tv, RSL_IE_IPAC_LOCAL_IP) || !TLVP_PRESENT(&tv, RSL_IE_IPAC_CONN_ID)) { @@ -2867,7 +2904,12 @@ * it now tells us the IP address and port number to which it has * connected the given logical channel */ - rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } + ipac_parse_rtp(lchan, &tv, "MDCX"); osmo_fsm_inst_dispatch(lchan->fi_rtp, LCHAN_RTP_EV_IPACC_MDCX_ACK, 0); @@ -2895,7 +2937,12 @@ struct abis_rsl_dchan_hdr *dh = msgb_l2(msg); struct tlv_parsed tv; - rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } + LOG_LCHAN(msg->lchan, LOGL_NOTICE, "Rx IPACC DLCX IND%s\n", rsl_cause_name(&tv)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id022628934e7d51ce66cb255baa88f24bf5c918a Gerrit-Change-Number: 27620 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: always check return value of rsl_tlv_parse()

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27620 ) Change subject: abis_rsl: always check return value of rsl_tlv_parse() ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: Re-applying 2 x CR+1. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id022628934e7d51ce66cb255baa88f24bf5c918a Gerrit-Change-Number: 27620 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 18:40:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-bsc[master]: fix bts_cbch_send_one(): use proper RSL Channel Number

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27619 ) Change subject: fix bts_cbch_send_one(): use proper RSL Channel Number ...................................................................... Patch Set 2: (2 comments) Patchset: PS2: > the question is whether it really matters, and whether it is really specified. 48.058 section 9.3. […] This is a valid point. My intention is to make it work with osmo-bts, because currently SMSCB does not work if CBCH is allocated on Cn. Probably we need to fix osmo-bts instead? Would be good to know how commercial multi-trx BTS models handle this. PS2: Let's keep this patch WIP. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib5fd00bfd5e762ce0a56e73816162d0555976f8d Gerrit-Change-Number: 27619 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 31 Mar 2022 18:38:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: always check return value of rsl_tlv_parse()

by fixeria

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27620 to look at the new patch set (#2). Change subject: abis_rsl: always check return value of rsl_tlv_parse() ...................................................................... abis_rsl: always check return value of rsl_tlv_parse() Change-Id: Id022628934e7d51ce66cb255baa88f24bf5c918a Related: SYS#5905 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 61 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/20/27620/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id022628934e7d51ce66cb255baa88f24bf5c918a Gerrit-Change-Number: 27620 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: Ensure message length is sufficient for respective header

by fixeria

Attention is currently required from: laforge. fixeria has uploaded a new patch set (#2) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27624 ) Change subject: abis_rsl: Ensure message length is sufficient for respective header ...................................................................... abis_rsl: Ensure message length is sufficient for respective header Change-Id: I63b64f1f241de3a76f9b66ed2cf524cc88933062 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/24/27624/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I63b64f1f241de3a76f9b66ed2cf524cc88933062 Gerrit-Change-Number: 27624 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years

1
0
0 0

Change in osmo-pcu[master]: WIP: llc: schedule frames to MS based on SAPI priority

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27627 ) Change subject: WIP: llc: schedule frames to MS based on SAPI priority ...................................................................... WIP: llc: schedule frames to MS based on SAPI priority Related: OS#5508 Related: SYS#5908 Change-Id: Ie8bd91eeac4fa7487d4f11b808dea95737041c7e --- M src/llc.c M src/llc.h 2 files changed, 91 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/27/27627/1 diff --git a/src/llc.c b/src/llc.c index 700585a..d333920 100644 --- a/src/llc.c +++ b/src/llc.c @@ -96,19 +96,40 @@ void llc_queue_init(struct gprs_llc_queue *q) { - INIT_LLIST_HEAD(&q->queue); + int i; + q->queue_size = 0; q->queue_octets = 0; q->avg_queue_delay = 0; + for (i = 0; i < ARRAY_SIZE(q->queue); i++) + INIT_LLIST_HEAD(&q->queue[i]); } +static enum gprs_llc_queue_prio llc_sapi2prio(uint8_t sapi) +{ + switch (sapi) { + case 1: + return LLC_QUEUE_PRIO_GMM; + case 2: + case 7: + case 8: + return LLC_QUEUE_PRIO_TOM_SMS; + default: + return LLC_QUEUE_PRIO_OTHER; + } +} + void llc_queue_enqueue(struct gprs_llc_queue *q, struct msgb *llc_msg, const struct timespec *expire_time) { struct MetaInfo *meta_storage; + struct gprs_llc_hdr *llc_hdr = (struct gprs_llc_hdr *)msgb_data(llc_msg); + enum gprs_llc_queue_prio prio; osmo_static_assert(sizeof(*meta_storage) <= sizeof(llc_msg->cb), info_does_not_fit); + prio = llc_sapi2prio(llc_hdr->sapi); + q->queue_size += 1; q->queue_octets += msgb_length(llc_msg); @@ -116,17 +137,20 @@ osmo_clock_gettime(CLOCK_MONOTONIC, &meta_storage->recv_time); meta_storage->expire_time = *expire_time; - msgb_enqueue(&q->queue, llc_msg); + msgb_enqueue(&q->queue[prio], llc_msg); } void llc_queue_clear(struct gprs_llc_queue *q, struct gprs_rlcmac_bts *bts) { struct msgb *msg; + unsigned int i; - while ((msg = msgb_dequeue(&q->queue))) { - if (bts) - bts_do_rate_ctr_inc(bts, CTR_LLC_FRAME_DROPPED); - msgb_free(msg); + for (i = 0; i < ARRAY_SIZE(q->queue); i++) { + while ((msg = msgb_dequeue(&q->queue[i]))) { + if (bts) + bts_do_rate_ctr_inc(bts, CTR_LLC_FRAME_DROPPED); + msgb_free(msg); + } } q->queue_size = 0; @@ -137,51 +161,53 @@ { struct msgb *msg, *msg1 = NULL, *msg2 = NULL; struct llist_head new_queue; + unsigned int i; size_t queue_size = 0; size_t queue_octets = 0; INIT_LLIST_HEAD(&new_queue); - while (1) { - if (msg1 == NULL) - msg1 = msgb_dequeue(&q->queue); + for (i = 0; i < ARRAY_SIZE(q->queue); i++) { + while (1) { + if (msg1 == NULL) + msg1 = msgb_dequeue(&q->queue[i]); - if (msg2 == NULL) - msg2 = msgb_dequeue(&o->queue); + if (msg2 == NULL) + msg2 = msgb_dequeue(&o->queue[i]); - if (msg1 == NULL && msg2 == NULL) - break; + if (msg1 == NULL && msg2 == NULL) + break; - if (msg1 == NULL) { - msg = msg2; - msg2 = NULL; - } else if (msg2 == NULL) { - msg = msg1; - msg1 = NULL; - } else { - const struct MetaInfo *mi1 = (struct MetaInfo *)&msg1->cb[0]; - const struct MetaInfo *mi2 = (struct MetaInfo *)&msg2->cb[0]; - - if (timespeccmp(&mi2->recv_time, &mi1->recv_time, >)) { + if (msg1 == NULL) { + msg = msg2; + msg2 = NULL; + } else if (msg2 == NULL) { msg = msg1; msg1 = NULL; } else { - msg = msg2; - msg2 = NULL; + const struct MetaInfo *mi1 = (struct MetaInfo *)&msg1->cb[0]; + const struct MetaInfo *mi2 = (struct MetaInfo *)&msg2->cb[0]; + + if (timespeccmp(&mi2->recv_time, &mi1->recv_time, >)) { + msg = msg1; + msg1 = NULL; + } else { + msg = msg2; + msg2 = NULL; + } } + + msgb_enqueue(&new_queue, msg); + queue_size += 1; + queue_octets += msgb_length(msg); } - msgb_enqueue(&new_queue, msg); - queue_size += 1; - queue_octets += msgb_length(msg); + OSMO_ASSERT(llist_empty(&q->queue[i])); + OSMO_ASSERT(llist_empty(&o->queue[i])); + llist_splice_init(&new_queue, &q->queue[i]); } - OSMO_ASSERT(llist_empty(&q->queue)); - OSMO_ASSERT(llist_empty(&o->queue)); - o->queue_size = 0; o->queue_octets = 0; - - llist_splice_init(&new_queue, &q->queue); q->queue_size = queue_size; q->queue_octets = queue_octets; } @@ -193,9 +219,13 @@ struct msgb *msg; struct timespec *tv, tv_now, tv_result; uint32_t lifetime; + unsigned int i; const struct MetaInfo *meta_storage; - msg = msgb_dequeue(&q->queue); + for (i = 0; i < ARRAY_SIZE(q->queue); i++) { + if ((msg = msgb_dequeue(&q->queue[i]))) + break; + } if (!msg) return NULL; diff --git a/src/llc.h b/src/llc.h index bd542c0..035fe77 100644 --- a/src/llc.h +++ b/src/llc.h @@ -1,4 +1,4 @@ -/* +/* 3GPP TS 44.064 * Copyright (C) 2013 by Holger Hans Peter Freyther * Copyright (C) 2022 by by Sysmocom s.f.m.c. GmbH * @@ -23,13 +23,31 @@ #include <string.h> #include <time.h> +#include <osmocom/core/endian.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/msgb.h> +#include <osmocom/core/endian.h> #define LLC_MAX_LEN 1543 struct gprs_rlcmac_bts; +struct gprs_llc_hdr { +#if OSMO_IS_LITTLE_ENDIAN + union { /* 5.2, 6.2.0 */ + uint8_t address; + uint8_t sapi:4, unused:2, c_r:1, pd:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + union { + uint8_t address; + uint8_t pd:1, c_r:1, unused:2, sapi:4; +#endif + }; + uint8_t control[0]; +/* TODO: fix for big endian/little endian */ +} __attribute__ ((packed)); + /** * I represent the LLC data to a MS */ @@ -87,11 +105,17 @@ /** * I store the LLC frames that come from the SGSN. */ +enum gprs_llc_queue_prio { /* lowest value has highest prio */ + LLC_QUEUE_PRIO_GMM = 0, /* SAPI 1 */ + LLC_QUEUE_PRIO_TOM_SMS, /* SAPI 2,7,8 */ + LLC_QUEUE_PRIO_OTHER, /* Other SAPIs */ + _LLC_QUEUE_PRIO_SIZE /* used to calculate size of enum */ +}; struct gprs_llc_queue { uint32_t avg_queue_delay; /* Average delay of data going through the queue */ size_t queue_size; size_t queue_octets; - struct llist_head queue; /* queued LLC DL data */ + struct llist_head queue[_LLC_QUEUE_PRIO_SIZE]; /* queued LLC DL data. See enum gprs_llc_queue_prio. */ }; void llc_queue_calc_pdu_lifetime(struct gprs_rlcmac_bts *bts, const uint16_t pdu_delay_csec, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie8bd91eeac4fa7487d4f11b808dea95737041c7e Gerrit-Change-Number: 27627 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

Change in osmo-pcu[master]: llc: Move static functions below related object

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27626 ) Change subject: llc: Move static functions below related object ...................................................................... llc: Move static functions below related object Move all static functions related to gprs_llc object below it, so that it's easy finding all related APIs being together. Change-Id: If781e66c6e8a119cc22948c82167ceb90270ea6d --- M src/llc.h 1 file changed, 24 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/26/27626/1 diff --git a/src/llc.h b/src/llc.h index a371b68..bd542c0 100644 --- a/src/llc.h +++ b/src/llc.h @@ -48,30 +48,6 @@ void llc_put_dummy_frame(struct gprs_llc *llc, size_t req_len); void llc_append_frame(struct gprs_llc *llc, const uint8_t *data, size_t len); -struct MetaInfo { - struct timespec recv_time; - struct timespec expire_time; -}; -/** - * I store the LLC frames that come from the SGSN. - */ -struct gprs_llc_queue { - uint32_t avg_queue_delay; /* Average delay of data going through the queue */ - size_t queue_size; - size_t queue_octets; - struct llist_head queue; /* queued LLC DL data */ -}; - -void llc_queue_calc_pdu_lifetime(struct gprs_rlcmac_bts *bts, const uint16_t pdu_delay_csec, - struct timespec *tv); -bool llc_queue_is_frame_expired(const struct timespec *tv_now, const struct timespec *tv); - -void llc_queue_init(struct gprs_llc_queue *q); -void llc_queue_clear(struct gprs_llc_queue *q, struct gprs_rlcmac_bts *bts); -void llc_queue_move_and_merge(struct gprs_llc_queue *q, struct gprs_llc_queue *o); -void llc_queue_enqueue(struct gprs_llc_queue *q, struct msgb *llc_msg, const struct timespec *expire_time); -struct msgb *llc_queue_dequeue(struct gprs_llc_queue *q, const struct MetaInfo **info); - static inline uint16_t llc_chunk_size(const struct gprs_llc *llc) { return llc->length - llc->index; @@ -104,6 +80,30 @@ return llc->length + chunk_size <= LLC_MAX_LEN; } +struct MetaInfo { + struct timespec recv_time; + struct timespec expire_time; +}; +/** + * I store the LLC frames that come from the SGSN. + */ +struct gprs_llc_queue { + uint32_t avg_queue_delay; /* Average delay of data going through the queue */ + size_t queue_size; + size_t queue_octets; + struct llist_head queue; /* queued LLC DL data */ +}; + +void llc_queue_calc_pdu_lifetime(struct gprs_rlcmac_bts *bts, const uint16_t pdu_delay_csec, + struct timespec *tv); +bool llc_queue_is_frame_expired(const struct timespec *tv_now, const struct timespec *tv); + +void llc_queue_init(struct gprs_llc_queue *q); +void llc_queue_clear(struct gprs_llc_queue *q, struct gprs_rlcmac_bts *bts); +void llc_queue_move_and_merge(struct gprs_llc_queue *q, struct gprs_llc_queue *o); +void llc_queue_enqueue(struct gprs_llc_queue *q, struct msgb *llc_msg, const struct timespec *expire_time); +struct msgb *llc_queue_dequeue(struct gprs_llc_queue *q, const struct MetaInfo **info); + static inline size_t llc_queue_size(const struct gprs_llc_queue *q) { return q->queue_size; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27626 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If781e66c6e8a119cc22948c82167ceb90270ea6d Gerrit-Change-Number: 27626 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: always check return value of rsl_tlv_parse()

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27620 ) Change subject: abis_rsl: always check return value of rsl_tlv_parse() ...................................................................... Patch Set 1: -Code-Review (1 comment) Patchset: PS1: Actually, this patch needs to be rebased on top of I63b64f1f241de3a76f9b66ed2cf524cc88933062. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id022628934e7d51ce66cb255baa88f24bf5c918a Gerrit-Change-Number: 27620 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 18:26:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: always check return value of rsl_tlv_parse()

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27620 ) Change subject: abis_rsl: always check return value of rsl_tlv_parse() ...................................................................... Patch Set 1: Code-Review+2 (2 comments) Patchset: PS1: 1+1 File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27620/comment/648339d6_4425f1e0 PS1, Line 1224: if (rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { > https://gerrit.osmocom. […] So this is not a problem. Marking as resolved. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id022628934e7d51ce66cb255baa88f24bf5c918a Gerrit-Change-Number: 27620 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 18:25:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years

1
0
0 0

Change in docker-playground[master]: new bsc-nat: msc tests

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27625 ) Change subject: new bsc-nat: msc tests ...................................................................... new bsc-nat: msc tests Change-Id: Ifdb9956a8bdde8aa3f9f62bfcfc035baab01c934 --- A osmo-bsc-nat-latest/Dockerfile A osmo-bsc-nat-latest/Makefile A osmo-bsc-nat-latest/osmo-bsc-nat.cfg A osmo-bsc-nat-master/Dockerfile A osmo-bsc-nat-master/Makefile A osmo-bsc-nat-master/osmo-bsc-nat.cfg A ttcn3-bsc-nat-msc-test/Dockerfile A ttcn3-bsc-nat-msc-test/MSC_Tests.cfg A ttcn3-bsc-nat-msc-test/Makefile A ttcn3-bsc-nat-msc-test/jenkins.sh A ttcn3-bsc-nat-msc-test/osmo-bsc-nat.cfg A ttcn3-bsc-nat-msc-test/osmo-mgw.cfg A ttcn3-bsc-nat-msc-test/osmo-msc.cfg A ttcn3-bsc-nat-msc-test/osmo-stp-nat.cfg A ttcn3-bsc-nat-msc-test/osmo-stp.cfg 15 files changed, 685 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/25/27625/1 diff --git a/osmo-bsc-nat-latest/Dockerfile b/osmo-bsc-nat-latest/Dockerfile new file mode 100644 index 0000000..b00801a --- /dev/null +++ b/osmo-bsc-nat-latest/Dockerfile @@ -0,0 +1,30 @@ +ARG USER +ARG DISTRO +ARG OSMOCOM_REPO_VERSION="latest" +FROM $USER/$DISTRO-obs-$OSMOCOM_REPO_VERSION +# Arguments used after FROM must be specified again +ARG DISTRO + +RUN case "$DISTRO" in \ + debian*) \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + osmo-bsc-nat && \ + apt-get clean \ + ;; \ + centos*) \ + dnf install -y \ + libdbi-dbd-sqlite \ + osmo-bsc-nat \ + ;; \ + esac + +WORKDIR /tmp + +VOLUME /data +COPY osmo-bsc-nat.cfg /data/osmo-bsc-nat.cfg + +WORKDIR /data +CMD ["/bin/sh", "-c", "/usr/bin/osmo-bsc-nat -c /data/osmo-bsc-nat.cfg >/data/osmo-bsc-nat.log 2>&1"] + +#EXPOSE diff --git a/osmo-bsc-nat-latest/Makefile b/osmo-bsc-nat-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-bsc-nat-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-bsc-nat-latest/osmo-bsc-nat.cfg b/osmo-bsc-nat-latest/osmo-bsc-nat.cfg new file mode 100644 index 0000000..a8e47a1 --- /dev/null +++ b/osmo-bsc-nat-latest/osmo-bsc-nat.cfg @@ -0,0 +1,65 @@ +# DO NET EDIT THIS FILE DIRECTLY! +# This is generated from templates, and manual edits will be overwritten. + +cs7 instance 0 + point-code 0.23.3 + asp asp-clnt-OsmoBSCNAT-CN 2905 0 m3ua + remote-ip 172.18.20.201 + local-ip 172.18.20.112 + sccp-address msc + routing-indicator PC + point-code 0.23.1 + subsystem-number 254 + +cs7 instance 1 + point-code 0.23.1 + asp asp-clnt-OsmoBSCNAT-RAN 2905 0 m3ua + remote-ip 172.18.20.200 + local-ip 172.18.20.111 + sccp-address bsc + routing-indicator PC + point-code 0.23.3 + subsystem-number 254 + +bsc-nat + cs7-instance-cn 0 + cs7-instance-ran 1 + +!mgw 0 +! mgw remote-ip 172.18.2.114 +! mgw remote-port 2427 +! mgw local-ip 172.18.2.113 +! mgw local-port 2427 +! mgw endpoint-domain bscnat + +log stderr + logging filter all 1 + logging color 1 + logging print level 1 + logging print category 1 + logging print category-hex 0 + logging print file basename last + logging print extended-timestamp 1 + logging level set-all debug + logging level linp notice + +!log file current_log/osmo-bsc-nat.log +! logging filter all 1 +! logging color 1 +! logging print level 1 +! logging print category 1 +! logging print category-hex 0 +! logging print file basename last +! logging print extended-timestamp 1 +! logging level set-all debug + +log gsmtap 172.18.20.103 + logging filter all 1 + logging color 1 + logging print level 1 + logging print category 1 + logging print category-hex 0 + logging print file basename last + logging print extended-timestamp 1 + logging level set-all debug + logging level linp notice diff --git a/osmo-bsc-nat-master/Dockerfile b/osmo-bsc-nat-master/Dockerfile new file mode 100644 index 0000000..7a6b9b4 --- /dev/null +++ b/osmo-bsc-nat-master/Dockerfile @@ -0,0 +1,65 @@ +ARG USER +ARG DISTRO +FROM $USER/$DISTRO-build +# Arguments used after FROM must be specified again +ARG DISTRO + +RUN case "$DISTRO" in \ + debian*) \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + libasn1c-dev \ + libdbd-sqlite3 \ + libdbi-dev \ + libosmo-abis-dev \ + libosmo-mgcp-client-dev \ + libosmo-gsup-client-dev \ + libosmo-netif-dev \ + libosmo-ranap-dev \ + libosmo-sccp-dev \ + libosmo-sigtran-dev \ + libosmocore-dev \ + libsmpp34-dev && \ + apt-get clean \ + ;; \ + centos*) \ + dnf install -y \ + "pkgconfig(libasn1c)" \ + "pkgconfig(libosmo-gsup-client)" \ + "pkgconfig(libosmo-mgcp-client)" \ + "pkgconfig(libosmo-netif)" \ + "pkgconfig(libosmo-ranap)" \ + "pkgconfig(libosmo-sccp)" \ + "pkgconfig(libosmo-sigtran)" \ + "pkgconfig(libosmoabis)" \ + "pkgconfig(libosmocore)" \ + "pkgconfig(libosmoctrl)" \ + "pkgconfig(libosmogsm)" \ + "pkgconfig(libosmovty)" \ + "pkgconfig(libsmpp34)" \ + ;; \ + esac + +WORKDIR /tmp + +ARG OSMO_BSC_NAT_BRANCH="master" + +RUN git clone git://git.osmocom.org/osmo-bsc-nat.git +ADD http://git.osmocom.org/osmo-msc/patch?h=$OSMO_BSC_NAT_BRANCH /tmp/commit-osmo-bsc-nat + +RUN cd osmo-bsc-nat && \ + git fetch && git checkout $OSMO_BSC_NAT_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_BSC_NAT_BRANCH || exit 1); \ + git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ + autoreconf -fi && \ + ./configure && \ + make "-j$(nproc)" install + +VOLUME /data + +COPY osmo-bsc-nat.cfg /data/osmo-bsc-nat.cfg + +WORKDIR /data +CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-bsc-nat -c /data/osmo-bsc-nat.cfg >/data/osmo-bsc-nat.log 2>&1"] + +#EXPOSE diff --git a/osmo-bsc-nat-master/Makefile b/osmo-bsc-nat-master/Makefile new file mode 100644 index 0000000..77d4f8b --- /dev/null +++ b/osmo-bsc-nat-master/Makefile @@ -0,0 +1,3 @@ +RUN_ARGS?=--rm --network sigtran --ip 172.18.0.10 -v msc-vol:/data + +include ../make/Makefile diff --git a/osmo-bsc-nat-master/osmo-bsc-nat.cfg b/osmo-bsc-nat-master/osmo-bsc-nat.cfg new file mode 100644 index 0000000..a8e47a1 --- /dev/null +++ b/osmo-bsc-nat-master/osmo-bsc-nat.cfg @@ -0,0 +1,65 @@ +# DO NET EDIT THIS FILE DIRECTLY! +# This is generated from templates, and manual edits will be overwritten. + +cs7 instance 0 + point-code 0.23.3 + asp asp-clnt-OsmoBSCNAT-CN 2905 0 m3ua + remote-ip 172.18.20.201 + local-ip 172.18.20.112 + sccp-address msc + routing-indicator PC + point-code 0.23.1 + subsystem-number 254 + +cs7 instance 1 + point-code 0.23.1 + asp asp-clnt-OsmoBSCNAT-RAN 2905 0 m3ua + remote-ip 172.18.20.200 + local-ip 172.18.20.111 + sccp-address bsc + routing-indicator PC + point-code 0.23.3 + subsystem-number 254 + +bsc-nat + cs7-instance-cn 0 + cs7-instance-ran 1 + +!mgw 0 +! mgw remote-ip 172.18.2.114 +! mgw remote-port 2427 +! mgw local-ip 172.18.2.113 +! mgw local-port 2427 +! mgw endpoint-domain bscnat + +log stderr + logging filter all 1 + logging color 1 + logging print level 1 + logging print category 1 + logging print category-hex 0 + logging print file basename last + logging print extended-timestamp 1 + logging level set-all debug + logging level linp notice + +!log file current_log/osmo-bsc-nat.log +! logging filter all 1 +! logging color 1 +! logging print level 1 +! logging print category 1 +! logging print category-hex 0 +! logging print file basename last +! logging print extended-timestamp 1 +! logging level set-all debug + +log gsmtap 172.18.20.103 + logging filter all 1 + logging color 1 + logging print level 1 + logging print category 1 + logging print category-hex 0 + logging print file basename last + logging print extended-timestamp 1 + logging level set-all debug + logging level linp notice diff --git a/ttcn3-bsc-nat-msc-test/Dockerfile b/ttcn3-bsc-nat-msc-test/Dockerfile new file mode 100644 index 0000000..05610a4 --- /dev/null +++ b/ttcn3-bsc-nat-msc-test/Dockerfile @@ -0,0 +1,13 @@ +ARG REGISTRY +ARG USER +FROM $REGISTRY/$USER/debian-stretch-titan +ARG OSMO_TTCN3_BRANCH="master" + +ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" msc + +VOLUME /data + +COPY MSC_Tests.cfg /data/MSC_Tests.cfg + +CMD ttcn3-docker-run msc MSC_Tests diff --git a/ttcn3-bsc-nat-msc-test/MSC_Tests.cfg b/ttcn3-bsc-nat-msc-test/MSC_Tests.cfg new file mode 100644 index 0000000..3d8d988 --- /dev/null +++ b/ttcn3-bsc-nat-msc-test/MSC_Tests.cfg @@ -0,0 +1,63 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/msc/MSC_Tests.default" + +[LOGGING] +SourceInfoFormat:= Single +LogEntityName:= Yes +LogEventTypes:= Yes +*.FileMask :=WARNING|VERDICTOP|TIMEROP|STATISTICS|PORTEVENT|EXECUTOR|ERROR|DEFAULTOP|ACTION|PARALLEL|FUNCTION|USER|TESTCASE|DEBUG; + +[TESTPORT_PARAMETERS] +*.MSCVTY.CTRL_HOSTNAME := "172.18.20.10" + +[MODULE_PARAMETERS] +# connection to STP +MSC_Tests.mp_bssap_cfg := { + { + transport := BSSAP_TRANSPORT_AoIP, + sccp_service_type := "mtp3_itu", + sctp_addr := { 23906, "172.18.20.103", 2905, "172.18.20.200" }, + own_pc := 193, /* 0.24.1 BSC emulation [0] */ + own_ssn := 254, + peer_pc := 185, /* 0.23.1 osmo-msc */ + peer_ssn := 254, + sio := '83'O, + rctx := 0 + }, + { + transport := BSSAP_TRANSPORT_AoIP, + sccp_service_type := "mtp3_itu", + sctp_addr := { 23907, "172.18.20.103", 2905, "172.18.20.200" }, + own_pc := 194, /* 0.24.2 BSC emulation [1] */ + own_ssn := 254, + peer_pc := 185, /* 0.23.1 osmo-msc */ + peer_ssn := 254, + sio := '83'O, + rctx := 1 + }, + { + transport := RANAP_TRANSPORT_IuCS, + sccp_service_type := "mtp3_itu", + sctp_addr := { 23908, "172.18.20.103", 2905, "172.18.20.200" }, + own_pc := 195, /* 0.24.3 BSC emulation [2] */ + own_ssn := 142, + peer_pc := 185, /* 0.23.1 osmo-msc */ + peer_ssn := 142, + sio := '83'O, + rctx := 2 + } +}; + +# remote (IUT) side +MSC_Tests.mp_msc_mncc := "/data/unix/mncc"; +MSC_Tests.mp_msc_ip := "172.18.20.10"; +# local (emulation) side) +MSC_Tests.mp_hlr_ip := "172.18.20.103"; +MSC_Tests.mp_mgw_ip := "172.18.20.103"; + +[MAIN_CONTROLLER] + +[EXECUTE] +MSC_Tests.control +MSC_Tests_Iu.control diff --git a/ttcn3-bsc-nat-msc-test/Makefile b/ttcn3-bsc-nat-msc-test/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/ttcn3-bsc-nat-msc-test/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/ttcn3-bsc-nat-msc-test/jenkins.sh b/ttcn3-bsc-nat-msc-test/jenkins.sh new file mode 100755 index 0000000..13de480 --- /dev/null +++ b/ttcn3-bsc-nat-msc-test/jenkins.sh @@ -0,0 +1,92 @@ +#!/bin/sh + +. ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "osmo-stp-$IMAGE_SUFFIX" \ + "osmo-msc-$IMAGE_SUFFIX" \ + "osmo-mgw-$IMAGE_SUFFIX" \ + "osmo-bsc-nat-$IMAGE_SUFFIX" \ + "ttcn3-msc-test" + +set_clean_up_trap +set -e + +SUBNET=20 +network_create $SUBNET + +mkdir $VOL_BASE_DIR/msc-tester +mkdir $VOL_BASE_DIR/msc-tester/unix +cp MSC_Tests.cfg $VOL_BASE_DIR/msc-tester/ + +mkdir $VOL_BASE_DIR/stp +cp osmo-stp.cfg $VOL_BASE_DIR/stp/ + +mkdir $VOL_BASE_DIR/stp2 +cp osmo-stp-nat.cfg $VOL_BASE_DIR/stp2/osmo-stp.cfg + +mkdir $VOL_BASE_DIR/mgw +cp osmo-mgw.cfg $VOL_BASE_DIR/mgw/ + +mkdir $VOL_BASE_DIR/bsc-nat +cp osmo-bsc-nat.cfg $VOL_BASE_DIR/bsc-nat/ + +mkdir $VOL_BASE_DIR/msc +mkdir $VOL_BASE_DIR/msc/unix +cp osmo-msc.cfg $VOL_BASE_DIR/msc/ + +mkdir $VOL_BASE_DIR/unix + +echo Starting container with STP +docker run --rm \ + $(docker_network_params $SUBNET 200) \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/stp:/data \ + --name ${BUILD_TAG}-stp -d \ + $REPO_USER/osmo-stp-$IMAGE_SUFFIX + +echo Starting container with STP2 +docker run --rm \ + $(docker_network_params $SUBNET 201) \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/stp2:/data \ + --name ${BUILD_TAG}-stp2 -d \ + $REPO_USER/osmo-stp-$IMAGE_SUFFIX + +echo Starting container with MGW +docker run --rm \ + $(docker_network_params $SUBNET 114) \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/mgw:/data \ + --name ${BUILD_TAG}-mgw -d \ + $REPO_USER/osmo-mgw-$IMAGE_SUFFIX + +echo Starting container with bsc-nat +docker run --rm \ + $(docker_network_params $SUBNET 111) \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/bsc-nat:/data \ + --name ${BUILD_TAG}-bsc-nat -d \ + $REPO_USER/osmo-bsc-nat-$IMAGE_SUFFIX + +echo Starting container with MSC +docker run --rm \ + $(docker_network_params $SUBNET 10) \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/msc:/data \ + -v $VOL_BASE_DIR/unix:/data/unix \ + --name ${BUILD_TAG}-msc -d \ + $DOCKER_ARGS \ + $REPO_USER/osmo-msc-$IMAGE_SUFFIX \ + /bin/sh -c "osmo-msc -c /data/osmo-msc.cfg >>/data/osmo-msc.log 2>&1" + +echo Starting container with MSC testsuite +docker run --rm \ + $(docker_network_params $SUBNET 103) \ + --ulimit core=-1 \ + -e "TTCN3_PCAP_PATH=/data" \ + -v $VOL_BASE_DIR/msc-tester:/data \ + -v $VOL_BASE_DIR/unix:/data/unix \ + --name ${BUILD_TAG}-ttcn3-bsc-nat-test \ + $DOCKER_ARGS \ + $REPO_USER/ttcn3-msc-test diff --git a/ttcn3-bsc-nat-msc-test/osmo-bsc-nat.cfg b/ttcn3-bsc-nat-msc-test/osmo-bsc-nat.cfg new file mode 100644 index 0000000..6be347f --- /dev/null +++ b/ttcn3-bsc-nat-msc-test/osmo-bsc-nat.cfg @@ -0,0 +1,55 @@ +# DO NET EDIT THIS FILE DIRECTLY! +# This is generated from templates, and manual edits will be overwritten. + +cs7 instance 0 + point-code 0.23.3 + asp asp-clnt-OsmoBSCNAT-CN 2907 0 m3ua + remote-ip 172.18.20.201 + local-ip 172.18.20.111 + sccp-address msc + routing-indicator PC + point-code 0.23.1 + subsystem-number 254 + +cs7 instance 1 + point-code 0.23.1 + asp asp-clnt-OsmoBSCNAT-RAN 2905 0 m3ua + remote-ip 172.18.20.200 + local-ip 172.18.20.111 + sccp-address bsc + routing-indicator PC + point-code 0.23.3 + subsystem-number 254 + +bsc-nat + cs7-instance-cn 0 + cs7-instance-ran 1 + +!mgw 0 +! mgw remote-ip 172.18.2.114 +! mgw remote-port 2427 +! mgw local-ip 172.18.2.113 +! mgw local-port 2427 +! mgw endpoint-domain bscnat + +log stderr + logging filter all 1 + logging color 1 + logging print level 1 + logging print category 1 + logging print category-hex 0 + logging print file basename last + logging print extended-timestamp 1 + logging level set-all debug + logging level linp notice + +log gsmtap 172.18.20.103 + logging filter all 1 + logging color 1 + logging print level 1 + logging print category 1 + logging print category-hex 0 + logging print file basename last + logging print extended-timestamp 1 + logging level set-all debug + logging level linp notice diff --git a/ttcn3-bsc-nat-msc-test/osmo-mgw.cfg b/ttcn3-bsc-nat-msc-test/osmo-mgw.cfg new file mode 100644 index 0000000..e026dcc --- /dev/null +++ b/ttcn3-bsc-nat-msc-test/osmo-mgw.cfg @@ -0,0 +1,46 @@ +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level set-all notice + logging level lmgcp debug +! +stats interval 5 +! +line vty + no login + bind 172.18.2.114 +! +stats interval 0 +stats reporter statsd + prefix TTCN3 + level subscriber + remote-ip 172.18.2.203 + remote-port 8125 + flush-period 1 + mtu 1024 + enable +! +mgcp + bind ip 172.18.2.114 + bind port 2427 + rtp port-range 4002 16000 + rtp bind-ip 172.18.2.114 + rtp bind-ip-v6 ::1 + rtp ip-probing + rtp ip-dscp 46 + no rtp keep-alive + no rtcp-omit + no rtp-patch + sdp audio-payload number 98 + sdp audio-payload name GSM + sdp audio-payload send-ptime + sdp audio-payload send-name + conn-timeout 0 + loop 0 + number endpoints 31 + allow-transcoding + osmux off + diff --git a/ttcn3-bsc-nat-msc-test/osmo-msc.cfg b/ttcn3-bsc-nat-msc-test/osmo-msc.cfg new file mode 100644 index 0000000..80e6296 --- /dev/null +++ b/ttcn3-bsc-nat-msc-test/osmo-msc.cfg @@ -0,0 +1,95 @@ +! +! OsmoMSC (1.1.2.66-629c4-dirty) configuration saved from vty +!! +! +log gsmtap 172.18.20.103 + logging level set-all debug + logging filter all 1 +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level rll notice + logging level cc debug + logging level mm debug + logging level rr notice + logging level mncc debug + logging level pag notice + logging level msc notice + logging level mgcp debug + logging level ho notice + logging level db notice + logging level ref notice + logging level ctrl notice + logging level smpp debug + logging level ranap debug + logging level vlr debug + logging level iucs debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl info + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp notice + logging level lsua notice + logging level lm3ua debug + logging level lmgcp debug +! +stats interval 5 +! +line vty + no login + bind 0.0.0.0 +ctrl + bind 0.0.0.0 +! +cs7 instance 0 + point-code 0.23.1 + asp asp-clnt-OsmoMSC-A 2907 0 m3ua + local-ip 172.18.20.10 +! local-ip fd02:db8:20::10 + remote-ip 172.18.20.201 +! remote-ip fd02:db8:20::201 + as as-clnt-OsmoMSC-A m3ua + asp asp-clnt-OsmoMSC-A + routing-key 3 0.23.1 +network + network country code 262 + mobile network code 42 + short name OsmoMSC + long name OsmoMSC + encryption a5 0 + authentication optional + rrlp mode none + mm info 0 + periodic location update 30 +msc + assign-tmsi + cs7-instance-a 0 + cs7-instance-iu 0 + mgw remote-ip 172.18.20.103 + emergency-call route-to-msisdn 112 + mncc external /data/unix/mncc +mncc-int + default-codec tch-f fr + default-codec tch-h hr +smpp + local-tcp-port 2775 + policy closed + no smpp-first + esme msc_tester + password osmocom1 +hlr + remote-ip 172.18.20.103 + remote-port 4222 diff --git a/ttcn3-bsc-nat-msc-test/osmo-stp-nat.cfg b/ttcn3-bsc-nat-msc-test/osmo-stp-nat.cfg new file mode 100644 index 0000000..51e15c5 --- /dev/null +++ b/ttcn3-bsc-nat-msc-test/osmo-stp-nat.cfg @@ -0,0 +1,24 @@ +! +! OsmoSTP (0.8.1) configuration saved from vty +!! +! +log gsmtap 172.18.20.103 + logging level set-all debug + logging filter all 1 +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level set-all debug +! +line vty + no login +! +cs7 instance 0 + xua rkm routing-key-allocation dynamic-permitted + listen m3ua 2907 + accept-asp-connections dynamic-permitted + local-ip 172.18.20.201 diff --git a/ttcn3-bsc-nat-msc-test/osmo-stp.cfg b/ttcn3-bsc-nat-msc-test/osmo-stp.cfg new file mode 100644 index 0000000..60562d1 --- /dev/null +++ b/ttcn3-bsc-nat-msc-test/osmo-stp.cfg @@ -0,0 +1,67 @@ +! +! OsmoSTP (0.8.1) configuration saved from vty +!! +! +log gsmtap 172.18.20.103 + logging level set-all debug + logging filter all 1 +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level set-all debug +! +line vty + no login +! +cs7 instance 0 + xua rkm routing-key-allocation dynamic-permitted + asp virt-bsc0-0 23906 2905 m3ua + local-ip 172.18.20.200 + local-ip fd02:db8:20::200 + remote-ip 172.18.20.103 + remote-ip fd02:db8:20::103 + as virt-bsc0 m3ua + asp virt-bsc0-0 + routing-key 0 0.24.1 +! + asp virt-bsc1-0 23907 2905 m3ua + local-ip 172.18.20.200 + local-ip fd02:db8:20::200 + remote-ip 172.18.20.103 + remote-ip fd02:db8:20::103 + as virt-bsc1 m3ua + asp virt-bsc1-0 + routing-key 1 0.24.2 +! + asp virt-rnc0-0 23908 2905 m3ua + local-ip 172.18.20.200 + local-ip fd02:db8:20::200 + remote-ip 172.18.20.103 + remote-ip fd02:db8:20::103 + as virt-rnc0 m3ua + asp virt-rnc0-0 + routing-key 2 0.24.3 +! + asp virt-msc0-0 0 2905 m3ua + local-ip 172.18.20.200 + remote-ip 172.18.20.111 + as virt-msc0 m3ua + asp virt-msc0-0 +! routing-key 3 0.23.1 + + route-table system + update route 0.24.1 7.255.7 linkset virt-bsc0 + update route 0.24.2 7.255.7 linkset virt-bsc1 + update route 0.24.3 7.255.7 linkset virt-rnc0 + update route 0.23.1 7.255.7 linkset virt-msc0 + listen m3ua 2905 + accept-asp-connections dynamic-permitted + local-ip 172.18.20.200 + local-ip fd02:db8:20::200 + listen ipa 5000 + accept-asp-connections dynamic-permitted + local-ip 172.18.20.200 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ifdb9956a8bdde8aa3f9f62bfcfc035baab01c934 Gerrit-Change-Number: 27625 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: Ensure message length is sufficient for respective header

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27624 ) Change subject: abis_rsl: Ensure message length is sufficient for respective header ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I63b64f1f241de3a76f9b66ed2cf524cc88933062 Gerrit-Change-Number: 27624 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 31 Mar 2022 17:49:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ran emulation: allow multiple reset attempts

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27602 ) Change subject: ran emulation: allow multiple reset attempts ...................................................................... ran emulation: allow multiple reset attempts bsc-nat introduces a delay that will lead to failed tests, since the reset attempt happens too early and times out, and the tests do not retry. Change-Id: I9f6db2a24e984eef31e76f9d42a80eb6a1bb6928 --- M bsc-nat/BSC_MS_ConnectionHandler.ttcn M bsc-nat/MSC_ConnectionHandler.ttcn M library/RAN_Emulation.ttcnpp M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 5 files changed, 25 insertions(+), 11 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc-nat/BSC_MS_ConnectionHandler.ttcn b/bsc-nat/BSC_MS_ConnectionHandler.ttcn index f011c39..1a3f951 100644 --- a/bsc-nat/BSC_MS_ConnectionHandler.ttcn +++ b/bsc-nat/BSC_MS_ConnectionHandler.ttcn @@ -74,6 +74,7 @@ protocol := RAN_PROTOCOL_BSSAP, transport := BSSAP_TRANSPORT_AoIP, use_osmux := false, + bssap_reset_retries := 1, sccp_addr_local := omit, sccp_addr_peer := omit } diff --git a/bsc-nat/MSC_ConnectionHandler.ttcn b/bsc-nat/MSC_ConnectionHandler.ttcn index e4d3816..fdf08de 100644 --- a/bsc-nat/MSC_ConnectionHandler.ttcn +++ b/bsc-nat/MSC_ConnectionHandler.ttcn @@ -104,6 +104,7 @@ protocol := RAN_PROTOCOL_BSSAP, transport := BSSAP_TRANSPORT_AoIP, use_osmux := false, + bssap_reset_retries := 1, sccp_addr_local := omit, sccp_addr_peer := omit } diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index d87ee9c..e6d36e6 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -521,20 +521,28 @@ function f_bssap_reset(SCCP_PAR_Address peer, SCCP_PAR_Address own) runs on RAN_Emulation_CT { timer T := 5.0; var boolean append_osmux_support := append_osmux_ie(); + var integer attempts := g_ran_ops.bssap_reset_retries; - BSSAP.send(ts_BSSAP_UNITDATA_req(peer, own, ts_BSSMAP_Reset(0, append_osmux_support))); - T.start; - alt { - [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(own, peer, tr_BSSMAP_ResetAck(append_osmux_support))) { - log("BSSMAP: Received RESET-ACK in response to RESET, we're ready to go!"); - } - [] as_reset_ack(append_osmux_support); - [] BSSAP.receive { repeat }; - [] T.timeout { - setverdict(fail, "BSSMAP: Timeout waiting for RESET-ACK after sending RESET"); - mtc.stop; + while (attempts > 0) { + attempts := attempts - 1; + + BSSAP.send(ts_BSSAP_UNITDATA_req(peer, own, ts_BSSMAP_Reset(0, append_osmux_support))); + T.start; + alt { + [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(own, peer, tr_BSSMAP_ResetAck(append_osmux_support))) { + log("BSSMAP: Received RESET-ACK in response to RESET, we're ready to go!"); + return; + } + [] as_reset_ack(append_osmux_support); + [] BSSAP.receive { repeat }; + [] T.timeout { + continue; + } } } + + setverdict(fail, "BSSMAP: Timeout waiting for RESET-ACK after sending RESET"); + mtc.stop; } private function f_bssap_l3_is_rr(PDU_BSSAP bssap) return boolean { @@ -713,6 +721,7 @@ RanProtocol protocol, RAN_Transport transport, boolean use_osmux, + integer bssap_reset_retries, /* needed for performing BSSMAP RESET */ SCCP_PAR_Address sccp_addr_local optional, SCCP_PAR_Address sccp_addr_peer optional diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 7b3188a..c3426a4 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -260,6 +260,7 @@ protocol := RAN_PROTOCOL_BSSAP, transport := BSSAP_TRANSPORT_AoIP, use_osmux := false, + bssap_reset_retries := 1, sccp_addr_local := omit, sccp_addr_peer := omit } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index dd31daf..2fad7b4 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -140,6 +140,7 @@ charstring mp_smpp_password := "osmocom1"; charstring mp_mme_name := "mmec01.mmegi0001.mme.epc.mnc070.mcc901.3gppnetwork.org"; charstring mp_vlr_name := "vlr.example.net"; + integer mp_bssap_reset_retries := 1; RAN_Configurations mp_bssap_cfg := { { @@ -327,6 +328,7 @@ if (isbound(mp_bssap_cfg[i])) { var RanOps ranops := BSC_RanOps; ranops.use_osmux := osmux; + ranops.bssap_reset_retries := mp_bssap_reset_retries; f_ran_adapter_init(g_bssap[i], mp_bssap_cfg[i], "MSC_Test_" & int2str(i), ranops); f_ran_adapter_start(g_bssap[i]); } else { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27602 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: I9f6db2a24e984eef31e76f9d42a80eb6a1bb6928 Gerrit-Change-Number: 27602 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

Change in osmo-e1d[master]: OCTOI: initial support for E1oIP forwarding

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27588 ) Change subject: OCTOI: initial support for E1oIP forwarding ...................................................................... OCTOI: initial support for E1oIP forwarding This introduces initial support for operation as OCTOI (Osmocom Community TDMoIP) server and client operation. Various features are still absent (user authentication, support for re-ordered packets), but this version is already able to provide services to clients with dynamic IP addresses as well as servers. The bulk of the OCTOI / E1oIP code is implemented as a shared library, to facilitate the development of other servers and clients in the future, and also to minimize the impact on the existing osmo-e1d code base. More information is available at https://osmocom.org/projects/octoi/wiki Change-Id: I05f5ff697ca8f7dccdcf89660f12089babfcc92e --- M Makefile.am M configure.ac M debian/control A debian/libosmo-octoi-dev.install A debian/libosmo-octoi0.install M include/Makefile.am M include/osmocom/e1d/proto.h A include/osmocom/octoi/e1oip_proto.h A include/osmocom/octoi/octoi.h A libosmo-octoi.pc.in M src/Makefile.am M src/ctl.c M src/e1d.h A src/e1oip.c M src/intf_line.c M src/mux_demux.c A src/octoi/Makefile.am A src/octoi/e1oip.c A src/octoi/e1oip.h A src/octoi/frame_fifo.c A src/octoi/frame_fifo.h A src/octoi/libosmo-octoi.map A src/octoi/octoi.c A src/octoi/octoi.h A src/octoi/octoi_clnt_fsm.c A src/octoi/octoi_clnt_vty.c A src/octoi/octoi_fsm.c A src/octoi/octoi_fsm.h A src/octoi/octoi_sock.c A src/octoi/octoi_sock.h A src/octoi/octoi_srv_fsm.c A src/octoi/octoi_srv_vty.c A src/octoi/octoi_vty.h M src/osmo-e1d.c M src/usb.c M src/vty.c 36 files changed, 3,427 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 3f87824..5027905 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,7 @@ $(NULL) pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libosmo-e1d.pc +pkgconfig_DATA = libosmo-e1d.pc libosmo-octoi.pc AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) diff --git a/configure.ac b/configure.ac index f5c15f2..5a09386 100644 --- a/configure.ac +++ b/configure.ac @@ -97,6 +97,8 @@ doc/Makefile doc/examples/Makefile src/Makefile + src/octoi/Makefile include/Makefile libosmo-e1d.pc + libosmo-octoi.pc ) diff --git a/debian/control b/debian/control index f1e35b7..4f0109e 100644 --- a/debian/control +++ b/debian/control @@ -40,3 +40,20 @@ libosmo-e1d1 (= ${binary:Version}), libosmocore-dev, Description: Development headers for the osmo-e1d library. + +Package: libosmo-octoi0 +Section: libs +Architecture: any +Multi-Arch: same +Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends} +Description: Library for the Osmocom Community TDMoIP network. + +Package: libosmo-octoi-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: ${misc:Depends}, ${shlibs:Depends}, + libosmo-octoi0 (= ${binary:Version}), + libosmocore-dev, +Description: Development headers for the Osmocom Community TDMoIP library. diff --git a/debian/libosmo-octoi-dev.install b/debian/libosmo-octoi-dev.install new file mode 100644 index 0000000..ac05774 --- /dev/null +++ b/debian/libosmo-octoi-dev.install @@ -0,0 +1,5 @@ +usr/include/osmocom/octoi +usr/lib/*/libosmo-octoi*.a +usr/lib/*/libosmo-octoi*.so +usr/lib/*/libosmo-octoi*.la +usr/lib/*/pkgconfig/libosmo-octoi.pc diff --git a/debian/libosmo-octoi0.install b/debian/libosmo-octoi0.install new file mode 100644 index 0000000..389c462 --- /dev/null +++ b/debian/libosmo-octoi0.install @@ -0,0 +1 @@ +usr/lib/*/libosmo-octoi*.so.* diff --git a/include/Makefile.am b/include/Makefile.am index e74dd6e..3c4cb0d 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1 +1,2 @@ -nobase_include_HEADERS = osmocom/e1d/proto_clnt.h osmocom/e1d/proto.h osmocom/e1d/proto_srv.h +nobase_include_HEADERS = osmocom/e1d/proto_clnt.h osmocom/e1d/proto.h osmocom/e1d/proto_srv.h \ + osmocom/octoi/octoi.h osmocom/octoi/e1oip_proto.h diff --git a/include/osmocom/e1d/proto.h b/include/osmocom/e1d/proto.h index 3033f11..a5cb8ec 100644 --- a/include/osmocom/e1d/proto.h +++ b/include/osmocom/e1d/proto.h @@ -73,6 +73,7 @@ E1DP_LMODE_OFF = 0x00, E1DP_LMODE_CHANNELIZED = 0x20, E1DP_LMODE_SUPERCHANNEL = 0x21, + E1DP_LMODE_E1OIP = 0x22, }; enum osmo_e1dp_ts_mode { diff --git a/include/osmocom/octoi/e1oip_proto.h b/include/osmocom/octoi/e1oip_proto.h new file mode 100644 index 0000000..96bc1d7 --- /dev/null +++ b/include/osmocom/octoi/e1oip_proto.h @@ -0,0 +1,126 @@ +#pragma once + +struct e1oip_hdr { + uint8_t version:4, + flags:4; + uint8_t msg_type; /* enum e1oip_msgtype */ +} __attribute__ ((packed)); + +#define E1OIP_VERSION 1 + +enum e1oip_msgtype { + E1OIP_MSGT_ECHO_REQ = 0, /* struct e1oip_echo */ + E1OIP_MSGT_ECHO_RESP = 1, /* struct e1oip_echo */ + E1OIP_MSGT_TDM_DATA = 2, /* struct e1oip_tdm_hdr + payload */ + E1OIP_MSGT_SERVICE_REQ = 3, /* struct e1oip_service_req */ + E1OIP_MSGT_SERVICE_ACK = 4, /* struct e1oip_service_ack */ + E1OIP_MSGT_SERVICE_REJ = 5, /* struct e1oip_service_rej */ + E1OIP_MSGT_REDIR_CMD = 6, /* struct e1oip_redir_cmd */ + E1OIP_MSGT_AUTH_REQ = 7, /* struct e1oip_auth_req */ + E1OIP_MSGT_AUTH_RESP = 8, /* struct e1oip_auth_resp */ + E1OIP_MSGT_ERROR_IND = 9, /* struct e1oip_error_ind */ +}; + +enum e1oip_service { + E1OIP_SERVICE_NONE = 0, + E1OIP_SERVICE_E1_FRAMED = 1, /* single (framed) E1 trunk */ +}; + +/* ECHO REQ + ECHO RESP */ +struct e1oip_echo { + /* sequence number to distinguish subsequent requests and + * responses */ + uint16_t seq_nr; + /* data chosen by sender of ECHO_REQ, echoed back in ECHO_RESP */ + uint8_t data[0]; +} __attribute__ ((packed)); + + +/* follows e1oip_hdr for E1OIP_MSGT_TDM_DATA */ +struct e1oip_tdm_hdr { + /* reduced frame number, increments with every E1 frame (8000 + * Hz). 16bit provides > 8s of wrap-around time, which is more + * than sufficient for detecting re-ordered framses over any + * meaningful interval */ + uint16_t frame_nr; + /* bit-mask of timeslots with data contained in 'data' below*/ + uint32_t ts_mask; + /* timeslot data: array of bytes per frame; each frame having + * one octet for the active timeslots indicated in 'ts_mask', + * in ascending order. If ts_mask == 0, then we have a single + * octet in 'data' specifying the number of frames expressed in + * this packet. */ + uint8_t data[0]; +} __attribute__ ((packed)); + +/* client says "hello" to server + requests a service */ +struct e1oip_service_req { + uint32_t requested_service; + char subscriber_id[32]; + char software_id[32]; + char software_version[16]; + uint32_t capability_flags; +} __attribute__ ((packed)); + +/* server instructs client to use other server IP/port */ +struct e1oip_redir_cmd { + char server_ip[40]; /* IPv4 or IPv6 */ + uint16_t server_port; /* UDP port number */ +} __attribute__ ((packed)); + +/* server requests client to authenticate */ +struct e1oip_auth_req { + uint8_t rand_len; + uint8_t rand[16]; + uint8_t autn_len; + uint8_t autn[16]; +} __attribute__ ((packed)); + +/* client responds to auth request. + * - res_len == 0 && auts_len == 0 -> failure + * - res_len != 0 && auts_len == 0 -> success + * - res_len == 0 && auts_len != 0 -> re-sync */ +struct e1oip_auth_resp { + uint8_t res_len; /* RES in success case */ + uint8_t res[16]; + uint8_t auts_len; /* AUTS in resync case */ + uint8_t auts[16]; +} __attribute__ ((packed)); + +/* server acknowledges a client "hello" + service granted */ +struct e1oip_service_ack { + uint32_t assigned_service; + char server_id[32]; + char software_id[32]; + char software_version[16]; + uint32_t capability_flags; /* server supported capabilities */ +} __attribute__ ((packed)); + +/* server acknowledges a client "hello" + service rejected */ +struct e1oip_service_rej { + uint32_t rejected_service; + char reject_message[64]; +} __attribute__ ((packed)); + +/* either side informs the other of an erroneous condition */ +struct e1oip_error_ind { + uint32_t cause; + char error_message[64]; + uint8_t original_message[0]; +} __attribute__ ((packed)); + + +struct e1oip_msg { + struct e1oip_hdr hdr; + union { + struct e1oip_echo echo; + struct e1oip_tdm_hdr tdm_hdr; + struct e1oip_service_req service_req; + struct e1oip_redir_cmd redir_cmd; + struct e1oip_auth_req auth_req; + struct e1oip_auth_resp auth_resp; + struct e1oip_service_ack service_ack; + struct e1oip_service_rej service_rej; + struct e1oip_error_ind error_ind; + } u; +} __attribute__ ((packed)); diff --git a/include/osmocom/octoi/octoi.h b/include/osmocom/octoi/octoi.h new file mode 100644 index 0000000..48ec122 --- /dev/null +++ b/include/osmocom/octoi/octoi.h @@ -0,0 +1,87 @@ +#pragma once + +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/sockaddr_str.h> +#include <osmocom/vty/vty.h> + +struct octoi_peer; + +enum octoi_account_mode { + ACCOUNT_MODE_NONE, + ACCOUNT_MODE_ICE1USB, + ACCOUNT_MODE_REDIRECT, + ACCOUNT_MODE_DAHDI, +}; + +extern const struct value_string octoi_account_mode_name[]; + +/* a single user account connecting via OCTOI protocol */ +struct octoi_account { + struct llist_head list; /* member in octoi_server.cfg.accounts */ + char *user_id; /* user ID (IMSI) */ + enum octoi_account_mode mode; + union { + struct { + char *usb_serial; /* USB serial string (ASCII) of icE1usb */ + uint8_t line_nr; /* line nubmer inside icE1usb */ + } ice1usb; + struct { + struct osmo_sockaddr_str to; /* remote IP/port to which to redirect */ + } redirect; + struct { + /* TBD */ + } dahdi; + } u; +}; + +struct octoi_sock; + +struct octoi_server { + struct octoi_sock *sock; /* OCTOI UDP server sock representation */ + struct { + struct llist_head accounts; /* list of octoi_account */ + struct osmo_sockaddr_str local; /* local socket bind address/port */ + } cfg; + +}; + +struct octoi_client { + struct llist_head list; /* member in e1_daemon.octoi.clients */ + struct octoi_sock *sock; /* OCTOI UDP server sock representation */ + struct { + struct osmo_sockaddr_str remote; /* remote socket address/port */ + struct osmo_sockaddr_str local; /* local socket bind address/port */ + + struct octoi_account *account; + } cfg; +}; + +/* call-backs from OCTOI library to application */ +struct octoi_ops { + /* server notifies the application that a new client connection has just been accepted */ + void * (*client_connected)(struct octoi_server *srv, struct octoi_peer *peer, + struct octoi_account *acc); + /* OCTOI library notifies the application that a given peer has disconnected */ + void (*peer_disconnected)(struct octoi_peer *peer); +}; + +struct octoi_daemon { + void *priv; + const struct octoi_ops *ops; + struct octoi_server *server; + struct llist_head clients; +}; + +extern struct octoi_daemon *g_octoi; + +void octoi_init(void *ctx, void *priv, const struct octoi_ops *ops); + +int octoi_vty_go_parent(struct vty *vty); + +struct octoi_peer *octoi_client_get_peer(struct octoi_client *client); +void octoi_clnt_start_for_peer(struct octoi_peer *peer, struct octoi_account *acc); + +void octoi_peer_e1o_in(struct octoi_peer *peer, const uint8_t *buf, int ftr); +void octoi_peer_e1t_out(struct octoi_peer *peer, uint8_t *buf, int fts); + diff --git a/libosmo-octoi.pc.in b/libosmo-octoi.pc.in new file mode 100644 index 0000000..94c6a79 --- /dev/null +++ b/libosmo-octoi.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Osmocom Community TDMoIP Library +Description: C Utility Library +Version: @VERSION@ +Requires: libosmocore +Libs: -L${libdir} -losmo-octoi +Cflags: -I${includedir}/ diff --git a/src/Makefile.am b/src/Makefile.am index f4af9f2..5795598 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = octoi . + # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification @@ -47,10 +49,12 @@ usb.c \ vpair.c \ vty.c \ + e1oip.c \ $(NULL) osmo_e1d_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) \ - $(LIBOSMOUSB_LIBS) $(LIBUSB_LIBS) libosmo-e1d.la + $(LIBOSMOUSB_LIBS) $(LIBUSB_LIBS) libosmo-e1d.la \ + octoi/libosmo-octoi.la osmo_e1d_pipe_SOURCES = \ e1d-ts-pipe.c \ @@ -60,7 +64,8 @@ osmo_e1gen_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) \ - $(LIBOSMOUSB_LIBS) $(LIBUSB_LIBS) + $(LIBOSMOUSB_LIBS) $(LIBUSB_LIBS) \ + octoi/libosmo-octoi.la osmo_e1gen_SOURCES = \ intf_line.c \ diff --git a/src/ctl.c b/src/ctl.c index 7040001..b5fdee4 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -71,6 +71,9 @@ case E1_LINE_MODE_SUPERCHANNEL: li->cfg.mode = E1DP_LMODE_SUPERCHANNEL; break; + case E1_LINE_MODE_E1OIP: + li->cfg.mode = E1DP_LMODE_E1OIP; + break; default: OSMO_ASSERT(0); } diff --git a/src/e1d.h b/src/e1d.h index dbcc047..726696e 100644 --- a/src/e1d.h +++ b/src/e1d.h @@ -31,8 +31,13 @@ #include <osmocom/core/timer.h> #include <osmocom/vty/command.h> +#include <osmocom/octoi/octoi.h> #include <osmocom/e1d/proto.h> +/*********************************************************************** + * core e1d related data structures + ***********************************************************************/ + enum e1d_vty_node { E1D_NODE = _LAST_OSMOVTY_NODE + 1, INTF_NODE, @@ -94,6 +99,8 @@ /* 1 channel group spanning all 31 TS, as used e.g. when using Frame Relay * or raw HDLC over channelized E1. */ E1_LINE_MODE_SUPERCHANNEL, + /* E1 forwarding over IP */ + E1_LINE_MODE_E1OIP, }; #define E1L_TS0_RX_CRC4_ERR 0x01 @@ -114,6 +121,7 @@ struct e1_ts ts[32]; /* superchannel */ struct e1_ts superchan; + struct octoi_peer *octoi_peer; struct { /*! buffer where we aggregate the E bits each multi-frame */ @@ -165,6 +173,7 @@ struct llist_head interfaces; }; +extern const struct octoi_ops e1d_octoi_ops; struct e1_line * e1_intf_find_line(struct e1_intf *intf, uint8_t id); @@ -194,6 +203,9 @@ void e1_line_destroy(struct e1_line *line); +void +e1_line_active(struct e1_line *line); + int e1_line_mux_out(struct e1_line *line, uint8_t *buf, int fts); @@ -211,3 +223,12 @@ struct e1_intf * e1d_vpair_intf_peer(struct e1_intf *intf); + +int +e1oip_line_demux_in(struct e1_line *line, const uint8_t *buf, int ftr); + +int +e1oip_line_mux_out(struct e1_line *line, uint8_t *buf, int fts); + +int +e1d_vty_go_parent(struct vty *vty); diff --git a/src/e1oip.c b/src/e1oip.c new file mode 100644 index 0000000..384a91b --- /dev/null +++ b/src/e1oip.c @@ -0,0 +1,152 @@ +/* + * e1oip.c + * + * (C) 2022 by Harald Welte <laforge(a)osmocom.org> + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <errno.h> +#include <unistd.h> +#include <stdint.h> +#include <string.h> +#include <sys/types.h> + +#include <talloc.h> + +#include <osmocom/core/isdnhdlc.h> +#include <osmocom/core/utils.h> + +#include <osmocom/octoi/octoi.h> + +#include "e1d.h" +#include "log.h" + +/*********************************************************************** + * internal helper functions + ***********************************************************************/ + +/* convenience helper function finding a e1_line for given serial_str + id */ +static struct e1_line * +find_line_by_usb_serial(struct e1_daemon *e1d, const char *serial_str, uint8_t id) +{ + struct e1_intf *e1i = e1d_find_intf_by_usb_serial(e1d, serial_str); + if (!e1i) + return NULL; + return e1_intf_find_line(e1i, id); +} + +static struct e1_line * +find_line_for_account(struct e1_daemon *e1d, const struct octoi_account *acc) +{ + switch (acc->mode) { + case ACCOUNT_MODE_ICE1USB: + return find_line_by_usb_serial(e1d, acc->u.ice1usb.usb_serial, + acc->u.ice1usb.line_nr); + case ACCOUNT_MODE_DAHDI: + OSMO_ASSERT(0); /* TODO */ + break; + default: + return NULL; + } +} + + +/*********************************************************************** + * e1d integration + ***********************************************************************/ + +/* physical E1 interface has received some E1 frames (E1->IP) */ +int +e1oip_line_demux_in(struct e1_line *line, const uint8_t *buf, int ftr) +{ + OSMO_ASSERT(line->mode == E1_LINE_MODE_E1OIP); + + if (!line->octoi_peer) + return -ENODEV; + + octoi_peer_e1o_in(line->octoi_peer, buf, ftr); + + return 0; +} + +/* physical E1 interface needs some E1 fames (E1<-IP) */ +int +e1oip_line_mux_out(struct e1_line *line, uint8_t *buf, int fts) +{ + OSMO_ASSERT(line->mode == E1_LINE_MODE_E1OIP); + + if (!line->octoi_peer) { + memset(buf, 0xff, 32*fts); + return -ENODEV; + } + + octoi_peer_e1t_out(line->octoi_peer, buf, fts); + + return 0; +} + + +/* OCTOI server FSM has detected an (authenticated) client connection */ +static void * +_e1d_octoi_client_connected_cb(struct octoi_server *srv, struct octoi_peer *peer, + struct octoi_account *acc) +{ + struct e1_daemon *e1d = g_octoi->priv; + struct e1_line *line; + + /* resolve the line for the just-connected subscriber account */ + line = find_line_for_account(e1d, acc); + if (!line) { + LOGP(DE1D, LOGL_NOTICE, "Could not find E1 line for client %s\n", + acc->user_id); + return NULL; + } + + if (line->octoi_peer) { + LOGPLI(line, DE1D, LOGL_NOTICE, "New OCTOI client connection for %s, " + "but we already have a client connection!\n", acc->user_id); + /* FIXME: properly get rid of the old client */ + } + line->octoi_peer = peer; + + LOGPLI(line, DE1D, LOGL_INFO, "New OCTOI client connection for %s\n", acc->user_id); + + return line; +} + +/* OCTOI has detected that a given peer has vanished; delete reference to it */ +static void +_e1d_octoi_peer_disconnected_cb(struct octoi_peer *peer) +{ + struct e1_daemon *e1d = g_octoi->priv; + struct e1_intf *intf; + + llist_for_each_entry(intf, &e1d->interfaces, list) { + struct e1_line *line; + llist_for_each_entry(line, &intf->lines, list) { + if (line->octoi_peer == peer) { + LOGPLI(line, DE1D, LOGL_NOTICE, "Peer disconnected\n"); + line->octoi_peer = NULL; + return; + } + } + } +} + +const struct octoi_ops e1d_octoi_ops = { + .client_connected = &_e1d_octoi_client_connected_cb, + .peer_disconnected = &_e1d_octoi_peer_disconnected_cb, +}; diff --git a/src/intf_line.c b/src/intf_line.c index bd7a393..9b33141 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -40,6 +40,7 @@ #include "e1d.h" #include "log.h" +#include <osmocom/octoi/octoi.h> const struct value_string e1_driver_names[] = { { E1_DRIVER_USB, "usb" }, @@ -250,18 +251,66 @@ line->ctrs = rate_ctr_group_alloc(line, &line_ctrg_desc, intf->id << 8 | line->id); OSMO_ASSERT(line->ctrs); + llist_add_tail(&line->list, &intf->lines); + + LOGPLI(line, DE1D, LOGL_NOTICE, "Created\n"); + + return line; +} + +/* find an octoi client (if any) for the given line */ +static struct octoi_client *octoi_client_by_line(struct e1_line *line) +{ + struct octoi_client *clnt; + + llist_for_each_entry(clnt, &g_octoi->clients, list) { + struct octoi_account *acc = clnt->cfg.account; + switch (acc->mode) { + case ACCOUNT_MODE_ICE1USB: + if (!strcmp(line->intf->usb.serial_str, acc->u.ice1usb.usb_serial) && + line->id == acc->u.ice1usb.line_nr) + return clnt; + break; + case ACCOUNT_MODE_NONE: + case ACCOUNT_MODE_REDIRECT: + break; + default: + OSMO_ASSERT(0); + } + } + return NULL; +} + +/* mark given line as 'active' (hardware present + enabled) */ +void +e1_line_active(struct e1_line *line) +{ + struct octoi_client *clnt; + + LOGPLI(line, DE1D, LOGL_NOTICE, "Activated\n"); + osmo_timer_setup(&line->ts0.timer, _ts0_tmr_cb, line); osmo_timer_schedule(&line->ts0.timer, 1, 0); - llist_add_tail(&line->list, &intf->lines); - /* start watchdog timer */ osmo_timer_setup(&line->watchdog.timer, line_watchdog_cb, line); osmo_timer_schedule(&line->watchdog.timer, 1, 0); - LOGPLI(line, DE1D, LOGL_NOTICE, "Created\n"); - - return line; + switch (line->mode) { + case E1_LINE_MODE_E1OIP: + OSMO_ASSERT(!line->octoi_peer); + /* find a client for this line */ + clnt = octoi_client_by_line(line); + if (!clnt) + return; + /* start the peer for this client */ + line->octoi_peer = octoi_client_get_peer(clnt); + OSMO_ASSERT(line->octoi_peer); + octoi_clnt_start_for_peer(line->octoi_peer, clnt->cfg.account); + break; + default: + break; + } } void diff --git a/src/mux_demux.c b/src/mux_demux.c index 3d72f7f..671d6d1 100644 --- a/src/mux_demux.c +++ b/src/mux_demux.c @@ -211,6 +211,9 @@ case E1_LINE_MODE_SUPERCHANNEL: _e1_line_mux_out_superchan(line, buf, fts); break; + case E1_LINE_MODE_E1OIP: + e1oip_line_mux_out(line, buf, fts); + break; default: OSMO_ASSERT(0); } @@ -423,6 +426,8 @@ return _e1_line_demux_in_channelized(line, buf, ftr); case E1_LINE_MODE_SUPERCHANNEL: return _e1_line_demux_in_superchan(line, buf, ftr); + case E1_LINE_MODE_E1OIP: + return e1oip_line_demux_in(line, buf, ftr); default: OSMO_ASSERT(0); } diff --git a/src/octoi/Makefile.am b/src/octoi/Makefile.am new file mode 100644 index 0000000..b77e0b8 --- /dev/null +++ b/src/octoi/Makefile.am @@ -0,0 +1,37 @@ +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) +AM_CFLAGS=-Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wno-unused-result $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) + +# This is _NOT_ the library release version, it's an API version. +# Please read Chapter 6 "Library interface versions" of the libtool +# documentation before making any modification +LIBVERSION=0:0:0 + +lib_LTLIBRARIES = libosmo-octoi.la + +libosmo_octoi_la_SOURCES = \ + frame_fifo.c \ + e1oip.c \ + octoi.c \ + octoi_sock.c \ + octoi_fsm.c \ + octoi_srv_fsm.c \ + octoi_srv_vty.c \ + octoi_clnt_fsm.c \ + octoi_clnt_vty.c \ + $(NULL) + +libosmo_octoi_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined \ + -Wl,--version-script=$(srcdir)/libosmo-octoi.map +libosmo_octoi_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) + +noinst_HEADERS = \ + e1oip.h \ + frame_fifo.h \ + octoi.h \ + octoi_fsm.h \ + octoi_sock.h \ + octoi_vty.h \ + $(NULL) + +EXTRA_DIST = libosmo-octoi.map diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c new file mode 100644 index 0000000..0cb7206 --- /dev/null +++ b/src/octoi/e1oip.c @@ -0,0 +1,281 @@ +/* + * e1oip.c - Actual TDM/E1oIP handling within OCTOI + * + * (C) 2022 by Harald Welte <laforge(a)osmocom.org> + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <time.h> +#include <errno.h> +#include <unistd.h> +#include <stdint.h> +#include <string.h> +#include <sys/types.h> +#include <sys/socket.h> + +#include <talloc.h> + +#include <osmocom/core/isdnhdlc.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/stats.h> +#include <osmocom/core/rate_ctr.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/socket.h> +#include <osmocom/core/sockaddr_str.h> + +#include <osmocom/octoi/e1oip_proto.h> + +#include "octoi_sock.h" +#include "frame_fifo.h" +#include "e1oip.h" + +static const struct rate_ctr_desc iline_ctr_description[] = { + [LINE_CTR_E1oIP_UNDERRUN] = { "e1oip:underrun", "Frames missing/substituted in IP->E1 direction"}, + [LINE_CTR_E1oIP_OVERFLOW] = { "e1oip:overflow", "Frames overflowed in IP->E1 direction"}, +}; + +static const struct rate_ctr_group_desc iline_ctrg_desc = { + .group_name_prefix = "e1oip_line", + .group_description = "Counters for E1oIP line", + .class_id = OSMO_STATS_CLASS_GLOBAL, + .num_ctr = ARRAY_SIZE(iline_ctr_description), + .ctr_desc = iline_ctr_description, +}; + +static const struct osmo_stat_item_desc iline_stat_description[] = { + [LINE_STAT_E1oIP_RTT] = { "e1oip:rtt", "Round Trip Time (in ms)" }, + [LINE_STAT_E1oIP_E1O_FIFO] = { "e1oip:e1o_fifo_level", "E1 originated FIFO level" }, + [LINE_STAT_E1oIP_E1T_FIFO] = { "e1oip:e1t_fifo_level", "E1 terminated FIFO level" }, +}; + +static const struct osmo_stat_item_group_desc iline_stats_desc = { + .group_name_prefix = "e1oip_line", + .group_description = "Stat items for E1oIP line", + .class_id = OSMO_STATS_CLASS_GLOBAL, + .num_items = ARRAY_SIZE(iline_stat_description), + .item_desc = iline_stat_description, +}; + + +/* E1 -> IP FIFO threshold reached: send one packet */ +static void fifo_threshold_cb(struct frame_fifo *fifo, unsigned int frames, void *priv) +{ + struct e1oip_line *iline = priv; + struct msgb *msg; + struct e1oip_tdm_hdr *eith; + unsigned int n_frames = fifo->threshold; + uint8_t buf[n_frames][BYTES_PER_FRAME]; + const uint8_t *ref_frame; + uint32_t ts_mask = 0; + unsigned int num_ts = 0; + unsigned int i; + uint8_t *cur; + int rc; + + msg = msgb_alloc_c(iline, 2048, "E1oIP UDP Tx"); + OSMO_ASSERT(msg); + eith = (struct e1oip_tdm_hdr *) msgb_put(msg, sizeof(*eith)); + + eith->frame_nr = htons(iline->e1o.next_seq); + + //printf("%s: n_frames=%u\n", __func__, n_frames); + + /* first pull all the frames to a local buffer */ + for (i = 0; i < n_frames; i++) { + rc = frame_fifo_out(&iline->e1o.fifo, buf[i]); + if (rc < 0) { + /* this situation cannot really happen: The FIFO called us that + * a certain threshold is reached, ubt now it cannot provide + * frames? */ + LOGPEER(iline->peer, LOGL_ERROR, + "frame_fifo_out failure for frame %u/%u\n", iline->e1o.next_seq + i, i); + } + } + iline_stat_set(iline, LINE_STAT_E1oIP_E1O_FIFO, frame_fifo_frames(&iline->e1o.fifo)); + + /* then compute the ts_mask */ + for (i = 0, ref_frame = iline->e1o.last_frame; i < n_frames; i++, ref_frame = buf[i-1]) { + /* FIXME: what to do about TS0? */ + for (unsigned int j = 1; j < BYTES_PER_FRAME; j++) { + if (buf[i][j] != ref_frame[j]) + ts_mask |= (1U << j); + } + } + eith->ts_mask = htonl(ts_mask); + + for (i = 0; i < BYTES_PER_FRAME; i++) { + if (ts_mask & (1U << i)) + num_ts++; + } + + /* finally, encode the payload */ + if (num_ts == 0) { + /* explicitly encode the number of frames, as the receiver can not determine it + * if we don't include any data */ + msgb_put_u8(msg, n_frames); + } else { + cur = msgb_put(msg, num_ts * n_frames); + for (i = 0; i < n_frames; i++) { + for (unsigned int j = 0; j < BYTES_PER_FRAME; j++) { + if (ts_mask & (1U << j)) + *cur++ = buf[i][j]; + } + } + } + + /* send the packet to the peer */ + octoi_tx(iline->peer, E1OIP_MSGT_TDM_DATA, 0, msgb_data(msg), msgb_length(msg)); + msgb_free(msg); + + /* update the local state */ + iline->e1o.next_seq += n_frames; + if (n_frames) + memcpy(iline->e1o.last_frame, buf[n_frames-1], BYTES_PER_FRAME); +} + +/* build a table indexed by offset inside the EoIP TDM frame resulting in TS number */ +static unsigned int ts_mask2idx(uint8_t *out, uint32_t ts_mask) +{ + unsigned int i; + uint8_t *cur = out; + + memset(out, 0xff, BYTES_PER_FRAME); + + for (i = 0; i < BYTES_PER_FRAME; i++) { + if (ts_mask & (1U << i)) + *cur++ = i; + } + + return (cur - out); +} + +/* An E1OIP_MSGT_TDM_DATA message was received from a remote IP peer */ +int e1oip_rcvmsg_tdm_data(struct e1oip_line *iline, struct msgb *msg) +{ + struct octoi_peer *peer = iline->peer; + const struct e1oip_tdm_hdr *e1th; + uint16_t frame_nr; + uint32_t ts_mask; + uint8_t idx2ts[BYTES_PER_FRAME]; + unsigned int n_frames; + uint8_t frame_buf[BYTES_PER_FRAME]; + unsigned int num_ts; + struct timespec ts; + + /* update the timestamp at which we last received data from this peer */ + clock_gettime(CLOCK_MONOTONIC, &ts); + peer->last_rx_tdm = ts.tv_sec; + + if (!peer->tdm_permitted) + return -EPERM; + + if (msgb_l2len(msg) < sizeof(*e1th)) + return -EINVAL; + + /* read header */ + e1th = (const struct e1oip_tdm_hdr *) msgb_l2(msg); + msg->l3h = msgb_l2(msg) + sizeof(*e1th); + frame_nr = ntohs(e1th->frame_nr); + ts_mask = ntohl(e1th->ts_mask); + + if (frame_nr != iline->e1t.next_seq) { + LOGPEER(peer, LOGL_NOTICE, "RxIP: frame_nr=%u, but expected %u: packet loss? " + "or re-ordering?\n", frame_nr, iline->e1t.next_seq); + /* FIXME: locally substitute frames? */ + } + + /* compute E1oIP idx to timeslot table */ + num_ts = ts_mask2idx(idx2ts, ts_mask); + if (num_ts > 0) { + n_frames = msgb_l3len(msg) / num_ts; + if (msgb_l3len(msg) % num_ts) { + LOGPEER(peer, LOGL_NOTICE, + "RxIP: %u extraneous bytes (len=%u, num_ts=%u, n_frames=%u)\n", + msgb_length(msg) % num_ts, msgb_length(msg), num_ts, n_frames); + } + LOGPEER(peer, LOGL_INFO, "RxIP: frame=%05u ts_mask=0x%08x num_ts=%02u, n_frames=%u\n", + frame_nr, ts_mask, num_ts, n_frames); + } else { + if (msgb_l3len(msg) < 1) { + LOGPEER(peer, LOGL_ERROR, "RxIP: num_ts==0 but no n_frames octet!\n"); + n_frames = BYTES_PER_FRAME; /* hackish assumption */ + } else + n_frames = msg->l3h[0]; + } + + memcpy(frame_buf, iline->e1t.last_frame, BYTES_PER_FRAME); + for (unsigned int i = 0; i < n_frames; i++) { + for (unsigned int j = 0; j < num_ts; j++) { + uint8_t ts_nr = idx2ts[j]; + frame_buf[ts_nr] = e1th->data[i*num_ts + j]; + } + /* FIXME: what to do about TS0? */ + frame_fifo_in(&iline->e1t.fifo, frame_buf); + } + /* update local state */ + memcpy(iline->e1t.last_frame, frame_buf, BYTES_PER_FRAME); + iline->e1t.next_seq = frame_nr + n_frames; + + iline_stat_set(iline, LINE_STAT_E1oIP_E1T_FIFO, frame_fifo_frames(&iline->e1t.fifo)); + + return 0; +} + +/* TODO: more meaningful identifiers? */ +static int g_ctr_idx = 0; + +struct e1oip_line *e1oip_line_alloc(struct octoi_peer *peer) +{ + struct e1oip_line *iline; + int ctr_idx = g_ctr_idx++; + + if (peer->iline) + return NULL; + + iline = talloc_zero(peer, struct e1oip_line); + if (!iline) + return NULL; + + 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); + + iline->cfg.batching_factor = 32; + iline->cfg.prefill_frame_count = 400; /* 50ms */ + + frame_fifo_init(&iline->e1o.fifo, iline->cfg.batching_factor, fifo_threshold_cb, iline); + memset(&iline->e1o.last_frame, 0xff, sizeof(iline->e1o.last_frame)); + + frame_fifo_init(&iline->e1t.fifo, 0, NULL, iline); + memset(&iline->e1t.last_frame, 0xff, sizeof(iline->e1o.last_frame)); + + iline->peer = peer; + peer->iline = iline; + + return iline; +} + +void e1oip_line_destroy(struct e1oip_line *iline) +{ + if (!iline) + return; + + rate_ctr_group_free(iline->ctrs); + osmo_stat_item_group_free(iline->stats); + if (iline->peer) + iline->peer->iline = NULL; + iline->peer = NULL; + talloc_free(iline); +} diff --git a/src/octoi/e1oip.h b/src/octoi/e1oip.h new file mode 100644 index 0000000..e08e3ca --- /dev/null +++ b/src/octoi/e1oip.h @@ -0,0 +1,61 @@ +#pragma once + +#include <osmocom/core/msgb.h> +#include <osmocom/core/rate_ctr.h> +#include <osmocom/core/stat_item.h> + +#include <osmocom/octoi/e1oip_proto.h> + +#include "frame_fifo.h" + +#define iline_ctr_add(iline, idx, add) rate_ctr_add(rate_ctr_group_get_ctr((iline)->ctrs, idx), add) +#define iline_stat_set(iline, idx, add) \ + osmo_stat_item_set(osmo_stat_item_group_get_item((iline)->stats, idx), add) + +enum e1oip_line_ctr { + LINE_CTR_E1oIP_UNDERRUN, + LINE_CTR_E1oIP_OVERFLOW, +}; + +enum e1oip_line_stat { + LINE_STAT_E1oIP_RTT, + LINE_STAT_E1oIP_E1O_FIFO, + LINE_STAT_E1oIP_E1T_FIFO, +}; + +struct octoi_peer; + +struct e1oip_line { + /* back-pointer */ + struct octoi_peer *peer; + + struct rate_ctr_group *ctrs; + struct osmo_stat_item_group *stats; + + /* configuration data */ + struct { + uint8_t batching_factor; + uint32_t prefill_frame_count; + } cfg; + + /* E1 originated side (E1->IP) */ + struct { + struct frame_fifo fifo; + uint8_t last_frame[BYTES_PER_FRAME]; /* last frame on the E1 side */ + uint16_t next_seq; + } e1o; + + /* E1 terminated side (E1<-IP) */ + struct { + struct frame_fifo fifo; + uint8_t last_frame[BYTES_PER_FRAME]; /* last frame on the E1 side */ + uint16_t next_seq; /* next expected sequence nr */ + } e1t; + + /* TODO: statistics (RTT, frame loss, std deviation, alarms */ +}; + +struct e1oip_line *e1oip_line_alloc(struct octoi_peer *peer); +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/frame_fifo.c b/src/octoi/frame_fifo.c new file mode 100644 index 0000000..6ba6beb --- /dev/null +++ b/src/octoi/frame_fifo.c @@ -0,0 +1,146 @@ +/* + * frame_fifo.c + * + * (C) 2022 by Harald Welte <laforge(a)osmocom.org> + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <errno.h> +#include <unistd.h> +#include <stdint.h> +#include <string.h> +#include <sys/types.h> +#include <sys/socket.h> + +#include <osmocom/core/utils.h> + +#include "frame_fifo.h" + + +/*********************************************************************** + * Frame FIFO + ***********************************************************************/ + +void fifo_dump(struct frame_fifo *fifo) +{ + printf("buf=%p, size=%zu, next_in=%lu, next_out=%lu\n", fifo->buf, sizeof(fifo->buf), + fifo->next_in - fifo->buf, fifo->next_out - fifo->buf); +} + +/*! Initialize a frame FIFO. + * \param fifo Caller-allocated memory for FIFO data structure + * \param threshold After how many available frames shall we call threshold_cb + * \param threshold_cb Optional call-back to call whenever FIFO contains more than 'threshold' frames + * \param priv Opaque pointer passed to threshold_cb */ +void frame_fifo_init(struct frame_fifo *fifo, unsigned int threshold, + void (*threshold_cb)(struct frame_fifo *fifo, unsigned int frames, void *priv), + void *priv) +{ + memset(fifo->buf, 0xff, sizeof(fifo->buf)); + fifo->next_in = fifo->buf; + fifo->next_out = fifo->buf; + fifo->threshold = threshold; + fifo->threshold_cb = threshold_cb; + fifo->priv = priv; +} + +#define FIFO_BUF_END(f) ((f)->buf + sizeof((f)->buf)) + +/*! put one received frames into the FIFO. + * \param fifo The FIFO to which we want to put (append) multiple frames + * \param frame Pointer to memory containing the frame data + * \param count Number of frames to put into FIFO. + * \returns 0 on success; -1 on error (overflow */ +int frame_fifo_in(struct frame_fifo *fifo, const uint8_t *frame) +{ + OSMO_ASSERT(fifo->next_in + BYTES_PER_FRAME <= FIFO_BUF_END(fifo)); + + memcpy(fifo->next_in, frame, BYTES_PER_FRAME); + + fifo->next_in += BYTES_PER_FRAME; + if (fifo->next_in >= FIFO_BUF_END(fifo)) + fifo->next_in -= sizeof(fifo->buf); + + /* FIXME: detect overflow */ + + if (fifo->threshold_cb) { + unsigned int frames_avail = frame_fifo_frames(fifo); + if (frames_avail >= fifo->threshold) + fifo->threshold_cb(fifo, frames_avail, fifo->priv); + } + + return 0; +} + +/*! put (append) multiple received frames into the FIFO. + * \param fifo The FIFO to which we want to put (append) multiple frames + * \param frame Pointer to memory containing the frame data + * \param count Number of frames to put into FIFO. + * \returns Number of frames actually put to FIFO; can be less than 'count' */ +int frame_fifo_in_multi(struct frame_fifo *fifo, const uint8_t *frame, size_t count) +{ + const uint8_t *cur = frame; + unsigned int i; + int rc; + + for (i = 0; i < count; i++) { + rc = frame_fifo_in(fifo, cur); + /* abort on the first failing frame, there's no point in trying further */ + if (rc < 0) + return (int) i; + cur += BYTES_PER_FRAME; + } + return (int) i; +} + +/*! pull one frames out of the FIFO. + * \param fifo The FIFO from which we want to pull frames + * \param out Caller-allocated output buffer + * \returns 0 on success; -1 on error (no frame available) */ +int frame_fifo_out(struct frame_fifo *fifo, uint8_t *out) +{ + if (frame_fifo_frames(fifo) < 1) + return -1; + memcpy(out, fifo->next_out, BYTES_PER_FRAME); + fifo->next_out += BYTES_PER_FRAME; + + if (fifo->next_out >= FIFO_BUF_END(fifo)) + fifo->next_out -= sizeof(fifo->buf); + + return 0; +} + +/*! pull multiple frames out of the FIFO. + * \param fifo The FIFO from which we want ot pull frames + * \param out Caller-allocated output buffer + * \param count Number of frames to pull + * \returns number of frames pulled; can be 0 or less than count */ +int frame_fifo_out_multi(struct frame_fifo *fifo, uint8_t *out, size_t count) +{ + uint8_t *cur = out; + unsigned int i; + int rc = 0; + + for (i = 0; i < count; i++) { + rc = frame_fifo_out(fifo, cur); + /* if there's no data in the FIFO, return number of frames + * pulled so far, could be 0. */ + if (rc < 0) + return (int) i; + cur += BYTES_PER_FRAME; + } + return (int) i; +} diff --git a/src/octoi/frame_fifo.h b/src/octoi/frame_fifo.h new file mode 100644 index 0000000..64aa06a --- /dev/null +++ b/src/octoi/frame_fifo.h @@ -0,0 +1,42 @@ +#pragma once + +#define BYTES_PER_FRAME 32 +#define FRAMES_PER_FIFO 800 + +struct frame_fifo { + uint8_t *next_in; /* where to write next input into FIFO */ + uint8_t *next_out; /* where to read next output from FIFO */ + uint8_t threshold; /* number of frames that should trigger */ + void (*threshold_cb)(struct frame_fifo *fifo, unsigned int frames, void *priv); + void *priv; + + uint8_t buf[BYTES_PER_FRAME * FRAMES_PER_FIFO]; +}; + +void frame_fifo_init(struct frame_fifo *fifo, unsigned int threshold, + void (*threshold_cb)(struct frame_fifo *fifo, unsigned int frames, void *priv), + void *priv); + +/* number of frames currently available in FIFO */ +static inline unsigned int frame_fifo_frames(struct frame_fifo *fifo) +{ + return ((fifo->next_in + sizeof(fifo->buf) - fifo->next_out) % sizeof(fifo->buf)) / BYTES_PER_FRAME; +} + +/* for how many frames do we have space in the FIFO? */ +static inline unsigned int frame_fifo_space(struct frame_fifo *fifo) +{ + return FRAMES_PER_FIFO - frame_fifo_frames(fifo); +} + +/* put a received frame into the FIFO */ +int frame_fifo_in(struct frame_fifo *fifo, const uint8_t *frame); + +/* put multiple received frames into the FIFO */ +int frame_fifo_in_multi(struct frame_fifo *fifo, const uint8_t *frame, size_t count); + +/* pull one frame out of the FIFO */ +int frame_fifo_out(struct frame_fifo *fifo, uint8_t *out); + +/* pull multiple frames out of the FIFO */ +int frame_fifo_out_multi(struct frame_fifo *fifo, uint8_t *out, size_t count); diff --git a/src/octoi/libosmo-octoi.map b/src/octoi/libosmo-octoi.map new file mode 100644 index 0000000..01b5167 --- /dev/null +++ b/src/octoi/libosmo-octoi.map @@ -0,0 +1,12 @@ +{ +global: +g_octoi; +octoi_vty_go_parent; +octoi_init; +octoi_client_get_peer; +octoi_clnt_start_for_peer; +octoi_peer_e1o_in; +octoi_peer_e1t_out; + +local: *; +}; diff --git a/src/octoi/octoi.c b/src/octoi/octoi.c new file mode 100644 index 0000000..a2c4ca6 --- /dev/null +++ b/src/octoi/octoi.c @@ -0,0 +1,131 @@ +/* + * octoi.c + * + * (C) 2022 by Harald Welte <laforge(a)osmocom.org> + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <osmocom/core/fsm.h> +#include <osmocom/octoi/octoi.h> + +#include "e1oip.h" +#include "octoi.h" +#include "octoi_sock.h" +#include "frame_fifo.h" + +struct octoi_daemon *g_octoi; + +static struct octoi_client *client4account(struct octoi_account *acc) +{ + struct octoi_client *clnt; + + llist_for_each_entry(clnt, &g_octoi->clients, list) { + if (clnt->cfg.account == acc) + return clnt; + } + + return NULL; +} + +int octoi_vty_go_parent(struct vty *vty) +{ + struct octoi_account *acc; + + switch (vty->node) { + case OCTOI_ACCOUNT_NODE: + vty->node = OCTOI_SRV_NODE; + vty->index = g_octoi->server; + break; + case OCTOI_CLNT_ACCOUNT_NODE: + acc = vty->index; + vty->node = OCTOI_CLNT_NODE; + vty->index = client4account(acc); + break; + default: + vty->node = CONFIG_NODE; + vty->index = NULL; + break; + } + return 0; +} + +void octoi_init(void *ctx, void *priv, const struct octoi_ops *ops) +{ + OSMO_ASSERT(!g_octoi); + + osmo_fsm_register(&octoi_server_fsm); + osmo_fsm_register(&octoi_client_fsm); + + g_octoi = talloc_zero(ctx, struct octoi_daemon); + OSMO_ASSERT(g_octoi); + + g_octoi->priv = priv; + g_octoi->ops = ops; + INIT_LLIST_HEAD(&g_octoi->clients); + + octoi_server_vty_init(); + octoi_client_vty_init(); +} + +/* resolve the octoi_peer for a specified octoi_client */ +struct octoi_peer *octoi_client_get_peer(struct octoi_client *clnt) +{ + return octoi_sock_client_get_peer(clnt->sock); +} + + +/*! E1 interface has received some E1 frames, forward in E1->IP direction. + * \param[in] peer The peer for which E1 frames were received + * \param[in] buf Buffer holding the just-received E1 frames + * \param[in] ftr Number of 32-byte frames in buf */ +void octoi_peer_e1o_in(struct octoi_peer *peer, const uint8_t *buf, int ftr) +{ + struct e1oip_line *iline = peer->iline; + int rc; + + if (!peer->tdm_permitted) + return; + + rc = frame_fifo_in_multi(&iline->e1o.fifo, buf, ftr); + if (rc < ftr) + iline_ctr_add(iline, LINE_CTR_E1oIP_OVERFLOW, ftr - rc); + + iline_stat_set(iline, LINE_STAT_E1oIP_E1O_FIFO, frame_fifo_frames(&iline->e1o.fifo)); +} + +/*! E1 interface needs to transmit some E1 frames, E1<-IP direction. + * \param[in] peer The peer from which E1 frames are needed + * \param[in] buf Caller-provided output buffer to which frames are written. + * \param[in] fts Number of 32-byte frames to be written to buf. */ +void octoi_peer_e1t_out(struct octoi_peer *peer, uint8_t *buf, int fts) +{ + struct e1oip_line *iline = peer->iline; + int rc; + + if (!peer->tdm_permitted) + return; + + for (int i = 0; i < fts; i++) { + uint8_t *cur = buf + BYTES_PER_FRAME*i; + rc = frame_fifo_out(&iline->e1t.fifo, cur); + if (rc < 0) { + iline_ctr_add(iline, LINE_CTR_E1oIP_UNDERRUN, 1); + /* substitute with last received frame */ + memcpy(cur, iline->e1t.last_frame, BYTES_PER_FRAME); + } + } + iline_stat_set(iline, LINE_STAT_E1oIP_E1T_FIFO, frame_fifo_frames(&iline->e1t.fifo)); +} diff --git a/src/octoi/octoi.h b/src/octoi/octoi.h new file mode 100644 index 0000000..589c208 --- /dev/null +++ b/src/octoi/octoi.h @@ -0,0 +1,26 @@ +#pragma once + +/*********************************************************************** + * OCTOI related data structures + ***********************************************************************/ + +#include <osmocom/vty/command.h> + +#include <osmocom/octoi/octoi.h> + +/* FIXME: migrate to libosmocore/vty/command.h */ +enum octoi_vty_node { + OCTOI_SRV_NODE = RESERVED1_NODE, + OCTOI_ACCOUNT_NODE, + OCTOI_CLNT_NODE, + OCTOI_CLNT_ACCOUNT_NODE, +}; + + +extern struct osmo_fsm octoi_server_fsm; +extern struct osmo_fsm octoi_client_fsm; + +void octoi_server_vty_init(void); +void octoi_client_vty_init(void); + +struct octoi_account *octoi_account_find(struct octoi_server *srv, const char *user_id); diff --git a/src/octoi/octoi_clnt_fsm.c b/src/octoi/octoi_clnt_fsm.c new file mode 100644 index 0000000..1c38bc8 --- /dev/null +++ b/src/octoi/octoi_clnt_fsm.c @@ -0,0 +1,320 @@ +/* + * octoi_clnt_fsm.c - OCTOI Client-side Finite State Machine + * + * (C) 2022 by Harald Welte <laforge(a)osmocom.org> + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <osmocom/core/fsm.h> +#include <osmocom/core/msgb.h> + +#include <osmocom/octoi/octoi.h> +#include <osmocom/octoi/e1oip_proto.h> + +#include "octoi_sock.h" +#include "octoi_fsm.h" +#include "e1oip.h" + +enum octoi_client_fsm_state { + CLNT_ST_INIT, + CLNT_ST_SVC_REQ_SENT, + CLNT_ST_ACCEPTED, + CLNT_ST_REJECTED, + CLNT_ST_REDIRECTED, +}; + +struct clnt_state { + struct octoi_peer *peer; + + /* fields filled in locally */ + uint32_t service; + uint32_t capability_flags; + struct osmo_timer_list rx_alive_timer; + struct octoi_account *acc; + + /* fields below are all filled in once received from the remote server side */ + struct { + char *server_id; + char *software_id; + char *software_version; + uint32_t capability_flags; + } remote; +}; + +static void clnt_st_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct clnt_state *st = fi->priv; + + switch (event) { + case OCTOI_CLNT_EV_REQUEST_SERVICE: + octoi_tx_service_req(st->peer, st->service, st->acc->user_id, + PACKAGE_NAME, PACKAGE_VERSION, st->capability_flags); + osmo_fsm_inst_state_chg(fi, CLNT_ST_SVC_REQ_SENT, 10, 0); + break; + default: + OSMO_ASSERT(0); + } +} + +static void clnt_st_svc_req_sent(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct clnt_state *st = fi->priv; + struct msgb *msg = NULL; + //struct e1oip_auth_req *auth_req = NULL; + struct e1oip_service_ack *svc_ack = NULL; + struct e1oip_service_rej *svc_rej = NULL; + //struct e1oip_redir_cmd *redir_cmd = NULL; + + switch (event) { + case OCTOI_CLNT_EV_RX_AUTH_REQ: + msg = data; + //auth_req = msgb_l2(msg); + /* TODO: implement authentication */ + break; + case OCTOI_CLNT_EV_RX_SVC_ACK: + msg = data; + svc_ack = msgb_l2(msg); + osmo_talloc_replace_string(st->peer, &st->remote.server_id, svc_ack->server_id); + osmo_talloc_replace_string(st->peer, &st->remote.software_id, svc_ack->software_id); + osmo_talloc_replace_string(st->peer, &st->remote.software_version, svc_ack->software_version); + LOGPFSML(fi, LOGL_NOTICE, "Rx SERVICE_ACK (service=%u, server_id='%s', software_id='%s', " + "software_version='%s'\n", ntohl(svc_ack->assigned_service), + st->remote.server_id, st->remote.software_id, st->remote.software_version); + osmo_fsm_inst_state_chg(fi, CLNT_ST_ACCEPTED, 0, 0); + break; + case OCTOI_CLNT_EV_RX_SVC_REJ: + msg = data; + svc_rej = msgb_l2(msg); + LOGPFSML(fi, LOGL_NOTICE, "Rx SERVICE_REJ (service=%u, message='%s')\n", + ntohl(svc_rej->rejected_service), svc_rej->reject_message); + osmo_fsm_inst_state_chg(fi, CLNT_ST_REJECTED, 0, 0); + break; + case OCTOI_CLNT_EV_RX_REDIR_CMD: + msg = data; + //redir_cmd = msgb_l2(msg); + LOGPFSML(fi, LOGL_NOTICE, "Rx REDIR_CMD, but not yet supported\n"); + osmo_fsm_inst_state_chg(fi, CLNT_ST_REDIRECTED, 0, 0); + break; + } +} + +static void clnt_st_accepted_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct clnt_state *st = fi->priv; + + st->peer->tdm_permitted = true; + osmo_timer_schedule(&st->rx_alive_timer, 3, 0); +} + +static void clnt_st_accepted(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct clnt_state *st = fi->priv; + + switch (event) { + case OCTOI_CLNT_EV_RX_AUTH_REQ: + /* TODO: implement authentication */ + LOGPFSML(fi, LOGL_NOTICE, "Rx AUTH_REQ, but no authentication supported yet!\n"); + break; + case OCTOI_EV_RX_TDM_DATA: + e1oip_rcvmsg_tdm_data(st->peer->iline, data); + break; + } +} + +static void clnt_st_accepted_onleave(struct osmo_fsm_inst *fi, uint32_t next_state) +{ + struct clnt_state *st = fi->priv; + + osmo_timer_del(&st->rx_alive_timer); + st->peer->tdm_permitted = false; +} + +static void clnt_st_rejected_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + LOGPFSML(fi, LOGL_ERROR, "Server has rejected service, will not retry until program restart\n"); +} + +static void clnt_st_redirected(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + //struct clnt_state *st = fi->priv; +} + + +static const struct osmo_fsm_state client_fsm_states[] = { + [CLNT_ST_INIT] = { + .name = "INIT", + .in_event_mask = S(OCTOI_CLNT_EV_REQUEST_SERVICE), + .out_state_mask = S(CLNT_ST_SVC_REQ_SENT), + .action = clnt_st_init, + }, + [CLNT_ST_SVC_REQ_SENT] = { + .name = "SVC_REQ_SENT", + .in_event_mask = S(OCTOI_CLNT_EV_RX_AUTH_REQ) | + S(OCTOI_CLNT_EV_RX_SVC_ACK) | + S(OCTOI_CLNT_EV_RX_SVC_REJ) | + S(OCTOI_CLNT_EV_RX_REDIR_CMD), + .out_state_mask = S(CLNT_ST_SVC_REQ_SENT) | + S(CLNT_ST_ACCEPTED) | + S(CLNT_ST_REJECTED) | + S(CLNT_ST_REDIRECTED), + .action = clnt_st_svc_req_sent, + }, + [CLNT_ST_ACCEPTED] = { + .name = "ACCEPTED", + .in_event_mask = S(OCTOI_CLNT_EV_RX_AUTH_REQ) | + S(OCTOI_EV_RX_TDM_DATA), + .out_state_mask = S(CLNT_ST_INIT), + .action = clnt_st_accepted, + .onenter = clnt_st_accepted_onenter, + .onleave = clnt_st_accepted_onleave, + }, + [CLNT_ST_REJECTED] = { + .name = "REJECTED", + .in_event_mask = 0, + .out_state_mask = 0, + .onenter = clnt_st_rejected_onenter, + }, + [CLNT_ST_REDIRECTED] = { + .name = "REDIRECTED", + .in_event_mask = 0, + .out_state_mask = S(CLNT_ST_SVC_REQ_SENT), + .action = clnt_st_redirected, + }, +}; + +static void clnt_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct clnt_state *st = fi->priv; + struct msgb *msg = data; + struct e1oip_echo *echo_req; + struct e1oip_error_ind *err_ind; + + switch (event) { + case OCTOI_EV_RX_ECHO_REQ: + echo_req = msgb_l2(msg); + octoi_tx_echo_resp(st->peer, ntohs(echo_req->seq_nr), echo_req->data, msgb_l2len(msg)); + break; + case OCTOI_EV_RX_ECHO_RESP: + /* FIXME: update state, peer has responded! */ + break; + case OCTOI_EV_RX_ERROR_IND: + err_ind = msgb_l2(msg); + LOGPFSML(fi, LOGL_ERROR, "Rx OCTOI ERROR IND (cause=0x%08x, msg=%s)\n", + ntohl(err_ind->cause), err_ind->error_message); + break; + default: + OSMO_ASSERT(0); + } +} + +static int clnt_fsm_timer_cb(struct osmo_fsm_inst *fi) +{ + struct clnt_state *st = fi->priv; + + switch (fi->state) { + case CLNT_ST_SVC_REQ_SENT: + /* retransmit timer */ + LOGPFSML(fi, LOGL_INFO, "Re-transmitting SERVICE_REQ\n"); + octoi_tx_service_req(st->peer, st->service, st->acc->user_id, + PACKAGE_NAME, PACKAGE_VERSION, st->capability_flags); + osmo_fsm_inst_state_chg(fi, CLNT_ST_SVC_REQ_SENT, 10, 0); + break; + } + return 0; +} + +struct osmo_fsm octoi_client_fsm = { + .name = "OCTOI_CLIENT", + .states = client_fsm_states, + .num_states = ARRAY_SIZE(client_fsm_states), + .allstate_event_mask = S(OCTOI_EV_RX_ECHO_REQ) | + S(OCTOI_EV_RX_ECHO_RESP) | + S(OCTOI_EV_RX_ERROR_IND), + .allstate_action = clnt_allstate_action, + .timer_cb = clnt_fsm_timer_cb, + .log_subsys = DLINP, + .event_names = octoi_fsm_event_names, +}; + +static void clnt_rx_alive_timer_cb(void *data) +{ + struct osmo_fsm_inst *fi = data; + struct clnt_state *st = fi->priv; + struct timespec ts; + + clock_gettime(CLOCK_MONOTONIC, &ts); + + if (ts.tv_sec - st->peer->last_rx_tdm > 3) { + LOGPFSML(fi, LOGL_NOTICE, "No TDM data received for >= 3 seconds, declaring peer dead\n"); + osmo_fsm_inst_state_chg(fi, CLNT_ST_INIT, 0, 0); + osmo_fsm_inst_dispatch(fi, OCTOI_CLNT_EV_REQUEST_SERVICE, NULL); + } else + osmo_timer_schedule(&st->rx_alive_timer, 3, 0); +} + + +/* call-back function for every received OCTOI socket message for given peer */ +int octoi_clnt_fsm_rx_cb(struct octoi_peer *peer, struct msgb *msg) +{ + /* ensure peer->priv points to a fsm_inst */ + if (!peer->priv) { + struct osmo_fsm_inst *fi; + struct clnt_state *st; + + fi = osmo_fsm_inst_alloc(&octoi_client_fsm, peer, NULL, LOGL_DEBUG, NULL); + OSMO_ASSERT(fi); + + st = talloc_zero(fi, struct clnt_state); + OSMO_ASSERT(st); + st->peer = peer; + fi->priv = st; + + peer->priv = fi; + } + OSMO_ASSERT(peer->priv); + + return _octoi_fsm_rx_cb(peer, msg); +} + +/* start the OCTO client FSM for a specified peer */ +void octoi_clnt_start_for_peer(struct octoi_peer *peer, struct octoi_account *acc) +{ + OSMO_ASSERT(!peer->sock->cfg.server_mode) + + /* ensure peer->priv points to a fsm_inst */ + if (!peer->priv) { + struct osmo_fsm_inst *fi; + struct clnt_state *st; + + fi = osmo_fsm_inst_alloc(&octoi_client_fsm, peer, NULL, LOGL_DEBUG, acc->user_id); + OSMO_ASSERT(fi); + + st = talloc_zero(fi, struct clnt_state); + OSMO_ASSERT(st); + st->peer = peer; + st->acc = acc; + st->service = E1OIP_SERVICE_E1_FRAMED; + st->capability_flags = 0; + osmo_timer_setup(&st->rx_alive_timer, clnt_rx_alive_timer_cb, fi); + fi->priv = st; + + peer->priv = fi; + } + if (!peer->iline) + peer->iline = e1oip_line_alloc(peer); + + osmo_fsm_inst_dispatch(peer->priv, OCTOI_CLNT_EV_REQUEST_SERVICE, NULL); +} diff --git a/src/octoi/octoi_clnt_vty.c b/src/octoi/octoi_clnt_vty.c new file mode 100644 index 0000000..1f8f7d1 --- /dev/null +++ b/src/octoi/octoi_clnt_vty.c @@ -0,0 +1,219 @@ +/* + * octoi_clnt_vty.c - VTY code for OCTOI client role + * + * (C) 2022 by Harald Welte <laforge(a)osmocom.org> + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <errno.h> +#include <stdio.h> +#include <string.h> + +#include <talloc.h> + +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/sockaddr_str.h> + +#include <osmocom/vty/telnet_interface.h> +#include <osmocom/vty/command.h> +#include <osmocom/vty/logging.h> +#include <osmocom/vty/stats.h> +#include <osmocom/vty/misc.h> + +#include "octoi.h" +#include "octoi_sock.h" +#include "octoi_fsm.h" +#include "octoi_vty.h" + +/*********************************************************************** + * core data structures + ***********************************************************************/ + +static struct octoi_client *octoi_client_alloc(void *ctx, const char *ip, uint16_t port) +{ + struct octoi_client *clnt = talloc_zero(ctx, struct octoi_client); + int rc; + + if (!clnt) + return NULL; + + rc = osmo_sockaddr_str_from_str(&clnt->cfg.remote, ip, port); + if (rc < 0) { + talloc_free(clnt); + return NULL; + } + + return clnt; +} + +/* find a client for given remote IP + port */ +struct octoi_client *octoi_client_find(const char *ip, uint16_t port) +{ + struct octoi_client *clnt; + + llist_for_each_entry(clnt, &g_octoi->clients, list) { + if (!strcmp(ip, clnt->cfg.remote.ip) && clnt->cfg.remote.port == port) + return clnt; + } + return NULL; +} + +/*********************************************************************** + * VTY + ***********************************************************************/ + +static struct cmd_node clnt_node = { + (enum node_type) OCTOI_CLNT_NODE, + "%s(config-octoi-client)# ", + 1, +}; + +static struct cmd_node clnt_account_node = { + (enum node_type) OCTOI_CLNT_ACCOUNT_NODE, + "%s(config-octoi-client-account)# ", + 1, +}; + +DEFUN(cfg_client, cfg_client_cmd, + "octoi-client (A.B.C.D|X:X::X:X) <0-65535>", + "Configure an OCTOI client\n" + "Remote IPv4 address of OCTOI server\n" + "Remote IPv6 address of OCTOI server\n" + "Remote UDP port number of OCTOI server\n") +{ + const char *ip = argv[0]; + int port = atoi(argv[1]); + struct octoi_client *clnt = octoi_client_find(ip, port); + + if (!clnt) { + clnt = octoi_client_alloc(g_octoi, ip, port); + OSMO_ASSERT(clnt); + llist_add_tail(&clnt->list, &g_octoi->clients); + } + + vty->node = OCTOI_CLNT_NODE; + vty->index = clnt; + + return CMD_SUCCESS; +} + +#if 0 +DEFUN(cfg_no_client, cfg_no_client_cmd, + "no octoi-client (A.B.C.D|X:X::X:X) <0-65535>", + NO_STR "Remove an OCTOI client\n") + "Remote IPv4 address of OCTOI server\n" + "Remote IPv6 address of OCTOI server\n" + "Remote UDP port number of OCTOI server\n") +{ +} +#endif + + +DEFUN(cfg_clnt_local, cfg_clnt_local_cmd, + "local-bind (A.B.C.D|X:X::X:X) <0-65535>", + "Local OCTOI socket bind address/port\n" + "Local OCTOI IPv4 Address\n" + "Local OCTOI IPv6 Address\n" + "Local OCTOI UDP Port Number\n") +{ + struct octoi_client *clnt = vty->index; + int rc; + + rc = osmo_sockaddr_str_from_str(&clnt->cfg.local, argv[0], atoi(argv[1])); + if (rc < 0) { + vty_out(vty, "%% sockaddr Error: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + + if (clnt->sock) + octoi_sock_destroy(clnt->sock); + + clnt->sock = octoi_sock_create_client(clnt, clnt, &clnt->cfg.local, &clnt->cfg.remote); + if (!clnt->sock) { + vty_out(vty, "%% failed to create/bind socket: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + clnt->sock->rx_cb = octoi_clnt_fsm_rx_cb; + + return CMD_SUCCESS; +} + +DEFUN(cfg_clnt_account, cfg_clnt_account_cmd, + "account USER_ID", + "Configure a local user account\n") +{ + struct octoi_client *clnt = vty->index; + const char *user_id = argv[0]; + struct octoi_account *ac = clnt->cfg.account; + + if (!ac) { + ac = octoi_client_account_create(clnt, user_id); + OSMO_ASSERT(ac); + } else + osmo_talloc_replace_string(ac, &ac->user_id, user_id); + + vty->node = OCTOI_CLNT_ACCOUNT_NODE; + vty->index = ac; + + return CMD_SUCCESS; +} + +DEFUN(show_clnt, show_clnt_cmd, + "show octoi-clients", + SHOW_STR "Display information about the OCTOI Clients\n") +{ + struct octoi_client *clnt; + + llist_for_each_entry(clnt, &g_octoi->clients, list) { + struct octoi_sock *sock = clnt->sock; + + vty_show_octoi_sock(vty, sock); + } + + return CMD_SUCCESS; +} + +static int config_write_octoi_clnt(struct vty *vty) +{ + struct octoi_client *clnt; + + llist_for_each_entry(clnt, &g_octoi->clients, list) { + vty_out(vty, "octoi-client %s %u%s", clnt->cfg.remote.ip, clnt->cfg.remote.port, + VTY_NEWLINE); + if (strlen(clnt->cfg.local.ip)) { + vty_out(vty, " local-bind %s %u%s", clnt->cfg.local.ip, clnt->cfg.local.port, + VTY_NEWLINE); + } + octoi_vty_write_one_account(vty, clnt->cfg.account); + } + + return 0; +} + +void octoi_client_vty_init(void) +{ + install_element_ve(&show_clnt_cmd); + + install_node(&clnt_account_node, NULL); + install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_ice1_serno_cmd); + install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_ice1_line_cmd); + install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_mode_cmd); + + install_node(&clnt_node, config_write_octoi_clnt); + install_element(CONFIG_NODE, &cfg_client_cmd); + install_element(OCTOI_CLNT_NODE, &cfg_clnt_local_cmd); + install_element(OCTOI_CLNT_NODE, &cfg_clnt_account_cmd); +} diff --git a/src/octoi/octoi_fsm.c b/src/octoi/octoi_fsm.c new file mode 100644 index 0000000..3431587 --- /dev/null +++ b/src/octoi/octoi_fsm.c @@ -0,0 +1,226 @@ +/* + * octoi_fsm.c - OCTOI Protocol / Finite State Machine interface + * + * (C) 2022 by Harald Welte <laforge(a)osmocom.org> + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <osmocom/core/utils.h> +#include <osmocom/core/fsm.h> +#include <osmocom/core/msgb.h> + +#include <osmocom/octoi/e1oip_proto.h> + +#include "octoi_sock.h" +#include "octoi_fsm.h" + + +const struct value_string octoi_fsm_event_names[] = { + { OCTOI_EV_RX_TDM_DATA, "RX_TDM_DATA" }, + { OCTOI_EV_RX_ECHO_REQ, "RX_ECHO_REQ" }, + { OCTOI_EV_RX_ECHO_RESP, "RX_ECHO_RESP" }, + { OCTOI_EV_RX_ERROR_IND, "RX_ERROR_IND" }, + + { OCTOI_SRV_EV_RX_SERVICE_REQ, "RX_SERVICE_REQ" }, + { OCTOI_SRV_EV_RX_AUTH_VEC, "RX_AUTH_VEC" }, + { OCTOI_SRV_EV_RX_AUTH_RESP, "RX_AUTH_RESP" }, + + { OCTOI_CLNT_EV_REQUEST_SERVICE,"REQUEST_SERVICE" }, + { OCTOI_CLNT_EV_RX_AUTH_REQ, "RX_AUTH_REQ" }, + { OCTOI_CLNT_EV_RX_SVC_ACK, "RX_SERVICE_ACK" }, + { OCTOI_CLNT_EV_RX_SVC_REJ, "RX_SERVICE_REJ" }, + { OCTOI_CLNT_EV_RX_REDIR_CMD, "RX_REDIR_CMD" }, + { 0, NULL } +}; + +/* ensure given fixed-length string is zero-terminated */ +#define ENSURE_ZERO_TERM(x) ensure_zero_term(x, sizeof(x)) +static void ensure_zero_term(char *buf, size_t len) +{ + for (unsigned int i = 0; i < len; i++) { + if (buf[i] == '\0') + return; + } + buf[len-1] = '\0'; +} + +/* verify if the given OCTOI message is consistent */ +static bool octoi_msg_validate(struct osmo_fsm_inst *fi, struct msgb *msg) +{ + struct e1oip_msg *eip = msgb_l1(msg); + + /* ensure that the minimum length is >= header length, and that the version matches */ + if (msgb_l1len(msg) < sizeof(eip->hdr)) { + LOGPFSML(fi, LOGL_INFO, "Rx short message (%u < %zu)\n", msgb_l1len(msg), sizeof(eip->hdr)); + return false; + } + if (eip->hdr.version != E1OIP_VERSION) { + LOGPFSML(fi, LOGL_INFO, "Rx unsupported version (%u != %u)\n", eip->hdr.version, + E1OIP_VERSION); + return false; + } + + switch (eip->hdr.msg_type) { + case E1OIP_MSGT_ECHO_REQ: + if (msgb_l2len(msg) < sizeof(eip->u.echo)) + goto err_msg_len; + break; + case E1OIP_MSGT_ECHO_RESP: + if (msgb_l2len(msg) < sizeof(eip->u.echo)) + goto err_msg_len; + break; + case E1OIP_MSGT_TDM_DATA: + if (msgb_l2len(msg) < sizeof(eip->u.tdm_hdr)) + goto err_msg_len; + break; + case E1OIP_MSGT_SERVICE_REQ: + if (msgb_l2len(msg) < sizeof(eip->u.service_req)) + goto err_msg_len; + ENSURE_ZERO_TERM(eip->u.service_req.subscriber_id); + ENSURE_ZERO_TERM(eip->u.service_req.software_id); + ENSURE_ZERO_TERM(eip->u.service_req.software_version); + break; + case E1OIP_MSGT_SERVICE_ACK: + if (msgb_l2len(msg) < sizeof(eip->u.service_ack)) + goto err_msg_len; + ENSURE_ZERO_TERM(eip->u.service_ack.server_id); + ENSURE_ZERO_TERM(eip->u.service_ack.software_id); + ENSURE_ZERO_TERM(eip->u.service_ack.software_version); + break; + case E1OIP_MSGT_SERVICE_REJ: + if (msgb_l2len(msg) < sizeof(eip->u.service_rej)) + goto err_msg_len; + ENSURE_ZERO_TERM(eip->u.service_rej.reject_message); + break; + case E1OIP_MSGT_REDIR_CMD: + if (msgb_l2len(msg) < sizeof(eip->u.redir_cmd)) + goto err_msg_len; + ENSURE_ZERO_TERM(eip->u.redir_cmd.server_ip); + break; + case E1OIP_MSGT_AUTH_REQ: + if (msgb_l2len(msg) < sizeof(eip->u.auth_req)) + goto err_msg_len; + if (eip->u.auth_req.rand_len > sizeof(eip->u.auth_req.rand)) + goto err_ie_len; + if (eip->u.auth_req.autn_len > sizeof(eip->u.auth_req.autn)) + goto err_ie_len; + break; + case E1OIP_MSGT_AUTH_RESP: + if (msgb_l2len(msg) < sizeof(eip->u.auth_resp)) + goto err_msg_len; + if (eip->u.auth_resp.res_len > sizeof(eip->u.auth_resp.res)) + goto err_ie_len; + if (eip->u.auth_resp.auts_len > sizeof(eip->u.auth_resp.auts)) + goto err_ie_len; + break; + case E1OIP_MSGT_ERROR_IND: + if (msgb_l2len(msg) < sizeof(eip->u.error_ind)) + goto err_msg_len; + ENSURE_ZERO_TERM(eip->u.error_ind.error_message); + break; + default: + LOGPFSML(fi, LOGL_NOTICE, "Rx unknown OCTOI message type 0x%02x\n", eip->hdr.msg_type); + return false; + } + + return true; + +err_msg_len: + LOGPFSML(fi, LOGL_NOTICE, "Rx truncated OCTOI message 0x%02x\n", eip->hdr.msg_type); + return false; + +err_ie_len: + LOGPFSML(fi, LOGL_NOTICE, "Rx invalid IE length in OCTOI message 0x%02x\n", eip->hdr.msg_type); + return false; +} + + +/* call-back function for every received OCTOI socket message for given peer */ +int _octoi_fsm_rx_cb(struct octoi_peer *peer, struct msgb *msg) +{ + struct osmo_fsm_inst *fi = peer->priv; + struct e1oip_hdr *e1h = msgb_l1(msg); + + OSMO_ASSERT(fi); + OSMO_ASSERT(msgb_l1(msg)); + OSMO_ASSERT(msgb_l2(msg)); + + if (!octoi_msg_validate(fi, msg)) + return -1; + + switch (e1h->msg_type) { + case E1OIP_MSGT_TDM_DATA: + osmo_fsm_inst_dispatch(fi, OCTOI_EV_RX_TDM_DATA, msg); + break; + case E1OIP_MSGT_ECHO_REQ: + osmo_fsm_inst_dispatch(fi, OCTOI_EV_RX_ECHO_REQ, msg); + break; + case E1OIP_MSGT_ECHO_RESP: + osmo_fsm_inst_dispatch(fi, OCTOI_EV_RX_ECHO_RESP, msg); + break; + case E1OIP_MSGT_ERROR_IND: + osmo_fsm_inst_dispatch(fi, OCTOI_EV_RX_ERROR_IND, msg); + break; + + case E1OIP_MSGT_SERVICE_REQ: + osmo_fsm_inst_dispatch(fi, OCTOI_SRV_EV_RX_SERVICE_REQ, msg); + break; + case E1OIP_MSGT_AUTH_RESP: + osmo_fsm_inst_dispatch(fi, OCTOI_SRV_EV_RX_AUTH_RESP, msg); + break; + + case E1OIP_MSGT_SERVICE_ACK: + osmo_fsm_inst_dispatch(fi, OCTOI_CLNT_EV_RX_SVC_ACK, msg); + break; + case E1OIP_MSGT_SERVICE_REJ: + osmo_fsm_inst_dispatch(fi, OCTOI_CLNT_EV_RX_SVC_REJ, msg); + break; + case E1OIP_MSGT_REDIR_CMD: + osmo_fsm_inst_dispatch(fi, OCTOI_CLNT_EV_RX_REDIR_CMD, msg); + break; + case E1OIP_MSGT_AUTH_REQ: + osmo_fsm_inst_dispatch(fi, OCTOI_CLNT_EV_RX_AUTH_REQ, msg); + break; + + default: + LOGPFSML(fi, LOGL_NOTICE, "Rx Unknown OCTOI message type 0x%02x\n", e1h->msg_type); + break; + } + + msgb_free(msg); + return 0; +} + +#include <osmocom/vty/vty.h> +#include <osmocom/vty/misc.h> +#include "e1oip.h" + +void vty_show_octoi_sock(struct vty *vty, struct octoi_sock *sock) +{ + struct octoi_peer *peer; + + vty_out(vty, "OCTOI %s Socket on "OSMO_SOCKADDR_STR_FMT"%s", + sock->cfg.server_mode ? "Server" : "Client", + OSMO_SOCKADDR_STR_FMT_ARGS(&sock->cfg.local), VTY_NEWLINE); + + llist_for_each_entry(peer, &sock->peers, list) { + vty_out(vty, " Peer '%s', Remote "OSMO_SOCKADDR_STR_FMT", State %s%s", + peer->name, OSMO_SOCKADDR_STR_FMT_ARGS(&peer->cfg.remote), + osmo_fsm_inst_state_name(peer->priv), VTY_NEWLINE); + vty_out_rate_ctr_group(vty, " ", peer->iline->ctrs); + vty_out_stat_item_group(vty, " ", peer->iline->stats); + } +} diff --git a/src/octoi/octoi_fsm.h b/src/octoi/octoi_fsm.h new file mode 100644 index 0000000..b605c3a --- /dev/null +++ b/src/octoi/octoi_fsm.h @@ -0,0 +1,31 @@ +#pragma once + +enum octoi_fsm_event { + /* common for server and client */ + OCTOI_EV_RX_TDM_DATA, /* receive TDM data from client */ + OCTOI_EV_RX_ECHO_REQ, /* receive echo request from client */ + OCTOI_EV_RX_ECHO_RESP, /* receive echo response from client */ + OCTOI_EV_RX_ERROR_IND, /* receive error indication */ + + /* only on server side */ + OCTOI_SRV_EV_RX_SERVICE_REQ, /* receive service request from client */ + OCTOI_SRV_EV_RX_AUTH_VEC, /* receive auth vector from HLR */ + OCTOI_SRV_EV_RX_AUTH_RESP, /* receive auth response from client */ + + /* only on client side */ + OCTOI_CLNT_EV_REQUEST_SERVICE, + OCTOI_CLNT_EV_RX_AUTH_REQ, + OCTOI_CLNT_EV_RX_SVC_ACK, + OCTOI_CLNT_EV_RX_SVC_REJ, + OCTOI_CLNT_EV_RX_REDIR_CMD, +}; + +#define S(x) (1 << (x)) + +extern const struct value_string octoi_fsm_event_names[]; + +int _octoi_fsm_rx_cb(struct octoi_peer *peer, struct msgb *msg); + +/* call-back function for every received OCTOI socket message for given peer */ +int octoi_srv_fsm_rx_cb(struct octoi_peer *peer, struct msgb *msg); +int octoi_clnt_fsm_rx_cb(struct octoi_peer *peer, struct msgb *msg); diff --git a/src/octoi/octoi_sock.c b/src/octoi/octoi_sock.c new file mode 100644 index 0000000..943270a --- /dev/null +++ b/src/octoi/octoi_sock.c @@ -0,0 +1,485 @@ +/* + * octoi_sock.c - OCTOI Socket handling code + * + * (C) 2022 by Harald Welte <laforge(a)osmocom.org> + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <stdint.h> +#include <errno.h> +#include <stdbool.h> +#include <unistd.h> + +#include <sys/socket.h> +#include <sys/un.h> +#include <netinet/in.h> + +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/select.h> +#include <osmocom/core/socket.h> +#include <osmocom/core/sockaddr_str.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/logging.h> + +#include <osmocom/octoi/e1oip_proto.h> + +#include "octoi_sock.h" +#include "e1oip.h" + +/*********************************************************************** + * transmit to remote peer + ***********************************************************************/ + +/* transmit something to an octoi peer */ +int octoi_tx(struct octoi_peer *peer, uint8_t msg_type, uint8_t flags, + const void *data, size_t len) +{ + struct e1oip_hdr hdr = { + .version = E1OIP_VERSION, + .flags = flags & 0xf, + .msg_type = msg_type, + }; + struct iovec iov[2] = { + { + .iov_base = (void *) &hdr, + .iov_len = sizeof(hdr), + }, { + .iov_base = (void *) data, + .iov_len = len, + } + }; + struct msghdr msgh = { + .msg_name = &peer->remote, + .msg_namelen = sizeof(peer->remote), + .msg_iov = iov, + .msg_iovlen = ARRAY_SIZE(iov), + .msg_control = NULL, + .msg_controllen = 0, + .msg_flags = 0, + }; + int rc; + + rc = sendmsg(peer->sock->ofd.fd, &msgh, 0); + if (rc < 0) + LOGPEER(peer, LOGL_ERROR, "Error in sendmsg: %s\n", strerror(errno)); + else if (rc != (int) (sizeof(hdr) + len)) + LOGPEER(peer, LOGL_ERROR, "Short write in sendmsg: %d != %zu\n", rc, sizeof(hdr)+len); + + return rc; +} + +static int _octoi_tx_echo(struct octoi_peer *peer, bool is_req, uint16_t seq_nr, + const uint8_t *data, size_t data_len) +{ + enum e1oip_msgtype msgt; + struct { + struct e1oip_echo echo; + uint8_t buf[data_len]; + } u; + + u.echo.seq_nr = htons(seq_nr); + memcpy(u.echo.data, data, data_len); + + if (is_req) + msgt = E1OIP_MSGT_ECHO_REQ; + else + msgt = E1OIP_MSGT_ECHO_RESP; + + return octoi_tx(peer, msgt, 0, &u, sizeof(u)); +} + +int octoi_tx_echo_req(struct octoi_peer *peer, uint16_t seq_nr, const uint8_t *data, size_t data_len) +{ + LOGPEER(peer, LOGL_DEBUG, "Tx ECHO_REQ\n"); + return _octoi_tx_echo(peer, true, seq_nr, data, data_len); +} + +int octoi_tx_echo_resp(struct octoi_peer *peer, uint16_t seq_nr, const uint8_t *data, size_t data_len) +{ + LOGPEER(peer, LOGL_DEBUG, "Tx ECHO_RESP\n"); + return _octoi_tx_echo(peer, false, seq_nr, data, data_len); +} + +int octoi_tx_service_req(struct octoi_peer *peer, uint32_t service, const char *subscr_id, + const char *software_id, const char *software_version, + uint32_t capability_flags) +{ + struct e1oip_service_req service_req; + + memset(&service_req, 0, sizeof(service_req)); + service_req.requested_service = htonl(service); + OSMO_STRLCPY_ARRAY(service_req.subscriber_id, subscr_id); + OSMO_STRLCPY_ARRAY(service_req.software_id, software_id); + OSMO_STRLCPY_ARRAY(service_req.software_version, software_version); + service_req.capability_flags = htonl(capability_flags); + + LOGPEER(peer, LOGL_INFO, "Tx SERVICE_REQ\n"); + return octoi_tx(peer, E1OIP_MSGT_SERVICE_REQ, 0, &service_req, sizeof(service_req)); +} + +int octoi_tx_redir_cmd(struct octoi_peer *peer, const char *server_ip, uint16_t server_port) +{ + struct e1oip_redir_cmd redir; + + memset(&redir, 0, sizeof(redir)); + OSMO_STRLCPY_ARRAY(redir.server_ip, server_ip); + redir.server_port = htons(server_port); + + LOGPEER(peer, LOGL_INFO, "Tx REDIR_CMD\n"); + return octoi_tx(peer, E1OIP_MSGT_REDIR_CMD, 0, &redir, sizeof(redir)); +} + +int octoi_tx_auth_req(struct octoi_peer *peer, uint8_t rand_len, const uint8_t *rand, + uint8_t autn_len, const uint8_t *autn) +{ + struct e1oip_auth_req areq; + + memset(&areq, 0, sizeof(areq)); + + OSMO_ASSERT(rand_len <= sizeof(areq.rand)); + OSMO_ASSERT(autn_len <= sizeof(areq.autn)); + + areq.rand_len = rand_len; + memcpy(areq.rand, rand, rand_len); + areq.autn_len = autn_len; + memcpy(areq.autn, autn, autn_len); + + LOGPEER(peer, LOGL_INFO, "Tx AUTH_REQ\n"); + return octoi_tx(peer, E1OIP_MSGT_AUTH_REQ, 0, &areq, sizeof(areq)); +} + + +int octoi_tx_auth_resp(struct octoi_peer *peer, uint8_t res_len, const uint8_t *res, + uint8_t auts_len, const uint8_t *auts) +{ + struct e1oip_auth_resp aresp; + + memset(&aresp, 0, sizeof(aresp)); + + OSMO_ASSERT(res_len <= sizeof(aresp.res)); + OSMO_ASSERT(auts_len <= sizeof(aresp.auts)); + + aresp.res_len = res_len; + memcpy(aresp.res, res, res_len); + aresp.auts_len = auts_len; + memcpy(aresp.auts, auts, auts_len); + + LOGPEER(peer, LOGL_INFO, "Tx AUTH_RESP\n"); + return octoi_tx(peer, E1OIP_MSGT_AUTH_RESP, 0, &aresp, sizeof(aresp)); +} + +int octoi_tx_service_ack(struct octoi_peer *peer, uint32_t assigned_service, + const char *server_id, const char *software_id, + const char *software_version, uint32_t capability_flags) +{ + struct e1oip_service_ack service_ack; + + memset(&service_ack, 0, sizeof(service_ack)); + service_ack.assigned_service = htonl(assigned_service); + OSMO_STRLCPY_ARRAY(service_ack.server_id, server_id); + OSMO_STRLCPY_ARRAY(service_ack.software_id, software_id); + OSMO_STRLCPY_ARRAY(service_ack.software_version, software_version); + service_ack.capability_flags = htonl(capability_flags); + + LOGPEER(peer, LOGL_INFO, "Tx SERVICE_ACK\n"); + return octoi_tx(peer, E1OIP_MSGT_SERVICE_ACK, 0, &service_ack, sizeof(service_ack)); +} + +int octoi_tx_service_rej(struct octoi_peer *peer, uint32_t rejected_service, const char *message) +{ + struct e1oip_service_rej service_rej; + + memset(&service_rej, 0, sizeof(service_rej)); + service_rej.rejected_service = htonl(rejected_service); + OSMO_STRLCPY_ARRAY(service_rej.reject_message, message); + + LOGPEER(peer, LOGL_INFO, "Tx SERVICE_REJ\n"); + return octoi_tx(peer, E1OIP_MSGT_SERVICE_REJ, 0, &service_rej, sizeof(service_rej)); +} + +int octoi_tx_error_ind(struct octoi_peer *peer, uint32_t cause, const char *message, + const uint8_t *orig, size_t orig_len) +{ + struct { + struct e1oip_error_ind error_ind; + uint8_t orig[orig_len]; + } u; + + u.error_ind.cause = htonl(cause); + OSMO_STRLCPY_ARRAY(u.error_ind.error_message, message); + memcpy(&u.orig, orig, orig_len); + + LOGPEER(peer, LOGL_INFO, "Tx ERROR_IND\n"); + return octoi_tx(peer, E1OIP_MSGT_ERROR_IND, 0, &u, sizeof(u)); +} + + +/*********************************************************************** + * socket + ***********************************************************************/ + +static int sockaddr_cmp(const struct sockaddr *x, const struct sockaddr *y) +{ + if (x->sa_family != y->sa_family) + return -1; + + if (x->sa_family == AF_UNIX) { + const struct sockaddr_un *xun = (void *)x, *yun = (void *)y; + int r = strcmp(xun->sun_path, yun->sun_path); + if (r != 0) + return r; + } else if (x->sa_family == AF_INET) { + const struct sockaddr_in *xin = (void *)x, *yin = (void *)y; + if (xin->sin_addr.s_addr != yin->sin_addr.s_addr) + return -1; + if (xin->sin_port != yin->sin_port) + return -1; + } else if (x->sa_family == AF_INET6) { + const struct sockaddr_in6 *xin6 = (void *)x, *yin6 = (void *)y; + int r = memcmp(xin6->sin6_addr.s6_addr, yin6->sin6_addr.s6_addr, sizeof(xin6->sin6_addr.s6_addr)); + if (r != 0) + return r; + if (xin6->sin6_port != yin6->sin6_port) + return -1; + if (xin6->sin6_flowinfo != yin6->sin6_flowinfo) + return -1; + if (xin6->sin6_scope_id != yin6->sin6_scope_id) + return -1; + } else { + OSMO_ASSERT(0); + } + return 0; +} + +static struct octoi_peer *find_peer_by_sockaddr(struct octoi_sock *sock, const struct sockaddr *sa) +{ + struct octoi_peer *peer; + + llist_for_each_entry(peer, &sock->peers, list) { + if (!sockaddr_cmp(sa, (struct sockaddr *) &peer->remote)) + return peer; + } + return NULL; +} + +static struct octoi_peer * +alloc_peer(struct octoi_sock *sock, const struct sockaddr *sa, socklen_t sa_len) +{ + struct octoi_peer *peer = talloc_zero(sock, struct octoi_peer); + + if (!peer) + return NULL; + + OSMO_ASSERT(sa_len <= sizeof(peer->remote)); + memcpy(&peer->remote, sa, sa_len); + + peer->sock = sock; + llist_add_tail(&peer->list, &sock->peers); + + return peer; +} + +static int octoi_fd_cb(struct osmo_fd *ofd, unsigned int what) +{ + struct octoi_sock *sock = ofd->data; + struct msgb *msg; + struct sockaddr_storage ss_remote; + socklen_t ss_remote_len = sizeof(ss_remote); + struct octoi_peer *peer; + int rc; + + if (what & OSMO_FD_WRITE) { + LOGP(DLINP, LOGL_INFO, "non-blocking connect succeeded\n"); + osmo_fd_write_disable(ofd); + } + + + if (what & OSMO_FD_READ) { + msg = msgb_alloc_c(sock, 2048, "OCTOI Rx"); + OSMO_ASSERT(msg); + rc = recvfrom(ofd->fd, msgb_data(msg), msgb_tailroom(msg), 0, + (struct sockaddr *) &ss_remote, &ss_remote_len); + if (rc <= 0) { + msgb_free(msg); + return -1; + } + msgb_put(msg, rc); + msg->l1h = msg->data; + if (msgb_l1len(msg) < sizeof(struct e1oip_hdr)) { + msgb_free(msg); + return -2; + } + msg->l2h = msg->l1h + sizeof(struct e1oip_hdr); + + /* look-up octoi_peer based on remote address */ + peer = find_peer_by_sockaddr(sock, (struct sockaddr *) &ss_remote); + if (!peer) { + peer = alloc_peer(sock, (struct sockaddr *) &ss_remote, ss_remote_len); + if (peer) { + osmo_sockaddr_str_from_sockaddr(&peer->cfg.remote, &ss_remote); + osmo_talloc_replace_string_fmt(peer, &peer->name, OSMO_SOCKADDR_STR_FMT, + OSMO_SOCKADDR_STR_FMT_ARGS(&peer->cfg.remote)); + LOGPEER(peer, LOGL_INFO, "peer created\n"); + } + } + OSMO_ASSERT(peer); + + /* dispatch received message to peer */ + rc = sock->rx_cb(peer, msg); + if (rc < 0) + return rc; + } + + return 0; +} + +void octoi_peer_destroy(struct octoi_peer *peer) +{ + if (!peer) + return; + + peer->tdm_permitted = false; + peer->sock = NULL; + e1oip_line_destroy(peer->iline); + + llist_del(&peer->list); + talloc_free(peer); +} + +static struct octoi_sock *octoi_sock_create(void *ctx) +{ + struct octoi_sock *sock = talloc_zero(ctx, struct octoi_sock); + + if (!sock) + return NULL; + + INIT_LLIST_HEAD(&sock->peers); + osmo_fd_setup(&sock->ofd, -1, OSMO_FD_READ, octoi_fd_cb, sock, 0); + + return sock; +} + +struct octoi_sock *octoi_sock_create_server(void *ctx, void *priv, const struct osmo_sockaddr_str *local) +{ + struct octoi_sock *sock = octoi_sock_create(ctx); + struct sockaddr_storage sa_local; + int rc; + + OSMO_ASSERT(sock); + + sock->priv = priv; + sock->cfg.server_mode = true; + sock->cfg.local = *local; + + /* bind to local addr/port; don't connect to any remote as we have many */ + osmo_sockaddr_str_to_sockaddr(&sock->cfg.local, &sa_local); + rc = osmo_sock_init_osa_ofd(&sock->ofd, SOCK_DGRAM, IPPROTO_UDP, + (struct osmo_sockaddr *) &sa_local, NULL, + OSMO_SOCK_F_BIND | OSMO_SOCK_F_NONBLOCK); + + if (rc < 0) { + LOGP(DLINP, LOGL_ERROR, "Unable to create OCTOI server socket\n"); + talloc_free(sock); + return NULL; + } + + LOGP(DLINP, LOGL_NOTICE, "OCTOI server socket at "OSMO_SOCKADDR_STR_FMT"\n", + OSMO_SOCKADDR_STR_FMT_ARGS(local)); + + return sock; +} + +struct octoi_sock *octoi_sock_create_client(void *ctx, void *priv, const struct osmo_sockaddr_str *local, + const struct osmo_sockaddr_str *remote) +{ + struct octoi_sock *sock = octoi_sock_create(ctx); + struct sockaddr_storage sa_remote; + struct octoi_peer *peer; + int rc; + + OSMO_ASSERT(sock); + + sock->priv = priv; + sock->cfg.server_mode = false; + if (local) + sock->cfg.local = *local; + + /* bind to local addr/port; don't connect to any remote as we have many */ + osmo_sockaddr_str_to_sockaddr(remote, &sa_remote); + if (local) { + struct sockaddr_storage sa_local; + osmo_sockaddr_str_to_sockaddr(&sock->cfg.local, &sa_local); + rc = osmo_sock_init_osa_ofd(&sock->ofd, SOCK_DGRAM, IPPROTO_UDP, + (struct osmo_sockaddr *) &sa_local, + (struct osmo_sockaddr *) &sa_remote, + OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_BIND | OSMO_SOCK_F_NONBLOCK); + } else { + rc = osmo_sock_init_osa_ofd(&sock->ofd, SOCK_DGRAM, IPPROTO_UDP, + NULL, (struct osmo_sockaddr *) &sa_remote, + OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_NONBLOCK); + } + if (rc < 0) { + LOGP(DLINP, LOGL_ERROR, "Unable to create OCTOI client socket\n"); + talloc_free(sock); + return NULL; + } + + LOGP(DLINP, LOGL_NOTICE, "OCTOI client socket to "OSMO_SOCKADDR_STR_FMT"\n", + OSMO_SOCKADDR_STR_FMT_ARGS(remote)); + + /* create [the only] peer */ + peer = alloc_peer(sock, (struct sockaddr *) &sa_remote, sizeof(sa_remote)); + peer->cfg.remote = *remote; + osmo_talloc_replace_string_fmt(peer, &peer->name, OSMO_SOCKADDR_STR_FMT, + OSMO_SOCKADDR_STR_FMT_ARGS(remote)); + + return sock; +} + +void octoi_sock_destroy(struct octoi_sock *sock) +{ + struct octoi_peer *p1, *p2; + + if (!sock) + return; + + llist_for_each_entry_safe(p1, p2, &sock->peers, list) { + OSMO_ASSERT(p1->sock == sock); + p1->sock = NULL; + /* FIXME: destroy FSM / priv */ + llist_del(&p1->list); + talloc_free(p1); + } + + osmo_fd_unregister(&sock->ofd); + close(sock->ofd.fd); + + LOGP(DLINP, LOGL_NOTICE, "OCTOI %s socket destroyed\n", + sock->cfg.server_mode ? "server" : "client"); + + talloc_free(sock); +} + +/* return the (only) peer of a octoi_sock client */ +struct octoi_peer *octoi_sock_client_get_peer(struct octoi_sock *sock) +{ + if (!sock) + return NULL; + OSMO_ASSERT(!sock->cfg.server_mode); + OSMO_ASSERT(llist_count(&sock->peers) == 1); + return llist_entry(sock->peers.next, struct octoi_peer, list); +} diff --git a/src/octoi/octoi_sock.h b/src/octoi/octoi_sock.h new file mode 100644 index 0000000..cf7b74b --- /dev/null +++ b/src/octoi/octoi_sock.h @@ -0,0 +1,97 @@ +#pragma once + +#include <stdint.h> +#include <stdbool.h> + +#include <sys/socket.h> + +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/sockaddr_str.h> +#include <osmocom/core/select.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/logging.h> + +/* Server side: + * - one socket, bound to configured port but not connected + * - multiple peers + * + * Client side: + * - one socket, [optionally locally bound] + connected to configured remote IP+port + * - single peer + */ + +#define LOGPEER(peer, lvl, fmt, args ...) \ + LOGP(DLINP, lvl, "%s: " fmt, (peer)->name, ## args) + +struct e1oip_line; +struct octoi_peer; + +struct octoi_sock { + struct llist_head list; /* member in global list */ + struct osmo_fd ofd; /* file descriptor */ + struct llist_head peers; /* list of peers */ + void *priv; + + int (*rx_cb)(struct octoi_peer *peer, struct msgb *msg); + + struct { + bool server_mode; + struct osmo_sockaddr_str local; /* local address */ + } cfg; +}; + +struct octoi_peer { + struct llist_head list; /* member in octoi_sock.peers */ + struct octoi_sock *sock; /* back-pointer to sock */ + struct sockaddr_storage remote; /* remote socket address */ + time_t last_rx_tdm; /* last time we received TDM from peer */ + struct e1oip_line *iline; + bool tdm_permitted; /* TDM messages are permitted (now) */ + char *name; /* human-readable name (just for logging) */ + void *priv; /* private data, e.g. fsm instance */ + + struct { + struct osmo_sockaddr_str remote; /* remote address */ + } cfg; +}; + +struct octoi_sock *octoi_sock_create_server(void *ctx, void *priv, + const struct osmo_sockaddr_str *local); + +struct octoi_sock *octoi_sock_create_client(void *ctx, void *priv, + const struct osmo_sockaddr_str *local, + const struct osmo_sockaddr_str *remote); + +void octoi_sock_destroy(struct octoi_sock *sock); + +struct octoi_peer *octoi_sock_client_get_peer(struct octoi_sock *sock); + +void octoi_peer_destroy(struct octoi_peer *peer); + +int octoi_tx(struct octoi_peer *peer, uint8_t msg_type, uint8_t flags, + const void *data, size_t len); + +int octoi_tx_echo_req(struct octoi_peer *peer, uint16_t seq_nr, const uint8_t *data, size_t data_len); + +int octoi_tx_echo_resp(struct octoi_peer *peer, uint16_t seq_nr, const uint8_t *data, size_t data_len); + +int octoi_tx_service_req(struct octoi_peer *peer, uint32_t service, const char *subscr_id, + const char *software_id, const char *software_version, + uint32_t capability_flags); + +int octoi_tx_redir_cmd(struct octoi_peer *peer, const char *server_ip, uint16_t server_port); + +int octoi_tx_auth_req(struct octoi_peer *peer, uint8_t rand_len, const uint8_t *rand, + uint8_t autn_len, const uint8_t *autn); + +int octoi_tx_auth_resp(struct octoi_peer *peer, uint8_t res_len, const uint8_t *res, + uint8_t auts_len, const uint8_t *auts); + +int octoi_tx_service_ack(struct octoi_peer *peer, uint32_t assigned_service, + const char *server_id, const char *software_id, + const char *software_version, uint32_t capability_flags); + +int octoi_tx_service_rej(struct octoi_peer *peer, uint32_t rejected_service, const char *message); + +int octoi_tx_error_ind(struct octoi_peer *peer, uint32_t cause, const char *message, + const uint8_t *orig, size_t orig_len); diff --git a/src/octoi/octoi_srv_fsm.c b/src/octoi/octoi_srv_fsm.c new file mode 100644 index 0000000..07dc1a7 --- /dev/null +++ b/src/octoi/octoi_srv_fsm.c @@ -0,0 +1,379 @@ +/* + * octoi_srv_fsm.c - OCTOI Server-side Finite State Machine + * + * (C) 2022 by Harald Welte <laforge(a)osmocom.org> + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <osmocom/core/fsm.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/timer.h> + +#include <osmocom/octoi/octoi.h> +#include <osmocom/octoi/e1oip_proto.h> + +#include "octoi.h" +#include "octoi_sock.h" +#include "octoi_fsm.h" +#include "e1oip.h" + +#define SUPPORTED_CAPABILITIES 0x00000000 + +enum octoi_server_fsm_state { + SRV_ST_INIT, /* just created [for new client] */ + SRV_ST_WAIT_AUTH_VEC, /* service request from client */ + SRV_ST_WAIT_AUTH_RESP, /* auth req sent, wait for auth resp */ + SRV_ST_ACCEPTED, /* service accepted */ + SRV_ST_REJECTED, /* service rejected */ + SRV_ST_REDIRECTED, /* service redirected */ +}; + +struct srv_state { + struct octoi_peer *peer; /* peer to which we belong */ + uint32_t service; /* service we are providing */ + uint32_t capability_flags; /* negotiated capabilities */ + struct { + char *subscriber_id; + char *software_id; + char *software_version; + uint32_t capability_flags; + } remote; + struct osmo_timer_list rx_alive_timer; + struct octoi_account *acc; + void *app_priv; /* application private data */ + const char *rej_str; +}; + +static void srv_st_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct srv_state *st = fi->priv; + struct octoi_server *srv = st->peer->priv; + struct octoi_account *acc; + struct msgb *msg = data; + struct e1oip_service_req *srv_req = NULL; + uint32_t service; + + switch (event) { + case OCTOI_SRV_EV_RX_SERVICE_REQ: + srv_req = (struct e1oip_service_req *) msgb_l2(msg); + service = ntohl(srv_req->requested_service); + LOGPFSML(fi, LOGL_INFO, "Rx SERVICE REQ (service=%u, subscriber='%s', " + "software='%s'/'%s', capabilities=0x%08x)\n", service, + srv_req->subscriber_id, srv_req->software_id, srv_req->software_version, + htonl(srv_req->capability_flags)); + if (service != E1OIP_SERVICE_E1_FRAMED) { + osmo_fsm_inst_state_chg(fi, SRV_ST_REJECTED, 0, 0); + octoi_tx_service_rej(st->peer, service, "Unsupported service"); + break; + } + /* fill peer structure with parameters received */ + st->service = service; + osmo_fsm_inst_update_id(fi, srv_req->subscriber_id); + osmo_talloc_replace_string(st->peer, &st->remote.subscriber_id, srv_req->subscriber_id); + osmo_talloc_replace_string(st->peer, &st->remote.software_id, srv_req->software_id); + osmo_talloc_replace_string(st->peer, &st->remote.software_version, srv_req->software_version); + st->remote.capability_flags = ntohl(srv_req->capability_flags); + /* intersect capabilities */ + st->capability_flags = st->remote.capability_flags & SUPPORTED_CAPABILITIES; + + /* TODO: later we would want to start looking up the subscriber in the HLR + * and request authentication tuples. */ + + /* check subscriber */ + acc = octoi_account_find(st->peer->sock->priv, st->remote.subscriber_id); + if (!acc) { + LOGPFSML(fi, LOGL_NOTICE, "Could not find user account %s, rejecting\n", + st->remote.subscriber_id); + st->rej_str = "Unknown user"; + goto reject; + } + st->acc = acc; + + switch (acc->mode) { + case ACCOUNT_MODE_ICE1USB: + case ACCOUNT_MODE_DAHDI: + /* check if a matching device exists for that account */ + st->app_priv = g_octoi->ops->client_connected(srv, st->peer, acc); + if (!st->app_priv) { + LOGPFSML(fi, LOGL_NOTICE, "Could not find E1 line for account %s, " + "rejecting\n", acc->user_id); + st->rej_str = "No line for user"; + goto reject; + } + osmo_talloc_replace_string(st->peer, &st->peer->name, 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); + break; + case ACCOUNT_MODE_REDIRECT: + octoi_tx_redir_cmd(st->peer, acc->u.redirect.to.ip, acc->u.redirect.to.port); + osmo_fsm_inst_state_chg(fi, SRV_ST_REDIRECTED, 10, 0); + break; + case ACCOUNT_MODE_NONE: + LOGPFSML(fi, LOGL_NOTICE, "User account %s has mode 'none', rejecting\n", + acc->user_id); + default: + st->rej_str = "Unsupported mode for user"; + goto reject; + break; + } + break; + default: + OSMO_ASSERT(0); + } + + return; + +reject: + octoi_tx_service_rej(st->peer, st->service, st->rej_str); + osmo_fsm_inst_state_chg(fi, SRV_ST_REJECTED, 10, 0); +} + +static void srv_st_wait_auth_vec(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch (event) { + case OCTOI_SRV_EV_RX_AUTH_VEC: + /* TODO */ + //octoi_tx_auth_req(peer, + break; + default: + OSMO_ASSERT(0); + } +} + +static void srv_st_wait_auth_resp(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch (event) { + case OCTOI_SRV_EV_RX_AUTH_RESP: + /* TODO */ + default: + OSMO_ASSERT(0); + } +} + +static void srv_st_accepted_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct srv_state *st = fi->priv; + + st->peer->tdm_permitted = true; + osmo_timer_schedule(&st->rx_alive_timer, 3, 0); +} + +static void srv_st_accepted(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct srv_state *st = fi->priv; + + switch (event) { + case OCTOI_SRV_EV_RX_AUTH_RESP: /* Rx re-transmission from client side */ + /* re-transmit ack */ + octoi_tx_service_ack(st->peer, st->service, "TODO-SRV", PACKAGE_NAME, + PACKAGE_VERSION, st->capability_flags); + osmo_timer_schedule(&st->rx_alive_timer, 3, 0); + break; + case OCTOI_EV_RX_TDM_DATA: + e1oip_rcvmsg_tdm_data(st->peer->iline, data); + break; + default: + OSMO_ASSERT(0); + } +} + +static void srv_st_accepted_onleave(struct osmo_fsm_inst *fi, uint32_t next_state) +{ + struct srv_state *st = fi->priv; + + osmo_timer_del(&st->rx_alive_timer); + st->peer->tdm_permitted = false; +} + +static void srv_st_rejected(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct srv_state *st = fi->priv; + + switch (event) { + case OCTOI_SRV_EV_RX_SERVICE_REQ: + case OCTOI_SRV_EV_RX_AUTH_RESP: /* Rx re-transmission from client side */ + octoi_tx_service_rej(st->peer, st->service, st->rej_str); + break; + default: + OSMO_ASSERT(0); + } +} + +static void srv_st_redirected(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct srv_state *st = fi->priv; + + switch (event) { + case OCTOI_SRV_EV_RX_SERVICE_REQ: + case OCTOI_SRV_EV_RX_AUTH_RESP: /* Rx re-transmission from client side */ + octoi_tx_redir_cmd(st->peer, st->acc->u.redirect.to.ip, st->acc->u.redirect.to.port); + break; + default: + OSMO_ASSERT(0); + } +} + +static const struct osmo_fsm_state server_fsm_states[] = { + [SRV_ST_INIT] = { + .name = "INIT", + .in_event_mask = S(OCTOI_SRV_EV_RX_SERVICE_REQ), /* retransmit */ + .out_state_mask = S(SRV_ST_WAIT_AUTH_VEC) | S(SRV_ST_ACCEPTED) | S(SRV_ST_REJECTED), + .action = srv_st_init, + }, + [SRV_ST_WAIT_AUTH_VEC] = { + .name = "WAIT_AUTH_VEC", + .in_event_mask = S(OCTOI_SRV_EV_RX_AUTH_VEC), + .out_state_mask = S(SRV_ST_WAIT_AUTH_RESP) | S(SRV_ST_REJECTED), + .action = srv_st_wait_auth_vec, + }, + [SRV_ST_WAIT_AUTH_RESP] = { + .name = "WAIT_AUTH_RESP", + .in_event_mask = S(OCTOI_SRV_EV_RX_AUTH_RESP), + .out_state_mask = S(SRV_ST_ACCEPTED) | S(SRV_ST_REJECTED) | S(SRV_ST_REDIRECTED), + .action = srv_st_wait_auth_resp, + }, + [SRV_ST_ACCEPTED] = { + .name = "ACCEPTED", + .in_event_mask = S(OCTOI_SRV_EV_RX_AUTH_RESP) | /* retransmit */ + S(OCTOI_EV_RX_TDM_DATA), + .action = srv_st_accepted, + .onenter = srv_st_accepted_onenter, + .onleave = srv_st_accepted_onleave, + }, + [SRV_ST_REJECTED] = { + .name = "REJECTED", + .in_event_mask = S(OCTOI_SRV_EV_RX_SERVICE_REQ) | /* retransmit */ + S(OCTOI_SRV_EV_RX_AUTH_RESP), /* retransmit */ + .action = srv_st_rejected, + }, + [SRV_ST_REDIRECTED] = { + .name = "REDIRECTED", + .in_event_mask = S(OCTOI_SRV_EV_RX_SERVICE_REQ) | /* retransmit */ + S(OCTOI_SRV_EV_RX_AUTH_RESP), /* retransmit */ + .action = srv_st_redirected, + }, +}; + +static void srv_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct srv_state *st = fi->priv; + struct msgb *msg = data; + struct e1oip_echo *echo_req; + struct e1oip_error_ind *err_ind; + + switch (event) { + case OCTOI_EV_RX_ECHO_REQ: + echo_req = msgb_l2(msg); + octoi_tx_echo_resp(st->peer, ntohs(echo_req->seq_nr), echo_req->data, msgb_l2len(msg)); + break; + case OCTOI_EV_RX_ECHO_RESP: + /* TODO: update state, peer has responded! */ + break; + case OCTOI_EV_RX_ERROR_IND: + err_ind = msgb_l2(msg); + LOGPFSML(fi, LOGL_ERROR, "Rx OCTOI ERROR IND (cause=0x%08x, msg=%s)\n", + ntohl(err_ind->cause), err_ind->error_message); + break; + default: + OSMO_ASSERT(0); + } +} + +static int srv_fsm_timer_cb(struct osmo_fsm_inst *fi) +{ + switch (fi->state) { + case SRV_ST_REJECTED: + case SRV_ST_REDIRECTED: + /* 10s timeout has expired, we can now forget about this peer */ + /* request termination */ + return 1; + } + + return 0; +} + +static void srv_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) +{ + struct srv_state *st = fi->priv; + + osmo_timer_del(&st->rx_alive_timer); + + /* as long as 'fi' lives within 'peer' we cannot recursively destroy peer */ + talloc_steal(OTC_SELECT, fi); + + if (g_octoi->ops->peer_disconnected) + g_octoi->ops->peer_disconnected(st->peer); + + octoi_peer_destroy(st->peer); +} + +struct osmo_fsm octoi_server_fsm = { + .name = "OCTOI_SERVER", + .states = server_fsm_states, + .num_states = ARRAY_SIZE(server_fsm_states), + .allstate_event_mask = S(OCTOI_EV_RX_ECHO_REQ) | + S(OCTOI_EV_RX_ECHO_RESP) | + S(OCTOI_EV_RX_ERROR_IND), + .allstate_action = srv_allstate_action, + .timer_cb = srv_fsm_timer_cb, + .log_subsys = DLINP, + .event_names = octoi_fsm_event_names, + .cleanup = srv_fsm_cleanup, +}; + + +static void srv_rx_alive_timer_cb(void *data) +{ + struct osmo_fsm_inst *fi = data; + struct srv_state *st = fi->priv; + struct timespec ts; + + clock_gettime(CLOCK_MONOTONIC, &ts); + + if (ts.tv_sec - st->peer->last_rx_tdm > 3) { + LOGPFSML(fi, LOGL_NOTICE, "No TDM data received for >= 3 seconds, declaring peer dead\n"); + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_TIMEOUT, NULL); + } else + osmo_timer_schedule(&st->rx_alive_timer, 3, 0); +} + +/* call-back function for every received OCTOI socket message for given peer */ +int octoi_srv_fsm_rx_cb(struct octoi_peer *peer, struct msgb *msg) +{ + + /* ensure peer->priv points to a fsm_inst */ + if (!peer->priv) { + struct osmo_fsm_inst *fi; + struct srv_state *st; + + fi = osmo_fsm_inst_alloc(&octoi_server_fsm, peer, NULL, LOGL_DEBUG, NULL); + OSMO_ASSERT(fi); + + st = talloc_zero(fi, struct srv_state); + OSMO_ASSERT(st); + st->peer = peer; + osmo_timer_setup(&st->rx_alive_timer, srv_rx_alive_timer_cb, fi); + fi->priv = st; + + peer->priv = fi; + } + OSMO_ASSERT(peer->priv); + if (!peer->iline) + peer->iline = e1oip_line_alloc(peer); + + return _octoi_fsm_rx_cb(peer, msg); +} diff --git a/src/octoi/octoi_srv_vty.c b/src/octoi/octoi_srv_vty.c new file mode 100644 index 0000000..e5b91c7 --- /dev/null +++ b/src/octoi/octoi_srv_vty.c @@ -0,0 +1,386 @@ +/* + * octoi_srv_vty.c - VTY interface for OCTOI server side + * + * (C) 2022 by Harald Welte <laforge(a)osmocom.org> + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <errno.h> +#include <stdio.h> +#include <string.h> + +#include <talloc.h> + +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/sockaddr_str.h> +#include <osmocom/core/fsm.h> + +#include <osmocom/vty/telnet_interface.h> +#include <osmocom/vty/command.h> +#include <osmocom/vty/logging.h> +#include <osmocom/vty/stats.h> +#include <osmocom/vty/misc.h> + +#include "octoi.h" +#include "octoi_sock.h" +#include "octoi_fsm.h" +#include "octoi_vty.h" + +/*********************************************************************** + * core data structures + ***********************************************************************/ + +const struct value_string octoi_account_mode_name[] = { + { ACCOUNT_MODE_NONE, "none" }, + { ACCOUNT_MODE_ICE1USB, "ice1usb" }, + { ACCOUNT_MODE_REDIRECT, "redirect" }, + { ACCOUNT_MODE_DAHDI, "dahdi" }, + { 0, NULL } +}; + +static struct octoi_account *_account_create(void *ctx, const char *user_id) +{ + struct octoi_account *ac = talloc_zero(ctx, struct octoi_account); + if (!ac) + return NULL; + + ac->user_id = talloc_strdup(ac, user_id); + if (!ac->user_id) { + talloc_free(ac); + return NULL; + } + + return ac; +} + +static struct octoi_account *octoi_server_account_create(struct octoi_server *srv, const char *user_id) +{ + struct octoi_account *ac = _account_create(srv, user_id); + if (!ac) + return NULL; + + llist_add_tail(&ac->list, &srv->cfg.accounts); + + return ac; +} + +struct octoi_account *octoi_client_account_create(struct octoi_client *clnt, const char *user_id) +{ + + struct octoi_account *ac = _account_create(clnt, user_id); + if (!ac) + return NULL; + + OSMO_ASSERT(!clnt->cfg.account); + clnt->cfg.account = ac; + + ac->mode = ACCOUNT_MODE_ICE1USB; + + return ac; +} + +struct octoi_account *octoi_account_find(struct octoi_server *srv, const char *user_id) +{ + struct octoi_account *ac; + + llist_for_each_entry(ac, &srv->cfg.accounts, list) { + if (!strcmp(ac->user_id, user_id)) + return ac; + } + return NULL; +} + +static struct octoi_server *octoi_server_alloc(void *ctx) +{ + struct octoi_server *srv = talloc_zero(ctx, struct octoi_server); + if (!srv) + return NULL; + + INIT_LLIST_HEAD(&srv->cfg.accounts); + + return srv; +} + +/*********************************************************************** + * VTY + ***********************************************************************/ + +static struct cmd_node srv_node = { + (enum node_type) OCTOI_SRV_NODE, + "%s(config-octoi-server)# ", + 1, +}; + +static struct cmd_node account_node = { + (enum node_type) OCTOI_ACCOUNT_NODE, + "%s(config-octoi-server-account)# ", + 1, +}; + +DEFUN(cfg_server, cfg_server_cmd, + "octoi-server", + "Configure the OCTOI server\n") +{ + struct octoi_server *srv = g_octoi->server; + + if (!srv) + srv = g_octoi->server = octoi_server_alloc(g_octoi); + OSMO_ASSERT(srv); + + vty->node = OCTOI_SRV_NODE; + vty->index = srv; + + return CMD_SUCCESS; +} + +#if 0 +DEFUN(cfg_no_server, cfg_no_server_cmd, + "no octoi-server", + NO_STR "Disable OCTOI server\n") +{ + /* we'd need to iterate over all accounts and terminate any + * octoi_server_fsm that might exist for each account */ +} +#endif + +DEFUN(cfg_srv_local, cfg_srv_local_cmd, + "local-bind (A.B.C.D|X:X::X:X) <0-65535>", + "Local OCTOI socket bind address/port\n" + "Local OCTOI IPv4 Address\n" + "Local OCTOI IPv6 Address\n" + "Local OCTOI UDP Port Number\n") +{ + struct octoi_server *srv = vty->index; + int rc; + + rc = osmo_sockaddr_str_from_str(&srv->cfg.local, argv[0], atoi(argv[1])); + if (rc < 0) { + vty_out(vty, "%% sockaddr Error: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + + if (srv->sock) + octoi_sock_destroy(srv->sock); + + srv->sock = octoi_sock_create_server(srv, srv, &srv->cfg.local); + if (!srv->sock) { + vty_out(vty, "%% failed to create/bind socket: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + srv->sock->rx_cb = octoi_srv_fsm_rx_cb; + + return CMD_SUCCESS; +} + +DEFUN(cfg_srv_account, cfg_srv_account_cmd, + "account USER_ID", + "Configure a local user account\n" + "User ID\n") +{ + struct octoi_server *srv = vty->index; + const char *user_id = argv[0]; + struct octoi_account *ac = octoi_account_find(srv, user_id); + if (!ac) + ac = octoi_server_account_create(srv, user_id); + if (!ac) + return CMD_WARNING; + + vty->node = OCTOI_ACCOUNT_NODE; + vty->index = ac; + + return CMD_SUCCESS; +} + +#if 0 +DEFUN(cfg_srv_no_account, cfg_serv_no_account_cmd, + "no account USER_ID", + NO_STR "Remove a local user account\n" + "User ID\n") +{ + struct octoi_server *srv = vty->index; + const char *user_id = argv[0]; + struct octoi_account *ac = octoi_account_find(srv, user_id); + if (!ac) + return CMD_WARNING; + + /* we'd need to iterate all octoi_server_fsm instances and terminate any + * pointing to this account */ +} +#endif + +gDEFUN(cfg_account_mode, cfg_account_mode_cmd, + "mode (ice1usb|redirect)", + "Operational mode of account\n" + "Connect to local icE1usb (identified by USB serial + line number)\n" + "Redirect to other IP/Port\n") +{ + struct octoi_account *acc = vty->index; + + /* leave old mode */ + switch (acc->mode) { + case ACCOUNT_MODE_ICE1USB: + talloc_free(acc->u.ice1usb.usb_serial); + break; + default: + break; + } + memset(&acc->u, 0, sizeof(acc->u)); + + if (!strcmp(argv[0], "ice1usb")) { + acc->mode = ACCOUNT_MODE_ICE1USB; + } else if (!strcmp(argv[0], "redirect")) { + acc->mode = ACCOUNT_MODE_REDIRECT; + } else + OSMO_ASSERT(0); + + return CMD_SUCCESS; +} + +#define ICE1_STR "icE1usb settings\n" + +gDEFUN(cfg_account_ice1_serno, cfg_account_ice1_serno_cmd, + "ice1usb serial-number SERNO", + ICE1_STR "USB Serial Number String\n" "USB Serial Number String\n") +{ + struct octoi_account *acc = vty->index; + + if (acc->mode != ACCOUNT_MODE_ICE1USB) { + vty_out(vty, "%% Error: Not in icE1usb mode!%s", VTY_NEWLINE); + return CMD_WARNING; + } + + osmo_talloc_replace_string(acc, &acc->u.ice1usb.usb_serial, argv[0]); + return CMD_SUCCESS; +} + +gDEFUN(cfg_account_ice1_line, cfg_account_ice1_line_cmd, + "ice1usb line-number <0-1>", + ICE1_STR "E1 Line number\n" "E1 Line number\n") +{ + struct octoi_account *acc = vty->index; + + if (acc->mode != ACCOUNT_MODE_ICE1USB) { + vty_out(vty, "%% Error: Not in icE1usb mode!%s", VTY_NEWLINE); + return CMD_WARNING; + } + + acc->u.ice1usb.line_nr = atoi(argv[0]); + return CMD_SUCCESS; +} + +DEFUN(cfg_account_redir, cfg_account_redir_cmd, + "redirect (A.B.C.D|X:X::X:X) <0-65535>", + "Redirect to other IP/Port\n" + "Destination IPv4 address\n" + "Destination IPv6 address\n" + "Destination UDP port\n") +{ + struct octoi_account *acc = vty->index; + int rc; + + if (acc->mode != ACCOUNT_MODE_REDIRECT) { + vty_out(vty, "%% Error: Not in redirect mode!%s", VTY_NEWLINE); + return CMD_WARNING; + } + + rc = osmo_sockaddr_str_from_str(&acc->u.redirect.to, argv[0], atoi(argv[1])); + if (rc < 0) { + vty_out(vty, "%% sockaddr Error: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + + return CMD_SUCCESS; +} + +void octoi_vty_write_one_account(struct vty *vty, const struct octoi_account *acc) +{ + if (!acc) + return; + + vty_out(vty, " account %s%s", acc->user_id, VTY_NEWLINE); + vty_out(vty, " mode %s%s", get_value_string(octoi_account_mode_name, acc->mode), + VTY_NEWLINE); + + switch (acc->mode) { + case ACCOUNT_MODE_NONE: + break; + case ACCOUNT_MODE_ICE1USB: + if (acc->u.ice1usb.usb_serial) + vty_out(vty, " ice1usb serial-number %s%s", acc->u.ice1usb.usb_serial, + VTY_NEWLINE); + + vty_out(vty, " ice1usb line-number %u%s", acc->u.ice1usb.line_nr, VTY_NEWLINE); + break; + case ACCOUNT_MODE_REDIRECT: + vty_out(vty, " redirect %s %u%s", acc->u.redirect.to.ip, acc->u.redirect.to.port, + VTY_NEWLINE); + break; + case ACCOUNT_MODE_DAHDI: + OSMO_ASSERT(0); + break; + } +} + +static int config_write_octoi_srv(struct vty *vty) +{ + struct octoi_account *acc; + struct octoi_server *srv = g_octoi->server; + + if (!srv) + return 0; + + vty_out(vty, "octoi-server%s", VTY_NEWLINE); + if (strlen(srv->cfg.local.ip)) { + vty_out(vty, " local-bind %s %u%s", srv->cfg.local.ip, srv->cfg.local.port, + VTY_NEWLINE); + } + + llist_for_each_entry(acc, &srv->cfg.accounts, list) + octoi_vty_write_one_account(vty, acc); + + return 0; +} + +DEFUN(show_server, show_server_cmd, + "show octoi-server", + SHOW_STR "Display information about the OCTOI Server\n") +{ + struct octoi_server *srv = g_octoi->server; + struct octoi_sock *sock = srv->sock; + + vty_show_octoi_sock(vty, sock); + + return CMD_SUCCESS; +} + +void octoi_server_vty_init(void) +{ + + install_element_ve(&show_server_cmd); + + install_node(&account_node, NULL); + install_element(OCTOI_ACCOUNT_NODE, &cfg_account_mode_cmd); + install_element(OCTOI_ACCOUNT_NODE, &cfg_account_ice1_serno_cmd); + install_element(OCTOI_ACCOUNT_NODE, &cfg_account_ice1_line_cmd); + install_element(OCTOI_ACCOUNT_NODE, &cfg_account_redir_cmd); + + install_node(&srv_node, config_write_octoi_srv); + install_element(CONFIG_NODE, &cfg_server_cmd); + //install_element(CONFIG_NODE, &cfg_no_server_cmd); + install_element(OCTOI_SRV_NODE, &cfg_srv_local_cmd); + install_element(OCTOI_SRV_NODE, &cfg_srv_account_cmd); + //install_element(CONFIG_SRV_NODE, &cfg_srv_no_account_cmd); +} diff --git a/src/octoi/octoi_vty.h b/src/octoi/octoi_vty.h new file mode 100644 index 0000000..6f18802 --- /dev/null +++ b/src/octoi/octoi_vty.h @@ -0,0 +1,15 @@ +#pragma once + +#include <osmocom/vty/command.h> + +#include "octoi.h" + +extern struct cmd_element cfg_account_mode_cmd; +extern struct cmd_element cfg_account_ice1_serno_cmd; +extern struct cmd_element cfg_account_ice1_line_cmd; + +struct octoi_account *octoi_client_account_create(struct octoi_client *clnt, const char *user_id); + +void octoi_vty_write_one_account(struct vty *vty, const struct octoi_account *acc); + +void vty_show_octoi_sock(struct vty *vty, struct octoi_sock *sock); diff --git a/src/osmo-e1d.c b/src/osmo-e1d.c index f86a92a..1e18f88 100644 --- a/src/osmo-e1d.c +++ b/src/osmo-e1d.c @@ -39,11 +39,14 @@ #include <osmocom/core/select.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/logging.h> +#include <osmocom/vty/stats.h> +#include <osmocom/vty/misc.h> #include <osmocom/e1d/proto_srv.h> #include <osmocom/e1d/proto.h> #include "e1d.h" +#include <osmocom/octoi/octoi.h> #include "usb.h" #include "log.h" @@ -83,6 +86,7 @@ static struct vty_app_info vty_info = { .name = "osmo-e1d", .version = PACKAGE_VERSION, + .go_parent_cb = e1d_vty_go_parent, .copyright = "(C) 2019-2022 by Sylvain Munaut, Harald Welte and contributors\r\n", "License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl-2.0.html>\r\n" @@ -176,7 +180,12 @@ vty_init(&vty_info); logging_vty_add_cmds(); e1d_vty_init(e1d); + octoi_init(g_e1d_ctx, e1d, &e1d_octoi_ops); rate_ctr_init(e1d); + osmo_stat_item_init(e1d); + osmo_stats_vty_add_cmds(); + osmo_talloc_vty_add_cmds(); + osmo_fsm_vty_add_cmds(); handle_options(argc, argv); diff --git a/src/usb.c b/src/usb.c index 40518d8..1949485 100644 --- a/src/usb.c +++ b/src/usb.c @@ -939,6 +939,8 @@ if (line_data->ep_int) resubmit_irq(line); + e1_line_active(line); + next_interface: line_nr++; } diff --git a/src/vty.c b/src/vty.c index bdd0457..ba6b1ac 100644 --- a/src/vty.c +++ b/src/vty.c @@ -24,6 +24,7 @@ #include <stdbool.h> #include <unistd.h> #include <time.h> +#include <errno.h> #include <osmocom/core/linuxlist.h> @@ -36,7 +37,9 @@ #include <osmocom/vty/misc.h> #include <osmocom/vty/tdef_vty.h> +#include <osmocom/octoi/octoi.h> #include <osmocom/e1d/proto.h> + #include "e1d.h" #include "usb.h" @@ -60,6 +63,23 @@ 1, }; +int e1d_vty_go_parent(struct vty *vty) +{ + struct e1_line *line; + + switch (vty->node) { + case LINE_NODE: + line = vty->index; + vty->node = INTF_NODE; + vty->index = line->intf; + break; + default: + return octoi_vty_go_parent(vty); + } + + return 0; +} + #if 0 static void vty_dump_ts(struct vty *vty, const struct e1_ts *ts) { @@ -135,6 +155,7 @@ const struct value_string e1_line_mode_names[] = { { E1_LINE_MODE_CHANNELIZED, "channelized" }, { E1_LINE_MODE_SUPERCHANNEL, "superchannel" }, + { E1_LINE_MODE_E1OIP, "e1oip" }, { 0, NULL } }; @@ -294,14 +315,17 @@ } DEFUN(cfg_e1d_if_line_mode, cfg_e1d_if_line_mode_cmd, - "mode (channelized|superchannel)", + "mode (channelized|superchannel|e1oip)", "Configure the mode of the E1 line\n" "Channelized (64kBps timeslot) mode\n" "Superchannel (1xHDLC over 31x64kBps) mode\n") { struct e1_line *line = vty->index; - - line->mode = get_string_value(e1_line_mode_names, argv[0]); + enum e1_line_mode new_mode = get_string_value(e1_line_mode_names, argv[0]); + if (line->mode != new_mode) { + /* FIXME: clean up any old state */ + line->mode = new_mode; + } return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I05f5ff697ca8f7dccdcf89660f12089babfcc92e Gerrit-Change-Number: 27588 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

2 years

1
0
0 0

Change in osmo-e1d[master]: OCTOI: initial support for E1oIP forwarding

by laforge

Attention is currently required from: manawyrm, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27588 ) Change subject: OCTOI: initial support for E1oIP forwarding ...................................................................... Patch Set 5: Code-Review+2 (1 comment) Patchset: PS5: guess the patch is too large for review. As it only adds a lot of new code without changing much of the existing code paths for non-OCTOI, it should be rather safe to merge. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I05f5ff697ca8f7dccdcf89660f12089babfcc92e Gerrit-Change-Number: 27588 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Thu, 31 Mar 2022 17:48:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: Ensure message length is sufficient for respective header

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27624 ) Change subject: abis_rsl: Ensure message length is sufficient for respective header ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I63b64f1f241de3a76f9b66ed2cf524cc88933062 Gerrit-Change-Number: 27624 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 31 Mar 2022 17:47:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-bts[master]: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27621 ) Change subject: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn ...................................................................... fix gsm_bts_get_cbch(): CBCH can be allocated on Cn According to 3GPP TS 45.002, table 3, unlike the CCCH+SDCCH/4+CBCH combination, which can only be allocated on C0/TS0, the SDCCH/8+CBCH can be allocated on C0..n/TS0..3. In other words, having CBCH on e.g. C1/TS2 is perfectly legal. This is why in gsm_bts_get_cbch() we should check all transceivers, not just the C0. Without this change osmo-bts does not send CBCH Load Indications at all if the CBCH is allocated on C1..n. Change-Id: Ib5976783b53521047fbdfc18e0e236e8bce8eaae Related: osmo-bsc.git Ie79ccff4f8f0f1134757ec0c35e18b58081cc158 Related: SYS#5905 --- M src/common/bts.c 1 file changed, 11 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/common/bts.c b/src/common/bts.c index 4e49c45..0608df1 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -883,22 +883,23 @@ /* return the gsm_lchan for the CBCH (if it exists at all) */ struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts) { - struct gsm_lchan *lchan = NULL; struct gsm_bts_trx *trx = bts->c0; + /* According to 3GPP TS 45.002, table 3, CBCH can be allocated + * either on C0/TS0 (CCCH+SDCCH4) or on C0..n/TS0..3 (SDCCH/8). */ if (trx->ts[0].pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) - lchan = &trx->ts[0].lchan[2]; - else { - int i; - for (i = 0; i < 8; i++) { - if (trx->ts[i].pchan == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) { - lchan = &trx->ts[i].lchan[2]; - break; - } + return &trx->ts[0].lchan[2]; /* C0/TS0 */ + + llist_for_each_entry(trx, &bts->trx_list, list) { /* C0..n */ + unsigned int tn; + for (tn = 0; tn <= 3; tn++) { /* TS0..3 */ + struct gsm_bts_trx_ts *ts = &trx->ts[tn]; + if (ts->pchan == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) + return &ts->lchan[2]; } } - return lchan; + return NULL; } /* BCCH carrier power reduction (see 3GPP TS 45.008, section 7.1) */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib5976783b53521047fbdfc18e0e236e8bce8eaae Gerrit-Change-Number: 27621 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

Change in osmo-bts[master]: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27621 ) Change subject: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib5976783b53521047fbdfc18e0e236e8bce8eaae Gerrit-Change-Number: 27621 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 17:47:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: always check return value of rsl_tlv_parse()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27620 ) Change subject: abis_rsl: always check return value of rsl_tlv_parse() ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27620/comment/699a1503_1cb9c4d9 PS1, Line 1224: if (rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { > abis_rsl_rcvmsg() is checking for 'sizeof(struct abis_rsl_common_hdr)' length. […] https://gerrit.osmocom.org/c/osmo-bsc/+/27624 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id022628934e7d51ce66cb255baa88f24bf5c918a Gerrit-Change-Number: 27620 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 17:47:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: Ensure message length is sufficient for respective header

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27624 ) Change subject: abis_rsl: Ensure message length is sufficient for respective header ...................................................................... abis_rsl: Ensure message length is sufficient for respective header Change-Id: I63b64f1f241de3a76f9b66ed2cf524cc88933062 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/24/27624/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 6681875..822d39a 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1502,6 +1502,9 @@ int rc = 0; struct e1inp_sign_link *sign_link = msg->dst; + if (msgb_l2len(msg) < sizeof(*rslh)) + return -EINVAL; + if (rslh->ie_chan != RSL_IE_CHAN_NR) { LOGP(DRSL, LOGL_ERROR, "Rx RSL DCHAN: invalid RSL header, expecting Channel Number IE tag, got 0x%x\n", @@ -1602,6 +1605,9 @@ struct tlv_parsed tp; struct e1inp_sign_link *sign_link = msg->dst; + if (msgb_l2len(msg) < sizeof(*rslh)) + return -EINVAL; + rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg)-sizeof(*rslh)); LOGP(DRSL, LOGL_ERROR, "%s ERROR REPORT%s\n", @@ -2403,6 +2409,9 @@ struct rate_ctr_group *bts_ctrs = sign_link->trx->bts->bts_ctrs; int rc = 0; + if (msgb_l2len(msg) < sizeof(*rslh)) + return -EINVAL; + msg->lchan = lchan_lookup(sign_link->trx, rslh->chan_nr, "Abis RSL rx CCHAN: "); @@ -2472,8 +2481,12 @@ struct e1inp_sign_link *sign_link = msg->dst; struct abis_rsl_rll_hdr *rllh = msgb_l2(msg); int rc = 0; - uint8_t sapi = rllh->link_id & 0x7; + uint8_t sapi; + if (msgb_l2len(msg) < sizeof(*rllh)) + return -1; + + sapi = rllh->link_id & 0x7; msg->lchan = lchan_lookup(sign_link->trx, rllh->chan_nr, "Abis RSL rx RLL: "); switch (rllh->c.msg_type) { @@ -2895,6 +2908,9 @@ struct abis_rsl_rll_hdr *rllh = msgb_l2(msg); int rc = 0; + if (msgb_l2len(msg) < sizeof(*rllh)) + return -EINVAL; + msg->lchan = lchan_lookup(sign_link->trx, rllh->chan_nr, "Abis RSL rx IPACC: "); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I63b64f1f241de3a76f9b66ed2cf524cc88933062 Gerrit-Change-Number: 27624 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: always check return value of rsl_tlv_parse()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27620 ) Change subject: abis_rsl: always check return value of rsl_tlv_parse() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id022628934e7d51ce66cb255baa88f24bf5c918a Gerrit-Change-Number: 27620 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 17:43:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-pcu[master]: llc: Convert to C

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27623 ) Change subject: llc: Convert to C ...................................................................... llc: Convert to C There's no real reason (other than historical) why code in llc should be kept as c++ code. Let's rewrite it as C so that it can be included by existing C code without having to add C->C++ shim, ifdefs all around, etc. This simplifies code and easies modification/improvement of the related objects. Change-Id: I250680ba581167d7398b2f734769c756cbb61c48 --- M debian/copyright M src/Makefile.am R src/llc.c M src/llc.h M src/tbf.cpp M src/tbf_dl.cpp M src/tbf_ul.cpp M tests/edge/EdgeTest.cpp M tests/llc/LlcTest.cpp M tests/types/TypesTest.cpp 10 files changed, 131 insertions(+), 143 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/23/27623/1 diff --git a/debian/copyright b/debian/copyright index 4e9347e..4a2b5dd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -42,7 +42,7 @@ src/tbf_dl.cpp src/sba.cpp src/sba.h - src/llc.cpp + src/llc.c src/encoding.cpp src/encoding.h src/gprs_rlcmac.cpp @@ -50,6 +50,7 @@ Copyright: 2012 Ivan Klyuchnikov 2012 Andreas Eversberg <jolly(a)eversberg.eu> 2013 by Holger Hans Peter Freyther + 2022 by by Sysmocom s.f.m.c. GmbH License: GPL-2.0+ Files: src/gprs_rlcmac.h diff --git a/src/Makefile.am b/src/Makefile.am index 25fdab2..fedc96f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -73,7 +73,7 @@ encoding.cpp \ sba.c \ decoding.cpp \ - llc.cpp \ + llc.c \ rlc.cpp \ osmobts_sock.c \ gprs_codel.c \ diff --git a/src/llc.cpp b/src/llc.c similarity index 69% rename from src/llc.cpp rename to src/llc.c index 5cf2213..700585a 100644 --- a/src/llc.cpp +++ b/src/llc.c @@ -15,32 +15,36 @@ * GNU General Public License for more details. */ -#include <bts.h> #include <stdio.h> -extern "C" { #include <osmocom/core/msgb.h> -} +#include "bts.h" #include "pcu_utils.h" +#include "llc.h" + +void llc_init(struct gprs_llc *llc) +{ + llc_reset(llc); +} /* reset LLC frame */ -void gprs_llc::reset() +void llc_reset(struct gprs_llc *llc) { - index = 0; - length = 0; + llc->index = 0; + llc->length = 0; - memset(frame, 0x42, sizeof(frame)); + memset(llc->frame, 0x42, sizeof(llc->frame)); } -void gprs_llc::reset_frame_space() +void llc_reset_frame_space(struct gprs_llc *llc) { - index = 0; + llc->index = 0; } /* Put an Unconfirmed Information (UI) Dummy command, see GSM 44.064, 6.4.2.2 */ -void gprs_llc::put_dummy_frame(size_t req_len) +void llc_put_dummy_frame(struct gprs_llc *llc, size_t req_len) { /* The shortest dummy command (the spec requests at least 6 octets) */ static const uint8_t llc_dummy_command[] = { @@ -48,39 +52,34 @@ }; static const size_t max_dummy_command_len = 79; - put_frame(llc_dummy_command, sizeof(llc_dummy_command)); + llc_put_frame(llc, llc_dummy_command, sizeof(llc_dummy_command)); if (req_len > max_dummy_command_len) req_len = max_dummy_command_len; /* Add further stuffing, if the requested length exceeds the minimum * dummy command length */ - if (length < req_len) { - memset(&frame[length], 0x2b, req_len - length); - length = req_len; + if (llc->length < req_len) { + memset(&llc->frame[llc->length], 0x2b, req_len - llc->length); + llc->length = req_len; } } -void gprs_llc::put_frame(const uint8_t *data, size_t len) +void llc_put_frame(struct gprs_llc *llc, const uint8_t *data, size_t len) { /* only put frames when we are empty */ - OSMO_ASSERT(index == 0 && length == 0); - append_frame(data, len); + OSMO_ASSERT(llc->index == 0 && llc->length == 0); + llc_append_frame(llc, data, len); } -void gprs_llc::append_frame(const uint8_t *data, size_t len) +void llc_append_frame(struct gprs_llc *llc, const uint8_t *data, size_t len) { /* TODO: bounds check */ - memcpy(frame + length, data, len); - length += len; + memcpy(llc->frame + llc->length, data, len); + llc->length += len; } -void gprs_llc::init() -{ - reset(); -} - -bool gprs_llc::is_user_data_frame(uint8_t *data, size_t len) +bool llc_is_user_data_frame(const uint8_t *data, size_t len) { if (len < 2) return false; @@ -104,20 +103,20 @@ } -void gprs_llc_queue::enqueue(struct msgb *llc_msg, const struct timespec *expire_time) +void llc_queue_enqueue(struct gprs_llc_queue *q, struct msgb *llc_msg, const struct timespec *expire_time) { - MetaInfo *meta_storage; + struct MetaInfo *meta_storage; osmo_static_assert(sizeof(*meta_storage) <= sizeof(llc_msg->cb), info_does_not_fit); - queue_size += 1; - queue_octets += msgb_length(llc_msg); + q->queue_size += 1; + q->queue_octets += msgb_length(llc_msg); - meta_storage = (MetaInfo *)&llc_msg->cb[0]; + meta_storage = (struct MetaInfo *)&llc_msg->cb[0]; osmo_clock_gettime(CLOCK_MONOTONIC, &meta_storage->recv_time); meta_storage->expire_time = *expire_time; - msgb_enqueue(&queue, llc_msg); + msgb_enqueue(&q->queue, llc_msg); } void llc_queue_clear(struct gprs_llc_queue *q, struct gprs_rlcmac_bts *bts) @@ -159,8 +158,8 @@ msg = msg1; msg1 = NULL; } else { - const MetaInfo *mi1 = (MetaInfo *)&msg1->cb[0]; - const MetaInfo *mi2 = (MetaInfo *)&msg2->cb[0]; + const struct MetaInfo *mi1 = (struct MetaInfo *)&msg1->cb[0]; + const struct MetaInfo *mi2 = (struct MetaInfo *)&msg2->cb[0]; if (timespeccmp(&mi2->recv_time, &mi1->recv_time, >)) { msg = msg1; @@ -189,24 +188,24 @@ #define ALPHA 0.5f -struct msgb *gprs_llc_queue::dequeue(const MetaInfo **info) +struct msgb *llc_queue_dequeue(struct gprs_llc_queue *q, const struct MetaInfo **info) { struct msgb *msg; struct timespec *tv, tv_now, tv_result; uint32_t lifetime; - const MetaInfo *meta_storage; + const struct MetaInfo *meta_storage; - msg = msgb_dequeue(&queue); + msg = msgb_dequeue(&q->queue); if (!msg) return NULL; - meta_storage = (MetaInfo *)&msg->cb[0]; + meta_storage = (struct MetaInfo *)&msg->cb[0]; if (info) *info = meta_storage; - queue_size -= 1; - queue_octets -= msgb_length(msg); + q->queue_size -= 1; + q->queue_octets -= msgb_length(msg); /* take the second time */ osmo_clock_gettime(CLOCK_MONOTONIC, &tv_now); @@ -214,12 +213,12 @@ timespecsub(&tv_now, &meta_storage->recv_time, &tv_result); lifetime = tv_result.tv_sec*1000 + tv_result.tv_nsec/1000000; - avg_queue_delay = avg_queue_delay * ALPHA + lifetime * (1-ALPHA); + q->avg_queue_delay = q->avg_queue_delay * ALPHA + lifetime * (1-ALPHA); return msg; } -void gprs_llc_queue::calc_pdu_lifetime(struct gprs_rlcmac_bts *bts, const uint16_t pdu_delay_csec, struct timespec *tv) +void llc_queue_calc_pdu_lifetime(struct gprs_rlcmac_bts *bts, const uint16_t pdu_delay_csec, struct timespec *tv) { uint16_t delay_csec; if (bts->pcu->vty.force_llc_lifetime) @@ -241,8 +240,7 @@ timespecadd(&now, &csec, tv); } -bool gprs_llc_queue::is_frame_expired(const struct timespec *tv_now, - const struct timespec *tv) +bool llc_queue_is_frame_expired(const struct timespec *tv_now, const struct timespec *tv) { /* Timeout is infinite */ if (tv->tv_sec == 0 && tv->tv_nsec == 0) diff --git a/src/llc.h b/src/llc.h index e7548d4..a371b68 100644 --- a/src/llc.h +++ b/src/llc.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2013 by Holger Hans Peter Freyther + * Copyright (C) 2022 by by Sysmocom s.f.m.c. GmbH * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,15 +18,14 @@ #ifdef __cplusplus extern "C" { #endif - #include <osmocom/core/linuxlist.h> -#ifdef __cplusplus -} -#endif #include <stdint.h> #include <string.h> #include <time.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/msgb.h> + #define LLC_MAX_LEN 1543 struct gprs_rlcmac_bts; @@ -34,23 +34,19 @@ * I represent the LLC data to a MS */ struct gprs_llc { - -#ifdef __cplusplus - static bool is_user_data_frame(uint8_t *data, size_t len); - - void init(); - void reset(); - void reset_frame_space(); - - void put_frame(const uint8_t *data, size_t len); - void put_dummy_frame(size_t req_len); - void append_frame(const uint8_t *data, size_t len); -#endif - uint8_t frame[LLC_MAX_LEN]; /* current DL or UL frame */ uint16_t index; /* current write/read position of frame */ uint16_t length; /* len of current DL LLC_frame, 0 == no frame */ }; +bool llc_is_user_data_frame(const uint8_t *data, size_t len); + +void llc_init(struct gprs_llc *llc); +void llc_reset(struct gprs_llc *llc); +void llc_reset_frame_space(struct gprs_llc *llc); + +void llc_put_frame(struct gprs_llc *llc, const uint8_t *data, size_t len); +void llc_put_dummy_frame(struct gprs_llc *llc, size_t req_len); +void llc_append_frame(struct gprs_llc *llc, const uint8_t *data, size_t len); struct MetaInfo { struct timespec recv_time; @@ -60,28 +56,21 @@ * I store the LLC frames that come from the SGSN. */ struct gprs_llc_queue { -#ifdef __cplusplus - static void calc_pdu_lifetime(struct gprs_rlcmac_bts *bts, const uint16_t pdu_delay_csec, - struct timespec *tv); - static bool is_frame_expired(const struct timespec *now, - const struct timespec *tv); - static bool is_user_data_frame(uint8_t *data, size_t len); - - void enqueue(struct msgb *llc_msg, const struct timespec *expire_time); - struct msgb *dequeue(const MetaInfo **info = 0); -#endif uint32_t avg_queue_delay; /* Average delay of data going through the queue */ size_t queue_size; size_t queue_octets; struct llist_head queue; /* queued LLC DL data */ }; -#ifdef __cplusplus -extern "C" { -#endif +void llc_queue_calc_pdu_lifetime(struct gprs_rlcmac_bts *bts, const uint16_t pdu_delay_csec, + struct timespec *tv); +bool llc_queue_is_frame_expired(const struct timespec *tv_now, const struct timespec *tv); + void llc_queue_init(struct gprs_llc_queue *q); void llc_queue_clear(struct gprs_llc_queue *q, struct gprs_rlcmac_bts *bts); void llc_queue_move_and_merge(struct gprs_llc_queue *q, struct gprs_llc_queue *o); +void llc_queue_enqueue(struct gprs_llc_queue *q, struct msgb *llc_msg, const struct timespec *expire_time); +struct msgb *llc_queue_dequeue(struct gprs_llc_queue *q, const struct MetaInfo **info); static inline uint16_t llc_chunk_size(const struct gprs_llc *llc) { diff --git a/src/tbf.cpp b/src/tbf.cpp index c2eeb89..2c68ede 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -130,7 +130,7 @@ OSMO_ASSERT(dl_ass_fsm.fi); m_rlc.init(); - m_llc.init(); + llc_init(&m_llc); m_name_buf[0] = '\0'; diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index ec455c1..01b8f68 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -217,9 +217,9 @@ if (!llc_msg) return -ENOMEM; - gprs_llc_queue::calc_pdu_lifetime(bts, pdu_delay_csec, &expire_time); + llc_queue_calc_pdu_lifetime(bts, pdu_delay_csec, &expire_time); memcpy(msgb_put(llc_msg, len), data, len); - llc_queue()->enqueue(llc_msg, &expire_time); + llc_queue_enqueue(llc_queue(), llc_msg, &expire_time); start_llc_timer(); if (state_is(TBF_ST_WAIT_RELEASE)) { @@ -358,7 +358,7 @@ osmo_clock_gettime(CLOCK_MONOTONIC, &tv_now); timespecadd(&tv_now, &hyst_delta, &tv_now2); - while ((msg = llc_queue()->dequeue(&info))) { + while ((msg = llc_queue_dequeue(llc_queue(), &info))) { const struct timespec *tv_disc = &info->expire_time; const struct timespec *tv_recv = &info->recv_time; @@ -372,11 +372,11 @@ } /* Is the age below the low water mark? */ - if (!gprs_llc_queue::is_frame_expired(&tv_now2, tv_disc)) + if (!llc_queue_is_frame_expired(&tv_now2, tv_disc)) break; /* Is the age below the high water mark */ - if (!gprs_llc_queue::is_frame_expired(&tv_now, tv_disc)) { + if (!llc_queue_is_frame_expired(&tv_now, tv_disc)) { /* Has the previous message not been dropped? */ if (frames == 0) break; @@ -391,7 +391,7 @@ break; /* Is it a GMM message? */ - if (!gprs_llc::is_user_data_frame(msg->data, msg->len)) + if (!llc_is_user_data_frame(msg->data, msg->len)) break; } @@ -634,7 +634,7 @@ LOGPTBFDL(this, LOGL_DEBUG, "Dequeue next LLC (len=%d)\n", msg->len); - m_llc.put_frame(msg->data, msg->len); + llc_put_frame(&m_llc, msg->data, msg->len); bts_do_rate_ctr_inc(bts, CTR_LLC_FRAME_SCHED); msgb_free(msg); m_last_dl_drained_fn = -1; @@ -726,7 +726,7 @@ * "Delayed release of downlink Temporary Block Flow" */ /* A header will need to by added, so we just need * space-1 octets */ - m_llc.put_dummy_frame(space - 1); + llc_put_dummy_frame(&m_llc, space - 1); LOGPTBFDL(this, LOGL_DEBUG, "Empty chunk, added LLC dummy command of size %d, drained_since=%d\n", @@ -747,7 +747,7 @@ LOGPTBFDL(this, LOGL_DEBUG, "Complete DL frame, len=%d\n", llc_frame_length(&m_llc)); gprs_rlcmac_dl_bw(this, llc_frame_length(&m_llc)); bts_do_rate_ctr_add(bts, CTR_LLC_DL_BYTES, llc_frame_length(&m_llc)); - m_llc.reset(); + llc_reset(&m_llc); if (is_final) { request_dl_ack(); diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index 305daaa..21a7a76 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -283,7 +283,7 @@ i + 1, frame->offset, frame->length, frame->is_complete); - m_llc.append_frame(data + frame->offset, frame->length); + llc_append_frame(&m_llc, data + frame->offset, frame->length); llc_consume(&m_llc, frame->length); } @@ -292,7 +292,7 @@ LOGPTBFUL(this, LOGL_DEBUG, "complete UL frame len=%d\n", llc_frame_length(&m_llc)); snd_ul_ud(); bts_do_rate_ctr_add(bts, CTR_LLC_UL_BYTES, llc_frame_length(&m_llc)); - m_llc.reset(); + llc_reset(&m_llc); } } @@ -544,7 +544,7 @@ LOGP(DBSSGP, LOGL_INFO, "LLC [PCU -> SGSN] %s len=%d\n", tbf_name(this), llc_frame_length(&m_llc)); if (!bctx) { LOGP(DBSSGP, LOGL_ERROR, "No bctx\n"); - m_llc.reset_frame_space(); + llc_reset_frame_space(&m_llc); return -EIO; } @@ -556,7 +556,7 @@ qos_profile[2] = QOS_PROFILE; bssgp_tx_ul_ud(bctx, tlli(), qos_profile, llc_pdu); - m_llc.reset_frame_space(); + llc_reset_frame_space(&m_llc); return 0; } diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp index 134e856..02a3568 100644 --- a/tests/edge/EdgeTest.cpp +++ b/tests/edge/EdgeTest.cpp @@ -535,7 +535,7 @@ printf("=== start %s ===\n", __func__); - llc.init(); + llc_init(&llc); /* TS 44.060, B.1 */ cs = CS4; @@ -544,8 +544,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, 11); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 11); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -557,8 +557,8 @@ OSMO_ASSERT(count_payload == 11); OSMO_ASSERT(num_chunks == 1); - llc.reset(); - llc.put_frame(llc_data, 26); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 26); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -570,8 +570,8 @@ OSMO_ASSERT(count_payload == 26); OSMO_ASSERT(num_chunks == 2); - llc.reset(); - llc.put_frame(llc_data, 99); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 99); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -597,8 +597,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, 20); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 20); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -632,8 +632,8 @@ OSMO_ASSERT(count_payload == 1); OSMO_ASSERT(num_chunks == 1); - llc.reset(); - llc.put_frame(llc_data, 99); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 99); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -657,8 +657,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, 7); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 7); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -670,8 +670,8 @@ OSMO_ASSERT(count_payload == 7); OSMO_ASSERT(num_chunks == 1); - llc.reset(); - llc.put_frame(llc_data, 11); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 11); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -696,8 +696,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, 99); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 99); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -721,8 +721,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, 20); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 20); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -746,8 +746,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, 30); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 30); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -779,8 +779,8 @@ OSMO_ASSERT(count_payload == 10); OSMO_ASSERT(num_chunks == 1); - llc.reset(); - llc.put_frame(llc_data, 99); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 99); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -804,8 +804,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, 11); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 11); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -817,8 +817,8 @@ OSMO_ASSERT(count_payload == 11); OSMO_ASSERT(num_chunks == 1); - llc.reset(); - llc.put_frame(llc_data, 26); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 26); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -830,8 +830,8 @@ OSMO_ASSERT(count_payload == 26); OSMO_ASSERT(num_chunks == 2); - llc.reset(); - llc.put_frame(llc_data, 99); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 99); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -862,8 +862,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, 15); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 15); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -875,8 +875,8 @@ OSMO_ASSERT(count_payload == 15); OSMO_ASSERT(num_chunks == 1); - llc.reset(); - llc.put_frame(llc_data, 12); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 12); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -911,8 +911,8 @@ OSMO_ASSERT(count_payload == 0); OSMO_ASSERT(num_chunks == 1); - llc.reset(); - llc.put_frame(llc_data, 7); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 7); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -925,8 +925,8 @@ OSMO_ASSERT(count_payload == 7); OSMO_ASSERT(num_chunks == 2); - llc.reset(); - llc.put_frame(llc_data, 18); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 18); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -950,8 +950,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, 6); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 6); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -963,8 +963,8 @@ OSMO_ASSERT(count_payload == 6); OSMO_ASSERT(num_chunks == 1); - llc.reset(); - llc.put_frame(llc_data, 12); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 12); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -994,8 +994,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, rdbi.data_len); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, rdbi.data_len); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -1020,8 +1020,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, rdbi.data_len - 1); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, rdbi.data_len - 1); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -1048,8 +1048,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, rdbi.data_len - 2); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, rdbi.data_len - 2); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, diff --git a/tests/llc/LlcTest.cpp b/tests/llc/LlcTest.cpp index d98636a..b18f6de 100644 --- a/tests/llc/LlcTest.cpp +++ b/tests/llc/LlcTest.cpp @@ -56,7 +56,7 @@ memcpy(msg_data, data, len); - queue->enqueue(llc_msg, expire_time); + llc_queue_enqueue(queue, llc_msg, expire_time); } static void dequeue_and_check(gprs_llc_queue *queue, const uint8_t *exp_data, @@ -65,7 +65,7 @@ struct msgb *llc_msg; const MetaInfo *info_res; - llc_msg = queue->dequeue(&info_res); + llc_msg = llc_queue_dequeue(queue, &info_res); OSMO_ASSERT(llc_msg != NULL); fprintf(stderr, "dequeued msg, length %u (expected %zu), data %s\n", diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp index 3834acb..c497d07 100644 --- a/tests/types/TypesTest.cpp +++ b/tests/types/TypesTest.cpp @@ -58,20 +58,20 @@ uint8_t data[LLC_MAX_LEN] = {1, 2, 3, 4, }; uint8_t out; gprs_llc llc; - llc.init(); + llc_init(&llc); OSMO_ASSERT(llc_chunk_size(&llc) == 0); OSMO_ASSERT(llc_remaining_space(&llc) == LLC_MAX_LEN); OSMO_ASSERT(llc_frame_length(&llc) == 0); - llc.put_frame(data, 2); + llc_put_frame(&llc, data, 2); OSMO_ASSERT(llc_remaining_space(&llc) == LLC_MAX_LEN - 2); OSMO_ASSERT(llc_frame_length(&llc) == 2); OSMO_ASSERT(llc_chunk_size(&llc) == 2); OSMO_ASSERT(llc.frame[0] == 1); OSMO_ASSERT(llc.frame[1] == 2); - llc.append_frame(&data[3], 1); + llc_append_frame(&llc, &data[3], 1); OSMO_ASSERT(llc_remaining_space(&llc) == LLC_MAX_LEN - 3); OSMO_ASSERT(llc_frame_length(&llc) == 3); OSMO_ASSERT(llc_chunk_size(&llc) == 3); @@ -88,7 +88,7 @@ OSMO_ASSERT(llc.frame[2] == 4); /* now fill the frame */ - llc.append_frame(data, llc_remaining_space(&llc) - 1); + llc_append_frame(&llc, data, llc_remaining_space(&llc) - 1); OSMO_ASSERT(llc_fits_in_current_frame(&llc, 1)); OSMO_ASSERT(!llc_fits_in_current_frame(&llc, 2)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I250680ba581167d7398b2f734769c756cbb61c48 Gerrit-Change-Number: 27623 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

Change in osmo-pcu[master]: llc: Convert to C: s/m_//g

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27622 ) Change subject: llc: Convert to C: s/m_//g ...................................................................... llc: Convert to C: s/m_//g Change-Id: Ia5272841392110b87725e87a7e6824c17a70d6d1 --- M src/llc.cpp M src/llc.h M tests/tbf/TbfTest.cpp 3 files changed, 47 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/22/27622/1 diff --git a/src/llc.cpp b/src/llc.cpp index b118307..5cf2213 100644 --- a/src/llc.cpp +++ b/src/llc.cpp @@ -28,15 +28,15 @@ /* reset LLC frame */ void gprs_llc::reset() { - m_index = 0; - m_length = 0; + index = 0; + length = 0; memset(frame, 0x42, sizeof(frame)); } void gprs_llc::reset_frame_space() { - m_index = 0; + index = 0; } /* Put an Unconfirmed Information (UI) Dummy command, see GSM 44.064, 6.4.2.2 */ @@ -55,24 +55,24 @@ /* Add further stuffing, if the requested length exceeds the minimum * dummy command length */ - if (m_length < req_len) { - memset(&frame[m_length], 0x2b, req_len - m_length); - m_length = req_len; + if (length < req_len) { + memset(&frame[length], 0x2b, req_len - length); + length = req_len; } } void gprs_llc::put_frame(const uint8_t *data, size_t len) { /* only put frames when we are empty */ - OSMO_ASSERT(m_index == 0 && m_length == 0); + OSMO_ASSERT(index == 0 && length == 0); append_frame(data, len); } void gprs_llc::append_frame(const uint8_t *data, size_t len) { /* TODO: bounds check */ - memcpy(frame + m_length, data, len); - m_length += len; + memcpy(frame + length, data, len); + length += len; } void gprs_llc::init() @@ -97,10 +97,10 @@ void llc_queue_init(struct gprs_llc_queue *q) { - INIT_LLIST_HEAD(&q->m_queue); - q->m_queue_size = 0; - q->m_queue_octets = 0; - q->m_avg_queue_delay = 0; + INIT_LLIST_HEAD(&q->queue); + q->queue_size = 0; + q->queue_octets = 0; + q->avg_queue_delay = 0; } @@ -110,28 +110,28 @@ osmo_static_assert(sizeof(*meta_storage) <= sizeof(llc_msg->cb), info_does_not_fit); - m_queue_size += 1; - m_queue_octets += msgb_length(llc_msg); + queue_size += 1; + queue_octets += msgb_length(llc_msg); meta_storage = (MetaInfo *)&llc_msg->cb[0]; osmo_clock_gettime(CLOCK_MONOTONIC, &meta_storage->recv_time); meta_storage->expire_time = *expire_time; - msgb_enqueue(&m_queue, llc_msg); + msgb_enqueue(&queue, llc_msg); } void llc_queue_clear(struct gprs_llc_queue *q, struct gprs_rlcmac_bts *bts) { struct msgb *msg; - while ((msg = msgb_dequeue(&q->m_queue))) { + while ((msg = msgb_dequeue(&q->queue))) { if (bts) bts_do_rate_ctr_inc(bts, CTR_LLC_FRAME_DROPPED); msgb_free(msg); } - q->m_queue_size = 0; - q->m_queue_octets = 0; + q->queue_size = 0; + q->queue_octets = 0; } void llc_queue_move_and_merge(struct gprs_llc_queue *q, struct gprs_llc_queue *o) @@ -144,10 +144,10 @@ while (1) { if (msg1 == NULL) - msg1 = msgb_dequeue(&q->m_queue); + msg1 = msgb_dequeue(&q->queue); if (msg2 == NULL) - msg2 = msgb_dequeue(&o->m_queue); + msg2 = msgb_dequeue(&o->queue); if (msg1 == NULL && msg2 == NULL) break; @@ -176,15 +176,15 @@ queue_octets += msgb_length(msg); } - OSMO_ASSERT(llist_empty(&q->m_queue)); - OSMO_ASSERT(llist_empty(&o->m_queue)); + OSMO_ASSERT(llist_empty(&q->queue)); + OSMO_ASSERT(llist_empty(&o->queue)); - o->m_queue_size = 0; - o->m_queue_octets = 0; + o->queue_size = 0; + o->queue_octets = 0; - llist_splice_init(&new_queue, &q->m_queue); - q->m_queue_size = queue_size; - q->m_queue_octets = queue_octets; + llist_splice_init(&new_queue, &q->queue); + q->queue_size = queue_size; + q->queue_octets = queue_octets; } #define ALPHA 0.5f @@ -196,7 +196,7 @@ uint32_t lifetime; const MetaInfo *meta_storage; - msg = msgb_dequeue(&m_queue); + msg = msgb_dequeue(&queue); if (!msg) return NULL; @@ -205,8 +205,8 @@ if (info) *info = meta_storage; - m_queue_size -= 1; - m_queue_octets -= msgb_length(msg); + queue_size -= 1; + queue_octets -= msgb_length(msg); /* take the second time */ osmo_clock_gettime(CLOCK_MONOTONIC, &tv_now); @@ -214,7 +214,7 @@ timespecsub(&tv_now, &meta_storage->recv_time, &tv_result); lifetime = tv_result.tv_sec*1000 + tv_result.tv_nsec/1000000; - m_avg_queue_delay = m_avg_queue_delay * ALPHA + lifetime * (1-ALPHA); + avg_queue_delay = avg_queue_delay * ALPHA + lifetime * (1-ALPHA); return msg; } diff --git a/src/llc.h b/src/llc.h index 623ae49..e7548d4 100644 --- a/src/llc.h +++ b/src/llc.h @@ -48,8 +48,8 @@ #endif uint8_t frame[LLC_MAX_LEN]; /* current DL or UL frame */ - uint16_t m_index; /* current write/read position of frame */ - uint16_t m_length; /* len of current DL LLC_frame, 0 == no frame */ + uint16_t index; /* current write/read position of frame */ + uint16_t length; /* len of current DL LLC_frame, 0 == no frame */ }; struct MetaInfo { @@ -70,10 +70,10 @@ void enqueue(struct msgb *llc_msg, const struct timespec *expire_time); struct msgb *dequeue(const MetaInfo **info = 0); #endif - uint32_t m_avg_queue_delay; /* Average delay of data going through the queue */ - size_t m_queue_size; - size_t m_queue_octets; - struct llist_head m_queue; /* queued LLC DL data */ + uint32_t avg_queue_delay; /* Average delay of data going through the queue */ + size_t queue_size; + size_t queue_octets; + struct llist_head queue; /* queued LLC DL data */ }; #ifdef __cplusplus @@ -85,44 +85,44 @@ static inline uint16_t llc_chunk_size(const struct gprs_llc *llc) { - return llc->m_length - llc->m_index; + return llc->length - llc->index; } static inline uint16_t llc_remaining_space(const struct gprs_llc *llc) { - return LLC_MAX_LEN - llc->m_length; + return LLC_MAX_LEN - llc->length; } static inline uint16_t llc_frame_length(const struct gprs_llc *llc) { - return llc->m_length; + return llc->length; } static inline void llc_consume(struct gprs_llc *llc, size_t len) { - llc->m_index += len; + llc->index += len; } static inline void llc_consume_data(struct gprs_llc *llc, uint8_t *data, size_t len) { /* copy and increment index */ - memcpy(data, llc->frame + llc->m_index, len); + memcpy(data, llc->frame + llc->index, len); llc_consume(llc, len); } static inline bool llc_fits_in_current_frame(const struct gprs_llc *llc, uint8_t chunk_size) { - return llc->m_length + chunk_size <= LLC_MAX_LEN; + return llc->length + chunk_size <= LLC_MAX_LEN; } static inline size_t llc_queue_size(const struct gprs_llc_queue *q) { - return q->m_queue_size; + return q->queue_size; } static inline size_t llc_queue_octets(const struct gprs_llc_queue *q) { - return q->m_queue_octets; + return q->queue_octets; } #ifdef __cplusplus diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 9bea528..d077852 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -2528,7 +2528,7 @@ data_msg[5] = 0x0; pdch->rcv_block(data_msg, 49, *fn, &meas); - OSMO_ASSERT(ul_tbf->m_llc.m_index == 43); + OSMO_ASSERT(ul_tbf->m_llc.index == 43); return ul_tbf; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia5272841392110b87725e87a7e6824c17a70d6d1 Gerrit-Change-Number: 27622 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: always check return value of rsl_tlv_parse()

by laforge

Attention is currently required from: pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27620 ) Change subject: abis_rsl: always check return value of rsl_tlv_parse() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27620/comment/9073e797_aaec0ecc PS1, Line 1224: if (rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { > You probably need to check that msgb_l2len(msg) >= sizeof(*dh) before derreferencing dh below. […] abis_rsl_rcvmsg() is checking for 'sizeof(struct abis_rsl_common_hdr)' length. Since only dh->c ('c' is the common part) is dereferenced, it's fine. However, I think the check for the larger 'sizeof(struct abis_rsl_rx_dchan)' should go into the start of abis_rsl_rx_dchan(), whre we already dereference the chan_nr information element. Unrelated additional patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id022628934e7d51ce66cb255baa88f24bf5c918a Gerrit-Change-Number: 27620 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 17:42:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-bsc[master]: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27618 ) Change subject: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn ...................................................................... fix gsm_bts_get_cbch(): CBCH can be allocated on Cn According to 3GPP TS 45.002, table 3, unlike the CCCH+SDCCH/4+CBCH combination, which can only be allocated on C0/TS0, the SDCCH/8+CBCH can be allocated on C0..n/TS0..3. In other words, having CBCH on e.g. TRX1/C1 is perfectly legal. This is why in gsm_bts_get_cbch() we should check all transceivers, not just the C0. Change-Id: Ie79ccff4f8f0f1134757ec0c35e18b58081cc158 Related: SYS#5905 --- M src/osmo-bsc/bts.c 1 file changed, 11 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index d09aa48..843d711 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -562,22 +562,23 @@ /* return the gsm_lchan for the CBCH (if it exists at all) */ struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts) { - struct gsm_lchan *lchan = NULL; struct gsm_bts_trx *trx = bts->c0; + /* According to 3GPP TS 45.002, table 3, CBCH can be allocated + * either on C0/TS0 (CCCH+SDCCH4) or on C0..n/TS0..3 (SDCCH/8). */ if (trx->ts[0].pchan_from_config == GSM_PCHAN_CCCH_SDCCH4_CBCH) - lchan = &trx->ts[0].lchan[2]; - else { - int i; - for (i = 0; i < 8; i++) { - if (trx->ts[i].pchan_from_config == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) { - lchan = &trx->ts[i].lchan[2]; - break; - } + return &trx->ts[0].lchan[2]; /* C0/TS0 */ + + llist_for_each_entry(trx, &bts->trx_list, list) { /* C0..n */ + unsigned int tn; + for (tn = 0; tn < 4; tn++) { /* TS0..3 */ + struct gsm_bts_trx_ts *ts = &trx->ts[tn]; + if (ts->pchan_from_config == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) + return &ts->lchan[2]; } } - return lchan; + return NULL; } int gsm_set_bts_type(struct gsm_bts *bts, enum gsm_bts_type type) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie79ccff4f8f0f1134757ec0c35e18b58081cc158 Gerrit-Change-Number: 27618 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

Change in osmo-bsc[master]: cbch_scheduler: cosmetic: s/bts_cbch_timer/bts_cbch_timer_cb/

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27617 ) Change subject: cbch_scheduler: cosmetic: s/bts_cbch_timer/bts_cbch_timer_cb/ ...................................................................... cbch_scheduler: cosmetic: s/bts_cbch_timer/bts_cbch_timer_cb/ Change-Id: Ibff3045d8066b644b437e46330848ebadfb373fd --- M src/osmo-bsc/cbch_scheduler.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/cbch_scheduler.c b/src/osmo-bsc/cbch_scheduler.c index 1bdf5e7..c66f743 100644 --- a/src/osmo-bsc/cbch_scheduler.c +++ b/src/osmo-bsc/cbch_scheduler.c @@ -246,7 +246,7 @@ bts_smscb_page_done(cstate, page); } -static void bts_cbch_timer(void *data) +static void bts_cbch_timer_cb(void *data) { struct gsm_bts *bts = (struct gsm_bts *)data; @@ -259,7 +259,7 @@ /* There is one SMSCB message (page) per eight 51-multiframes, i.e. 1.882 seconds */ void bts_cbch_timer_schedule(struct gsm_bts *bts) { - osmo_timer_setup(&bts->cbch_timer, &bts_cbch_timer, bts); + osmo_timer_setup(&bts->cbch_timer, &bts_cbch_timer_cb, bts); osmo_timer_schedule(&bts->cbch_timer, 1, 882920); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibff3045d8066b644b437e46330848ebadfb373fd Gerrit-Change-Number: 27617 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

Change in osmo-bsc[master]: fix bts_cbch_send_one(): use proper RSL Channel Number

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27619 ) Change subject: fix bts_cbch_send_one(): use proper RSL Channel Number ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: the question is whether it really matters, and whether it is really specified. 48.058 section 9.3.1 doesn't give any encoding for the CBCH... and Section 8.5.8 doesn't really state anything about how to populate the Channel Number IE in this situation either. Since the CBCH handling ina BTS is something "central" that only exists once, it doesn't really make sense at all sending it to a specific lchan at a specific TS. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib5fd00bfd5e762ce0a56e73816162d0555976f8d Gerrit-Change-Number: 27619 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 17:37:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-bts[master]: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn

by pespin

Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27621 ) Change subject: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib5976783b53521047fbdfc18e0e236e8bce8eaae Gerrit-Change-Number: 27621 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 17:33:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-bsc[master]: cbch_scheduler: cosmetic: s/bts_cbch_timer/bts_cbch_timer_cb/

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27617 ) Change subject: cbch_scheduler: cosmetic: s/bts_cbch_timer/bts_cbch_timer_cb/ ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibff3045d8066b644b437e46330848ebadfb373fd Gerrit-Change-Number: 27617 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 17:33:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-bsc[master]: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn

by laforge

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27618 ) Change subject: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie79ccff4f8f0f1134757ec0c35e18b58081cc158 Gerrit-Change-Number: 27618 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 17:18:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-bts[master]: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn

by fixeria

Attention is currently required from: laforge, pespin. Hello laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/27621 to look at the new patch set (#3). Change subject: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn ...................................................................... fix gsm_bts_get_cbch(): CBCH can be allocated on Cn According to 3GPP TS 45.002, table 3, unlike the CCCH+SDCCH/4+CBCH combination, which can only be allocated on C0/TS0, the SDCCH/8+CBCH can be allocated on C0..n/TS0..3. In other words, having CBCH on e.g. C1/TS2 is perfectly legal. This is why in gsm_bts_get_cbch() we should check all transceivers, not just the C0. Without this change osmo-bts does not send CBCH Load Indications at all if the CBCH is allocated on C1..n. Change-Id: Ib5976783b53521047fbdfc18e0e236e8bce8eaae Related: osmo-bsc.git Ie79ccff4f8f0f1134757ec0c35e18b58081cc158 Related: SYS#5905 --- M src/common/bts.c 1 file changed, 11 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/21/27621/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib5976783b53521047fbdfc18e0e236e8bce8eaae Gerrit-Change-Number: 27621 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years

1
0
0 0

Change in osmo-bts[master]: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn

by fixeria

Attention is currently required from: laforge, pespin. Hello laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/27621 to look at the new patch set (#2). Change subject: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn ...................................................................... fix gsm_bts_get_cbch(): CBCH can be allocated on Cn According to 3GPP TS 45.002, table 3, unlike the CCCH+SDCCH/4+CBCH combination, which can only be allocated on C0/TS0, the SDCCH/8+CBCH can be allocated on C0..n/TS0..3. In other words, having CBCH on e.g. C1/TS2 is perfectly legal. This is why in gsm_bts_get_cbch() we should check all transceivers, not just the C0. Without this change osmo-bts does not send CBCH Load Indications at all if the CBCH is allocated on C1..n. Change-Id: Ib5976783b53521047fbdfc18e0e236e8bce8eaae Related: osmo-bsc.git Ie79ccff4f8f0f1134757ec0c35e18b58081cc158 Related: SYS#5905 --- M src/common/bts.c 1 file changed, 10 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/21/27621/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib5976783b53521047fbdfc18e0e236e8bce8eaae Gerrit-Change-Number: 27621 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years

1
0
0 0

Change in osmo-bts[master]: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27621 ) Change subject: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn ...................................................................... fix gsm_bts_get_cbch(): CBCH can be allocated on Cn According to 3GPP TS 45.002, table 3, unlike the CCCH+SDCCH/4+CBCH combination, which can only be allocated on C0/TS0, the SDCCH/8+CBCH can be allocated on C0..n/TS0..3. In other words, having CBCH on e.g. C1/TS2 is perfectly legal. This is why in gsm_bts_get_cbch() we should check all transceivers, not just the C0. Change-Id: Ib5976783b53521047fbdfc18e0e236e8bce8eaae Related: osmo-bsc.git Ie79ccff4f8f0f1134757ec0c35e18b58081cc158 Related: SYS#5905 --- M src/common/bts.c 1 file changed, 10 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/21/27621/1 diff --git a/src/common/bts.c b/src/common/bts.c index 4e49c45..d9969d3 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -883,18 +883,19 @@ /* return the gsm_lchan for the CBCH (if it exists at all) */ struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts) { - struct gsm_lchan *lchan = NULL; struct gsm_bts_trx *trx = bts->c0; + /* According to 3GPP TS 45.002, table 3, CBCH can be allocated + * either on C0/TS0 (CCCH+SDCCH4) or on C0..n/TS0..3 (SDCCH/8). */ if (trx->ts[0].pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) - lchan = &trx->ts[0].lchan[2]; - else { - int i; - for (i = 0; i < 8; i++) { - if (trx->ts[i].pchan == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) { - lchan = &trx->ts[i].lchan[2]; - break; - } + return &trx->ts[0].lchan[2]; /* C0/TS0 */ + + llist_for_each_entry(trx, &bts->trx_list, list) { /* C0..n */ + unsigned int tn; + for (tn = 0; tn <= 3; tn++) { /* TS0..3 */ + struct gsm_bts_trx_ts *ts = &trx->ts[tn]; + if (ts->pchan_from_config == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) + return &ts->lchan[2]; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib5976783b53521047fbdfc18e0e236e8bce8eaae Gerrit-Change-Number: 27621 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

Change in osmo-bsc[master]: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27618 ) Change subject: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn ...................................................................... Patch Set 2: (1 comment) File src/osmo-bsc/bts.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27618/comment/30d580c9_1c3ef056 PS1, Line 570: llist_for_each_entry(trx, &bts->trx_list, list) { /* C0..n */ > Add reference to "3GPP TS 45. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie79ccff4f8f0f1134757ec0c35e18b58081cc158 Gerrit-Change-Number: 27618 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 16:51:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-bsc[master]: cbch_scheduler: cosmetic: s/bts_cbch_timer/bts_cbch_timer_cb/

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27617 to look at the new patch set (#2). Change subject: cbch_scheduler: cosmetic: s/bts_cbch_timer/bts_cbch_timer_cb/ ...................................................................... cbch_scheduler: cosmetic: s/bts_cbch_timer/bts_cbch_timer_cb/ Change-Id: Ibff3045d8066b644b437e46330848ebadfb373fd --- M src/osmo-bsc/cbch_scheduler.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/17/27617/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibff3045d8066b644b437e46330848ebadfb373fd Gerrit-Change-Number: 27617 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years

1
0
0 0

Change in osmo-bsc[master]: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27618 to look at the new patch set (#2). Change subject: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn ...................................................................... fix gsm_bts_get_cbch(): CBCH can be allocated on Cn According to 3GPP TS 45.002, table 3, unlike the CCCH+SDCCH/4+CBCH combination, which can only be allocated on C0/TS0, the SDCCH/8+CBCH can be allocated on C0..n/TS0..3. In other words, having CBCH on e.g. TRX1/C1 is perfectly legal. This is why in gsm_bts_get_cbch() we should check all transceivers, not just the C0. Change-Id: Ie79ccff4f8f0f1134757ec0c35e18b58081cc158 Related: SYS#5905 --- M src/osmo-bsc/bts.c 1 file changed, 11 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/18/27618/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie79ccff4f8f0f1134757ec0c35e18b58081cc158 Gerrit-Change-Number: 27618 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: always check return value of rsl_tlv_parse()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27620 ) Change subject: abis_rsl: always check return value of rsl_tlv_parse() ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27620/comment/b9ee5aad_1cd26128 PS1, Line 1224: if (rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { You probably need to check that msgb_l2len(msg) >= sizeof(*dh) before derreferencing dh below. Same applies for all new blocks you are adding. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id022628934e7d51ce66cb255baa88f24bf5c918a Gerrit-Change-Number: 27620 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 16:21:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-bsc[master]: fix bts_cbch_send_one(): use proper RSL Channel Number

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27619 ) Change subject: fix bts_cbch_send_one(): use proper RSL Channel Number ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib5fd00bfd5e762ce0a56e73816162d0555976f8d Gerrit-Change-Number: 27619 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 16:19:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-bsc[master]: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27618 ) Change subject: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/osmo-bsc/bts.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27618/comment/b8512560_9002642d PS1, Line 570: llist_for_each_entry(trx, &bts->trx_list, list) { /* C0..n */ Add reference to "3GPP TS 45.002, table 3" here? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie79ccff4f8f0f1134757ec0c35e18b58081cc158 Gerrit-Change-Number: 27618 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 16:17:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: always check return value of rsl_tlv_parse()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27620 ) Change subject: abis_rsl: always check return value of rsl_tlv_parse() ...................................................................... abis_rsl: always check return value of rsl_tlv_parse() Change-Id: Id022628934e7d51ce66cb255baa88f24bf5c918a Related: SYS#5905 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 61 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/20/27620/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 6681875..8730954 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1221,7 +1221,12 @@ return -EINVAL; } - rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } + cause_p = rsl_cause(&tp); LOG_LCHAN(lchan, LOGL_ERROR, "CHANNEL ACTIVATE NACK%s\n", rsl_cause_name(&tp)); @@ -1241,7 +1246,12 @@ struct tlv_parsed tp; const uint8_t *cause_p; - rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } + cause_p = rsl_cause(&tp); LOG_LCHAN(lchan, LOGL_ERROR, "CONNECTION FAIL%s\n", rsl_cause_name(&tp)); @@ -1385,7 +1395,11 @@ memset(mr, 0, sizeof(*mr)); mr->lchan = msg->lchan; - rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } if (!TLVP_PRESENT(&tp, RSL_IE_MEAS_RES_NR) || !TLVP_PRESENT(&tp, RSL_IE_UPLINK_MEAS) || @@ -1466,7 +1480,11 @@ .msg = msg, }; - rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } if (TLVP_PRESENT(&tp, RSL_IE_ACCESS_DELAY)) d.access_delay = TLVP_VAL(&tp, RSL_IE_ACCESS_DELAY); @@ -1602,7 +1620,11 @@ struct tlv_parsed tp; struct e1inp_sign_link *sign_link = msg->dst; - rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg)-sizeof(*rslh)); + if (rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg) - sizeof(*rslh)) < 0) { + LOGP(DRSL, LOGL_ERROR, "%s Failed to parse RSL %s\n", + gsm_trx_name(sign_link->trx), rsl_or_ipac_msg_name(rslh->msg_type)); + return -EINVAL; + } LOGP(DRSL, LOGL_ERROR, "%s ERROR REPORT%s\n", gsm_trx_name(sign_link->trx), rsl_cause_name(&tp)); @@ -1619,7 +1641,7 @@ struct gsm_bts_trx *trx = sign_link->trx; struct gsm_lchan *lchan; int ts_nr; - int rc, i; + int i; LOGP(DRSL, LOGL_DEBUG, "%s Rx Resource Indication\n", gsm_trx_name(trx)); @@ -1633,9 +1655,9 @@ } } - rc = rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg) - sizeof(*rslh)); - if (rc < 0) { - LOGP(DRSL, LOGL_ERROR, "Rx Resource Indication: failed to parse the message\n"); + if (rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg) - sizeof(*rslh)) < 0) { + LOGP(DRSL, LOGL_ERROR, "%s Failed to parse RSL %s\n", + gsm_trx_name(trx), rsl_or_ipac_msg_name(rslh->msg_type)); return -EINVAL; } @@ -2355,7 +2377,12 @@ struct tlv_parsed tp; uint8_t slot_count; - rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg) - sizeof(*rslh)); + if (rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg) - sizeof(*rslh)) < 0) { + LOGP(DRSL, LOGL_ERROR, "%s Failed to parse RSL %s\n", + gsm_trx_name(sign_link->trx), rsl_or_ipac_msg_name(rslh->c.msg_type)); + return -EINVAL; + } + if (!TLVP_PRESENT(&tp, RSL_IE_CBCH_LOAD_INFO)) { LOG_BTS(bts, DRSL, LOGL_ERROR, "CBCH LOAD IND without mandatory CBCH Load Info IE\n"); return -1; @@ -2443,7 +2470,12 @@ struct abis_rsl_rll_hdr *rllh = msgb_l2(msg); uint8_t rlm_cause; - rsl_tlv_parse(&tp, rllh->data, msgb_l2len(msg) - sizeof(*rllh)); + if (rsl_tlv_parse(&tp, rllh->data, msgb_l2len(msg) - sizeof(*rllh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(rllh->c.msg_type)); + return -EINVAL; + } + if (!TLVP_PRESENT(&tp, RSL_IE_RLM_CAUSE)) { LOG_LCHAN(msg->lchan, LOGL_ERROR, "ERROR INDICATION without mandantory cause.\n"); return -1; @@ -2809,7 +2841,12 @@ * address and port number to which it has bound the given logical * channel */ - rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } + if (!TLVP_PRESENT(&tv, RSL_IE_IPAC_LOCAL_PORT) || !TLVP_PRESENT(&tv, RSL_IE_IPAC_LOCAL_IP) || !TLVP_PRESENT(&tv, RSL_IE_IPAC_CONN_ID)) { @@ -2854,7 +2891,12 @@ * it now tells us the IP address and port number to which it has * connected the given logical channel */ - rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } + ipac_parse_rtp(lchan, &tv, "MDCX"); osmo_fsm_inst_dispatch(lchan->fi_rtp, LCHAN_RTP_EV_IPACC_MDCX_ACK, 0); @@ -2882,7 +2924,12 @@ struct abis_rsl_dchan_hdr *dh = msgb_l2(msg); struct tlv_parsed tv; - rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } + LOG_LCHAN(msg->lchan, LOGL_NOTICE, "Rx IPACC DLCX IND%s\n", rsl_cause_name(&tv)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id022628934e7d51ce66cb255baa88f24bf5c918a Gerrit-Change-Number: 27620 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

Change in osmo-upf[master]: libosmo-gtlv: add generic TLV de- and encoder

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/27217 ) Change subject: libosmo-gtlv: add generic TLV de- and encoder ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: there is not much difference in effort between moving to libosmocore now or later. I think I'd rather merge to osmo-upf.git first and then see about the move to libosmocore ... would marginally speed up the process of merging patches here. -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/27217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ib0fd00d9f288ffe13b7e67701f3e47073587404a Gerrit-Change-Number: 27217 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 14:46:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years

1
0
0 0

Change in osmo-bsc[master]: hodec2: show reported ho oscillation from bad rxqual

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27595 ) Change subject: hodec2: show reported ho oscillation from bad rxqual ...................................................................... hodec2: show reported ho oscillation from bad rxqual First show the problem. Related: SYS#5911 Change-Id: I51f3101901492ae742d8e56d6eed2725408216cb --- M tests/handover/test_rxqual.ho_vty 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/handover/test_rxqual.ho_vty b/tests/handover/test_rxqual.ho_vty index 4dc5c24..f64de52 100644 --- a/tests/handover/test_rxqual.ho_vty +++ b/tests/handover/test_rxqual.ho_vty @@ -19,3 +19,11 @@ expect-ts-use trx 0 0 states * - - - - - - - expect-ts-use trx 1 0 states * TCH/F - - - - - - +# Now the channel is on bts 1, which has lower rxlev than bts 0. +# The result is an undesired ho oscillation +meas-rep lchan 1 0 1 0 rxlev 30 rxqual 0 ta 0 neighbors 40 +expect-ho from lchan 1 0 1 0 to lchan 0 0 1 0 +meas-rep repeat 10 lchan 0 0 1 0 rxlev 40 rxqual 6 ta 0 neighbors 30 +expect-ho from lchan 0 0 1 0 to lchan 1 0 1 0 +meas-rep lchan 1 0 1 0 rxlev 30 rxqual 0 ta 0 neighbors 40 +expect-ho from lchan 1 0 1 0 to lchan 0 0 1 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I51f3101901492ae742d8e56d6eed2725408216cb Gerrit-Change-Number: 27595 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

Change in osmo-bsc[master]: hodec2: add penalty-time low-rxqual-ho

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27596 ) Change subject: hodec2: add penalty-time low-rxqual-ho ...................................................................... hodec2: add penalty-time low-rxqual-ho When bad RxQual causes handover to a cell with weaker RxLev, then handover oscillation *will* happen, as shown in test_rxqual.ho_vty. Introduce a penalty timer for a cell where we had bad RxQual. This delays handover back to the cell with stronger RxLev by the penalty timeout; hopefully the interference is gone after the timeout. Usually, we set new configuration elements so that osmo-bsc behaves the same as before the config item was added. In this instance, this makes no sense, because no-one ever wants handover oscillation from bad RxQual, which is guaranteed to happen without the new penalty timer. Set it to 60 seconds by default, same as other penalty timers. Related: SYS#5911 Change-Id: I057b156604a104a26a7ce45d1c7adadbf452c932 --- M include/osmocom/bsc/handover_cfg.h M src/osmo-bsc/handover_decision_2.c M tests/handover/test_rxqual.ho_vty M tests/handover_cfg.vty 4 files changed, 44 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/bsc/handover_cfg.h b/include/osmocom/bsc/handover_cfg.h index 2bd2681..7d68e63 100644 --- a/include/osmocom/bsc/handover_cfg.h +++ b/include/osmocom/bsc/handover_cfg.h @@ -268,6 +268,13 @@ "Time to suspend re-assignment after an lchan was re-assigned because of low RxQual\n" \ "Seconds\n") \ \ + HO_CFG_ONE_MEMBER(int, hodec2_penalty_low_rxqual_ho, 60, \ + "handover2 ", "penalty-time low-rxqual-ho", "<0-99999>", atoi, "%d", as_is, \ + HO_CFG_STR_HANDOVER2 \ + HO_CFG_STR_PENALTY_TIME \ + "Time to suspend handover back to a cell after bad RxQual caused handover away from it\n" \ + "Seconds\n") \ + \ HO_CFG_ONE_MEMBER(int, hodec2_retries, 0, \ "handover2 ", "retries", "<0-9>", atoi, "%d", as_is, \ HO_CFG_STR_HANDOVER2 \ diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index 14bc2d4..8627910 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -914,6 +914,19 @@ full_rate ? "TCH/F" : "TCH/H", ho_reason_name(global_ho_reason)); handover_request(&req); + + /* Apply penalty timer hodec2_penalty_low_rxqual_ho */ + if (global_ho_reason == HO_REASON_INTERFERENCE + || global_ho_reason == HO_REASON_BAD_QUALITY) { + struct gsm0808_cell_id bts_id; + struct gsm_subscriber_connection *conn = c->current.lchan->conn; + int timeout = ho_get_hodec2_penalty_low_rxqual_ho(c->current.bts->ho); + gsm_bts_cell_id(&bts_id, c->current.bts); + LOGPHOCAND(c, LOGL_DEBUG, "Applying penalty-time low-rxqual-ho %d s on bts %u (%s), reason: %s\n", + timeout, c->current.bts->nr, gsm0808_cell_id_name_c(OTC_SELECT, &bts_id), + ho_reason_name(global_ho_reason)); + penalty_timers_add(conn, &conn->hodec2.penalty_timers, &bts_id, timeout); + } } return 0; } diff --git a/tests/handover/test_rxqual.ho_vty b/tests/handover/test_rxqual.ho_vty index f64de52..6f86cf4 100644 --- a/tests/handover/test_rxqual.ho_vty +++ b/tests/handover/test_rxqual.ho_vty @@ -10,6 +10,10 @@ # See Performance Enhancements in a Frequency Hopping GSM Network (Nielsen Wigard 2002), Chapter # 2.1.1, "Interference" in the list of triggers on p.157. +# first show undesired oscillation when penalty-time low-rxqual-ho is disabled +network + handover2 penalty-time low-rxqual-ho 0 + create-n-bts 2 set-ts-use trx 0 0 states * TCH/F - - - - - - meas-rep repeat 9 lchan 0 0 1 0 rxlev 40 rxqual 6 ta 0 neighbors 30 @@ -20,10 +24,26 @@ expect-ts-use trx 1 0 states * TCH/F - - - - - - # Now the channel is on bts 1, which has lower rxlev than bts 0. -# The result is an undesired ho oscillation +# The result is an undesired ho oscillation, because the penalty timer is zero meas-rep lchan 1 0 1 0 rxlev 30 rxqual 0 ta 0 neighbors 40 expect-ho from lchan 1 0 1 0 to lchan 0 0 1 0 + +# Set a proper penalty timeout and report bad-rxqual again +network + handover2 penalty-time low-rxqual-ho 10 meas-rep repeat 10 lchan 0 0 1 0 rxlev 40 rxqual 6 ta 0 neighbors 30 expect-ho from lchan 0 0 1 0 to lchan 1 0 1 0 + +# This time the penalty timer prevents oscillation +meas-rep repeat 10 lchan 1 0 1 0 rxlev 30 rxqual 0 ta 0 neighbors 40 +expect-no-chan + +# After the penalty timeout passes, we do go back to the cell with stronger rxlev +wait 10 meas-rep lchan 1 0 1 0 rxlev 30 rxqual 0 ta 0 neighbors 40 expect-ho from lchan 1 0 1 0 to lchan 0 0 1 0 +# If the rxqual is still bad here after the penalty timeout, well, then we quickly snap back to the weaker cell, once +meas-rep repeat 10 lchan 0 0 1 0 rxlev 40 rxqual 6 ta 0 neighbors 30 +expect-ho from lchan 0 0 1 0 to lchan 1 0 1 0 +meas-rep repeat 10 lchan 1 0 1 0 rxlev 30 rxqual 0 ta 0 neighbors 40 +expect-no-chan diff --git a/tests/handover_cfg.vty b/tests/handover_cfg.vty index eb3ec3e..fb3c73c 100644 --- a/tests/handover_cfg.vty +++ b/tests/handover_cfg.vty @@ -190,6 +190,7 @@ handover2 penalty-time failed-ho (<0-99999>|default) handover2 penalty-time failed-assignment (<0-99999>|default) handover2 penalty-time low-rxqual-assignment (<0-99999>|default) + handover2 penalty-time low-rxqual-ho (<0-99999>|default) handover2 retries (<0-9>|default) handover2 congestion-check (disabled|<1-999>|now) ... @@ -389,6 +390,7 @@ failed-ho Time to suspend handover for a subscriber after a failed handover into this cell; see also 'handover2 retries' failed-assignment Time to suspend handover for a subscriber after a failed re-assignment within this cell; see also 'handover2 retries' low-rxqual-assignment Time to suspend re-assignment after an lchan was re-assigned because of low RxQual + low-rxqual-ho Time to suspend handover back to a cell after bad RxQual caused handover away from it OsmoBSC(config-net)# handover2 penalty-time max-distance ? <0-99999> Seconds @@ -613,6 +615,7 @@ failed-ho Time to suspend handover for a subscriber after a failed handover into this cell; see also 'handover2 retries' failed-assignment Time to suspend handover for a subscriber after a failed re-assignment within this cell; see also 'handover2 retries' low-rxqual-assignment Time to suspend re-assignment after an lchan was re-assigned because of low RxQual + low-rxqual-ho Time to suspend handover back to a cell after bad RxQual caused handover away from it OsmoBSC(config-net-bts)# handover2 penalty-time max-distance ? <0-99999> Seconds -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I057b156604a104a26a7ce45d1c7adadbf452c932 Gerrit-Change-Number: 27596 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

Change in osmo-bsc[master]: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27618 ) Change subject: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn ...................................................................... fix gsm_bts_get_cbch(): CBCH can be allocated on Cn According to 3GPP TS 45.002, table 3, unlike the CCCH+SDCCH/4+CBCH combination, which can only be allocated on C0/TS0, the SDCCH/8+CBCH can be allocated on C0..n/TS0..3. In other words, having CBCH on e.g. TRX1/C1 is perfectly legal. This is why in gsm_bts_get_cbch() we should check all transceivers, not just the C0. Change-Id: Ie79ccff4f8f0f1134757ec0c35e18b58081cc158 Related: SYS#5905 --- M src/osmo-bsc/bts.c 1 file changed, 9 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/18/27618/1 diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index d09aa48..e0757db 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -562,22 +562,21 @@ /* return the gsm_lchan for the CBCH (if it exists at all) */ struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts) { - struct gsm_lchan *lchan = NULL; struct gsm_bts_trx *trx = bts->c0; if (trx->ts[0].pchan_from_config == GSM_PCHAN_CCCH_SDCCH4_CBCH) - lchan = &trx->ts[0].lchan[2]; - else { - int i; - for (i = 0; i < 8; i++) { - if (trx->ts[i].pchan_from_config == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) { - lchan = &trx->ts[i].lchan[2]; - break; - } + return &trx->ts[0].lchan[2]; + + llist_for_each_entry(trx, &bts->trx_list, list) { /* C0..n */ + unsigned int tn; + for (tn = 0; tn < 4; tn++) { /* TS0..3 */ + struct gsm_bts_trx_ts *ts = &trx->ts[tn]; + if (ts->pchan_from_config == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) + return &ts->lchan[2]; } } - return lchan; + return NULL; } int gsm_set_bts_type(struct gsm_bts *bts, enum gsm_bts_type type) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie79ccff4f8f0f1134757ec0c35e18b58081cc158 Gerrit-Change-Number: 27618 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

Change in osmo-bsc[master]: fix bts_cbch_send_one(): use proper RSL Channel Number

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27619 ) Change subject: fix bts_cbch_send_one(): use proper RSL Channel Number ...................................................................... fix bts_cbch_send_one(): use proper RSL Channel Number Currently bts_cbch_send_one() blindly assumes that CBCH is on C0/TS0. According to 3GPP TS 45.002, table 3, it can also be on C0..n/TS0..3. Change-Id: Ib5fd00bfd5e762ce0a56e73816162d0555976f8d Related: SYS#5905 --- M src/osmo-bsc/cbch_scheduler.c 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/19/27619/1 diff --git a/src/osmo-bsc/cbch_scheduler.c b/src/osmo-bsc/cbch_scheduler.c index c66f743..891edb5 100644 --- a/src/osmo-bsc/cbch_scheduler.c +++ b/src/osmo-bsc/cbch_scheduler.c @@ -202,8 +202,10 @@ { struct bts_smscb_page *page; struct gsm_bts *bts = cstate->bts; + const struct gsm_lchan *cbch_lchan; struct rsl_ie_cb_cmd_type cb_cmd; bool is_extended = false; + uint8_t chan_nr; if (cstate == &bts->cbch_extended) is_extended = true; @@ -240,7 +242,16 @@ default: osmo_panic("SMSCB Page must have 1..4 blocks, not %d\n", page->num_blocks); } - rsl_sms_cb_command(bts, RSL_CHAN_SDCCH4_ACCH, cb_cmd, is_extended, + + /* Get RSL Channel Number for the CBCH logical channel */ + if ((cbch_lchan = gsm_bts_get_cbch(bts)) == NULL) + return; + if (cbch_lchan->ts->pchan_is == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) + chan_nr = RSL_CHAN_SDCCH8_ACCH | cbch_lchan->ts->nr; + else + chan_nr = RSL_CHAN_SDCCH4_ACCH; /* always TS0 */ + + rsl_sms_cb_command(bts, chan_nr, cb_cmd, is_extended, page->data, sizeof(page->data)); bts_smscb_page_done(cstate, page); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib5fd00bfd5e762ce0a56e73816162d0555976f8d Gerrit-Change-Number: 27619 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

2024

2023

2022

gerrit-log March 2022