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

[XS] Change in libosmocore[master]: After writing VTY config, run sync() in a different thread
by jolly 08 Oct '24

08 Oct '24

Attention is currently required from: jolly, laforge, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/37798?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review-1 by pespin, Verified+1 by Jenkins Builder Change subject: After writing VTY config, run sync() in a different thread ...................................................................... After writing VTY config, run sync() in a different thread Running sync() after writing VTY config causes the process to stop for a fraction of a second. This may result in delayed processing that causes buffer underruns, overflows and delay. This is a problem with applications that do real-time signal processing such as osmo-trx and osmo-bts. After some discussions, I decided to simply remove the sync() commands from the VTY's write function. There is still a backup file created of the previously saved configuration before writing the current configurtion. Loosing current configuration caused by a system crash afterwards is very unlikely with modern file systems. Related: OS#6438 Change-Id: I3cb2ee68b2e4c730f96522208c4abf00d0f49a44 --- M src/vty/command.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/98/37798/6 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37798?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3cb2ee68b2e4c730f96522208c4abf00d0f49a44 Gerrit-Change-Number: 37798 Gerrit-PatchSet: 6 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Hoernchen <ewild(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-msc[master]: vlr: use correct types for vlr_timer
by lynxis lazus 08 Oct '24

08 Oct '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/38356?usp=email ) Change subject: vlr: use correct types for vlr_timer ...................................................................... vlr: use correct types for vlr_timer A timer T is always an integer. Also osmo_tdef_get returns an unsigned long. Match the types from osmo_tdef. Change-Id: Ic46ddb578962619fc08bd63645c76852e676fcc9 --- M include/osmocom/vlr/vlr.h M src/libvlr/vlr.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/56/38356/1 diff --git a/include/osmocom/vlr/vlr.h b/include/osmocom/vlr/vlr.h index 27b40c2..90147ba 100644 --- a/include/osmocom/vlr/vlr.h +++ b/include/osmocom/vlr/vlr.h @@ -424,7 +424,7 @@ bool vlr_subscr_matches_msisdn(struct vlr_subscr *vsub, const char *msisdn); bool vlr_subscr_matches_imei(struct vlr_subscr *vsub, const char *imei); -uint32_t vlr_timer(struct vlr_instance *vlr, uint32_t timer); +unsigned long vlr_timer(struct vlr_instance *vlr, int timer); int vlr_subscr_changed(struct vlr_subscr *vsub); int vlr_subscr_purge(struct vlr_subscr *vsub) __attribute__((warn_unused_result)); diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index f160578..866a63d 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -203,7 +203,7 @@ /* This is just a wrapper around the osmo_tdef API. * TODO: we should start using osmo_tdef_fsm_inst_state_chg() */ -uint32_t vlr_timer(struct vlr_instance *vlr, uint32_t timer) +unsigned long vlr_timer(struct vlr_instance *vlr, int timer) { /* NOTE: since we usually do not need more than one instance of the VLR, * and since libosmocore's osmo_tdef API does not (yet) support dynamic -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38356?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic46ddb578962619fc08bd63645c76852e676fcc9 Gerrit-Change-Number: 38356 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in osmo-msc[master]: Move vlr.h & vlr_sgs.h into osmocom/vlr/
by lynxis lazus 08 Oct '24

08 Oct '24

Attention is currently required from: dexter, laforge, lynxis lazus, pespin. Hello Jenkins Builder, dexter, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/38111?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+2 by dexter, Code-Review+2 by pespin, Verified-1 by Jenkins Builder Change subject: Move vlr.h & vlr_sgs.h into osmocom/vlr/ ...................................................................... Move vlr.h & vlr_sgs.h into osmocom/vlr/ Prepare libvlr to be independent, start by moving the vlr headers into its own directory. Change-Id: I8b18b05091b35e744b3234d1ce0d537f56bccf07 --- M configure.ac M include/osmocom/Makefile.am M include/osmocom/msc/Makefile.am M include/osmocom/msc/sgs_iface.h M include/osmocom/msc/transaction_cc.h A include/osmocom/vlr/Makefile.am R include/osmocom/vlr/vlr.h R include/osmocom/vlr/vlr_sgs.h M src/libmsc/ctrl_commands.c M src/libmsc/db.c M src/libmsc/e_link.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_11_gsup.c M src/libmsc/gsm_09_11.c M src/libmsc/mncc_call.c M src/libmsc/msc_a.c M src/libmsc/msc_a_remote.c M src/libmsc/msc_ho.c M src/libmsc/msc_net_init.c M src/libmsc/msc_t.c M src/libmsc/msc_vgcs.c M src/libmsc/msc_vty.c M src/libmsc/msub.c M src/libmsc/paging.c M src/libmsc/ran_conn.c M src/libmsc/ran_peer.c M src/libmsc/sgs_iface.c M src/libmsc/silent_call.c M src/libmsc/sms_queue.c M src/libmsc/transaction.c M src/libsmpputil/smpp_msc.c M src/libvlr/vlr.c M src/libvlr/vlr_access_req_fsm.c M src/libvlr/vlr_auth_fsm.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M src/libvlr/vlr_sgs.c M src/libvlr/vlr_sgs_fsm.c M tests/db_sms/db_sms_test.c M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_tests.h M tests/sms_queue/sms_queue_test.c 44 files changed, 51 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/11/38111/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38111?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8b18b05091b35e744b3234d1ce0d537f56bccf07 Gerrit-Change-Number: 38111 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de>

1 0

[S] Change in osmo-msc[master]: libvlr: replace direct call of paging_expired() into a callback
by lynxis lazus 08 Oct '24

08 Oct '24

Attention is currently required from: lynxis lazus, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/38107?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: libvlr: replace direct call of paging_expired() into a callback ...................................................................... libvlr: replace direct call of paging_expired() into a callback libmsc internal functions shouldn't be called from within the libvlr. Re-use the paging callback with an osmocom specific indication to inform it to cancel paging. Change-Id: I7a3d15e8f0fb51c6b32add2de5024fc4d599ecf0 --- M include/osmocom/msc/sgs_iface.h M include/osmocom/msc/vlr_sgs.h M src/libmsc/paging.c M src/libmsc/sgs_iface.c M src/libvlr/vlr_sgs_fsm.c 5 files changed, 13 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/07/38107/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38107?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I7a3d15e8f0fb51c6b32add2de5024fc4d599ecf0 Gerrit-Change-Number: 38107 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in osmo-msc[master]: vlr: fix typo in comment
by lynxis lazus 08 Oct '24

08 Oct '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/38355?usp=email ) Change subject: vlr: fix typo in comment ...................................................................... vlr: fix typo in comment Change-Id: I06baf0494fde1d0c8eb6aaf72f5ce6e9134f3905 --- M src/libvlr/vlr.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/55/38355/1 diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 2f49452..6712ca0 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -1582,7 +1582,7 @@ return 0; } -/* MSC->VLR: Subscribre has disconnected */ +/* MSC->VLR: Subscriber has disconnected */ int vlr_subscr_disconnected(struct vlr_subscr *vsub) { /* This corresponds to a MAP-ABORT from MSC->VLR on a classic B -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38355?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I06baf0494fde1d0c8eb6aaf72f5ce6e9134f3905 Gerrit-Change-Number: 38355 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in libosmocore[master]: protocol: gsm 29.118: add SGSAP_SERV_IND_PAGING_TIMEOUT (osmocom spec...
by lynxis lazus 08 Oct '24

08 Oct '24

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/38125?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: protocol: gsm 29.118: add SGSAP_SERV_IND_PAGING_TIMEOUT (osmocom specific) ...................................................................... protocol: gsm 29.118: add SGSAP_SERV_IND_PAGING_TIMEOUT (osmocom specific) To simplify the code, extend the service indication to also indicate a paging timeout. The VLR is using this type to indicate paging timeouts or aborting paging in case the SGs state has been terminated. Related: OS#6547 Change-Id: I58bfba50cb9c8aff2cd1cfe88d6467d4d2bd17cb --- M include/osmocom/gsm/protocol/gsm_29_118.h 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/38125/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38125?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58bfba50cb9c8aff2cd1cfe88d6467d4d2bd17cb Gerrit-Change-Number: 38125 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmocore[master]: protocol: gsm 29.118: add SGSAP_SERV_IND_PAGING_TIMEOUT (osmocom spec...
by lynxis lazus 08 Oct '24

08 Oct '24

Attention is currently required from: laforge, pespin. lynxis lazus has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/libosmocore/+/38125?usp=email ) Change subject: protocol: gsm 29.118: add SGSAP_SERV_IND_PAGING_TIMEOUT (osmocom specific) ...................................................................... Patch Set 1: (3 comments) Patchset: PS1: > ... and this is even stuck for two minor cosmetic changes for more than three weeks. @lynxis@fe80. […] Done Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/38125/comment/e842bc4b_19bf2a56?… : PS1, Line 10: a paging timeout. The VLR is susing this type to indicate paging > didn't know Suse was developing VLRs :) (typo "susing") Done https://gerrit.osmocom.org/c/libosmocore/+/38125/comment/9e418038_ff3e4921?… : PS1, Line 11: timeouts or aborting paging in case the SGS state has been terminated. > SGs? Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38125?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58bfba50cb9c8aff2cd1cfe88d6467d4d2bd17cb Gerrit-Change-Number: 38125 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Oct 2024 21:00:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-sip-connector[master]: sip.c: permit early media with both 183 and 180
by lynxis lazus 07 Oct '24

07 Oct '24

Attention is currently required from: fixeria, jolly, keith, laforge, neels, pespin. lynxis lazus has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/38039?usp=email ) Change subject: sip.c: permit early media with both 183 and 180 ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/38039?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ia0072080c2e0bfb8b2bf751a248d3410a7723e79 Gerrit-Change-Number: 38039 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: keith <keith(a)rhizomatica.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Mon, 07 Oct 2024 20:39:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ci[master]: jobs: gerrit-verifications.yml: Add job for upf-benchmark.git
by pespin 07 Oct '24

07 Oct '24

Attention is currently required from: osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ci/+/38330?usp=email ) Change subject: jobs: gerrit-verifications.yml: Add job for upf-benchmark.git ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Once patches for upf-benchmark.git are merged in maste (ones containing the jenkins.sh), we need to add a new jenkins job to build master nightly too. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38330?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7212e8f88c731993af01e0e42ddaad6dd7291c37 Gerrit-Change-Number: 38330 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Oct 2024 18:26:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in upf-benchmark[master]: Rename osmo-pfcp-tool to osmo-upf-genload
by pespin 07 Oct '24

07 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/upf-benchmark/+/38354?usp=email ) Change subject: Rename osmo-pfcp-tool to osmo-upf-genload ...................................................................... Rename osmo-pfcp-tool to osmo-upf-genload Change-Id: Ie36379b5dcf4ab86276dfda9e25410fe41db1d93 --- M configure.ac M debian/upf-benchmark.install M include/osmocom/Makefile.am R include/osmocom/upfgenload/Makefile.am R include/osmocom/upfgenload/checksum.h R include/osmocom/upfgenload/gtp_flood.h R include/osmocom/upfgenload/pfcp_tool.h R include/osmocom/upfgenload/range.h M src/Makefile.am M src/osmo-udp-responder/udp_responder.c R src/osmo-upf-genload/Makefile.am R src/osmo-upf-genload/checksum.c R src/osmo-upf-genload/gtp_flood.c R src/osmo-upf-genload/main.c R src/osmo-upf-genload/pfcp_tool.c R src/osmo-upf-genload/pfcp_tool_vty.c R src/osmo-upf-genload/range.c M testsuites/gtplab-sysmo2017/overview_only_tunend.dot M testsuites/gtplab-sysmo2017/overview_only_tunmap.dot M testsuites/gtplab-sysmo2017/overview_tunmap_and_tunend.dot M testsuites/gtplab-sysmo2017/tunend/ran/0.gtp_flood.vty R testsuites/gtplab-sysmo2017/tunend/ran/osmo-upf-genload.cfg M testsuites/gtplab-sysmo2017/tunend/ran/run.sh M testsuites/gtplab-sysmo2017/tunmap/ran/0.gtp_flood.vty R testsuites/gtplab-sysmo2017/tunmap/ran/osmo-upf-genload.cfg M testsuites/gtplab-sysmo2017/tunmap/ran/run.sh 26 files changed, 44 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/54/38354/1 diff --git a/configure.ac b/configure.ac index 61a8d35..ca137eb 100644 --- a/configure.ac +++ b/configure.ac @@ -161,9 +161,9 @@ AC_OUTPUT( include/Makefile include/osmocom/Makefile - include/osmocom/pfcptool/Makefile + include/osmocom/upfgenload/Makefile src/Makefile - src/osmo-pfcp-tool/Makefile + src/osmo-upf-genload/Makefile src/osmo-udp-responder/Makefile src/osmo-udp-simpleflood/Makefile doc/Makefile diff --git a/debian/upf-benchmark.install b/debian/upf-benchmark.install index 6653611..2aff203 100644 --- a/debian/upf-benchmark.install +++ b/debian/upf-benchmark.install @@ -1 +1 @@ -usr/bin/osmo-pfcp-tool +usr/bin/osmo-upf-genload diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am index 1e3c7ce..42e2a22 100644 --- a/include/osmocom/Makefile.am +++ b/include/osmocom/Makefile.am @@ -1,3 +1,3 @@ SUBDIRS = \ - pfcptool \ + upfgenload \ $(NULL) diff --git a/include/osmocom/pfcptool/Makefile.am b/include/osmocom/upfgenload/Makefile.am similarity index 100% rename from include/osmocom/pfcptool/Makefile.am rename to include/osmocom/upfgenload/Makefile.am diff --git a/include/osmocom/pfcptool/checksum.h b/include/osmocom/upfgenload/checksum.h similarity index 100% rename from include/osmocom/pfcptool/checksum.h rename to include/osmocom/upfgenload/checksum.h diff --git a/include/osmocom/pfcptool/gtp_flood.h b/include/osmocom/upfgenload/gtp_flood.h similarity index 100% rename from include/osmocom/pfcptool/gtp_flood.h rename to include/osmocom/upfgenload/gtp_flood.h diff --git a/include/osmocom/pfcptool/pfcp_tool.h b/include/osmocom/upfgenload/pfcp_tool.h similarity index 97% rename from include/osmocom/pfcptool/pfcp_tool.h rename to include/osmocom/upfgenload/pfcp_tool.h index 699fd87..34b00fd 100644 --- a/include/osmocom/pfcptool/pfcp_tool.h +++ b/include/osmocom/upfgenload/pfcp_tool.h @@ -1,4 +1,4 @@ -/* Global definitions for osmo-pfcp-tool */ +/* Global definitions for osmo-upf-genload */ /* * (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * All Rights Reserved. @@ -33,8 +33,8 @@ #include <osmocom/pfcp/pfcp_msg.h> -#include <osmocom/pfcptool/range.h> -#include <osmocom/pfcptool/gtp_flood.h> +#include <osmocom/upfgenload/range.h> +#include <osmocom/upfgenload/gtp_flood.h> struct osmo_tdef; struct ctrl_handle; diff --git a/include/osmocom/pfcptool/range.h b/include/osmocom/upfgenload/range.h similarity index 100% rename from include/osmocom/pfcptool/range.h rename to include/osmocom/upfgenload/range.h diff --git a/src/Makefile.am b/src/Makefile.am index 0005c41..d5e3d2a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ SUBDIRS = \ - osmo-pfcp-tool \ + osmo-upf-genload \ osmo-udp-responder \ osmo-udp-simpleflood \ $(NULL) diff --git a/src/osmo-udp-responder/udp_responder.c b/src/osmo-udp-responder/udp_responder.c index 5ffe707..5a100bc 100644 --- a/src/osmo-udp-responder/udp_responder.c +++ b/src/osmo-udp-responder/udp_responder.c @@ -47,7 +47,7 @@ #include <osmocom/core/socket.h> #include <osmocom/core/sockaddr_str.h> -#include <osmocom/pfcptool/gtp_flood.h> +#include <osmocom/upfgenload/gtp_flood.h> static volatile bool started; static struct timespec ts_start; diff --git a/src/osmo-pfcp-tool/Makefile.am b/src/osmo-upf-genload/Makefile.am similarity index 88% rename from src/osmo-pfcp-tool/Makefile.am rename to src/osmo-upf-genload/Makefile.am index ea16f72..9a52474 100644 --- a/src/osmo-pfcp-tool/Makefile.am +++ b/src/osmo-upf-genload/Makefile.am @@ -25,13 +25,13 @@ $(NULL) bin_PROGRAMS = \ - osmo-pfcp-tool \ + osmo-upf-genload \ $(NULL) -osmo_pfcp_tool_SOURCES = \ +osmo_upf_genload_SOURCES = \ checksum.c \ gtp_flood.c \ - osmo_pfcp_tool_main.c \ + main.c \ pfcp_tool.c \ pfcp_tool_vty.c \ range.c \ diff --git a/src/osmo-pfcp-tool/checksum.c b/src/osmo-upf-genload/checksum.c similarity index 98% rename from src/osmo-pfcp-tool/checksum.c rename to src/osmo-upf-genload/checksum.c index c6abe27..b13002e 100644 --- a/src/osmo-pfcp-tool/checksum.c +++ b/src/osmo-upf-genload/checksum.c @@ -39,7 +39,7 @@ #include <sys/endian.h> #endif -#include <osmocom/pfcptool/checksum.h> +#include <osmocom/upfgenload/checksum.h> #include <arpa/inet.h> static inline unsigned short from32to16(unsigned int x) diff --git a/src/osmo-pfcp-tool/gtp_flood.c b/src/osmo-upf-genload/gtp_flood.c similarity index 98% rename from src/osmo-pfcp-tool/gtp_flood.c rename to src/osmo-upf-genload/gtp_flood.c index 69cbf4b..0d64dbf 100644 --- a/src/osmo-pfcp-tool/gtp_flood.c +++ b/src/osmo-upf-genload/gtp_flood.c @@ -30,7 +30,7 @@ #endif #include "config.h" -#include <osmocom/pfcptool/gtp_flood.h> +#include <osmocom/upfgenload/gtp_flood.h> #include <osmocom/core/logging.h> #define HAVE_URING 1 @@ -47,8 +47,8 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/core/talloc.h> #include <osmocom/vty/cpu_sched_vty.h> -#include <osmocom/pfcptool/pfcp_tool.h> -#include <osmocom/pfcptool/checksum.h> +#include <osmocom/upfgenload/pfcp_tool.h> +#include <osmocom/upfgenload/checksum.h> #define PKT_BUF_SIZE 1452 @@ -263,7 +263,7 @@ /* write some payload */ struct osmo_strbuf sb = { .buf = (void *)cur, .len = udp_payload_len }; - OSMO_STRBUF_PRINTF(sb, "osmo-pfcp-tool gtp flood, emitted from %s to %s teid 0x%08x flow %u\n", + OSMO_STRBUF_PRINTF(sb, "osmo-upf-genload gtp flood, emitted from %s to %s teid 0x%08x flow %u\n", osmo_sockaddr_to_str_c(OTC_SELECT, &flow->cfg.gtp_local->osa), osmo_sockaddr_to_str_c(OTC_SELECT, &flow->cfg.gtp_remote), flow->cfg.gtp_remote_teid, diff --git a/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c b/src/osmo-upf-genload/main.c similarity index 95% rename from src/osmo-pfcp-tool/osmo_pfcp_tool_main.c rename to src/osmo-upf-genload/main.c index d61c951..e60eb62 100644 --- a/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c +++ b/src/osmo-upf-genload/main.c @@ -45,8 +45,8 @@ #include <osmocom/pfcp/pfcp_endpoint.h> -#include <osmocom/pfcptool/pfcp_tool.h> -#include <osmocom/pfcptool/gtp_flood.h> +#include <osmocom/upfgenload/pfcp_tool.h> +#include <osmocom/upfgenload/gtp_flood.h> #include <getopt.h> @@ -68,13 +68,13 @@ enum vty_ref_gen_mode vty_ref_gen_mode; const char *command_file; } pfcp_tool_cmdline_config = { - .config_file = "osmo-pfcp-tool.cfg", + .config_file = "osmo-upf-genload.cfg", .vty_ref_gen_mode = VTY_REF_GEN_MODE_DEFAULT, }; static void print_usage() { - printf("Usage: osmo-pfcp-tool [command-file.vty]\n telnet localhost %d\n", OSMO_VTY_PORT_PFCP_TOOL); + printf("Usage: osmo-upf-genload [command-file.vty]\n telnet localhost %d\n", OSMO_VTY_PORT_PFCP_TOOL); } static void print_help() @@ -210,11 +210,11 @@ } static struct vty_app_info pfcp_tool_vty_app_info = { - .name = "osmo-pfcp-tool", + .name = "osmo-upf-genload", .version = PACKAGE_VERSION, .copyright = - "OsmoPFCPTool - Osmocom Packet Forwarding Control Protocol tool for testing\r\n" - "Copyright (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>\r\n" + "OsmoUPFGenLoad - Osmocom UPF PFCP / GTPv1U traffic generator\r\n" + "Copyright (C) 2021-2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>\r\n" "License AGPLv3+: GNU AGPL version 3 or later <http://gnu.org/licenses/agpl-3.0.html>\r\n" "This is free software: you are free to change and redistribute it.\r\n" "There is NO WARRANTY, to the extent permitted by law.\r\n", @@ -259,7 +259,7 @@ osmo_fsm_set_dealloc_ctx(OTC_SELECT); - tall_pfcp_tool_ctx = talloc_named_const(NULL, 1, "osmo-pfcp-tool"); + tall_pfcp_tool_ctx = talloc_named_const(NULL, 1, "osmo-upf-genload"); pfcp_tool_vty_app_info.tall_ctx = tall_pfcp_tool_ctx; msgb_talloc_ctx_init(tall_pfcp_tool_ctx, 0); diff --git a/src/osmo-pfcp-tool/pfcp_tool.c b/src/osmo-upf-genload/pfcp_tool.c similarity index 97% rename from src/osmo-pfcp-tool/pfcp_tool.c rename to src/osmo-upf-genload/pfcp_tool.c index 6ba8d27..d21c89e 100644 --- a/src/osmo-pfcp-tool/pfcp_tool.c +++ b/src/osmo-upf-genload/pfcp_tool.c @@ -29,8 +29,8 @@ #include <osmocom/pfcp/pfcp_endpoint.h> -#include <osmocom/pfcptool/pfcp_tool.h> -#include <osmocom/pfcptool/gtp_flood.h> +#include <osmocom/upfgenload/pfcp_tool.h> +#include <osmocom/upfgenload/gtp_flood.h> struct g_pfcp_tool *g_pfcp_tool = NULL; @@ -333,8 +333,8 @@ } /* The 'local' and 'remote' naming clashes here. struct pfcp_tool_gtp_tun names its items from the UPF's point - * of view: so the GTP port of osmo-pfcp-tool is 'remote'. - * Here we are setting up a port to emit GTP from osmo-pfcp-tool, the same port is called 'gtp_local'. + * of view: so the GTP port of osmo-upf-genload is 'remote'. + * Here we are setting up a port to emit GTP from osmo-upf-genload, the same port is called 'gtp_local'. */ cfg.gtp_local = pfcp_tool_have_local_udp_port_by_str(&tun_access->remote.addr, 2152); if (!cfg.gtp_local) { @@ -345,7 +345,7 @@ /* The 'local' and 'remote' naming clashes here. struct pfcp_tool_gtp_tun names its items from the UPF's point * of view: so the GTP port of UPF is 'local'. * Here we are reading the GTP port that the UPF has opened to receive GTP traffic; the same port is called - * 'gtp_remote' in cfg, which is remote from osmo-pfcp-tool's point of view. + * 'gtp_remote' in cfg, which is remote from osmo-upf-genload's point of view. */ if (osmo_sockaddr_str_to_osa(&tun_access->local.addr, &cfg.gtp_remote)) { LOGP(DLGLOBAL, LOGL_ERROR, "Cannot set up GTP flow for session, failed to identify UPF's GTP port\n"); diff --git a/src/osmo-pfcp-tool/pfcp_tool_vty.c b/src/osmo-upf-genload/pfcp_tool_vty.c similarity index 99% rename from src/osmo-pfcp-tool/pfcp_tool_vty.c rename to src/osmo-upf-genload/pfcp_tool_vty.c index 6348850..010e4ca 100644 --- a/src/osmo-pfcp-tool/pfcp_tool_vty.c +++ b/src/osmo-upf-genload/pfcp_tool_vty.c @@ -1,4 +1,4 @@ -/* osmo-pfcp-tool interface to quagga VTY */ +/* osmo-upf-genload interface to quagga VTY */ /* * (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * All Rights Reserved. @@ -34,7 +34,7 @@ #include <osmocom/vty/vty.h> #include <osmocom/vty/command.h> -#include <osmocom/pfcptool/pfcp_tool.h> +#include <osmocom/upfgenload/pfcp_tool.h> DEFUN(c_local_addr, c_local_addr_cmd, "local-addr IP_ADDR", @@ -1257,7 +1257,7 @@ te = &session->tunend; /* Access: set remote GTP address from UPF's point of view. - * A local GTP port from osmo-pfcp-tool's point of view. */ + * A local GTP port from osmo-upf-genload's point of view. */ dst = &te->access.remote; rc = set_access_ran_tunend(dst); if (rc != CMD_SUCCESS) @@ -1344,7 +1344,7 @@ tm = &session->tunmap; /* Access: set remote GTP address from UPF's point of view. - * A local GTP port from osmo-pfcp-tool's point of view. */ + * A local GTP port from osmo-upf-genload's point of view. */ dst = &tm->access.remote; rc = set_access_ran_tunend(dst); if (rc != CMD_SUCCESS) diff --git a/src/osmo-pfcp-tool/range.c b/src/osmo-upf-genload/range.c similarity index 98% rename from src/osmo-pfcp-tool/range.c rename to src/osmo-upf-genload/range.c index 5d30bd6..906892a 100644 --- a/src/osmo-pfcp-tool/range.c +++ b/src/osmo-upf-genload/range.c @@ -24,7 +24,7 @@ #include <osmocom/core/socket.h> #include <osmocom/core/utils.h> -#include <osmocom/pfcptool/range.h> +#include <osmocom/upfgenload/range.h> void range_val_set_int(struct range_val *rv, uint32_t val) { diff --git a/testsuites/gtplab-sysmo2017/overview_only_tunend.dot b/testsuites/gtplab-sysmo2017/overview_only_tunend.dot index 067f091..9285566 100644 --- a/testsuites/gtplab-sysmo2017/overview_only_tunend.dot +++ b/testsuites/gtplab-sysmo2017/overview_only_tunend.dot @@ -7,7 +7,7 @@ label="gtplab0"; rankdir=TB; gtplab0_172_31 [label="172.16.31.1/24"]; - tool [label="osmo-pfcp-tool",shape=box3d]; + tool [label="osmo-upf-genload",shape=box3d]; } subgraph cluster_gtplab1 { label="gtplab1"; diff --git a/testsuites/gtplab-sysmo2017/overview_only_tunmap.dot b/testsuites/gtplab-sysmo2017/overview_only_tunmap.dot index 96d5dcf..42cff52 100644 --- a/testsuites/gtplab-sysmo2017/overview_only_tunmap.dot +++ b/testsuites/gtplab-sysmo2017/overview_only_tunmap.dot @@ -7,7 +7,7 @@ label="gtplab0"; rankdir=TB; gtplab0_172_31 [label="172.16.31.1/24"]; - tool [label="osmo-pfcp-tool",shape=box3d]; + tool [label="osmo-upf-genload",shape=box3d]; insert_teid [label="insert return TEID\nin UDP payload",shape=note]; } subgraph cluster_gtplab1 { diff --git a/testsuites/gtplab-sysmo2017/overview_tunmap_and_tunend.dot b/testsuites/gtplab-sysmo2017/overview_tunmap_and_tunend.dot index 6d82dd9..3640d61 100644 --- a/testsuites/gtplab-sysmo2017/overview_tunmap_and_tunend.dot +++ b/testsuites/gtplab-sysmo2017/overview_tunmap_and_tunend.dot @@ -8,7 +8,7 @@ rankdir=TB; gtplab0_10 [label="10.9.25.20/24"]; gtplab0_172_31 [label="172.16.31.1/24"]; - tool [label="osmo-pfcp-tool",shape=box3d]; + tool [label="osmo-upf-genload",shape=box3d]; } subgraph cluster_gtplab1 { label="gtplab1"; diff --git a/testsuites/gtplab-sysmo2017/tunend/ran/0.gtp_flood.vty b/testsuites/gtplab-sysmo2017/tunend/ran/0.gtp_flood.vty index 9d197ab..eb13f35 100644 --- a/testsuites/gtplab-sysmo2017/tunend/ran/0.gtp_flood.vty +++ b/testsuites/gtplab-sysmo2017/tunend/ran/0.gtp_flood.vty @@ -1,7 +1,7 @@ # Establish N PFCP sessions for tunend, and emit massive GTP traffic to the UPF # to each established tunnel. # -# osmo-pfcp-tool UPF "internet host" +# osmo-upf-genload UPF "internet host" # |GTP-ep -------GTP-----> GTP-ep|UE-IP-addr -------IP------> arbitrary-IP| # |10.0.1.1 10.0.2.1|192.168.10.23 123.234.42.23| # |10.0.1.2 @@ -128,7 +128,7 @@ date # All GTP is flowing. -# osmo-pfcp-tool will keep this up for as long as there still are active GTP flows, +# osmo-upf-genload will keep this up for as long as there still are active GTP flows, # or until receiving a signal interrupt (ctrl-C). # give some time to gather counters before the tunnel is removed diff --git a/testsuites/gtplab-sysmo2017/tunend/ran/osmo-pfcp-tool.cfg b/testsuites/gtplab-sysmo2017/tunend/ran/osmo-upf-genload.cfg similarity index 100% rename from testsuites/gtplab-sysmo2017/tunend/ran/osmo-pfcp-tool.cfg rename to testsuites/gtplab-sysmo2017/tunend/ran/osmo-upf-genload.cfg diff --git a/testsuites/gtplab-sysmo2017/tunend/ran/run.sh b/testsuites/gtplab-sysmo2017/tunend/ran/run.sh index cfd313c..586a592 100755 --- a/testsuites/gtplab-sysmo2017/tunend/ran/run.sh +++ b/testsuites/gtplab-sysmo2017/tunend/ran/run.sh @@ -2,4 +2,4 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -osmo-pfcp-tool -c "$SCRIPT_DIR/osmo-pfcp-tool.cfg" "$SCRIPT_DIR/0.gtp_flood.vty" \ No newline at end of file +osmo-upf-genload -c "$SCRIPT_DIR/osmo-upf-genload.cfg" "$SCRIPT_DIR/0.gtp_flood.vty" \ No newline at end of file diff --git a/testsuites/gtplab-sysmo2017/tunmap/ran/0.gtp_flood.vty b/testsuites/gtplab-sysmo2017/tunmap/ran/0.gtp_flood.vty index 611065c..43085e1 100644 --- a/testsuites/gtplab-sysmo2017/tunmap/ran/0.gtp_flood.vty +++ b/testsuites/gtplab-sysmo2017/tunmap/ran/0.gtp_flood.vty @@ -1,7 +1,7 @@ # Establish N PFCP sessions for tunmap, and emit massive GTP traffic to the UPF # to each established tunnel. # -# osmo-pfcp-tool UPF "core" +# osmo-upf-genload UPF "core" # |GTP-ep -------GTP-----> GTP-ep|GTP-ep ----------IP------> GTP-ep # |10.0.1.1 10.0.2.1|10.0.3.1 10.0.3.2 # |10.0.1.2 @@ -148,7 +148,7 @@ date # All GTP is flowing. -# osmo-pfcp-tool will keep this up for as long as there still are active GTP flows, +# osmo-upf-genload will keep this up for as long as there still are active GTP flows, # or until receiving a signal interrupt (ctrl-C). # give some time to gather counters before the tunnel is removed diff --git a/testsuites/gtplab-sysmo2017/tunmap/ran/osmo-pfcp-tool.cfg b/testsuites/gtplab-sysmo2017/tunmap/ran/osmo-upf-genload.cfg similarity index 100% rename from testsuites/gtplab-sysmo2017/tunmap/ran/osmo-pfcp-tool.cfg rename to testsuites/gtplab-sysmo2017/tunmap/ran/osmo-upf-genload.cfg diff --git a/testsuites/gtplab-sysmo2017/tunmap/ran/run.sh b/testsuites/gtplab-sysmo2017/tunmap/ran/run.sh index 277bb4a..68c3d73 100755 --- a/testsuites/gtplab-sysmo2017/tunmap/ran/run.sh +++ b/testsuites/gtplab-sysmo2017/tunmap/ran/run.sh @@ -2,4 +2,4 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -osmo-pfcp-tool -c "$SCRIPT_DIR/osmo-pfcp-tool.cfg" "$SCRIPT_DIR/0.gtp_flood.vty" +osmo-upf-genload -c "$SCRIPT_DIR/osmo-upf-genload.cfg" "$SCRIPT_DIR/0.gtp_flood.vty" -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/38354?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: Ie36379b5dcf4ab86276dfda9e25410fe41db1d93 Gerrit-Change-Number: 38354 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0