[M] Change in libosmocore[master]: gsmtap_util: Use Osmo IO instead of Osmo write queues

[arehbein]

Attention is currently required from: daniel, laforge.

arehbein has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libosmocore/+/34743?usp=email )

Change subject: gsmtap_util: Use Osmo IO instead of Osmo write queues
..


Patch Set 5:

(1 comment)

File src/core/gsmtap_util.c:

https://gerrit.osmocom.org/c/libosmocore/+/34743/comment/f34c565e_66e9d891
PS1, Line 483: TODO
> https://gerrit.osmocom. […]
patch above was abandoned in favor of 
https://gerrit.osmocom.org/c/libosmocore/+/34835 (part of this upload series)



--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34743?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Iadbbef74e3add7001d84dd6b68f51eac293e44d0
Gerrit-Change-Number: 34743
Gerrit-PatchSet: 5
Gerrit-Owner: arehbein 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Attention: laforge 
Gerrit-Attention: daniel 
Gerrit-Comment-Date: Thu, 19 Oct 2023 16:31:33 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: arehbein 
Comment-In-Reply-To: laforge 
Gerrit-MessageType: comment

[M] Change in libosmocore[master]: gsmtap_util: Use Osmo IO instead of Osmo write queues

[pespin]

Attention is currently required from: arehbein, daniel, laforge.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libosmocore/+/34743?usp=email )

Change subject: gsmtap_util: Use Osmo IO instead of Osmo write queues
..


Patch Set 5: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34743?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Iadbbef74e3add7001d84dd6b68f51eac293e44d0
Gerrit-Change-Number: 34743
Gerrit-PatchSet: 5
Gerrit-Owner: arehbein 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Attention: arehbein 
Gerrit-Attention: laforge 
Gerrit-Attention: daniel 
Gerrit-Comment-Date: Thu, 19 Oct 2023 16:22:29 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in libosmocore[master]: osmo_io_poll: Handle -EAGAIN in case of OSMO_FD_WRITE

[pespin]

Attention is currently required from: arehbein, daniel.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libosmocore/+/34835?usp=email )

Change subject: osmo_io_poll: Handle -EAGAIN in case of OSMO_FD_WRITE
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34835?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I59c86370d13f2bb33c289d1b177df895726975cb
Gerrit-Change-Number: 34835
Gerrit-PatchSet: 1
Gerrit-Owner: arehbein 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: pespin 
Gerrit-Attention: arehbein 
Gerrit-Attention: daniel 
Gerrit-Comment-Date: Thu, 19 Oct 2023 16:10:22 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in libosmocore[master]: gsmtap_util: Use Osmo IO instead of Osmo write queues

[arehbein]

Attention is currently required from: arehbein, daniel, laforge, pespin.

Hello Jenkins Builder, daniel, pespin,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/libosmocore/+/34743?usp=email

to look at the new patch set (#5).

The following approvals got outdated and were removed:
Code-Review+1 by pespin, Verified-1 by Jenkins Builder


Change subject: gsmtap_util: Use Osmo IO instead of Osmo write queues
..

gsmtap_util: Use Osmo IO instead of Osmo write queues

 - Adapt decl. of 'struct gsmtap_inst' for usage of Osmo IO while maintaining 
backwards compatibility
 - Maintain legacy behavior without any message queues if osmo_io_mode is zero

Related: OS#6213
Change-Id: Iadbbef74e3add7001d84dd6b68f51eac293e44d0
---
M src/core/gsmtap_util.c
1 file changed, 63 insertions(+), 64 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/34743/5
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34743?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Iadbbef74e3add7001d84dd6b68f51eac293e44d0
Gerrit-Change-Number: 34743
Gerrit-PatchSet: 5
Gerrit-Owner: arehbein 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Attention: arehbein 
Gerrit-Attention: laforge 
Gerrit-Attention: pespin 
Gerrit-Attention: daniel 
Gerrit-MessageType: newpatchset

[S] Change in libosmocore[master]: osmo_io_poll: Handle -EAGAIN in case of OSMO_FD_WRITE

[arehbein]

arehbein has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/libosmocore/+/34835?usp=email )


Change subject: osmo_io_poll: Handle -EAGAIN in case of OSMO_FD_WRITE
..

osmo_io_poll: Handle -EAGAIN in case of OSMO_FD_WRITE

Related: OS#6213
Change-Id: I59c86370d13f2bb33c289d1b177df895726975cb
---
M src/core/osmo_io_poll.c
1 file changed, 14 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/35/34835/1

diff --git a/src/core/osmo_io_poll.c b/src/core/osmo_io_poll.c
index d207047..a9aaea4 100644
--- a/src/core/osmo_io_poll.c
+++ b/src/core/osmo_io_poll.c
@@ -86,6 +86,10 @@
iofd_txqueue_enqueue_front(iofd, msghdr);
return;
}
+   if (rc == -EAGAIN) {
+   iofd_txqueue_enqueue_front(iofd, msghdr);
+   return;
+   }

switch (iofd->mode) {
case OSMO_IO_FD_MODE_READ_WRITE:

--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34835?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I59c86370d13f2bb33c289d1b177df895726975cb
Gerrit-Change-Number: 34835
Gerrit-PatchSet: 1
Gerrit-Owner: arehbein 
Gerrit-MessageType: newchange

[S] Change in libosmocore[master]: osmo_io: Add possibility to resend a message

[arehbein]

arehbein has abandoned this change. ( 
https://gerrit.osmocom.org/c/libosmocore/+/34750?usp=email )

Change subject: osmo_io: Add possibility to resend a message
..


Abandoned

The decision has been made by Daniel and me to fix this in osmo_io_poll.c, 
patch is following shortly
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34750?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I9cc588294fcaee49e334282183672aa32fa30bee
Gerrit-Change-Number: 34750
Gerrit-PatchSet: 2
Gerrit-Owner: arehbein 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: abandon

[L] Change in osmo-ttcn3-hacks[master]: Introduce EPDG_Tests testsuite

[pespin]

Attention is currently required from: fixeria, lynxis lazus, osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34778?usp=email )

Change subject: Introduce EPDG_Tests testsuite
..


Patch Set 6:

(1 comment)

Patchset:

PS6:
I plan to merge this one soon in order to have something already being un in 
jenkins nightly docker setup.



--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34778?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Iab6f3c7dbcbbf344b0beca9490597c9ab0907171
Gerrit-Change-Number: 34778
Gerrit-PatchSet: 6
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Reviewer: osmith 
Gerrit-Attention: osmith 
Gerrit-Attention: fixeria 
Gerrit-Attention: lynxis lazus 
Gerrit-Comment-Date: Thu, 19 Oct 2023 15:14:15 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

[M] Change in osmo-ttcn3-hacks[master]: epdg: Test GTPv2C CreateSession triggerd by EPDG_Tunnel Req

[osmith]

Attention is currently required from: lynxis lazus, pespin.

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34833?usp=email )

Change subject: epdg: Test GTPv2C CreateSession triggerd by EPDG_Tunnel Req
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34833?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I8f18c927b1897806233cc9d049c25694c1e639d4
Gerrit-Change-Number: 34833
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: lynxis lazus 
Gerrit-Reviewer: osmith 
Gerrit-Attention: pespin 
Gerrit-Attention: lynxis lazus 
Gerrit-Comment-Date: Thu, 19 Oct 2023 15:11:27 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-ttcn3-hacks[master]: GSUP_Types: Add EDPG_Tunnel messages

[osmith]

Attention is currently required from: lynxis lazus, pespin.

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34832?usp=email )

Change subject: GSUP_Types: Add EDPG_Tunnel messages
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34832?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Iadba149e6d299e5e666b2debdc23a00d37e78da5
Gerrit-Change-Number: 34832
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: lynxis lazus 
Gerrit-Reviewer: osmith 
Gerrit-Attention: pespin 
Gerrit-Attention: lynxis lazus 
Gerrit-Comment-Date: Thu, 19 Oct 2023 15:09:47 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in docker-playground[master]: ttcn3-epdg-test: Update config file to set up GTPv2C socket

[pespin]

pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/docker-playground/+/34834?usp=email )


Change subject: ttcn3-epdg-test: Update config file to set up GTPv2C socket
..

ttcn3-epdg-test: Update config file to set up GTPv2C socket

Depends: osmo-epdg.git I6f00b7fce2d5fcdc484bfd45629b9141f16bc579
Depends: osmo-ttcn3-hacks.git I8f18c927b1897806233cc9d049c25694c1e639d4
Change-Id: I05ae2d87e16cef9772bc5c3690f687e5ecbd5f51
---
M ttcn3-epdg-test/osmo-epdg.config
1 file changed, 19 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/docker-playground 
refs/changes/34/34834/1

diff --git a/ttcn3-epdg-test/osmo-epdg.config b/ttcn3-epdg-test/osmo-epdg.config
index ac8828a..8036b2c 100644
--- a/ttcn3-epdg-test/osmo-epdg.config
+++ b/ttcn3-epdg-test/osmo-epdg.config
@@ -14,5 +14,12 @@
{vendor_id, 0},
{origin_host, "epdg.localdomain"},
{origin_realm, "localdomain"},
-   {context_id, "epdg@localdomain"}]}
+   {context_id, "epdg@localdomain"},
+   % GTPv2C Connection parameters
+   {gtpc_local_ip, "172.18.10.20"},
+   {gtpc_local_port, 2123},
+   {gtpc_remote_ip, "172.18.10.103"},
+   {gtpc_remote_port, 2123}
+  ]
+ }
 ].

--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34834?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I05ae2d87e16cef9772bc5c3690f687e5ecbd5f51
Gerrit-Change-Number: 34834
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-MessageType: newchange

[S] Change in osmo-ttcn3-hacks[master]: GSUP_Types: Fix tr_GSUP_IMSI params

[osmith]

Attention is currently required from: fixeria, lynxis lazus, pespin.

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34831?usp=email )

Change subject: GSUP_Types: Fix tr_GSUP_IMSI params
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34831?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ifeff47d35df53f4238bc1556bdee037e62e9d892
Gerrit-Change-Number: 34831
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Reviewer: osmith 
Gerrit-Attention: pespin 
Gerrit-Attention: fixeria 
Gerrit-Attention: lynxis lazus 
Gerrit-Comment-Date: Thu, 19 Oct 2023 15:09:07 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-ttcn3-hacks[master]: GTPv2_Templates: Several improvements to tr_GTP2C_CreateSessionReq

[pespin]

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822?usp=email )

Change subject: GTPv2_Templates: Several improvements to 
tr_GTP2C_CreateSessionReq
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I6dd8cddcb986969d713ed7975a55cb31ab47c499
Gerrit-Change-Number: 34822
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Thu, 19 Oct 2023 15:05:26 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-ttcn3-hacks[master]: GTPv2_Templates: Several improvements to tr_GTP2C_CreateSessionReq

[osmith]

Attention is currently required from: pespin.

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822?usp=email )

Change subject: GTPv2_Templates: Several improvements to 
tr_GTP2C_CreateSessionReq
..


Patch Set 1: Code-Review+1

(2 comments)

File library/GTPv2_Templates.ttcn:

https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822/comment/42b32c78_d72ab081
PS1, Line 751: 6
> Sorry previous comment want ment for the other discussion. […]
Ack


https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822/comment/4eb4b232_d69920c6
PS1, Line 743: ?
> I don't even know why that value was set there tbh, but makes no sense to me.
Ack



--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I6dd8cddcb986969d713ed7975a55cb31ab47c499
Gerrit-Change-Number: 34822
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: osmith 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Thu, 19 Oct 2023 15:04:49 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: osmith 
Comment-In-Reply-To: pespin 
Gerrit-MessageType: comment

[S] Change in osmo-ttcn3-hacks[master]: GTPv2_Templates: Several improvements to tr_GTP2C_CreateSessionReq

[pespin]

Attention is currently required from: osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822?usp=email )

Change subject: GTPv2_Templates: Several improvements to 
tr_GTP2C_CreateSessionReq
..


Patch Set 1:

(2 comments)

File library/GTPv2_Templates.ttcn:

https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822/comment/bbd82a13_d865660a
PS1, Line 751: 6
> I don't even know why that value was set there tbh, but makes no sense to me.
Sorry previous comment want ment for the other discussion.

"why replace it with ?" because the RAT type really changes depending on where 
you use/expect the message. For instnace I'm expecting 5 (WLAN) in my current 
tests.

BTW, I believe this tr template was not yet used anywhere because it had some 
bugs which I'm now fixing with the patchset; a more generic template was being 
used instead.


https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822/comment/984f96ba_1aa8c096
PS1, Line 743: ?
> shouldn't the previous default '012a'O be here?
I don't even know why that value was set there tbh, but makes no sense to me.



--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I6dd8cddcb986969d713ed7975a55cb31ab47c499
Gerrit-Change-Number: 34822
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: osmith 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Thu, 19 Oct 2023 15:03:34 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith 
Comment-In-Reply-To: pespin 
Gerrit-MessageType: comment

[S] Change in osmo-ttcn3-hacks[master]: GTPv2_Templates: Several improvements to tr_GTP2C_CreateSessionReq

[pespin]

Attention is currently required from: osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822?usp=email )

Change subject: GTPv2_Templates: Several improvements to 
tr_GTP2C_CreateSessionReq
..


Patch Set 1:

(1 comment)

File library/GTPv2_Templates.ttcn:

https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822/comment/f054892d_fe715e5b
PS1, Line 751: 6
> why replace it with ?
I don't even know why that value was set there tbh, but makes no sense to me.



--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I6dd8cddcb986969d713ed7975a55cb31ab47c499
Gerrit-Change-Number: 34822
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: osmith 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Thu, 19 Oct 2023 15:01:36 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith 
Gerrit-MessageType: comment

[S] Change in libosmocore[master]: WIP: gsup: add message type for osmo-epdg CEIA interface

[pespin]

Attention is currently required from: lynxis lazus.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libosmocore/+/32033?usp=email )

Change subject: WIP: gsup: add message type for osmo-epdg CEIA interface
..


Patch Set 1:

(1 comment)

Patchset:

PS1:
> Duplicate of https://gerrit.osmocom. […]
I abandoned by duplicate patch. @lyn...@fe80.eu said he wanted to send an email 
to the ML requesting for comments on which message types to (re)use.



--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32033?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I6f7c20340c99f94b1326a8a7dc99c86cf6a0dbc3
Gerrit-Change-Number: 32033
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-CC: pespin 
Gerrit-Attention: lynxis lazus 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:59:50 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin 
Gerrit-MessageType: comment

[S] Change in osmo-ttcn3-hacks[master]: GSUP_Types: Add EDPG_Tunnel messages

[pespin]

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34832?usp=email )

Change subject: GSUP_Types: Add EDPG_Tunnel messages
..


Patch Set 1:

(1 comment)

Patchset:

PS1:
Related libosmocore: https://gerrit.osmocom.org/c/libosmocore/+/32033



--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34832?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Iadba149e6d299e5e666b2debdc23a00d37e78da5
Gerrit-Change-Number: 34832
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:58:56 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

[M] Change in osmo-ttcn3-hacks[master]: epdg: Test GTPv2C CreateSession triggerd by EPDG_Tunnel Req

[pespin]

pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34833?usp=email )


Change subject: epdg: Test GTPv2C CreateSession triggerd by EPDG_Tunnel Req
..

epdg: Test GTPv2C CreateSession triggerd by EPDG_Tunnel Req

Change-Id: I8f18c927b1897806233cc9d049c25694c1e639d4
---
M epdg/EPDG_Tests.ttcn
1 file changed, 84 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/33/34833/1

diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn
index 2006632..24e924a 100644
--- a/epdg/EPDG_Tests.ttcn
+++ b/epdg/EPDG_Tests.ttcn
@@ -2,6 +2,7 @@

 import from Misc_Helpers all;
 import from General_Types all;
+import from Native_Functions all;
 import from Osmocom_Types all;
 import from L3_Common all;

@@ -13,6 +14,8 @@
 import from DIAMETER_Templates all;
 import from DIAMETER_Emulation all;

+import from GTPv2_Types all;
+import from GTPv2_Templates all;
 import from GTPv2_Emulation all;

 modulepar {
@@ -108,6 +111,17 @@

 type record EPDG_ConnHdlrPars {
hexstring imsi,
+   charstring ue_ip,
+
+   /* TEI (Data) local side */
+   OCT4 teid,
+   /* TEI (Control) local side */
+   OCT4 teic,
+   /* TEI (Data) remote side */
+   OCT4 teid_remote optional,
+   /* TEI (Control) remote side */
+   OCT4 teic_remote optional,
+
AuthVector vec optional
 };

@@ -122,11 +136,15 @@
}
 }

-
 private function f_init_pars(integer imsi_suffix := 1)
 runs on MTC_CT return EPDG_ConnHdlrPars {
var EPDG_ConnHdlrPars pars := {
imsi := f_gen_imsi(imsi_suffix),
+   ue_ip := "192.168.123.50",
+   teid := ''O,
+   teic := ''O,
+   teid_remote := omit,
+   teic_remote := omit,
vec := f_gen_auth_vec_3g()
};
return pars;
@@ -231,7 +249,7 @@
use_gtpu_daemon := false /* TODO: maybe use, set to true */
};

-   vc_GTP2 := GTPv2_Emulation_CT.create("GTP2_EM");
+   vc_GTP2 := GTPv2_Emulation_CT.create(id & "-GTPV2");
map(vc_GTP2:GTP2C, system:GTP2C);
connect(vc_GTP2:TEID0, self:TEID0);
vc_GTP2.start(GTPv2_Emulation.main(cfg));
@@ -255,6 +273,9 @@
/* tell GSUP dispatcher to send this IMSI to us */
f_create_gsup_expect(hex2str(g_pars.imsi));

+   /* tell GTPv2 dispatcher to send this IMSI to us */
+   f_gtp2_register_imsi(g_pars.imsi);
+
fn.apply(id);
 }

@@ -266,9 +287,14 @@

vc_conn := EPDG_ConnHdlr.create(id);

+   /* GSUP */
connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT);
connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC);

+   /* GTP2 */
+   connect(vc_conn:GTP2, vc_GTP2:CLIENT);
+   connect(vc_conn:GTP2_PROC, vc_GTP2:CLIENT_PROC);
+
/* SWx */
vc_conn_swx := DIAMETER_ConnHdlr_CT.create(id);
connect(vc_conn_swx:DIAMETER, vc_SWx:DIAMETER_CLIENT);
@@ -336,6 +362,36 @@
}
 }

+/* Diameter SWx SAR + SAA. */
+private altstep as_GTP2C_CreateSession_success() runs on EPDG_ConnHdlr {
+   var PDU_GTPCv2 rx_msg;
+   var template (value) FullyQualifiedTEID fteid_c_ie, fteid_u_ie;
+   var template (value) PDN_AddressAllocation paa;
+
+   [] GTP2.receive(tr_GTP2C_CreateSessionReq(g_pars.imsi)) -> value rx_msg 
{
+   /* TODO: parse TEIC and TEID and store it in 
g_pars.remote_tei{c,d} */
+
+   /* allocate + register TEID-C on local side */
+   g_pars.teic := f_gtp2_allocate_teid();
+   g_pars.teid := g_pars.teic;
+
+   fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S2b_ePDG_GTPC, 
g_pars.teic, 0,
+   f_inet_addr(mp_s2b_local_ip), omit);
+   fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S2bU_ePDG_GTPU, 
g_pars.teid, 2,
+   f_inet_addr(mp_s2b_local_ip), omit);
+   paa := ts_GTP2C_PdnAddrAlloc_v4(f_inet_addr(g_pars.ue_ip));
+   GTP2.send(ts_GTP2C_CreateSessionResp({ fteid_c_ie }, paa));
+   setverdict(pass);
+   }
+   [] GTP2.receive(PDU_GTPCv2:?) -> value rx_msg {
+   Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, 
log2str("Unexpected GTP2C msg rx: ", rx_msg));
+   }
+}
+private function f_GTP2C_CreateSession_success() runs on EPDG_ConnHdlr {
+   f_gtp2_register_udmsg('20'O);
+   as_GTP2C_CreateSession_success();
+}
+
 /* GSUP AuthInfo Req + Resp, triggers SWx MAR + MAA. */
 private function f_GSUP_AI_success() runs on EPDG_ConnHdlr {
var GSUP_PDU rx_gsup;
@@ -363,7 +419,7 @@
var template octetstring destination_name := *;
GSUP.send(ts_GSUP_UL_REQ(g_pars.imsi));
as_DIA_SWx_SA_success();
-   /* Expect a positive response back to the translator; expect AIA */
+   /* Expect a positive response back to the translator */
  

[S] Change in osmo-ttcn3-hacks[master]: GSUP_Types: Add EDPG_Tunnel messages

[pespin]

pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34832?usp=email )


Change subject: GSUP_Types: Add EDPG_Tunnel messages
..

GSUP_Types: Add EDPG_Tunnel messages

Change-Id: Iadba149e6d299e5e666b2debdc23a00d37e78da5
---
M library/GSUP_Types.ttcn
1 file changed, 40 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/32/34832/1

diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn
index 739dcbc..cd532c8 100644
--- a/library/GSUP_Types.ttcn
+++ b/library/GSUP_Types.ttcn
@@ -138,7 +138,11 @@
OSMO_GSUP_MSGT_E_CLOSE  ('01000111'B),
OSMO_GSUP_MSGT_E_ABORT  ('01001011'B),

-   OSMO_GSUP_MSGT_E_ROUTING_ERROR  ('01001110'B)
+   OSMO_GSUP_MSGT_E_ROUTING_ERROR  ('01001110'B),
+
+   OSMO_GSUP_MSGT_EPDG_TUNNEL_REQUEST  ('0101'B),
+   OSMO_GSUP_MSGT_EPDG_TUNNEL_ERROR('01010001'B),
+   OSMO_GSUP_MSGT_EPDG_TUNNEL_RESULT   ('01010010'B)
 } with { variant "FIELDLENGTH(8)" };

 type enumerated GSUP_CancelType {
@@ -687,6 +691,32 @@
tr_GSUP(OSMO_GSUP_MSGT_CHECK_IMEI_ERROR, f_gen_tr_ies(imsi, cause := 
cause, destination_name := destination_name));


+/* EPDG Tunnel */
+template GSUP_PDU ts_GSUP_EPDGTunnel_REQ(hexstring imsi, GSUP_CnDomain dom := 
OSMO_GSUP_CN_DOMAIN_PS,
+template octetstring source_name := 
omit) :=
+   ts_GSUP(OSMO_GSUP_MSGT_EPDG_TUNNEL_REQUEST, f_gen_ts_ies(imsi, dom := 
dom,
+
source_name := source_name));
+
+template (present) GSUP_PDU tr_GSUP_EPDGTunnel_REQ(template (present) 
hexstring imsi := ?) :=
+   tr_GSUP_IMSI(OSMO_GSUP_MSGT_EPDG_TUNNEL_REQUEST, imsi);
+
+template (value) GSUP_PDU ts_GSUP_EPDGTunnel_RES(hexstring imsi, octetstring 
destination_name := ''O) :=
+   ts_GSUP(OSMO_GSUP_MSGT_EPDG_TUNNEL_RESULT, { 
valueof(ts_GSUP_IE_IMSI(imsi)),
+   
valueof(ts_GSUP_IE_Destination_Name(destination_name))});
+
+template (present) GSUP_PDU tr_GSUP_EPDGTunnel_RES(template (present) 
hexstring imsi, template octetstring destination_name := omit) :=
+   tr_GSUP(OSMO_GSUP_MSGT_EPDG_TUNNEL_RESULT, f_gen_tr_ies(imsi, 
destination_name := destination_name));
+
+template (value) GSUP_PDU ts_GSUP_EPDGTunnel_ERR(hexstring imsi, integer 
cause) :=
+   ts_GSUP(OSMO_GSUP_MSGT_EPDG_TUNNEL_ERROR, {
+   valueof(ts_GSUP_IE_IMSI(imsi)), 
valueof(ts_GSUP_IE_Cause(cause)) });
+
+template (present) GSUP_PDU tr_GSUP_EPDGTunnel_ERR(template (present) 
hexstring imsi, template (present) integer cause := ?,
+   template octetstring destination_name := omit) :=
+   tr_GSUP(OSMO_GSUP_MSGT_EPDG_TUNNEL_ERROR,
+   f_gen_tr_ies(imsi, cause := cause, destination_name := 
destination_name));
+
+
 template (value) GSUP_IE ts_GSUP_IE_CancelType(GSUP_CancelType ctype) := {
tag := OSMO_GSUP_CANCEL_TYPE_IE,
len := 0, /* overwritten */

--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34832?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Iadba149e6d299e5e666b2debdc23a00d37e78da5
Gerrit-Change-Number: 34832
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-MessageType: newchange

[S] Change in osmo-ttcn3-hacks[master]: GSUP_Types: Fix tr_GSUP_IMSI params

[pespin]

pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34831?usp=email )


Change subject: GSUP_Types: Fix tr_GSUP_IMSI params
..

GSUP_Types: Fix tr_GSUP_IMSI params

Change-Id: Ifeff47d35df53f4238bc1556bdee037e62e9d892
---
M library/GSUP_Types.ttcn
1 file changed, 11 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/31/34831/1

diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn
index ef98175..739dcbc 100644
--- a/library/GSUP_Types.ttcn
+++ b/library/GSUP_Types.ttcn
@@ -507,7 +507,7 @@
ies := ies
 }

-template GSUP_PDU tr_GSUP_IMSI(template GSUP_MessageType msgt := ?, template 
hexstring imsi) := {
+template (present) GSUP_PDU tr_GSUP_IMSI(template (present) GSUP_MessageType 
msgt := ?, template (present) hexstring imsi := ?) := {
msg_type := msgt,
ies := { tr_GSUP_IE_IMSI(imsi), * }
 }
@@ -715,7 +715,7 @@
}
 }

-template GSUP_IE tr_GSUP_IE_IMSI(template hexstring imsi) := {
+template (present) GSUP_IE tr_GSUP_IE_IMSI(template (present) hexstring imsi 
:= ?) := {
tag := OSMO_GSUP_IMSI_IE,
len := ?,
val := {

--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34831?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ifeff47d35df53f4238bc1556bdee037e62e9d892
Gerrit-Change-Number: 34831
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-MessageType: newchange

[S] Change in osmo-ttcn3-hacks[master]: GTPv2_Templates: Several improvements to tr_GTP2C_CreateSessionReq

[osmith]

Attention is currently required from: pespin.

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822?usp=email )

Change subject: GTPv2_Templates: Several improvements to 
tr_GTP2C_CreateSessionReq
..


Patch Set 1:

(1 comment)

File library/GTPv2_Templates.ttcn:

https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822/comment/f7fb467a_bf52f969
PS1, Line 751: 6
why replace it with ?



--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I6dd8cddcb986969d713ed7975a55cb31ab47c499
Gerrit-Change-Number: 34822
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: osmith 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:56:48 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

[S] Change in libosmocore[master]: gsup: Define EPDG Tunnel messages

[pespin]

pespin has abandoned this change. ( 
https://gerrit.osmocom.org/c/libosmocore/+/34784?usp=email )

Change subject: gsup: Define EPDG Tunnel messages
..


Abandoned

Abandoning in favor of https://gerrit.osmocom.org/c/libosmocore/+/32033
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34784?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I482060da4a13e30a76527ad911f8583b3937d077
Gerrit-Change-Number: 34784
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: lynxis lazus 
Gerrit-MessageType: abandon

[S] Change in osmo-ttcn3-hacks[master]: GTPv2_Templates: Several improvements to tr_GTP2C_CreateSessionReq

[osmith]

Attention is currently required from: pespin.

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822?usp=email )

Change subject: GTPv2_Templates: Several improvements to 
tr_GTP2C_CreateSessionReq
..


Patch Set 1:

(1 comment)

File library/GTPv2_Templates.ttcn:

https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822/comment/7e757946_ec631276
PS1, Line 743: ?
shouldn't the previous default '012a'O be here?



--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I6dd8cddcb986969d713ed7975a55cb31ab47c499
Gerrit-Change-Number: 34822
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: osmith 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:56:16 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

[S] Change in osmo-ttcn3-hacks[master]: GTPv2: Fix match of 15-digit IMSIs

[osmith]

Attention is currently required from: pespin.

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34821?usp=email )

Change subject: GTPv2: Fix match of 15-digit IMSIs
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34821?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ie2f316ccb5bc69ec15e861616de4fd5babc4004e
Gerrit-Change-Number: 34821
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: osmith 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:55:10 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in ...osmo-epdg[master]: README.md: Fix path to config file

[pespin]

pespin has submitted this change. ( 
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34802?usp=email )

Change subject: README.md: Fix path to config file
..

README.md: Fix path to config file

Change-Id: Id0f7cb0d991895da96694082ab367c30867a7bce
---
M README.md
1 file changed, 10 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved




diff --git a/README.md b/README.md
index 6f93fed..d425efc 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@

 == Configuration ==

-$ rebar3 shell --config ./examples/sys.config
+$ rebar3 shell --config ./config/sys.config
 ```
 1> osmo_epdg:start().
 ```

--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34802?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: Id0f7cb0d991895da96694082ab367c30867a7bce
Gerrit-Change-Number: 34802
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[S] Change in ...osmo-epdg[master]: Makefile: Add shell target

[pespin]

pespin has submitted this change. ( 
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34805?usp=email )

Change subject: Makefile: Add shell target
..

Makefile: Add shell target

Change-Id: Icec3e92c4597d73f141c6ba669e8d9d07ec2e220
---
M Makefile
1 file changed, 12 insertions(+), 0 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified




diff --git a/Makefile b/Makefile
index 5b2196e..b2fe66f 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,9 @@
 run: build
ERL_FLAGS='-config config/sys.config' _build/default/bin/osmo-epdg

+shell: build
+   rebar3 shell --config ./config/sys.config
+
 check:
rebar3 eunit


--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34805?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: Icec3e92c4597d73f141c6ba669e8d9d07ec2e220
Gerrit-Change-Number: 34805
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[S] Change in ...osmo-epdg[master]: diameter_swx: Fix MAA and SAA parsing mixed

[pespin]

pespin has submitted this change. ( 
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34783?usp=email )

Change subject: diameter_swx: Fix MAA and SAA parsing mixed
..

diameter_swx: Fix MAA and SAA parsing mixed

Change-Id: I570dd7c0ae521ccaea5fceb7eef90b4975cb0fbc
---
M src/epdg_diameter_swx.erl
1 file changed, 35 insertions(+), 12 deletions(-)

Approvals:
  fixeria: Looks good to me, but someone else must approve
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved
  Jenkins Builder: Verified




diff --git a/src/epdg_diameter_swx.erl b/src/epdg_diameter_swx.erl
index fe89f11..dadfa65 100644
--- a/src/epdg_diameter_swx.erl
+++ b/src/epdg_diameter_swx.erl
@@ -152,19 +152,28 @@
 unknown_user => #{error => "User is not known by HSS"}
 }).

--spec parse_mar(#'MAA'{}) -> map().
-parse_mar(#'MAA'{'Result-Code' = [ResultCode]} = Maa) ->
+-spec parse_maa(#'MAA'{}) -> map().
+parse_maa(#'MAA'{'Result-Code' = [ResultCode]} = Maa) ->
 Success = result_code_success(ResultCode),
 {Success, ResultCode};
-
-parse_mar(#'MAA'{'Experimental-Result' = [#{'Vendor-Code' := ?VENDOR_ID_3GPP, 
'ExpResultCode' := 5001}]} = Maa) ->
+parse_maa(#'MAA'{'Experimental-Result' = [#{'Vendor-Code' := ?VENDOR_ID_3GPP, 
'ExpResultCode' := 5001}]} = Maa) ->
 {unknown_user, 5001};
-parse_mar(#'MAA'{'Experimental-Result' = [#{'Vendor-Code' := ?VENDOR_ID_3GPP, 
'ExpResultCode' := ResultCode}]} = Maa) ->
+parse_maa(#'MAA'{'Experimental-Result' = [#{'Vendor-Code' := ?VENDOR_ID_3GPP, 
'ExpResultCode' := ResultCode}]} = Maa) ->
 {invalid_exp_result, ResultCode};
-parse_mar(Maa) ->
+parse_maa(Maa) ->
 {unknown_err, []}.
+% parse_maa(#'MAA'{'Experimental-Result-Code' = [ResultCode] = MAA) ->

-% parse_mar(#'MAA'{'Experimental-Result-Code' = [ResultCode] = MAA) ->
+-spec parse_saa(#'SAA'{}) -> map().
+parse_saa(#'SAA'{'Result-Code' = [ResultCode]} = Saa) ->
+Success = result_code_success(ResultCode),
+{Success, ResultCode};
+parse_saa(#'SAA'{'Experimental-Result' = [#{'Vendor-Code' := ?VENDOR_ID_3GPP, 
'ExpResultCode' := 5001}]} = Saa) ->
+{unknown_user, 5001};
+parse_saa(#'SAA'{'Experimental-Result' = [#{'Vendor-Code' := ?VENDOR_ID_3GPP, 
'ExpResultCode' := ResultCode}]} = Saa) ->
+{invalid_exp_result, ResultCode};
+parse_saa(Saa) ->
+{unknown_err, []}.

 handle_call({mar, {IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey}}, 
_From, State) ->
 SessionId = diameter:session_id(application:get_env(?ENV_APP_NAME, 
origin_host, ?ENV_DEFAULT_ORIG_HOST)),
@@ -184,11 +193,16 @@
 Ret = diameter:call(?SVC_NAME, ?APP_ALIAS, MAR, []),
 case Ret of
 {ok, MAA} ->
-{reply, {ok, MAA}, State};
+SuccessCode = parse_maa(MAA),
+case SuccessCode of
+{ok, _} -> {reply, {ok, MAA}, State};
+{Err, Info} -> {reply, {error, {Err, Info, MAA}}, State}
+end;
 {error, Err} ->
 lager:error("Error: ~w~n", [Err]),
 {reply, {error, Err}, State}
 end;
+
 handle_call({sar, {IMSI, Type, APN}}, _From, State) ->
 SessionId = diameter:session_id(application:get_env(?ENV_APP_NAME, 
origin_host, ?ENV_DEFAULT_ORIG_HOST)),
 SAR = #'SAR'{'Vendor-Specific-Application-Id' = 
#'Vendor-Specific-Application-Id'{
@@ -202,11 +216,11 @@
 },
 Ret = diameter:call(?SVC_NAME, ?APP_ALIAS, SAR, []),
 case Ret of
-{ok, Maa} ->
-SuccessCode = parse_mar(Maa),
+{ok, Saa} ->
+SuccessCode = parse_saa(Saa),
 case SuccessCode of
-{ok, _} -> {reply, {ok, Maa}, State};
-{Err, Info} -> {reply, {error, {Err, Info, Maa}}, State}
+{ok, _} -> {reply, {ok, Saa}, State};
+{Err, Info} -> {reply, {error, {Err, Info, Saa}}, State}
 end;
 {error, Err} ->
 lager:error("Error: ~w~n", [Err]),

--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34783?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: I570dd7c0ae521ccaea5fceb7eef90b4975cb0fbc
Gerrit-Change-Number: 34783
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[S] Change in ...osmo-epdg[master]: Makefile: pass config file to 'make run'

[pespin]

pespin has submitted this change. ( 
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34803?usp=email )

Change subject: Makefile: pass config file to 'make run'
..

Makefile: pass config file to 'make run'

Change-Id: Icbd12d5aac363c6cdc54aac88c0e2fa619c1e01b
---
M Makefile
1 file changed, 10 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved




diff --git a/Makefile b/Makefile
index 43e749d..5b2196e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
rebar3 escriptize

 run: build
-   _build/default/bin/osmo-epdg
+   ERL_FLAGS='-config config/sys.config' _build/default/bin/osmo-epdg

 check:
rebar3 eunit

-- 
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34803?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: Icbd12d5aac363c6cdc54aac88c0e2fa619c1e01b
Gerrit-Change-Number: 34803
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[S] Change in ...osmo-epdg[master]: diameter_swx: Fix MAA and SAA parsing mixed

[pespin]

Attention is currently required from: fixeria, lynxis lazus.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34783?usp=email )

Change subject: diameter_swx: Fix MAA and SAA parsing mixed
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34783?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: I570dd7c0ae521ccaea5fceb7eef90b4975cb0fbc
Gerrit-Change-Number: 34783
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Reviewer: pespin 
Gerrit-Attention: fixeria 
Gerrit-Attention: lynxis lazus 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:50:29 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in libgtpnl[master]: gitignore: add gtp-link, gtp-tunnel

[osmith]

osmith has submitted this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34824?usp=email )

Change subject: gitignore: add gtp-link, gtp-tunnel
..

gitignore: add gtp-link, gtp-tunnel

Change-Id: I9f9c9f64d96e25d99c5631ec40c1439f76678905
---
M .gitignore
1 file changed, 12 insertions(+), 0 deletions(-)

Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified




diff --git a/.gitignore b/.gitignore
index 738b3c4..bf5732d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,6 @@
 debian/libgtpnl0

 contrib/libgtpnl.spec
+
+tools/gtp-link
+tools/gtp-tunnel

--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34824?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: I9f9c9f64d96e25d99c5631ec40c1439f76678905
Gerrit-Change-Number: 34824
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[M] Change in libgtpnl[master]: Add IPv6 support

[pespin]

Attention is currently required from: laforge, osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34735?usp=email )

Change subject: Add IPv6 support
..


Patch Set 3: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34735?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: If864c9170f74af52a95cbc4cdb1b866e0309306b
Gerrit-Change-Number: 34735
Gerrit-PatchSet: 3
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Attention: osmith 
Gerrit-Attention: laforge 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:43:29 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in libgtpnl[master]: Add IPv6 support

[osmith]

Attention is currently required from: laforge, pespin.

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34735?usp=email )

Change subject: Add IPv6 support
..


Patch Set 2:

(4 comments)

File src/gtp-genl.c:

https://gerrit.osmocom.org/c/libgtpnl/+/34735/comment/b087f34e_d39e33cb
PS2, Line 60:   }
> default: assert()
Done


https://gerrit.osmocom.org/c/libgtpnl/+/34735/comment/c350bc50_b555d079
PS2, Line 69:   }
> default: assert()
Done


https://gerrit.osmocom.org/c/libgtpnl/+/34735/comment/f1d30c8a_29d582ee
PS2, Line 239:  switch (pdp.ms_addr.family) {
> All this can simply be: […]
oh right, nice! :D


https://gerrit.osmocom.org/c/libgtpnl/+/34735/comment/38353512_cb43cd01
PS2, Line 249:  switch (pdp.sgsn_addr.family) {
> inet_ntop(pdp.sgsn_addr.family, _addr. […]
Done



--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34735?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: If864c9170f74af52a95cbc4cdb1b866e0309306b
Gerrit-Change-Number: 34735
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Attention: laforge 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:43:00 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin 
Gerrit-MessageType: comment

[M] Change in libgtpnl[master]: Add IPv6 support

[osmith]

Attention is currently required from: laforge, osmith, pespin.

Hello Jenkins Builder, pespin,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/libgtpnl/+/34735?usp=email

to look at the new patch set (#3).

The following approvals got outdated and were removed:
Code-Review+1 by pespin, Verified+1 by Jenkins Builder


Change subject: Add IPv6 support
..

Add IPv6 support

Implement IPv6 in libgtpnl and the gtp-tunnel testing tool. Allow to
combine:

- GTPA_MS_ADDRESS and GTPA_PEER_ADDR6
- GTPA_MS_ADDR6 and GTPA_PEER_ADDRESS

to specify IPv4-in-IPv6-GTP and IPv6-in-IPv4-GTP in the tunnel
declaration from control plane.

This patch is based on multiple patches from Pablo in OS#6123. I decided
to squash them to directly implement v4-in-v6 and vice versa, instead of
implementing another variant first and then changing it again.

Co-developed-by: Pablo Neira Ayuso 
Related: OS#6096
Change-Id: If864c9170f74af52a95cbc4cdb1b866e0309306b
---
M include/libgtpnl/gtp.h
M include/linux/gtp.h
M src/gtp-genl.c
M src/gtp.c
M src/libgtpnl.map
M tools/gtp-tunnel.c
6 files changed, 146 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/35/34735/3
--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34735?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: If864c9170f74af52a95cbc4cdb1b866e0309306b
Gerrit-Change-Number: 34735
Gerrit-PatchSet: 3
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Attention: osmith 
Gerrit-Attention: laforge 
Gerrit-Attention: pespin 
Gerrit-MessageType: newpatchset

[S] Change in osmo-msc[master]: ASCI: Reject TERMINATION, if MS is not the originator

[pespin]

Attention is currently required from: jolly.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-msc/+/34830?usp=email )

Change subject: ASCI: Reject TERMINATION, if MS is not the originator
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34830?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Ibe289920fa3ea50dd3e7d5c1371456dca9b72604
Gerrit-Change-Number: 34830
Gerrit-PatchSet: 1
Gerrit-Owner: jolly 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-Attention: jolly 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:42:08 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[L] Change in osmo-bsc[master]: ASCI: Add System Information 10 support

[pespin]

Attention is currently required from: fixeria, jolly, laforge.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email )

Change subject: ASCI: Add System Information 10 support
..


Patch Set 6:

(4 comments)

File src/osmo-bsc/system_information.c:

https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/3a994631_16e74711
PS6, Line 1420: int gsm_generate_si10(uint8_t *data, size_t len, const struct 
gsm_subscriber_connection *conn)
"struct gsm48_system_information_type_10 *data" ?


https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/6aaafb03_f812b8ce
PS6, Line 1424: struct gsm_bts *s_bts = conn->lchan->ts->trx->bts;
Can conn->lchan be null?
OSMO_ASSERT(conn && conn->lchan) perhaps?


File src/osmo-bsc/vgcs_fsm.c:

https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/5ca286d7_976722cb
PS6, Line 70: #define SI10_TIMER3, 0
AFAIU this is no longer used.


https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/982f534c_2e5f996c
PS6, Line 71: #define SI10_LENGTH   21
this length should be in the same header where the API is used, and probably be 
documented in the API that the data buf should be at least this size.



--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Icd3101e6dd935a57f003253aaef400c2cf95a0c3
Gerrit-Change-Number: 34626
Gerrit-PatchSet: 6
Gerrit-Owner: jolly 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-CC: pespin 
Gerrit-Attention: jolly 
Gerrit-Attention: laforge 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:38:56 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

[M] Change in libgtpnl[master]: Add IPv6 support

[pespin]

Attention is currently required from: laforge, osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34735?usp=email )

Change subject: Add IPv6 support
..


Patch Set 2: Code-Review+1

(4 comments)

File src/gtp-genl.c:

https://gerrit.osmocom.org/c/libgtpnl/+/34735/comment/10e8a343_fd652bb7
PS2, Line 60:   }
default: assert()


https://gerrit.osmocom.org/c/libgtpnl/+/34735/comment/696be098_103d2406
PS2, Line 69:   }
default: assert()


https://gerrit.osmocom.org/c/libgtpnl/+/34735/comment/2c28aec1_c99fa3a7
PS2, Line 239:  switch (pdp.ms_addr.family) {
All this can simply be:
inet_ntop(pdp.ms_addr.family, _addr.ip4, buf, sizeof(buf));


https://gerrit.osmocom.org/c/libgtpnl/+/34735/comment/15e9f1bb_e05a5cec
PS2, Line 249:  switch (pdp.sgsn_addr.family) {
inet_ntop(pdp.sgsn_addr.family, _addr.ip4, buf, sizeof(buf));



--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34735?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: If864c9170f74af52a95cbc4cdb1b866e0309306b
Gerrit-Change-Number: 34735
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Attention: osmith 
Gerrit-Attention: laforge 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:30:59 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in libgtpnl[master]: Add IPv6 support

[osmith]

Attention is currently required from: laforge, pespin.

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34735?usp=email )

Change subject: Add IPv6 support
..


Patch Set 2:

(1 comment)

File src/gtp-genl.c:

https://gerrit.osmocom.org/c/libgtpnl/+/34735/comment/b6c8c366_6dac6244
PS1, Line 220:  }
> "default: return MNL_CB_ERROR;" ?
Done



--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34735?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: If864c9170f74af52a95cbc4cdb1b866e0309306b
Gerrit-Change-Number: 34735
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge 
Gerrit-CC: pespin 
Gerrit-Attention: laforge 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:26:03 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin 
Gerrit-MessageType: comment

[S] Change in osmo-msc[master]: ASCI: Reject TERMINATION, if MS is not the originator

[jolly]

jolly has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-msc/+/34830?usp=email )


Change subject: ASCI: Reject TERMINATION, if MS is not the originator
..

ASCI: Reject TERMINATION, if MS is not the originator

Only the originator may terminate the VGCS/VBS call. This will not
happen in real life, because the UI of the MS should not allow
termination of a recevied VGCS call.

Change-Id: Ibe289920fa3ea50dd3e7d5c1371456dca9b72604
Related: OS#4854
---
M src/libmsc/msc_vgcs.c
1 file changed, 34 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/30/34830/1

diff --git a/src/libmsc/msc_vgcs.c b/src/libmsc/msc_vgcs.c
index 772a9e3..d3f2e0e 100644
--- a/src/libmsc/msc_vgcs.c
+++ b/src/libmsc/msc_vgcs.c
@@ -859,6 +859,21 @@
trans_free(trans);
 }

+/* Send TERMINATION REJECT to the calling/talking subscriber. */
+static void gcc_termination_reject(struct gsm_trans *trans, enum 
osmo_gsm44068_cause cause)
+{
+   uint8_t pdisc = (trans->type == TRANS_GCC) ? GSM48_PDISC_GROUP_CC : 
GSM48_PDISC_BCAST_CC;
+   int rc;
+
+   /* Send TERMINATION towards MS. */
+   rc = gsm44068_tx_termination(trans->msc_a, trans->gcc.uplink_bss,
+pdisc | (trans->transaction_id << 4),
+OSMO_GSM44068_MSGT_TERMINATION_REJECT,
+cause,  NULL, 0);
+   if (rc < 0)
+   LOG_GCC(trans, LOGL_ERROR, "Failed to send TERMINATION REJECT 
towards MS.\n");
+}
+
 /* Start inactivity timer.
  * This timer is used to terminate the call, if the radio connection to the 
caller gets lost. */
 static void start_inactivity_timer(struct gsm_trans *trans)
@@ -1112,6 +1127,11 @@
gcc_terminate_and_destroy(trans, 
OSMO_GSM44068_CAUSE_NORMAL_CALL_CLEARING);
break;
case VGCS_GCC_EV_USER_TERM:
+   if (!trans->gcc.uplink_originator) {
+   LOG_GCC(trans, LOGL_ERROR, "Termination by user, but it 
is not the originator.\n");
+   gcc_termination_reject(trans, 
OSMO_GSM44068_CAUSE_USER_NOT_ORIGINATOR);
+   break;
+   }
LOG_GCC(trans, LOGL_DEBUG, "Termination by user, destroying 
call.\n");
/* Send TERMINATE to the calling subscriber and destroy group 
call in all cells. */
gcc_terminate_and_destroy(trans, 
OSMO_GSM44068_CAUSE_NORMAL_CALL_CLEARING);

--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34830?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Ibe289920fa3ea50dd3e7d5c1371456dca9b72604
Gerrit-Change-Number: 34830
Gerrit-PatchSet: 1
Gerrit-Owner: jolly 
Gerrit-MessageType: newchange

[M] Change in libgtpnl[master]: Use struct gtp_addr for ms_addr and sgsn_addr

[pespin]

Attention is currently required from: laforge.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34734?usp=email )

Change subject: Use struct gtp_addr for ms_addr and sgsn_addr
..


Patch Set 2: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34734?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: Ifc7e3b03a723fb544d1c7b789101102b2c27b60e
Gerrit-Change-Number: 34734
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Attention: laforge 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:25:16 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in libgtpnl[master]: Use struct gtp_addr for ms_addr and sgsn_addr

[osmith]

Attention is currently required from: laforge, pespin.

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34734?usp=email )

Change subject: Use struct gtp_addr for ms_addr and sgsn_addr
..


Patch Set 2:

(2 comments)

Commit Message:

https://gerrit.osmocom.org/c/libgtpnl/+/34734/comment/afa621d5_358c59d8
PS1, Line 7: update to p
> Please expand a little bit what the change does.  Like "Introduce a union in 
> struct foo ... […]
Done


File src/internal.h:

https://gerrit.osmocom.org/c/libgtpnl/+/34734/comment/f722a4bb_14f76d4a
PS1, Line 22:   } ip;
> I would agree, it should be ip4/ip6, or something else that is clearly 
> understood. […]
Done



--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34734?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: Ifc7e3b03a723fb544d1c7b789101102b2c27b60e
Gerrit-Change-Number: 34734
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Attention: laforge 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:25:11 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge 
Comment-In-Reply-To: pespin 
Gerrit-MessageType: comment

[M] Change in libgtpnl[master]: Add IPv6 support

[osmith]

Attention is currently required from: laforge, pespin.

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34735?usp=email )

Change subject: Add IPv6 support
..


Patch Set 2:

(1 comment)

File src/gtp-genl.c:

https://gerrit.osmocom.org/c/libgtpnl/+/34735/comment/81090384_4bb99bdd
PS1, Line 60:   mnl_attr_put(nlh, GTPA_PEER_ADDR6, 
sizeof(t->ip6.sgsn_addr), >ip6.sgsn_addr);
> why do we check for ANY_ADDR in ipv4 but not in ipv6?
Done



--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34735?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: If864c9170f74af52a95cbc4cdb1b866e0309306b
Gerrit-Change-Number: 34735
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge 
Gerrit-CC: pespin 
Gerrit-Attention: laforge 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:24:25 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin 
Gerrit-MessageType: comment

[S] Change in libgtpnl[master]: include/linux/gtp.h: sync with kernel header

[pespin]

Attention is currently required from: osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34829?usp=email )

Change subject: include/linux/gtp.h: sync with kernel header
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34829?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: Icf7b78e6655b6573c09c2eaa71d22ef6742b2594
Gerrit-Change-Number: 34829
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:23:50 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in libgtpnl[master]: Add IPv6 support

[osmith]

Attention is currently required from: laforge, pespin.

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34735?usp=email )

Change subject: Add IPv6 support
..


Patch Set 2:

(1 comment)

File src/gtp.c:

https://gerrit.osmocom.org/c/libgtpnl/+/34735/comment/5e5ae56b_f7f3f4bf
PS1, Line 39:   t->family = AF_INET;
> explain here with a comment that you add this here to maintain backward 
> compat with older apps.
I realized that t->family was always the same as MS address family in the 
previous patches. So I removed t->family altogether.



--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34735?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: If864c9170f74af52a95cbc4cdb1b866e0309306b
Gerrit-Change-Number: 34735
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge 
Gerrit-CC: pespin 
Gerrit-Attention: laforge 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:23:10 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin 
Gerrit-MessageType: comment

[S] Change in libgtpnl[master]: include/linux/gtp.h: fix GTPA_MAX

[pespin]

Attention is currently required from: osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34828?usp=email )

Change subject: include/linux/gtp.h: fix GTPA_MAX
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34828?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: I42a358fc795d0e593e2c5509dcfa6ffdbad3cbfa
Gerrit-Change-Number: 34828
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:22:58 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[L] Change in osmo-bsc[master]: ASCI: Add System Information 10 support

[jolly]

Attention is currently required from: fixeria, laforge, pespin.

jolly has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email )

Change subject: ASCI: Add System Information 10 support
..


Patch Set 5:

(3 comments)

Patchset:

PS2:
> I don't have a strong preference here... […]
There is a better solution, I used to resolve this problem:

The channels are activated quite quickly after each other. The BTS will take a 
while, to acknowledge the channel activations or reject them. The BSC will wait 
until all requested channels have been activated or rejected. Then the SI10 is 
generated. This way the SI10 is generated and sent to the BTSs only once.

In case the channels are requested with a delay (congestions/errors on the 
A-Interface), the BSC will generate SI10 as soon as all (so fare) requested 
channels have been activated or rejected. Then, if more channels get requested 
by the MSC later, the BSC will update SI10, when all further channels have been 
activated or rejected.


File src/osmo-bsc/system_information.c:

https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/0105248a_3ab27112
PS2, Line 1428: unsigned int save_cur_bit;
  : struct gsm_subscriber_connection *c;
> variables should always be declared with the smallest possible scope. […]
Done


File src/osmo-bsc/system_information.c:

https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/baeacfa9_64818519
PS4, Line 1456: llist_for_each_entry(c, 
>vgcs_chan.call->vgcs_call.chan_list, vgcs_chan.list) {
> I always want to separate variables from code. […]
Done



--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Icd3101e6dd935a57f003253aaef400c2cf95a0c3
Gerrit-Change-Number: 34626
Gerrit-PatchSet: 5
Gerrit-Owner: jolly 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-CC: pespin 
Gerrit-Attention: laforge 
Gerrit-Attention: fixeria 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:22:33 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: jolly 
Comment-In-Reply-To: laforge 
Comment-In-Reply-To: fixeria 
Comment-In-Reply-To: pespin 
Gerrit-MessageType: comment

[S] Change in libgtpnl[master]: configure: add --enable-werror

[pespin]

Attention is currently required from: osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34827?usp=email )

Change subject: configure: add --enable-werror
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34827?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: Ife3716c667d2e9b3fcd94d3cdc044d594e7dab5a
Gerrit-Change-Number: 34827
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:22:28 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in libgtpnl[master]: configure: regular_C(PP)FLAGS -> C(PP)FLAGS

[pespin]

Attention is currently required from: osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34826?usp=email )

Change subject: configure: regular_C(PP)FLAGS -> C(PP)FLAGS
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34826?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: I11e9657fb0c038169bd414a6455044ff4a4709b7
Gerrit-Change-Number: 34826
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:22:20 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in libgtpnl[master]: README, debian/control: update URLs

[pespin]

Attention is currently required from: osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34825?usp=email )

Change subject: README, debian/control: update URLs
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34825?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: I0995f14657e3f58a46e9e357aa3e6baecc132fe0
Gerrit-Change-Number: 34825
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: pespin 
Gerrit-CC: Jenkins Builder
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:21:40 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in libgtpnl[master]: gitignore: add gtp-link, gtp-tunnel

[pespin]

Attention is currently required from: osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34824?usp=email )

Change subject: gitignore: add gtp-link, gtp-tunnel
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34824?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: I9f9c9f64d96e25d99c5631ec40c1439f76678905
Gerrit-Change-Number: 34824
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: pespin 
Gerrit-CC: Jenkins Builder
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Thu, 19 Oct 2023 14:21:13 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in libgtpnl[master]: IPv4-in-IPv6-GTP and IPv6-in-IPv4-GTP

[osmith]

osmith has abandoned this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34739?usp=email )

Change subject: IPv4-in-IPv6-GTP and IPv6-in-IPv4-GTP
..


Abandoned

squashed into https://gerrit.osmocom.org/c/libgtpnl/+/34735/2
--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34739?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: Ibc581a92a561dc0bd9924d9f15c7a27dc513c8d7
Gerrit-Change-Number: 34739
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin 
Gerrit-MessageType: abandon

[M] Change in libgtpnl[master]: tools: gtp-tunnel: add IPv6 support

[osmith]

osmith has abandoned this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34737?usp=email )

Change subject: tools: gtp-tunnel: add IPv6 support
..


Abandoned

squashed into https://gerrit.osmocom.org/c/libgtpnl/+/34735/2
--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34737?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: Ifdc104b158afa6343e3aa6142ffa9591db209c4f
Gerrit-Change-Number: 34737
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-MessageType: abandon

[S] Change in libgtpnl[master]: add IPv6 API for GTP tunnel

[osmith]

osmith has abandoned this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34736?usp=email )

Change subject: add IPv6 API for GTP tunnel
..


Abandoned

squashed into https://gerrit.osmocom.org/c/libgtpnl/+/34735/2
--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34736?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: Ic9c1a5cd791b285d214e7f2aeb76f8bf372e01c6
Gerrit-Change-Number: 34736
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: abandon

[S] Change in libgtpnl[master]: configure: regular_C(PP)FLAGS -> C(PP)FLAGS

[osmith]

osmith has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34826?usp=email )


Change subject: configure: regular_C(PP)FLAGS -> C(PP)FLAGS
..

configure: regular_C(PP)FLAGS -> C(PP)FLAGS

Make it consistent with other Osmocom projects by removing special
naming for CFLAGS and CPPFLAGS. Otherwise the arguments we typically
add, such as --enable-sanitize which is already there, or
--enable-werror which I'll add in the next patch, do not work without
further changes.

Change-Id: I11e9657fb0c038169bd414a6455044ff4a4709b7
---
M Make_global.am
M configure.ac
2 files changed, 24 insertions(+), 8 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/26/34826/1

diff --git a/Make_global.am b/Make_global.am
index f2cb36c..9a3d5b2 100644
--- a/Make_global.am
+++ b/Make_global.am
@@ -1,2 +1,2 @@
-AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_srcdir}/include ${LIBMNL_CFLAGS}
-AM_CFLAGS = ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN}
+AM_CPPFLAGS = ${CPPFLAGS} -I${top_srcdir}/include ${LIBMNL_CFLAGS}
+AM_CFLAGS = ${CFLAGS} ${GCC_FVISIBILITY_HIDDEN}
diff --git a/configure.ac b/configure.ac
index eb35f57..e7d9888 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,11 @@
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign tar-pax no-dist-gzip dist-bzip2 1.6 subdir-objects])

+CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_REENTRANT"
+CFLAGS="$CFLAGS -Wall -Waggregate-return -Wmissing-declarations \
+   -Wmissing-prototypes -Wshadow -Wstrict-prototypes \
+   -Wformat=2 -pipe"
+
 dnl include release helper
 RELMAKE='-include osmo-release.mk'
 AC_SUBST([RELMAKE])
@@ -48,12 +53,8 @@
CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined"
 fi

-regular_CPPFLAGS="-D_FILE_OFFSET_BITS=64 -D_REENTRANT"
-regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \
-   -Wmissing-prototypes -Wshadow -Wstrict-prototypes \
-   -Wformat=2 -pipe"
-AC_SUBST([regular_CPPFLAGS])
-AC_SUBST([regular_CFLAGS])
+AC_SUBST([CPPFLAGS])
+AC_SUBST([CFLAGS])
 AC_CONFIG_FILES([Makefile src/Makefile include/Makefile 
include/libgtpnl/Makefile include/linux/Makefile tools/Makefile libgtpnl.pc])
 AC_OUTPUT(
contrib/libgtpnl.spec)

--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34826?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: I11e9657fb0c038169bd414a6455044ff4a4709b7
Gerrit-Change-Number: 34826
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[S] Change in libgtpnl[master]: include/linux/gtp.h: sync with kernel header

[osmith]

osmith has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34829?usp=email )


Change subject: include/linux/gtp.h: sync with kernel header
..

include/linux/gtp.h: sync with kernel header

Make the file exactly the same as include/uapi/linux/gtp.h in
linux.git. GTPA_SGSN_ADDRESS is not used, but we decided to rather add
it and not have a diff.

Related: 
https://gerrit.osmocom.org/c/libgtpnl/+/34735/comment/909c69a6_2fe7781a/
Change-Id: Icf7b78e6655b6573c09c2eaa71d22ef6742b2594
---
M include/linux/gtp.h
1 file changed, 21 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/29/34829/1

diff --git a/include/linux/gtp.h b/include/linux/gtp.h
index 5d37b1c..3dcdb9e 100644
--- a/include/linux/gtp.h
+++ b/include/linux/gtp.h
@@ -1,10 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_GTP_H_
-#define _UAPI_LINUX_GTP_H__
+#define _UAPI_LINUX_GTP_H_
+
+#define GTP_GENL_MCGRP_NAME"gtp"

 enum gtp_genl_cmds {
GTP_CMD_NEWPDP,
GTP_CMD_DELPDP,
GTP_CMD_GETPDP,
+   GTP_CMD_ECHOREQ,

GTP_CMD_MAX,
 };
@@ -19,7 +23,8 @@
GTPA_LINK,
GTPA_VERSION,
GTPA_TID,   /* for GTPv0 only */
-   GTPA_PEER_ADDRESS,
+   GTPA_PEER_ADDRESS,  /* Remote GSN peer, either SGSN or GGSN */
+#define GTPA_SGSN_ADDRESS GTPA_PEER_ADDRESS /* maintain legacy attr name */
GTPA_MS_ADDRESS,
GTPA_FLOW,
GTPA_NET_NS_FD,

--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34829?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: Icf7b78e6655b6573c09c2eaa71d22ef6742b2594
Gerrit-Change-Number: 34829
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[S] Change in libgtpnl[master]: include/linux/gtp.h: fix GTPA_MAX

[osmith]

osmith has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34828?usp=email )


Change subject: include/linux/gtp.h: fix GTPA_MAX
..

include/linux/gtp.h: fix GTPA_MAX

Apply same fix as done by Pablo in linux.git:
> Subtract one to __GTPA_MAX, otherwise GTPA_MAX is off by 2

Change-Id: I42a358fc795d0e593e2c5509dcfa6ffdbad3cbfa
---
M include/linux/gtp.h
1 file changed, 13 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/28/34828/1

diff --git a/include/linux/gtp.h b/include/linux/gtp.h
index c525cb3..5d37b1c 100644
--- a/include/linux/gtp.h
+++ b/include/linux/gtp.h
@@ -28,6 +28,6 @@
GTPA_PAD,
__GTPA_MAX,
 };
-#define GTPA_MAX (__GTPA_MAX + 1)
+#define GTPA_MAX (__GTPA_MAX - 1)

 #endif /* _UAPI_LINUX_GTP_H_ */

--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34828?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: I42a358fc795d0e593e2c5509dcfa6ffdbad3cbfa
Gerrit-Change-Number: 34828
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[S] Change in libgtpnl[master]: configure: add --enable-werror

[osmith]

osmith has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34827?usp=email )


Change subject: configure: add --enable-werror
..

configure: add --enable-werror

Change-Id: Ife3716c667d2e9b3fcd94d3cdc044d594e7dab5a
---
M configure.ac
1 file changed, 28 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/27/34827/1

diff --git a/configure.ac b/configure.ac
index e7d9888..a16f40b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,25 @@
CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined"
 fi

+AC_ARG_ENABLE(werror,
+   [AS_HELP_STRING(
+   [--enable-werror],
+   [Turn all compiler warnings into errors, with exceptions:
+a) deprecation (allow upstream to mark deprecation without 
breaking builds);
+b) "#warning" pragmas (allow to remind ourselves of errors 
without breaking builds)
+   ]
+   )],
+   [werror=$enableval], [werror="no"])
+if test x"$werror" = x"yes"
+then
+   WERROR_FLAGS="-Werror"
+   WERROR_FLAGS+=" -Werror=implicit-int -Werror=int-conversion 
-Werror=old-style-definition"
+   WERROR_FLAGS+=" -Wno-error=deprecated 
-Wno-error=deprecated-declarations"
+   WERROR_FLAGS+=" -Wno-error=cpp" # "#warning"
+   CFLAGS="$CFLAGS $WERROR_FLAGS"
+   CPPFLAGS="$CPPFLAGS $WERROR_FLAGS"
+fi
+
 AC_SUBST([CPPFLAGS])
 AC_SUBST([CFLAGS])
 AC_CONFIG_FILES([Makefile src/Makefile include/Makefile 
include/libgtpnl/Makefile include/linux/Makefile tools/Makefile libgtpnl.pc])

--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34827?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: Ife3716c667d2e9b3fcd94d3cdc044d594e7dab5a
Gerrit-Change-Number: 34827
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[S] Change in libgtpnl[master]: README, debian/control: update URLs

[osmith]

osmith has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34825?usp=email )


Change subject: README, debian/control: update URLs
..

README, debian/control: update URLs

Change-Id: I0995f14657e3f58a46e9e357aa3e6baecc132fe0
---
M README.md
M debian/control
2 files changed, 14 insertions(+), 5 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/25/34825/1

diff --git a/README.md b/README.md
index 5d3b5bf..95ad1ac 100644
--- a/README.md
+++ b/README.md
@@ -20,9 +20,9 @@

 You can clone from the official libgtpnl.git repository using

-   git clone git://git.osmocom.org/libgtpnl.git
+   git clone https://gitea.osmocom.org/cellular-infrastructure/libgtpnl

-There is a cgit interface at 
+Visiting the URL in a browser shows a web interface.

 Mailing List
 
diff --git a/debian/control b/debian/control
index a24564e..17a8649 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,9 @@
pkg-config,
libmnl-dev
 Standards-Version: 3.9.8
-Vcs-Git: git://git.osmocom.org/libgtpnl.git
-Vcs-Browser: http://git.osmocom.org/gitweb?p=libgtpnl.git;a=summary
-Homepage: https://projects.osmocom.org/projects/openggsn
+Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/libgtpnl
+Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/libgtpnl
+Homepage: https://osmocom.org/projects/linux-kernel-gtp-u/wiki/Libgtpnl

 Package: libgtpnl0
 Section: libs

--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34825?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: I0995f14657e3f58a46e9e357aa3e6baecc132fe0
Gerrit-Change-Number: 34825
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[M] Change in libgtpnl[master]: Add IPv6 support

[osmith]

Attention is currently required from: laforge, pespin.

Hello Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/libgtpnl/+/34735?usp=email

to look at the new patch set (#2).

The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder


Change subject: Add IPv6 support
..

Add IPv6 support

Implement IPv6 in libgtpnl and the gtp-tunnel testing tool. Allow to
combine:

- GTPA_MS_ADDRESS and GTPA_PEER_ADDR6
- GTPA_MS_ADDR6 and GTPA_PEER_ADDRESS

to specify IPv4-in-IPv6-GTP and IPv6-in-IPv4-GTP in the tunnel
declaration from control plane.

This patch is based on multiple patches from Pablo in OS#6123. I decided
to squash them to directly implement v4-in-v6 and vice versa, instead of
implementing another variant first and then changing it again.

Co-developed-by: Pablo Neira Ayuso 
Related: OS#6096
Change-Id: If864c9170f74af52a95cbc4cdb1b866e0309306b
---
M include/libgtpnl/gtp.h
M include/linux/gtp.h
M src/gtp-genl.c
M src/gtp.c
M src/libgtpnl.map
M tools/gtp-tunnel.c
6 files changed, 153 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/35/34735/2
--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34735?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: If864c9170f74af52a95cbc4cdb1b866e0309306b
Gerrit-Change-Number: 34735
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge 
Gerrit-CC: pespin 
Gerrit-Attention: laforge 
Gerrit-Attention: pespin 
Gerrit-MessageType: newpatchset

[M] Change in libgtpnl[master]: Use struct gtp_addr for ms_addr and sgsn_addr

[osmith]

Attention is currently required from: osmith, pespin.

Hello Jenkins Builder, pespin,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/libgtpnl/+/34734?usp=email

to look at the new patch set (#2).

The following approvals got outdated and were removed:
Code-Review+1 by pespin, Verified+1 by Jenkins Builder


Change subject: Use struct gtp_addr for ms_addr and sgsn_addr
..

Use struct gtp_addr for ms_addr and sgsn_addr

Prepare for IPv6 support by using a new struct for MS and SGSN
addresses, in which either an IPv4 or IPv6 can be stored.

Related: OS#6096
Change-Id: Ifc7e3b03a723fb544d1c7b789101102b2c27b60e
---
M src/gtp-genl.c
M src/gtp.c
M src/internal.h
3 files changed, 42 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/34/34734/2
--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34734?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: Ifc7e3b03a723fb544d1c7b789101102b2c27b60e
Gerrit-Change-Number: 34734
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Attention: osmith 
Gerrit-Attention: pespin 
Gerrit-MessageType: newpatchset

[S] Change in libgtpnl[master]: gitignore: add gtp-link, gtp-tunnel

[osmith]

osmith has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34824?usp=email )


Change subject: gitignore: add gtp-link, gtp-tunnel
..

gitignore: add gtp-link, gtp-tunnel

Change-Id: I9f9c9f64d96e25d99c5631ec40c1439f76678905
---
M .gitignore
1 file changed, 12 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/24/34824/1

diff --git a/.gitignore b/.gitignore
index 738b3c4..bf5732d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,6 @@
 debian/libgtpnl0

 contrib/libgtpnl.spec
+
+tools/gtp-link
+tools/gtp-tunnel

--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34824?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: I9f9c9f64d96e25d99c5631ec40c1439f76678905
Gerrit-Change-Number: 34824
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[S] Change in osmo-ttcn3-hacks[master]: Makefile: Update titan.ProtocolModules.BSSMAP to new osmocom/master b...

[pespin]

pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34823?usp=email )


Change subject: Makefile: Update titan.ProtocolModules.BSSMAP to new 
osmocom/master branch
..

Makefile: Update titan.ProtocolModules.BSSMAP to new osmocom/master branch

The repository branches were rebased and rearranged, where now its master branch
follows upstream, and we keep an osmocom/master branch with our own
patches (Osmux, not aimed at upstream) which can then be rebased on top of 
master.

Related: OS#6011
Change-Id: I1ec7cb6f8fa5acaca6eb434ea9449119de078c94
---
M deps/Makefile
1 file changed, 15 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/23/34823/1

diff --git a/deps/Makefile b/deps/Makefile
index bd6ce8a..c6031cb 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -89,7 +89,7 @@
 titan.ProtocolEmulations.SCCP_commit=  
f8a44f2cdef44d0c3adf787ab3184c293a9a58be
 titan.ProtocolModules.BSSAPP_v7.3.0_commit=R.2.A-4-g20cfaf8
 titan.ProtocolModules.BSSGP_v13.0.0_commit=
e97d92a8b66bec399babea52f593771b76cb175a
-titan.ProtocolModules.BSSMAP_commit=   
814c5d786ab633bce384eea99685f0e49a386172
+titan.ProtocolModules.BSSMAP_commit=   
4acb6ab5f058477f0b90c2da182d52054e3614b0
 titan.ProtocolModules.DNS_commit=  R.7.B
 titan.ProtocolModules.GRE_commit=  R.2.A-5-g654c446
 titan.ProtocolModules.GTP_v13.5.0_commit=  
54219599037626c675610d3a44433d01af264fbb

--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34823?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I1ec7cb6f8fa5acaca6eb434ea9449119de078c94
Gerrit-Change-Number: 34823
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-MessageType: newchange

[L] Change in osmo-bsc[master]: ASCI: Add System Information 10 support

[jolly]

Attention is currently required from: fixeria, jolly, pespin.

Hello Jenkins Builder, fixeria, laforge,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email

to look at the new patch set (#6).

The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder


Change subject: ASCI: Add System Information 10 support
..

ASCI: Add System Information 10 support

A timer is used to wait some seconds before sending SI 10 to all BTS.
This ensures that all channels are established by the MSC, before
sending a complete list of VGCS/VBS neighbor cells for a call.

For each BTS, an SI 10 is generated with all other neighbor BTS.

The SI 10 will only define neighbor cells within the same BSC, because
it does not know about neighbor cells within other BSCs.

Change-Id: Icd3101e6dd935a57f003253aaef400c2cf95a0c3
---
M include/osmocom/bsc/system_information.h
M src/osmo-bsc/system_information.c
M src/osmo-bsc/vgcs_fsm.c
3 files changed, 329 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/26/34626/6
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Icd3101e6dd935a57f003253aaef400c2cf95a0c3
Gerrit-Change-Number: 34626
Gerrit-PatchSet: 6
Gerrit-Owner: jolly 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-CC: pespin 
Gerrit-Attention: jolly 
Gerrit-Attention: fixeria 
Gerrit-Attention: pespin 
Gerrit-MessageType: newpatchset

[M] Change in osmo-bsc[master]: osmo-bsc: Have PCU socket connection use osmo_wqueue

[pespin]

Attention is currently required from: arehbein, dexter, laforge.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/33891?usp=email )

Change subject: osmo-bsc: Have PCU socket connection use osmo_wqueue
..


Patch Set 7: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33891?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ifd9741045a87338e17eec3492590a5de9c308cb5
Gerrit-Change-Number: 33891
Gerrit-PatchSet: 7
Gerrit-Owner: arehbein 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: arehbein 
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Attention: arehbein 
Gerrit-Attention: laforge 
Gerrit-Attention: dexter 
Gerrit-Comment-Date: Thu, 19 Oct 2023 13:42:17 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-bsc[master]: osmo-bsc: Have PCU socket connection use osmo_wqueue

[arehbein]

Attention is currently required from: dexter, laforge, pespin.

arehbein has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/33891?usp=email )

Change subject: osmo-bsc: Have PCU socket connection use osmo_wqueue
..


Patch Set 7:

(1 comment)

File src/osmo-bsc/pcu_sock.c:

https://gerrit.osmocom.org/c/osmo-bsc/+/33891/comment/6b4eecc1_8e80ac10
PS5, Line 726:  "dropping message\n");
> 1- Alright, I'll keep that in mind […]
Not sure if this was forgotten, so a short 'comment-ping' here. I don't mind 
putting the string literal in one line, if it isn't considered as an unrelated 
change in code review.



--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33891?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ifd9741045a87338e17eec3492590a5de9c308cb5
Gerrit-Change-Number: 33891
Gerrit-PatchSet: 7
Gerrit-Owner: arehbein 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: arehbein 
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Attention: laforge 
Gerrit-Attention: pespin 
Gerrit-Attention: dexter 
Gerrit-Comment-Date: Thu, 19 Oct 2023 13:14:22 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: arehbein 
Comment-In-Reply-To: pespin 
Gerrit-MessageType: comment

[M] Change in libosmo-netif[master]: stream_test: Improve mem mgmt, fix connection mgmt

[arehbein]

arehbein has submitted this change. ( 
https://gerrit.osmocom.org/c/libosmo-netif/+/34799?usp=email )

Change subject: stream_test: Improve mem mgmt, fix connection mgmt
..

stream_test: Improve mem mgmt, fix connection mgmt

 - Use tall_test as root context everywhere, don't create any other contexts
 - change .*_(cli|srv)_run_client() signature by adding talloc context as 
parameter
 - Open and Close server link inside test_recon()

Related: OS#6222
Change-Id: I9ef02ed113bc049ae430b93d0eb69641e2ee809b
---
M tests/stream/stream_test.c
M tests/stream/stream_test.ok
2 files changed, 93 insertions(+), 81 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve




diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c
index 4830302..0851558 100644
--- a/tests/stream/stream_test.c
+++ b/tests/stream/stream_test.c
@@ -340,10 +340,17 @@
   bool autoreconnect)
 {
struct timeval tv;
-   struct osmo_stream_cli *cli = make_client(ctx, host, port, 
autoreconnect);
+   struct osmo_stream_cli *cli;
+   if (osmo_stream_srv_link_open(lnk) < 0) {
+   printf("Unable to open server\n");
+   osmo_stream_srv_link_destroy(lnk);
+   return;
+   }
+   cli = make_client(ctx, host, port, autoreconnect);
if (!cli)
return;

+
printf("===\n");
printf("Client/Server entering %s event loop...\n", 
ASTR(autoreconnect));
printf("===\n");
@@ -368,6 +375,7 @@
}

osmo_stream_cli_destroy(cli);
+   osmo_stream_srv_link_close(lnk);
printf("{%lu.%06lu} %s test complete.\n\n", tv.tv_sec, tv.tv_usec, 
ASTR(autoreconnect));
 }

@@ -531,12 +539,10 @@
return 0;
 }

-struct osmo_stream_cli *test_segm_ipa_stream_srv_run_client(void)
+struct osmo_stream_cli *test_segm_ipa_stream_srv_run_client(void *ctx)
 {
struct osmo_stream_cli *osc;
-   void *ctx = talloc_named_const(NULL, 0, __func__);

-   (void) msgb_talloc_ctx_init(ctx, 0);
osc = osmo_stream_cli_create(ctx);
if (osc == NULL) {
fprintf(stderr, "osmo_stream_cli_create_iofd()\n");
@@ -546,7 +552,6 @@
osmo_stream_cli_set_local_port(osc, 8977);
osmo_stream_cli_set_port(osc, );
osmo_stream_cli_set_connect_cb(osc, 
test_segm_ipa_stream_srv_cli_connect_cb);
-   osmo_stream_cli_set_data(osc, ctx);
osmo_stream_cli_set_read_cb2(osc, test_segm_ipa_stream_srv_cli_read_cb);
osmo_stream_cli_set_nodelay(osc, true);
if (osmo_stream_cli_open(osc) < 0) {
@@ -590,7 +595,7 @@

 static int test_segm_ipa_stream_srv_srv_accept_cb(struct osmo_stream_srv_link 
*srv, int fd)
 {
-   void *ctx = talloc_named_const(NULL, 0, __func__);
+   void *ctx = osmo_stream_srv_link_get_data(srv);
struct osmo_stream_srv *oss =
osmo_stream_srv_create2(ctx, srv, fd, NULL);
if (oss == NULL) {
@@ -613,7 +618,7 @@
printf("Unable to open server\n");
exit(1);
}
-   osc = test_segm_ipa_stream_srv_run_client();
+   osc = test_segm_ipa_stream_srv_run_client(ctx);

printf("__Running test 
%s__\n", testname);
alarm(2);
@@ -714,7 +719,7 @@

 static int test_segm_ipa_stream_cli_srv_accept_cb(struct osmo_stream_srv_link 
*srv, int fd)
 {
-   void *ctx = talloc_named_const(NULL, 0, __func__);
+   void *ctx = osmo_stream_srv_link_get_data(srv);
struct osmo_stream_srv *oss =
osmo_stream_srv_create2(ctx, srv, fd, NULL);
unsigned char *data;
@@ -781,12 +786,10 @@
return 0;
 }

-static void *test_segm_ipa_stream_cli_run_client(void)
+static void *test_segm_ipa_stream_cli_run_client(void *ctx)
 {
struct osmo_stream_cli *osc;
-   void *ctx = talloc_named_const(NULL, 0, __func__);

-   (void) msgb_talloc_ctx_init(ctx, 0);
osc = osmo_stream_cli_create(ctx);
if (osc == NULL) {
fprintf(stderr, "osmo_stream_cli_create_iofd()\n");
@@ -795,7 +798,6 @@
osmo_stream_cli_set_addr(osc, "127.0.0.11");
osmo_stream_cli_set_local_port(osc, 8977);
osmo_stream_cli_set_port(osc, 1112);
-   osmo_stream_cli_set_data(osc, ctx);
osmo_stream_cli_set_read_cb2(osc, test_segm_ipa_stream_cli_cli_read_cb);
osmo_stream_cli_set_nodelay(osc, true);
osmo_stream_cli_set_segmentation_cb(osc, osmo_ipa_segmentation_cb);
@@ -818,7 +820,7 @@
printf("Unable to open server\n");
exit(1);
}
-   test_segm_ipa_stream_cli_run_client();
+   test_segm_ipa_stream_cli_run_client(ctx);

[M] Change in libosmo-netif[master]: stream_test: Fix memleaks

[arehbein]

arehbein has submitted this change. ( 
https://gerrit.osmocom.org/c/libosmo-netif/+/34793?usp=email )

Change subject: stream_test: Fix memleaks
..

stream_test: Fix memleaks

 - Clean up all allocations, introduce clean memory management to entire
   test

Related: OS#6222

Change-Id: Ica25fcd71e8bf8946def3ea7ce320354ea6edb3a
---
M tests/stream/stream_test.c
1 file changed, 47 insertions(+), 15 deletions(-)

Approvals:
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved
  Jenkins Builder: Verified




diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c
index 0851558..e50752b 100644
--- a/tests/stream/stream_test.c
+++ b/tests/stream/stream_test.c
@@ -121,6 +121,7 @@
osmo_stream_cli_set_data(cli, msg);
CLI_SND(cli, "Doh, responding to server :-D");
}
+   msgb_free(msg);

return 0;
 }
@@ -299,6 +300,7 @@
   than it must be subsequent (after reconnect) call */
request_test_stop(srv);
}
+   msgb_free(msg);
osmo_stream_srv_destroy(srv);
return -EINVAL;
} else {
@@ -505,14 +507,11 @@
unsigned char *data;
struct ipa_head *h = (struct ipa_head *) msg->l1h;
uint8_t ipac_msg_type = *msg->data;
-   struct msgb *reply = msgb_alloc_headroom(128, 0, "IPA reply");
-   if (reply == NULL) {
-   fprintf(stderr, "Cannot allocate message\n");
-   return -ENOMEM;
-   }
+   struct msgb *reply;
LOGCLI(osc, "Received message from stream (payload len = %" PRIu16 
")\n", msgb_length(msg));
if (ipac_msg_type < 0 || 5 < ipac_msg_type) {
fprintf(stderr, "Received unexpected IPAC message type 
%"PRIu8"\n", ipac_msg_type);
+   msgb_free(msg);
return -ENOMSG;
}
LOGCLI(osc, "\tType: %s\n", IPAC_MSG_TYPES[ipac_msg_type]);
@@ -520,6 +519,11 @@
LOGCLI(osc, "Got IPAC_MSGT_ID_GET from server\n");
LOGCLI(osc, "[(%u + 2/3) -cli] Appending: Second third of 
IPAC_MSGT_ID_GET\n",
   test_segm_ipa_stream_srv_msglognum_cli);
+   reply = msgb_alloc_headroom(128, 0, "IPA reply");
+   if (reply == NULL) {
+   fprintf(stderr, "Cannot allocate message\n");
+   return -ENOMEM;
+   }
data = msgb_put(reply, ipac_msg_idreq_third);
memcpy(data, ipac_msg_idreq + ipac_msg_idreq_third,
   ipac_msg_idreq_third);
@@ -535,15 +539,14 @@
LOGCLI(osc, "\texpected=%s\n",
   osmo_hexdump(ipac_msg_idresp, sizeof(ipac_msg_idresp)));
}
+   msgb_free(msg);
printf("\n");
return 0;
 }

 struct osmo_stream_cli *test_segm_ipa_stream_srv_run_client(void *ctx)
 {
-   struct osmo_stream_cli *osc;
-
-   osc = osmo_stream_cli_create(ctx);
+   struct osmo_stream_cli *osc = osmo_stream_cli_create(ctx);
if (osc == NULL) {
fprintf(stderr, "osmo_stream_cli_create_iofd()\n");
return NULL;
@@ -589,6 +592,7 @@
osmo_stream_srv_send(conn, m);
} else if (msgnum_srv == 7 && *msgt == IPAC_MSGT_PONG) {
test_segm_ipa_stream_srv_all_msgs_processed = true;
+   osmo_stream_srv_destroy(conn);
}
return 0;
 }
@@ -631,6 +635,7 @@
printf("==Test %s 
complete\n\n", testname);
if (osc)
osmo_stream_cli_destroy(osc);
+   osmo_stream_srv_link_close(srv);
 }

 static void sigalarm_handler(int _foo)
@@ -640,6 +645,7 @@
 }

 static struct osmo_timer_list fragmented_send_tl_srv;
+static struct osmo_timer_list fragmented_send_tl_srv_destroy;

 static unsigned test_segm_ipa_stream_cli_srv_msglognum = 0;

@@ -652,6 +658,11 @@
put_ipa_msg(UCHAR_PTR_DST, STRUCT_MSGB_PTR, SRC_IPAC_MSG_BUF);\
 } while (0)
 
+static void destroy_conn(void *osmo_stream_srv_arg)
+{
+   osmo_stream_srv_destroy(osmo_stream_srv_arg);
+}
+
 static void send_last_third_srv(void *osmo_stream_srv_arg)
 {
struct osmo_stream_srv *oss = osmo_stream_srv_arg;
@@ -675,6 +686,11 @@
"[ Last third of IPAC_MSGT_ID_GET | IPAC_MSGT_PONG | 
IPAC_MSGT_PONG ]\n");
LOGSRV(oss, "\t(msg dump: %s)\n\n", osmo_hexdump(reply->data, 
reply->len));
osmo_stream_srv_send(oss, reply);
+   osmo_timer_setup(_send_tl_srv_destroy, destroy_conn, oss);
+   osmo_timer_add(_send_tl_srv_destroy);
+   /* 2 select loop iterations needed, timing only 1 will leave the client 
side hanging while waiting
+* to receive the last messages */
+   osmo_timer_schedule(_send_tl_srv_destroy, 0, 2);
 }

 int 

[M] Change in osmocom-bb[master]: mobile: vty: rework support enable/disable commands

[jolly]

Attention is currently required from: fixeria.

jolly has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmocom-bb/+/34811?usp=email )

Change subject: mobile: vty: rework support enable/disable commands
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34811?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ibfef31f6dd7694dad535ad07fdf47bd32571b7b2
Gerrit-Change-Number: 34811
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria 
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: jolly 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Thu, 19 Oct 2023 13:02:02 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-ttcn3-hacks[master]: GTPv2_Templates: Several improvements to tr_GTP2C_CreateSessionReq

[fixeria]

Attention is currently required from: pespin.

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822?usp=email )

Change subject: GTPv2_Templates: Several improvements to 
tr_GTP2C_CreateSessionReq
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I6dd8cddcb986969d713ed7975a55cb31ab47c499
Gerrit-Change-Number: 34822
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Thu, 19 Oct 2023 12:14:32 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-ttcn3-hacks[master]: GTPv2_Templates: Fix sveral wrong ElementIdentifier

[fixeria]

Attention is currently required from: pespin.

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34820?usp=email )

Change subject: GTPv2_Templates: Fix sveral wrong ElementIdentifier
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34820?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Idea191cedd78768a3fef7a9958fda5c27f2859e1
Gerrit-Change-Number: 34820
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Thu, 19 Oct 2023 12:14:15 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-ttcn3-hacks[master]: GTPv2: Fix match of 15-digit IMSIs

[fixeria]

Attention is currently required from: pespin.

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34821?usp=email )

Change subject: GTPv2: Fix match of 15-digit IMSIs
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34821?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ie2f316ccb5bc69ec15e861616de4fd5babc4004e
Gerrit-Change-Number: 34821
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Thu, 19 Oct 2023 12:13:53 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in libgtpnl[master]: gtp-genl: allocate room for maximum IPv6 address

[osmith]

osmith has submitted this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34738?usp=email )

 (

1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted 
one.
 )Change subject: gtp-genl: allocate room for maximum IPv6 address
..

gtp-genl: allocate room for maximum IPv6 address

Otherwise, inet_ntop() might return ENOSPC because of the buffer
being too small to accomodate an IPv6 address.

Change-Id: I2283e0c3112bec8e6e7e7b5c96657facc09d0a7a
---
M src/gtp-genl.c
1 file changed, 13 insertions(+), 1 deletion(-)

Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified
  laforge: Looks good to me, approved




diff --git a/src/gtp-genl.c b/src/gtp-genl.c
index b8edc72..9c9e8d3 100644
--- a/src/gtp-genl.c
+++ b/src/gtp-genl.c
@@ -155,7 +155,7 @@
 static int genl_gtp_attr_cb(const struct nlmsghdr *nlh, void *data)
 {
struct nlattr *tb[GTPA_MAX + 1] = {};
-   char buf[INET_ADDRSTRLEN];
+   char buf[INET6_ADDRSTRLEN];
struct gtp_pdp pdp = {};
struct genlmsghdr *genl;


--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34738?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: I2283e0c3112bec8e6e7e7b5c96657facc09d0a7a
Gerrit-Change-Number: 34738
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[M] Change in osmocom-bb[master]: mobile: vty: rework support enable/disable commands

[pespin]

Attention is currently required from: fixeria, jolly.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmocom-bb/+/34811?usp=email )

Change subject: mobile: vty: rework support enable/disable commands
..


Patch Set 1: Code-Review+1

(1 comment)

File src/host/layer23/src/mobile/vty_interface.c:

https://gerrit.osmocom.org/c/osmocom-bb/+/34811/comment/bbfaa42c_19e2da88
PS1, Line 2019: struct osmocom_ms *ms = vty->index; \
Did you think about having all this code in a single helper function where you 
pass a bool* to it? This way we'd avoid tons of functions duplicating code.



--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34811?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ibfef31f6dd7694dad535ad07fdf47bd32571b7b2
Gerrit-Change-Number: 34811
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria 
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: jolly 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: jolly 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Thu, 19 Oct 2023 11:48:55 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-ttcn3-hacks[master]: GTPv2_Templates: Several improvements to tr_GTP2C_CreateSessionReq

[pespin]

pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822?usp=email )


Change subject: GTPv2_Templates: Several improvements to 
tr_GTP2C_CreateSessionReq
..

GTPv2_Templates: Several improvements to tr_GTP2C_CreateSessionReq

Change-Id: I6dd8cddcb986969d713ed7975a55cb31ab47c499
---
M library/GTPv2_Templates.ttcn
1 file changed, 20 insertions(+), 11 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/22/34822/1

diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn
index e5022d8..753774d 100644
--- a/library/GTPv2_Templates.ttcn
+++ b/library/GTPv2_Templates.ttcn
@@ -740,38 +740,38 @@


 template (present) PDU_GTPCv2
-tr_GTP2C_CreateSessionReq(template (present) hexstring imsi) :=
+tr_GTP2C_CreateSessionReq(template (present) hexstring imsi := ?, template 
(present) octetstring apn := ?) :=
 tr_PDU_GTP2C(''O, ?, {
createSessionRequest := {
iMSI := tr_GTP2C_Imsi(imsi),
mSISDN := *,
mEI := *,
-   userLocationInfo := ?,
-   servingNetwork := ?,
-   rAT_Type := tr_GTP2C_RatType(6),
+   userLocationInfo := *,
+   servingNetwork := *,
+   rAT_Type := tr_GTP2C_RatType(?),
indication := *,
fullyQualifiedTEID := ?,
-   accessPointName := tr_GTP2C_APN('012a'O), // '*'
+   accessPointName := tr_GTP2C_APN(apn), // '*'
selectionMode := ?,
-   pDN_Type := ?,
+   pDN_Type := *,
pDN_AddressAllocation := ?,
-   maxAPN_Restriction := ?,
+   maxAPN_Restriction := *,
ambr := *,
linkedEPS_Bearer_ID := omit,
trustedWLANModeIndication := omit,
protocolConfigOptions := omit,
bearerContextGrouped := ?,
traceInformation := *,
-   recovery := omit,
+   recovery := *,
csid := omit,
-   uE_TimeZone := ?,
+   uE_TimeZone := *,
user_CSG_Information := omit,
-   chargingCharacteristics := ?,
+   chargingCharacteristics := *,
lDN := omit,
signallingPriorityIndication := *,
iP_Addr := omit,
portNumber := omit,
-   aPCO := omit,
+   aPCO := *,
trustedWLANAccessNetworkIdentifier := omit,
cNOperatorSelectionEntity := omit,
presenceReportingAreaInformation := omit,

--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I6dd8cddcb986969d713ed7975a55cb31ab47c499
Gerrit-Change-Number: 34822
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-MessageType: newchange

[S] Change in osmo-ttcn3-hacks[master]: GTPv2: Fix match of 15-digit IMSIs

[pespin]

pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34821?usp=email )


Change subject: GTPv2: Fix match of 15-digit IMSIs
..

GTPv2: Fix match of 15-digit IMSIs

15-digit IMSIs are len(imsi)=15, but decoded messages are
octet-aligned, hence the hexstring in messages is len(imsi)=16,
where the last hex char is a padding 'F'H.

* Make sure IMSIs stored in GTPv2_Emulation are padded to 16 digits (8
  octets) to process matches easily.
* Update tr_ template to transparently adapt passed hexstrings to match
  the octet-aligned value received from the wire.

Change-Id: Ie2f316ccb5bc69ec15e861616de4fd5babc4004e
---
M library/GTPv2_Emulation.ttcn
M library/GTPv2_Templates.ttcn
M library/Osmocom_Types.ttcn
3 files changed, 35 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/21/34821/1

diff --git a/library/GTPv2_Emulation.ttcn b/library/GTPv2_Emulation.ttcn
index 571da4e..736dd03 100644
--- a/library/GTPv2_Emulation.ttcn
+++ b/library/GTPv2_Emulation.ttcn
@@ -602,6 +602,10 @@
 };

 function f_gtp2_register_imsi(hexstring imsi) runs on GTP2_ConnHdlr {
+   /* 15-digit IMSIs are len(imsi)=15, but decoded messages are
+* octet-aligned, hence the hexstring in messages is len(imsi)=16, where
+* the last hex char is a padding 'F'H */
+   imsi := f_pad_bcd_number(imsi);
GTP2_PROC.call(GTP2EM_register_imsi:{imsi}) {
[] GTP2_PROC.getreply(GTP2EM_register_imsi:{imsi});
}
diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn
index b306955..e5022d8 100644
--- a/library/GTPv2_Templates.ttcn
+++ b/library/GTPv2_Templates.ttcn
@@ -126,7 +126,7 @@
lengthIndicator := ?,
instance := ?,
spare := ''B,
-   iMSI_Value := imsi
+   iMSI_Value := f_pad_bcd_number_tmpl(imsi)
 }

 template (present) MSISDN ts_GTP2C_msisdn(template (present) hexstring msisdn) 
:= {
diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn
index ef55583..d034a74 100644
--- a/library/Osmocom_Types.ttcn
+++ b/library/Osmocom_Types.ttcn
@@ -261,6 +261,18 @@
}
 }

+function f_pad_bcd_number_tmpl(template hexstring inp) return template 
hexstring {
+   if (istemplatekind(inp, "omit")) {
+   return omit;
+   } else if (istemplatekind(inp, "*")) {
+   return *;
+   } else if (istemplatekind(inp, "?")) {
+   return ?;
+   } else {
+   return f_pad_bcd_number(valueof(inp));
+   }
+}
+
 /* like L1SAP_IS_PACKET_RACH */
 function ra_is_ps(OCT1 ra) return boolean {
if ((ra and4b 'F0'O == '70'O) and (ra and4b '0F'O != '0F'O)) {

--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34821?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ie2f316ccb5bc69ec15e861616de4fd5babc4004e
Gerrit-Change-Number: 34821
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-MessageType: newchange

[S] Change in osmo-ttcn3-hacks[master]: GTPv2_Templates: Fix sveral wrong ElementIdentifier

[pespin]

pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34820?usp=email )


Change subject: GTPv2_Templates: Fix sveral wrong ElementIdentifier
..

GTPv2_Templates: Fix sveral wrong ElementIdentifier

Change-Id: Idea191cedd78768a3fef7a9958fda5c27f2859e1
---
M library/GTPv2_Templates.ttcn
1 file changed, 14 insertions(+), 5 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/20/34820/1

diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn
index 644728e..b306955 100644
--- a/library/GTPv2_Templates.ttcn
+++ b/library/GTPv2_Templates.ttcn
@@ -213,16 +213,16 @@
 }

 
-/* 8.5 */
+/* 8.6 */
 template (value) AccessPointName ts_GTP2C_APN(template (value) octetstring 
apn) := {
-   elementIdentifier := '48'O,
+   elementIdentifier := '47'O,
lengthIndicator := 0, /* overwritten */
instance := ''B,
spare := ''B,
aPN_Value := apn
 }
 template (present) AccessPointName tr_GTP2C_APN(template (present) octetstring 
apn) := {
-   elementIdentifier := '48'O,
+   elementIdentifier := '47'O,
lengthIndicator := ?,
instance := ?,
spare := ''B,
@@ -321,7 +321,7 @@

 /* 8.17 */
 template (value) RAT_Type ts_GTP2C_RatType(template (value) integer rat) := {
-   elementIdentifier := '53'O,
+   elementIdentifier := '52'O,
lengthIndicator := 0, /* overwritten */
instance := ''B,
spare := ''B,
@@ -329,7 +329,7 @@
additionalOctets := omit
 }
 template (present) RAT_Type tr_GTP2C_RatType(template (present) integer rat) 
:= {
-   elementIdentifier := '53'O,
+   elementIdentifier := '52'O,
lengthIndicator := ?,
instance := ?,
spare := ''B,

--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34820?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Idea191cedd78768a3fef7a9958fda5c27f2859e1
Gerrit-Change-Number: 34820
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-MessageType: newchange

[M] Change in osmocom-bb[master]: mobile: vty: rework support enable/disable commands

[fixeria]

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmocom-bb/+/34811?usp=email )

Change subject: mobile: vty: rework support enable/disable commands
..


Patch Set 1: Verified+1


--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34811?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ibfef31f6dd7694dad535ad07fdf47bd32571b7b2
Gerrit-Change-Number: 34811
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria 
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Comment-Date: Thu, 19 Oct 2023 11:35:09 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmocom-bb[master]: mobile: vty: rework support enable/disable commands

[fixeria]

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmocom-bb/+/34811?usp=email )

Change subject: mobile: vty: rework support enable/disable commands
..


Patch Set 1:

(1 comment)

Patchset:

PS1:
We cannot use `do-while(0)` here because these macros are used outside of 
functions.



--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34811?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ibfef31f6dd7694dad535ad07fdf47bd32571b7b2
Gerrit-Change-Number: 34811
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Comment-Date: Thu, 19 Oct 2023 11:34:54 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

[M] Change in osmocom-bb[master]: mobile: improve handling of Bearer Capability IE for MT calls

[fixeria]

fixeria has submitted this change. ( 
https://gerrit.osmocom.org/c/osmocom-bb/+/34810?usp=email )

Change subject: mobile: improve handling of Bearer Capability IE for MT calls
..

mobile: improve handling of Bearer Capability IE for MT calls

This patch prepares for adding MT data call support:

* Move handling of the Bearer Capability IE into a function.
* Check transfer mode and coding standard in the received BCap.

Change-Id: I3a5cac8c35ba6b7bdc5fcb077690b32848747756
Related: OS#4396
---
M src/host/layer23/src/mobile/mnccms.c
1 file changed, 133 insertions(+), 58 deletions(-)

Approvals:
  fixeria: Looks good to me, approved
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified




diff --git a/src/host/layer23/src/mobile/mnccms.c 
b/src/host/layer23/src/mobile/mnccms.c
index be43afa..d23fbb7 100644
--- a/src/host/layer23/src/mobile/mnccms.c
+++ b/src/host/layer23/src/mobile/mnccms.c
@@ -192,6 +192,119 @@
mncc->bearer_cap.mode = GSM48_BCAP_TMOD_CIRCUIT;
 }

+/* Check the given Bearer Capability, select first supported speech codec 
version.
+ * The choice between half-rate and full-rate is made based on current 
settings.
+ * Return a selected codec or -1 if no speech codec was selected. */
+static int mncc_handle_bcap_speech(const struct gsm_mncc_bearer_cap *bcap,
+  const struct gsm_settings *set)
+{
+   int speech_ver_half = -1;
+   int speech_ver = -1;
+
+   for (unsigned int i = 0; bcap->speech_ver[i] >= 0; i++) {
+   int temp = mncc_get_bearer(set, bcap->speech_ver[i]);
+   switch (temp) {
+   case GSM48_BCAP_SV_AMR_H:
+   case GSM48_BCAP_SV_HR:
+   /* only the first half rate */
+   if (speech_ver_half < 0)
+   speech_ver_half = temp;
+   break;
+   default:
+   if (temp < 0)
+   continue;
+   /* only the first full rate */
+   if (speech_ver < 0)
+   speech_ver = temp;
+   break;
+   }
+   }
+
+   /* half and full given */
+   if (speech_ver_half >= 0 && speech_ver >= 0) {
+   if (set->half_prefer) {
+   LOGP(DMNCC, LOGL_INFO, " both supported"
+   " codec rates are given, using "
+   "preferred half rate\n");
+   speech_ver = speech_ver_half;
+   } else {
+   LOGP(DMNCC, LOGL_INFO, " both supported"
+   " codec rates are given, using "
+   "preferred full rate\n");
+   }
+   } else if (speech_ver_half < 0 && speech_ver < 0) {
+   LOGP(DMNCC, LOGL_INFO, " no supported codec "
+   "rate is given\n");
+   /* only half rate is given, use it */
+   } else if (speech_ver_half >= 0) {
+   LOGP(DMNCC, LOGL_INFO, " only supported half "
+   "rate codec is given, using it\n");
+   speech_ver = speech_ver_half;
+   /* only full rate is given, use it */
+   } else {
+   LOGP(DMNCC, LOGL_INFO, " only supported full "
+   "rate codec is given, using it\n");
+   }
+
+   return speech_ver;
+}
+
+static int mncc_handle_bcap(struct gsm_mncc *mncc_out, /* CC Call 
Confirmed */
+   const struct gsm_mncc *mncc_in, /* CC Setup */
+   const struct gsm_settings *set)
+{
+   const struct gsm_mncc_bearer_cap *bcap = _in->bearer_cap;
+
+   /* 3GPP TS 24.008, section 9.3.2.2 defines several cases in which the
+* Bearer Capability 1 IE is to be included, provided that at least
+* one of these conditions is met. */
+
+   /* if the Bearer Capability 1 IE is not present */
+   if (~mncc_in->fields & MNCC_F_BEARER_CAP) {
+   /* ... include our own Bearer Capability, assuming a speech 
call */
+   mncc_set_bearer(mncc_out, set, -1);
+   return 0;
+   }
+
+   if (bcap->mode != GSM48_BCAP_TMOD_CIRCUIT) {
+   LOGP(DMNCC, LOGL_ERROR,
+"%s(): Transfer mode 0x%02x is not supported\n",
+__func__, bcap->mode);
+   return -ENOTSUP;
+   }
+   if (bcap->coding != GSM48_BCAP_CODING_GSM_STD) {
+   LOGP(DMNCC, LOGL_ERROR,
+"%s(): Coding standard 0x%02x is not supported\n",
+__func__, bcap->coding);
+   return -ENOTSUP;
+   }
+
+   switch (bcap->transfer) {
+   case GSM48_BCAP_ITCAP_SPEECH:
+   {
+  

[M] Change in libgtpnl[master]: add IPv6 support

[osmith]

Attention is currently required from: laforge, pespin.

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libgtpnl/+/34735?usp=email )

Change subject: add IPv6 support
..


Patch Set 1:

(1 comment)

File include/linux/gtp.h:

https://gerrit.osmocom.org/c/libgtpnl/+/34735/comment/7b451764_ac0e0c1d
PS1, Line 27: #define GTPA_SGSN_ADDRESS GTPA_PEER_ADDRESS /* maintain legacy 
attr name */
> The kernel code used to call it GTPA_SGSN_ADDRESS initially at the time the 
> kernel GTP only supporte […]
I also found it confusing without laforge's explanation above. I'll split it 
into a separate patch with a commit message that explains it.



--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34735?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libgtpnl
Gerrit-Branch: master
Gerrit-Change-Id: If864c9170f74af52a95cbc4cdb1b866e0309306b
Gerrit-Change-Number: 34735
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge 
Gerrit-CC: pespin 
Gerrit-Attention: laforge 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Thu, 19 Oct 2023 10:51:56 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge 
Comment-In-Reply-To: pespin 
Gerrit-MessageType: comment

[M] Change in osmocom-bb[master]: mobile: mnccms: use constants from libosmogsm (gsm_04_08.h)

[fixeria]

fixeria has submitted this change. ( 
https://gerrit.osmocom.org/c/osmocom-bb/+/34807?usp=email )

Change subject: mobile: mnccms: use constants from libosmogsm (gsm_04_08.h)
..

mobile: mnccms: use constants from libosmogsm (gsm_04_08.h)

Change-Id: I5ce59db39ad865620aaed2d778bc3710cf37bc3b
Related: OS#4396
---
M src/host/layer23/src/mobile/mnccms.c
1 file changed, 37 insertions(+), 24 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve




diff --git a/src/host/layer23/src/mobile/mnccms.c 
b/src/host/layer23/src/mobile/mnccms.c
index a068ee9..c20dd7a 100644
--- a/src/host/layer23/src/mobile/mnccms.c
+++ b/src/host/layer23/src/mobile/mnccms.c
@@ -22,6 +22,7 @@
 #include 

 #include 
+#include 

 #include 
 #include 
@@ -84,7 +85,7 @@
 static int8_t mncc_get_bearer(struct gsm_settings *set, uint8_t speech_ver)
 {
switch (speech_ver) {
-   case 4:
+   case GSM48_BCAP_SV_AMR_F:
if (set->full_v3)
LOGP(DMNCC, LOGL_INFO, " net suggests full rate v3\n");
else {
@@ -92,7 +93,7 @@
speech_ver = -1;
}
break;
-   case 2:
+   case GSM48_BCAP_SV_EFR:
if (set->full_v2)
LOGP(DMNCC, LOGL_INFO, " net suggests full rate v2\n");
else {
@@ -100,7 +101,7 @@
speech_ver = -1;
}
break;
-   case 0: /* mandatory */
+   case GSM48_BCAP_SV_FR: /* mandatory */
if (set->full_v1)
LOGP(DMNCC, LOGL_INFO, " net suggests full rate v1\n");
else {
@@ -108,7 +109,7 @@
speech_ver = -1;
}
break;
-   case 5:
+   case GSM48_BCAP_SV_AMR_H:
if (set->half_v3)
LOGP(DMNCC, LOGL_INFO, " net suggests half rate v3\n");
else {
@@ -116,7 +117,7 @@
speech_ver = -1;
}
break;
-   case 1:
+   case GSM48_BCAP_SV_HR:
if (set->half_v1)
LOGP(DMNCC, LOGL_INFO, " net suggests half rate v1\n");
else {
@@ -140,13 +141,13 @@
int i = 0;

mncc->fields |= MNCC_F_BEARER_CAP;
-   mncc->bearer_cap.coding = 0;
+   mncc->bearer_cap.coding = GSM48_BCAP_CODING_GSM_STD;
if (set->ch_cap == GSM_CAP_SDCCH_TCHF_TCHH
 && (set->half_v1 || set->half_v3)) {
-   mncc->bearer_cap.radio = 3;
+   mncc->bearer_cap.radio = GSM48_BCAP_RRQ_DUAL_FR;
LOGP(DMNCC, LOGL_INFO, " support TCH/H also\n");
} else {
-   mncc->bearer_cap.radio = 1;
+   mncc->bearer_cap.radio = GSM48_BCAP_RRQ_FR_ONLY;
LOGP(DMNCC, LOGL_INFO, " support TCH/F only\n");
}
mncc->bearer_cap.speech_ctm = 0;
@@ -154,41 +155,41 @@
if (speech_ver < 0) {
/* if half rate is supported and preferred */
if (set->half_v3 && set->half && set->half_prefer) {
-   mncc->bearer_cap.speech_ver[i++] = 5;
+   mncc->bearer_cap.speech_ver[i++] = GSM48_BCAP_SV_AMR_H;
LOGP(DMNCC, LOGL_INFO, " support half rate v3\n");
}
if (set->half_v1 && set->half && set->half_prefer) {
-   mncc->bearer_cap.speech_ver[i++] = 1;
+   mncc->bearer_cap.speech_ver[i++] = GSM48_BCAP_SV_HR;
LOGP(DMNCC, LOGL_INFO, " support half rate v1\n");
}
/* if full rate is supported */
if (set->full_v3) {
-   mncc->bearer_cap.speech_ver[i++] = 4;
+   mncc->bearer_cap.speech_ver[i++] = GSM48_BCAP_SV_AMR_F;
LOGP(DMNCC, LOGL_INFO, " support full rate v3\n");
}
if (set->full_v2) {
-   mncc->bearer_cap.speech_ver[i++] = 2;
+   mncc->bearer_cap.speech_ver[i++] = GSM48_BCAP_SV_EFR;
LOGP(DMNCC, LOGL_INFO, " support full rate v2\n");
}
if (set->full_v1) { /* mandatory, so it's always true */
-   mncc->bearer_cap.speech_ver[i++] = 0;
+   mncc->bearer_cap.speech_ver[i++] = GSM48_BCAP_SV_FR;
LOGP(DMNCC, LOGL_INFO, " support full rate v1\n");
}
/* if half rate is supported and not preferred */
if (set->half_v3 && set->half && !set->half_prefer) {
-   mncc->bearer_cap.speech_ver[i++] = 5;
+   mncc->bearer_cap.speech_ver[i++] = GSM48_BCAP_SV_AMR_H;

[S] Change in osmocom-bb[master]: mobile: fix mncc_get_bearer(): return -1 straightaway

[fixeria]

fixeria has submitted this change. ( 
https://gerrit.osmocom.org/c/osmocom-bb/+/34809?usp=email )

Change subject: mobile: fix mncc_get_bearer(): return -1 straightaway
..

mobile: fix mncc_get_bearer(): return -1 straightaway

Even though the function works as expected and *can* return -1,
which is first casted to unsigned and then back to signed, let's
make the code less confusing by returning -1 straightaway.

Change-Id: I3206fcfa9ab4cac85a1f0f2a4de3250b25f9058f
Related: OS#4396
---
M src/host/layer23/src/mobile/mnccms.c
1 file changed, 20 insertions(+), 6 deletions(-)

Approvals:
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved
  Jenkins Builder: Verified




diff --git a/src/host/layer23/src/mobile/mnccms.c 
b/src/host/layer23/src/mobile/mnccms.c
index b173946..be43afa 100644
--- a/src/host/layer23/src/mobile/mnccms.c
+++ b/src/host/layer23/src/mobile/mnccms.c
@@ -90,7 +90,7 @@
LOGP(DMNCC, LOGL_INFO, " net suggests full rate v3\n");
else {
LOGP(DMNCC, LOGL_INFO, " full rate v3 not supported\n");
-   speech_ver = -1;
+   return -1;
}
break;
case GSM48_BCAP_SV_EFR:
@@ -98,7 +98,7 @@
LOGP(DMNCC, LOGL_INFO, " net suggests full rate v2\n");
else {
LOGP(DMNCC, LOGL_INFO, " full rate v2 not supported\n");
-   speech_ver = -1;
+   return -1;
}
break;
case GSM48_BCAP_SV_FR: /* mandatory */
@@ -106,7 +106,7 @@
LOGP(DMNCC, LOGL_INFO, " net suggests full rate v1\n");
else {
LOGP(DMNCC, LOGL_INFO, " full rate v1 not supported\n");
-   speech_ver = -1;
+   return -1;
}
break;
case GSM48_BCAP_SV_AMR_H:
@@ -114,7 +114,7 @@
LOGP(DMNCC, LOGL_INFO, " net suggests half rate v3\n");
else {
LOGP(DMNCC, LOGL_INFO, " half rate v3 not supported\n");
-   speech_ver = -1;
+   return -1;
}
break;
case GSM48_BCAP_SV_HR:
@@ -122,13 +122,13 @@
LOGP(DMNCC, LOGL_INFO, " net suggests half rate v1\n");
else {
LOGP(DMNCC, LOGL_INFO, " half rate v1 not supported\n");
-   speech_ver = -1;
+   return -1;
}
break;
default:
LOGP(DMNCC, LOGL_INFO, " net suggests unknown speech version "
"%d\n", speech_ver);
-   speech_ver = -1;
+   return -1;
}

return speech_ver;

--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34809?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I3206fcfa9ab4cac85a1f0f2a4de3250b25f9058f
Gerrit-Change-Number: 34809
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[S] Change in osmocom-bb[master]: mobile: cosmetic: improve mncc_{get,set}_bearer()

[fixeria]

fixeria has submitted this change. ( 
https://gerrit.osmocom.org/c/osmocom-bb/+/34808?usp=email )

Change subject: mobile: cosmetic: improve mncc_{get,set}_bearer()
..

mobile: cosmetic: improve mncc_{get,set}_bearer()

Change-Id: I5647bdf58cbf58065dbe8eebe16f330d98fd0d22
Related: OS#4396
---
M src/host/layer23/src/mobile/mnccms.c
1 file changed, 18 insertions(+), 8 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve




diff --git a/src/host/layer23/src/mobile/mnccms.c 
b/src/host/layer23/src/mobile/mnccms.c
index c20dd7a..b173946 100644
--- a/src/host/layer23/src/mobile/mnccms.c
+++ b/src/host/layer23/src/mobile/mnccms.c
@@ -82,7 +82,7 @@
return NULL;
 }

-static int8_t mncc_get_bearer(struct gsm_settings *set, uint8_t speech_ver)
+static int8_t mncc_get_bearer(const struct gsm_settings *set, uint8_t 
speech_ver)
 {
switch (speech_ver) {
case GSM48_BCAP_SV_AMR_F:
@@ -134,10 +134,10 @@
return speech_ver;
 }

-static void mncc_set_bearer(struct osmocom_ms *ms, int8_t speech_ver,
-   struct gsm_mncc *mncc)
+static void mncc_set_bearer(struct gsm_mncc *mncc,
+   const struct gsm_settings *set,
+   int8_t speech_ver)
 {
-   struct gsm_settings *set = >settings;
int i = 0;

mncc->fields |= MNCC_F_BEARER_CAP;
@@ -259,7 +259,7 @@

 int mncc_recv_internal(struct osmocom_ms *ms, int msg_type, void *arg)
 {
-   struct gsm_settings *set = >settings;
+   const struct gsm_settings *set = >settings;
const struct gsm_mncc *data = arg;
struct gsm_call *call = get_call_ref(data->callref);
struct gsm_mncc mncc;
@@ -466,10 +466,10 @@
 * or if given codec is unimplemented
 */
if (!(data->fields & MNCC_F_BEARER_CAP) || speech_ver < 0)
-   mncc_set_bearer(ms, -1, );
+   mncc_set_bearer(, set, -1);
else if (data->bearer_cap.speech_ver[1] >= 0
  || speech_ver != 0)
-   mncc_set_bearer(ms, speech_ver, );
+   mncc_set_bearer(, set, speech_ver);
/* CC capabilities (optional) */
if (ms->settings.cc_dtmf) {
mncc.fields |= MNCC_F_CCCAP;
@@ -580,7 +580,7 @@
OSMO_STRLCPY_ARRAY(setup.called.number, number);

/* bearer capability (mandatory) */
-   mncc_set_bearer(ms, -1, );
+   mncc_set_bearer(, >settings, -1);

/* CLIR */
if (ms->settings.clir)

-- 
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34808?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I5647bdf58cbf58065dbe8eebe16f330d98fd0d22
Gerrit-Change-Number: 34808
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[M] Change in osmocom-bb[master]: mobile: improve handling of Bearer Capability IE for MT calls

[fixeria]

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmocom-bb/+/34810?usp=email )

Change subject: mobile: improve handling of Bearer Capability IE for MT calls
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34810?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I3a5cac8c35ba6b7bdc5fcb077690b32848747756
Gerrit-Change-Number: 34810
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Thu, 19 Oct 2023 10:51:29 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-ci[master]: scripts/tarballs: create release dir if missing

[pespin]

Attention is currently required from: laforge, osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34819?usp=email )

Change subject: scripts/tarballs: create release dir if missing
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34819?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I46310d633302028d486dd356147c9c4f35b24940
Gerrit-Change-Number: 34819
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Attention: laforge 
Gerrit-Comment-Date: Thu, 19 Oct 2023 09:51:59 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-ci[master]: scripts/tarballs: create release dir if missing

[osmith]

osmith has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34819?usp=email )


Change subject: scripts/tarballs: create release dir if missing
..

scripts/tarballs: create release dir if missing

Fix for:
rsync: [Receiver] change_dir#3 "/downloads/home/releases/web-files/gapk" 
failed: No such file or directory (2)

Change-Id: I46310d633302028d486dd356147c9c4f35b24940
---
M scripts/tarballs/publish-tarballs-for-tags.sh
1 file changed, 13 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/19/34819/1

diff --git a/scripts/tarballs/publish-tarballs-for-tags.sh 
b/scripts/tarballs/publish-tarballs-for-tags.sh
index e3dbf5b..c185c21 100755
--- a/scripts/tarballs/publish-tarballs-for-tags.sh
+++ b/scripts/tarballs/publish-tarballs-for-tags.sh
@@ -290,6 +290,7 @@
return
fi

+   $SSH_COMMAND relea...@ftp.osmocom.org -- mkdir -p "$WEB_PATH/$repo"
rsync -vz -e "$SSH_COMMAND" "$tarball_path" $tarball_path_remote
 }


--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34819?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I46310d633302028d486dd356147c9c4f35b24940
Gerrit-Change-Number: 34819
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[S] Change in osmo-ci[master]: scripts/tarballs: add osmo-fl2k, rtl-sdr

[osmith]

osmith has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34818?usp=email )

Change subject: scripts/tarballs: add osmo-fl2k, rtl-sdr
..

scripts/tarballs: add osmo-fl2k, rtl-sdr

Closes: OS#6226, OS#6225
Change-Id: Idff299c65902b6818e409a409a3d303e8fccc4f9
---
M scripts/common.sh
M scripts/tarballs/publish-tarballs-for-tags.sh
2 files changed, 13 insertions(+), 1 deletion(-)

Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve




diff --git a/scripts/common.sh b/scripts/common.sh
index 194feff..2bca384 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -80,7 +80,7 @@
local url ret pattern

case "$project" in
-   gapk)
+   gapk|osmo-fl2k)
pattern='refs/tags/v[0-9.]*$'
;;
*)
diff --git a/scripts/tarballs/publish-tarballs-for-tags.sh 
b/scripts/tarballs/publish-tarballs-for-tags.sh
index 26e949f..e3dbf5b 100755
--- a/scripts/tarballs/publish-tarballs-for-tags.sh
+++ b/scripts/tarballs/publish-tarballs-for-tags.sh
@@ -23,6 +23,7 @@
osmo-cbc
osmo-e1-recorder
osmo-e1d
+   osmo-fl2k
osmo-gbproxy
osmo-ggsn
osmo-gsm-manuals
@@ -42,6 +43,7 @@
osmo-trx
osmo-uecups
osmocom-bb
+   rtl-sdr
simtrace2
 "


--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34818?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Idff299c65902b6818e409a409a3d303e8fccc4f9
Gerrit-Change-Number: 34818
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[M] Change in osmo-ci[master]: scripts/tarballs: add gapk

[osmith]

osmith has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34817?usp=email )

Change subject: scripts/tarballs: add gapk
..

scripts/tarballs: add gapk

Closes: OS#6227
Change-Id: I6f26b6f5953701b383acb3b93058b66a286f7989
---
M scripts/common.sh
A scripts/tarballs/prefer-configure.sh
M scripts/tarballs/publish-tarballs-for-tags.sh
3 files changed, 48 insertions(+), 3 deletions(-)

Approvals:
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve
  osmith: Looks good to me, approved




diff --git a/scripts/common.sh b/scripts/common.sh
index 8099499..194feff 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -77,11 +77,20 @@
local project="$1"
local amount="$2"
local default_str="$3"
-   local url ret
+   local url ret pattern
+
+   case "$project" in
+   gapk)
+   pattern='refs/tags/v[0-9.]*$'
+   ;;
+   *)
+   pattern='refs/tags/[0-9.]*$'
+   ;;
+   esac

url="$(osmo_git_clone_url "$project")"
ret="$(git ls-remote --tags "$url")"
-   ret="$(echo "$ret" | grep 'refs/tags/[0-9.]*$' || true)"
+   ret="$(echo "$ret" | grep "$pattern" || true)"
ret="$(echo "$ret" | sort -V -t/ -k3)"
if [ "$amount" != "all" ]; then
ret="$(echo "$ret" | tail -n "$amount")"
diff --git a/scripts/tarballs/prefer-configure.sh 
b/scripts/tarballs/prefer-configure.sh
new file mode 100755
index 000..f9f8613
--- /dev/null
+++ b/scripts/tarballs/prefer-configure.sh
@@ -0,0 +1,25 @@
+#!/bin/sh -ex
+# Decide whether to build a tarball from autotools logic (exit 0) or by
+# creating a simple git archive (exit 1)
+
+PROJECT="$1"
+TAG="$2"
+
+if ! [ -e configure.ac ]; then
+   exit 1
+fi
+
+case "$PROJECT" in
+gapk)
+   # Running gapk's configure involves running libgsmhr/fetch_sources.py,
+   # which according to git log doesn't really work unless using the
+   # version from master and it looks like we don't want to distribute
+   # these sources directly... or else we should just add them to the git
+   # repository and not rely on downloading a remote archive that may just
+   # change at any time. So create a simple git archive instead.
+   exit 1
+   ;;
+*)
+   exit 0
+   ;;
+esac
diff --git a/scripts/tarballs/publish-tarballs-for-tags.sh 
b/scripts/tarballs/publish-tarballs-for-tags.sh
index 3cd8a15..26e949f 100755
--- a/scripts/tarballs/publish-tarballs-for-tags.sh
+++ b/scripts/tarballs/publish-tarballs-for-tags.sh
@@ -8,6 +8,7 @@
 LOG_PREFIX="::"

 OSMO_RELEASE_REPOS="
+   gapk
libasn1c
libgtpnl
libosmo-abis
@@ -237,7 +238,7 @@

cd /src/$project_path

-   if [ -e configure.ac ]; then
+   if /tarballs/prefer-configure.sh \"$repo\" \"$tag\"; 
then
su build -c \"autoreconf -fi\"
case \"$repo\" in
osmo-trx)

--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34817?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I6f26b6f5953701b383acb3b93058b66a286f7989
Gerrit-Change-Number: 34817
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[S] Change in osmo-ci[master]: scripts/common: osmo git last commit…: add vars

[osmith]

osmith has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34816?usp=email )

Change subject: scripts/common: osmo_git_last_commit…: add vars
..

scripts/common: osmo_git_last_commit…: add vars

Add variable names for $1, $2, $3 so the logic is easier to follow.

Related: OS#6227
Change-Id: I7abbcefc8d5bd4c5b84c30a7e38ca3dcb855dd56
---
M scripts/common.sh
1 file changed, 20 insertions(+), 4 deletions(-)

Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve




diff --git a/scripts/common.sh b/scripts/common.sh
index 72be4fc..8099499 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -74,19 +74,23 @@
# ee618ecbedec82dfd240334bc87d0d1c806477b0
refs/tags/debian/0.9.13-0_jrsantos.1
# a3fdd24af099b449c9856422eb099fb45a5595df
refs/tags/debian/0.9.13-0_jrsantos.1^{}
# ...
+   local project="$1"
+   local amount="$2"
+   local default_str="$3"
local url ret
-   url="$(osmo_git_clone_url "$1")"
+
+   url="$(osmo_git_clone_url "$project")"
ret="$(git ls-remote --tags "$url")"
ret="$(echo "$ret" | grep 'refs/tags/[0-9.]*$' || true)"
ret="$(echo "$ret" | sort -V -t/ -k3)"
-   if [ "$2" != "all" ]; then
-   ret="$(echo "$ret" | tail -n "$2")"
+   if [ "$amount" != "all" ]; then
+   ret="$(echo "$ret" | tail -n "$amount")"
fi

if [ -n "$ret" ]; then
echo "$ret"
else
-   echo "$3"
+   echo "$default_str"
fi
 }


--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34816?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I7abbcefc8d5bd4c5b84c30a7e38ca3dcb855dd56
Gerrit-Change-Number: 34816
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[S] Change in osmo-ci[master]: scripts/tarballs: add osmo-e1-recorder

[osmith]

osmith has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34815?usp=email )

Change subject: scripts/tarballs: add osmo-e1-recorder
..

scripts/tarballs: add osmo-e1-recorder

Closes: OS#6228
Change-Id: I6bd8387f99c258226125b33705645c43aadd875f
---
M .gitignore
A scripts/tarballs/install-depends.sh
M scripts/tarballs/publish-tarballs-for-tags.sh
3 files changed, 39 insertions(+), 0 deletions(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  osmith: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified




diff --git a/.gitignore b/.gitignore
index 517a620..5f47674 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 cov-analysis-*
 source-*
 install-*
+!install-depends.sh
 tokens.txt
 .*.sw?
 jenkins_jobs.ini
diff --git a/scripts/tarballs/install-depends.sh 
b/scripts/tarballs/install-depends.sh
new file mode 100755
index 000..4943712
--- /dev/null
+++ b/scripts/tarballs/install-depends.sh
@@ -0,0 +1,25 @@
+#!/bin/sh -ex
+# For releases where no debian/control exists, install the dependencies to pass
+# the checks in configure.ac so we can run it before building a release
+# tarball.
+
+PROJECT="$1"
+TAG="$2"
+DEPENDS=""
+
+case "$PROJECT" in
+osmo-e1-recorder)
+   DEPENDS="
+   libosmo-abis-dev
+   libosmocore-dev
+   "
+   ;;
+*)
+   DEPENDS=""
+   ;;
+esac
+
+if [ -n "$DEPENDS" ]; then
+   apt-get update
+   apt-get install -y --no-install-recommends $DEPENDS
+fi
diff --git a/scripts/tarballs/publish-tarballs-for-tags.sh 
b/scripts/tarballs/publish-tarballs-for-tags.sh
index 052e445..3cd8a15 100755
--- a/scripts/tarballs/publish-tarballs-for-tags.sh
+++ b/scripts/tarballs/publish-tarballs-for-tags.sh
@@ -20,6 +20,7 @@
osmo-bsc
osmo-bts
osmo-cbc
+   osmo-e1-recorder
osmo-e1d
osmo-gbproxy
osmo-ggsn
@@ -230,6 +231,8 @@
if [ -e debian/control ]; then
apt-get update
apt-get -y build-dep .
+   else
+   /tarballs/install-depends.sh \"$repo\" \"$tag\"
fi

cd /src/$project_path

--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34815?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I6bd8387f99c258226125b33705645c43aadd875f
Gerrit-Change-Number: 34815
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[S] Change in osmo-ci[master]: scripts/tarballs: add osmo-e1-recorder

[osmith]

Attention is currently required from: fixeria.

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34815?usp=email )

Change subject: scripts/tarballs: add osmo-e1-recorder
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34815?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I6bd8387f99c258226125b33705645c43aadd875f
Gerrit-Change-Number: 34815
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Thu, 19 Oct 2023 09:24:08 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-ci[master]: scripts/tarballs: add gapk

[osmith]

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34817?usp=email )

Change subject: scripts/tarballs: add gapk
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34817?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I6f26b6f5953701b383acb3b93058b66a286f7989
Gerrit-Change-Number: 34817
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Thu, 19 Oct 2023 09:24:12 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-ci[master]: scripts/tarballs: add osmo-fl2k, rtl-sdr

[pespin]

Attention is currently required from: osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34818?usp=email )

Change subject: scripts/tarballs: add osmo-fl2k, rtl-sdr
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34818?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Idff299c65902b6818e409a409a3d303e8fccc4f9
Gerrit-Change-Number: 34818
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Thu, 19 Oct 2023 09:23:19 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-ci[master]: scripts/tarballs: add gapk

[pespin]

Attention is currently required from: osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34817?usp=email )

Change subject: scripts/tarballs: add gapk
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34817?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I6f26b6f5953701b383acb3b93058b66a286f7989
Gerrit-Change-Number: 34817
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Thu, 19 Oct 2023 09:22:42 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-ci[master]: scripts/tarballs: add osmo-e1-recorder

[pespin]

Attention is currently required from: fixeria, osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34815?usp=email )

Change subject: scripts/tarballs: add osmo-e1-recorder
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34815?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I6bd8387f99c258226125b33705645c43aadd875f
Gerrit-Change-Number: 34815
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Thu, 19 Oct 2023 09:21:46 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-ci[master]: scripts/common: osmo git last commit…: add vars

[pespin]

Attention is currently required from: osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34816?usp=email )

Change subject: scripts/common: osmo_git_last_commit…: add vars
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34816?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I7abbcefc8d5bd4c5b84c30a7e38ca3dcb855dd56
Gerrit-Change-Number: 34816
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Thu, 19 Oct 2023 09:20:44 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-ci[master]: scripts/tarballs: add osmo-fl2k, rtl-sdr

[laforge]

Attention is currently required from: osmith.

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34818?usp=email )

Change subject: scripts/tarballs: add osmo-fl2k, rtl-sdr
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34818?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Idff299c65902b6818e409a409a3d303e8fccc4f9
Gerrit-Change-Number: 34818
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Thu, 19 Oct 2023 09:17:45 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-ci[master]: scripts/tarballs: add gapk

[laforge]

Attention is currently required from: osmith.

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34817?usp=email )

Change subject: scripts/tarballs: add gapk
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34817?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I6f26b6f5953701b383acb3b93058b66a286f7989
Gerrit-Change-Number: 34817
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Thu, 19 Oct 2023 09:17:25 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-ci[master]: scripts/common: osmo git last commit…: add vars

[laforge]

Attention is currently required from: osmith.

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34816?usp=email )

Change subject: scripts/common: osmo_git_last_commit…: add vars
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34816?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I7abbcefc8d5bd4c5b84c30a7e38ca3dcb855dd56
Gerrit-Change-Number: 34816
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Thu, 19 Oct 2023 09:16:50 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-ci[master]: scripts/tarballs: add osmo-e1-recorder

[laforge]

Attention is currently required from: fixeria, osmith, pespin.

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34815?usp=email )

Change subject: scripts/tarballs: add osmo-e1-recorder
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34815?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I6bd8387f99c258226125b33705645c43aadd875f
Gerrit-Change-Number: 34815
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Attention: fixeria 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Thu, 19 Oct 2023 09:16:35 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in docker-playground[master]: Introduce ttcn3-epdg-test

[pespin]

pespin has submitted this change. ( 
https://gerrit.osmocom.org/c/docker-playground/+/34798?usp=email )

Change subject: Introduce ttcn3-epdg-test
..

Introduce ttcn3-epdg-test

Change-Id: I77a4d66c1bd0236dee8fc54e03a9d6bf8d63f204
---
A ttcn3-epdg-test/Dockerfile
A ttcn3-epdg-test/EPDG_Tests.cfg
A ttcn3-epdg-test/Makefile
A ttcn3-epdg-test/jenkins.sh
A ttcn3-epdg-test/osmo-epdg.config
5 files changed, 102 insertions(+), 0 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved
  osmith: Looks good to me, but someone else must approve




diff --git a/ttcn3-epdg-test/Dockerfile b/ttcn3-epdg-test/Dockerfile
new file mode 100644
index 000..e3fd8a3
--- /dev/null
+++ b/ttcn3-epdg-test/Dockerfile
@@ -0,0 +1,14 @@
+ARGREGISTRY
+ARGUSER
+FROM   $REGISTRY/$USER/debian-bookworm-titan
+
+ARGOSMO_TTCN3_BRANCH="master"
+
+ADD
https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT
 /tmp/commit
+RUNttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" epdg
+
+VOLUME /data
+
+COPY   EPDG_Tests.cfg /data/EPDG_Tests.cfg
+
+CMDttcn3-docker-run epdg EPDG_Tests
diff --git a/ttcn3-epdg-test/EPDG_Tests.cfg b/ttcn3-epdg-test/EPDG_Tests.cfg
new file mode 100644
index 000..f05a819
--- /dev/null
+++ b/ttcn3-epdg-test/EPDG_Tests.cfg
@@ -0,0 +1,21 @@
+[ORDERED_INCLUDE]
+"/osmo-ttcn3-hacks/Common.cfg"
+"/osmo-ttcn3-hacks/epdg/EPDG_Tests.default"
+
+[LOGGING]
+
+[TESTPORT_PARAMETERS]
+
+[MODULE_PARAMETERS]
+EPDG_Tests.mp_gsup_local_ip := "172.18.10.103"
+EPDG_Tests.mp_swx_local_ip := "172.18.10.103"
+EPDG_Tests.mp_s6b_local_ip := "172.18.10.103"
+EPDG_Tests.mp_s2b_local_ip := "172.18.10.103"
+
+EPDG_Tests.mp_gsup_remote_ip := "172.18.10.20"
+EPDG_Tests.mp_s2b_remote_ip := "172.18.10.20"
+
+[MAIN_CONTROLLER]
+
+[EXECUTE]
+EPDG_Tests.control
diff --git a/ttcn3-epdg-test/Makefile b/ttcn3-epdg-test/Makefile
new file mode 100644
index 000..8d0e10b
--- /dev/null
+++ b/ttcn3-epdg-test/Makefile
@@ -0,0 +1 @@
+include ../make/Makefile
diff --git a/ttcn3-epdg-test/jenkins.sh b/ttcn3-epdg-test/jenkins.sh
new file mode 100755
index 000..df445fc
--- /dev/null
+++ b/ttcn3-epdg-test/jenkins.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+   "osmo-epdg-$IMAGE_SUFFIX" \
+   "ttcn3-epdg-test"
+
+set_clean_up_trap
+set -e
+
+mkdir $VOL_BASE_DIR/epdg-tester
+cp EPDG_Tests.cfg $VOL_BASE_DIR/epdg-tester/
+write_mp_osmo_repo "$VOL_BASE_DIR/epdg-tester/EPDG_Tests.cfg"
+
+mkdir $VOL_BASE_DIR/epdg
+cp osmo-epdg.config $VOL_BASE_DIR/epdg/
+
+network_create
+network_replace_subnet_in_configs
+
+echo Starting container with osmo-epdg
+docker run --rm \
+   $(docker_network_params $SUBNET 20) \
+   --ulimit core=-1 \
+   -v $VOL_BASE_DIR/epdg:/data \
+   --name ${BUILD_TAG}-epdg -d \
+   $DOCKER_ARGS \
+   $REPO_USER/osmo-epdg-$IMAGE_SUFFIX
+
+echo Starting container with EPDG testsuite
+docker run --rm \
+   $(docker_network_params $SUBNET 103) \
+   --ulimit core=-1 \
+   -e "TTCN3_PCAP_PATH=/data" \
+   -v $VOL_BASE_DIR/epdg-tester:/data \
+   --name ${BUILD_TAG}-ttcn3-epdg-test \
+   $DOCKER_ARGS \
+   $REPO_USER/ttcn3-epdg-test
diff --git a/ttcn3-epdg-test/osmo-epdg.config b/ttcn3-epdg-test/osmo-epdg.config
new file mode 100644
index 000..ac8828a
--- /dev/null
+++ b/ttcn3-epdg-test/osmo-epdg.config
@@ -0,0 +1,18 @@
+[
+ %% ===
+ %% Application config
+ %% ===
+ {osmo_epdg,
+  [% GSUP Server connection parameters
+   {gsup_local_ip, "172.18.10.20"},
+   {gsup_local_port, 4222},
+   % Diameter Connection parameters
+   {diameter_remote_ip, "172.18.10.103"},
+   {diameter_remote_port, 3868},
+   {diameter_proto, sctp},
+   % Diameter Server parameters
+   {vendor_id, 0},
+   {origin_host, "epdg.localdomain"},
+   {origin_realm, "localdomain"},
+   {context_id, "epdg@localdomain"}]}
+].

--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34798?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I77a4d66c1bd0236dee8fc54e03a9d6bf8d63f204
Gerrit-Change-Number: 34798
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged