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

Change in docker-playground[master]: debian-bullseye-titan: Use gitea, not obsolete cgit

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/29253 ) Change subject: debian-bullseye-titan: Use gitea, not obsolete cgit ...................................................................... debian-bullseye-titan: Use gitea, not obsolete cgit When downloading the deps/Makefile, use gitea instead of the obsolete and now defunct cgit deep-link Change-Id: Ifbcb992e70a1faefc3829df28f8bf4dfaf2143e1 Related: OS#5670 --- M debian-bullseye-titan/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/53/29253/1 diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile index 68c27ee..342cc08 100644 --- a/debian-bullseye-titan/Dockerfile +++ b/debian-bullseye-titan/Dockerfile @@ -59,7 +59,7 @@ # clone osmo-ttcn3-hacks and deps, invalidate cache if deps change (OS#5017) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git && \ make -j8 -C /osmo-ttcn3-hacks deps -ADD https://git.osmocom.org/osmo-ttcn3-hacks/plain/deps/Makefile /tmp/deps-Makefile +ADD https://gitea.osmocom.org/ttcn3/osmo-ttcn3-hacks/raw/branch/master/deps/Mak… /tmp/deps-Makefile RUN if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \ cd /osmo-ttcn3-hacks && \ git pull && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ifbcb992e70a1faefc3829df28f8bf4dfaf2143e1 Gerrit-Change-Number: 29253 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in libosmo-sccp[master]: SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD

by pespin

Attention is currently required from: neels, laforge, fixeria, Max. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/29084 ) Change subject: SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD ...................................................................... Patch Set 16: (4 comments) File src/sccp_scoc.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/a81464a3_aa110981 PS15, Line 600: if ( > We shouldn't. […] Simply drop it then. https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/d28a52f7_7f4401a2 PS15, Line 606: } else > Actually it's better to add them to else according to https://www.kernel. […] "Do not unnecessarily use braces where a single statement will do." So why do you say it's better according to it? https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/cd5f094b_282695b0 PS15, Line 635: LOGP(DLSCCP, LOGL_ERROR, "replacing unsent %u bytes of optional data cache with %s optional data\n", > I think it's error - this situation should not arise normally. AFAIU that's something coming from outside, from a peer, so not really an error of the program itself. Not important though. https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/68333f0c_d0c3678f PS15, Line 784: xua_msg_add_sccp_addr(xua, SUA_IEI_DEST_ADDR, &conn->calling_addr); > Similar to the above: the comments are placed to match the fields order in the spec. Then write a new comit "comments are placed to match the fields order in the spec." -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/29084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0033faf9da393418930252233ce74d62cd1cef8a Gerrit-Change-Number: 29084 Gerrit-PatchSet: 16 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Max <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 16:14:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: Max <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in libosmo-sccp[master]: SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD

by Max

Attention is currently required from: neels, laforge, pespin, fixeria. Hello Jenkins Builder, neels, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/29084 to look at the new patch set (#16). Change subject: SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD ...................................................................... SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD The length limit of optional Data parameter is 130 bytes according to ITU-T Rec Q.713 §4.2..§4.5. If we receive CR, CC or RLSD message with bigger data - cache it if necessary and send via separate DT1 message after connection becomes active. While at it, clarify the order of comments in the encoding routine to match the spec. Fixes: OS#5579 Change-Id: I0033faf9da393418930252233ce74d62cd1cef8a --- M src/sccp_scoc.c 1 file changed, 133 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/84/29084/16 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/29084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0033faf9da393418930252233ce74d62cd1cef8a Gerrit-Change-Number: 29084 Gerrit-PatchSet: 16 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 9 months

1
0
0 0

Change in libosmo-sccp[master]: SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD

by Max

Attention is currently required from: neels, laforge, pespin, fixeria. Max has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/29084 ) Change subject: SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD ...................................................................... Patch Set 15: (8 comments) File src/sccp_scoc.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/4363d4d6_ffda9ece PS15, Line 642: /* optional: importance */ > why is this line removed here? this is non related. The RLC does not have optional importance field. https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/b870683f_95186f62 PS15, Line 600: if ( > Ack We shouldn't. Shall I replace it with assert or just drop? https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/6fa8a826_fd35be4a PS15, Line 606: } else > remove curly braces in the if. Actually it's better to add them to else according to https://www.kernel.org/doc/html/latest/process/coding-style.html#placing-br… https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/51617eeb_e7923d15 PS15, Line 630: if (xua_drop_data_check(prim, SCCP_MAX_DATA, "cache overrun")) > ... […] Done https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/f4acfafc_5ad77dad PS15, Line 635: LOGP(DLSCCP, LOGL_ERROR, "replacing unsent %u bytes of optional data cache with %s optional data\n", > NOTICE I think it's error - this situation should not arise normally. https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/da5d2afe_a69997e6 PS15, Line 639: msgb_alloc(SCCP_MAX_DATA, "SCCP optional data cache for CR/CC/RLSD"); > Ack Done https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/5d2bd69d_a2630137 PS15, Line 639: msgb_alloc(SCCP_MAX_DATA, "SCCP optional data cache for CR/CC/RLSD"); > Ack Done https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/699f9d67_3b1a53c1 PS15, Line 784: xua_msg_add_sccp_addr(xua, SUA_IEI_DEST_ADDR, &conn->calling_addr); > why is this line removed here? this is non related. Similar to the above: the comments are placed to match the fields order in the spec. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/29084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0033faf9da393418930252233ce74d62cd1cef8a Gerrit-Change-Number: 29084 Gerrit-PatchSet: 15 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 16:07:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bsc: Enable OSMUX feature in osmo-bts-omldummy

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29011 ) Change subject: ttcn3-bsc: Enable OSMUX feature in osmo-bts-omldummy ...................................................................... ttcn3-bsc: Enable OSMUX feature in osmo-bts-omldummy This feature is used to indicate to the BSC that the BTS supports Osmux. Requires: libosmocore 18c6a8183f92915e77368ecffb1cbf7f555453a3 Related: SYS#5987 Change-Id: Ia402b7514b636750442d0859d5ebc3fcad67dd9f --- M ttcn3-bsc-test-vamos/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh 3 files changed, 13 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/ttcn3-bsc-test-vamos/jenkins.sh b/ttcn3-bsc-test-vamos/jenkins.sh index 1fb3541..e686710 100755 --- a/ttcn3-bsc-test-vamos/jenkins.sh +++ b/ttcn3-bsc-test-vamos/jenkins.sh @@ -46,6 +46,10 @@ $REPO_USER/osmo-bsc-$IMAGE_SUFFIX BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION,VAMOS" +# Disable until libosmocore release > 1.7.0 +if image_suffix_is_master; then + BTS_FEATURES="${BTS_FEATURES},OSMUX" +fi for i in `seq 0 2`; do echo Starting container with OML for BTS$i diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index 3d2b70d..e402b33 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -35,6 +35,11 @@ $REPO_USER/osmo-bsc-$IMAGE_SUFFIX BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION" +# Disable until libosmocore release > 1.7.0 +if image_suffix_is_master; then + BTS_FEATURES="${BTS_FEATURES},OSMUX" +fi + for i in "0 1" "1 1" "2 4"; do set -- $i # convert the {BTS, TRXN} "tuple" into the param args $1 $2 diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 40b3f62..c018046 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -45,6 +45,10 @@ $REPO_USER/osmo-bsc-$IMAGE_SUFFIX BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION" +# Disable until libosmocore release > 1.7.0 +if image_suffix_is_master; then + BTS_FEATURES="${BTS_FEATURES},OSMUX" +fi for i in "0 1" "1 1" "2 4"; do set -- $i # convert the {BTS, TRXN} "tuple" into the param args $1 $2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia402b7514b636750442d0859d5ebc3fcad67dd9f Gerrit-Change-Number: 29011 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-msc[master]: Set working directory in systemd service file

by Max

Max has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/29242 ) Change subject: Set working directory in systemd service file ...................................................................... Set working directory in systemd service file By default systemd will execute service with root directory (or home directory for user instance) which might result in attempts to create files in unexpected place. Let's set it to 'osmocom' subdir of state directory (/var/lib for system instance) instead. Fixes: OS#5661 Change-Id: I0f942545d9e920ba8a2d8645512ec3414ab27418 --- M contrib/systemd/osmo-msc.service 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve neels: Looks good to me, but someone else must approve Max: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/osmo-msc.service b/contrib/systemd/osmo-msc.service index 343639c..36849f7 100644 --- a/contrib/systemd/osmo-msc.service +++ b/contrib/systemd/osmo-msc.service @@ -8,6 +8,8 @@ [Service] Type=simple Restart=always +StateDirectory=osmocom +WorkingDirectory=%S/osmocom ExecStart=/usr/bin/osmo-msc -c /etc/osmocom/osmo-msc.cfg RestartSec=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0f942545d9e920ba8a2d8645512ec3414ab27418 Gerrit-Change-Number: 29242 Gerrit-PatchSet: 2 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: roh <jsteiger(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-msc[master]: Set working directory in systemd service file

by Max

Attention is currently required from: roh. Max has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/29242 ) Change subject: Set working directory in systemd service file ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0f942545d9e920ba8a2d8645512ec3414ab27418 Gerrit-Change-Number: 29242 Gerrit-PatchSet: 2 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: roh <jsteiger(a)sysmocom.de> Gerrit-Attention: roh <jsteiger(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 15:38:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-upf[master]: drop charts/, duplicated from libosmo-pfcp.git

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/29211 ) Change subject: drop charts/, duplicated from libosmo-pfcp.git ...................................................................... drop charts/, duplicated from libosmo-pfcp.git When placing libosmo-pfcp in a separate repository, I accidentally duplicated the charts. Since the charts are generally valid for PFCP, libosmo-pfcp is the proper place, not here. Change-Id: I95f11e1525b3bc6b782e5f8aecddea672a104c99 --- M configure.ac M doc/Makefile.am D doc/charts/Makefile.am D doc/charts/pfcp_and_gtp.dot D doc/charts/pfcp_cp_peer_fsm.dot D doc/charts/pfcp_cp_session_fsm.dot D doc/charts/pfcp_heartbeat_fsm.dot D doc/charts/pfcp_overview.dot D doc/charts/pfcp_up_peer_fsm.dot D doc/charts/pfcp_up_session_fsm.dot 10 files changed, 0 insertions(+), 205 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index fd5f3fc..f86c0bc 100644 --- a/configure.ac +++ b/configure.ac @@ -206,7 +206,6 @@ doc/Makefile doc/examples/Makefile doc/manuals/Makefile - doc/charts/Makefile contrib/Makefile contrib/systemd/Makefile Makefile) diff --git a/doc/Makefile.am b/doc/Makefile.am index 66103ba..15f36b7 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,4 @@ SUBDIRS = \ examples \ manuals \ - charts \ $(NULL) diff --git a/doc/charts/Makefile.am b/doc/charts/Makefile.am deleted file mode 100644 index af0736d..0000000 --- a/doc/charts/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -msc: \ - $(builddir)/pfcp_msgs.png \ - $(builddir)/pfcp_msgs_gtp.png \ - $(NULL) - -dot: \ - $(builddir)/pfcp_overview.png \ - $(builddir)/pfcp_cp_peer_fsm.png \ - $(builddir)/pfcp_up_peer_fsm.png \ - $(builddir)/pfcp_heartbeat_fsm.png \ - $(builddir)/pfcp_cp_session_fsm.png \ - $(builddir)/pfcp_up_session_fsm.png \ - $(builddir)/pfcp_and_gtp.png \ - $(NULL) - -$(builddir)/%.png: $(srcdir)/%.msc - mscgen -T png -o $@ $< - -$(builddir)/%.png: $(srcdir)/%.dot - dot -Tpng $< > $@ - -.PHONY: poll -poll: - while true; do $(MAKE) msc dot; sleep 1; done diff --git a/doc/charts/pfcp_and_gtp.dot b/doc/charts/pfcp_and_gtp.dot deleted file mode 100644 index 5c160b3..0000000 --- a/doc/charts/pfcp_and_gtp.dot +++ /dev/null @@ -1,20 +0,0 @@ -digraph G { -rankdir=LR -labelloc=t; label="PFCP and GTP" - -SGSN [label="SGSN\n123.44.0.9"] -SGWC [label="SGW-C\n123.44.05"] -subgraph cluster_UPF { - label="OsmoUPF"; - SGWU [label="SGW-U\n123.44.0.6"]; - GTPk [label="kernel GTP\n123.44.0.6"] -} - -SGSN -> SGWC [label="S4\nGTPv2-C"] -SGWC -> SGWU [label="Sxa\nPFCP\nSession Establishment:\n"] -SGSN -> GTPk [label="S4\nGTPv1-U",dir=both] - -MS [label="MS\n192.168.104.176"] -MS -> SGSN [dir=both] - -} diff --git a/doc/charts/pfcp_cp_peer_fsm.dot b/doc/charts/pfcp_cp_peer_fsm.dot deleted file mode 100644 index 101fe07..0000000 --- a/doc/charts/pfcp_cp_peer_fsm.dot +++ /dev/null @@ -1,39 +0,0 @@ -digraph G { -rankdir=TB -labelloc=t; label="PFCP CP peer FSM\nControl Plane side, managing association with remote UP peer" - -cp [label="CP function",shape="box"] - -cp -> WAIT_ASSOC_SETUP_RESP [label="cp_peer_associate()"] - -txrx [label="PFCP socket",shape="box"] -WAIT_ASSOC_SETUP_RESP -> txrx [label="tx_assoc_setup_req()",style=dotted] -txrx -> WAIT_ASSOC_SETUP_RESP [label="EV_RX_ASSOC_SETUP_RESP",style=dotted] -WAIT_ASSOC_SETUP_RESP -> ASSOCIATED [label="Assoc Setup Resp"] - -WAIT_ASSOC_SETUP_RESP -> WAIT_ASSOC_SETUP_RESP [label="retry"] - -heartbeat [label="PFCP heartbeat FSM",shape=box3d] -ASSOCIATED -> heartbeat [label="alloc()",style=dotted] -heartbeat -> ASSOCIATED [label="EV_HEARTBEAT_FAILURE",style=dotted] - -txrx2 [label="PFCP socket",shape="box"] -txrx2 -> ASSOCIATED [label="EV_RX_ASSOC_UPDATE_REQ\n3GPP TS 29.244 6.2.7.3.1",style=dotted] -GRACEFUL_RELEASE -> txrx2 [label="tx_assoc_update_resp()",style=dotted] - -cp_session [label="PFCP CP session FSM",shape=box3d] -cp -> ASSOCIATED [label="cp_peer_session_create()",style=dotted] -ASSOCIATED -> cp_session [label="cp_session_create()",style=dotted] -cp -> cp_session [style=invisible,arrowhead=none] - -ASSOCIATED -> GRACEFUL_RELEASE [label="Association Update\nindicating graceful release"] - -cp -> ASSOCIATED [label="cp_peer_release()",style=dotted] -ASSOCIATED -> term [label="cp_peer_release()\nHeartbeat failure"] - -ASSOCIATED -> WAIT_ASSOC_SETUP_RESP [label="Heartbeat failure"] - -GRACEFUL_RELEASE -> term -term [shape="octagon"] - -} diff --git a/doc/charts/pfcp_cp_session_fsm.dot b/doc/charts/pfcp_cp_session_fsm.dot deleted file mode 100644 index 0319608..0000000 --- a/doc/charts/pfcp_cp_session_fsm.dot +++ /dev/null @@ -1,28 +0,0 @@ -digraph G { -rankdir=TB -labelloc=t; label="PFCP CP session FSM" - -cp [label="CP function",shape=box] -cp -> WAIT_ESTABLISHMENT_RESP [label="cp_session_create(cp_peer)\niff cp_peer in state ASSOCIATED"] - -txrx [label="PFCP socket",shape=box] - -WAIT_ESTABLISHMENT_RESP -> txrx [label="tx_session_est_req()",style=dotted] -txrx -> WAIT_ESTABLISHMENT_RESP [label="EV_RX_SESSION_EST_RESP",style=dotted] - -WAIT_ESTABLISHMENT_RESP -> ESTABLISHED [label="Est Resp"] - -cp -> ESTABLISHED [label="cp_session_modify()",style=dotted] -ESTABLISHED -> WAIT_MODIFICATION_RESP [label="cp_session_modify()"] -WAIT_MODIFICATION_RESP -> txrx [label="tx_session_mod_req()",style=dotted] -txrx -> WAIT_MODIFICATION_RESP [label="EV_RX_SESSION_MOD_RESP",style=dotted,constraint=false] -WAIT_MODIFICATION_RESP -> ESTABLISHED [label="Mod Resp"] - -cp -> ESTABLISHED [label="cp_session_delete()",style=dotted] -ESTABLISHED -> WAIT_DELETION_RESP [label="cp_session_delete()"] -WAIT_DELETION_RESP -> txrx [label="tx_session_del_req()",style=dotted] -txrx -> WAIT_DELETION_RESP [label="EV_RX_SESSION_DEL_RESP",style=dotted,constraint=false] -WAIT_DELETION_RESP -> term -term [shape="octagon"] - -} diff --git a/doc/charts/pfcp_heartbeat_fsm.dot b/doc/charts/pfcp_heartbeat_fsm.dot deleted file mode 100644 index b5b4584..0000000 --- a/doc/charts/pfcp_heartbeat_fsm.dot +++ /dev/null @@ -1,21 +0,0 @@ -digraph G { -rankdir=TB -labelloc=t; label="PFCP heartbeat FSM" - -peer [label="PFCP CP/UP peer FSM",shape=box3d] -txrx [label="PFCP socket",shape=box] - -peer -> IDLE [label="alloc()"] -IDLE -> WAIT_HEARTBEAT_RESP -> IDLE -WAIT_HEARTBEAT_RESP -> term -term [shape="octagon"] - -WAIT_HEARTBEAT_RESP -> txrx [label="tx_heartbeat_req()",style=dotted] -txrx -> WAIT_HEARTBEAT_RESP [label="HEARTBEAT_EV_RX_RESP",style=dotted] - -term -> peer [label="PEER_EV_HEARTBEAT_FAILURE",style=dotted] - -txrx2 [label="PFCP socket",shape=box] -txrx2 -> txrx2 [label="rx Heartbeat Req\ntx Heartbeat Resp",style=dotted] - -} diff --git a/doc/charts/pfcp_overview.dot b/doc/charts/pfcp_overview.dot deleted file mode 100644 index 33fa9a0..0000000 --- a/doc/charts/pfcp_overview.dot +++ /dev/null @@ -1,23 +0,0 @@ -digraph G { -rankdir=TB -labelloc=t; label="PFCP Overview\n3GPP TS 29.244 3.1, 5.8.1" - -subgraph cluster_N1_CP { - label="Node: Control Plane function";style=dotted - N1_E_CP [label="CP Entity"] -} - -subgraph cluster_N2_UP { - label="Node: User Plane function\nNode ID: my-userplane.com\n(FQDN may provide multiple PFCP Entities)";style=dotted - N2_E_UP [label="UP Entity\n8.7.6.1"] - N2_E_UP2 [label="UP Entity\n8.7.6.2"] -} - -subgraph cluster_N3_UP { - label="Node: User Plane function\nNode ID: 1.2.3.4\n(IP address means only one PFCP Entity)";style=dotted - N3_E_UP [label="UP Entity\n1.2.3.4\n(osmo-upf)"] -} - -N1_E_CP -> N3_E_UP [label="PFCP Request"] -N1_E_CP -> N2_E_UP -} diff --git a/doc/charts/pfcp_up_peer_fsm.dot b/doc/charts/pfcp_up_peer_fsm.dot deleted file mode 100644 index 60152f7..0000000 --- a/doc/charts/pfcp_up_peer_fsm.dot +++ /dev/null @@ -1,27 +0,0 @@ -digraph G { -rankdir=TB -labelloc=t; label="PFCP UP peer FSM\nUser Plane side, managing association with remote CP peer" - -txrx [label="PFCP socket",shape="box"] - -txrx -> NOT_ASSOCIATED [label="rx PFCP msg from\nnew remote IP"] -txrx -> NOT_ASSOCIATED [label="EV_RX_ASSOC_SETUP_REQ",style=dotted] - -NOT_ASSOCIATED -> ASSOCIATED [label="Assoc Setup Req",shape="box"] - -heartbeat [label="PFCP heartbeat FSM",shape=box3d] -ASSOCIATED -> heartbeat [label="alloc()",style=dotted] -heartbeat -> ASSOCIATED [label="EV_HEARTBEAT_FAILURE",style=dotted] - -txrx -> ASSOCIATED [label="EV_RX_SESSION_EST_REQ",style=dotted] -up_session [label="PFCP UP session FSM",shape=box3d] -ASSOCIATED -> up_session [label="up_session_create()",style=dotted] - -txrx -> ASSOCIATED [label="EV_RX_ASSOC_UPD_REQ",style=dotted] -ASSOCIATED -> GRACEFUL_RELEASE [label="Association Update\nindicating graceful release"] - -ASSOCIATED -> term [label="Heartbeat failure"] -GRACEFUL_RELEASE -> term -term [shape="octagon"] - -} diff --git a/doc/charts/pfcp_up_session_fsm.dot b/doc/charts/pfcp_up_session_fsm.dot deleted file mode 100644 index b4a06f5..0000000 --- a/doc/charts/pfcp_up_session_fsm.dot +++ /dev/null @@ -1,21 +0,0 @@ -digraph G { -rankdir=TB -labelloc=t; label="PFCP UP session FSM" - -peer [label="PFCP UP peer FSM",shape=box3d] -peer -> ESTABLISHED [label="rx_session_est_req()"] - -txrx [label="PFCP socket",shape="box"] -txrx2 [label="PFCP socket",shape="box"] - -txrx -> ESTABLISHED [label="EV_RX_SESSION_MOD_REQ",style=dotted] -ESTABLISHED -> txrx [label="tx_session_mod_resp()",style=dotted,constraint=false] -ESTABLISHED -> ESTABLISHED [label="Mod"] - -txrx2 -> ESTABLISHED [label="EV_RX_SESSION_DEL_REQ",style=dotted] -ESTABLISHED -> txrx2 [label="tx_session_del_resp()",style=dotted,constraint=false] - -ESTABLISHED -> term [label="Deletion"] -term [shape="octagon"] - -} 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/29211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I95f11e1525b3bc6b782e5f8aecddea672a104c99 Gerrit-Change-Number: 29211 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-upf[master]: Allow running without a GTP dev

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/29210 ) Change subject: Allow running without a GTP dev ...................................................................... Allow running without a GTP dev Allow running without opening a GTP dev for encapsulation/decapsulation. Probe and open the mnl socket for talking to the GTP kernel module only when actual GTP devices exist in the config. A site that is only doing tunnel proxying via netfilter hence does not require GTP support in the kernel. Change-Id: Ibb79b3ce1906136f77a895ff6f691d72a92c9fb9 --- M include/osmocom/upf/upf_gtp.h M src/osmo-upf/osmo_upf_main.c M src/osmo-upf/upf_gtp.c 3 files changed, 8 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/upf/upf_gtp.h b/include/osmocom/upf/upf_gtp.h index a67c850..1e0df5e 100644 --- a/include/osmocom/upf/upf_gtp.h +++ b/include/osmocom/upf/upf_gtp.h @@ -69,7 +69,7 @@ int upf_gtp_tun_desc_cmp(const struct upf_gtp_tun_desc *a, const struct upf_gtp_tun_desc *b); -int upf_gtp_genl_open(); +int upf_gtp_genl_ensure_open(); void upf_gtp_genl_close(); int upf_gtp_dev_open(const char *name, bool create_gtp_dev, const char *local_addr, bool listen_for_gtpv0, diff --git a/src/osmo-upf/osmo_upf_main.c b/src/osmo-upf/osmo_upf_main.c index b4888af..65a0e84 100644 --- a/src/osmo-upf/osmo_upf_main.c +++ b/src/osmo-upf/osmo_upf_main.c @@ -331,9 +331,6 @@ } } - if (upf_gtp_genl_open()) - return -1; - if (upf_gtp_devs_open()) return -1; diff --git a/src/osmo-upf/upf_gtp.c b/src/osmo-upf/upf_gtp.c index 6280e45..d75e8d7 100644 --- a/src/osmo-upf/upf_gtp.c +++ b/src/osmo-upf/upf_gtp.c @@ -183,6 +183,12 @@ dev->sgsn_mode = sgsn_mode; + rc = upf_gtp_genl_ensure_open(); + if (rc) { + LOG_GTP_DEV(dev, LOGL_ERROR, "Cannot set up GTP device, failed to open mnl_socket\n"); + return rc; + } + if (listen_for_gtpv0) { rc = osmo_sock_init_osa_ofd(&dev->gtpv0.ofd, SOCK_DGRAM, 0, &dev->gtpv0.local_addr, &any, OSMO_SOCK_F_BIND); @@ -255,13 +261,8 @@ } /* Open an MNL socket which allows to create and remove GTP devices (requires CAP_NET_ADMIN). */ -int upf_gtp_genl_open() +int upf_gtp_genl_ensure_open() { - if (g_upf->gtp.mockup) { - LOGP(DGTP, LOGL_NOTICE, "gtp/mockup active: not opening mnl_socket\n"); - return 0; - } - /* Already open? */ if (g_upf->gtp.nl && g_upf->gtp.genl_id >= 0) return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/29210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ibb79b3ce1906136f77a895ff6f691d72a92c9fb9 Gerrit-Change-Number: 29210 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-msc[master]: Set working directory in systemd service file

by neels

Attention is currently required from: roh, Max. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/29242 ) Change subject: Set working directory in systemd service file ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0f942545d9e920ba8a2d8645512ec3414ab27418 Gerrit-Change-Number: 29242 Gerrit-PatchSet: 2 Gerrit-Owner: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: roh <jsteiger(a)sysmocom.de> Gerrit-Attention: roh <jsteiger(a)sysmocom.de> Gerrit-Attention: Max <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Aug 2022 14:19:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2022