November 2024 - gerrit-log - lists.osmocom.org

[XS] Change in upf-benchmark[master]: testsuites: eupf: run with GIN_MODE=release

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/upf-benchmark/+/38742?usp=email ) Change subject: testsuites: eupf: run with GIN_MODE=release ...................................................................... testsuites: eupf: run with GIN_MODE=release The output of eupf said it was using debug mode and that release mode should be used in production. Change-Id: Ic5afa6865c708960210e5251f20e9328947cd5b7 --- M testsuites/gtplab-sysmo2017/tunend/upf/osmo-upf/run.sh M testsuites/gtplab-sysmo2017/tunmap/upf/eupf/run.sh 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/42/38742/1 diff --git a/testsuites/gtplab-sysmo2017/tunend/upf/osmo-upf/run.sh b/testsuites/gtplab-sysmo2017/tunend/upf/osmo-upf/run.sh index a4951e9..9dda226 100755 --- a/testsuites/gtplab-sysmo2017/tunend/upf/osmo-upf/run.sh +++ b/testsuites/gtplab-sysmo2017/tunend/upf/osmo-upf/run.sh @@ -2,7 +2,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -sudo osmo-upf -c "$SCRIPT_DIR/osmo-upf.cfg" +sudo GIN_MODE=release osmo-upf -c "$SCRIPT_DIR/osmo-upf.cfg" # TODO: Route needs to be set up manually on the tun iface once it becomes created, since osmo-upf is not yet doing it (OS#6585). # For now, run this manually after starting osmo-upf with the current run.sh script: diff --git a/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/run.sh b/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/run.sh index 1532b76..26a1931 100755 --- a/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/run.sh +++ b/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/run.sh @@ -2,4 +2,4 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -sudo eupf --config "$SCRIPT_DIR/eupf.yaml" +sudo GIN_MODE=release eupf --config "$SCRIPT_DIR/eupf.yaml" -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/38742?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: Ic5afa6865c708960210e5251f20e9328947cd5b7 Gerrit-Change-Number: 38742 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[XS] Change in upf-benchmark[master]: testsuites: eupf: Use xdp_attach_mode native

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/upf-benchmark/+/38741?usp=email ) Change subject: testsuites: eupf: Use xdp_attach_mode native ...................................................................... testsuites: eupf: Use xdp_attach_mode native This is preferred over the generic mode, since the mlx5 driver supports it and should provide better performance. Change-Id: Iaa048cdfed459942973314d626103689f22a4239 --- M testsuites/gtplab-sysmo2017/tunend/upf/eupf/eupf.yaml M testsuites/gtplab-sysmo2017/tunmap/upf/eupf/eupf.yaml 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/41/38741/1 diff --git a/testsuites/gtplab-sysmo2017/tunend/upf/eupf/eupf.yaml b/testsuites/gtplab-sysmo2017/tunend/upf/eupf/eupf.yaml index 5f1efac..924328c 100644 --- a/testsuites/gtplab-sysmo2017/tunend/upf/eupf/eupf.yaml +++ b/testsuites/gtplab-sysmo2017/tunend/upf/eupf/eupf.yaml @@ -1,5 +1,5 @@ interface_name: [enp2s0f0np0, enp2s0f1np1] -xdp_attach_mode: generic +xdp_attach_mode: native api_address: :8080 pfcp_address: 172.16.31.2:8805 pfcp_node_id: 172.16.31.2 diff --git a/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/eupf.yaml b/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/eupf.yaml index 5f1efac..924328c 100644 --- a/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/eupf.yaml +++ b/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/eupf.yaml @@ -1,5 +1,5 @@ interface_name: [enp2s0f0np0, enp2s0f1np1] -xdp_attach_mode: generic +xdp_attach_mode: native api_address: :8080 pfcp_address: 172.16.31.2:8805 pfcp_node_id: 172.16.31.2 -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/38741?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: Iaa048cdfed459942973314d626103689f22a4239 Gerrit-Change-Number: 38741 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email ) Change subject: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/host/trxcon/src/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmocom-bb/+/38740/comment/4b70f3fb_a7264e99?u… : PS1, Line 86: /* TDMA frame number of burst 'f' is used as the table index. */ > > so you are numbering the bursts a,b,c,d,e,f? […] Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia4b737cf11d4d9ce9847cabb77189e9cbcbb8840 Gerrit-Change-Number: 38740 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Nov 2024 18:35:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn()

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email ) Change subject: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn() ...................................................................... Patch Set 1: (1 comment) File src/host/trxcon/src/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmocom-bb/+/38740/comment/92040570_bba94c13?u… : PS1, Line 86: /* TDMA frame number of burst 'f' is used as the table index. */ > so you are numbering the bursts a,b,c,d,e,f? Yes, see the comment above illustrating burst placement in the buffer. > Is that specified like that somewhere? Not that I am aware of. > Maybe add "(last)" here and "(first)" below? Ack, it does not hurt to clarify things a bit. In a separate patch though. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia4b737cf11d4d9ce9847cabb77189e9cbcbb8840 Gerrit-Change-Number: 38740 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Nov 2024 18:34:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email ) Change subject: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn() ...................................................................... Patch Set 1: (1 comment) File src/host/trxcon/src/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmocom-bb/+/38740/comment/16a42d33_9df35e02?u… : PS1, Line 86: /* TDMA frame number of burst 'f' is used as the table index. */ so you are numbering the bursts a,b,c,d,e,f? Is that specified like that somewhere? otherwise I find it confusing tbh. Maybe add "(last)" here and "(first)" below? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia4b737cf11d4d9ce9847cabb77189e9cbcbb8840 Gerrit-Change-Number: 38740 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Nov 2024 18:01:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

7 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email ) Change subject: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn() ...................................................................... trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn() In c15084a5 overlooked that in order to ensure alignment to the first FACCH/H block in rx_tchh_fn() we actually need to check if DL FACCH/H can start (not end!) at the current TDMA Fn. This means we cannot use the same mapping as we do below in that function; we need another one. This patch fixes multiple FACCH/H regressions in ttcn3-bts-test. Change-Id: Ia4b737cf11d4d9ce9847cabb77189e9cbcbb8840 Fixes: c15084a5 ("trxcon/l1sched: replace old API with sched_tchh_ul_facch_map[]") --- M src/host/trxcon/src/sched_lchan_tchh.c 1 file changed, 19 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/40/38740/1 diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index eff36fd..a158bef 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -81,9 +81,10 @@ }; /* FACCH/H channel mappings for DL and UL (see 3GPP TS 45.002, table 1). - * These mappings are valid for both FACCH/H(0) and FACCH/H(1). - * TDMA frame number of burst 'f' is used as the table index. */ -static const uint8_t sched_tchh_dl_facch_map[26] = { + * These mappings are valid for both FACCH/H(0) and FACCH/H(1). */ + +/* TDMA frame number of burst 'f' is used as the table index. */ +static const uint8_t sched_tchh_dl_facch_f_map[26] = { [15] = 1, /* FACCH/H(0): B0(4,6,8,10,13,15) */ [16] = 1, /* FACCH/H(1): B0(5,7,9,11,14,16) */ [23] = 1, /* FACCH/H(0): B1(13,15,17,19,21,23) */ @@ -93,6 +94,16 @@ }; /* TDMA frame number of burst 'a' is used as the table index. */ +static const uint8_t sched_tchh_dl_facch_a_map[26] = { + [4] = 1, /* FACCH/H(0): B0(4,6,8,10,13,15) */ + [5] = 1, /* FACCH/H(1): B0(5,7,9,11,14,16) */ + [13] = 1, /* FACCH/H(0): B1(13,15,17,19,21,23) */ + [14] = 1, /* FACCH/H(1): B1(14,16,18,20,22,24) */ + [21] = 1, /* FACCH/H(0): B2(21,23,0,2,4,6) */ + [22] = 1, /* FACCH/H(1): B2(22,24,1,3,5,7) */ +}; + +/* TDMA frame number of burst 'a' is used as the table index. */ static const uint8_t sched_tchh_ul_facch_map[26] = { [0] = 1, /* FACCH/H(0): B0(0,2,4,6,8,10) */ [1] = 1, /* FACCH/H(1): B0(1,3,5,7,9,11) */ @@ -189,7 +200,7 @@ /* Align reception of the first FACCH/H frame */ if (lchan->tch_mode == GSM48_CMODE_SIGN) { - if (!sched_tchh_dl_facch_map[bi->fn % 26]) + if (!sched_tchh_dl_facch_a_map[bi->fn % 26]) return 0; } } @@ -246,14 +257,14 @@ case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: /* HR */ rc = gsm0503_tch_hr_decode(&tch_data[0], BUFTAIL8(bursts_p), - !sched_tchh_dl_facch_map[bi->fn % 26], + !sched_tchh_dl_facch_f_map[bi->fn % 26], &n_errors, &n_bits_total); break; case GSM48_CMODE_SPEECH_AMR: /* AMR */ /* See comment in function rx_tchf_fn() */ amr = 2; rc = gsm0503_tch_ahs_decode_dtx(&tch_data[amr], BUFTAIL8(bursts_p), - !sched_tchh_dl_facch_map[bi->fn % 26], + !sched_tchh_dl_facch_f_map[bi->fn % 26], !sched_tchh_dl_amr_cmi_map[bi->fn % 26], lchan->amr.codec, lchan->amr.codecs, @@ -281,7 +292,7 @@ /* CSD (TCH/H4.8): 6.0 kbit/s radio interface rate */ case GSM48_CMODE_DATA_6k0: /* FACCH/H does not steal TCH/H4.8 frames, but only disturbs some bits */ - if (sched_tchh_dl_facch_map[bi->fn % 26]) + if (sched_tchh_dl_facch_f_map[bi->fn % 26]) decode_hr_facch(lchan); if (!sched_tchh_dl_csd_map[bi->fn % 26]) return 0; @@ -291,7 +302,7 @@ /* CSD (TCH/H2.4): 3.6 kbit/s radio interface rate */ case GSM48_CMODE_DATA_3k6: /* FACCH/H does not steal TCH/H2.4 frames, but only disturbs some bits */ - if (sched_tchh_dl_facch_map[bi->fn % 26]) + if (sched_tchh_dl_facch_f_map[bi->fn % 26]) decode_hr_facch(lchan); if (!sched_tchh_dl_csd_map[bi->fn % 26]) return 0; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia4b737cf11d4d9ce9847cabb77189e9cbcbb8840 Gerrit-Change-Number: 38740 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[XS] Change in upf-benchmark[master]: testsuites: eupf: Fix missing interface preventing DL tunend to work

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/upf-benchmark/+/38739?usp=email ) Change subject: testsuites: eupf: Fix missing interface preventing DL tunend to work ...................................................................... testsuites: eupf: Fix missing interface preventing DL tunend to work The DL rx interface was missing, which means eupf wouldn't add a hook to it and hence DL traffic for the UEs was not picked up, instead being forwarded as normal packets (to default gw). Change-Id: Id4848dd400309ef13bd000e7da494e927d34940a --- M testsuites/gtplab-sysmo2017/tunend/upf/eupf/eupf.yaml M testsuites/gtplab-sysmo2017/tunmap/upf/eupf/eupf.yaml 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/39/38739/1 diff --git a/testsuites/gtplab-sysmo2017/tunend/upf/eupf/eupf.yaml b/testsuites/gtplab-sysmo2017/tunend/upf/eupf/eupf.yaml index cd49159..5f1efac 100644 --- a/testsuites/gtplab-sysmo2017/tunend/upf/eupf/eupf.yaml +++ b/testsuites/gtplab-sysmo2017/tunend/upf/eupf/eupf.yaml @@ -1,4 +1,4 @@ -interface_name: [enp2s0f0np0] +interface_name: [enp2s0f0np0, enp2s0f1np1] xdp_attach_mode: generic api_address: :8080 pfcp_address: 172.16.31.2:8805 diff --git a/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/eupf.yaml b/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/eupf.yaml index 8ff3444..5f1efac 100644 --- a/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/eupf.yaml +++ b/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/eupf.yaml @@ -1,4 +1,4 @@ -interface_name: [enp2s0f0np0,enp2s0f1np1] +interface_name: [enp2s0f0np0, enp2s0f1np1] xdp_attach_mode: generic api_address: :8080 pfcp_address: 172.16.31.2:8805 -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/38739?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: Id4848dd400309ef13bd000e7da494e927d34940a Gerrit-Change-Number: 38739 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in upf-benchmark[master]: testsuites: Fix eupf run scripts

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/upf-benchmark/+/38738?usp=email ) Change subject: testsuites: Fix eupf run scripts ...................................................................... testsuites: Fix eupf run scripts Change-Id: If8e4f00154383a66c02b49e6a358911a9a9908d6 --- D testsuites/gtplab-sysmo2017/tunend/upf/eupf/1.run_eupf.sh R testsuites/gtplab-sysmo2017/tunend/upf/eupf/eupf.yaml A testsuites/gtplab-sysmo2017/tunend/upf/eupf/run.sh D testsuites/gtplab-sysmo2017/tunmap/upf/eupf/1.run_eupf.sh R testsuites/gtplab-sysmo2017/tunmap/upf/eupf/eupf.yaml A testsuites/gtplab-sysmo2017/tunmap/upf/eupf/run.sh 6 files changed, 10 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/38/38738/1 diff --git a/testsuites/gtplab-sysmo2017/tunend/upf/eupf/1.run_eupf.sh b/testsuites/gtplab-sysmo2017/tunend/upf/eupf/1.run_eupf.sh deleted file mode 100755 index 12e0b27..0000000 --- a/testsuites/gtplab-sysmo2017/tunend/upf/eupf/1.run_eupf.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -set -x -sudo eupf --config 1.eupf.yaml diff --git a/testsuites/gtplab-sysmo2017/tunend/upf/eupf/1.eupf.yaml b/testsuites/gtplab-sysmo2017/tunend/upf/eupf/eupf.yaml similarity index 100% rename from testsuites/gtplab-sysmo2017/tunend/upf/eupf/1.eupf.yaml rename to testsuites/gtplab-sysmo2017/tunend/upf/eupf/eupf.yaml diff --git a/testsuites/gtplab-sysmo2017/tunend/upf/eupf/run.sh b/testsuites/gtplab-sysmo2017/tunend/upf/eupf/run.sh new file mode 100755 index 0000000..1532b76 --- /dev/null +++ b/testsuites/gtplab-sysmo2017/tunend/upf/eupf/run.sh @@ -0,0 +1,5 @@ +#!/bin/bash -xe + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +sudo eupf --config "$SCRIPT_DIR/eupf.yaml" diff --git a/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/1.run_eupf.sh b/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/1.run_eupf.sh deleted file mode 100755 index 12e0b27..0000000 --- a/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/1.run_eupf.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -set -x -sudo eupf --config 1.eupf.yaml diff --git a/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/1.eupf.yaml b/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/eupf.yaml similarity index 100% rename from testsuites/gtplab-sysmo2017/tunmap/upf/eupf/1.eupf.yaml rename to testsuites/gtplab-sysmo2017/tunmap/upf/eupf/eupf.yaml diff --git a/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/run.sh b/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/run.sh new file mode 100755 index 0000000..1532b76 --- /dev/null +++ b/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/run.sh @@ -0,0 +1,5 @@ +#!/bin/bash -xe + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +sudo eupf --config "$SCRIPT_DIR/eupf.yaml" -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/38738?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: If8e4f00154383a66c02b49e6a358911a9a9908d6 Gerrit-Change-Number: 38738 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: cosmetic: osmo_ss7: Rearrange some contents

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38721?usp=email ) Change subject: cosmetic: osmo_ss7: Rearrange some contents ...................................................................... cosmetic: osmo_ss7: Rearrange some contents * Create sections for Routing Key, AS Traffic Mode, ASP Protocol which have their own enum/struct and set of APIs acting upon them. * Move osmo_ss7_asp_disconnect() to its ASP section (was in AS section). Change-Id: I592db59e27fa7b401d1281921e38817772308c00 --- M include/osmocom/sigtran/osmo_ss7.h 1 file changed, 44 insertions(+), 22 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index dcf985d..d35b870 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -132,12 +132,9 @@ osmo_ss7_route_get_dest_as(struct osmo_ss7_route *rt); /*********************************************************************** - * SS7 Application Servers + * SS7 Routing key ***********************************************************************/ -struct osmo_ss7_as; -struct osmo_ss7_asp; - struct osmo_ss7_routing_key { uint32_t context; uint32_t l_rk_id; @@ -148,6 +145,33 @@ /* FIXME: more complex routing keys */ }; + +/*********************************************************************** + * SS7 ASP Protocols + ***********************************************************************/ + +enum osmo_ss7_asp_protocol { + OSMO_SS7_ASP_PROT_NONE, + OSMO_SS7_ASP_PROT_SUA, + OSMO_SS7_ASP_PROT_M3UA, + OSMO_SS7_ASP_PROT_IPA, + _NUM_OSMO_SS7_ASP_PROT +}; + +extern struct value_string osmo_ss7_asp_protocol_vals[]; +static inline const char * +osmo_ss7_asp_protocol_name(enum osmo_ss7_asp_protocol mode) +{ + return get_value_string(osmo_ss7_asp_protocol_vals, mode); +} + +int osmo_ss7_asp_protocol_port(enum osmo_ss7_asp_protocol prot); + + +/*********************************************************************** + * SS7 AS Traffic Mode + ***********************************************************************/ + enum osmo_ss7_as_traffic_mode { OSMO_SS7_AS_TMOD_OVERRIDE = 0, /* default */ OSMO_SS7_AS_TMOD_BCAST, @@ -164,23 +188,16 @@ return get_value_string(osmo_ss7_as_traffic_mode_vals, mode); } -enum osmo_ss7_asp_protocol { - OSMO_SS7_ASP_PROT_NONE, - OSMO_SS7_ASP_PROT_SUA, - OSMO_SS7_ASP_PROT_M3UA, - OSMO_SS7_ASP_PROT_IPA, - _NUM_OSMO_SS7_ASP_PROT -}; +enum osmo_ss7_as_traffic_mode osmo_ss7_tmode_from_xua(uint32_t in); +int osmo_ss7_tmode_to_xua(enum osmo_ss7_as_traffic_mode tmod); -extern struct value_string osmo_ss7_asp_protocol_vals[]; -static inline const char * -osmo_ss7_asp_protocol_name(enum osmo_ss7_asp_protocol mode) -{ - return get_value_string(osmo_ss7_asp_protocol_vals, mode); -} +/*********************************************************************** + * SS7 Application Servers + ***********************************************************************/ -int osmo_ss7_asp_protocol_port(enum osmo_ss7_asp_protocol prot); +struct osmo_ss7_as; +struct osmo_ss7_asp; struct osmo_ss7_as * osmo_ss7_as_find_by_name(struct osmo_ss7_instance *inst, const char *name); @@ -203,7 +220,6 @@ bool osmo_ss7_as_down(const struct osmo_ss7_as *as); bool osmo_ss7_as_active(const struct osmo_ss7_as *as); bool osmo_ss7_as_tmode_compatible_xua(struct osmo_ss7_as *as, uint32_t m3ua_tmt); -void osmo_ss7_asp_disconnect(struct osmo_ss7_asp *asp); /*********************************************************************** @@ -260,6 +276,7 @@ osmo_ss7_asp_find_or_create2(struct osmo_ss7_instance *inst, const char *name, uint16_t remote_port, uint16_t local_port, int trans_proto, enum osmo_ss7_asp_protocol proto); +void osmo_ss7_asp_disconnect(struct osmo_ss7_asp *asp); void osmo_ss7_asp_destroy(struct osmo_ss7_asp *asp); int osmo_ss7_asp_send(struct osmo_ss7_asp *asp, struct msgb *msg); int osmo_ss7_asp_restart(struct osmo_ss7_asp *asp); @@ -282,6 +299,10 @@ void osmo_ss7_register_rx_unknown_cb(osmo_ss7_asp_rx_unknown_cb *cb); +/*********************************************************************** + * Simple Client + ***********************************************************************/ + struct osmo_sccp_instance * osmo_sccp_simple_client(void *ctx, const char *name, uint32_t default_pc, enum osmo_ss7_asp_protocol prot, int default_local_port, @@ -297,6 +318,10 @@ int default_remote_port, const char *default_remote_ip); +/*********************************************************************** + * Simple Server + ***********************************************************************/ + struct osmo_sccp_instance * osmo_sccp_simple_server(void *ctx, uint32_t pc, enum osmo_ss7_asp_protocol prot, int local_port, @@ -314,9 +339,6 @@ int local_port, int remote_port, const char *remote_ip); -enum osmo_ss7_as_traffic_mode osmo_ss7_tmode_from_xua(uint32_t in); -int osmo_ss7_tmode_to_xua(enum osmo_ss7_as_traffic_mode tmod); - /* VTY related */ struct vty; void osmo_ss7_vty_init_asp(void *ctx); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38721?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I592db59e27fa7b401d1281921e38817772308c00 Gerrit-Change-Number: 38721 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: route_table: Split allocation code to its own function

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38729?usp=email ) Change subject: route_table: Split allocation code to its own function ...................................................................... route_table: Split allocation code to its own function Change-Id: Id081d6de14be84b05ed38f3f8211ba91e675cff0 --- M src/osmo_ss7_route_table.c 1 file changed, 19 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_ss7_route_table.c b/src/osmo_ss7_route_table.c index 4ab4594..910633b 100644 --- a/src/osmo_ss7_route_table.c +++ b/src/osmo_ss7_route_table.c @@ -32,6 +32,23 @@ * SS7 Route Tables ***********************************************************************/ +static struct osmo_ss7_route_table *ss7_route_table_alloc(struct osmo_ss7_instance *inst, const char *name) +{ + struct osmo_ss7_route_table *rtbl; + + OSMO_ASSERT(name); + LOGSS7(inst, LOGL_INFO, "Creating Route Table %s\n", name); + + rtbl = talloc_zero(inst, struct osmo_ss7_route_table); + OSMO_ASSERT(rtbl); + + rtbl->inst = inst; + rtbl->cfg.name = talloc_strdup(rtbl, name); + INIT_LLIST_HEAD(&rtbl->routes); + llist_add_tail(&rtbl->list, &inst->rtable_list); + return rtbl; +} + struct osmo_ss7_route_table * ss7_route_table_find(struct osmo_ss7_instance *inst, const char *name) { @@ -51,14 +68,8 @@ OSMO_ASSERT(ss7_initialized); rtbl = ss7_route_table_find(inst, name); - if (!rtbl) { - LOGSS7(inst, LOGL_INFO, "Creating Route Table %s\n", name); - rtbl = talloc_zero(inst, struct osmo_ss7_route_table); - rtbl->inst = inst; - rtbl->cfg.name = talloc_strdup(rtbl, name); - INIT_LLIST_HEAD(&rtbl->routes); - llist_add_tail(&rtbl->list, &inst->rtable_list); - } + if (!rtbl) + rtbl = ss7_route_table_alloc(inst, name); return rtbl; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38729?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Id081d6de14be84b05ed38f3f8211ba91e675cff0 Gerrit-Change-Number: 38729 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024