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

[S] Change in osmo-bts[master]: Fix incorrect order of params passed to logging macro

by falconia

Attention is currently required from: keith. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34085 ) Change subject: Fix incorrect order of params passed to logging macro ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie1ad41210280ae5dbe693de6bdc4378ff34621b7 Gerrit-Change-Number: 34085 Gerrit-PatchSet: 1 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Fri, 04 Aug 2023 22:27:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: Fix incorrect order of params passed to logging macro

by pespin

Attention is currently required from: falconia, keith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34085 ) Change subject: Fix incorrect order of params passed to logging macro ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie1ad41210280ae5dbe693de6bdc4378ff34621b7 Gerrit-Change-Number: 34085 Gerrit-PatchSet: 1 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Fri, 04 Aug 2023 22:15:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: Fix incorrect order of params passed to logging macro

by keith

keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34085 ) Change subject: Fix incorrect order of params passed to logging macro ...................................................................... Fix incorrect order of params passed to logging macro Stops log lines like: 'DOML unknown 0x239616 (bts=0,trx=0,ts=1,ss=0) [....]' Change-Id: Ie1ad41210280ae5dbe693de6bdc4378ff34621b7 --- M src/osmo-bts-sysmo/tch.c 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/85/34085/1 diff --git a/src/osmo-bts-sysmo/tch.c b/src/osmo-bts-sysmo/tch.c index 0109771..a0d1cf8 100644 --- a/src/osmo-bts-sysmo/tch.c +++ b/src/osmo-bts-sysmo/tch.c @@ -635,7 +635,7 @@ if (is_recv_only(lchan->abis_ip.speech_mode)) return -EAGAIN; - LOGPLCFN(lchan, DL1P, LOGL_DEBUG, data_ind->u32Fn, "chan_nr %d Rx FACCH\n", chan_nr); + LOGPLCFN(lchan, data_ind->u32Fn, DL1P, LOGL_DEBUG, "chan_nr %d Rx FACCH\n", chan_nr); /* Push empty payload to upper layers */ rmsg = msgb_alloc_headroom(256, 128, "L1P-to-RTP"); return add_l1sap_header(trx, rmsg, lchan, chan_nr, data_ind->u32Fn, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie1ad41210280ae5dbe693de6bdc4378ff34621b7 Gerrit-Change-Number: 34085 Gerrit-PatchSet: 1 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[M] Change in libosmo-netif[master]: stream_cli: Forward SCTP MSG_NOTIFICATION to upper layers

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/34080 to look at the new patch set (#3). Change subject: stream_cli: Forward SCTP MSG_NOTIFICATION to upper layers ...................................................................... stream_cli: Forward SCTP MSG_NOTIFICATION to upper layers Same mechanism as already used in stream_srv. Change-Id: I4cb94d264109f1b763cccd44c6ba049cc7509319 --- M src/stream_cli.c 1 file changed, 120 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/80/34080/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I4cb94d264109f1b763cccd44c6ba049cc7509319 Gerrit-Change-Number: 34080 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[M] Change in libosmo-netif[master]: stream_srv: Log SCTP REMOTE_ERROR events

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34084 ) Change subject: stream_srv: Log SCTP REMOTE_ERROR events ...................................................................... stream_srv: Log SCTP REMOTE_ERROR events The event was enabled but was not being logged. Change-Id: I49f5a648fd474e320101424fb6873a37442339bf --- M include/osmocom/netif/sctp.h M src/sctp.c M src/stream_srv.c 3 files changed, 54 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/84/34084/1 diff --git a/include/osmocom/netif/sctp.h b/include/osmocom/netif/sctp.h index f0c52cf..bb8acda 100644 --- a/include/osmocom/netif/sctp.h +++ b/include/osmocom/netif/sctp.h @@ -27,3 +27,24 @@ extern const struct value_string osmo_sctp_sn_error_strs[]; static inline const char *osmo_sctp_sn_error_str(enum sctp_sn_error val) { return get_value_string(osmo_sctp_sn_error_strs, val); } + +enum osmo_sctp_op_error { + OSMO_SCTP_OP_ERR_INVALID_STREAM_ID = 1, + OSMO_SCTP_OP_ERR_MISS_MAND_PARAM = 2, + OSMO_SCTP_OP_ERR_STALE_COOKIE = 3, + OSMO_SCTP_OP_ERR_NO_RESOURCES = 4, + OSMO_SCTP_OP_ERR_UNRESOLV_ADDR = 5, + OSMO_SCTP_OP_ERR_UNKN_CHUNK_TYPE = 6, + OSMO_SCTP_OP_ERR_INVALID_MAND_PARAM = 7, + OSMO_SCTP_OP_ERR_UNKN_PARAM = 8, + OSMO_SCTP_OP_ERR_NO_USER_DATA = 9, + OSMO_SCTP_OP_ERR_COOKIE_RX_WHILE_SHUTDOWN = 10, + OSMO_SCTP_OP_ERR_RESTART_ASSC_NEW_ADDR = 11, + OSMO_SCTP_OP_ERR_UNER_INITED_ABORT = 12, + OSMO_SCTP_OP_ERR_PROTO_VERSION = 13, +}; + + +extern const struct value_string osmo_sctp_op_error_strs[]; +static inline const char *osmo_sctp_op_error_str(enum osmo_sctp_op_error val) +{ return get_value_string(osmo_sctp_op_error_strs, val); } diff --git a/src/sctp.c b/src/sctp.c index c1b57db..7f4f54b 100644 --- a/src/sctp.c +++ b/src/sctp.c @@ -51,3 +51,21 @@ { SCTP_PEER_FAULTY, "PEER_FAULTY" }, { 0, NULL } }; + +/* rfc4960 section 3.3.10 "Operation Error", in host byte order */ +const struct value_string osmo_sctp_op_error_strs[] = { + { OSMO_SCTP_OP_ERR_INVALID_STREAM_ID, "Invalid Stream Identifier" }, + { OSMO_SCTP_OP_ERR_MISS_MAND_PARAM, "Missing Mandatory Parameter" }, + { OSMO_SCTP_OP_ERR_STALE_COOKIE, "Stale Cookie Error" }, + { OSMO_SCTP_OP_ERR_NO_RESOURCES, "Out of Resource" }, + { OSMO_SCTP_OP_ERR_UNRESOLV_ADDR, "Unresolvable Address" }, + { OSMO_SCTP_OP_ERR_UNKN_CHUNK_TYPE, "Unrecognized Chunk Type" }, + { OSMO_SCTP_OP_ERR_INVALID_MAND_PARAM, "Invalid Mandatory Parameter" }, + { OSMO_SCTP_OP_ERR_UNKN_PARAM, "Unrecognized Parameters" }, + { OSMO_SCTP_OP_ERR_NO_USER_DATA, "No User Data" }, + { OSMO_SCTP_OP_ERR_COOKIE_RX_WHILE_SHUTDOWN, "Cookie Received While Shutting Down" }, + { OSMO_SCTP_OP_ERR_RESTART_ASSC_NEW_ADDR, "Restart of an Association with New Addresses" }, + { OSMO_SCTP_OP_ERR_UNER_INITED_ABORT, "User Initiated Abort" }, + { OSMO_SCTP_OP_ERR_PROTO_VERSION, "Protocol Violation" }, + { 0, NULL } +}; diff --git a/src/stream_srv.c b/src/stream_srv.c index 970ea65..9544b9b 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -891,6 +891,10 @@ /* RFC6458 3.1.4: Any attempt to send more data will cause sendmsg() * to return with an ESHUTDOWN error. */ break; + case SCTP_REMOTE_ERROR: + LOGP(DLINP, LOGL_INFO, "===> REMOTE ERROR: %s\n", + osmo_sctp_op_error_str(ntohs(notif->sn_remote_error.sre_error))); + break; } return -EAGAIN; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I49f5a648fd474e320101424fb6873a37442339bf Gerrit-Change-Number: 34084 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream_srv: sctp: Log error cause of COMM_LOST event

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34083 ) Change subject: stream_srv: sctp: Log error cause of COMM_LOST event ...................................................................... stream_srv: sctp: Log error cause of COMM_LOST event RFC 6458 6.1.1: """ sac_error: If the state was reached due to an error condition (e.g., SCTP_COMM_LOST), any relevant error information is available in this field. This corresponds to the protocol error codes defined in [RFC4960]. """ Change-Id: Ie48360d22ce1e35eefb1a305dde106948dfa80e8 --- M src/stream_srv.c 1 file changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/83/34083/1 diff --git a/src/stream_srv.c b/src/stream_srv.c index c1d3739..970ea65 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -856,7 +856,8 @@ LOGPC(DLINP, LOGL_INFO, " UP\n"); break; case SCTP_COMM_LOST: - LOGPC(DLINP, LOGL_INFO, " LOST\n"); + LOGPC(DLINP, LOGL_INFO, " COMM_LOST (err: %s)\n", + osmo_sctp_sn_error_str(notif->sn_assoc_change.sac_error)); /* Handle this like a regular disconnect */ return 0; case SCTP_RESTART: -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie48360d22ce1e35eefb1a305dde106948dfa80e8 Gerrit-Change-Number: 34083 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: sctp: Document relevant RFC specs

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/34082 to look at the new patch set (#2). Change subject: sctp: Document relevant RFC specs ...................................................................... sctp: Document relevant RFC specs Change-Id: Iae325b787fdb7fc95aa6922975a7e1fcf368527a --- M include/osmocom/netif/sctp.h 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/82/34082/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iae325b787fdb7fc95aa6922975a7e1fcf368527a Gerrit-Change-Number: 34082 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: sctp: Document relevant RFC specs

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34082 ) Change subject: sctp: Document relevant RFC specs ...................................................................... sctp: Document relevant RFC specs Change-Id: Iae325b787fdb7fc95aa6922975a7e1fcf368527a --- M include/osmocom/netif/sctp.h 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/82/34082/1 diff --git a/include/osmocom/netif/sctp.h b/include/osmocom/netif/sctp.h index 0b64824..2cb74fd 100644 --- a/include/osmocom/netif/sctp.h +++ b/include/osmocom/netif/sctp.h @@ -2,6 +2,12 @@ #include <osmocom/core/utils.h> +/* Relevant SCTP RFCs: + * rfc4960: SCTP protocol + * rfc5061: SCTP Dynamic Address Reconfiguration + * rfc6458: SCTP Sockets API Extensions + */ + enum sctp_sac_state; extern const struct value_string osmo_sctp_assoc_chg_strs[]; static inline const char *osmo_sctp_assoc_chg_str(enum sctp_sac_state val) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iae325b787fdb7fc95aa6922975a7e1fcf368527a Gerrit-Change-Number: 34082 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[M] Change in libosmo-netif[master]: stream_cli: Forward SCTP MSG_NOTIFICATION to upper layers

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/34080 to look at the new patch set (#2). Change subject: stream_cli: Forward SCTP MSG_NOTIFICATION to upper layers ...................................................................... stream_cli: Forward SCTP MSG_NOTIFICATION to upper layers Same mechanism as already used in stream_srv. Change-Id: I4cb94d264109f1b763cccd44c6ba049cc7509319 --- M src/stream_cli.c 1 file changed, 115 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/80/34080/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I4cb94d264109f1b763cccd44c6ba049cc7509319 Gerrit-Change-Number: 34080 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream_srv: Increase logging level of SCTP MSG_NOTIFICATION lines

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34081 ) Change subject: stream_srv: Increase logging level of SCTP MSG_NOTIFICATION lines ...................................................................... stream_srv: Increase logging level of SCTP MSG_NOTIFICATION lines Those are events affecting the state of the link, so it makes sense to have a higher level than debug. Change-Id: I0ed84cc2effb71b6ef1f6efb3f8b663c602a5a31 --- M src/stream_srv.c 1 file changed, 22 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/81/34081/1 diff --git a/src/stream_srv.c b/src/stream_srv.c index 554596d..c1d3739 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -845,33 +845,33 @@ msgb_sctp_stream(msg) = sinfo.sinfo_stream; if (flags & MSG_NOTIFICATION) { union sctp_notification *notif = (union sctp_notification *)data; - LOGP(DLINP, LOGL_DEBUG, "NOTIFICATION %u flags=0x%x\n", notif->sn_header.sn_type, notif->sn_header.sn_flags); + LOGP(DLINP, LOGL_INFO, "NOTIFICATION %u flags=0x%x\n", notif->sn_header.sn_type, notif->sn_header.sn_flags); msgb_put(msg, sizeof(union sctp_notification)); msgb_sctp_msg_flags(msg) = OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION; switch (notif->sn_header.sn_type) { case SCTP_ASSOC_CHANGE: - LOGP(DLINP, LOGL_DEBUG, "===> ASSOC CHANGE:"); + LOGP(DLINP, LOGL_INFO, "===> ASSOC CHANGE:"); switch (notif->sn_assoc_change.sac_state) { case SCTP_COMM_UP: - LOGPC(DLINP, LOGL_DEBUG, " UP\n"); + LOGPC(DLINP, LOGL_INFO, " UP\n"); break; case SCTP_COMM_LOST: - LOGPC(DLINP, LOGL_DEBUG, " LOST\n"); + LOGPC(DLINP, LOGL_INFO, " LOST\n"); /* Handle this like a regular disconnect */ return 0; case SCTP_RESTART: - LOGPC(DLINP, LOGL_DEBUG, " RESTART\n"); + LOGPC(DLINP, LOGL_INFO, " RESTART\n"); break; case SCTP_SHUTDOWN_COMP: - LOGPC(DLINP, LOGL_DEBUG, " SHUTDOWN COMP\n"); + LOGPC(DLINP, LOGL_INFO, " SHUTDOWN COMP\n"); break; case SCTP_CANT_STR_ASSOC: - LOGPC(DLINP, LOGL_DEBUG, " CANT STR ASSOC\n"); + LOGPC(DLINP, LOGL_INFO, " CANT STR ASSOC\n"); break; } break; case SCTP_SEND_FAILED: - LOGP(DLINP, LOGL_DEBUG, "===> SEND FAILED\n"); + LOGP(DLINP, LOGL_INFO, "===> SEND FAILED\n"); break; case SCTP_PEER_ADDR_CHANGE: { @@ -879,14 +879,14 @@ struct sockaddr_storage sa = notif->sn_paddr_change.spc_aaddr; osmo_sockaddr_to_str_buf(addr_str, sizeof(addr_str), (const struct osmo_sockaddr *)&sa); - LOGP(DLINP, LOGL_DEBUG, "===> PEER ADDR CHANGE: %s %s err=%s\n", + LOGP(DLINP, LOGL_INFO, "===> PEER ADDR CHANGE: %s %s err=%s\n", addr_str, osmo_sctp_paddr_chg_str(notif->sn_paddr_change.spc_state), (notif->sn_paddr_change.spc_state == SCTP_ADDR_UNREACHABLE) ? osmo_sctp_sn_error_str(notif->sn_paddr_change.spc_error) : "None"); } break; case SCTP_SHUTDOWN_EVENT: - LOGP(DLINP, LOGL_DEBUG, "===> SHUTDOWN EVT\n"); + LOGP(DLINP, LOGL_INFO, "===> SHUTDOWN EVT\n"); /* RFC6458 3.1.4: Any attempt to send more data will cause sendmsg() * to return with an ESHUTDOWN error. */ break; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I0ed84cc2effb71b6ef1f6efb3f8b663c602a5a31 Gerrit-Change-Number: 34081 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[M] Change in docker-playground[master]: ttcn3: use debian-bookworm-titan

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34049 ) Change subject: ttcn3: use debian-bookworm-titan ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2017dd3888670c475b96e692d911a433484f3df9 Gerrit-Change-Number: 34049 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Aug 2023 16:09:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in docker-playground[master]: debian-bookworm-titan{,-master}: new containers

by laforge

Attention is currently required from: osmith, daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34048 ) Change subject: debian-bookworm-titan{,-master}: new containers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4415fcde6518bd26d1e2cb5785ddaf84ac2116b3 Gerrit-Change-Number: 34048 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Aug 2023 16:09:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SGSN_Tests: add missing RIM ROUTING ADDRESS field in request

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34077 ) Change subject: SGSN_Tests: add missing RIM ROUTING ADDRESS field in request ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34077/comment/f8d88b69_bbab… PS1, Line 13: AFAIU the spec you are mentioning clearly states the opposite: Those are OPTIONAL. It even says: """ If RIM Routing Address Discriminator IE is not included, the RIM Routing Address shall be processed as an RNC identifier, or as if "RIM Routing Address discriminator = 0001". """ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34077 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: Id944c66f28d787a18c6c6f7c9dc885997d83e94c Gerrit-Change-Number: 34077 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Aug 2023 15:53:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: GTP_Templates: add function to encode RIM_Routing_Address_GTPC

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34076 ) Change subject: GTP_Templates: add function to encode RIM_Routing_Address_GTPC ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: You could add a decode function while at it, I assume we'll also need it? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34076 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: I45d1f5b019f3847fd611c38dc19d78d6fe027c5a Gerrit-Change-Number: 34076 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Aug 2023 15:51:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: GTP_Templates: Add templates for RIM ROUTING ADDRESS

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34075 ) Change subject: GTP_Templates: Add templates for RIM ROUTING ADDRESS ...................................................................... Patch Set 1: (2 comments) File library/GTP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34075/comment/92f33ccc_a0d6… PS1, Line 1443: template RIM_RoutingAddress tr_RIM_RoutingAddress(template octetstring addr_value := ?) := { template (present) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34075/comment/2e884205_7196… PS1, Line 1456: template RIM_RoutingAddress_Discriminator tr_RIM_RoutingAddress_Discriminator(template bitstring addr_discr := ?) := { template (present) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34075 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: If79f94ac3b7ec9a76763141ee2d8cac50c69d60b Gerrit-Change-Number: 34075 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Aug 2023 15:50:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[XL] Change in libosmo-netif[master]: stream: Split cli/srv specific code out of stream.c

by pespin

Attention is currently required from: laforge, fixeria, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34057 ) Change subject: stream: Split cli/srv specific code out of stream.c ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: > are we sure this re-factoring doesn't clash with ongoing osmo_io work? We should always avoid to do […] Most of the io work was already merged, at least the initial big commits, so I expect minimal crash now. In any case, I'm also doing a lot of ongoing work now in order to improve libosmo-sccp Primary Address on top of this commit. I think I already provided a big amount of time (lots of weeks, even months?) to get whatever work there merged. Furthermore, this split should also make it easier to submit new patches regarding io in the future. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I22af01bba2040eb320ba48fd1b46c090c98be159 Gerrit-Change-Number: 34057 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Aug 2023 15:48:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream_srv: Handle ESHUTDOWN and other write() errors destroying the ...

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/34078 to look at the new patch set (#2). Change subject: stream_srv: Handle ESHUTDOWN and other write() errors destroying the socket ...................................................................... stream_srv: Handle ESHUTDOWN and other write() errors destroying the socket If internal send() fails with a fatal error, it should destroy the socket. The user will know about the event through the close_cb() called during osmo_stream_srv_destroy(). As a result, the socket is not closed when receiving SHUTDOWN by the peer (through SCTP MSG_NOTIFICATION), but keep it alive since the socket can still keep receiving data from the peer. Only fail if write() to that read-only socket is attempted. Related: OS#6134 Change-Id: I84ddebabdffe47733cb529bcfebec8757e6a172b --- M src/stream_srv.c 1 file changed, 34 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/78/34078/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I84ddebabdffe47733cb529bcfebec8757e6a172b Gerrit-Change-Number: 34078 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream_cli: Proper handling of send() socket errors

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34079 ) Change subject: stream_cli: Proper handling of send() socket errors ...................................................................... stream_cli: Proper handling of send() socket errors Upon EAGAIN, simply re-enqueue the message and return waiting for next poll. Upon any other error, force close + reconnect. Related: OS#6134 Change-Id: I462cb176ebc51f3e99ee796310e8665144c84ccc --- M src/stream_cli.c 1 file changed, 22 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/79/34079/1 diff --git a/src/stream_cli.c b/src/stream_cli.c index 0e075b8..e90b5e4 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -288,9 +288,15 @@ } if (ret < 0) { - if (errno == EPIPE || errno == ENOTCONN) - osmo_stream_cli_reconnect(cli); - LOGSCLI(cli, LOGL_ERROR, "received error %d in response to send\n", errno); + int err = errno; + LOGSCLI(cli, LOGL_ERROR, "error to send: %s\n", strerror(err)); + if (err == EAGAIN) { + /* Re-add at the start of the queue to re-attempt: */ + llist_add(&msg->list, &cli->tx_queue); + return 0; + } + msgb_free(msg); + osmo_stream_cli_reconnect(cli); } msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I462cb176ebc51f3e99ee796310e8665144c84ccc Gerrit-Change-Number: 34079 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[M] Change in libosmo-netif[master]: WIP: stream_cli: Forward SCTP MSG_NOTIFICATION to upper layers

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34080 ) Change subject: WIP: stream_cli: Forward SCTP MSG_NOTIFICATION to upper layers ...................................................................... WIP: stream_cli: Forward SCTP MSG_NOTIFICATION to upper layers Same mechanism as already used in strea_srv. Change-Id: I4cb94d264109f1b763cccd44c6ba049cc7509319 --- M src/stream_cli.c 1 file changed, 114 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/80/34080/1 diff --git a/src/stream_cli.c b/src/stream_cli.c index e90b5e4..cc63297 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -913,18 +913,119 @@ } } +#ifdef HAVE_LIBSCTP +static int _sctp_recvmsg_wrapper(int fd, struct msgb *msg) +{ + struct sctp_sndrcvinfo sinfo; + int flags = 0; + int ret; + uint8_t *data = msg->tail; + + ret = sctp_recvmsg(fd, data, msgb_tailroom(msg), + NULL, NULL, &sinfo, &flags); + msgb_sctp_msg_flags(msg) = 0; + msgb_sctp_ppid(msg) = ntohl(sinfo.sinfo_ppid); + msgb_sctp_stream(msg) = sinfo.sinfo_stream; + if (flags & MSG_NOTIFICATION) { + union sctp_notification *notif = (union sctp_notification *)data; + LOGP(DLINP, LOGL_INFO, "NOTIFICATION %u flags=0x%x\n", notif->sn_header.sn_type, notif->sn_header.sn_flags); + msgb_put(msg, sizeof(union sctp_notification)); + msgb_sctp_msg_flags(msg) = OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION; + switch (notif->sn_header.sn_type) { + case SCTP_ASSOC_CHANGE: + LOGP(DLINP, LOGL_INFO, "===> ASSOC CHANGE:"); + switch (notif->sn_assoc_change.sac_state) { + case SCTP_COMM_UP: + LOGPC(DLINP, LOGL_INFO, " UP\n"); + break; + case SCTP_COMM_LOST: + LOGPC(DLINP, LOGL_INFO, " LOST\n"); + /* Handle this like a regular disconnect */ + return 0; + case SCTP_RESTART: + LOGPC(DLINP, LOGL_INFO, " RESTART\n"); + break; + case SCTP_SHUTDOWN_COMP: + LOGPC(DLINP, LOGL_INFO, " SHUTDOWN COMP\n"); + break; + case SCTP_CANT_STR_ASSOC: + LOGPC(DLINP, LOGL_INFO, " CANT STR ASSOC\n"); + break; + } + break; + case SCTP_SEND_FAILED: + LOGP(DLINP, LOGL_INFO, "===> SEND FAILED\n"); + break; + case SCTP_PEER_ADDR_CHANGE: + { + char addr_str[INET6_ADDRSTRLEN + 10]; + struct sockaddr_storage sa = notif->sn_paddr_change.spc_aaddr; + osmo_sockaddr_to_str_buf(addr_str, sizeof(addr_str), + (const struct osmo_sockaddr *)&sa); + LOGP(DLINP, LOGL_INFO, "===> PEER ADDR CHANGE: %s %s err=%s\n", + addr_str, osmo_sctp_paddr_chg_str(notif->sn_paddr_change.spc_state), + (notif->sn_paddr_change.spc_state == SCTP_ADDR_UNREACHABLE) ? + osmo_sctp_sn_error_str(notif->sn_paddr_change.spc_error) : "None"); + } + break; + case SCTP_SHUTDOWN_EVENT: + LOGP(DLINP, LOGL_INFO, "===> SHUTDOWN EVT\n"); + /* Handle this like a regular disconnect */ + return 0; + } + return -EAGAIN; + } + return ret; +} +#endif + /*! \brief Receive data via an Osmocom stream client * \param[in] cli Stream Client through which we want to send * \param msg pre-allocate message buffer to which received data is appended - * \returns number of bytes read; <=0 in case of error */ + * \returns number of bytes read; <=0 in case of erro + * + * If conn is an SCTP connection, additional specific considerations shall be taken: + * - msg->cb is always filled with SCTP ppid, and SCTP stream values, see msgb_sctp_*() APIs. + * - If an SCTP notification was received when reading from the SCTP socket, + * msgb_sctp_msg_flags(msg) will contain bit flag + * OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION set, and the msgb will + * contain a "union sctp_notification" instead of user data. In this case the + * return code will be either 0 (if conn is considered dead after the + * notification) or -EAGAIN (if conn is considered still alive after the + * notification) resembling the standard recv() API. + */ int osmo_stream_cli_recv(struct osmo_stream_cli *cli, struct msgb *msg) { int ret; OSMO_ASSERT(cli); OSMO_ASSERT(msg); - ret = recv(cli->ofd.fd, msg->tail, msgb_tailroom(msg), 0); + switch (cli->sk_domain) { + case AF_UNIX: + ret = recv(cli->ofd.fd, msg->tail, msgb_tailroom(msg), 0); + break; + case AF_INET: + case AF_INET6: + case AF_UNSPEC: + switch (cli->proto) { +#ifdef HAVE_LIBSCTP + case IPPROTO_SCTP: + ret = _sctp_recvmsg_wrapper(cli->ofd.fd, msg); + break; +#endif + case IPPROTO_TCP: + default: + ret = recv(cli->ofd.fd, msg->tail, msgb_tailroom(msg), 0); + break; + } + break; + default: + ret = -ENOTSUP; + } + if (ret < 0) { + if (ret == -EAGAIN) + return ret; if (errno == EPIPE || errno == ECONNRESET) LOGSCLI(cli, LOGL_ERROR, "lost connection with srv\n"); osmo_stream_cli_reconnect(cli); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I4cb94d264109f1b763cccd44c6ba049cc7509319 Gerrit-Change-Number: 34080 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream_srv: Handle ESHUTDOWN and other write() errors destroying the ...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34078 ) Change subject: stream_srv: Handle ESHUTDOWN and other write() errors destroying the socket ...................................................................... stream_srv: Handle ESHUTDOWN and other write() errors destroying the socket If internal send() fails with a fatal error, it should destroy the socket. The user will know about the event through the close_cb() called during osmo_stream_srv_destroy(). As a result, the socket is not closed when receiving SHUTDOWN by the peer (through SCTP MSG_NOTIFICATION), but keep it alive since the socket can still keep receiving data from the peer. Only fail if write() to that read-only socket is attempted. Change-Id: I84ddebabdffe47733cb529bcfebec8757e6a172b --- M src/stream_srv.c 1 file changed, 33 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/78/34078/1 diff --git a/src/stream_srv.c b/src/stream_srv.c index be43a80..554596d 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -588,8 +588,18 @@ return; } - if (ret == -1) /* send(): On error -1 is returned, and errno is set appropriately */ - LOGSSRV(conn, LOGL_ERROR, "error to send: %s\n", strerror(errno)); + if (ret == -1) {/* send(): On error -1 is returned, and errno is set appropriately */ + int err = errno; + LOGSSRV(conn, LOGL_ERROR, "error to send: %s\n", strerror(err)); + if (err == EAGAIN) { + /* Re-add at the start of the queue to re-attempt: */ + llist_add(&msg->list, &conn->tx_queue); + return; + } + msgb_free(msg); + osmo_stream_srv_destroy(conn); + return; + } msgb_free(msg); @@ -877,8 +887,9 @@ break; case SCTP_SHUTDOWN_EVENT: LOGP(DLINP, LOGL_DEBUG, "===> SHUTDOWN EVT\n"); - /* Handle this like a regular disconnect */ - return 0; + /* RFC6458 3.1.4: Any attempt to send more data will cause sendmsg() + * to return with an ESHUTDOWN error. */ + break; } return -EAGAIN; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I84ddebabdffe47733cb529bcfebec8757e6a172b Gerrit-Change-Number: 34078 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SGSN_Tests: add missing RIM ROUTING ADDRESS field in request

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34077 ) Change subject: SGSN_Tests: add missing RIM ROUTING ADDRESS field in request ...................................................................... SGSN_Tests: add missing RIM ROUTING ADDRESS field in request When sending the RAN INFORMATION REQUEST on GTP-C, we do not add a RIM ROUTING ADDRESS + RIM ROUTING ADDRESS DISCRIMINATOR field next to the RAN TRANSPARENT CONTAINER. Those two fields are requred by the spec, see also: 3gpp TS 29.060, section 7.5.14 Change-Id: Id944c66f28d787a18c6c6f7c9dc885997d83e94c Related: OS#6095 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/77/34077/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index ac25caa..4af44ee 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -3478,6 +3478,8 @@ var template (value) RIM_Routing_Address_GTPC gtpc_dst_addr, gtpc_src_addr; var template (value) RAN_Information_Request_RIM_Container_GTPC gtpc_rim_req_cont; var template (value) PDU_BSSGP_RAN_INFORMATION_REQUEST_GTPC gtpc_bssgp_cont; + var template (value) RIM_RoutingAddress gtpc_rim_ra; + var template (value) RIM_RoutingAddress_Discriminator gtpc_rim_ra_discr; var template (value) Gtp1cUnitdata gtpc_pdu; gtpc_dst_addr := t_GTPC_RIM_Routing_Address_cid(gtp_ci); @@ -3492,7 +3494,12 @@ gtpc_bssgp_cont := ts_GTPC_RAN_Information_Request(ts_GTPC_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, gtpc_dst_addr), ts_GTPC_RIM_Routing_Information(RIM_ADDR_EUTRAN_NODEB_ID, gtpc_src_addr), gtpc_rim_req_cont); - gtpc_pdu := ts_GTPC_RANInfoRelay(peer, ts_RANTransparentContainer_RAN_INFO_REQ(gtpc_bssgp_cont)); + + /* Assemble RIM Routing Address (essentially a copy of the destination cell identifier)*/ + gtpc_rim_ra := ts_RIM_RoutingAddress(enc_RIM_Routing_Address_GTPC(valueof(gtpc_dst_addr))); + gtpc_rim_ra_discr := ts_RIM_RoutingAddress_Discriminator(hex2bit(RIM_ADDR_GERAN_CELL_ID)); + gtpc_pdu := ts_GTPC_RANInfoRelay(peer, ts_RANTransparentContainer_RAN_INFO_REQ(gtpc_bssgp_cont), + gtpc_rim_ra, gtpc_rim_ra_discr); GTPC.send(gtpc_pdu); var template RIM_Routing_Address bssgp_dst_addr, bssgp_src_addr; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34077 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: Id944c66f28d787a18c6c6f7c9dc885997d83e94c Gerrit-Change-Number: 34077 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: GTP_Templates: Add templates for RIM ROUTING ADDRESS

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34075 ) Change subject: GTP_Templates: Add templates for RIM ROUTING ADDRESS ...................................................................... GTP_Templates: Add templates for RIM ROUTING ADDRESS The IE types RIM_RoutingAddress and RIM_RoutingAddress_Discriminator have not coresponding templates yet. Related: OS#6095 Change-Id: If79f94ac3b7ec9a76763141ee2d8cac50c69d60b --- M library/GTP_Templates.ttcn 1 file changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/34075/1 diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index f6fda36..adae38f 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -1433,4 +1433,30 @@ peer := peer, gtpu := ts_GTP1U_PDU('FF'O, seq, teid, { g_PDU_IEs := { data := data }}) } + + /* 3GPP TS 29.060, section 7.7.57 */ + template (value) RIM_RoutingAddress ts_RIM_RoutingAddress(octetstring addr_value) := { + type_gtpc := '9F'O, + lengthf := 0, /* we assume encoder overwrites this */ + rIM_RoutingAddressValue := addr_value + } + template RIM_RoutingAddress tr_RIM_RoutingAddress(template octetstring addr_value := ?) := { + type_gtpc := '9F'O, + lengthf := ?, + rIM_RoutingAddressValue := addr_value + } + + /* 3GPP TS 29.060, section 7.7.77 */ + template (value) RIM_RoutingAddress_Discriminator ts_RIM_RoutingAddress_Discriminator(bitstring addr_discr) := { + type_gtpc := 'B2'O, + lengthf := 0, /* we assume encoder overwrites this */ + rra_discriminator := addr_discr, + spare := '0000'B + } + template RIM_RoutingAddress_Discriminator tr_RIM_RoutingAddress_Discriminator(template bitstring addr_discr := ?) := { + type_gtpc := 'B2'O, + lengthf := ?, + rra_discriminator := addr_discr, + spare := '0000'B + } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34075 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: If79f94ac3b7ec9a76763141ee2d8cac50c69d60b Gerrit-Change-Number: 34075 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: MME_Tests: add testcase TC_RIM_RAN_INF

by dexter

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33937 to look at the new patch set (#4). Change subject: MME_Tests: add testcase TC_RIM_RAN_INF ...................................................................... MME_Tests: add testcase TC_RIM_RAN_INF The proposed testcase models a full RIM RAN INFORMATION REQUEST that originates at the eNB (S1AP), is forwarded by the MME towards GERAN (GTP) and goes back towards the MME (GTP) and is eventually forwarded by the MME back to the eNB (S1AP). Related: OS#5760 Related: OS#5759 Change-Id: I22d5aaab64df2824099977fb574afb86a4b7e91f --- M mme/MME_Tests.ttcn 1 file changed, 278 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/33937/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33937 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: I22d5aaab64df2824099977fb574afb86a4b7e91f Gerrit-Change-Number: 33937 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: MME_Tests: add testcase TC_RIM_RAN_INF

by dexter

Attention is currently required from: fixeria, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33937 ) Change subject: MME_Tests: add testcase TC_RIM_RAN_INF ...................................................................... Patch Set 4: (2 comments) File mme/MME_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33937/comment/f6dfb479_ce07… PS3, Line 108: global_enb_id_len := 8 > no semicolon? (same below) Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33937/comment/7511515b_47ee… PS3, Line 822: * does not add this information element. */ > it shall not be added to the S1AP MME Direct Information Transfer, see 3GPP TS 36.413 section 8.14. […] Thanks, I remember this now. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33937 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: I22d5aaab64df2824099977fb574afb86a4b7e91f Gerrit-Change-Number: 33937 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Aug 2023 15:27:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: GTP_Templates: add function to encode RIM_Routing_Address_GTPC

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34076 ) Change subject: GTP_Templates: add function to encode RIM_Routing_Address_GTPC ...................................................................... GTP_Templates: add function to encode RIM_Routing_Address_GTPC When forwarding RAN TRANSPARENT CONTAINERs containers on GTP-C, the sender adds a RIM ROUTING ADDRESS and a RIM ROUTING ADDRESS DISCRIMINATOR. The RIM ROUTING ADDRESS is represented as an octet-string, so we need an encoder function for it. Related: OS#6095 Change-Id: I45d1f5b019f3847fd611c38dc19d78d6fe027c5a --- M library/GTP_Templates.ttcn 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/34076/1 diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index adae38f..719eff6 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -1082,6 +1082,8 @@ number_of_SI_PSI := int2bit(si_psi_num, 7), sI_PSI := si_psi } + external function enc_RIM_Routing_Address_GTPC(in RIM_Routing_Address_GTPC ra) return octetstring + with { extension "prototype(convert) encode(RAW)" }; /* RAN_Information_Request */ template (value) RAN_Information_Request_RIM_Container_GTPC -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34076 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: I45d1f5b019f3847fd611c38dc19d78d6fe027c5a Gerrit-Change-Number: 34076 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: call f_pcu_data_req with correct timeslot

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34061 ) Change subject: BTS_Tests: call f_pcu_data_req with correct timeslot ...................................................................... BTS_Tests: call f_pcu_data_req with correct timeslot We are calling f_pcu_data_req() with SAPI PCU_IF_SAPI_AGCH or SAPI PCU_IF_SAPI_PCH and use ts_nr 7. In this particular case, the parameter ts_nr has no effect (see pcu_sock.c in osmo-bts.git). However, to prevent confusion, lets use ts_nr 0 since AGCH and PCH are actually is on TS 0 (on TRX 0). Related: OS#5927 Change-Id: I20566de992809d6c857c9062bf0fb799efa43e45 --- M bts/BTS_Tests.ttcn 1 file changed, 20 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 3602746..93b0ddf 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5792,7 +5792,7 @@ f_l1_tune(L1CTL); f_TC_pcu_act_req(0, 0, 7, true); - f_pcu_data_req(0, 0, 7, 0, 0, PCU_IF_SAPI_AGCH, c_PCU_DATA); + f_pcu_data_req(0, 0, 0, 0, 0, PCU_IF_SAPI_AGCH, c_PCU_DATA); T.start; alt { @@ -5817,13 +5817,13 @@ if (mp_pcuif_version < 11) { /* three characters prefix: last 3 digits of IMSI as ASCII */ - f_pcu_data_req(0, 0, 7, 0, 0, PCU_IF_SAPI_PCH, '313233'O & c_PCU_DATA); + f_pcu_data_req(0, 0, 0, 0, 0, PCU_IF_SAPI_PCH, '313233'O & c_PCU_DATA); } else { var PCUIF_pch_dt pch_dt; pch_dt.tlli := '01020304'O; pch_dt.imsi := "00101000000000123"; pch_dt.data := c_PCU_DATA; - f_pcu_data_req(0, 0, 7, 0, 0, PCU_IF_SAPI_PCH_DT, enc_PCUIF_pch_dt(pch_dt)); + f_pcu_data_req(0, 0, 0, 0, 0, PCU_IF_SAPI_PCH_DT, enc_PCUIF_pch_dt(pch_dt)); } T.start; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34061 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: I20566de992809d6c857c9062bf0fb799efa43e45 Gerrit-Change-Number: 34061 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix comment

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34062 ) Change subject: BTS_Tests: fix comment ...................................................................... BTS_Tests: fix comment The testcase is about PCH, not AGCH Related: OS#5927 Change-Id: I5c2aa1aab261a0f4bfb24b4be7af29c1d814d37a --- M bts/BTS_Tests.ttcn 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 93b0ddf..c5cc9c7 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5806,7 +5806,7 @@ } } -/* Send AGCH from PCU; check it appears on Um side */ +/* Send PCH from PCU; check it appears on Um side */ testcase TC_pcu_data_req_pch() runs on test_CT { timer T := 3.0; f_init_with_pcuif(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34062 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: I5c2aa1aab261a0f4bfb24b4be7af29c1d814d37a Gerrit-Change-Number: 34062 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_CodecPort: mention channel (PCH) in log lines

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34063 ) Change subject: PCUIF_CodecPort: mention channel (PCH) in log lines ...................................................................... PCUIF_CodecPort: mention channel (PCH) in log lines Related: OS#5927 Change-Id: I8a304acfc8894e6b31617756f43632a9c4dd5d23 --- M library/PCUIF_CodecPort.ttcn 1 file changed, 13 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/library/PCUIF_CodecPort.ttcn b/library/PCUIF_CodecPort.ttcn index 0f850e9..8824a11 100644 --- a/library/PCUIF_CodecPort.ttcn +++ b/library/PCUIF_CodecPort.ttcn @@ -174,7 +174,7 @@ setverdict(fail, "expecting tr_PCUIF_DATA_CNF_DT in PCUIF v.11 or later"); mtc.stop; } else { - log("IMM.ASS was sent on fn ", sd.data.u.data_cnf.fn); + log("IMM.ASS was sent on PCH at fn ", sd.data.u.data_cnf.fn); return sd.data.u.data_cnf.fn; } } @@ -183,13 +183,13 @@ setverdict(fail, "expecting tr_PCUIF_DATA_CNF in PCUIF v.10 or earlier"); mtc.stop; } else { - log("IMM.ASS was sent on fn ", sd.data.u.data_cnf_dt.fn); + log("IMM.ASS was sent on PCH at fn ", sd.data.u.data_cnf_dt.fn); return sd.data.u.data_cnf_dt.fn; } } [] pt.receive { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for PCU DATA.cnf"); + setverdict(fail, "Timeout waiting for PCU DATA.cnf (PCH)"); mtc.stop; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34063 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: I8a304acfc8894e6b31617756f43632a9c4dd5d23 Gerrit-Change-Number: 34063 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix log line (AGCH->PCH)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34064 ) Change subject: BTS_Tests: fix log line (AGCH->PCH) ...................................................................... BTS_Tests: fix log line (AGCH->PCH) The testcase TC_pcu_data_req_imm_ass_pch uses the PCH to transmit the IMMEDIATE ASSIGNMENT message but the log line mentions the AGCH. Related: OS#5927 Change-Id: I7cb8d91f2c3f92009d33134167eab856ee02fdab --- M bts/BTS_Tests.ttcn 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index c5cc9c7..1ab0f8a 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5859,7 +5859,7 @@ } [] L1CTL.receive { repeat; } [] T.timeout { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for PCU-originated AGCH block on Um"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for PCU-originated PCH block on Um"); } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34064 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: I7cb8d91f2c3f92009d33134167eab856ee02fdab Gerrit-Change-Number: 34064 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix log line (AGCH->PCH)

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34064 ) Change subject: BTS_Tests: fix log line (AGCH->PCH) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34064 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: I7cb8d91f2c3f92009d33134167eab856ee02fdab Gerrit-Change-Number: 34064 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Aug 2023 14:55:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[XL] Change in libosmo-netif[master]: stream: Split cli/srv specific code out of stream.c

by laforge

Attention is currently required from: pespin, fixeria, daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34057 ) Change subject: stream: Split cli/srv specific code out of stream.c ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: are we sure this re-factoring doesn't clash with ongoing osmo_io work? We should always avoid to do re-structuring on something that's actively being worked on. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I22af01bba2040eb320ba48fd1b46c090c98be159 Gerrit-Change-Number: 34057 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Aug 2023 14:55:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream: Append data to current tail of message upon recv()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34074 ) Change subject: stream: Append data to current tail of message upon recv() ...................................................................... stream: Append data to current tail of message upon recv() The previous behavior was not standarized, and even erratic under some code paths (passing msgb_data() and size=msgb_tailroom()). This patch standarizes the behavior, and makes it possible to append content if the user wishes so instead of erasing old data in the msgb passed to it. Change-Id: I2cfcd4f61545e6a76d84495c3467999efccf22df --- M src/stream_cli.c M src/stream_srv.c 2 files changed, 21 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/74/34074/1 diff --git a/src/stream_cli.c b/src/stream_cli.c index 9845f14..0e075b8 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -917,7 +917,7 @@ OSMO_ASSERT(cli); OSMO_ASSERT(msg); - ret = recv(cli->ofd.fd, msg->data, msg->data_len, 0); + ret = recv(cli->ofd.fd, msg->tail, msgb_tailroom(msg), 0); if (ret < 0) { if (errno == EPIPE || errno == ECONNRESET) LOGSCLI(cli, LOGL_ERROR, "lost connection with srv\n"); diff --git a/src/stream_srv.c b/src/stream_srv.c index 4d8d4d3..be43a80 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -826,14 +826,15 @@ struct sctp_sndrcvinfo sinfo; int flags = 0; int ret; + uint8_t *data = msg->tail; - ret = sctp_recvmsg(fd, msgb_data(msg), msgb_tailroom(msg), + ret = sctp_recvmsg(fd, data, msgb_tailroom(msg), NULL, NULL, &sinfo, &flags); msgb_sctp_msg_flags(msg) = 0; msgb_sctp_ppid(msg) = ntohl(sinfo.sinfo_ppid); msgb_sctp_stream(msg) = sinfo.sinfo_stream; if (flags & MSG_NOTIFICATION) { - union sctp_notification *notif = (union sctp_notification *)msgb_data(msg); + union sctp_notification *notif = (union sctp_notification *)data; LOGP(DLINP, LOGL_DEBUG, "NOTIFICATION %u flags=0x%x\n", notif->sn_header.sn_type, notif->sn_header.sn_flags); msgb_put(msg, sizeof(union sctp_notification)); msgb_sctp_msg_flags(msg) = OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION; @@ -908,7 +909,7 @@ switch (conn->srv->sk_domain) { case AF_UNIX: - ret = recv(conn->ofd.fd, msgb_data(msg), msgb_tailroom(msg), 0); + ret = recv(conn->ofd.fd, msg->tail, msgb_tailroom(msg), 0); break; case AF_INET: case AF_INET6: @@ -921,7 +922,7 @@ #endif case IPPROTO_TCP: default: - ret = recv(conn->ofd.fd, msgb_data(msg), msgb_tailroom(msg), 0); + ret = recv(conn->ofd.fd, msg->tail, msgb_tailroom(msg), 0); break; } break; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I2cfcd4f61545e6a76d84495c3467999efccf22df Gerrit-Change-Number: 34074 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream_srv: Improve logging lines accepting new connections

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34073 ) Change subject: stream_srv: Improve logging lines accepting new connections ...................................................................... stream_srv: Improve logging lines accepting new connections Change-Id: Iaca9a99417d2f1dbf449e2b20e5dfcdd5e05b683 --- M src/stream_srv.c M tests/stream/stream_test.err 2 files changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/73/34073/1 diff --git a/src/stream_srv.c b/src/stream_srv.c index 6898ef4..4d8d4d3 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -129,13 +129,13 @@ switch (osa.u.sa.sa_family) { case AF_UNIX: - LOGSLNK(link, LOGL_DEBUG, "accept()ed new link on fd %d\n", + LOGSLNK(link, LOGL_INFO, "accept()ed new link on fd %d\n", sock_fd); _setsockopt_nosigpipe(link, sock_fd); break; case AF_INET6: case AF_INET: - LOGSLNK(link, LOGL_DEBUG, "accept()ed new link from %s\n", + LOGSLNK(link, LOGL_INFO, "accept()ed new link from %s\n", osmo_sockaddr_to_str(&osa)); if (link->proto == IPPROTO_SCTP) { @@ -146,7 +146,7 @@ } break; default: - LOGSLNK(link, LOGL_DEBUG, "accept()ed unexpected address family %d\n", + LOGSLNK(link, LOGL_ERROR, "accept()ed unexpected address family %d\n", osa.u.sa.sa_family); goto error_close_socket; } diff --git a/tests/stream/stream_test.err b/tests/stream/stream_test.err index 1fbf395..df0ebc3 100644 --- a/tests/stream/stream_test.err +++ b/tests/stream/stream_test.err @@ -1,3 +1,4 @@ +SRV(srv_link_test,127.0.0.11:1111) accept()ed new link from 127.0.0.1:8976 CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTING} connection established {2.000001} autoreconnecting test step 11 [client NA, server OK], FD reg 1 @@ -19,12 +20,14 @@ {11.000008} autoreconnecting test step 4 [client OK, server OK], FD reg 0 {11.000009} autoreconnecting test step 3 [client OK, server OK], FD reg 1 +SRV(srv_link_test,127.0.0.11:1111) accept()ed new link from 127.0.0.1:8976 CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTING} connection established {11.000010} autoreconnecting test step 2 [client OK, server OK], FD reg 0 SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) connection closed with client {11.000011} autoreconnecting test step 1 [client OK, server NA], FD reg 0 +SRV(srv_link_test,127.0.0.11:1111) accept()ed new link from 127.0.0.1:8976 CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTING} connection established {11.000012} non-reconnecting test step 7 [client NA, server OK], FD reg 1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iaca9a99417d2f1dbf449e2b20e5dfcdd5e05b683 Gerrit-Change-Number: 34073 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream_srv: call setsockopt(SO_NOGIPIPE) also in srv sockets

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34072 ) Change subject: stream_srv: call setsockopt(SO_NOGIPIPE) also in srv sockets ...................................................................... stream_srv: call setsockopt(SO_NOGIPIPE) also in srv sockets Change-Id: I867d8e244e473679abb7e7e7a9b531eeed046436 --- M src/stream_cli.c M src/stream_srv.c 2 files changed, 26 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/72/34072/1 diff --git a/src/stream_cli.c b/src/stream_cli.c index 72a86c3..9845f14 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -308,7 +308,7 @@ int val = 1; ret = setsockopt(osmo_stream_cli_fd(cli), SOL_SOCKET, SO_NOSIGPIPE, (void *)&val, sizeof(val)); if (ret < 0) - LOGSCLI(cli, LOGL_DEBUG, "Failed setting SO_NOSIGPIPE: %s\n", strerror(errno)); + LOGSCLI(cli, LOGL_ERROR, "Failed setting SO_NOSIGPIPE: %s\n", strerror(errno)); return ret; #else return 0; diff --git a/src/stream_srv.c b/src/stream_srv.c index 1ef2cc4..6898ef4 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -97,6 +97,20 @@ int flags; }; +static int _setsockopt_nosigpipe(struct osmo_stream_srv_link *link, int new_fd) +{ +#ifdef SO_NOSIGPIPE + int ret; + int val = 1; + ret = setsockopt(new_fd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&val, sizeof(val)); + if (ret < 0) + LOGSLNK(link, LOGL_ERROR, "Failed setting SO_NOSIGPIPE: %s\n", strerror(errno)); + return ret; +#else + return 0; +#endif +} + static int osmo_stream_srv_link_ofd_cb(struct osmo_fd *ofd, unsigned int what) { int ret; @@ -117,6 +131,7 @@ case AF_UNIX: LOGSLNK(link, LOGL_DEBUG, "accept()ed new link on fd %d\n", sock_fd); + _setsockopt_nosigpipe(link, sock_fd); break; case AF_INET6: case AF_INET: @@ -124,6 +139,7 @@ osmo_sockaddr_to_str(&osa)); if (link->proto == IPPROTO_SCTP) { + _setsockopt_nosigpipe(link, sock_fd); ret = stream_sctp_sock_activate_events(sock_fd); if (ret < 0) goto error_close_socket; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I867d8e244e473679abb7e7e7a9b531eeed046436 Gerrit-Change-Number: 34072 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream_cli: Increase log level of established conn to INFO

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/34070 to look at the new patch set (#2). Change subject: stream_cli: Increase log level of established conn to INFO ...................................................................... stream_cli: Increase log level of established conn to INFO Change-Id: I49776db0b12ee46b629381d2fa2b501c2a63e390 --- M src/stream_cli.c M tests/stream/stream_test.err 2 files changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/70/34070/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I49776db0b12ee46b629381d2fa2b501c2a63e390 Gerrit-Change-Number: 34070 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream_srv: Use LOGSLNK() to print log line

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34071 ) Change subject: stream_srv: Use LOGSLNK() to print log line ...................................................................... stream_srv: Use LOGSLNK() to print log line Change-Id: I9aaa63b676b1cd77c7ea500f9bceda989db50db0 --- M src/stream_srv.c 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/71/34071/1 diff --git a/src/stream_srv.c b/src/stream_srv.c index 9146028..1ef2cc4 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -107,8 +107,8 @@ ret = accept(ofd->fd, &osa.u.sa, &sa_len); if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, "failed to accept from origin peer, reason=`%s'\n", - strerror(errno)); + LOGSLNK(link, LOGL_ERROR, "failed to accept from origin peer, reason=`%s'\n", + strerror(errno)); return ret; } sock_fd = ret; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I9aaa63b676b1cd77c7ea500f9bceda989db50db0 Gerrit-Change-Number: 34071 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream_cli: Increase log level of established conn to INFO

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34070 ) Change subject: stream_cli: Increase log level of established conn to INFO ...................................................................... stream_cli: Increase log level of established conn to INFO Change-Id: I49776db0b12ee46b629381d2fa2b501c2a63e390 --- M src/stream_cli.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/70/34070/1 diff --git a/src/stream_cli.c b/src/stream_cli.c index 5cd6931..72a86c3 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -341,7 +341,7 @@ /* Update sockname based on socket info: */ osmo_sock_get_name_buf(cli->sockname, sizeof(cli->sockname), osmo_stream_cli_fd(cli)); - LOGSCLI(cli, LOGL_DEBUG, "connection established\n"); + LOGSCLI(cli, LOGL_INFO, "connection established\n"); cli->state = STREAM_CLI_STATE_CONNECTED; switch (cli->sk_domain) { case AF_UNIX: -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I49776db0b12ee46b629381d2fa2b501c2a63e390 Gerrit-Change-Number: 34070 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[XL] Change in libosmo-netif[master]: stream: Split cli/srv specific code out of stream.c

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34057 ) Change subject: stream: Split cli/srv specific code out of stream.c ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: Sorry I messed it up in revision 2 of the patch, I squashed some WIP stuff into it. It should be fixed in revision 3. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I22af01bba2040eb320ba48fd1b46c090c98be159 Gerrit-Change-Number: 34057 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Aug 2023 11:30:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[XL] Change in libosmo-netif[master]: stream: Split cli/srv specific code out of stream.c

by pespin

Attention is currently required from: pespin, fixeria. Hello osmith, Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/34057 to look at the new patch set (#3). Change subject: stream: Split cli/srv specific code out of stream.c ...................................................................... stream: Split cli/srv specific code out of stream.c The dev/user in general is only interested about one side of the stream when looking at the code. Since the stream.c file is tarting to be quite large/bloated, this patch splits its content into stream_cli.c and stream_srv.c to make it easier to improve/extend and review. Keep common code between cli and srv in stream.c, and add a private header to contain references to it. Change-Id: I22af01bba2040eb320ba48fd1b46c090c98be159 --- M include/osmocom/netif/Makefile.am A include/osmocom/netif/stream_private.h M src/Makefile.am M src/stream.c A src/stream_cli.c A src/stream_srv.c 6 files changed, 1,954 insertions(+), 1,786 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/57/34057/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I22af01bba2040eb320ba48fd1b46c090c98be159 Gerrit-Change-Number: 34057 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: PCUIF: Add support for PCU_IF_SAPI_AGCH_DT

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34066 ) Change subject: PCUIF: Add support for PCU_IF_SAPI_AGCH_DT ...................................................................... Patch Set 1: Code-Review-1 (1 comment) Patchset: PS1: We agreed on IRC to rename the SAPI and don't pass "tlli" but a "msg_id". -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34066 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: I40e05a2e68cca77d3c2f41df9af8d35762488abf Gerrit-Change-Number: 34066 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Aug 2023 11:14:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: rewrite outdated comment

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34065 ) Change subject: BTS_Tests: rewrite outdated comment ...................................................................... Patch Set 1: (1 comment) File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34065/comment/d6034ec2_a5cc… PS1, Line 5850: /* The BTS will use the last three IMSI digits to compute pagng group. */ typo: paging -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34065 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: I3d943cd96e1d9627ad68e3439b2a649baa5785f1 Gerrit-Change-Number: 34065 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Aug 2023 11:10:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix log line (AGCH->PCH)

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34064 ) Change subject: BTS_Tests: fix log line (AGCH->PCH) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34064 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: I7cb8d91f2c3f92009d33134167eab856ee02fdab Gerrit-Change-Number: 34064 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Aug 2023 11:10:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_CodecPort: mention channel (PCH) in log lines

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34063 ) Change subject: PCUIF_CodecPort: mention channel (PCH) in log lines ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34063 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: I8a304acfc8894e6b31617756f43632a9c4dd5d23 Gerrit-Change-Number: 34063 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Aug 2023 11:09:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix comment

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34062 ) Change subject: BTS_Tests: fix comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34062 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: I5c2aa1aab261a0f4bfb24b4be7af29c1d814d37a Gerrit-Change-Number: 34062 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Aug 2023 11:09:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: call f_pcu_data_req with correct timeslot

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34061 ) Change subject: BTS_Tests: call f_pcu_data_req with correct timeslot ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34061 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: I20566de992809d6c857c9062bf0fb799efa43e45 Gerrit-Change-Number: 34061 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Aug 2023 11:09:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-bts[master]: pcu_sock: use PCU_IF_SAPI_AGCH_DT instead PCU_IF_SAPI_AGCH

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34059 ) Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_DT instead PCU_IF_SAPI_AGCH ...................................................................... Patch Set 1: (8 comments) File include/osmo-bts/pcu_if.h: https://gerrit.osmocom.org/c/osmo-bts/+/34059/comment/156c5e69_1cf35166 PS1, Line 26: int pcu_tx_pch_data_cnf(uint32_t fn, uint32_t tlli, uint8_t sapi); the function is named pch but we pass a sapi? are you sure this is correct? File src/common/bts.c: https://gerrit.osmocom.org/c/osmo-bts/+/34059/comment/30860e13_7dcdc4c9 PS1, Line 662: static struct msgb *bts_agch_dequeue(struct gsm_bts *bts) this can be in a separate commit apparently. https://gerrit.osmocom.org/c/osmo-bts/+/34059/comment/9849d0ce_ea8aa2f0 PS1, Line 757: unrelated? https://gerrit.osmocom.org/c/osmo-bts/+/34059/comment/5298d56e_f92f8c84 PS1, Line 765: if (msg->cb[0]) I'd love to know what these fields cb[0] and cb[1] are here. Maybe add #define getters for it? https://gerrit.osmocom.org/c/osmo-bts/+/34059/comment/1066077f_9fc84f5c PS1, Line 766: pcu_tx_pch_data_cnf(gt->fn, msg->cb[1], PCU_IF_SAPI_AGCH_DT); nice, a _pch_ function where an AGCH sapi is passed. This is obviously wrong. File src/common/paging.c: https://gerrit.osmocom.org/c/osmo-bts/+/34059/comment/296a089a_ffe5a0ec PS1, Line 737: pcu_tx_pch_data_cnf(gt->fn, pr[num_pr]->u.macblock.tlli, PCU_IF_SAPI_PCH_DT); pcu_tx_data_cnf? File src/common/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bts/+/34059/comment/09e0185d_cd88012d PS1, Line 714: msg->cb[0] = confirm; can we add a packed struct for these fields? https://gerrit.osmocom.org/c/osmo-bts/+/34059/comment/2bed15e3_ff9c03e4 PS1, Line 715: msg->cb[1] = gsm_pcu_if_agch_dt->tlli; You are assuming unsigned long is 32 bytes or more here (it probably is in most archs). -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I29858fa20ad8bd0aefe81a5c40ad77a2559a8c10 Gerrit-Change-Number: 34059 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Aug 2023 10:52:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-pcu[master]: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_DT for PCUIF v.11

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34058 ) Change subject: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_DT for PCUIF v.11 ...................................................................... Patch Set 1: (2 comments) File src/pcu_l1_if.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/34058/comment/8bbdd441_83056ca7 PS1, Line 268: /* Send a MAC block via the access gant channel. This will (obviously) only work for MAC blocks that contain access grant https://gerrit.osmocom.org/c/osmo-pcu/+/34058/comment/638c5b06_f74ab89b PS1, Line 321: OSMO_ASSERT(strlen(imsi) > 0); "OSMO_ASSERT(imsi[0] != '\0')" No need to count all bytes everytime for no good reason. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 Gerrit-Change-Number: 34058 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Aug 2023 10:44:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-sccp[master]: cosmetic: Fix pointer location format

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34055 ) Change subject: cosmetic: Fix pointer location format ...................................................................... cosmetic: Fix pointer location format Caught by linter: ERROR:POINTER_LOCATION: "foo* const* bar" should be "foo * const*bar" Change-Id: Icb3adff115e77fca273fdbfda6c7de1ddf1b61cd --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c 2 files changed, 14 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index ba1e214..1197ddf 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -452,7 +452,7 @@ int osmo_ss7_asp_peer_snprintf(char* buf, size_t buf_len, struct osmo_ss7_asp_peer *peer); int osmo_ss7_asp_peer_set_hosts(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, - const char* const* hosts, size_t host_cnt); + const char *const*hosts, size_t host_cnt); int osmo_ss7_asp_peer_add_host(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *host); struct osmo_ss7_asp * diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index e24b853..bc483a6 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1216,7 +1216,7 @@ * \param[in] hosts Array of strings containing IP addresses. * \param[in] host_cnt Number of strings in hosts * \returns 0 on success; negative otherwise */ -int osmo_ss7_asp_peer_set_hosts(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char* const* hosts, size_t host_cnt) +int osmo_ss7_asp_peer_set_hosts(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *const*hosts, size_t host_cnt) { int i = 0; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Icb3adff115e77fca273fdbfda6c7de1ddf1b61cd Gerrit-Change-Number: 34055 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-bts[master]: pcu_sock: forward downlink IMMEDAITE ASSIGNMENT with no IMSI to AGCH

by pespin

Attention is currently required from: laforge, fixeria, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33829 ) Change subject: pcu_sock: forward downlink IMMEDAITE ASSIGNMENT with no IMSI to AGCH ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iaa3e5cdcf86578821e149b3e23482a0bcee19f7b Gerrit-Change-Number: 33829 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Aug 2023 10:33:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: rewrite outdated comment

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34065 ) Change subject: BTS_Tests: rewrite outdated comment ...................................................................... BTS_Tests: rewrite outdated comment We are no longer "appending" imsi digits. This is now done properly using a struct but let's still mention what we use the IMSI for. Related: OS#5927 Change-Id: I3d943cd96e1d9627ad68e3439b2a649baa5785f1 --- M bts/BTS_Tests.ttcn 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/34065/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 1ab0f8a..0e4eee7 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5847,7 +5847,7 @@ f_init_l1ctl(); f_l1_tune(L1CTL); - /* append 3 last imsi digits so BTS can compute pagng group */ + /* The BTS will use the last three IMSI digits to compute pagng group. */ var uint32_t fn := f_PCUIF_tx_imm_ass_pch(PCU, g_pcu_conn_id, imm_ass, '123459987'H); timer T := 0.5; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34065 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: I3d943cd96e1d9627ad68e3439b2a649baa5785f1 Gerrit-Change-Number: 34065 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

2024

2023

2022

gerrit-log August 2023