- gerrit-log - lists.osmocom.org

[S] Change in osmo-bts[master]: osmo-bts-trx: fix scheduling of DL FACCH/H for TCH/H4.8 and TCH/H2.4
by falconia 08 Nov '24

08 Nov '24

Attention is currently required from: fixeria. falconia has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/38723?usp=email ) Change subject: osmo-bts-trx: fix scheduling of DL FACCH/H for TCH/H4.8 and TCH/H2.4 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38723?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idb753fa5c87dc79e9ad19e550680de6f462eed69 Gerrit-Change-Number: 38723 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Nov 2024 21:50:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmocom-bb[master]: trxcon/l1sched: replace old API with sched_tchh_ul_facch_map[]
by fixeria 08 Nov '24

08 Nov '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38725?usp=email ) Change subject: trxcon/l1sched: replace old API with sched_tchh_ul_facch_map[] ...................................................................... trxcon/l1sched: replace old API with sched_tchh_ul_facch_map[] The new UL FACCH/H mapping was the only missing bit that finally allows us to remove the old API which predates the lookup tables. Change-Id: I63ae94bc2edd528b1f9fd2c505b39a43ba1742fd --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_lchan_tchh.c 2 files changed, 16 insertions(+), 119 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/25/38725/1 diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 6c5a31e..39400cf 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -390,20 +390,6 @@ const char *l1sched_burst_mask2str(const uint32_t *mask, int bits); -/* Interleaved TCH/H block TDMA frame mapping */ -bool l1sched_tchh_block_map_fn(enum l1sched_lchan_type chan, - uint32_t fn, bool ul, bool facch, bool start); - -#define l1sched_tchh_traffic_start(chan, fn, ul) \ - l1sched_tchh_block_map_fn(chan, fn, ul, 0, 1) -#define l1sched_tchh_traffic_end(chan, fn, ul) \ - l1sched_tchh_block_map_fn(chan, fn, ul, 0, 0) - -#define l1sched_tchh_facch_start(chan, fn, ul) \ - l1sched_tchh_block_map_fn(chan, fn, ul, 1, 1) -#define l1sched_tchh_facch_end(chan, fn, ul) \ - l1sched_tchh_block_map_fn(chan, fn, ul, 1, 0) - /* Measurement history */ void l1sched_lchan_meas_push(struct l1sched_lchan_state *lchan, const struct l1sched_burst_ind *bi); diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index ecd9847..eff36fd 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -80,50 +80,8 @@ [18] = 1, /* TCH/H(1): a=18 */ }; -static const uint8_t tch_h0_traffic_block_map[3][4] = { - /* B0(0,2,4,6), B1(4,6,8,10), B2(8,10,0,2) */ - { 0, 2, 4, 6 }, - { 4, 6, 8, 10 }, - { 8, 10, 0, 2 }, -}; - -static const uint8_t tch_h1_traffic_block_map[3][4] = { - /* B0(1,3,5,7), B1(5,7,9,11), B2(9,11,1,3) */ - { 1, 3, 5, 7 }, - { 5, 7, 9, 11 }, - { 9, 11, 1, 3 }, -}; - -static const uint8_t tch_h0_dl_facch_block_map[3][6] = { - /* B0(4,6,8,10,13,15), B1(13,15,17,19,21,23), B2(21,23,0,2,4,6) */ - { 4, 6, 8, 10, 13, 15 }, - { 13, 15, 17, 19, 21, 23 }, - { 21, 23, 0, 2, 4, 6 }, -}; - -static const uint8_t tch_h0_ul_facch_block_map[3][6] = { - /* B0(0,2,4,6,8,10), B1(8,10,13,15,17,19), B2(17,19,21,23,0,2) */ - { 0, 2, 4, 6, 8, 10 }, - { 8, 10, 13, 15, 17, 19 }, - { 17, 19, 21, 23, 0, 2 }, -}; - -static const uint8_t tch_h1_dl_facch_block_map[3][6] = { - /* B0(5,7,9,11,14,16), B1(14,16,18,20,22,24), B2(22,24,1,3,5,7) */ - { 5, 7, 9, 11, 14, 16 }, - { 14, 16, 18, 20, 22, 24 }, - { 22, 24, 1, 3, 5, 7 }, -}; - -const uint8_t tch_h1_ul_facch_block_map[3][6] = { - /* B0(1,3,5,7,9,11), B1(9,11,14,16,18,20), B2(18,20,22,24,1,3) */ - { 1, 3, 5, 7, 9, 11 }, - { 9, 11, 14, 16, 18, 20 }, - { 18, 20, 22, 24, 1, 3 }, -}; - -/* FACCH/H channel mapping for Downlink (see 3GPP TS 45.002, table 1). - * This mapping is valid for both FACCH/H(0) and FACCH/H(1). +/* FACCH/H channel mappings for DL and UL (see 3GPP TS 45.002, table 1). + * These mappings are valid for both FACCH/H(0) and FACCH/H(1). * TDMA frame number of burst 'f' is used as the table index. */ static const uint8_t sched_tchh_dl_facch_map[26] = { [15] = 1, /* FACCH/H(0): B0(4,6,8,10,13,15) */ @@ -134,6 +92,16 @@ [7] = 1, /* FACCH/H(1): B2(22,24,1,3,5,7) */ }; +/* TDMA frame number of burst 'a' is used as the table index. */ +static const uint8_t sched_tchh_ul_facch_map[26] = { + [0] = 1, /* FACCH/H(0): B0(0,2,4,6,8,10) */ + [1] = 1, /* FACCH/H(1): B0(1,3,5,7,9,11) */ + [8] = 1, /* FACCH/H(0): B1(8,10,13,15,17,19) */ + [9] = 1, /* FACCH/H(1): B1(9,11,14,16,18,20) */ + [17] = 1, /* FACCH/H(0): B2(17,19,21,23,0,2) */ + [18] = 1, /* FACCH/H(1): B2(18,20,22,24,1,3) */ +}; + /* 3GPP TS 45.002, table 2 in clause 7: Mapping tables for TCH/H2.4 and TCH/H4.8. * * +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ @@ -169,63 +137,6 @@ [11] = 1, /* TCH/H(1): B2(18 ... 11) */ }; -/** - * Can a TCH/H block transmission be initiated / finished - * on a given frame number and a given channel type? - * - * See GSM 05.02, clause 7, table 1 - * - * @param chan channel type (L1SCHED_TCHH_0 or L1SCHED_TCHH_1) - * @param fn the current frame number - * @param ul Uplink or Downlink? - * @param facch FACCH/H or traffic? - * @param start init or end of transmission? - * @return true (yes) or false (no) - */ -bool l1sched_tchh_block_map_fn(enum l1sched_lchan_type chan, - uint32_t fn, bool ul, bool facch, bool start) -{ - uint8_t fn_mf; - int i = 0; - - /* Just to be sure */ - OSMO_ASSERT(chan == L1SCHED_TCHH_0 || chan == L1SCHED_TCHH_1); - - /* Calculate a modulo */ - fn_mf = facch ? (fn % 26) : (fn % 13); - -#define MAP_GET_POS(map) \ - (start ? 0 : ARRAY_SIZE(map[i]) - 1) - -#define BLOCK_MAP_FN(map) \ - do { \ - if (map[i][MAP_GET_POS(map)] == fn_mf) \ - return true; \ - } while (++i < ARRAY_SIZE(map)) - - /* Choose a proper block map */ - if (facch) { - if (ul) { - if (chan == L1SCHED_TCHH_0) - BLOCK_MAP_FN(tch_h0_ul_facch_block_map); - else - BLOCK_MAP_FN(tch_h1_ul_facch_block_map); - } else { - if (chan == L1SCHED_TCHH_0) - BLOCK_MAP_FN(tch_h0_dl_facch_block_map); - else - BLOCK_MAP_FN(tch_h1_dl_facch_block_map); - } - } else { - if (chan == L1SCHED_TCHH_0) - BLOCK_MAP_FN(tch_h0_traffic_block_map); - else - BLOCK_MAP_FN(tch_h1_traffic_block_map); - } - - return false; -} - static int decode_hr_facch(struct l1sched_lchan_state *lchan) { uint8_t data[GSM_MACBLOCK_LEN]; @@ -278,7 +189,7 @@ /* Align reception of the first FACCH/H frame */ if (lchan->tch_mode == GSM48_CMODE_SIGN) { - if (!l1sched_tchh_facch_start(lchan->type, bi->fn, 0)) + if (!sched_tchh_dl_facch_map[bi->fn % 26]) return 0; } } @@ -451,7 +362,7 @@ /* Align transmission of the first frame */ switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: - if (!l1sched_tchh_facch_start(lchan->type, br->fn, 1)) + if (!sched_tchh_ul_facch_map[br->fn % 26]) return 0; break; case GSM48_CMODE_DATA_6k0: @@ -485,7 +396,7 @@ /* dequeue a pair of TCH and FACCH frames */ msg_tch = l1sched_lchan_prim_dequeue_tch(lchan, false); - if (l1sched_tchh_facch_start(lchan->type, br->fn, true)) + if (sched_tchh_ul_facch_map[br->fn % 26]) msg_facch = l1sched_lchan_prim_dequeue_tch(lchan, true); else msg_facch = NULL; @@ -495,7 +406,7 @@ /* populate the buffer with bursts */ switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: - if (!l1sched_tchh_facch_start(lchan->type, br->fn, 1)) + if (!sched_tchh_ul_facch_map[br->fn % 26]) goto send_burst; /* XXX: should not happen */ if (msg == NULL) msg = l1sched_lchan_prim_dummy_lapdm(lchan); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38725?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I63ae94bc2edd528b1f9fd2c505b39a43ba1742fd Gerrit-Change-Number: 38725 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: fix decoding of DL FACCH/H for TCH/H4.8 and TCH/H2.4
by fixeria 08 Nov '24

08 Nov '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38724?usp=email ) Change subject: trxcon/l1sched: fix decoding of DL FACCH/H for TCH/H4.8 and TCH/H2.4 ...................................................................... trxcon/l1sched: fix decoding of DL FACCH/H for TCH/H4.8 and TCH/H2.4 The mapping sched_tchh_dl_csd_map[] is valid for DL TCH/H4.8 and TCH/H2.4, but not for DL FACCH/H. We need to use a separate lookup table sched_tchh_dl_facch_map[] for DL FACCH/H. Change-Id: I17df806185dc620999c4c2b9ed83a18cc8b2e0bf Fixes: a93785bf4 ("trxcon/l1sched: implement CSD scheduling support") Related: OS#4396, OS#6618 --- M src/host/trxcon/src/sched_lchan_tchh.c 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/24/38724/1 diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index d684976..ecd9847 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -310,8 +310,6 @@ /* Data (CSD) is interleaved over 22 bursts */ if ((*mask & 0x3fffff) != 0x3fffff) return 0; - if (!sched_tchh_dl_csd_map[bi->fn % 26]) - return 0; /* CSD: skip decoding attempt, need 2 more bursts */ break; default: /* Speech is interleaved over 4 bursts */ @@ -372,14 +370,20 @@ /* CSD (TCH/H4.8): 6.0 kbit/s radio interface rate */ case GSM48_CMODE_DATA_6k0: /* FACCH/H does not steal TCH/H4.8 frames, but only disturbs some bits */ - decode_hr_facch(lchan); + if (sched_tchh_dl_facch_map[bi->fn % 26]) + decode_hr_facch(lchan); + if (!sched_tchh_dl_csd_map[bi->fn % 26]) + return 0; rc = gsm0503_tch_hr48_decode(&tch_data[0], BUFPOS(bursts_p, 0), &n_errors, &n_bits_total); break; /* CSD (TCH/H2.4): 3.6 kbit/s radio interface rate */ case GSM48_CMODE_DATA_3k6: /* FACCH/H does not steal TCH/H2.4 frames, but only disturbs some bits */ - decode_hr_facch(lchan); + if (sched_tchh_dl_facch_map[bi->fn % 26]) + decode_hr_facch(lchan); + if (!sched_tchh_dl_csd_map[bi->fn % 26]) + return 0; rc = gsm0503_tch_hr24_decode(&tch_data[0], BUFPOS(bursts_p, 0), &n_errors, &n_bits_total); break; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38724?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I17df806185dc620999c4c2b9ed83a18cc8b2e0bf Gerrit-Change-Number: 38724 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-bts[master]: osmo-bts-trx: fix scheduling of DL FACCH/H for TCH/H4.8 and TCH/H2.4
by fixeria 08 Nov '24

08 Nov '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/38723?usp=email ) Change subject: osmo-bts-trx: fix scheduling of DL FACCH/H for TCH/H4.8 and TCH/H2.4 ...................................................................... osmo-bts-trx: fix scheduling of DL FACCH/H for TCH/H4.8 and TCH/H2.4 The mapping sched_tchh_dl_csd_map[] is valid for DL TCH/H4.8 and TCH/H2.4, but not for DL FACCH/H. We already use a separate lookup table sched_tchh_dl_facch_map[] when sending RTS.ind for DL FACCH/H, so no additional checks are added in this commit. Change-Id: Idb753fa5c87dc79e9ad19e550680de6f462eed69 Fixes: 95407f3f6 ("osmo-bts-trx: implement CSD scheduling support") Related: OS#1572, OS#6618 --- M src/osmo-bts-trx/sched_lchan_tchh.c 1 file changed, 14 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/23/38723/1 diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 6027072..01ac155 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -420,12 +420,6 @@ memmove(BUFPOS(bursts_p, 0), BUFPOS(bursts_p, 2), 20 * BPLEN); memset(BUFPOS(bursts_p, 20), 0, 2 * BPLEN); - /* for half-rate CSD we dequeue every 4th burst */ - if (chan_state->rsl_cmode == RSL_CMOD_SPD_DATA) { - if (!sched_tchh_dl_csd_map[br->fn % 26]) - goto send_burst; - } - /* dequeue a TCH and/or a FACCH message to be transmitted */ tch_dl_dequeue(l1ts, br, &msg_tch, &msg_facch); @@ -529,17 +523,25 @@ break; /* CSD (TCH/H4.8): 6.0 kbit/s radio interface rate */ case GSM48_CMODE_DATA_6k0: - if (msg_tch == NULL) - msg_tch = tch_dummy_msgb(4 * 60, 0x01); - gsm0503_tch_hr48_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); + /* for half-rate CSD we run the encoder every 4th burst (like for TCH/F) + * because the interleaving is done as specified for the TCH/F9.6 */ + if (sched_tchh_dl_csd_map[br->fn % 26]) { + if (msg_tch == NULL) + msg_tch = tch_dummy_msgb(4 * 60, 0x01); + gsm0503_tch_hr48_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); + } if (msg_facch != NULL) gsm0503_tch_hr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_facch)); break; /* CSD (TCH/H2.4): 3.6 kbit/s radio interface rate */ case GSM48_CMODE_DATA_3k6: - if (msg_tch == NULL) - msg_tch = tch_dummy_msgb(4 * 36, 0x01); - gsm0503_tch_hr24_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); + /* for half-rate CSD we run the encoder every 4th burst (like for TCH/F) + * because the interleaving is done as specified for the TCH/F9.6 */ + if (sched_tchh_dl_csd_map[br->fn % 26]) { + if (msg_tch == NULL) + msg_tch = tch_dummy_msgb(4 * 36, 0x01); + gsm0503_tch_hr24_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); + } if (msg_facch != NULL) gsm0503_tch_hr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_facch)); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38723?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idb753fa5c87dc79e9ad19e550680de6f462eed69 Gerrit-Change-Number: 38723 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: bts: add TC_data_facch_*: test FACCH/[FH] on data channels
by fixeria 08 Nov '24

08 Nov '24

Attention is currently required from: osmith, pespin. Hello Jenkins Builder, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38696?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: bts: add TC_data_facch_*: test FACCH/[FH] on data channels ...................................................................... bts: add TC_data_facch_*: test FACCH/[FH] on data channels So far we have been testing the actual traffic on TCH/[FH] in data mode (CSD), but not FACCH/[FH]. Add separate testcases for that. Half-rate variants of the new testcases crash osmo-bts-trx, so comment them out in the control section until the problem is fixed. Change-Id: I2098ccd651fc2a81f62e70be64af386ab0ca6148 Related: OS#6618 --- M bts/BTS_Tests.ttcn M bts/expected-results.xml 2 files changed, 133 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/38696/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38696?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2098ccd651fc2a81f62e70be64af386ab0ca6148 Gerrit-Change-Number: 38696 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-bsc[master]: Use new libosmo-sigtran API osmo_ss7_as_select_asp()
by pespin 08 Nov '24

08 Nov '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38722?usp=email ) Change subject: Use new libosmo-sigtran API osmo_ss7_as_select_asp() ...................................................................... Use new libosmo-sigtran API osmo_ss7_as_select_asp() Depends: libosmo-sigtran.git Change-Id b9f6b542bbae925e23ca7c4de27cdff59021ccb9 Change-Id: I0f2e3d6cbdf443c0194b61df7479aecf4073e19c --- M src/osmo-bsc/bsc_ctrl.c 1 file changed, 8 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/22/38722/1 diff --git a/src/osmo-bsc/bsc_ctrl.c b/src/osmo-bsc/bsc_ctrl.c index ff917ce..931a8ae 100644 --- a/src/osmo-bsc/bsc_ctrl.c +++ b/src/osmo-bsc/bsc_ctrl.c @@ -643,26 +643,10 @@ return as; } -static int _ss7_as_send(struct osmo_ss7_as *as, struct msgb *msg) -{ - struct osmo_ss7_asp *asp; - unsigned int i; - - /* FIXME: unify with xua_as_transmit_msg() and perform proper ASP lookup */ - for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - asp = as->cfg.asps[i]; - if (!asp) - continue; - /* FIXME: deal with multiple ASPs per AS */ - return osmo_ss7_asp_send(asp, msg); - } - msgb_free(msg); - return -1; -} - int bsc_sccplite_msc_send(struct bsc_msc_data *msc, struct msgb *msg) { struct osmo_ss7_as *as; + struct osmo_ss7_asp *asp; as = msc_get_ss7_as(msc); if (!as) { @@ -676,7 +660,13 @@ return 0; } - return _ss7_as_send(as, msg); + asp = osmo_ss7_as_select_asp(as); + if (!asp) { + LOGP(DCTRL, LOGL_NOTICE, "No ASP found for AS, dropping message\n"); + msgb_free(msg); + return -1; + } + return osmo_ss7_asp_send(asp, msg); } /* Encode a CTRL command and send it to the given ASP -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38722?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0f2e3d6cbdf443c0194b61df7479aecf4073e19c Gerrit-Change-Number: 38722 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: cosmetic: osmo_ss7: Rearrange some contents
by pespin 08 Nov '24

08 Nov '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38721?usp=email ) Change subject: cosmetic: osmo_ss7: Rearrange some contents ...................................................................... cosmetic: osmo_ss7: Rearrange some contents * Create sections for Routing Key, AS Traffic Mode, ASP Protocol which have their own enum/struct and set of APIs acting upon them. * Move osmo_ss7_asp_disconnect() to its ASP section (was in AS section). Change-Id: I592db59e27fa7b401d1281921e38817772308c00 --- M include/osmocom/sigtran/osmo_ss7.h 1 file changed, 44 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/21/38721/1 diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 3b2b380..5051074 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -118,12 +118,9 @@ osmo_ss7_route_get_dest_as(struct osmo_ss7_route *rt); /*********************************************************************** - * SS7 Application Servers + * SS7 Routing key ***********************************************************************/ -struct osmo_ss7_as; -struct osmo_ss7_asp; - struct osmo_ss7_routing_key { uint32_t context; uint32_t l_rk_id; @@ -134,6 +131,33 @@ /* FIXME: more complex routing keys */ }; + +/*********************************************************************** + * SS7 ASP Protocols + ***********************************************************************/ + +enum osmo_ss7_asp_protocol { + OSMO_SS7_ASP_PROT_NONE, + OSMO_SS7_ASP_PROT_SUA, + OSMO_SS7_ASP_PROT_M3UA, + OSMO_SS7_ASP_PROT_IPA, + _NUM_OSMO_SS7_ASP_PROT +}; + +extern struct value_string osmo_ss7_asp_protocol_vals[]; +static inline const char * +osmo_ss7_asp_protocol_name(enum osmo_ss7_asp_protocol mode) +{ + return get_value_string(osmo_ss7_asp_protocol_vals, mode); +} + +int osmo_ss7_asp_protocol_port(enum osmo_ss7_asp_protocol prot); + + +/*********************************************************************** + * SS7 AS Traffic Mode + ***********************************************************************/ + enum osmo_ss7_as_traffic_mode { OSMO_SS7_AS_TMOD_OVERRIDE = 0, /* default */ OSMO_SS7_AS_TMOD_BCAST, @@ -150,23 +174,16 @@ return get_value_string(osmo_ss7_as_traffic_mode_vals, mode); } -enum osmo_ss7_asp_protocol { - OSMO_SS7_ASP_PROT_NONE, - OSMO_SS7_ASP_PROT_SUA, - OSMO_SS7_ASP_PROT_M3UA, - OSMO_SS7_ASP_PROT_IPA, - _NUM_OSMO_SS7_ASP_PROT -}; +enum osmo_ss7_as_traffic_mode osmo_ss7_tmode_from_xua(uint32_t in); +int osmo_ss7_tmode_to_xua(enum osmo_ss7_as_traffic_mode tmod); -extern struct value_string osmo_ss7_asp_protocol_vals[]; -static inline const char * -osmo_ss7_asp_protocol_name(enum osmo_ss7_asp_protocol mode) -{ - return get_value_string(osmo_ss7_asp_protocol_vals, mode); -} +/*********************************************************************** + * SS7 Application Servers + ***********************************************************************/ -int osmo_ss7_asp_protocol_port(enum osmo_ss7_asp_protocol prot); +struct osmo_ss7_as; +struct osmo_ss7_asp; struct osmo_ss7_as * osmo_ss7_as_find_by_name(struct osmo_ss7_instance *inst, const char *name); @@ -189,7 +206,6 @@ bool osmo_ss7_as_down(const struct osmo_ss7_as *as); bool osmo_ss7_as_active(const struct osmo_ss7_as *as); bool osmo_ss7_as_tmode_compatible_xua(struct osmo_ss7_as *as, uint32_t m3ua_tmt); -void osmo_ss7_asp_disconnect(struct osmo_ss7_asp *asp); /*********************************************************************** @@ -246,6 +262,7 @@ osmo_ss7_asp_find_or_create2(struct osmo_ss7_instance *inst, const char *name, uint16_t remote_port, uint16_t local_port, int trans_proto, enum osmo_ss7_asp_protocol proto); +void osmo_ss7_asp_disconnect(struct osmo_ss7_asp *asp); void osmo_ss7_asp_destroy(struct osmo_ss7_asp *asp); int osmo_ss7_asp_send(struct osmo_ss7_asp *asp, struct msgb *msg); int osmo_ss7_asp_restart(struct osmo_ss7_asp *asp); @@ -268,6 +285,10 @@ void osmo_ss7_register_rx_unknown_cb(osmo_ss7_asp_rx_unknown_cb *cb); +/*********************************************************************** + * Simple Client + ***********************************************************************/ + struct osmo_sccp_instance * osmo_sccp_simple_client(void *ctx, const char *name, uint32_t default_pc, enum osmo_ss7_asp_protocol prot, int default_local_port, @@ -283,6 +304,10 @@ int default_remote_port, const char *default_remote_ip); +/*********************************************************************** + * Simple Server + ***********************************************************************/ + struct osmo_sccp_instance * osmo_sccp_simple_server(void *ctx, uint32_t pc, enum osmo_ss7_asp_protocol prot, int local_port, @@ -300,9 +325,6 @@ int local_port, int remote_port, const char *remote_ip); -enum osmo_ss7_as_traffic_mode osmo_ss7_tmode_from_xua(uint32_t in); -int osmo_ss7_tmode_to_xua(enum osmo_ss7_as_traffic_mode tmod); - /* VTY related */ struct vty; void osmo_ss7_vty_init_asp(void *ctx); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38721?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I592db59e27fa7b401d1281921e38817772308c00 Gerrit-Change-Number: 38721 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: sigtran: Add API osmo_ss7_as_select_asp()
by pespin 08 Nov '24

08 Nov '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38719?usp=email ) Change subject: sigtran: Add API osmo_ss7_as_select_asp() ...................................................................... sigtran: Add API osmo_ss7_as_select_asp() This API is required by osmo-bsc, since when in SCCPLite configuration, it needs to access the IPA conn of the AS towards the MSC in order to inject MGCP and CTRL protocols over the IPA multiplex. This API may need to be revisited (i.e. deprecated and a new one created) once we want to fully support loadshare, where message contents such as OPC,DPC,SLS need to be taken into account internally in libosmo-sigtran. That new version may well be kept private though, since the API here presented is good enough for osmo-bsc IPA multiplex injection. This is anyway kind of chicken-and-egg problem, because we want to have an API osmo-bsc can use in first place before moving the whole osmo_ss7_as struct as private so that we can modify it to implement proper AS loadsharing. Related: SYS#6602 Change-Id: I8b866b45ac4a24238c55171d25e11b9625e8f50c --- M TODO-RELEASE M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7_as.c M src/xua_as_fsm.c 4 files changed, 92 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/19/38719/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 261567c..08978d4 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -13,4 +13,4 @@ libosmo-sigtran Make private osmo_ss7_route libosmo-sigtran add API osmo_ss7_instance_get_id(), osmo_ss7_instance_get_name(), osmo_ss7_instance_get_pc_fmt(), osmo_ss7_instance_get_primary_pc(), osmo_ss7_get_sccp() libosmo-sigtran add API osmo_ss7_instances_llist_entry() -libosmo-sigtran add API osmo_ss7_as_get_asp_protocol() +libosmo-sigtran add API osmo_ss7_as_get_asp_protocol(), osmo_ss7_as_select_asp() diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 83956d8..361e715 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -274,6 +274,7 @@ void osmo_ss7_as_destroy(struct osmo_ss7_as *as); bool osmo_ss7_as_has_asp(const struct osmo_ss7_as *as, const struct osmo_ss7_asp *asp); +struct osmo_ss7_asp *osmo_ss7_as_select_asp(struct osmo_ss7_as *as); bool osmo_ss7_as_down(const struct osmo_ss7_as *as); bool osmo_ss7_as_active(const struct osmo_ss7_as *as); bool osmo_ss7_as_tmode_compatible_xua(struct osmo_ss7_as *as, uint32_t m3ua_tmt); diff --git a/src/osmo_ss7_as.c b/src/osmo_ss7_as.c index 5af7098..d4510fc 100644 --- a/src/osmo_ss7_as.c +++ b/src/osmo_ss7_as.c @@ -222,3 +222,89 @@ return true; return as->fi->state == XUA_AS_S_DOWN; } + +static struct osmo_ss7_asp *ss7_as_select_asp_override(struct osmo_ss7_as *as) +{ + struct osmo_ss7_asp *asp; + unsigned int i; + + /* FIXME: proper selection of the ASP based on the SLS! */ + for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { + asp = as->cfg.asps[i]; + if (asp && osmo_ss7_asp_active(asp)) + break; + } + return asp; +} + +static struct osmo_ss7_asp *ss7_as_select_asp_roundrobin(struct osmo_ss7_as *as) +{ + struct osmo_ss7_asp *asp; + unsigned int i; + unsigned int first_idx; + + first_idx = (as->cfg.last_asp_idx_sent + 1) % ARRAY_SIZE(as->cfg.asps); + i = first_idx; + do { + asp = as->cfg.asps[i]; + if (asp && osmo_ss7_asp_active(asp)) + break; + i = (i + 1) % ARRAY_SIZE(as->cfg.asps); + } while (i != first_idx); + as->cfg.last_asp_idx_sent = i; + + return asp; +} + +static struct osmo_ss7_asp *ss7_as_select_asp_broadcast(struct osmo_ss7_as *as) +{ + struct osmo_ss7_asp *asp; + struct osmo_ss7_asp *asp_found = NULL; + unsigned int cnt = 0; + + for (unsigned int i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { + asp = as->cfg.asps[i]; + if (!asp || !osmo_ss7_asp_active(asp)) + continue; + asp_found = asp; + cnt++; + if (cnt > 1) + break; /* Early return above: */ + } + return cnt == 1 ? asp_found : NULL; +} + +/*! Select an AS to transmit a message, according to AS configuration and ASP availability. + * \param[in] as Application Server. + * \returns asp to send the message to, NULL if no possible asp found + * + * This function returns NULL too if multiple ASPs would be selected, ie. AS is + * configured in broadcast mode and more than one ASP is configured. + */ +struct osmo_ss7_asp *osmo_ss7_as_select_asp(struct osmo_ss7_as *as) +{ + struct osmo_ss7_asp *asp = NULL; + + switch (as->cfg.mode) { + case OSMO_SS7_AS_TMOD_OVERRIDE: + asp = ss7_as_select_asp_override(as); + break; + case OSMO_SS7_AS_TMOD_LOADSHARE: + /* TODO: actually use the SLS value to ensure same SLS goes + * through same ASP. Not strictly required by M3UA RFC, but + * would fit the overall principle. */ + case OSMO_SS7_AS_TMOD_ROUNDROBIN: + asp = ss7_as_select_asp_roundrobin(as); + break; + case OSMO_SS7_AS_TMOD_BCAST: + return ss7_as_select_asp_broadcast(as); + case _NUM_OSMO_SS7_ASP_TMOD: + OSMO_ASSERT(false); + } + + if (!asp) { + LOGPFSM(as->fi, "No selectable ASP in AS\n"); + return NULL; + } + return asp; +} diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c index dff0d06..29d31a9 100644 --- a/src/xua_as_fsm.c +++ b/src/xua_as_fsm.c @@ -97,39 +97,6 @@ return -1; } -static struct osmo_ss7_asp *xua_as_select_asp_override(struct osmo_ss7_as *as) -{ - struct osmo_ss7_asp *asp; - unsigned int i; - - /* FIXME: proper selection of the ASP based on the SLS! */ - for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - asp = as->cfg.asps[i]; - if (asp && osmo_ss7_asp_active(asp)) - break; - } - return asp; -} - -static struct osmo_ss7_asp *xua_as_select_asp_roundrobin(struct osmo_ss7_as *as) -{ - struct osmo_ss7_asp *asp; - unsigned int i; - unsigned int first_idx; - - first_idx = (as->cfg.last_asp_idx_sent + 1) % ARRAY_SIZE(as->cfg.asps); - i = first_idx; - do { - asp = as->cfg.asps[i]; - if (asp && osmo_ss7_asp_active(asp)) - break; - i = (i + 1) % ARRAY_SIZE(as->cfg.asps); - } while (i != first_idx); - as->cfg.last_asp_idx_sent = i; - - return asp; -} - int xua_as_transmit_msg_broadcast(struct osmo_ss7_as *as, struct msgb *msg) { struct osmo_ss7_asp *asp; @@ -157,13 +124,12 @@ switch (as->cfg.mode) { case OSMO_SS7_AS_TMOD_OVERRIDE: - asp = xua_as_select_asp_override(as); - break; case OSMO_SS7_AS_TMOD_LOADSHARE: - /* TODO: actually use the SLS value to ensure same SLS goes through same ASP. Not - * strictly required by M3UA RFC, but would fit the overall principle. */ + /* TODO: OSMO_SS7_AS_TMOD_LOADSHARE: actually use the SLS value + * to ensure same SLS goes through same ASP. Not strictly + * required by M3UA RFC, but would fit the overall principle. */ case OSMO_SS7_AS_TMOD_ROUNDROBIN: - asp = xua_as_select_asp_roundrobin(as); + asp = osmo_ss7_as_select_asp(as); break; case OSMO_SS7_AS_TMOD_BCAST: return xua_as_transmit_msg_broadcast(as, msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38719?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I8b866b45ac4a24238c55171d25e11b9625e8f50c Gerrit-Change-Number: 38719 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: sigtran: Make osmo_ss7_as struct private
by pespin 08 Nov '24

08 Nov '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38720?usp=email ) Change subject: sigtran: Make osmo_ss7_as struct private ...................................................................... sigtran: Make osmo_ss7_as struct private Change-Id: I8c6513e6d2c152e853270fa5b488b606a3d18b14 --- M include/osmocom/sigtran/osmo_ss7.h M src/Makefile.am M src/ipa.c M src/m3ua.c M src/osmo_ss7.c M src/osmo_ss7_as.c M src/osmo_ss7_asp.c M src/osmo_ss7_hmrt.c M src/osmo_ss7_instance.c M src/osmo_ss7_route.c M src/osmo_ss7_vty.c M src/sccp_scrc.c M src/sccp_user.c A src/ss7_as.h M src/ss7_internal.h M src/sua.c M src/xua_as_fsm.c M src/xua_asp_fsm.c M src/xua_default_lm_fsm.c M src/xua_rkm.c M src/xua_shared.c M src/xua_snm.c M tests/ss7/ss7_test.c 23 files changed, 123 insertions(+), 79 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/20/38720/1 diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index ae25aa5..3b2b380 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -121,6 +121,9 @@ * SS7 Application Servers ***********************************************************************/ +struct osmo_ss7_as; +struct osmo_ss7_asp; + struct osmo_ss7_routing_key { uint32_t context; uint32_t l_rk_id; @@ -165,50 +168,6 @@ int osmo_ss7_asp_protocol_port(enum osmo_ss7_asp_protocol prot); -enum osmo_ss7_as_patch_sccp_mode { - OSMO_SS7_PATCH_NONE, /* no patching of SCCP */ - OSMO_SS7_PATCH_BOTH, /* patch both OPC and DPC into SCCP addresses */ -}; - -struct osmo_ss7_as { - /*! entry in 'ref osmo_ss7_instance.as_list */ - struct llist_head list; - struct osmo_ss7_instance *inst; - - /*! AS FSM */ - struct osmo_fsm_inst *fi; - - /*! Were we dynamically allocated by RKM? */ - bool rkm_dyn_allocated; - - /*! Were we allocated by "simple client" support? */ - bool simple_client_allocated; - - /*! Rate Counter Group */ - struct rate_ctr_group *ctrg; - - struct { - char *name; - char *description; - enum osmo_ss7_asp_protocol proto; - struct osmo_ss7_routing_key routing_key; - enum osmo_ss7_as_traffic_mode mode; - /* traffic mode was configured by VTY / config file */ - bool mode_set_by_vty; - /* traffic mode was configured by RKM (routing key management) or first ASPAC */ - bool mode_set_by_peer; - uint32_t recovery_timeout_msec; - uint8_t qos_class; - struct { - uint32_t dpc; - enum osmo_ss7_as_patch_sccp_mode sccp_mode; - } pc_override; - - struct osmo_ss7_asp *asps[16]; - uint8_t last_asp_idx_sent; /* used for load-sharing traffic mode (round robin implementation) */ - } cfg; -}; - struct osmo_ss7_as * osmo_ss7_as_find_by_name(struct osmo_ss7_instance *inst, const char *name); struct osmo_ss7_as * diff --git a/src/Makefile.am b/src/Makefile.am index 356a33a..dc35ecc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,6 +4,7 @@ noinst_HEADERS = \ sccp_internal.h \ + ss7_as.h \ ss7_asp.h \ ss7_asp_peer.h \ ss7_instance.h \ diff --git a/src/ipa.c b/src/ipa.c index ce44262..d62d710 100644 --- a/src/ipa.c +++ b/src/ipa.c @@ -47,6 +47,7 @@ #include <osmocom/sigtran/protocol/mtp.h> #include "xua_internal.h" +#include "ss7_as.h" #include "ss7_asp.h" #include "ss7_internal.h" #include "xua_asp_fsm.h" diff --git a/src/m3ua.c b/src/m3ua.c index a4db7f6..be1f167 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -44,6 +44,7 @@ #include "xua_as_fsm.h" #include "xua_asp_fsm.h" #include "xua_internal.h" +#include "ss7_as.h" #include "ss7_asp.h" #include "ss7_internal.h" diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index c906cf5..5965cd5 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -50,6 +50,7 @@ #include "sccp_internal.h" #include "xua_internal.h" +#include "ss7_as.h" #include "ss7_asp.h" #include "ss7_internal.h" #include "ss7_linkset.h" @@ -213,28 +214,3 @@ OSMO_ASSERT(false); } } - -bool osmo_ss7_as_tmode_compatible_xua(struct osmo_ss7_as *as, uint32_t m3ua_tmt) -{ - if (!as->cfg.mode_set_by_vty && !as->cfg.mode_set_by_peer) - return true; - - switch (m3ua_tmt) { - case M3UA_TMOD_OVERRIDE: - if (as->cfg.mode == OSMO_SS7_AS_TMOD_OVERRIDE) - return true; - break; - case M3UA_TMOD_LOADSHARE: - if (as->cfg.mode == OSMO_SS7_AS_TMOD_LOADSHARE || - as->cfg.mode == OSMO_SS7_AS_TMOD_ROUNDROBIN) - return true; - break; - case M3UA_TMOD_BCAST: - if (as->cfg.mode == OSMO_SS7_AS_TMOD_BCAST) - return true; - break; - default: - break; - } - return false; -} diff --git a/src/osmo_ss7_as.c b/src/osmo_ss7_as.c index fb8c68a..0e8ca99 100644 --- a/src/osmo_ss7_as.c +++ b/src/osmo_ss7_as.c @@ -26,13 +26,15 @@ #include <unistd.h> #include <inttypes.h> -#include <osmocom/sigtran/osmo_ss7.h> - #include <osmocom/core/linuxlist.h> #include <osmocom/core/utils.h> #include <osmocom/core/talloc.h> #include <osmocom/core/logging.h> +#include <osmocom/sigtran/osmo_ss7.h> +#include <osmocom/sigtran/protocol/m3ua.h> + +#include "ss7_as.h" #include "ss7_asp.h" #include "ss7_route.h" #include "ss7_route_table.h" @@ -309,3 +311,29 @@ } return asp; } + +bool osmo_ss7_as_tmode_compatible_xua(struct osmo_ss7_as *as, uint32_t m3ua_tmt) +{ + if (!as->cfg.mode_set_by_vty && !as->cfg.mode_set_by_peer) + return true; + + switch (m3ua_tmt) { + case M3UA_TMOD_OVERRIDE: + if (as->cfg.mode == OSMO_SS7_AS_TMOD_OVERRIDE) + return true; + break; + case M3UA_TMOD_LOADSHARE: + if (as->cfg.mode == OSMO_SS7_AS_TMOD_LOADSHARE || + as->cfg.mode == OSMO_SS7_AS_TMOD_ROUNDROBIN) + return true; + break; + case M3UA_TMOD_BCAST: + if (as->cfg.mode == OSMO_SS7_AS_TMOD_BCAST) + return true; + break; + default: + break; + } + return false; + +} diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index 12a5d5f..d81d25c 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -51,6 +51,7 @@ #include "sccp_internal.h" #include "xua_internal.h" +#include "ss7_as.h" #include "ss7_asp.h" #include "ss7_internal.h" #include "ss7_xua_srv.h" diff --git a/src/osmo_ss7_hmrt.c b/src/osmo_ss7_hmrt.c index 9aaa1df..c256860 100644 --- a/src/osmo_ss7_hmrt.c +++ b/src/osmo_ss7_hmrt.c @@ -35,6 +35,7 @@ #include <osmocom/sigtran/protocol/m3ua.h> #include "xua_internal.h" +#include "ss7_as.h" #include "ss7_asp.h" #include "ss7_linkset.h" #include "ss7_route.h" diff --git a/src/osmo_ss7_instance.c b/src/osmo_ss7_instance.c index 60a8829..f7d9a41 100644 --- a/src/osmo_ss7_instance.c +++ b/src/osmo_ss7_instance.c @@ -33,6 +33,7 @@ #include <osmocom/sigtran/osmo_ss7.h> #include <osmocom/sigtran/sccp_sap.h> +#include "ss7_as.h" #include "ss7_asp.h" #include "ss7_internal.h" #include "ss7_instance.h" diff --git a/src/osmo_ss7_route.c b/src/osmo_ss7_route.c index 32e3eb7..2cde410 100644 --- a/src/osmo_ss7_route.c +++ b/src/osmo_ss7_route.c @@ -27,6 +27,7 @@ #include <osmocom/sigtran/osmo_ss7.h> #include "ss7_linkset.h" +#include "ss7_as.h" #include "ss7_route.h" #include "ss7_route_table.h" #include "ss7_internal.h" diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 482e2f8..6b404b3 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -46,6 +46,7 @@ #include "xua_internal.h" #include <osmocom/sigtran/sccp_sap.h> #include "sccp_internal.h" +#include "ss7_as.h" #include "ss7_asp.h" #include "ss7_route.h" #include "ss7_route_table.h" diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index 33f0633..23c3f2d 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -33,6 +33,7 @@ #include <osmocom/sigtran/protocol/mtp.h> #include "sccp_internal.h" +#include "ss7_as.h" #include "ss7_instance.h" #include "ss7_linkset.h" #include "ss7_route.h" diff --git a/src/sccp_user.c b/src/sccp_user.c index d364eb5..8e8e2bd 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -39,6 +39,7 @@ #include "sccp_internal.h" #include "xua_internal.h" +#include "ss7_as.h" #include "ss7_asp.h" #include "ss7_route.h" #include "ss7_route_table.h" diff --git a/src/ss7_as.h b/src/ss7_as.h new file mode 100644 index 0000000..504818c --- /dev/null +++ b/src/ss7_as.h @@ -0,0 +1,71 @@ +#pragma once + +#include <stdint.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/fsm.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/tdef.h> +#include <osmocom/netif/stream.h> + +#include <osmocom/sigtran/osmo_ss7.h> + +#include "ss7_internal.h" + +/*********************************************************************** + * SS7 Application Server + ***********************************************************************/ + +struct osmo_ss7_instance; +struct osmo_ss7_asp; + +enum osmo_ss7_as_patch_sccp_mode { + OSMO_SS7_PATCH_NONE, /* no patching of SCCP */ + OSMO_SS7_PATCH_BOTH, /* patch both OPC and DPC into SCCP addresses */ +}; + +enum ss7_as_ctr { + SS7_AS_CTR_RX_MSU_TOTAL, + SS7_AS_CTR_TX_MSU_TOTAL, +}; + +struct osmo_ss7_as { + /*! entry in 'ref osmo_ss7_instance.as_list */ + struct llist_head list; + struct osmo_ss7_instance *inst; + + /*! AS FSM */ + struct osmo_fsm_inst *fi; + + /*! Were we dynamically allocated by RKM? */ + bool rkm_dyn_allocated; + + /*! Were we allocated by "simple client" support? */ + bool simple_client_allocated; + + /*! Rate Counter Group */ + struct rate_ctr_group *ctrg; + + struct { + char *name; + char *description; + enum osmo_ss7_asp_protocol proto; + struct osmo_ss7_routing_key routing_key; + enum osmo_ss7_as_traffic_mode mode; + /* traffic mode was configured by VTY / config file */ + bool mode_set_by_vty; + /* traffic mode was configured by RKM (routing key management) or first ASPAC */ + bool mode_set_by_peer; + uint32_t recovery_timeout_msec; + uint8_t qos_class; + struct { + uint32_t dpc; + enum osmo_ss7_as_patch_sccp_mode sccp_mode; + } pc_override; + + struct osmo_ss7_asp *asps[16]; + uint8_t last_asp_idx_sent; /* used for load-sharing traffic mode (round robin implementation) */ + } cfg; +}; + +#define LOGPAS(as, subsys, level, fmt, args ...) \ + _LOGSS7((as)->inst, subsys, level, "as-%s: " fmt, (as)->cfg.name, ## args) diff --git a/src/ss7_internal.h b/src/ss7_internal.h index 27bd54f..9475645 100644 --- a/src/ss7_internal.h +++ b/src/ss7_internal.h @@ -28,11 +28,3 @@ int ss7_asp_xua_srv_conn_closed_cb(struct osmo_stream_srv *srv); int xua_tcp_segmentation_cb(struct msgb *msg); - -enum ss7_as_ctr { - SS7_AS_CTR_RX_MSU_TOTAL, - SS7_AS_CTR_TX_MSU_TOTAL, -}; - -#define LOGPAS(as, subsys, level, fmt, args ...) \ - _LOGSS7((as)->inst, subsys, level, "as-%s: " fmt, (as)->cfg.name, ## args) diff --git a/src/sua.c b/src/sua.c index b7c70bb..c7bde24 100644 --- a/src/sua.c +++ b/src/sua.c @@ -47,6 +47,7 @@ #include "xua_asp_fsm.h" #include "xua_internal.h" #include "sccp_internal.h" +#include "ss7_as.h" #include "ss7_asp.h" #include "ss7_internal.h" diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c index 632bb01..6517f73 100644 --- a/src/xua_as_fsm.c +++ b/src/xua_as_fsm.c @@ -23,6 +23,7 @@ #include <osmocom/sigtran/protocol/sua.h> #include <osmocom/sigtran/protocol/m3ua.h> +#include "ss7_as.h" #include "ss7_asp.h" #include "ss7_route.h" #include "ss7_route_table.h" diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 37932a7..089c31c 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -27,6 +27,7 @@ #include "xua_msg.h" #include <osmocom/sigtran/protocol/sua.h> +#include "ss7_as.h" #include "ss7_asp.h" #include "ss7_internal.h" #include "ss7_xua_srv.h" diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index dd8e505..7c27b19 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -37,6 +37,7 @@ #include "xua_internal.h" #include "xua_asp_fsm.h" +#include "ss7_as.h" #include "ss7_asp.h" #include "ss7_xua_srv.h" diff --git a/src/xua_rkm.c b/src/xua_rkm.c index 0a05cdc..9a3918e 100644 --- a/src/xua_rkm.c +++ b/src/xua_rkm.c @@ -28,6 +28,7 @@ #include <osmocom/sigtran/osmo_ss7.h> #include <osmocom/sigtran/protocol/m3ua.h> +#include "ss7_as.h" #include "ss7_asp.h" #include "ss7_internal.h" #include "ss7_route.h" diff --git a/src/xua_shared.c b/src/xua_shared.c index 6fd0369..022b8ed 100644 --- a/src/xua_shared.c +++ b/src/xua_shared.c @@ -34,6 +34,7 @@ #include <osmocom/sigtran/protocol/m3ua.h> #include <osmocom/sigtran/protocol/sua.h> +#include "ss7_as.h" #include "ss7_asp.h" #include "ss7_internal.h" #include "xua_internal.h" diff --git a/src/xua_snm.c b/src/xua_snm.c index 78720cc..36fe3c7 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -31,6 +31,7 @@ #include <osmocom/sigtran/protocol/sua.h> #include <osmocom/sigtran/protocol/mtp.h> +#include "ss7_as.h" #include "ss7_asp.h" #include "ss7_internal.h" #include "xua_internal.h" diff --git a/tests/ss7/ss7_test.c b/tests/ss7/ss7_test.c index 98d4680..a28d37f 100644 --- a/tests/ss7/ss7_test.c +++ b/tests/ss7/ss7_test.c @@ -1,3 +1,4 @@ +#include "../src/ss7_as.h" #include "../src/ss7_asp.h" #include "../src/ss7_link.h" #include "../src/ss7_linkset.h" -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38720?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I8c6513e6d2c152e853270fa5b488b606a3d18b14 Gerrit-Change-Number: 38720 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XL] Change in libosmo-sigtran[master]: sigtran: Make osmo_ss7_instance struct private
by pespin 08 Nov '24

08 Nov '24

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38664?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: sigtran: Make osmo_ss7_instance struct private ...................................................................... sigtran: Make osmo_ss7_instance struct private Change-Id: I4562fe21535c5aa468ac0e3831d505bf08b336ec --- M TODO-RELEASE M include/osmocom/sigtran/osmo_ss7.h M src/Makefile.am M src/osmo_ss7.c A src/osmo_ss7_instance.c M src/sccp_scoc.c M src/sccp_scrc.c M src/sccp_vty.c A src/ss7_instance.h M src/ss7_internal.h 10 files changed, 695 insertions(+), 614 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/64/38664/5 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38664?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I4562fe21535c5aa468ac0e3831d505bf08b336ec Gerrit-Change-Number: 38664 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

2026

2025

2024

2023

2022

gerrit-log