Attention is currently required from: pespin, daniel.
arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34224 )
Change subject: stream tests: Eliminate timestamps from output
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
> Simply and plain for me: I just submitted a test patch based on libosmo-netif master and it's passin […]
This doesn't prove that the problem is local or related to my patch.
The problems have been that for two patches (see above text, "Add ... support for IPA", for the server side patch I found a workaround by using a different local port), timestamps all of a sudden stopped being predictable and hence tests failed with these patches (.ok-output not matching).
The test code itself has not been changed and you can read above what commits are causing this deviation in timestamps (I haven't yet busied myself with identifying the exact reason or commit, my guess is it doesn't matter in the end).
If you were to rebase https://gerrit.osmocom.org/c/libosmo-netif/+/33198/19 on libosmo-netif master - I gave the then-HEAD commit hash for reference - , you should be able see what I'm talking about (the lastest revision - 20 - was uploaded together with this change and doesn't use timestamps, so it would fail for other discrepancies in stdout output).
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34224
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I7faed932927d4f6e328a28c7f30a647a7272e89c
Gerrit-Change-Number: 34224
Gerrit-PatchSet: 2
Gerrit-Owner: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 31 Aug 2023 19:07:44 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: dexter.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34269 )
Change subject: NAS_Templates: add template for EPS update type
......................................................................
Patch Set 1:
(1 comment)
File library/NAS_Templates.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34269/comment/3bc54388_20e7…
PS1, Line 320: const BIT3 c_EPS_UPD_TYPE_TA_UPD := '000'B;
this should be an enum afaiu.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34269
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: I6ffac88cc1d3967dc8000e17a65cdba79a013cf7
Gerrit-Change-Number: 34269
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: Thu, 31 Aug 2023 16:59:33 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: dexter.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34267 )
Change subject: NAS_Templates: fix ts_NAS_GUTI
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
So what you are saying is that ts_NAS_GUTI was wrong?
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34267
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: I9546993987b873e8ae921664238b234608e37bba
Gerrit-Change-Number: 34267
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: Thu, 31 Aug 2023 16:58:30 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: dexter.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34265 )
Change subject: GTPv2_Emulation: make sure g_uecups_conn_id is populated.
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34265
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: Ifc2e8d9de13d5d183d6f052b2092c356ab4973d1
Gerrit-Change-Number: 34265
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: Thu, 31 Aug 2023 16:55:48 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: laforge.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34264 )
Change subject: ipa: use LSBs of file descriptor as SLS in IPA->M3UA direction
......................................................................
Patch Set 1:
(2 comments)
Patchset:
PS1:
Why not have a global variable incrementing with each new conn instead of taking it from fd? That would improve a lot the equal distribution. Depending on how fds are allocated they can end up with most ASPs using the same SLS.
File src/ipa.c:
https://gerrit.osmocom.org/c/libosmo-sccp/+/34264/comment/c12cd83b_358ffdf4
PS1, Line 295: * \param[in] msg received message buffer. Callee takes ownership!
missing new param documentation
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34264
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: Ice7bab997b84cfed00c7d6d780c70f4e9fac6002
Gerrit-Change-Number: 34264
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Thu, 31 Aug 2023 16:55:02 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: laforge.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34263 )
Change subject: stp: Don't expect a fixed SLS in IPA -> M3UA case
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34263
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: Ib70322b80a72e3e7dc3155bca9e67b03efb413e0
Gerrit-Change-Number: 34263
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, 31 Aug 2023 16:48:25 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34265 )
Change subject: GTPv2_Emulation: make sure g_uecups_conn_id is populated.
......................................................................
GTPv2_Emulation: make sure g_uecups_conn_id is populated.
In function f_init, we activate altstep as_uecups_ind at the end of the
function. In as_uecups we use the template generator function
tr_UECUPS_RecvFrom_R(). In this function we use g_uecups_conn_id, which
is only populated when use_gtpu_daemon is set to true. When
use_gtpu_daemon is false g_uecups_conn_id will be <unbound>, which leads
into an error.
Related: OS#5760
Change-Id: Ifc2e8d9de13d5d183d6f052b2092c356ab4973d1
---
M library/GTPv2_Emulation.ttcn
1 file changed, 19 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/34265/1
diff --git a/library/GTPv2_Emulation.ttcn b/library/GTPv2_Emulation.ttcn
index 5bb3b1e..ff6a60a 100644
--- a/library/GTPv2_Emulation.ttcn
+++ b/library/GTPv2_Emulation.ttcn
@@ -389,6 +389,8 @@
remPort := g_gtp2_cfg.gtpc_remote_port
}
+ g_uecups_conn_id := res.connId;
+
if (g_gtp2_cfg.use_gtpu_daemon) {
map(self:UECUPS, system:UECUPS);
res := UECUPS_CodecPort_CtrlFunct.f_IPL4_connect(UECUPS, mp_uecups_host, mp_uecups_port, "", -1, -1, { sctp := valueof(ts_SCTP) });
@@ -396,7 +398,6 @@
setverdict(fail, "Could not connect UECUPS socket, check your configuration");
testcase.stop;
}
- g_uecups_conn_id := res.connId;
/* clear all tunnel state in the daemon at start */
f_uecups_xceive({reset_all_state := {}}, {reset_all_state_res:=?}, 30.0);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34265
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: Ifc2e8d9de13d5d183d6f052b2092c356ab4973d1
Gerrit-Change-Number: 34265
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newchange
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34267 )
Change subject: NAS_Templates: fix ts_NAS_GUTI
......................................................................
NAS_Templates: fix ts_NAS_GUTI
The template ts_NAS_GUTI permutates the MCC/MNC digits in a weird way,
which seems to map to a format that is not used anywhere else. Also the
template is not used anywhere yet.
Let's not permutate the MCC/MNC digit, instead let's put a comment that
makes clear which format has to be used.
Change-Id: I9546993987b873e8ae921664238b234608e37bba
Related: OS#5760
---
M library/NAS_Templates.ttcn
1 file changed, 23 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/34267/1
diff --git a/library/NAS_Templates.ttcn b/library/NAS_Templates.ttcn
index f819862..bbe7237 100644
--- a/library/NAS_Templates.ttcn
+++ b/library/NAS_Templates.ttcn
@@ -111,13 +111,15 @@
template (value) GUTI ts_NAS_GUTI(hexstring mcc_mnc, OCT2 mmegi, OCT1 mmec, OCT4 tmsi) := {
oddevenIndicator := '0'B,
spare := '1111'B,
- /* mcc_mnc specified in format 262f42 */
+ /* use the mcc_mnc format as specified in 3GPP TS 24.301, figure 9.9.3.12.1.
+ * Example: mcc=262, mnc=42 => 262f42.
+ * mcc=001, mnc=01 => 001f01. */
mccDigit1 := mcc_mnc[0],
mccDigit2 := mcc_mnc[1],
mccDigit3 := mcc_mnc[2],
- mncDigit3 := mcc_mnc[5],
- mncDigit1 := mcc_mnc[3],
- mncDigit2 := mcc_mnc[4],
+ mncDigit3 := mcc_mnc[3],
+ mncDigit1 := mcc_mnc[4],
+ mncDigit2 := mcc_mnc[5],
mMEGI := mmegi,
mMEC := mmec,
mTMSI := tmsi
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34267
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: I9546993987b873e8ae921664238b234608e37bba
Gerrit-Change-Number: 34267
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newchange
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34262 )
Change subject: ms: bump osmocom-bb submodule to current head
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34262
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I9a16de0dce2e89fb522271ba63d908e33a1d7cde
Gerrit-Change-Number: 34262
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Thu, 31 Aug 2023 15:53:31 +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/+/34264 )
Change subject: ipa: use LSBs of file descriptor as SLS in IPA->M3UA direction
......................................................................
ipa: use LSBs of file descriptor as SLS in IPA->M3UA direction
when IPA/SCCPlite traffic traverses the osmo_ss7 stack, so far the
SLS of the MTP3 label was always set to 0 (default initialization).
However, in order to achieve a better distribution of signaling traffic
in SS7 networks that actually utilize the SLS to select any links (or
ASPs), it makes sense to use non-zero values.
Instead of introducing some kind of new, configurable attribute for
each ASP (IPA client connection), let's simply use the lower 4 bits of
the file descriptor integer. Those file descriptors should have a
roughly equal distribution, resulting in traffic (from multiple IPA
clients) to be spread across the 4-bit SLS number space.
Also, this mechanism ensures that traffic from one IPA client will
always get the same SLS and hence routed the same way in any underlying
CS7/SS7 network.
Change-Id: Ice7bab997b84cfed00c7d6d780c70f4e9fac6002
Related: SYS#6543
---
M src/ipa.c
M src/osmo_ss7.c
M src/xua_internal.h
3 files changed, 34 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/64/34264/1
diff --git a/src/ipa.c b/src/ipa.c
index 8daa5e0..874879e 100644
--- a/src/ipa.c
+++ b/src/ipa.c
@@ -211,7 +211,7 @@
return sccp_msg_out;
}
-static int ipa_rx_msg_sccp(struct osmo_ss7_asp *asp, struct msgb *msg)
+static int ipa_rx_msg_sccp(struct osmo_ss7_asp *asp, struct msgb *msg, uint8_t sls)
{
int rc;
struct m3ua_data_hdr data_hdr;
@@ -276,6 +276,7 @@
data_hdr.si = MTP_SI_SCCP;
data_hdr.opc = osmo_htonl(opc);
data_hdr.dpc = osmo_htonl(dpc);
+ data_hdr.sls = sls;
data_hdr.ni = as->inst->cfg.network_indicator;
/* Create M3UA message in XUA structure */
xua = m3ua_xfer_from_data(&data_hdr, msgb_l2(msg), msgb_l2len(msg));
@@ -293,7 +294,7 @@
* \param[in] asp Application Server Process receiving \a msg
* \param[in] msg received message buffer. Callee takes ownership!
* \returns 0 on success; negative on error */
-int ipa_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg)
+int ipa_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg, uint8_t sls)
{
struct ipaccess_head *hh;
int rc;
@@ -309,7 +310,7 @@
rc = ipa_rx_msg_ccm(asp, msg);
break;
case IPAC_PROTO_SCCP:
- rc = ipa_rx_msg_sccp(asp, msg);
+ rc = ipa_rx_msg_sccp(asp, msg, sls);
break;
default:
rc = ss7_asp_rx_unknown(asp, hh->proto, msg);
diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c
index b8124d1..440014a 100644
--- a/src/osmo_ss7.c
+++ b/src/osmo_ss7.c
@@ -2046,7 +2046,7 @@
}
msg->dst = asp;
- return ipa_rx_msg(asp, msg);
+ return ipa_rx_msg(asp, msg, ofd->fd & 0xf);
}
/* netif code tells us we can read something from the socket */
@@ -2194,7 +2194,7 @@
}
msg->dst = asp;
rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL);
- return ipa_rx_msg(asp, msg);
+ return ipa_rx_msg(asp, msg, ofd->fd & 0xf);
}
static int xua_cli_read_cb(struct osmo_stream_cli *conn)
diff --git a/src/xua_internal.h b/src/xua_internal.h
index 26cb3fc..93f6140 100644
--- a/src/xua_internal.h
+++ b/src/xua_internal.h
@@ -116,7 +116,7 @@
const struct xua_msg_part *rctx_ie);
int ipa_tx_xua_as(struct osmo_ss7_as *as, struct xua_msg *xua);
-int ipa_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg);
+int ipa_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg, uint8_t sls);
int osmo_isup_party_parse(char *out_digits, const uint8_t *in,
unsigned int in_num_bytes, bool odd);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34264
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: Ice7bab997b84cfed00c7d6d780c70f4e9fac6002
Gerrit-Change-Number: 34264
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newchange
Attention is currently required from: dexter.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34059 )
Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH
......................................................................
Patch Set 5: Code-Review+1
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/osmo-bts/+/34059/comment/f823304c_8e9ec908
PS4, Line 14: CAUTION: This patch breaks compatibility to current master osmo-pcu (See
: also "Depends")
> What do you think? Shall we bump the version to v.12 here now (osmo-ttcn3-hacks would require a follow up patch)
Ideally, yes. But there have already been some turbulence within PCUIFv11, so I guess it's too late and bumping the version [again] would create even more turbulence/confusion.
> [...] in the future apply the policy that the version number must be bumped as soon as a detail in PCUIF changes
I believe this policy is not new and was followed before PCUIFv11.
But yes, we should definitely stick to this policy.
--
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: 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-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 31 Aug 2023 15:05:55 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34261 )
Change subject: GTP_Templates: Fix several template type incongruencies
......................................................................
Patch Set 1:
(3 comments)
File library/GTP_Templates.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34261/comment/8caeb75e_93a1…
PS1, Line 285: lengthf := 2
As I said in the IRC, hard-coding `lengthf` to 2 is wrong. It's only valid if `ip_addr` is `omit`, and would not match otherwise. I suggest to use `f_eua_ipv4_len()` here and drop `tr_EuaIPv4`.
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34261/comment/933c7df9_b28e…
PS1, Line 306: lengthf := 2,
Same here.
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34261/comment/f4fd442f_72d7…
PS1, Line 328: lengthf := 2,
Same here.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34261
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: I3846d2a077e4bc53a772e354fcc3c38ca952b38f
Gerrit-Change-Number: 34261
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 31 Aug 2023 14:39:53 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34256 )
Change subject: osmo_io: Change parent of msghdr to iofd (instead of msg)
......................................................................
osmo_io: Change parent of msghdr to iofd (instead of msg)
msg was made a parent of msghdr after discussion in change
I3a279b55a3adff96948120683c844e1508d0ba94
It turns out this violates some assumptions made in osmo_io,
specifically that the user read callback shall free msg, but we expect
msghdr to remain valid until after that callback returns.
In general I think it is cleaner to make iofd a parent of msghdr.
Change-Id: I41277190e3020cd8fa625bd57a743973e2a65c4b
---
M src/core/osmo_io.c
1 file changed, 19 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c
index e176099..c67787b 100644
--- a/src/core/osmo_io.c
+++ b/src/core/osmo_io.c
@@ -120,7 +120,7 @@
talloc_steal(iofd, msg);
}
- hdr = talloc_zero(msg, struct iofd_msghdr);
+ hdr = talloc_zero(iofd, struct iofd_msghdr);
if (!hdr) {
if (free_msg)
talloc_free(msg);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34256
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I41277190e3020cd8fa625bd57a743973e2a65c4b
Gerrit-Change-Number: 34256
Gerrit-PatchSet: 2
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: daniel.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34257 )
Change subject: osmo_io: Use local variable to reference msghdr->msg
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34257
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I336ef7a5460dd18bf8e0f4ac5e97747f9fec5a35
Gerrit-Change-Number: 34257
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 31 Aug 2023 14:28:10 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: daniel.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34256 )
Change subject: osmo_io: Change parent of msghdr to iofd (instead of msg)
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34256
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I41277190e3020cd8fa625bd57a743973e2a65c4b
Gerrit-Change-Number: 34256
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 31 Aug 2023 14:28:01 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34261 )
Change subject: GTP_Templates: Fix several template type incongruencies
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34261
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: I3846d2a077e4bc53a772e354fcc3c38ca952b38f
Gerrit-Change-Number: 34261
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: Jenkins Builder
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 31 Aug 2023 14:27:24 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34260 )
Change subject: debian: fix build on ubuntu 20.04 without liburing
......................................................................
debian: fix build on ubuntu 20.04 without liburing
Ubuntu 20.04 is based on debian 11, but does not have liburing. Extend
the logic to cover this distribution too, so building packages for it
isn't stuck anymore on libosmocore not being able to resolve the
liburing-dev dependency.
I have verified that this makes libosmocore properly build with/without
liburing on debian 10, 11 and ubuntu 20.04 and 22.04.
Fixes: e486e012 ("debian: depend on liburing-dev for debian >= 11")
Change-Id: If18d6543fae9537c8b188e90499491bda3fdfe59
---
M debian/control
M debian/rules
2 files changed, 23 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/debian/control b/debian/control
index 1f1975e..e6b96e1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@
Maintainer: Osmocom team <openbsc(a)lists.osmocom.org>
Section: libs
Priority: optional
+# liburing-dev: don't try to install it on debian 10 and ubuntu 20.04
Build-Depends: debhelper (>= 10),
autotools-dev,
autoconf,
@@ -19,7 +20,7 @@
libusb-1.0-0-dev,
libmnl-dev,
libsystemd-dev,
- base-files (<< 11) | liburing-dev,
+ liburing-dev | base-files (<< 11) | ubuntu-keyring (<< 2021),
python3:native
Standards-Version: 3.9.8
Vcs-Git: https://gitea.osmocom.org/osmocom/libosmocore
diff --git a/debian/rules b/debian/rules
index efa5adc..f0105b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@
override_dh_auto_test:
dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)
-# Set --disable-uring for debian < 11 based distributions
+# Set --disable-uring for debian 10 and ubuntu 20.04
override_dh_auto_configure:
set -x && \
CONFIGURE_FLAGS=" \
@@ -33,8 +33,8 @@
--enable-static \
--enable-systemd-logging \
"; \
- base_ver="$$(dpkg -l base-files | grep "^ii" | awk '{print $$3}')"; \
- if dpkg --compare-versions "$$base_ver" lt 11; then \
+ distro_v=$$(. /etc/os-release && echo $$VERSION_ID); \
+ if [ "$$distro_v" = 10 ] || [ "$$distro_v" = 20.04 ]; then \
CONFIGURE_FLAGS="$$CONFIGURE_FLAGS --disable-uring"; \
fi; \
dh_auto_configure -- $$CONFIGURE_FLAGS
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34260
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: If18d6543fae9537c8b188e90499491bda3fdfe59
Gerrit-Change-Number: 34260
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: fixeria.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34260 )
Change subject: debian: fix build on ubuntu 20.04 without liburing
......................................................................
Patch Set 1: Code-Review+2
(1 comment)
Patchset:
PS1:
> Seeing how much fallout we had after making libosmocore depend on liburing by default (unless `--dis […]
FWIW we would still have required this logic for the debian packaging, it would just be in reverse.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34260
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: If18d6543fae9537c8b188e90499491bda3fdfe59
Gerrit-Change-Number: 34260
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 31 Aug 2023 14:19:21 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: osmith.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34260 )
Change subject: debian: fix build on ubuntu 20.04 without liburing
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
Patchset:
PS1:
Seeing how much fallout we had after making libosmocore depend on liburing by default (unless `--disable-uring` is specified), I am again starting to think that it would have been safer to not require this problematic dependency unless explicitly configured (i.e. by passing `--enable-uring`). This way we could enable it only when building for known-to-have-it distributions.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34260
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: If18d6543fae9537c8b188e90499491bda3fdfe59
Gerrit-Change-Number: 34260
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 31 Aug 2023 14:17:44 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34192 )
Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch
......................................................................
Patch Set 6:
(1 comment)
File src/osmo-bsc/pcu_sock.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/eed2ee66_fde2d946
PS1, Line 552: if (pch->confirmed_imm_ass)
> I take your criticism seriously. […]
My sincere opinion here is that we are really taking much more time than initially expected to apply all these changes, specially because some changes have been made which had to be reverted/redone since stuff was not looked at with enough detail or long vision back then.
I am also not happy with how the change process have been done but here we are. Let's try at least to be clear and compile the different changes that were made v10->v11, since it's right now quite difficult to gasp due to all the different patchsets.
That's really the problem imho, not the fact that we need to bump the PCUIF N times imho.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0
Gerrit-Change-Number: 34192
Gerrit-PatchSet: 6
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 31 Aug 2023 09:11:58 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
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