March 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmo-bsc[master]: tests: rename and extend gprs_{bvci_default->params}.vty
by pespin 31 Mar '23

31 Mar '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32169 ) Change subject: tests: rename and extend gprs_{bvci_default->params}.vty ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/32169/comment/0531defd_878b19f3 PS1, Line 18: The PCU obviously cannot bind to port 0, and will keep re-starting. why do you say the PCU cannot bind to port 0? I'm not understanding. Binding to port 0 just tells the kernel to pick an available port. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia02e9a97137eb7724f22526fc3768331b35ac55d Gerrit-Change-Number: 32169 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 31 Mar 2023 10:05:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: doc/{examples,manuals}: remove dummy 'gprs nsvc 1'
by pespin 31 Mar '23

31 Mar '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32168 ) Change subject: doc/{examples,manuals}: remove dummy 'gprs nsvc 1' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I976471ad15dbb7be832dc1a87ca794009ee1aa7c Gerrit-Change-Number: 32168 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 31 Mar 2023 10:03:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: tests: add more tests for GPRS NSVC parameters
by pespin 31 Mar '23

31 Mar '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32171 ) Change subject: tests: add more tests for GPRS NSVC parameters ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I13d6ac887ddb1c9bc5d1e4122f20405a28f135d4 Gerrit-Change-Number: 32171 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 31 Mar 2023 10:02:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: core: remove unnecessary #include <osmocom/core/talloc.h>
by pespin 31 Mar '23

31 Mar '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32167 ) Change subject: core: remove unnecessary #include <osmocom/core/talloc.h> ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4b9ffd7a329081df3d2c0b0ee8698a3cf759e94e Gerrit-Change-Number: 32167 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 31 Mar 2023 10:02:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: fixup (partial revert): "coding: clean up Makefile.am"
by pespin 31 Mar '23

31 Mar '23

Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32166 ) Change subject: fixup (partial revert): "coding: clean up Makefile.am" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic1bd82159a827af21fe36bea998f8f58f732473a Gerrit-Change-Number: 32166 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 31 Mar 2023 10:01:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmo-pfcp[master]: pfcp_msg: refactor LOG_PFCP_MSG
by neels 31 Mar '23

31 Mar '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/32173 ) Change subject: pfcp_msg: refactor LOG_PFCP_MSG ...................................................................... pfcp_msg: refactor LOG_PFCP_MSG It was requested during code review to make this a function and not a macro. One effective change: no longer log "NULL{fi=NULL}" when no m->ctx.session_fi or .peer_fi are set. Change-Id: Ic84090c9b1a34185577cfb2ea1efa9c07542df34 --- M include/osmocom/pfcp/pfcp_msg.h M src/libosmo-pfcp/pfcp_msg.c 2 files changed, 49 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/73/32173/1 diff --git a/include/osmocom/pfcp/pfcp_msg.h b/include/osmocom/pfcp/pfcp_msg.h index 4affa54..0023353 100644 --- a/include/osmocom/pfcp/pfcp_msg.h +++ b/include/osmocom/pfcp/pfcp_msg.h @@ -42,30 +42,15 @@ #define OSMO_PFCP_MSGB_ALLOC_SIZE 2048 -#define OSMO_LOG_PFCP_MSG_SRC(M, LEVEL, file, line, FMT, ARGS...) do { \ - struct osmo_fsm_inst *_fi = (M) ? ((M)->ctx.session_fi ?: (M)->ctx.peer_fi) : NULL; \ - enum osmo_pfcp_cause *cause = osmo_pfcp_msg_cause(M); \ - if ((M)->h.seid_present) { \ - LOGPFSMSLSRC(_fi, DLPFCP, LEVEL, file, line, \ - "%s%s PFCP seq-%u SEID-0x%"PRIx64" %s%s%s: " FMT, \ - _fi ? "" : osmo_sockaddr_to_str_c(OTC_SELECT, &(M)->remote_addr), \ - (M)->rx ? "-rx->" : "<-tx-", (M)->h.sequence_nr, \ - (M)->h.seid, \ - osmo_pfcp_message_type_str((M)->h.message_type), cause ? ": " : "", \ - cause ? osmo_pfcp_cause_str(*cause) : "", ##ARGS); \ - } else { \ - LOGPFSMSLSRC(_fi, DLPFCP, LEVEL, file, line, \ - "%s%s PFCP seq-%u %s%s%s: " FMT, \ - _fi ? "" : osmo_sockaddr_to_str_c(OTC_SELECT, &(M)->remote_addr), \ - (M)->rx ? "-rx->" : "<-tx-", (M)->h.sequence_nr, \ - osmo_pfcp_message_type_str((M)->h.message_type), cause ? ": " : "", \ - cause ? osmo_pfcp_cause_str(*cause) : "", ##ARGS); \ - } \ - } while (0) +#define OSMO_LOG_PFCP_MSG_SRC(M, LEVEL, file, line, FMT, ARGS...) \ + LOGPSRC(DLPFCP, LEVEL, file, line, "%s: " FMT, osmo_pfcp_msg_log_info_c(OTC_SELECT, M), ##ARGS) #define OSMO_LOG_PFCP_MSG(M, LEVEL, FMT, ARGS...) \ OSMO_LOG_PFCP_MSG_SRC(M, LEVEL, __FILE__, __LINE__, FMT, ##ARGS) +int osmo_pfcp_msg_log_info_buf(char *buf, size_t buflen, const struct osmo_pfcp_msg *m); +char *osmo_pfcp_msg_log_info_c(void *ctx, const struct osmo_pfcp_msg *m); + struct osmo_pfcp_header_parsed { uint8_t version; enum osmo_pfcp_message_type message_type; diff --git a/src/libosmo-pfcp/pfcp_msg.c b/src/libosmo-pfcp/pfcp_msg.c index 9893cb2..611d445 100644 --- a/src/libosmo-pfcp/pfcp_msg.c +++ b/src/libosmo-pfcp/pfcp_msg.c @@ -550,3 +550,32 @@ { OSMO_NAME_C_IMPL(ctx, 256, "ERROR", osmo_pfcp_msg_to_str_buf, m) } + +int osmo_pfcp_msg_log_info_buf(char *buf, size_t buflen, const struct osmo_pfcp_msg *m) +{ + struct osmo_strbuf sb = { .buf = buf, .len = buflen }; + struct osmo_fsm_inst *fi = m ? (m->ctx.session_fi ?: m->ctx.peer_fi) : NULL; + enum osmo_pfcp_cause *cause = osmo_pfcp_msg_cause(m); + + if (fi) + OSMO_STRBUF_PRINTF(sb, "%s{%s}: ", + osmo_fsm_inst_name(fi), + osmo_fsm_state_name(fi->fsm, fi->state)); + else + OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &m->remote_addr); + OSMO_STRBUF_PRINTF(sb, "%s PFCP seq-%u", + m->rx ? "-rx->" : "<-tx-", + m->h.sequence_nr); + if (m->h.seid_present) + OSMO_STRBUF_PRINTF(sb, " SEID-0x%"PRIx64, m->h.seid); + + OSMO_STRBUF_PRINTF(sb, " %s", osmo_pfcp_message_type_str(m->h.message_type)); + if (cause) + OSMO_STRBUF_PRINTF(sb, ": %s", osmo_pfcp_cause_str(*cause)); + return sb.chars_needed; +} + +char *osmo_pfcp_msg_log_info_c(void *ctx, const struct osmo_pfcp_msg *m) +{ + OSMO_NAME_C_IMPL(ctx, 128, "ERROR", osmo_pfcp_msg_log_info_buf, m) +} -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/32173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Ic84090c9b1a34185577cfb2ea1efa9c07542df34 Gerrit-Change-Number: 32173 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: bts-rbs2k: Simplify osmo_fsm_inst_alloc_child_id()
by fixeria 31 Mar '23

31 Mar '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32160 ) Change subject: bts-rbs2k: Simplify osmo_fsm_inst_alloc_child_id() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5344161e5a65ae9959684f0fda7f8b06cbb447f3 Gerrit-Change-Number: 32160 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 31 Mar 2023 01:47:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: Move paging queue specific handling to signal callback outside RSL code
by fixeria 31 Mar '23

31 Mar '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32159 ) Change subject: Move paging queue specific handling to signal callback outside RSL code ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/paging.c: https://gerrit.osmocom.org/c/osmo-bsc/+/32159/comment/41980f86_9561a91f PS1, Line 855: paging_update_buffer_space This function can be made static now? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iabc1c29908a5136501d6dc6e60f8777dab511b86 Gerrit-Change-Number: 32159 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 31 Mar 2023 01:46:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: modem: initial SM layer support through libosmo-gprs-sm
by fixeria 31 Mar '23

31 Mar '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32155 ) Change subject: modem: initial SM layer support through libosmo-gprs-sm ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9476d93954c7dc348e6f97ca89eaa651f802f9a0 Gerrit-Change-Number: 32155 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 31 Mar 2023 01:43:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: gprs: use sane default local UDP ports for NSVSs
by fixeria 31 Mar '23

31 Mar '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32170 ) Change subject: gprs: use sane default local UDP ports for NSVSs ...................................................................... gprs: use sane default local UDP ports for NSVSs 0 is not a valid bind port for the PCU and can never work. Let's set default local UDP ports for NSVSs to (23100 + i), because osmo-sgsn bind()s at 23000 by default and we don't want any conflists. Change-Id: Ifadc37c6fd9b5fa9cc2e2c31ee82347693d39aec Related: OS#5979 --- M src/osmo-bsc/bts_sm.c M tests/gprs_params.vty 2 files changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/70/32170/1 diff --git a/src/osmo-bsc/bts_sm.c b/src/osmo-bsc/bts_sm.c index ca572f1..958e45e 100644 --- a/src/osmo-bsc/bts_sm.c +++ b/src/osmo-bsc/bts_sm.c @@ -80,6 +80,8 @@ sizeof(bts_sm->gprs.nse.timer)); for (i = 0; i < ARRAY_SIZE(bts_sm->gprs.nsvc); i++) { + /* sane default value for the local UDP port */ + bts_sm->gprs.nsvc[i].local_port = 23100 + i; bts_sm->gprs.nsvc[i].bts = bts; bts_sm->gprs.nsvc[i].id = i; bts_sm->gprs.nsvc[i].mo.fi = osmo_fsm_inst_alloc( diff --git a/tests/gprs_params.vty b/tests/gprs_params.vty index 87c64b1..3edc540 100644 --- a/tests/gprs_params.vty +++ b/tests/gprs_params.vty @@ -42,7 +42,7 @@ gprs ns timer tns-alive 3 gprs ns timer tns-alive-retries 10 gprs nsvc 0 nsvci 0 - gprs nsvc 0 local udp port 0 + gprs nsvc 0 local udp port 23100 gprs nsvc 1 nsvci 0 - gprs nsvc 1 local udp port 0 + gprs nsvc 1 local udp port 23101 ... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ifadc37c6fd9b5fa9cc2e2c31ee82347693d39aec Gerrit-Change-Number: 32170 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0