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

Change in docker-playground[master]: open5gs-latest: fix Dockerfile: avoid using curl for downloading keys

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27771 ) Change subject: open5gs-latest: fix Dockerfile: avoid using curl for downloading keys ...................................................................... open5gs-latest: fix Dockerfile: avoid using curl for downloading keys Since recently, curl fails to download the key from www.mongodb.org: ''' $ curl --verbose https://www.mongodb.org/static/pgp/server-4.2.asc GET /static/pgp/server-4.2.asc HTTP/1.1 Host: www.mongodb.org User-Agent: curl/7.82.0 Accept: */* Mark bundle as not supporting multiuse HTTP/1.1 301 Moved Permanently Content-Type: text/html Date: Wed, 13 Apr 2022 20:50:19 GMT Location: https://pgp.mongodb.com/server-4.2.asc Connection: Keep-Alive Content-Length: 0 ''' By default, curl would not follow redirects unless '-L' is specified. Let's use Docker's 'ADD' command instead, like many Dockerfiles do. Also, update the address as suggested in the server's response. Change-Id: I9757fcce084595341b1a68822bad454b64941eb1 Related: SYS#5602 --- M open5gs-latest/Dockerfile 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/71/27771/1 diff --git a/open5gs-latest/Dockerfile b/open5gs-latest/Dockerfile index 325062f..66683b9 100644 --- a/open5gs-latest/Dockerfile +++ b/open5gs-latest/Dockerfile @@ -6,15 +6,16 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends \ ca-certificates \ - gnupg \ - curl -RUN curl https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/D… | apt-key add - -RUN curl https://www.mongodb.org/static/pgp/server-4.2.asc | apt-key add - + gnupg + +ADD https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/D… /tmp/Release.key +ADD https://pgp.mongodb.com/server-4.2.asc /tmp/server-4.2.asc RUN echo "deb http://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/De… ./" \ > /etc/apt/sources.list.d/open5gs.list RUN echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.2 main" \ > /etc/apt/sources.list.d/mongodb-org.list +RUN apt-key add /tmp/Release.key && apt-key add /tmp/server-4.2.asc RUN apt-get update && \ apt-get install -y \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9757fcce084595341b1a68822bad454b64941eb1 Gerrit-Change-Number: 27771 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-ci[master]: OBS, ttcn3-testsuites: add 2022q1

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/27770 ) Change subject: OBS, ttcn3-testsuites: add 2022q1 ...................................................................... OBS, ttcn3-testsuites: add 2022q1 Related: SYS#5887 Change-Id: Idadb541b49e57b4403a6a6e4c966bcba9c6651db --- M jobs/ttcn3-testsuites.yml M scripts/common-obs.sh M scripts/osmocom-nightly-packages.sh 3 files changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/70/27770/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 89915a2..4f92248 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -400,6 +400,29 @@ blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" timer: 30 14 * * * + # centos8 2022q1 (SYS#5887) + - TTCN3-centos-pcu-test-2022q1: + blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" + timer: 00 15 * * * + - TTCN3-centos-pcu-test-sns-2022q1: + blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" + timer: 15 15 * * * + - TTCN3-centos-bsc-test-2022q1: + blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" + timer: 30 15 * * * + - TTCN3-centos-mgw-test-2022q1: + blocking: "^(ttcn3|TTCN3-.*)-mgw-test.*" + timer: 45 15 * * * + - TTCN3-centos-bts-test-2022q1: + blocking: "^(ttcn3|TTCN3-.*)-bts-test.*" + timer: 00 16 * * * + - TTCN3-centos-smlc-test-2022q1: + blocking: "^(ttcn3|TTCN3-.*)-smlc-test.*" + timer: 15 16 * * * + - TTCN3-centos-gbproxy-test-2022q1: + blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" + timer: 30 16 * * * + - job-template: name: '{job-name}' project-type: freestyle diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh index e53a7aa..2d3bea7 100644 --- a/scripts/common-obs.sh +++ b/scripts/common-obs.sh @@ -5,6 +5,7 @@ FEEDS_ALL=" 2021q1 2021q4 + 2022q1 latest next nightly diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 6fb8a1d..3f9fc4c 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -17,6 +17,7 @@ FEEDS=" 2021q1 2021q4 + 2022q1 next nightly " -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idadb541b49e57b4403a6a6e4c966bcba9c6651db Gerrit-Change-Number: 27770 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-uecups[master]: tun_device: Avoid deadlocks logging while thread is cancelled

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-uecups/+/27769 ) Change subject: tun_device: Avoid deadlocks logging while thread is cancelled ...................................................................... tun_device: Avoid deadlocks logging while thread is cancelled We cannot garantee that LOGP will not end up calling a syscall which can be a cancellation point. Since the syscall will be probably called while having the logging mutex locked, an eventuall cancellation of the thread would leave the logging mutex locked forever, hence making all other threads deadlock as soon as they try to write anything to the log. Change-Id: I72a0b536c8f39857960f132a5b84cdf5b8519732 --- M daemon/tun_device.c 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/69/27769/1 diff --git a/daemon/tun_device.c b/daemon/tun_device.c index 5993856..e9c0400 100644 --- a/daemon/tun_device.c +++ b/daemon/tun_device.c @@ -139,12 +139,17 @@ uint8_t *buffer = base_buffer + sizeof(struct gtp1_header); struct sockaddr_storage daddr; + int old_cancelst_unused; /* initialize the fixed part of the GTP header */ gtph->flags = 0x30; gtph->type = GTP_TPDU; pthread_cleanup_push(tun_device_pthread_cleanup_routine, tun); + /* IMPORTANT!: All logging functions in this function block must be called with + * PTHREAD_CANCEL_DISABLE set, otherwise the thread could be cancelled while + * holding the logging mutex, hence causing deadlock with main (or other) + * thread. */ while (1) { struct gtp_tunnel *t; @@ -154,6 +159,7 @@ /* 1) read from tun */ rc = read(tun->fd, buffer, MAX_UDP_PACKET); if (rc < 0) { + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); LOGTUN(tun, LOGL_FATAL, "Error readingfrom tun device: %s\n", strerror(errno)); exit(1); } @@ -162,8 +168,10 @@ rc = parse_pkt(&pinfo, buffer, nread); if (rc < 0) { + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); LOGTUN(tun, LOGL_NOTICE, "Error parsing IP packet: %s\n", osmo_hexdump(buffer, nread)); + pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old_cancelst_unused); continue; } @@ -181,7 +189,9 @@ getnameinfo((const struct sockaddr *)&pinfo.saddr, sizeof(pinfo.saddr), host, sizeof(host), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV); + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); LOGTUN(tun, LOGL_NOTICE, "No tunnel found for source address %s:%s\n", host, port); + pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old_cancelst_unused); continue; } outfd = t->gtp_ep->fd; @@ -193,6 +203,7 @@ rc = sendto(outfd, base_buffer, nread+sizeof(*gtph), 0, (struct sockaddr *)&daddr, sizeof(daddr)); if (rc < 0) { + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); LOGTUN(tun, LOGL_FATAL, "Error Writing to UDP socket: %s\n", strerror(errno)); exit(1); } -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I72a0b536c8f39857960f132a5b84cdf5b8519732 Gerrit-Change-Number: 27769 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Avoid generating zero-length packets

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27763 ) Change subject: Avoid generating zero-length packets ...................................................................... Avoid generating zero-length packets I used the construct like f_rnd_octstring(f_rnd_int(100)) in a number of places to generate random-length packets with randomized length. The problem I didn't realize is that f_rnd_int() of course can also return '0', which would generate zero-length packets. This may be permitted in some protocols, but it leads to problems e.g. when trying to send a UDP packet of zero length (which the kernel will not do). So let's introduce * f_rnd_int_nonzero() for returning non-zero randomized integers * f_rnd_octstring_rnd_len() for returning a random-length random payload octet string * replace all f_rnd_octstring(f_rnd_int()) call sites with the new function. Change-Id: I818a113ff8d2a2f7cab2ec7d9c8661607c6331d6 Closes: OS#5528 --- M fr/FR_Tests.ttcn M library/Osmocom_Types.ttcn M pcap-client/OPCAP_CLIENT_Tests.ttcn M remsim/RemsimClient_Tests.ttcn M sccp/SCCP_Tests_RAW.ttcn M stp/STP_Tests.ttcn M stp/STP_Tests_M3UA.ttcn 7 files changed, 29 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index b7a56c3..65029c1 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -276,7 +276,7 @@ var integer ran_index := 0; var template (value) PDU_LLC llc_tx; var template (present) PDU_LLC llc_rx_exp; - var octetstring llc_payload := f_rnd_octstring(f_rnd_int(max_llc_payload_len)); + var octetstring llc_payload := f_rnd_octstring_rnd_len(max_llc_payload_len); var PDU_LLC llc_rx; timer T := 5.0; diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index b698a2e..2edec36 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -65,6 +65,11 @@ return float2int(rnd()*int2float(max)); } +/* return random integer 1 <= ret < max */ +function f_rnd_int_nonzero(integer max) return integer { + return float2int(1.0 + rnd()*int2float(max-1)); +} + /* return hexstring composed of random digits */ function f_rnd_hexstring(in integer len, in integer max := 16) return hexstring { var integer i; @@ -85,6 +90,11 @@ return ret; } +/* return ocetstring composed of random bytes, at least 1, maximum 'maxlen' bytes long */ +function f_rnd_octstring_rnd_len(in integer maxlen) return octetstring { + return f_rnd_octstring(f_rnd_int_nonzero(maxlen)); +} + /* return bitstring composed of random bits */ function f_rnd_bitstring(in integer len) return bitstring { var octetstring oct := f_rnd_octstring(len / 8 + 1); diff --git a/pcap-client/OPCAP_CLIENT_Tests.ttcn b/pcap-client/OPCAP_CLIENT_Tests.ttcn index e9fe406..1efc343 100644 --- a/pcap-client/OPCAP_CLIENT_Tests.ttcn +++ b/pcap-client/OPCAP_CLIENT_Tests.ttcn @@ -144,7 +144,7 @@ var octetstring udp_payload; /* we assume 1400 is low enough to avoid IP fragmentation */ - udp_payload := f_rnd_octstring(f_rnd_int(1400)); + udp_payload := f_rnd_octstring_rnd_len(1400); f_trafic_pkt_ab(udp_payload); f_opcap_exp_udp(udp_payload, 0); @@ -173,7 +173,7 @@ var octetstring udp_payload; /* we assume 1400 is low enough to avoid IP fragmentation */ - udp_payload := f_rnd_octstring(f_rnd_int(1400)); + udp_payload := f_rnd_octstring_rnd_len(1400); f_trafic_pkt_ab(udp_payload); /* expect packet to arrive on both simulated servers */ diff --git a/remsim/RemsimClient_Tests.ttcn b/remsim/RemsimClient_Tests.ttcn index d7d6bc7..219573c 100644 --- a/remsim/RemsimClient_Tests.ttcn +++ b/remsim/RemsimClient_Tests.ttcn @@ -299,8 +299,8 @@ integer count := 100, integer i := 0) runs on client_test_CT { for (var integer j := 0; j < count; j := j+1) { - var octetstring c_apdu := f_rnd_octstring(f_rnd_int(270)); - var octetstring r_apdu := f_rnd_octstring(f_rnd_int(270)); + var octetstring c_apdu := f_rnd_octstring_rnd_len(270); + var octetstring r_apdu := f_rnd_octstring_rnd_len(270); f_client2bank(cslot, bslot, c_apdu, i:=i); f_bank2client(bslot, cslot, r_apdu, i:=i); } @@ -345,8 +345,8 @@ f_set_atr(cslot, '3B9F96801FC78031A073BE21136743200718000001A5'O, i:=1); - var octetstring c_apdu := f_rnd_octstring(f_rnd_int(270)); - var octetstring r_apdu := f_rnd_octstring(f_rnd_int(270)); + var octetstring c_apdu := f_rnd_octstring_rnd_len(270); + var octetstring r_apdu := f_rnd_octstring_rnd_len(270); /* Send C-APDU from correct ClientId/Slot to simulated bankd */ f_client2bank(cslot, bslot, c_apdu, i:=1); /* respond with R-APDU from correct bankId/Slot but stating wrong ClientId */ @@ -372,8 +372,8 @@ f_set_atr(cslot, '3B9F96801FC78031A073BE21136743200718000001A5'O, i:=1); - var octetstring c_apdu := f_rnd_octstring(f_rnd_int(270)); - var octetstring r_apdu := f_rnd_octstring(f_rnd_int(270)); + var octetstring c_apdu := f_rnd_octstring_rnd_len(270); + var octetstring r_apdu := f_rnd_octstring_rnd_len(270); /* Send C-APDU from correct ClientId/Slot to simulated bankd */ f_client2bank(cslot, bslot, c_apdu, i:=1); /* respond with R-APDU from wrong bankId but stating correct ClientId */ diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 5013ddf..fd6bad9 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -182,7 +182,7 @@ testcase TC_udt_without_cr_cc() runs on SCCP_Test_RAW_CT { var SCCP_PAR_Address calling, called; var SCCP_MTP3_TRANSFERind rx; - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); /* Keep recommended ratio of T(iar) >= T(ias)*2, but anyway no IT should be received in this case. */ @@ -215,7 +215,7 @@ testcase TC_tiar_timeout() runs on SCCP_Test_RAW_CT { var SCCP_PAR_Address calling, called; var OCT3 remote_lref; - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); /* Set T(iar) in sccp_demo_user low enough that it will trigger before other side has time to keep alive with a T(ias). Keep recommended ratio of @@ -320,7 +320,7 @@ /* Test if the IUT SCCP code processes an XUDT [treat it like UDT] and answers back. */ testcase TC_process_rx_xudt() runs on SCCP_Test_RAW_CT { var SCCP_PAR_Address calling, called; - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); f_init_raw(mp_sccp_cfg[0]); f_sleep(1.0); diff --git a/stp/STP_Tests.ttcn b/stp/STP_Tests.ttcn index 004af05..ac45b1d 100644 --- a/stp/STP_Tests.ttcn +++ b/stp/STP_Tests.ttcn @@ -73,7 +73,7 @@ f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx /* send a well-formed, encoded SCCP message via M3UA */ - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); @@ -105,7 +105,7 @@ f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx /* send a well-formed, encoded SCCP message via IPA */ - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); @@ -137,7 +137,7 @@ f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx /* send a well-formed, encoded SCCP message via IPA */ - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); @@ -173,7 +173,7 @@ f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx /* send a well-formed, encoded SCCP message via IPA */ - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 31bab93..08fc9c9 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -407,7 +407,7 @@ integer idx_rx, template (omit) OCT4 rctx_receiver, OCT4 pc_rx, OCT1 si := '23'O, OCT1 ni := '00'O, OCT1 mp := '00'O, OCT1 sls := '00'O) runs on RAW_M3UA_CT { - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); f_M3UA_send(idx_tx, ts_M3UA_DATA(rctx_sender, ts_M3UA_protocol_data(pc_tx, pc_rx, si, ni, mp, sls, data)), 1); f_M3UA_exp(idx_rx, tr_M3UA_DATA(rctx_receiver, @@ -482,7 +482,7 @@ const integer iter_per_asp := 5; var integer num_rx[NR_M3UA] := { 0, 0, 0 }; for (i := 0; i < 2*iter_per_asp; i := i+1) { - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); var template (value) M3UA_Protocol_Data tx_pd; var template (present) M3UA_Protocol_Data rx_pd; tx_pd := ts_M3UA_protocol_data(pc_sender, pc_receiver, '23'O, '00'O, '00'O, '00'O, data); @@ -533,7 +533,7 @@ /* verify traffic is routed from sender to new receiver */ for (i := 0; i < 10; i := i+1) { - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); var template (value) M3UA_Protocol_Data tx_pd; var template (present) M3UA_Protocol_Data rx_pd; tx_pd := ts_M3UA_protocol_data(pc_sender, pc_receiver, '23'O, '00'O, '00'O, '00'O, data); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27763 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: I818a113ff8d2a2f7cab2ec7d9c8661607c6331d6 Gerrit-Change-Number: 27763 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-bsc-nat[master]: bssap: forward paging to relevant BSCs only

by laforge

Attention is currently required from: osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27767 ) Change subject: bssap: forward paging to relevant BSCs only ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: we also have to think of the case when a BTS is added during runtime of the BSC. At this point the bsc-nat doesn't know yet about the related cell identifier. A new BTS cannot yet have any subscribers registered to it, so one could still use CIL sniffing of the COMPLETE L3 INFO in addition to the BSSMAP RESET based mechanism. So we'll need the RESTET based mechanism, and either * CIL sniffing duriung COMPLETE L3 INFO, or * some new non-standard BSSMAP message to let the bsc-nat know of cell-ids that have been added I would think the CIL sniffing is the more elegant approach. So The RESET based list helps us with the initial state after e.g. a bsc-nat reset, and the CIL sniffing helps us to keep up with changes afterwards. Last, but not least we *may* have to keep in mind that BSSMAP message have a maximum length (typically imposted by the underlying SCCP/M3UA capability) and a very long list of BTSs in the BSC might overflow the BSSMAP RESET message that we're generating. For a pure SIGTRAN network this should not be a problem. However, for anything that actually still uses traditional SS7 circuits, there is a 272 byte limit on the MTP level. I guess we can ignore that for now but make sure to document this in the (bsc?) user manual, i.e. that with a large numer of BTSs this BSSMAP RESET message size could exceed the 272 byte limit of circuit-switched SS7/MTP, and that it is intended to be used over pure M3UA/SIGTRAN where such constraints don't exist (see RFC 4666 Section 1.3.2.1). -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27767 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: Iad3d1de8339206fa80f9fd10ac9213a7728a3c73 Gerrit-Change-Number: 27767 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Apr 2022 15:08:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: bts_report_interf_meas(): remove unused fn param

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27727 ) Change subject: osmo-bts-trx: bts_report_interf_meas(): remove unused fn param ...................................................................... osmo-bts-trx: bts_report_interf_meas(): remove unused fn param Change-Id: Iec25b28e418ce1f66bbc7e0696a3ceebb02e9c82 --- M src/osmo-bts-trx/scheduler_trx.c 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index d772620..382ddae 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -118,8 +118,7 @@ gsm_lchan_interf_meas_push((struct gsm_lchan *) lchan, interf_avg); } -static void bts_report_interf_meas(const struct gsm_bts *bts, - const uint32_t fn) +static void bts_report_interf_meas(const struct gsm_bts *bts) { const struct gsm_bts_trx *trx; unsigned int tn, ln; @@ -270,7 +269,7 @@ /* Report interference measurements */ if (fn % 104 == 0) /* SACCH period */ - bts_report_interf_meas(bts, fn); + bts_report_interf_meas(bts); /* send time indication */ l1if_mph_time_ind(bts, fn); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iec25b28e418ce1f66bbc7e0696a3ceebb02e9c82 Gerrit-Change-Number: 27727 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: l1sap: l1sap_chan_act(): remove unused *tp argument

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27726 ) Change subject: l1sap: l1sap_chan_act(): remove unused *tp argument ...................................................................... l1sap: l1sap_chan_act(): remove unused *tp argument Change-Id: I2030f05b55fc9370e71ff12b26ffe1142f4acfc8 --- M include/osmo-bts/l1sap.h M src/common/l1sap.c M src/common/pcu_sock.c M src/common/rsl.c M tests/handover/handover_test.c 5 files changed, 6 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index 93c532f..e28a53b 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -96,7 +96,7 @@ uint32_t timestamp, bool marker); /* channel control */ -int l1sap_chan_act(struct gsm_bts_trx *trx, uint8_t chan_nr, struct tlv_parsed *tp); +int l1sap_chan_act(struct gsm_bts_trx *trx, uint8_t chan_nr); int l1sap_chan_rel(struct gsm_bts_trx *trx, uint8_t chan_nr); int l1sap_chan_deact_sacch(struct gsm_bts_trx *trx, uint8_t chan_nr); int l1sap_chan_modify(struct gsm_bts_trx *trx, uint8_t chan_nr); diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 6ef5e3b..e9bab61 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1927,7 +1927,7 @@ return l1sap_down(trx, &l1sap); } -int l1sap_chan_act(struct gsm_bts_trx *trx, uint8_t chan_nr, struct tlv_parsed *tp) +int l1sap_chan_act(struct gsm_bts_trx *trx, uint8_t chan_nr) { struct gsm_lchan *lchan = get_lchan_by_chan_nr(trx, chan_nr); int rc; diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 94b45f3..9d0d87c 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -884,7 +884,7 @@ return -EINVAL; } if (act_req->activate) - l1sap_chan_act(trx, gsm_lchan2chan_nr(lchan), NULL); + l1sap_chan_act(trx, gsm_lchan2chan_nr(lchan)); else l1sap_chan_rel(trx, gsm_lchan2chan_nr(lchan)); diff --git a/src/common/rsl.c b/src/common/rsl.c index 30b65fc..59bc799 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1988,7 +1988,7 @@ lchan->top_acch_active = false; /* actually activate the channel in the BTS */ - rc = l1sap_chan_act(lchan->ts->trx, dch->chan_nr, &tp); + rc = l1sap_chan_act(lchan->ts->trx, dch->chan_nr); if (rc < 0) return rsl_tx_chan_act_acknack(lchan, -rc); diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 9c9b020..231be98 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -102,12 +102,12 @@ /* create two lchans for handover */ lchan = &trx->ts[1].lchan[0]; lchan->type = GSM_LCHAN_SDCCH; - l1sap_chan_act(lchan->ts->trx, 0x09, NULL); + l1sap_chan_act(lchan->ts->trx, 0x09); lchan = &trx->ts[2].lchan[0]; lchan->type = GSM_LCHAN_TCH_F; lchan->ho.active = HANDOVER_ENABLED; lchan->ho.ref = 23; - l1sap_chan_act(lchan->ts->trx, 0x0a, NULL); + l1sap_chan_act(lchan->ts->trx, 0x0a); OSMO_ASSERT(msgb_dequeue(&trx->rsl_link->tx_list)); OSMO_ASSERT(msgb_dequeue(&trx->rsl_link->tx_list)); OSMO_ASSERT(!msgb_dequeue(&trx->rsl_link->tx_list)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2030f05b55fc9370e71ff12b26ffe1142f4acfc8 Gerrit-Change-Number: 27726 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-virtual: remove unused 'codec_mode_request' argument

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27724 ) Change subject: osmo-bts-virtual: remove unused 'codec_mode_request' argument ...................................................................... osmo-bts-virtual: remove unused 'codec_mode_request' argument Change-Id: If5001d7b19820478d0e88fea3126e5dd4fbd2634 --- M src/osmo-bts-virtual/scheduler_virtbts.c 1 file changed, 3 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c index 8557638..a9edb3a 100644 --- a/src/osmo-bts-virtual/scheduler_virtbts.c +++ b/src/osmo-bts-virtual/scheduler_virtbts.c @@ -237,8 +237,7 @@ static void tx_tch_common(struct l1sched_ts *l1ts, const struct trx_dl_burst_req *br, - struct msgb **_msg_tch, struct msgb **_msg_facch, - int codec_mode_request) + struct msgb **_msg_tch, struct msgb **_msg_facch) { struct msgb *msg1, *msg2, *msg_tch = NULL, *msg_facch = NULL; struct l1sched_chan_state *chan_state = &l1ts->chan_state[br->chan]; @@ -419,7 +418,7 @@ if (br->bid > 0) return 0; - tx_tch_common(l1ts, br, &msg_tch, &msg_facch, (((br->fn + 4) % 26) >> 2) & 1); + tx_tch_common(l1ts, br, &msg_tch, &msg_facch); /* no message at all */ if (!msg_tch && !msg_facch) { @@ -447,7 +446,7 @@ return 0; /* get TCH and/or FACCH */ - tx_tch_common(l1ts, br, &msg_tch, &msg_facch, (((br->fn + 4) % 26) >> 2) & 1); + tx_tch_common(l1ts, br, &msg_tch, &msg_facch); /* no message at all */ if (!msg_tch && !msg_facch && !chan_state->dl_ongoing_facch) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If5001d7b19820478d0e88fea3126e5dd4fbd2634 Gerrit-Change-Number: 27724 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: l1sap: l1sap_chan_act(): alloc DTX FSM only for TCH

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27725 ) Change subject: l1sap: l1sap_chan_act(): alloc DTX FSM only for TCH ...................................................................... l1sap: l1sap_chan_act(): alloc DTX FSM only for TCH Change-Id: Ieb5728b7a9e7d7c58449deaa5a6c4d8755b6e213 --- M src/common/l1sap.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 502bcef..6ef5e3b 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1947,7 +1947,7 @@ return -RSL_ERR_EQUIPMENT_FAIL; /* Init DTX DL FSM if necessary */ - if (trx->bts->dtxd && lchan->type != GSM_LCHAN_SDCCH) { + if (trx->bts->dtxd && lchan_is_tch(lchan)) { lchan->tch.dtx.dl_amr_fsm = osmo_fsm_inst_alloc(&dtx_dl_amr_fsm, tall_bts_ctx, lchan, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ieb5728b7a9e7d7c58449deaa5a6c4d8755b6e213 Gerrit-Change-Number: 27725 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: l1sap: l1sap_chan_act(): alloc DTX FSM only for TCH

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27725 ) Change subject: l1sap: l1sap_chan_act(): alloc DTX FSM only for TCH ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ieb5728b7a9e7d7c58449deaa5a6c4d8755b6e213 Gerrit-Change-Number: 27725 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 13 Apr 2022 15:01:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022