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

Change in osmo-bsc-nat[master]: bssap: forward paging from MSC to all BSCs

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27704 ) Change subject: bssap: forward paging from MSC to all BSCs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I2532d94aab82d136b932d57fa53c8ecf2d8d1fd9 Gerrit-Change-Number: 27704 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Sat, 09 Apr 2022 09:11:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc-nat[master]: bssap: forward paging from MSC to all BSCs

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27704 ) Change subject: bssap: forward paging from MSC to all BSCs ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I think it is ok to merge this kind of approach now, but for later we definitely want to be smarter about this. In a larger-than-trivial network you would likely quickly saturate the PCH (downlink CCCH) if you push all paging requests everywhere. If the MSC wants to page the entire netwrok (bsc coverage area) it will say that in the paging request. But in most normal cases it would request to only page in a specific LA. Dynamically learning from the LU is a smart idea, and I like it - but unfortuantely it wouldn't work at the moment we start (or restart) bsc-nat. Then we don't have a (complete) table of the LAC yet, and we wouldn't be able to rout paging, even while there are still phones out there in those LA/BTS which could be paged. The other option would be to introduce some osmocom proprietary IE to the BSSMAP RESET which contains the LAC[s] of all the cells in the BSC. As we are developing osmo-bsc_nat primarily for use with osmo-bsc, this would be an elegant solution for the primary use caes. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I2532d94aab82d136b932d57fa53c8ecf2d8d1fd9 Gerrit-Change-Number: 27704 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Sat, 09 Apr 2022 09:11:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-e1d[laforge/rifo]: RIFO: add more thorough tests and a vetted test.ok file

by laforge

Attention is currently required from: manawyrm. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27717 ) Change subject: RIFO: add more thorough tests and a vetted test.ok file ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: looks good, thanks. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: laforge/rifo Gerrit-Change-Id: I930b4361924b2e8bcb566eb7ee64f36e06bc7745 Gerrit-Change-Number: 27717 Gerrit-PatchSet: 1 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Comment-Date: Sat, 09 Apr 2022 09:03:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-e1d[laforge/rifo]: RIFO: fix frame_rifo_in check on frame number wrap-around

by laforge

Attention is currently required from: manawyrm, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27716 ) Change subject: RIFO: fix frame_rifo_in check on frame number wrap-around ...................................................................... Patch Set 1: (1 comment) File src/octoi/frame_rifo.c: https://gerrit.osmocom.org/c/osmo-e1d/+/27716/comment/9d338bec_b8dd9532 PS1, Line 117: if ( fn < rifo->next_out_fn - FRAMES_PER_FIFO ) I'm not really following here. so the previous check was whether we try to insert a frame number that is too large. Your new check is for a frame number that is too small ("min_in_fn"). But the way how you nested the new if clause, it means -ERANGE is only returned if it's both larger than max_in_fn and smaller than "min_in_fn", i.e. never? I guess we shold define a frame_rifo_min_in_fn() function similar to frame_rifo_max_in_fn() and then have an or-statement here if it's either less than min_in_fn or greater than max_in_fn? -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: laforge/rifo Gerrit-Change-Id: I88abfc77543d5c64b01f40944b2914e03e57d08f Gerrit-Change-Number: 27716 Gerrit-PatchSet: 1 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Sat, 09 Apr 2022 09:00:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-e1d[laforge/rifo]: RIFO: fix frame_rifo_in check on frame number wrap-around

by manawyrm

manawyrm has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27716 ) Change subject: RIFO: fix frame_rifo_in check on frame number wrap-around ...................................................................... RIFO: fix frame_rifo_in check on frame number wrap-around frame_rifo_in would previously return -ERANGE when a frame was written which was at the edge of the wrap-around of the frame number (because the maximum value was already across the boundary) Also: fixed some typos Change-Id: I88abfc77543d5c64b01f40944b2914e03e57d08f --- M src/octoi/e1oip.c M src/octoi/frame_rifo.c 2 files changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/16/27716/1 diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c index 176db01..00c671d 100644 --- a/src/octoi/e1oip.c +++ b/src/octoi/e1oip.c @@ -98,7 +98,7 @@ 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 + * a certain threshold is reached, but 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); diff --git a/src/octoi/frame_rifo.c b/src/octoi/frame_rifo.c index 0ddaae5..823df15 100644 --- a/src/octoi/frame_rifo.c +++ b/src/octoi/frame_rifo.c @@ -106,14 +106,19 @@ * \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. - * \returns 0 on success; -1 on error (overflow */ + * \returns 0 on success; -1 on error (overflow) */ int frame_rifo_in(struct frame_rifo *rifo, const uint8_t *frame, uint32_t fn) { uint32_t bucket; uint8_t *dst; if (fn > frame_rifo_max_in_fn(rifo)) - return -ERANGE; + { + if ( fn < rifo->next_out_fn - FRAMES_PER_FIFO ) + { + return -ERANGE; + } + } bucket = bucket_for_fn(rifo, fn); dst = rifo->buf + bucket * BYTES_PER_FRAME; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: laforge/rifo Gerrit-Change-Id: I88abfc77543d5c64b01f40944b2914e03e57d08f Gerrit-Change-Number: 27716 Gerrit-PatchSet: 1 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-e1d[laforge/rifo]: RIFO: add more thorough tests and a vetted test.ok file

by manawyrm

manawyrm has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27717 ) Change subject: RIFO: add more thorough tests and a vetted test.ok file ...................................................................... RIFO: add more thorough tests and a vetted test.ok file This commit adds 2 new tests: - too old frames (which should get dropped) - already correct frames (which shouldn't be touched) In addition, every test will now be run twice. Once at frame number 0 and once very close to the wrap-around of the internal frame counter in order to observe the behaviour. Change-Id: I930b4361924b2e8bcb566eb7ee64f36e06bc7745 --- M tests/rifo/rifo_test.c A tests/rifo/rifo_test.ok 2 files changed, 284 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/17/27717/1 diff --git a/tests/rifo/rifo_test.c b/tests/rifo/rifo_test.c index c656c97..5dac5ba 100644 --- a/tests/rifo/rifo_test.c +++ b/tests/rifo/rifo_test.c @@ -9,11 +9,11 @@ #include "frame_rifo.h" static void *g_e1d_ctx; +static uint32_t init_next_out_fn; static void rifo_in(struct frame_rifo *rifo, uint8_t *frame, uint32_t fn) { - printf("RIFO_IN(%s, %u)\n", osmo_hexdump_nospc(frame, BYTES_PER_FRAME), fn); - OSMO_ASSERT(frame_rifo_in(rifo, frame, fn) == 0); + printf("RIFO_IN(%s, %u)=%d\n", osmo_hexdump_nospc(frame, BYTES_PER_FRAME), fn, frame_rifo_in(rifo, frame, fn)); } static int rifo_out(struct frame_rifo *rifo, uint8_t *out) @@ -23,18 +23,21 @@ return rc; } - -static void missing_frames(void) +static void missing_frames(uint8_t modulo) { struct frame_rifo rifo; frame_rifo_init(&rifo); + rifo.next_out_fn = init_next_out_fn; - printf("\nTEST: %s\n", __func__); + printf("\nTEST: %s, starting at FN: %u\n", __func__, init_next_out_fn); for (int i = 0; i < 10; i++) { uint8_t frame[32]; memset(frame, i, sizeof(frame)); - rifo_in(&rifo, frame, 2*i); + + if (i % 2 == modulo) { + rifo_in(&rifo, frame, init_next_out_fn + i); + } } for (int i = 0; i < 10; i++) { @@ -48,14 +51,15 @@ { struct frame_rifo rifo; frame_rifo_init(&rifo); + rifo.next_out_fn = init_next_out_fn; - printf("\nTEST: %s\n", __func__); + printf("\nTEST: %s, starting at FN: %u\n", __func__, init_next_out_fn); const uint8_t in[] = { 0, 1, 4, 3, 5, 2, 6, 7, 8, 9 }; for (int i = 0; i < sizeof(in); i++) { uint8_t frame[32]; memset(frame, in[i], sizeof(frame)); - rifo_in(&rifo, frame, in[i]); + rifo_in(&rifo, frame, init_next_out_fn + in[i]); } for (int i = 0; i < 10; i++) { @@ -65,12 +69,82 @@ } } +static void correct_order(void) +{ + struct frame_rifo rifo; + frame_rifo_init(&rifo); + rifo.next_out_fn = init_next_out_fn; + + printf("\nTEST: %s, starting at FN: %u\n", __func__, init_next_out_fn); + + const uint8_t in[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; + for (int i = 0; i < sizeof(in); i++) { + uint8_t frame[32]; + memset(frame, in[i], sizeof(frame)); + rifo_in(&rifo, frame, init_next_out_fn + in[i]); + } + + for (int i = 0; i < 10; i++) { + uint8_t frame[32]; + memset(frame, 0xff, sizeof(frame)); + rifo_out(&rifo, frame); + } +} + +static void too_old_frames(void) +{ + struct frame_rifo rifo; + frame_rifo_init(&rifo); + rifo.next_out_fn = init_next_out_fn; + + printf("\nTEST: %s, starting at FN: %u\n", __func__, init_next_out_fn); + + // Put 10 frames at absolute frame numbers 850-860 + // (to get outside of the 800 frame buffer) + const uint8_t in[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; + for (int i = 0; i < sizeof(in); i++) { + uint8_t frame[32]; + memset(frame, in[i], sizeof(frame)); + rifo_in(&rifo, frame, init_next_out_fn + in[i] + 850); + } + + // Skip the first 850 frames + for (int i = 0; i < 850; i++) { + uint8_t frame[32]; + memset(frame, 0xff, sizeof(frame)); + // Note: frame_rifo_out instead of rifo_out + // (just to ignore the output) + frame_rifo_out(&rifo, frame); + } + + // Try to read the 10 real frames (which shouldn't be in the buffer) + for (int i = 0; i < 10; i++) { + uint8_t frame[32]; + memset(frame, 0xff, sizeof(frame)); + rifo_out(&rifo, frame); + } +} + +void run_all_tests(void) +{ + missing_frames(0); + missing_frames(1); + reordered_in(); + correct_order(); + too_old_frames(); +} int main(int argc, char **argv) { g_e1d_ctx = talloc_named_const(NULL, 0, "osmo-e1d"); osmo_init_logging2(g_e1d_ctx, &log_info); - missing_frames(); - reordered_in(); + + // run all tests starting with a framenumber of 0 + init_next_out_fn = 0; + run_all_tests(); + + // re-run all tests at the edge of a framenumber rollover + init_next_out_fn = 0xFFFFFFFF - 5; + run_all_tests(); } diff --git a/tests/rifo/rifo_test.ok b/tests/rifo/rifo_test.ok new file mode 100644 index 0000000..cf1b778 --- /dev/null +++ b/tests/rifo/rifo_test.ok @@ -0,0 +1,200 @@ + +TEST: missing_frames, starting at FN: 0 +RIFO_IN(0000000000000000000000000000000000000000000000000000000000000000, 0)=0 +RIFO_IN(0202020202020202020202020202020202020202020202020202020202020202, 2)=0 +RIFO_IN(0404040404040404040404040404040404040404040404040404040404040404, 4)=0 +RIFO_IN(0606060606060606060606060606060606060606060606060606060606060606, 6)=0 +RIFO_IN(0808080808080808080808080808080808080808080808080808080808080808, 8)=0 +RIFO_OUT(0000000000000000000000000000000000000000000000000000000000000000)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0202020202020202020202020202020202020202020202020202020202020202)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0404040404040404040404040404040404040404040404040404040404040404)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0606060606060606060606060606060606060606060606060606060606060606)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0808080808080808080808080808080808080808080808080808080808080808)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 + +TEST: missing_frames, starting at FN: 0 +RIFO_IN(0101010101010101010101010101010101010101010101010101010101010101, 1)=0 +RIFO_IN(0303030303030303030303030303030303030303030303030303030303030303, 3)=0 +RIFO_IN(0505050505050505050505050505050505050505050505050505050505050505, 5)=0 +RIFO_IN(0707070707070707070707070707070707070707070707070707070707070707, 7)=0 +RIFO_IN(0909090909090909090909090909090909090909090909090909090909090909, 9)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0101010101010101010101010101010101010101010101010101010101010101)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0303030303030303030303030303030303030303030303030303030303030303)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0505050505050505050505050505050505050505050505050505050505050505)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0707070707070707070707070707070707070707070707070707070707070707)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0909090909090909090909090909090909090909090909090909090909090909)=0 + +TEST: reordered_in, starting at FN: 0 +RIFO_IN(0000000000000000000000000000000000000000000000000000000000000000, 0)=0 +RIFO_IN(0101010101010101010101010101010101010101010101010101010101010101, 1)=0 +RIFO_IN(0404040404040404040404040404040404040404040404040404040404040404, 4)=0 +RIFO_IN(0303030303030303030303030303030303030303030303030303030303030303, 3)=0 +RIFO_IN(0505050505050505050505050505050505050505050505050505050505050505, 5)=0 +RIFO_IN(0202020202020202020202020202020202020202020202020202020202020202, 2)=0 +RIFO_IN(0606060606060606060606060606060606060606060606060606060606060606, 6)=0 +RIFO_IN(0707070707070707070707070707070707070707070707070707070707070707, 7)=0 +RIFO_IN(0808080808080808080808080808080808080808080808080808080808080808, 8)=0 +RIFO_IN(0909090909090909090909090909090909090909090909090909090909090909, 9)=0 +RIFO_OUT(0000000000000000000000000000000000000000000000000000000000000000)=0 +RIFO_OUT(0101010101010101010101010101010101010101010101010101010101010101)=0 +RIFO_OUT(0202020202020202020202020202020202020202020202020202020202020202)=0 +RIFO_OUT(0303030303030303030303030303030303030303030303030303030303030303)=0 +RIFO_OUT(0404040404040404040404040404040404040404040404040404040404040404)=0 +RIFO_OUT(0505050505050505050505050505050505050505050505050505050505050505)=0 +RIFO_OUT(0606060606060606060606060606060606060606060606060606060606060606)=0 +RIFO_OUT(0707070707070707070707070707070707070707070707070707070707070707)=0 +RIFO_OUT(0808080808080808080808080808080808080808080808080808080808080808)=0 +RIFO_OUT(0909090909090909090909090909090909090909090909090909090909090909)=0 + +TEST: correct_order, starting at FN: 0 +RIFO_IN(0000000000000000000000000000000000000000000000000000000000000000, 0)=0 +RIFO_IN(0101010101010101010101010101010101010101010101010101010101010101, 1)=0 +RIFO_IN(0202020202020202020202020202020202020202020202020202020202020202, 2)=0 +RIFO_IN(0303030303030303030303030303030303030303030303030303030303030303, 3)=0 +RIFO_IN(0404040404040404040404040404040404040404040404040404040404040404, 4)=0 +RIFO_IN(0505050505050505050505050505050505050505050505050505050505050505, 5)=0 +RIFO_IN(0606060606060606060606060606060606060606060606060606060606060606, 6)=0 +RIFO_IN(0707070707070707070707070707070707070707070707070707070707070707, 7)=0 +RIFO_IN(0808080808080808080808080808080808080808080808080808080808080808, 8)=0 +RIFO_IN(0909090909090909090909090909090909090909090909090909090909090909, 9)=0 +RIFO_OUT(0000000000000000000000000000000000000000000000000000000000000000)=0 +RIFO_OUT(0101010101010101010101010101010101010101010101010101010101010101)=0 +RIFO_OUT(0202020202020202020202020202020202020202020202020202020202020202)=0 +RIFO_OUT(0303030303030303030303030303030303030303030303030303030303030303)=0 +RIFO_OUT(0404040404040404040404040404040404040404040404040404040404040404)=0 +RIFO_OUT(0505050505050505050505050505050505050505050505050505050505050505)=0 +RIFO_OUT(0606060606060606060606060606060606060606060606060606060606060606)=0 +RIFO_OUT(0707070707070707070707070707070707070707070707070707070707070707)=0 +RIFO_OUT(0808080808080808080808080808080808080808080808080808080808080808)=0 +RIFO_OUT(0909090909090909090909090909090909090909090909090909090909090909)=0 + +TEST: too_old_frames, starting at FN: 0 +RIFO_IN(0000000000000000000000000000000000000000000000000000000000000000, 850)=-34 +RIFO_IN(0101010101010101010101010101010101010101010101010101010101010101, 851)=-34 +RIFO_IN(0202020202020202020202020202020202020202020202020202020202020202, 852)=-34 +RIFO_IN(0303030303030303030303030303030303030303030303030303030303030303, 853)=-34 +RIFO_IN(0404040404040404040404040404040404040404040404040404040404040404, 854)=-34 +RIFO_IN(0505050505050505050505050505050505050505050505050505050505050505, 855)=-34 +RIFO_IN(0606060606060606060606060606060606060606060606060606060606060606, 856)=-34 +RIFO_IN(0707070707070707070707070707070707070707070707070707070707070707, 857)=-34 +RIFO_IN(0808080808080808080808080808080808080808080808080808080808080808, 858)=-34 +RIFO_IN(0909090909090909090909090909090909090909090909090909090909090909, 859)=-34 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 + +TEST: missing_frames, starting at FN: 4294967290 +RIFO_IN(0000000000000000000000000000000000000000000000000000000000000000, 4294967290)=0 +RIFO_IN(0202020202020202020202020202020202020202020202020202020202020202, 4294967292)=0 +RIFO_IN(0404040404040404040404040404040404040404040404040404040404040404, 4294967294)=0 +RIFO_IN(0606060606060606060606060606060606060606060606060606060606060606, 0)=0 +RIFO_IN(0808080808080808080808080808080808080808080808080808080808080808, 2)=0 +RIFO_OUT(0000000000000000000000000000000000000000000000000000000000000000)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0202020202020202020202020202020202020202020202020202020202020202)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0404040404040404040404040404040404040404040404040404040404040404)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0606060606060606060606060606060606060606060606060606060606060606)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0808080808080808080808080808080808080808080808080808080808080808)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 + +TEST: missing_frames, starting at FN: 4294967290 +RIFO_IN(0101010101010101010101010101010101010101010101010101010101010101, 4294967291)=0 +RIFO_IN(0303030303030303030303030303030303030303030303030303030303030303, 4294967293)=0 +RIFO_IN(0505050505050505050505050505050505050505050505050505050505050505, 4294967295)=0 +RIFO_IN(0707070707070707070707070707070707070707070707070707070707070707, 1)=0 +RIFO_IN(0909090909090909090909090909090909090909090909090909090909090909, 3)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0101010101010101010101010101010101010101010101010101010101010101)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0303030303030303030303030303030303030303030303030303030303030303)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0505050505050505050505050505050505050505050505050505050505050505)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0707070707070707070707070707070707070707070707070707070707070707)=0 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(0909090909090909090909090909090909090909090909090909090909090909)=0 + +TEST: reordered_in, starting at FN: 4294967290 +RIFO_IN(0000000000000000000000000000000000000000000000000000000000000000, 4294967290)=0 +RIFO_IN(0101010101010101010101010101010101010101010101010101010101010101, 4294967291)=0 +RIFO_IN(0404040404040404040404040404040404040404040404040404040404040404, 4294967294)=0 +RIFO_IN(0303030303030303030303030303030303030303030303030303030303030303, 4294967293)=0 +RIFO_IN(0505050505050505050505050505050505050505050505050505050505050505, 4294967295)=0 +RIFO_IN(0202020202020202020202020202020202020202020202020202020202020202, 4294967292)=0 +RIFO_IN(0606060606060606060606060606060606060606060606060606060606060606, 0)=0 +RIFO_IN(0707070707070707070707070707070707070707070707070707070707070707, 1)=0 +RIFO_IN(0808080808080808080808080808080808080808080808080808080808080808, 2)=0 +RIFO_IN(0909090909090909090909090909090909090909090909090909090909090909, 3)=0 +RIFO_OUT(0000000000000000000000000000000000000000000000000000000000000000)=0 +RIFO_OUT(0101010101010101010101010101010101010101010101010101010101010101)=0 +RIFO_OUT(0202020202020202020202020202020202020202020202020202020202020202)=0 +RIFO_OUT(0303030303030303030303030303030303030303030303030303030303030303)=0 +RIFO_OUT(0404040404040404040404040404040404040404040404040404040404040404)=0 +RIFO_OUT(0505050505050505050505050505050505050505050505050505050505050505)=0 +RIFO_OUT(0606060606060606060606060606060606060606060606060606060606060606)=0 +RIFO_OUT(0707070707070707070707070707070707070707070707070707070707070707)=0 +RIFO_OUT(0808080808080808080808080808080808080808080808080808080808080808)=0 +RIFO_OUT(0909090909090909090909090909090909090909090909090909090909090909)=0 + +TEST: correct_order, starting at FN: 4294967290 +RIFO_IN(0000000000000000000000000000000000000000000000000000000000000000, 4294967290)=0 +RIFO_IN(0101010101010101010101010101010101010101010101010101010101010101, 4294967291)=0 +RIFO_IN(0202020202020202020202020202020202020202020202020202020202020202, 4294967292)=0 +RIFO_IN(0303030303030303030303030303030303030303030303030303030303030303, 4294967293)=0 +RIFO_IN(0404040404040404040404040404040404040404040404040404040404040404, 4294967294)=0 +RIFO_IN(0505050505050505050505050505050505050505050505050505050505050505, 4294967295)=0 +RIFO_IN(0606060606060606060606060606060606060606060606060606060606060606, 0)=0 +RIFO_IN(0707070707070707070707070707070707070707070707070707070707070707, 1)=0 +RIFO_IN(0808080808080808080808080808080808080808080808080808080808080808, 2)=0 +RIFO_IN(0909090909090909090909090909090909090909090909090909090909090909, 3)=0 +RIFO_OUT(0000000000000000000000000000000000000000000000000000000000000000)=0 +RIFO_OUT(0101010101010101010101010101010101010101010101010101010101010101)=0 +RIFO_OUT(0202020202020202020202020202020202020202020202020202020202020202)=0 +RIFO_OUT(0303030303030303030303030303030303030303030303030303030303030303)=0 +RIFO_OUT(0404040404040404040404040404040404040404040404040404040404040404)=0 +RIFO_OUT(0505050505050505050505050505050505050505050505050505050505050505)=0 +RIFO_OUT(0606060606060606060606060606060606060606060606060606060606060606)=0 +RIFO_OUT(0707070707070707070707070707070707070707070707070707070707070707)=0 +RIFO_OUT(0808080808080808080808080808080808080808080808080808080808080808)=0 +RIFO_OUT(0909090909090909090909090909090909090909090909090909090909090909)=0 + +TEST: too_old_frames, starting at FN: 4294967290 +RIFO_IN(0000000000000000000000000000000000000000000000000000000000000000, 844)=-34 +RIFO_IN(0101010101010101010101010101010101010101010101010101010101010101, 845)=-34 +RIFO_IN(0202020202020202020202020202020202020202020202020202020202020202, 846)=-34 +RIFO_IN(0303030303030303030303030303030303030303030303030303030303030303, 847)=-34 +RIFO_IN(0404040404040404040404040404040404040404040404040404040404040404, 848)=-34 +RIFO_IN(0505050505050505050505050505050505050505050505050505050505050505, 849)=-34 +RIFO_IN(0606060606060606060606060606060606060606060606060606060606060606, 850)=-34 +RIFO_IN(0707070707070707070707070707070707070707070707070707070707070707, 851)=-34 +RIFO_IN(0808080808080808080808080808080808080808080808080808080808080808, 852)=-34 +RIFO_IN(0909090909090909090909090909090909090909090909090909090909090909, 853)=-34 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: laforge/rifo Gerrit-Change-Id: I930b4361924b2e8bcb566eb7ee64f36e06bc7745 Gerrit-Change-Number: 27717 Gerrit-PatchSet: 1 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: RIFO: fix frame_rifo_in check on frame number wrap-around

by manawyrm

manawyrm has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27714 ) Change subject: RIFO: fix frame_rifo_in check on frame number wrap-around ...................................................................... Abandoned this shouldn't have been commited to refs/for/master, sorry! -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I88abfc77543d5c64b01f40944b2914e03e57d08f Gerrit-Change-Number: 27714 Gerrit-PatchSet: 1 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: WIP: RIFO (random in, first out) for IP->E1 direction

by manawyrm

manawyrm has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27713 ) Change subject: WIP: RIFO (random in, first out) for IP->E1 direction ...................................................................... Abandoned this shouldn't have been commited to refs/for/master, sorry! -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I22256870114cb85e4e10932554478be7061e086b Gerrit-Change-Number: 27713 Gerrit-PatchSet: 1 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: abandon

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: RIFO: add more thorough tests and a vetted test.ok file

by manawyrm

manawyrm has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27715 ) Change subject: RIFO: add more thorough tests and a vetted test.ok file ...................................................................... Abandoned this shouldn't have been commited to refs/for/master, sorry! -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I930b4361924b2e8bcb566eb7ee64f36e06bc7745 Gerrit-Change-Number: 27715 Gerrit-PatchSet: 1 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: RIFO: fix frame_rifo_in check on frame number wrap-around

by manawyrm

manawyrm has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27714 ) Change subject: RIFO: fix frame_rifo_in check on frame number wrap-around ...................................................................... RIFO: fix frame_rifo_in check on frame number wrap-around frame_rifo_in would previously return -ERANGE when a frame was written which was at the edge of the wrap-around of the frame number (because the maximum value was already across the boundary) Also: fixed some typos Change-Id: I88abfc77543d5c64b01f40944b2914e03e57d08f --- M src/octoi/e1oip.c M src/octoi/frame_rifo.c 2 files changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/14/27714/1 diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c index 176db01..00c671d 100644 --- a/src/octoi/e1oip.c +++ b/src/octoi/e1oip.c @@ -98,7 +98,7 @@ 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 + * a certain threshold is reached, but 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); diff --git a/src/octoi/frame_rifo.c b/src/octoi/frame_rifo.c index 0ddaae5..823df15 100644 --- a/src/octoi/frame_rifo.c +++ b/src/octoi/frame_rifo.c @@ -106,14 +106,19 @@ * \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. - * \returns 0 on success; -1 on error (overflow */ + * \returns 0 on success; -1 on error (overflow) */ int frame_rifo_in(struct frame_rifo *rifo, const uint8_t *frame, uint32_t fn) { uint32_t bucket; uint8_t *dst; if (fn > frame_rifo_max_in_fn(rifo)) - return -ERANGE; + { + if ( fn < rifo->next_out_fn - FRAMES_PER_FIFO ) + { + return -ERANGE; + } + } bucket = bucket_for_fn(rifo, fn); dst = rifo->buf + bucket * BYTES_PER_FRAME; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I88abfc77543d5c64b01f40944b2914e03e57d08f Gerrit-Change-Number: 27714 Gerrit-PatchSet: 1 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022