Attention is currently required from: arehbein, pespin.
daniel has uploaded a new patch set (#4) to the change originally created by arehbein. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33193 )
Change subject: Add osmo_io support to osmo_stream_cli and osmo_stream_srv
......................................................................
Add osmo_io support to osmo_stream_cli and osmo_stream_srv
Change-Id: I2f52c7107c392b6f4b0bf2a84f8c873c084a200c
---
M include/osmocom/netif/stream.h
M src/stream.c
2 files changed, 379 insertions(+), 31 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/93/33193/4
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33193
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I2f52c7107c392b6f4b0bf2a84f8c873c084a200c
Gerrit-Change-Number: 33193
Gerrit-PatchSet: 4
Gerrit-Owner: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: daniel <dwillmann(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: arehbein <arehbein(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: arehbein, pespin.
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33193 )
Change subject: Add osmo_io support to osmo_stream_cli and osmo_stream_srv
......................................................................
Patch Set 4:
(2 comments)
File src/stream.c:
https://gerrit.osmocom.org/c/libosmo-netif/+/33193/comment/a3410ae0_c942c2d5
PS3, Line 1360: #define OSMO_STREAM_SRV_F_FLUSH_DESTROY (1 << 0)
> Why is this code block moved from below to to here? […]
I was squashing https://gerrit.osmocom.org/c/libosmo-netif/+/33195 into this commit, but I guess you're right and I didn't notice that it mixes osmo_stream_srv and srv_link
https://gerrit.osmocom.org/c/libosmo-netif/+/33193/comment/40d6aa9b_75734748
PS3, Line 1610: rc = conn->read_cb(conn);
> Mayeb the read_cb rename can be done in a separate prior patch to simplify this one.
Ack
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33193
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I2f52c7107c392b6f4b0bf2a84f8c873c084a200c
Gerrit-Change-Number: 33193
Gerrit-PatchSet: 4
Gerrit-Owner: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: daniel <dwillmann(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: arehbein <arehbein(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 08 Jun 2023 13:01:22 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: neels, pespin.
Hello Jenkins Builder, neels, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-sccp/+/33216
to look at the new patch set (#3).
Change subject: osmo_sccp_simple_client_on_ss7_id(): Support ASP explicitly configured as sctp server
......................................................................
osmo_sccp_simple_client_on_ss7_id(): Support ASP explicitly configured as sctp server
Right now, if a user configures an cs7 instance, as and asp (with
sctp-role server) in the VTY, then the function
osmo_sccp_simple_client_on_ss7_id() (used by osmo-bsc, osmo-msc,
osmo-hnbgw, etc.) will silently change the config to be SCTP client.
This is really confusing, since the user configured explicitly the ASP
as server but ends up running as client.
Instead, if the user explicitly configured the ASP as SCTP server,
allow it (after validating the user also properly configured a xUA
server through VTY).
Change-Id: I20de33edb8751a515d6719c49efadfc387dd85f8
---
M src/sccp_user.c
1 file changed, 40 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/16/33216/3
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/33216
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I20de33edb8751a515d6719c49efadfc387dd85f8
Gerrit-Change-Number: 33216
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/33227 )
Change subject: .gitignore: Ignore *.pyc
......................................................................
.gitignore: Ignore *.pyc
vty/config tests were added recently, which use python and end up
generating __pycache__/osmoappdesc.cpython-311.pyc when run.
Ignore those files as done in other projects such as osmo-bsc.
Change-Id: I8129a4a124457411c8163089ec2bac32f3e1c2b7
---
M .gitignore
1 file changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/27/33227/1
diff --git a/.gitignore b/.gitignore
index 54c432d..67685b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,6 +67,7 @@
*.pc
config.*
+*.pyc
tags
/Doxyfile
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/33227
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I8129a4a124457411c8163089ec2bac32f3e1c2b7
Gerrit-Change-Number: 33227
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: laforge.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/33226 )
Change subject: cosmetic: fix various typos in comments, log messages and VTY strings
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/33226
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I9a8afc07ae278100ffe34407db0e196f0c9ce8af
Gerrit-Change-Number: 33226
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Thu, 08 Jun 2023 11:31:56 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/33226 )
Change subject: cosmetic: fix various typos in comments, log messages and VTY strings
......................................................................
cosmetic: fix various typos in comments, log messages and VTY strings
Change-Id: I9a8afc07ae278100ffe34407db0e196f0c9ce8af
---
M src/m3ua.c
M src/osmo_ss7_vty.c
M src/sccp_user.c
M src/sua.c
M src/xua_as_fsm.c
5 files changed, 20 insertions(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/26/33226/1
diff --git a/src/m3ua.c b/src/m3ua.c
index 63297fe..8d82522 100644
--- a/src/m3ua.c
+++ b/src/m3ua.c
@@ -504,7 +504,7 @@
return -1;
/* send the msg to the AS for transmission. The AS FSM might
- * (depending on its state) enqueue it before trnsmission */
+ * (depending on its state) enqueue it before transmission */
rc = osmo_fsm_inst_dispatch(as->fi, XUA_AS_E_TRANSFER_REQ, msg);
if (rc < 0)
msgb_free(msg);
diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c
index 0d15c52..541d197 100644
--- a/src/osmo_ss7_vty.c
+++ b/src/osmo_ss7_vty.c
@@ -211,7 +211,7 @@
"xua rkm routing-key-allocation (static-only|dynamic-permitted)",
"SIGTRAN xxxUA related\n" "Routing Key Management\n"
"Routing Key Management Allocation Policy\n"
- "Only static (pre-confgured) Routing Keys permitted\n"
+ "Only static (pre-configured) Routing Keys permitted\n"
"Dynamically allocate Routing Keys for what ASPs request\n",
CMD_ATTR_IMMEDIATE)
{
@@ -514,7 +514,7 @@
DEFUN_ATTR(xua_accept_dyn_asp, xua_accept_dyn_asp_cmd,
"accept-asp-connections (pre-configured|dynamic-permitted)",
"Define what kind of ASP connections to accept\n"
- "Accept only pre-confiugred ASPs (source IP/prt)\n"
+ "Accept only pre-configured ASPs (source IP/port)\n"
"Accept any connection and dynamically create an ASP definition\n",
CMD_ATTR_IMMEDIATE)
{
diff --git a/src/sccp_user.c b/src/sccp_user.c
index a04a1c3..2be9cd4 100644
--- a/src/sccp_user.c
+++ b/src/sccp_user.c
@@ -646,7 +646,7 @@
asp->cfg.is_server = false;
/* Make sure that the role of this ASP is set to ASP unless the user
- * made a concious decision about the role via the VTY */
+ * made a conscious decision about the role via the VTY */
if (!asp->cfg.role_set_by_vty)
asp->cfg.role = OSMO_SS7_ASP_ROLE_ASP;
diff --git a/src/sua.c b/src/sua.c
index bd51005..a20d751 100644
--- a/src/sua.c
+++ b/src/sua.c
@@ -258,7 +258,7 @@
}
/***********************************************************************
- * Transmitting SUA messsages to SCTP
+ * Transmitting SUA messages to SCTP
***********************************************************************/
static struct msgb *sua_to_msg(struct xua_msg *xua)
@@ -316,7 +316,7 @@
return -1;
/* send the msg to the AS for transmission. The AS FSM might
- * (depending on its state) enqueue it before trnsmission */
+ * (depending on its state) enqueue it before transmission */
rc = osmo_fsm_inst_dispatch(as->fi, XUA_AS_E_TRANSFER_REQ, msg);
if (rc < 0)
msgb_free(msg);
@@ -324,7 +324,7 @@
}
/***********************************************************************
- * Receiving SUA messsages from SCTP
+ * Receiving SUA messages from SCTP
***********************************************************************/
/*! \brief Decode SUA Global Title according to RFC3868 Section 3.10.2.3
@@ -427,7 +427,7 @@
* probably want to have a separate general parsing function storing
* the subparts in xua_msg_part. But before we do, we should find more
* users of this subpart parsing and be aware of the performance
- * tradeoff.
+ * trade-off.
*/
while (pos + sizeof(*par) < param->len) {
@@ -619,7 +619,7 @@
if (ntfy.info_string)
talloc_free(ntfy.info_string);
- /* TODO: should we report this soemwhere? */
+ /* TODO: should we report this somewhere? */
return 0;
}
@@ -680,7 +680,7 @@
OSMO_ASSERT(asp->cfg.proto == OSMO_SS7_ASP_PROT_SUA);
/* caller owns msg memory, we shall neither free it here nor
- * keep references beyon the execution of this function and its
+ * keep references beyond the execution of this function and its
* callees. */
if (!asp->inst->sccp) {
diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c
index 2f52762..2b16139 100644
--- a/src/xua_as_fsm.c
+++ b/src/xua_as_fsm.c
@@ -80,7 +80,7 @@
{
unsigned int i;
- /* this is a bit tricky. "osmo_ss7_as" has no configuation of a role,
+ /* this is a bit tricky. "osmo_ss7_as" has no configuration of a role,
* only the ASPs have. As they all must be of the same role, let's simply
* find the first one and return its role */
for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) {
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/33226
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I9a8afc07ae278100ffe34407db0e196f0c9ce8af
Gerrit-Change-Number: 33226
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newchange
Attention is currently required from: arehbein, laforge.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33196 )
Change subject: stream: Fix endless loop on server on client disconnect
......................................................................
Patch Set 1:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/libosmo-netif/+/33196/comment/d542b9bc_95ba9c84
PS1, Line 9: Not sure why, but select() keeps reporting read events it seems,
: even though the client doesn't send any packets anymore.
> Looks like the code was originally designed with the idea to set the connection flag `OSMO_STREAM_SR […]
It is possible to close a connection halfway using the shutdown() syscall (see man 2 shutdown). This also means the other end can also do the same, which is notified through TCP FIN.
I'm right now not sure how that reflects on the socket interface though. if you receive a FIN from the peer indicating it finished transmitting, does it announce it somehow on the socket API? I guess in poll based system (like iofd) you simple get no READ notifications from the socket once the Rx queue is empty, so that means you never call read() on it (if you did, it would probably return 0?).
To close the tx side, we'd need oursleves to call shutdown() on the socket FD, which we are not doing anywhere afaict so far.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33196
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I012ddf14ae17642a52d34026d85ab6958cf488a1
Gerrit-Change-Number: 33196
Gerrit-PatchSet: 1
Gerrit-Owner: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: daniel <dwillmann(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: arehbein <arehbein(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Thu, 08 Jun 2023 11:20:26 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de>
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
Attention is currently required from: arehbein, pespin.
daniel has uploaded a new patch set (#5) to the change originally created by arehbein. ( https://gerrit.osmocom.org/c/libosmocore/+/33083 )
Change subject: gsm/ipa: Add segmentation callback
......................................................................
gsm/ipa: Add segmentation callback
Add segmentation callback to be used by the streaming backend of libosmo-netif
Related: OS#5753, OS#5751
Change-Id: I3a639e6896cc3b3fc8e9b2e1a58254710efa0d3f
---
M include/osmocom/gsm/ipa.h
M src/gsm/ipa.c
M src/gsm/libosmogsm.map
3 files changed, 35 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/83/33083/5
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33083
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I3a639e6896cc3b3fc8e9b2e1a58254710efa0d3f
Gerrit-Change-Number: 33083
Gerrit-PatchSet: 5
Gerrit-Owner: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: daniel <dwillmann(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: arehbein <arehbein(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: laforge.
arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33196 )
Change subject: stream: Fix endless loop on server on client disconnect
......................................................................
Patch Set 1:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/libosmo-netif/+/33196/comment/341dc159_f4f5abc0
PS1, Line 9: Not sure why, but select() keeps reporting read events it seems,
: even though the client doesn't send any packets anymore.
> it sounds like the normal semantics of a dead socket: readable, but length of read() returns 0. […]
Looks like the code was originally designed with the idea to set the connection flag `OSMO_STREAM_SRV_F_FLUSH_DESTROY`, allow all messages to be sent and only then destroy the connection.
So the server gets stuck, because the condition `if (osmo_iofd_txqueue_len(iofd) == 0)` is never met on subsequent iterations, i.e. the messages don't all get sent out for whatever reason.
Is it actually possible, that the socket is `read()`-dead, but messages can still be sent out on the connection?
If not, maybe we can simplify the code and do away with the condition check mentioned above, instead of destroying the connection on the next call to this function.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33196
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I012ddf14ae17642a52d34026d85ab6958cf488a1
Gerrit-Change-Number: 33196
Gerrit-PatchSet: 1
Gerrit-Owner: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Thu, 08 Jun 2023 11:06:45 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment