September 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: mgw: Factor out helper func to test data flows over endp with 2 conns

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34546?usp=email ) Change subject: mgw: Factor out helper func to test data flows over endp with 2 conns ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34546?usp=email 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: Ic4f3c5bb687373bdae6942e1952797e76bfa3ffb Gerrit-Change-Number: 34546 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 08:24:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: mgw: TC_conn_timeout Fix timeout left set upon test exit

by osmith

Attention is currently required from: dexter, neels, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34549?usp=email ) Change subject: mgw: TC_conn_timeout Fix timeout left set upon test exit ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34549?usp=email 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: I9447fa6c6b3103e05fa3ee756ee572ddecb69006 Gerrit-Change-Number: 34549 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 08:22:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

[M] Change in osmo-e1d[master]: Automatically reset RIFO on underrun/overflow

by jolly

Attention is currently required from: laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/34554?usp=email ) Change subject: Automatically reset RIFO on underrun/overflow ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-e1d/+/34554/comment/25ee80c3_23716305 PS1, Line 7: Automatically reset RIFO on underrun/overflow Maybe I need to split this commit. It is the work I have done. Check it out and do some comments. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/34554?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id7ccbfbdb288990c01f185dec79a1022a68b4748 Gerrit-Change-Number: 34554 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 27 Sep 2023 18:52:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-e1d[master]: Automatically reset RIFO on underrun/overflow

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/34554?usp=email ) Change subject: Automatically reset RIFO on underrun/overflow ...................................................................... Automatically reset RIFO on underrun/overflow Whenever the RIFO buffer underruns or overflows, it it reset and is filled to the initial prefill_frame_count value. There are two reasons for this to happen: The GPS clock is missing, so the receiving interface is not in sync with the transmitting interface. The delay changes significantly, due to congestion on the path between both peers. An upper limit is defined by max_frame_count. By default, it is set to twice the value of max_frame_count. It specifies when the RIFO will overflow. A lower value prevents too much delay, but also causes a RIFO reset at a lower fill level. Change-Id: Id7ccbfbdb288990c01f185dec79a1022a68b4748 --- M include/osmocom/octoi/octoi.h M src/octoi/e1oip.c M src/octoi/e1oip.h M src/octoi/frame_rifo.c M src/octoi/frame_rifo.h M src/octoi/octoi_clnt_fsm.c M src/octoi/octoi_clnt_vty.c M src/octoi/octoi_srv_fsm.c M src/octoi/octoi_srv_vty.c M src/octoi/octoi_vty.h M tests/rifo/rifo_test.c 11 files changed, 90 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/54/34554/1 diff --git a/include/osmocom/octoi/octoi.h b/include/osmocom/octoi/octoi.h index 645af3f..73c0889 100644 --- a/include/osmocom/octoi/octoi.h +++ b/include/osmocom/octoi/octoi.h @@ -24,6 +24,7 @@ uint8_t batching_factor; /* E1 frames per UDP packet (Tx) */ bool force_send_all_ts; /* force transmission of all timeslots */ uint32_t prefill_frame_count; /* FIFO prefill/preseed count (Rx) */ + uint32_t max_frame_count; /* FIFO maximum frames count (Rx) */ union { struct { char *usb_serial; /* USB serial string (ASCII) of icE1usb */ diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c index 85dd165..adb5319 100644 --- a/src/octoi/e1oip.c +++ b/src/octoi/e1oip.c @@ -268,10 +268,15 @@ frame_buf[ts_nr] = e1th->data[i*num_ts + j]; } /* FIXME: what to do about TS0? */ - rc = frame_rifo_in(&iline->e1t.rifo, frame_buf, fn32+i); - if (rc < 0) + rc = frame_rifo_in(&iline->e1t.rifo, frame_buf, fn32+i, iline->cfg.max_frame_count); + if (rc < 0) { + LOGPEER(peer, LOGL_ERROR, "RxIP: frame number out of range. Reset buffer.\n"); iline_ctr_add(iline, LINE_CTR_E1oIP_E1T_OVERFLOW, 1); + frame_rifo_init(&iline->e1t.rifo, fn32 + i); + iline->e1t.primed_rx_tdm = false; + } } + /* update local state */ memcpy(iline->e1t.last_frame, frame_buf, BYTES_PER_FRAME); if (update_next) @@ -308,6 +313,7 @@ iline->cfg.batching_factor = DEFAULT_BATCHING_FACTOR; iline->cfg.prefill_frame_count = DEFAULT_PREFILL_FRAME_COUNT; + iline->cfg.max_frame_count = DEFAULT_MAX_FRAME_COUNT; e1oip_line_reset(iline); @@ -317,11 +323,12 @@ return iline; } -void e1oip_line_configure(struct e1oip_line *iline, uint8_t batching_factor, - uint32_t prefill_frame_count, bool force_send_all_ts) +void e1oip_line_configure(struct e1oip_line *iline, uint8_t batching_factor, uint32_t prefill_frame_count, + uint32_t max_frame_count, bool force_send_all_ts) { iline->cfg.batching_factor = batching_factor; iline->cfg.prefill_frame_count = prefill_frame_count; + iline->cfg.max_frame_count = max_frame_count; iline->cfg.force_send_all_ts = force_send_all_ts; } @@ -331,7 +338,7 @@ memset(&iline->e1o.last_frame, 0xff, sizeof(iline->e1o.last_frame)); iline->e1o.next_seq = 0; - frame_rifo_init(&iline->e1t.rifo); + frame_rifo_init(&iline->e1t.rifo, 0); memset(&iline->e1t.last_frame, 0xff, sizeof(iline->e1t.last_frame)); iline->e1t.next_fn32 = 0; iline->e1t.primed_rx_tdm = false; diff --git a/src/octoi/e1oip.h b/src/octoi/e1oip.h index 9357d48..5b6b5c9 100644 --- a/src/octoi/e1oip.h +++ b/src/octoi/e1oip.h @@ -17,6 +17,7 @@ #define DEFAULT_BATCHING_FACTOR 32 #define DEFAULT_PREFILL_FRAME_COUNT 200 /* 25ms */ +#define DEFAULT_MAX_FRAME_COUNT 400 /* 50ms */ enum e1oip_line_ctr { LINE_CTR_E1oIP_UNDERRUN, @@ -53,6 +54,7 @@ struct { uint8_t batching_factor; uint32_t prefill_frame_count; + uint32_t max_frame_count; bool force_send_all_ts; } cfg; @@ -84,8 +86,8 @@ struct e1oip_line *e1oip_line_alloc(struct octoi_peer *peer); void e1oip_line_set_name(struct e1oip_line *line, const char *name); void e1oip_line_reset(struct e1oip_line *iline); -void e1oip_line_configure(struct e1oip_line *iline, uint8_t batching_factor, - uint32_t prefill_frame_count, bool force_send_all_ts); +void e1oip_line_configure(struct e1oip_line *iline, uint8_t batching_factor, uint32_t prefill_frame_count, + uint32_t max_frame_count, bool force_send_all_ts); 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_rifo.c b/src/octoi/frame_rifo.c index e3c22d9..8c892f2 100644 --- a/src/octoi/frame_rifo.c +++ b/src/octoi/frame_rifo.c @@ -86,12 +86,12 @@ /*! Initialize a frame RIFO. * \param rifo Caller-allocated memory for RIFO data structure */ -void frame_rifo_init(struct frame_rifo *rifo) +void frame_rifo_init(struct frame_rifo *rifo, uint32_t fn) { memset(rifo->buf, 0xff, sizeof(rifo->buf)); rifo->next_out = rifo->buf; - rifo->next_out_fn = 0; - rifo->last_in_fn = -1; + rifo->next_out_fn = fn; + rifo->last_in_fn = fn - 1; memset(rifo->bitvec, 0, sizeof(rifo->bitvec)); } @@ -101,16 +101,15 @@ * \param rifo The RIFO to which we want to put (append) multiple frames * \param frame Pointer to memory containing the frame data * \param fn Absolute frame number at which to insert the frame. + * \param Maximum number of frames to write in fifo. * \returns 0 on success; -1 on error (overflow) */ -int frame_rifo_in(struct frame_rifo *rifo, const uint8_t *frame, uint32_t fn) +int frame_rifo_in(struct frame_rifo *rifo, const uint8_t *frame, uint32_t fn, int max_frame_count) { uint32_t bucket; uint8_t *dst; - if (!frame_rifo_fn_in_range(rifo, fn)) - { + if (!frame_rifo_fn_in_range(rifo, fn, max_frame_count)) return -ERANGE; - } bucket = bucket_for_fn(rifo, fn); dst = rifo->buf + bucket * BYTES_PER_FRAME; diff --git a/src/octoi/frame_rifo.h b/src/octoi/frame_rifo.h index ac97506..46a8beb 100644 --- a/src/octoi/frame_rifo.h +++ b/src/octoi/frame_rifo.h @@ -14,11 +14,12 @@ indexed by physical offset in buf */ }; + /* can this frame number be stores in the rifo */ -static inline bool frame_rifo_fn_in_range(const struct frame_rifo *ff, uint32_t fn) +static inline bool frame_rifo_fn_in_range(const struct frame_rifo *ff, uint32_t fn, uint32_t max_frame_count) { uint32_t d = fn - ff->next_out_fn; - return d < FRAMES_PER_FIFO; + return d < FRAMES_PER_FIFO && d < max_frame_count; } /* current depth of RIFO */ @@ -27,7 +28,7 @@ return rifo->last_in_fn - rifo->next_out_fn + 1; } -void frame_rifo_init(struct frame_rifo *rifo); +void frame_rifo_init(struct frame_rifo *rifo, uint32_t fn); /* number of frames currently available in FIFO */ static inline unsigned int frame_rifo_frames(struct frame_rifo *rifo) @@ -45,7 +46,7 @@ } /* put a received frame into the FIFO */ -int frame_rifo_in(struct frame_rifo *rifo, const uint8_t *frame, uint32_t fn); +int frame_rifo_in(struct frame_rifo *rifo, const uint8_t *frame, uint32_t fn, int max_frame_count); /* pull one frame out of the FIFO */ int frame_rifo_out(struct frame_rifo *rifo, uint8_t *out); diff --git a/src/octoi/octoi_clnt_fsm.c b/src/octoi/octoi_clnt_fsm.c index 2bfc8f9..11e805d 100644 --- a/src/octoi/octoi_clnt_fsm.c +++ b/src/octoi/octoi_clnt_fsm.c @@ -122,8 +122,8 @@ { struct clnt_state *st = fi->priv; - e1oip_line_configure(st->peer->iline, st->acc->batching_factor, - st->acc->prefill_frame_count, st->acc->force_send_all_ts); + e1oip_line_configure(st->peer->iline, st->acc->batching_factor, st->acc->prefill_frame_count, + st->acc->max_frame_count, st->acc->force_send_all_ts); /* reset RIFO/FIFO etc. */ e1oip_line_reset(st->peer->iline); iline_ctr_add(st->peer->iline, LINE_CTR_E1oIP_CONNECT_ACCEPT, 1); diff --git a/src/octoi/octoi_clnt_vty.c b/src/octoi/octoi_clnt_vty.c index 54ed60f..1ed1d97 100644 --- a/src/octoi/octoi_clnt_vty.c +++ b/src/octoi/octoi_clnt_vty.c @@ -282,7 +282,9 @@ install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_batching_factor_cmd); install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_force_all_ts_cmd); install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_no_force_all_ts_cmd); + set_frames_per_fifo_str(); install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_prefill_frame_count_cmd); + install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_max_frame_count_cmd); #ifdef HAVE_DAHDI_TRUNKDEV install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_trunkdev_name_cmd); install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_trunkdev_line_cmd); diff --git a/src/octoi/octoi_srv_fsm.c b/src/octoi/octoi_srv_fsm.c index b6914b7..a17228c 100644 --- a/src/octoi/octoi_srv_fsm.c +++ b/src/octoi/octoi_srv_fsm.c @@ -175,8 +175,8 @@ { struct srv_state *st = fi->priv; - e1oip_line_configure(st->peer->iline, st->acc->batching_factor, - st->acc->prefill_frame_count, st->acc->force_send_all_ts); + e1oip_line_configure(st->peer->iline, st->acc->batching_factor, st->acc->prefill_frame_count, + st->acc->max_frame_count, st->acc->force_send_all_ts); /* reset RIFO/FIFO etc. */ e1oip_line_reset(st->peer->iline); iline_ctr_add(st->peer->iline, LINE_CTR_E1oIP_CONNECT_ACCEPT, 1); diff --git a/src/octoi/octoi_srv_vty.c b/src/octoi/octoi_srv_vty.c index 4fc4e47..0d6e0f9 100644 --- a/src/octoi/octoi_srv_vty.c +++ b/src/octoi/octoi_srv_vty.c @@ -66,6 +66,7 @@ ac->batching_factor = DEFAULT_BATCHING_FACTOR; ac->prefill_frame_count = DEFAULT_PREFILL_FRAME_COUNT; + ac->max_frame_count = DEFAULT_MAX_FRAME_COUNT; return ac; } @@ -411,14 +412,38 @@ return CMD_SUCCESS; } +static char cfg_account_prefill_frame_count_str[64]; +static char cfg_account_max_frame_count_str[64]; + +void set_frames_per_fifo_str(void) +{ + sprintf(cfg_account_prefill_frame_count_str, "prefill-frame-count <0-%u>", FRAMES_PER_FIFO); + sprintf(cfg_account_max_frame_count_str, "max-frame-count <0-%u>", FRAMES_PER_FIFO); +} + gDEFUN(cfg_account_prefill_frame_count, cfg_account_prefill_frame_count_cmd, - "prefill-frame-count <0-8000>", + cfg_account_prefill_frame_count_str, "Number of E1 frames to pre-fill/pre-seed in Rx RIFO\n" "Number of E1 frames to pre-fill/pre-seed in Rx RIFO\n") { struct octoi_account *acc = vty->index; acc->prefill_frame_count = atoi(argv[0]); + if (acc->prefill_frame_count > acc->max_frame_count) + acc->max_frame_count = acc->prefill_frame_count; + return CMD_SUCCESS; +} + +gDEFUN(cfg_account_max_frame_count, cfg_account_max_frame_count_cmd, + cfg_account_max_frame_count_str, + "Number of E1 frames to maximum allow in Rx RIFO\n" + "Number of E1 frames to maximum allow in Rx RIFO\n") +{ + struct octoi_account *acc = vty->index; + + acc->max_frame_count = atoi(argv[0]); + if (acc->max_frame_count < acc->prefill_frame_count) + acc->prefill_frame_count = acc->max_frame_count; return CMD_SUCCESS; } @@ -551,7 +576,6 @@ void octoi_server_vty_init(void) { - install_element_ve(&show_server_cmd); install_node(&account_node, NULL); @@ -562,7 +586,9 @@ install_element(OCTOI_ACCOUNT_NODE, &cfg_account_batching_factor_cmd); install_element(OCTOI_ACCOUNT_NODE, &cfg_account_force_all_ts_cmd); install_element(OCTOI_ACCOUNT_NODE, &cfg_account_no_force_all_ts_cmd); + set_frames_per_fifo_str(); install_element(OCTOI_ACCOUNT_NODE, &cfg_account_prefill_frame_count_cmd); + install_element(OCTOI_ACCOUNT_NODE, &cfg_account_max_frame_count_cmd); #ifdef HAVE_DAHDI_TRUNKDEV install_element(OCTOI_ACCOUNT_NODE, &cfg_account_trunkdev_name_cmd); install_element(OCTOI_ACCOUNT_NODE, &cfg_account_trunkdev_line_cmd); diff --git a/src/octoi/octoi_vty.h b/src/octoi/octoi_vty.h index 55fa7fe..24c3929 100644 --- a/src/octoi/octoi_vty.h +++ b/src/octoi/octoi_vty.h @@ -10,7 +10,9 @@ extern struct cmd_element cfg_account_batching_factor_cmd; extern struct cmd_element cfg_account_force_all_ts_cmd; extern struct cmd_element cfg_account_no_force_all_ts_cmd; +extern void set_frames_per_fifo_str(void); extern struct cmd_element cfg_account_prefill_frame_count_cmd; +extern struct cmd_element cfg_account_max_frame_count_cmd; extern struct cmd_element cfg_account_trunkdev_name_cmd; extern struct cmd_element cfg_account_trunkdev_line_cmd; diff --git a/tests/rifo/rifo_test.c b/tests/rifo/rifo_test.c index ec90ce7..887db7b 100644 --- a/tests/rifo/rifo_test.c +++ b/tests/rifo/rifo_test.c @@ -23,14 +23,14 @@ static void rifo_init(struct frame_rifo *rifo) { - frame_rifo_init(rifo); + frame_rifo_init(rifo, 0); rifo->next_out_fn = init_next_out_fn; rifo->last_in_fn = init_next_out_fn - 1; } static void rifo_in(struct frame_rifo *rifo, uint8_t *frame, uint32_t fn) { - int rc = frame_rifo_in(rifo, frame, fn); + int rc = frame_rifo_in(rifo, frame, fn, FRAMES_PER_FIFO); unsigned int depth = frame_rifo_depth(rifo); printf("RIFO_IN(%s, start fn + %s%d)=%d [depth=%s%d, frames=%u]\n", osmo_hexdump_nospc(frame, BYTES_PER_FRAME), FN_PRINT(fn), rc, @@ -48,7 +48,7 @@ static void missing_frames(uint8_t modulo) { struct frame_rifo rifo; - frame_rifo_init(&rifo); + frame_rifo_init(&rifo, 0); rifo.next_out_fn = init_next_out_fn; rifo.last_in_fn = init_next_out_fn - 1; @@ -156,7 +156,7 @@ // Put 1 frame and get it memset(frame, 0xa5, sizeof(frame)); - frame_rifo_in(&rifo, frame, init_next_out_fn); + frame_rifo_in(&rifo, frame, init_next_out_fn, FRAMES_PER_FIFO); frame_rifo_out(&rifo, frame); // Put 11 frames at absolute frame numbers FRAMES_PER_FIFO - -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/34554?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id7ccbfbdb288990c01f185dec79a1022a68b4748 Gerrit-Change-Number: 34554 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCU_Tests_SNS: fix TC_pcuif_rach

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34550?usp=email ) Change subject: PCU_Tests_SNS: fix TC_pcuif_rach ...................................................................... PCU_Tests_SNS: fix TC_pcuif_rach The tesctcase TC_pcuif_rach expects an immediate assignment message on the AGCH but the template still uses the now deprecated (old v10 PCUIF) SAPI PCU_IF_SAPI_AGCH. With PCUIF v.11 we must use PCU_IF_SAPI_AGCH_2 Related: OS#5927 Change-Id: Ie8b2e21e184282f70c92d6b9f716cfda1405ef4d --- M pcu/PCU_Tests_SNS.ttcn 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn index 012699e..b90fe37 100644 --- a/pcu/PCU_Tests_SNS.ttcn +++ b/pcu/PCU_Tests_SNS.ttcn @@ -361,7 +361,7 @@ fn:=42, arfcn:=871, qta:=0)); PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_DATA_REQ(bts_nr:=0, trx_nr:=0, ts_nr:=0, block_nr:=?, fn:=?, - sapi:=PCU_IF_SAPI_AGCH, data:=?))); + sapi:=PCU_IF_SAPI_AGCH_2, data:=?))); setverdict(pass); f_clean_ns_codec(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34550?usp=email 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: Ie8b2e21e184282f70c92d6b9f716cfda1405ef4d Gerrit-Change-Number: 34550 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCU_Tests_SNS: fix TC_pcuif_rach

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34550?usp=email ) Change subject: PCU_Tests_SNS: fix TC_pcuif_rach ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34550?usp=email 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: Ie8b2e21e184282f70c92d6b9f716cfda1405ef4d Gerrit-Change-Number: 34550 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Sep 2023 16:36:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-bsc[master]: sccplite: Support multiple MGW in MGW pool

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34511?usp=email ) Change subject: sccplite: Support multiple MGW in MGW pool ...................................................................... sccplite: Support multiple MGW in MGW pool Before this patch, the MGW was selected at startup, and the MGCP data was always forwarded to that same MGW. If several MGW were configured in the MGW pool, then osmo-bsc would select any of those from the pool, and start configured the BTS-side connection on an endpoint in that MGW. However, when the MSC submitted the MGCP encapsulated in IPA to the BSC, the BSC would always forward the MGCP message to that same MGW selected at startup. As a result, multiple MGWs configured with osmo-bsc using SCCPlite was broken. This commit fixes support for multiple MGWs by looking up the already selected MGW (to setup the BTS-side conn on the endpoint), based on the CIC (MGCP Endpoint) which was provided by the MSC upon AssignReq. Related: OS#6189 Depends: libosmocore.git Change-Id Iee361d740845257fa62c9093e30e8079fa933827 Depends: osmo-mgw.git Change-Id I18d7bdf650c0ec87ae16ed4944aed9f495400137 Change-Id: Ia106a21b7692eb5b2ac3b5ac2b358bedbc3b9da6 --- M TODO-RELEASE M src/osmo-bsc/osmo_bsc_mgcp.c M src/osmo-bsc/osmo_bsc_msc.c 3 files changed, 147 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index d0852fc..7a7ec22 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmocore > 1.9.0 working (compiling) OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL diff --git a/src/osmo-bsc/osmo_bsc_mgcp.c b/src/osmo-bsc/osmo_bsc_mgcp.c index 1b8e089..d7de4d2 100644 --- a/src/osmo-bsc/osmo_bsc_mgcp.c +++ b/src/osmo-bsc/osmo_bsc_mgcp.c @@ -2,6 +2,7 @@ * SCCPlite MGCP handling * * (C) 2018 by Harald Welte <laforge(a)gnumonks.org> + * (C) 2023 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> * All Rights Reserved * * This program is free software; you can redistribute it and/or modify @@ -19,6 +20,15 @@ * */ +#include <string.h> + +#include <osmocom/core/utils.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/socket.h> +#include <osmocom/core/sockaddr_str.h> +#include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h> +#include <osmocom/mgcp_client/mgcp_client.h> + #include <osmocom/bsc/bsc_msc_data.h> #include <osmocom/bsc/osmo_bsc.h> #include <osmocom/bsc/gsm_data.h> @@ -46,22 +56,123 @@ return osmo_msc_data_find(bsc_gsmnet, msc_nr); } +/* negative on error, zero upon success */ +static int parse_local_endpoint_name(char *buf, size_t buf_len, const char *data) +{ + char line[1024]; + char *epstart, *sep; + const char *start = data; + char *eol = strpbrk(start, "\r\n"); + + if (!eol) + return -1; + + if (eol - start > sizeof(line)) + return -1; + memcpy(line, start, eol - start); + line[eol - start] = '\0'; + + if (!(epstart = strchr(line, ' '))) + return -1; + epstart++; + /* epstart now points to trans */ + + if (!(epstart = strchr(epstart, ' '))) + return -1; + epstart++; + /* epstart now points to endpoint */ + if (!(sep = strchr(epstart, '@'))) + return -1; + if (sep - epstart >= buf_len) + return -1; + + *sep = '\0'; + osmo_strlcpy(buf, epstart, buf_len); + return 0; +} + /* We received an IPA-encapsulated MGCP message from a MSC. Transfers msg ownership. */ int bsc_sccplite_rx_mgcp(struct osmo_ss7_asp *asp, struct msgb *msg) { struct bsc_msc_data *msc; + struct gsm_subscriber_connection *conn; + char rcv_ep_local_name[1024]; + struct osmo_sockaddr_str osa_str = {}; + struct osmo_sockaddr osa = {}; + socklen_t dest_len; + struct mgcp_client *mgcp_cli = NULL; int rc; - LOGP(DMSC, LOGL_NOTICE, "%s: Received IPA-encapsulated MGCP: %s\n", + LOGP(DMSC, LOGL_INFO, "%s: Received IPA-encapsulated MGCP: %s\n", osmo_ss7_asp_get_name(asp), msg->l2h); - msc = msc_from_asp(asp); - if (msc) { - /* we don't have a write queue here as we simply expect the socket buffers - * to be large enough to deal with whatever small/infrequent MGCP messages */ - rc = send(msc->mgcp_ipa.ofd.fd, msgb_l2(msg), msgb_l2len(msg), 0); - } else - rc = 0; + msc = msc_from_asp(asp); + if (!msc) { + rc = 0; + goto free_msg_ret; + } + + rc = parse_local_endpoint_name(rcv_ep_local_name, sizeof(rcv_ep_local_name), (const char *)msg->l2h); + if (rc < 0) { + LOGP(DMSC, LOGL_ERROR, "(%s:) Received IPA-encapsulated MGCP: Failed to parse CIC\n", + osmo_ss7_asp_get_name(asp)); + goto free_msg_ret; + } + + /* Lookup which conn attached to the MSC holds an MGW endpoint with the + * name Endpoint Number as the one provided in the MGCP msg we received + * from MSC. Since CIC are unique per MSC, that's the same MGW in the + * pool where we have to forward the MGCP message. */ + llist_for_each_entry(conn, &bsc_gsmnet->subscr_conns, entry) { + const char *ep_local_name; + if (conn->sccp.msc != msc) + continue; /* Only conns belonging to this MSC */ + if (!conn->user_plane.mgw_endpoint) + continue; + ep_local_name = osmo_mgcpc_ep_local_name(conn->user_plane.mgw_endpoint); + LOGPFSMSL(conn->fi, DMSC, LOGL_DEBUG, "ep_local_name='%s' vs rcv_ep_local_name='%s'\n", + ep_local_name ? : "(null)", rcv_ep_local_name); + if (!ep_local_name) + continue; + if (strcmp(ep_local_name, rcv_ep_local_name) != 0) + continue; + mgcp_cli = osmo_mgcpc_ep_client(conn->user_plane.mgw_endpoint); + if (!mgcp_cli) + continue; + break; + } + + if (!mgcp_cli) { + LOGP(DMSC, LOGL_ERROR, "(%s:) Received IPA-encapsulated MGCP: Failed to find associated MGW\n", + osmo_ss7_asp_get_name(asp)); + rc = 0; + goto free_msg_ret; + } + + rc = osmo_sockaddr_str_from_str(&osa_str, mgcp_client_remote_addr_str(mgcp_cli), + mgcp_client_remote_port(mgcp_cli)); + if (rc < 0) { + LOGP(DMSC, LOGL_ERROR, "(%s:) Received IPA-encapsulated MGCP: Failed to parse MGCP address %s:%u\n", + osmo_ss7_asp_get_name(asp), mgcp_client_remote_addr_str(mgcp_cli), mgcp_client_remote_port(mgcp_cli)); + goto free_msg_ret; + } + + LOGP(DMSC, LOGL_NOTICE, "%s: Forwarding IPA-encapsulated MGCP to MGW at " OSMO_SOCKADDR_STR_FMT "\n", + osmo_ss7_asp_get_name(asp), OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL(&osa_str)); + + rc = osmo_sockaddr_str_to_sockaddr(&osa_str, &osa.u.sas); + if (rc < 0) { + LOGP(DMSC, LOGL_ERROR, "(%s:) Received IPA-encapsulated MGCP: Failed to parse MGCP address " OSMO_SOCKADDR_STR_FMT "\n", + osmo_ss7_asp_get_name(asp), OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL(&osa_str)); + goto free_msg_ret; + } + dest_len = osmo_sockaddr_size(&osa); + + /* we don't have a write queue here as we simply expect the socket buffers + * to be large enough to deal with whatever small/infrequent MGCP messages */ + rc = sendto(msc->mgcp_ipa.ofd.fd, msgb_l2(msg), msgb_l2len(msg), 0, &osa.u.sa, dest_len); + +free_msg_ret: msgb_free(msg); return rc; } diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index dfba2de..2425592 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -376,26 +376,15 @@ int osmo_bsc_msc_init(struct bsc_msc_data *msc) { - struct gsm_network *net = msc->network; - struct mgcp_client *mgcp_cli; int rc; /* Everything below refers to SCCP-Lite MSC connections only. */ if (msc_is_aoip(msc)) return 0; - /* Note: MGW is preselected here at startup, which means currently - * osmo-bsc configured for SCCPLite doesn't support MGW pools with more - * than 1 MGW. - */ - mgcp_cli = mgcp_client_pool_get(net->mgw.mgw_pool); - OSMO_ASSERT(mgcp_cli); rc = osmo_sock_init2_ofd(&msc->mgcp_ipa.ofd, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, msc->mgcp_ipa.local_addr, msc->mgcp_ipa.local_port, - mgcp_client_remote_addr_str(mgcp_cli), - mgcp_client_remote_port(mgcp_cli), - OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT); - mgcp_client_pool_put(mgcp_cli); + NULL, 0, OSMO_SOCK_F_BIND); if (rc < 0) { LOGP(DMSC, LOGL_ERROR, "msc %u: Could not create/connect/bind MGCP proxy socket: %d\n", msc->nr, rc); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34511?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia106a21b7692eb5b2ac3b5ac2b358bedbc3b9da6 Gerrit-Change-Number: 34511 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: mgw: Add missing TC_two_crcx_mdcx_and_rtp_clearmode to expected-resul...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34553?usp=email ) Change subject: mgw: Add missing TC_two_crcx_mdcx_and_rtp_clearmode to expected-results.xml ...................................................................... mgw: Add missing TC_two_crcx_mdcx_and_rtp_clearmode to expected-results.xml Change-Id: I54fa4aeae49fdae51cfbbf076a56b7185585fc48 --- M mgw/expected-results.xml 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/53/34553/1 diff --git a/mgw/expected-results.xml b/mgw/expected-results.xml index 5d57e1c..3c438bd 100644 --- a/mgw/expected-results.xml +++ b/mgw/expected-results.xml @@ -95,5 +95,6 @@ <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_iuup_rtp_rfci_unordered' time='MASKED'/> <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_iuup_rtp_mdcx_recvonly' time='MASKED'/> <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_iuup_rtp_mdcx_to_iuup' time='MASKED'/> + <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_rtp_clearmode' time='MASKED'/> <testcase classname='MGCP_Test' name='TC_one_crcx_loopback_rtp_implicit' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34553?usp=email 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: I54fa4aeae49fdae51cfbbf076a56b7185585fc48 Gerrit-Change-Number: 34553 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_two_crcx_mdcx_and_iuup_rtp_mdcx_to_iuup

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34539?usp=email ) Change subject: mgw: Introduce test TC_two_crcx_mdcx_and_iuup_rtp_mdcx_to_iuup ...................................................................... Patch Set 4: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34539?usp=email 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: I08eca9ea123029c37892d5de7c94a8ed6cc0a913 Gerrit-Change-Number: 34539 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Sep 2023 16:32:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: RTP_Emulation: Log number of error packets

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34551?usp=email ) Change subject: RTP_Emulation: Log number of error packets ...................................................................... RTP_Emulation: Log number of error packets Change-Id: I685fb43ea30c83a975edd32cc24994da15940100 --- M library/RTP_Emulation.ttcn 1 file changed, 14 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/34551/1 diff --git a/library/RTP_Emulation.ttcn b/library/RTP_Emulation.ttcn index de2c877..5e10b3f 100644 --- a/library/RTP_Emulation.ttcn +++ b/library/RTP_Emulation.ttcn @@ -295,23 +295,23 @@ /* Check error counters */ if (s.num_pkts_rx_err_seq != 0) { - setverdict(fail, "RTP packet sequence number errors occurred"); + setverdict(fail, log2str(s.num_pkts_rx_err_seq, " RTP packet sequence number errors occurred")); mtc.stop; } if (s.num_pkts_rx_err_ts != 0) { - setverdict(fail, "RTP packet timestamp errors occurred"); + setverdict(fail, log2str(s.num_pkts_rx_err_ts, " RTP packet timestamp errors occurred")); mtc.stop; } if (s.num_pkts_rx_err_pt != 0) { - setverdict(fail, "RTP packet payload type errors occurred"); + setverdict(fail, log2str(s.num_pkts_rx_err_pt, " RTP packet payload type errors occurred")); mtc.stop; } if (s.num_pkts_rx_err_disabled != 0) { - setverdict(fail, "RTP packets received while RX was disabled"); + setverdict(fail, log2str(s.num_pkts_rx_err_disabled, " RTP packets received while RX was disabled")); mtc.stop; } if (s.num_pkts_rx_err_payload != 0) { - setverdict(fail, "RTP packets with mismatching payload received"); + setverdict(fail, log2str(s.num_pkts_rx_err_payload, " RTP packets with mismatching payload received")); mtc.stop; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34551?usp=email 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: I685fb43ea30c83a975edd32cc24994da15940100 Gerrit-Change-Number: 34551 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023