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

[M] Change in ...osmo-epdg[master]: Bump version: 0.1.1

by fixeria

Attention is currently required from: lynxis lazus, osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/39026?usp=email ) Change subject: Bump version: 0.1.1 ...................................................................... Patch Set 1: Code-Review-1 (1 comment) Patchset: PS1: In erlang projects using rebar3, we also need to bump version in the `relx` section of `rebar.config`. We currently have `1.0.0` in there, which is wrong BTW (no such tag). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/39026?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I34615dd880ded0f17cd6dc5f8fe3a69eda046fe4 Gerrit-Change-Number: 39026 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 04 Dec 2024 20:24:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

6 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCU_Tests_SNS: sns_del: check if removed NS-VC still transmits

by fixeria

Attention is currently required from: laforge, lynxis lazus, pespin. fixeria has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39011?usp=email ) Change subject: PCU_Tests_SNS: sns_del: check if removed NS-VC still transmits ...................................................................... Patch Set 2: (1 comment) File pcu/PCU_Tests_SNS.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39011/comment/af3277b0_ba30… : PS1, Line 327: integer idx := 0, integer idx_del := 1, float tout := 20.0 > I'm sorry but I don't think it's good to start using parameters in testcase with no real good reason [...] It's good to know that one can pass arguments to testcases; ETSI ES 201 873-1 V4.16.1 confirms this is possible in section 26.1. But I agree with @pespin@sysmocom.de here. It needs to be researched further how the resulting junit xml file would look like. And in this specific case, you're not calling `TC_sns_del` with different parameters in the `control` section, so unless you're planning to do so I don't see a reason for having those params. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39011?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ied4367a519cf75291ff8766c9efebb0f8a12b11f Gerrit-Change-Number: 39011 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 04 Dec 2024 20:17:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

6 months, 3 weeks

1
0
0 0

[M] Change in osmo-remsim[master]: rspro: use osmo_stream to handle IPA connection

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-remsim/+/39023?usp=email ) Change subject: rspro: use osmo_stream to handle IPA connection ...................................................................... Patch Set 3: (1 comment) This change is ready for review. Patchset: PS3: I run REMSIM_Tests several times and I see tests going on passing generally and no crash. -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/39023?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I9cba48bf8eba85215acef70eda7bcf8ec13ea49a Gerrit-Change-Number: 39023 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 04 Dec 2024 19:28:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

6 months, 3 weeks

1
0
0 0

[M] Change in osmo-remsim[master]: server: Implement IPA server with osmo_stream

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/osmo-remsim/+/39033?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: server: Implement IPA server with osmo_stream ...................................................................... server: Implement IPA server with osmo_stream libosmo-abis is still needed since we are still using ipa_keepalive_fsm from there. This needs to be imported here or moved to libosmo-netif. Related: OS#5896 Change-Id: I6341612e41a0005de85f45fd6454bb954becb69c --- M src/server/rspro_server.c M src/server/rspro_server.h 2 files changed, 154 insertions(+), 57 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/33/39033/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/39033?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I6341612e41a0005de85f45fd6454bb954becb69c Gerrit-Change-Number: 39033 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de>

6 months, 3 weeks

1
0
0 0

[XS] Change in docker-playground[master]: make: Fix OSMO_REMSIM_BRANCH not passed

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/39034?usp=email ) Change subject: make: Fix OSMO_REMSIM_BRANCH not passed ...................................................................... make: Fix OSMO_REMSIM_BRANCH not passed Change-Id: Iae85a99d998f91f9fda8f416155059a00da35296 --- M make/Makefile 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/34/39034/1 diff --git a/make/Makefile b/make/Makefile index c39f2a8..71f8c5f 100644 --- a/make/Makefile +++ b/make/Makefile @@ -37,6 +37,7 @@ OSMO_MSC_BRANCH?=master OSMO_NITB_BRANCH?=master OSMO_PCU_BRANCH?=master +OSMO_REMSIM_BRANCH?=master OSMO_SGSN_BRANCH?=master OSMO_SIP_BRANCH?=master OSMO_STP_BRANCH?=master @@ -121,6 +122,7 @@ --build-arg OSMO_MSC_BRANCH=$(OSMO_MSC_BRANCH) \ --build-arg OSMO_NITB_BRANCH=$(OSMO_NITB_BRANCH) \ --build-arg OSMO_PCU_BRANCH=$(OSMO_PCU_BRANCH) \ + --build-arg OSMO_REMSIM_BRANCH=$(OSMO_REMSIM_BRANCH) \ --build-arg OSMO_SGSN_BRANCH=$(OSMO_SGSN_BRANCH) \ --build-arg OSMO_SIP_BRANCH=$(OSMO_SIP_BRANCH) \ --build-arg OSMO_STP_BRANCH=$(OSMO_STP_BRANCH) \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39034?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iae85a99d998f91f9fda8f416155059a00da35296 Gerrit-Change-Number: 39034 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months, 3 weeks

1
0
0 0

[M] Change in osmo-remsim[master]: server: Implement IPA server with osmo_stream

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/39033?usp=email ) Change subject: server: Implement IPA server with osmo_stream ...................................................................... server: Implement IPA server with osmo_stream libosmo-abis is still needed since we are still using ipa_keepalive_fsm from there. This needs to be imported here or moved to libosmo-netif. Change-Id: I6341612e41a0005de85f45fd6454bb954becb69c --- M src/server/rspro_server.c M src/server/rspro_server.h 2 files changed, 136 insertions(+), 54 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/33/39033/1 diff --git a/src/server/rspro_server.c b/src/server/rspro_server.c index 5803c8a..730e519 100644 --- a/src/server/rspro_server.c +++ b/src/server/rspro_server.c @@ -2,6 +2,7 @@ #include <string.h> #include <unistd.h> #include <pthread.h> +#include <errno.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/select.h> @@ -9,6 +10,7 @@ #include <osmocom/core/logging.h> #include <osmocom/core/socket.h> #include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/netif/ipa.h> #include <osmocom/abis/ipa.h> #include <osmocom/rspro/RsproPDU.h> @@ -60,7 +62,7 @@ } ipa_prepend_header_ext(msg_tx, IPAC_PROTO_EXT_RSPRO); ipa_prepend_header(msg_tx, IPAC_PROTO_OSMO); - ipa_server_conn_send(conn->peer, msg_tx); + osmo_stream_srv_send(conn->peer, msg_tx); } @@ -127,9 +129,10 @@ RsproPDU_t *resp = NULL; char ip_str[INET6_ADDRSTRLEN]; char port_str[6]; + int fd = osmo_stream_srv_get_fd(conn->peer); /* remote IP and port */ - osmo_sock_get_ip_and_port(conn->peer->ofd.fd, ip_str, sizeof(ip_str), + osmo_sock_get_ip_and_port(fd, ip_str, sizeof(ip_str), port_str, sizeof(port_str), false); switch (event) { @@ -174,9 +177,14 @@ * timeout, or to continue to operate. If we were to drop the old * connection, this could interrupt a perfectly working connection and opens * some kind of DoS. */ + char prev_ip_str[INET6_ADDRSTRLEN]; + char prev_port_str[6]; + int prev_fd = osmo_stream_srv_get_fd(previous_conn->peer); + osmo_sock_get_ip_and_port(prev_fd, prev_ip_str, sizeof(prev_ip_str), + prev_port_str, sizeof(prev_port_str), false); LOGPFSML(fi, LOGL_ERROR, "New client connection from %s:%s, but we already " - "have a connection from %s:%u. Dropping new connection.\n", - ip_str, port_str, previous_conn->peer->addr, previous_conn->peer->port); + "have a connection from %s:%s. Dropping new connection.\n", + ip_str, port_str, prev_ip_str, prev_port_str); resp = rspro_gen_ConnectClientRes(&conn->srv->comp_id, ResultCode_identityInUse); client_conn_send(conn, resp); osmo_fsm_inst_state_chg(fi, CLNTC_ST_REJECTED, 1, 2); @@ -218,14 +226,19 @@ /* check for unique-ness */ previous_conn = bankd_conn_by_id(conn->srv, conn->bank.bank_id); if (previous_conn && previous_conn != conn) { + char prev_ip_str[INET6_ADDRSTRLEN]; + char prev_port_str[6]; + int prev_fd = osmo_stream_srv_get_fd(previous_conn->peer); + osmo_sock_get_ip_and_port(prev_fd, prev_ip_str, sizeof(prev_ip_str), + prev_port_str, sizeof(prev_port_str), false); /* we're dropping the current (new) connection as we don't really know which * is the "right" one. Dropping the new gives the old connection time to * timeout, or to continue to operate. If we were to drop the old * connection, this could interrupt a perfectly working connection and opens * some kind of DoS. */ LOGPFSML(fi, LOGL_ERROR, "New bankd connection from %s:%s, but we already " - "have a connection from %s:%u. Dropping new connection.\n", - ip_str, port_str, previous_conn->peer->addr, previous_conn->peer->port); + "have a connection from %s:%s. Dropping new connection.\n", + ip_str, port_str, prev_ip_str, prev_port_str); resp = rspro_gen_ConnectBankRes(&conn->srv->comp_id, ResultCode_identityInUse); client_conn_send(conn, resp); osmo_fsm_inst_state_chg(fi, CLNTC_ST_REJECTED, 1, 2); @@ -307,8 +320,9 @@ bankd_port = 0; } else { /* obtain IP and port of bankd */ - rc = osmo_sock_get_ip_and_port(bankd_conn->peer->ofd.fd, ip_str, sizeof(ip_str), - port_str, sizeof(port_str), false); + rc = osmo_sock_get_ip_and_port(osmo_stream_srv_get_fd(bankd_conn->peer), + ip_str, sizeof(ip_str), + port_str, sizeof(port_str), false); if (rc < 0) { LOGPFSML(bankd_conn->fi, LOGL_ERROR, "Error during getpeername\n"); return; @@ -636,64 +650,121 @@ return 0; } -/* data was received from one of the client connections to the RSPRO socket */ -static int sock_read_cb(struct ipa_server_conn *peer, struct msgb *msg) +static int _ipa_srv_conn_ccm(struct rspro_client_conn *conn, struct msgb *msg) { - struct ipaccess_head *hh = (struct ipaccess_head *) msg->data; - struct ipaccess_head_ext *he = (struct ipaccess_head_ext *) msgb_l2(msg); - struct rspro_client_conn *conn = peer->data; + struct tlv_parsed tlvp; + uint8_t msg_type; + struct ipaccess_unit unit_data = {}; + char *unitid; + int len, ret; + + OSMO_ASSERT(msgb_l2len(msg) > 0); + msg_type = msg->l2h[0]; + + switch (msg_type) { + case IPAC_MSGT_PING: + ret = ipa_ccm_send_pong(osmo_stream_srv_get_fd(conn->peer)); + if (ret < 0) { + LOGPFSML(conn->fi, LOGL_ERROR, "Cannot send PONG message. Reason: %s\n", strerror(errno)); + goto err; + } + return 0; + case IPAC_MSGT_PONG: + LOGPFSML(conn->fi, LOGL_DEBUG, "PONG!\n"); + ipa_keepalive_fsm_pong_received(conn->keepalive_fi); + return 0; + case IPAC_MSGT_ID_ACK: + LOGPFSML(conn->fi, LOGL_DEBUG, "ID_ACK? -> ACK!\n"); + ret = ipa_ccm_send_id_ack(osmo_stream_srv_get_fd(conn->peer)); + if (ret < 0) { + LOGPFSML(conn->fi, LOGL_ERROR, "Cannot send ID_ACK message. Reason: %s\n", strerror(errno)); + goto err; + } + return 0; + case IPAC_MSGT_ID_RESP: + ret = ipa_ccm_id_resp_parse(&tlvp, (const uint8_t *)msg->l2h+1, msgb_l2len(msg)-1); + if (ret < 0) { + LOGPFSML(conn->fi, LOGL_ERROR, "IPA CCM RESPonse with malformed TLVs\n"); + goto err; + } + if (!TLVP_PRESENT(&tlvp, IPAC_IDTAG_UNIT)) { + LOGPFSML(conn->fi, LOGL_ERROR, "IPA CCM RESP without unit ID\n"); + goto err; + } + len = TLVP_LEN(&tlvp, IPAC_IDTAG_UNIT); + if (len < 1) { + LOGPFSML(conn->fi, LOGL_ERROR, "IPA CCM RESP with short unit ID\n"); + goto err; + } + unitid = (char *) TLVP_VAL(&tlvp, IPAC_IDTAG_UNIT); + unitid[len-1] = '\0'; + ipa_parse_unitid(unitid, &unit_data); + break; + default: + LOGPFSML(conn->fi, LOGL_ERROR, "Unknown IPA message type\n"); + goto err; + } + + return 0; +err: + /* Connection and msgb destroyed by parent. */ + return -1; +} + +/* data was received from one of the client connections to the RSPRO socket */ +static int sock_read_cb(struct osmo_stream_srv *peer, int res, struct msgb *msg) +{ + enum ipaccess_proto ipa_proto = osmo_ipa_msgb_cb_proto(msg); + struct rspro_client_conn *conn = osmo_stream_srv_get_data(peer); RsproPDU_t *pdu; int rc; - if (msgb_length(msg) < sizeof(*hh)) - goto invalid; - msg->l2h = &hh->data[0]; - switch (hh->proto) { + if (res <= 0) { + LOGPFSML(conn->fi, LOGL_NOTICE, "failed reading from socket: %d\n", res); + goto err; + } + + switch (ipa_proto) { case IPAC_PROTO_IPACCESS: - rc = ipa_server_conn_ccm(peer, msg); + rc = _ipa_srv_conn_ccm(conn, msg); if (rc < 0) - break; - switch (hh->data[0]) { - case IPAC_MSGT_PONG: - ipa_keepalive_fsm_pong_received(conn->keepalive_fi); - rc = 0; - break; - default: - break; - } + goto err; break; case IPAC_PROTO_OSMO: - if (!he || msgb_l2len(msg)< sizeof(*he)) - goto invalid; - msg->l2h = &he->data[0]; - - switch (he->proto) { + switch (osmo_ipa_msgb_cb_proto_ext(msg)) { case IPAC_PROTO_EXT_RSPRO: pdu = rspro_dec_msg(msg); - if (!pdu) - goto invalid; - + if (!pdu) { + rc = -EIO; + break; + } rc = handle_rx_rspro(conn, pdu); ASN_STRUCT_FREE(asn_DEF_RsproPDU, pdu); break; default: - goto invalid; + LOGPFSML(conn->fi, LOGL_ERROR, "Rx unexpected ipa proto ext: %d\n", + osmo_ipa_msgb_cb_proto_ext(msg)); + goto err; } break; default: - goto invalid; + LOGPFSML(conn->fi, LOGL_ERROR, "Rx unexpected ipa proto: %d\n", ipa_proto); + goto err; } + msgb_free(msg); return rc; -invalid: +err: msgb_free(msg); - return -1; + osmo_stream_srv_destroy(peer); + return -EBADF; } -static int sock_closed_cb(struct ipa_server_conn *peer) +static int sock_closed_cb(struct osmo_stream_srv *peer) { - struct rspro_client_conn *conn = peer->data; + struct rspro_client_conn *conn = osmo_stream_srv_get_data(peer); + osmo_stream_srv_set_data(peer, NULL); if (conn->fi) osmo_fsm_inst_dispatch(conn->fi, CLNTC_E_TCP_DOWN, NULL); /* FIXME: who cleans up conn? */ @@ -707,9 +778,9 @@ }; /* a new TCP connection was accepted on the RSPRO server socket */ -static int accept_cb(struct ipa_server_link *link, int fd) +static int accept_cb(struct osmo_stream_srv_link *link, int fd) { - struct rspro_server *srv = link->data; + struct rspro_server *srv = osmo_stream_srv_link_get_data(link); struct rspro_client_conn *conn; conn = talloc_zero(srv, struct rspro_client_conn); @@ -717,9 +788,12 @@ conn->srv = srv; /* don't allocate peer under 'conn', as it must survive 'conn' during teardown */ - conn->peer = ipa_server_conn_create(link, link, fd, sock_read_cb, sock_closed_cb, conn); + conn->peer = osmo_stream_srv_create2(link, link, fd, conn); if (!conn->peer) goto out_err; + osmo_stream_srv_set_read_cb(conn->peer, sock_read_cb); + osmo_stream_srv_set_closed_cb(conn->peer, sock_closed_cb); + osmo_stream_srv_set_segmentation_cb(conn->peer, osmo_ipa_segmentation_cb); /* don't allocate 'fi' as slave from 'conn', as 'fi' needs to survive 'conn' during * teardown */ @@ -728,7 +802,7 @@ goto out_err_conn; /* use ipa_keepalive_fsm to periodically send an IPA_PING and expect a PONG in response */ - conn->keepalive_fi = ipa_server_conn_alloc_keepalive_fsm(conn->peer, &ka_params, NULL); + conn->keepalive_fi = ipa_generic_conn_alloc_keepalive_fsm(conn->peer, conn->peer, &ka_params, NULL); if (!conn->keepalive_fi) goto out_err_fi; /* ensure parent is notified once keepalive FSM instance is dying */ @@ -751,7 +825,7 @@ out_err_fi: osmo_fsm_inst_term(conn->fi, OSMO_FSM_TERM_ERROR, NULL); out_err_conn: - ipa_server_conn_destroy(conn->peer); + osmo_stream_srv_destroy(conn->peer); /* the above will free 'conn' down the chain */ return -1; out_err: @@ -824,7 +898,7 @@ static void rspro_client_conn_destroy(struct rspro_client_conn *conn) { /* this will internally call closed_cb() which will dispatch a TCP_DOWN event */ - ipa_server_conn_destroy(conn->peer); + osmo_stream_srv_destroy(conn->peer); conn->peer = NULL; /* ensure all slotmaps are unlinked + returned to NEW or deleted */ @@ -854,18 +928,26 @@ INIT_LLIST_HEAD(&srv->banks); pthread_rwlock_unlock(&srv->rwlock); - srv->link = ipa_server_link_create(ctx, NULL, host, port, accept_cb, srv); + srv->link = osmo_stream_srv_link_create(ctx); if (!srv->link) goto out_free; - rc = ipa_server_link_open(srv->link); + osmo_stream_srv_link_set_proto(srv->link, IPPROTO_TCP); + osmo_stream_srv_link_set_addr(srv->link, host); + osmo_stream_srv_link_set_port(srv->link, port); + osmo_stream_srv_link_set_data(srv->link, srv); + osmo_stream_srv_link_set_nodelay(srv->link, true); + osmo_stream_srv_link_set_accept_cb(srv->link, accept_cb); + + + rc = osmo_stream_srv_link_open(srv->link); if (rc < 0) goto out_destroy; return srv; out_destroy: - ipa_server_link_destroy(srv->link); + osmo_stream_srv_link_destroy(srv->link); out_free: pthread_rwlock_destroy(&srv->rwlock); talloc_free(srv); @@ -877,7 +959,7 @@ { /* FIXME: clear all lists */ - ipa_server_link_destroy(srv->link); + osmo_stream_srv_link_destroy(srv->link); srv->link = NULL; pthread_rwlock_destroy(&srv->rwlock); talloc_free(srv); diff --git a/src/server/rspro_server.h b/src/server/rspro_server.h index 6dd498e..4843821 100644 --- a/src/server/rspro_server.h +++ b/src/server/rspro_server.h @@ -3,13 +3,13 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/core/select.h> #include <osmocom/core/fsm.h> -#include <osmocom/abis/ipa.h> +#include <osmocom/netif/stream.h> #include "rspro_util.h" #include "slotmap.h" struct rspro_server { - struct ipa_server_link *link; + struct osmo_stream_srv_link *link; /* list of rspro_client_conn */ struct llist_head connections; struct llist_head clients; @@ -30,7 +30,7 @@ /* back-pointer to rspro_server */ struct rspro_server *srv; /* reference to the underlying IPA server connection */ - struct ipa_server_conn *peer; + struct osmo_stream_srv *peer; /* FSM instance for this connection */ struct osmo_fsm_inst *fi; /* remote component identity (after it has been received) */ -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/39033?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I6341612e41a0005de85f45fd6454bb954becb69c Gerrit-Change-Number: 39033 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months, 3 weeks

1
0
0 0

[M] Change in osmo-ggsn[master]: gtpie: add gtp_encaps a modern encapsulation method

by Jenkins Builder

Jenkins Builder has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/39032?usp=email ) Change subject: gtpie: add gtp_encaps a modern encapsulation method ...................................................................... Patch Set 1: (1 comment) File gtp/gtpie.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20406): https://gerrit.osmocom.org/c/osmo-ggsn/+/39032/comment/1ad4b069_c25f071a?us… : PS1, Line 954: * \returns 0 on sucess; 2 for out-of-space 'sucess' may be misspelled - perhaps 'success'? -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/39032?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I8bb086c568e07052c52d880df06049490346e91e Gerrit-Change-Number: 39032 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 04 Dec 2024 17:35:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

6 months, 3 weeks

1
0
0 0

[M] Change in osmo-ggsn[master]: gtpie: add gtp_encaps a modern encapsulation method

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/39032?usp=email ) Change subject: gtpie: add gtp_encaps a modern encapsulation method ...................................................................... gtpie: add gtp_encaps a modern encapsulation method No idea why the previous ones started at the second IE. Further add more length arguments to the encapsulation method. Change-Id: I8bb086c568e07052c52d880df06049490346e91e --- M gtp/gtpie.c M include/osmocom/gtp/gtpie.h 2 files changed, 188 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/32/39032/1 diff --git a/gtp/gtpie.c b/gtp/gtpie.c index b3f2ff7..de33638 100644 --- a/gtp/gtpie.c +++ b/gtp/gtpie.c @@ -944,3 +944,189 @@ } return 0; } + +/*! Encode GTP packet payload from Array of Information Elements. + * \param[in] ie Input Array of GTPIE + * \param[in] ie_len Length of \a ie array + * \param[in] pack Pointer to caller-allocated buffer for raw GTP packet (GTPIE_MAX length) + * \param[in] pack_len Length of \a pack buffer + * \param[out] encoded_len Encoded length of \a pack in bytes + * \returns 0 on sucess; 2 for out-of-space + * GTP requires a certain order, the call must follow those which are defined for every message */ +int gtpie_encaps3(union gtpie_member **ies, unsigned int ie_len, + void *pack, unsigned pack_len, unsigned *encoded_len) +{ + unsigned int i; + unsigned char *p; + unsigned char *end; + int iesize; + union gtpie_member *ie; + + *encoded_len = 0; + p = pack; + + memset(pack, 0, pack_len); + end = p + pack_len; + for (i = 0; i < ie_len; i++) { + if (!ies[i]) + continue; + ie = ies[i]; + + if (GTPIE_DEBUG) + printf + ("gtpie_encaps. Number %d, Type %d\n", + i, ie->t); + switch (ie->t) { + case GTPIE_CAUSE: /* TV GTPIE types with value length 1 */ + case GTPIE_REORDER: + case GTPIE_MAP_CAUSE: + case GTPIE_MS_VALIDATED: + case GTPIE_RECOVERY: + case GTPIE_SELECTION_MODE: + case GTPIE_TEARDOWN: + case GTPIE_NSAPI: + case GTPIE_RANAP_CAUSE: + case GTPIE_RP_SMS: + case GTPIE_RP: + case GTPIE_MS_NOT_REACH: + case GTPIE_BCM: + iesize = 2; + break; + case GTPIE_PFI: /* TV GTPIE types with value length 2 */ + case GTPIE_CHARGING_C: + case GTPIE_TRACE_REF: + case GTPIE_TRACE_TYPE: + iesize = 3; + break; + case GTPIE_QOS_PROFILE0: /* TV GTPIE types with value length 3 */ + case GTPIE_P_TMSI_S: + iesize = 4; + break; + case GTPIE_TLLI: /* TV GTPIE types with value length 4 */ + case GTPIE_P_TMSI: + case GTPIE_TEI_DI: + case GTPIE_TEI_C: + case GTPIE_CHARGING_ID: + iesize = 5; + break; + case GTPIE_TEI_DII: /* TV GTPIE types with value length 5 */ + iesize = 6; + break; + case GTPIE_RAI: /* TV GTPIE types with value length 6 */ + iesize = 7; + break; + case GTPIE_RAB_CONTEXT: /* TV GTPIE types with value length 7 */ + iesize = 8; + break; + case GTPIE_IMSI: /* TV GTPIE types with value length 8 */ + iesize = 9; + break; + case GTPIE_AUTH_TRIPLET: /* TV GTPIE types with value length 28 */ + iesize = 29; + break; + case GTPIE_EXT_HEADER_T: /* GTP extension header */ + iesize = 2 + hton8(ie->ext.l); + break; + case GTPIE_EUA: /* TLV GTPIE types with length length 2 */ + case GTPIE_MM_CONTEXT: + case GTPIE_PDP_CONTEXT: + case GTPIE_APN: + case GTPIE_PCO: + case GTPIE_GSN_ADDR: + case GTPIE_MSISDN: + case GTPIE_QOS_PROFILE: + case GTPIE_AUTH_QUINTUP: + case GTPIE_TFT: + case GTPIE_TARGET_INF: + case GTPIE_UTRAN_TRANS: + case GTPIE_RAB_SETUP: + case GTPIE_TRIGGER_ID: + case GTPIE_OMC_ID: + case GTPIE_RAN_T_CONTAIN: + case GTPIE_PDP_CTX_PRIO: + case GTPIE_ADDL_RAB_S_I: + case GTPIE_SGSN_NUMBER: + case GTPIE_COMMON_FLAGS: + case GTPIE_APN_RESTR: + case GTPIE_R_PRIO_LCS: + case GTPIE_RAT_TYPE: + case GTPIE_USER_LOC: + case GTPIE_MS_TZ: + case GTPIE_IMEI_SV: + case GTPIE_CML_CHG_I_CT: + case GTPIE_MBMS_UE_CTX: + case GTPIE_TMGI: + case GTPIE_RIM_ROUT_ADDR: + case GTPIE_MBMS_PCO: + case GTPIE_MBMS_SA: + case GTPIE_SRNC_PDCP_CTX: + case GTPIE_ADDL_TRACE: + case GTPIE_HOP_CTR: + case GTPIE_SEL_PLMN_ID: + case GTPIE_MBMS_SESS_ID: + case GTPIE_MBMS_2_3G_IND: + case GTPIE_ENH_NSAPI: + case GTPIE_MBMS_SESS_DUR: + case GTPIE_A_MBMS_TRAC_I: + case GTPIE_MBMS_S_REP_N: + case GTPIE_MBMS_TTDT: + case GTPIE_PS_HO_REQ_CTX: + case GTPIE_BSS_CONTAINER: + case GTPIE_CELL_ID: + case GTPIE_PDU_NUMBERS: + case GTPIE_BSSGP_CAUSE: + case GTPIE_RQD_MBMS_BCAP: + case GTPIE_RIM_RA_DISCR: + case GTPIE_L_SETUP_PFCS: + case GTPIE_PS_HO_XID_PAR: + case GTPIE_MS_CHG_REP_A: + case GTPIE_DIR_TUN_FLAGS: + case GTPIE_CORREL_ID: + case GTPIE_MBMS_FLOWI: + case GTPIE_MBMS_MC_DIST: + case GTPIE_MBMS_DIST_ACK: + case GTPIE_R_IRAT_HO_INF: + case GTPIE_RFSP_IDX: + case GTPIE_FQDN: + case GTPIE_E_ALL_PRIO_1: + case GTPIE_E_ALL_PRIO_2: + case GTPIE_E_CMN_FLAGS: + case GTPIE_U_CSG_INFO: + case GTPIE_CSG_I_REP_ACT: + case GTPIE_CSG_ID: + case GTPIE_CSG_MEMB_IND: + case GTPIE_AMBR: + case GTPIE_UE_NET_CAPA: + case GTPIE_UE_AMBR: + case GTPIE_APN_AMBR_NS: + case GTPIE_GGSN_BACKOFF: + case GTPIE_S_PRIO_IND: + case GTPIE_S_PRIO_IND_NS: + case GTPIE_H_BR_16MBPS_F: + case GTPIE_A_MMCTX_SRVCC: + case GTPIE_A_FLAGS_SRVCC: + case GTPIE_STN_SR: + case GTPIE_C_MSISDN: + case GTPIE_E_RANAP_CAUSE: + case GTPIE_ENODEB_ID: + case GTPIE_SEL_MODE_NS: + case GTPIE_ULI_TIMESTAMP: + case GTPIE_CHARGING_ADDR: + case GTPIE_PRIVATE: + iesize = 3 + hton16(ie->tlv.l); + break; + default: + return 2; /* We received something unknown */ + } + + if (p + iesize < end) { + memcpy(p, ie, iesize); + p += iesize; + *encoded_len += iesize; + } else + return 2; /* Out of space */ + } + + return 0; +} + diff --git a/include/osmocom/gtp/gtpie.h b/include/osmocom/gtp/gtpie.h index b6fea6e..b3e3ddf 100644 --- a/include/osmocom/gtp/gtpie.h +++ b/include/osmocom/gtp/gtpie.h @@ -321,5 +321,7 @@ extern int gtpie_encaps(union gtpie_member *ie[], void *pack, unsigned *len); extern int gtpie_encaps2(union gtpie_member ie[], unsigned int size, void *pack, unsigned *len); +extern int gtpie_encaps3(union gtpie_member *ie[], unsigned int ie_len, + void *pack, unsigned pack_len, unsigned *encoded_len); #endif /* !_GTPIE_H */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/39032?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I8bb086c568e07052c52d880df06049490346e91e Gerrit-Change-Number: 39032 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

6 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCU_Tests_SNS: sns_del: check if removed NS-VC still transmits

by pespin

Attention is currently required from: fixeria, laforge, lynxis lazus. pespin has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39011?usp=email ) Change subject: PCU_Tests_SNS: sns_del: check if removed NS-VC still transmits ...................................................................... Patch Set 2: (1 comment) File pcu/PCU_Tests_SNS.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39011/comment/6ead1b70_cf1f… : PS1, Line 327: integer idx := 0, integer idx_del := 1, float tout := 20.0 > I didn't propose to use the parameters somewhere. They are there for readability. […] Well, then the point is: if parameters are not changed, why passing parameters instead of declaring them as variables... I'm sorry but I don't think it's good to start using parameters in *testcase* with no real good reason or improvement. This may actually cause more unforeseen problems than good things. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39011?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ied4367a519cf75291ff8766c9efebb0f8a12b11f Gerrit-Change-Number: 39011 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 04 Dec 2024 17:19:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

6 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCU_Tests_SNS: sns_del: check if removed NS-VC still transmits

by lynxis lazus

Attention is currently required from: fixeria, pespin. lynxis lazus has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39011?usp=email ) Change subject: PCU_Tests_SNS: sns_del: check if removed NS-VC still transmits ...................................................................... Patch Set 2: (1 comment) File pcu/PCU_Tests_SNS.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39011/comment/ff085846_997d… : PS1, Line 327: integer idx := 0, integer idx_del := 1, float tout := 20.0 > So if you have in TC_ctrl: […] I didn't propose to use the parameters somewhere. They are there for readability. If someone would need as function, it would be easy to convert. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39011?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ied4367a519cf75291ff8766c9efebb0f8a12b11f Gerrit-Change-Number: 39011 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 04 Dec 2024 17:16:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

6 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2024