[L] Change in osmo-mgw[master]: add fmtp string to ptmap: allow all possible fmtp
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email ) Change subject: add fmtp string to ptmap: allow all possible fmtp .. Patch Set 1: (1 comment) File include/osmocom/mgcp_client/mgcp_client.h: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12114): https://gerrit.osmocom.org/c/osmo-mgw/+/34900/comment/eb876c85_e3480476 PS1, Line 84:const char *fmtp; Statements should start on a tabstop -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b Gerrit-Change-Number: 34900 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 26 Oct 2023 01:50:25 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-mgw[master]: mgcp_client_fsm: fix inconsistent API (param_present, param).
Attention is currently required from: dexter, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34351?usp=email ) Change subject: mgcp_client_fsm: fix inconsistent API (param_present, param). .. Patch Set 8: (1 comment) Patchset: PS8: to put money where my mouth is, i actually implemented my suggestions in alternative patch https://gerrit.osmocom.org/c/osmo-mgw/+/34900 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34351?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I50d737f3f3d45e4004c64101700a471fe75b3436 Gerrit-Change-Number: 34351 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Thu, 26 Oct 2023 01:55:15 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[L] Change in osmo-mgw[master]: add fmtp string to ptmap: allow all possible fmtp
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email )
Change subject: add fmtp string to ptmap: allow all possible fmtp
..
add fmtp string to ptmap: allow all possible fmtp
Remove the limit of having only one AMR octet-aligned fmtp parameter per
MGCP message. Instead allow any arbitrary fmtp options, one per every
codec.
Deprecate all use of struct mgcp_codec_param. Instead, store and pass
plain fmtp strings.
We need to know fmtp details only for AMR, and only to probe whether it
is octet-aligned. So add a separate fmtp string parser that returns that
information flexibly, as in
if (osmo_mgcp_fmtp_get_int("octet-aligned", 0) == 1) ...
Provide legacy shims that still act correctly for any callers that may
pass the old struct mgcp_codec_param. (I'm not sure if we need to keep
this, but we can always drop it in another patch.)
Adjust one mgcp_test.c: instead of returning only the octet-aligned
parameter, now osmo-mgw keeps and returns all the fmtp parameters that
the user provided. So add the missing "mode-change-capability".
Related: OS#6171
Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b
---
M include/osmocom/mgcp/Makefile.am
A include/osmocom/mgcp/fmtp.h
M include/osmocom/mgcp/mgcp_codec.h
M include/osmocom/mgcp/mgcp_network.h
M include/osmocom/mgcp_client/mgcp_client.h
M src/libosmo-mgcp-client/mgcp_client.c
M src/libosmo-mgcp/Makefile.am
A src/libosmo-mgcp/fmtp.c
M src/libosmo-mgcp/mgcp_codec.c
M src/libosmo-mgcp/mgcp_network.c
M src/libosmo-mgcp/mgcp_protocol.c
M src/libosmo-mgcp/mgcp_sdp.c
M tests/mgcp/mgcp_test.c
13 files changed, 264 insertions(+), 93 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/00/34900/1
diff --git a/include/osmocom/mgcp/Makefile.am b/include/osmocom/mgcp/Makefile.am
index 15ff01a..5d77c09 100644
--- a/include/osmocom/mgcp/Makefile.am
+++ b/include/osmocom/mgcp/Makefile.am
@@ -13,4 +13,5 @@
mgcp_network.h \
mgcp_protocol.h \
mgcp_iuup.h \
+ fmtp.h \
$(NULL)
diff --git a/include/osmocom/mgcp/fmtp.h b/include/osmocom/mgcp/fmtp.h
new file mode 100644
index 000..95a7504
--- /dev/null
+++ b/include/osmocom/mgcp/fmtp.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include
+#include
+
+int osmo_mgcp_fmtp_get_val(char *val, size_t val_size, const char *fmtp, const
char *option_name);
+int osmo_mgcp_fmtp_get_int(const char *fmtp, const char *option_name, int
default_value);
+bool osmo_mgcp_fmtp_is_octet_aligned(const char *fmtp);
+
+#define OSMO_MGCP_OCTET_ALIGNED_STR "octet-aligned"
+#define OSMO_MGCP_OCTET_ALIGNED_EQUALS_STR(VAL) OSMO_MGCP_OCTET_ALIGNED_STR
"=" VAL
diff --git a/include/osmocom/mgcp/mgcp_codec.h
b/include/osmocom/mgcp/mgcp_codec.h
index cfc8ecf..4702f6d 100644
--- a/include/osmocom/mgcp/mgcp_codec.h
+++ b/include/osmocom/mgcp/mgcp_codec.h
@@ -13,6 +13,7 @@
void mgcp_codec_summary(struct mgcp_conn_rtp *conn);
void mgcp_codec_reset_all(struct mgcp_conn_rtp *conn);
int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char
*audio_name, const struct mgcp_codec_param *param);
+int mgcp_codec_add2(struct mgcp_conn_rtp *conn, int payload_type, const char
*audio_name, const char *fmtp);
int mgcp_codec_decide(struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp
*conn_dst);
const struct mgcp_rtp_codec *mgcp_codec_pt_find_by_subtype_name(struct
mgcp_conn_rtp *conn,
const char
*subtype_name, unsigned int match_nr);
diff --git a/include/osmocom/mgcp/mgcp_network.h
b/include/osmocom/mgcp/mgcp_network.h
index e95907d..7f87224 100644
--- a/include/osmocom/mgcp/mgcp_network.h
+++ b/include/osmocom/mgcp/mgcp_network.h
@@ -83,8 +83,11 @@
char audio_name[64];
char subtype_name[64];
+ /* Deprecated. Use the new fmtp string instead. */
bool param_present;
struct mgcp_codec_param param;
+
+ char fmtp[256];
};
/* 'mgcp_rtp_end': basically a wrapper around the RTP+RTCP ports */
diff --git a/include/osmocom/mgcp_client/mgcp_client.h
b/include/osmocom/mgcp_client/mgcp_client.h
index 31f4ae7..c238dc2 100644
--- a/include/osmocom/mgcp_client/mgcp_client.h
+++ b/include/osmocom/mgcp_client/mgcp_client.h
@@ -77,6 +77,11 @@
/*! payload type number (96-127) */
unsigned int pt;
+
+ /*! the MGCP 'a=fmtp:N <...>' string, e.g.
"mode-set=1,2,3;octet-align=0".
+* Suggested storage: talloc allocated string with the struct
mgcp_conn_peer or struct mgcp_response as talloc
+* ctx. */
+const char *fmtp;
};
struct mgcp_response_head {
@@ -158,7 +163,8 @@
uint8_t rate, uint8_t offset);
/* Invoked when an MGCP response is received or sending failed. When the
- * response is passed as NULL, this indicates failure during transmission. */
+ * response is passed as NULL, this indicates
[L] Change in osmo-mgw[master]: add fmtp string to ptmap: allow all possible fmtp
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email ) Change subject: add fmtp string to ptmap: allow all possible fmtp .. Patch Set 1: (1 comment) This change is ready for review. Patchset: PS1: ttcn3 tests still fail, @pma...@sysmocom.de would be great if you could take a look..? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b Gerrit-Change-Number: 34900 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter Gerrit-Comment-Date: Thu, 26 Oct 2023 01:56:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[L] Change in osmo-mgw[master]: add fmtp string to ptmap: allow all possible fmtp
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email ) Change subject: add fmtp string to ptmap: allow all possible fmtp .. Patch Set 1: (1 comment) Patchset: PS1: context: this patch replaces https://gerrit.osmocom.org/c/osmo-mgw/+/34351 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b Gerrit-Change-Number: 34900 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 26 Oct 2023 01:54:33 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-mgw[master]: mgcp_client_fsm: explain member param in struct mgcp_conn_peer better
Attention is currently required from: dexter. neels has uploaded a new patch set (#5) to the change originally created by dexter. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34350?usp=email ) The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: mgcp_client_fsm: explain member param in struct mgcp_conn_peer better .. mgcp_client_fsm: explain member param in struct mgcp_conn_peer better The struct member param specifies additional codec parameters. Let's improve its explaination. Change-Id: Iea4dc1e72fccaa464ce503fae88b5d8a867b1d19 Related: OS#6171 --- M include/osmocom/mgcp_client/mgcp_client_fsm.h 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/50/34350/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34350?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iea4dc1e72fccaa464ce503fae88b5d8a867b1d19 Gerrit-Change-Number: 34350 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[M] Change in osmo-mgw[master]: mgcp_client_fsm: fix inconsistent API (param_present, param).
Attention is currently required from: dexter, pespin.
neels has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-mgw/+/34351?usp=email )
Change subject: mgcp_client_fsm: fix inconsistent API (param_present, param).
..
Patch Set 8: Code-Review-1
(7 comments)
Patchset:
PS8:
this can be much simpler, especially after
https://gerrit.osmocom.org/c/osmo-mgw/+/34899 ...
File include/osmocom/mgcp/mgcp_common.h:
https://gerrit.osmocom.org/c/osmo-mgw/+/34351/comment/169b3632_9f718fee
PS8, Line 73: } amr;
let's add a char* fmtp entry to struct ptmap instead.
To go with it, let's add individual parsing functions like
bool oa = (fmtp_get_int(ptmap->fmtp, "octet-align") == 1)
The parsing should only happen when we actually need details on an AMR entry,
not on every message parsing and composition.
why:
so what i don't like about this is that it needs to model each and every fmtp
that exists in anyone's MGCP in a C struct. Much rather, I'd suggest that we
simply keep an actual string of the fmtp, and evaluate that string whenever we
would need the conveyed information. Like that we can transport and respond
with fmtp that osmo-mgw does not even need to care about. With the C struct
implementation, we silently drop all unknown fmtp in a conversation, or we need
to error a lot.
File include/osmocom/mgcp_client/mgcp_client_fsm.h:
https://gerrit.osmocom.org/c/osmo-mgw/+/34351/comment/ba48c374_58bbd033
PS2, Line 70: struct mgcp_codec_param2 codecs_param[MGCP_MAX_CODECS];
> Ok, better sort that kind of problems *before* this patch.
Instead please add a fmtp entry to the struct ptmap, so that all of pt, codec
and fmtp are kept in the same place. (further below i explain why i think it
should be a string)
why:
i don't like this at all at all, it creates a separate array that needs to be
kept in sync with (in this patch) the 'codecs' list as well as the 'ptmap'
list. While doing this review, i submitted a patch to combine those two into
just 'ptmap', because it is complete madness to keep N separate arrays of
individual struct members, when you can just keep one array of structs. It
would be cool to continue in that way.
File src/libosmo-mgcp-client/mgcp_client.c:
https://gerrit.osmocom.org/c/osmo-mgw/+/34351/comment/3e14e32c_d1270c9c
PS8, Line 1374: OSMO_ASSERT(!(mgcp_msg->param_present &&
mgcp_msg->codecs_param_present));
when we add a fmtp string to ptmap, then we don't need a codecs_param list nor
a codecs_param_present flag. Instead I would see if in an incoming mgcp_msg, if
param_present == true, apply that param only to those ptmap entries where there
is no fmtp yet.
It would be cooler if we could just drop param, but we need to be backwards
compatible, right?
https://gerrit.osmocom.org/c/osmo-mgw/+/34351/comment/0aefc4f3_c31feb32
PS8, Line 1391: for (i = 0; i < mgcp_msg->codecs_len; i++) {
if you accept my suggestion in https://gerrit.osmocom.org/c/osmo-mgw/+/34899
then here you'd iterate mgcp_msg->ptmap instead.
https://gerrit.osmocom.org/c/osmo-mgw/+/34351/comment/d38e13de_a81a82c0
PS8, Line 1394: continue;
so this is dropping all fmtp except for AMR codecs, not ideal. Instead we could
just simply store the string as it is.
https://gerrit.osmocom.org/c/osmo-mgw/+/34351/comment/4a071b36_1af1b90e
PS8, Line 1399: MSGB_PRINTF_OR_RET("a=fmtp:%u
octet-align=0\r\n", pt);
i don't like this: this is implementing codec-specific fmtp composition in
osmo-mgw. Instead we should use the exact string that the user provided.
If we take on fmtp composition, we are opening a can of worms.
For example, the octet-align parameter is specified with a default value. It is
usually only present when it should differ from the default, and omitted if it
is the default. I'm not saying which one is better -- the point is that we
don't want to have to make these decisions in osmo-mgw, at all.
If we keep the fmtp string 1:1, we can just lean back and use whatever clients
throw at us, just carry the fmtp along as they are. Only when we need a fmtp
detail like for AMR OA vs BE conversion, only then do we need to validate that
the fmtp parameters make any sense. Only then will we have to throw an error if
the fmtp is garbage. For those cases we don't care whether a default value is
present or omitted, we just need to get the bit of message handling relevant
information from it.
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34351?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I50d737f3f3d45e4004c64101700a471fe75b3436
Gerrit-Change-Number: 34351
Gerrit-PatchSet: 8
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels
Gerrit-CC: pespin
[M] Change in osmo-mgw[master]: mgcp_client_fsm: fix inconsistent API (param_present, param).
Attention is currently required from: dexter, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34351?usp=email ) Change subject: mgcp_client_fsm: fix inconsistent API (param_present, param). .. Patch Set 8: (1 comment) File include/osmocom/mgcp/mgcp_common.h: https://gerrit.osmocom.org/c/osmo-mgw/+/34351/comment/3befaf34_62063e21 PS8, Line 73: } amr; > let's add a char* fmtp entry to struct ptmap instead. […] (that fmtp_get_int() idea would also need another argument: a default value in case the fmtp in question is omitted) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34351?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I50d737f3f3d45e4004c64101700a471fe75b3436 Gerrit-Change-Number: 34351 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 25 Oct 2023 21:45:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
[M] Change in osmo-mgw[master]: mgcp_client_fsm: fix inconsistent API (param_present, param).
Attention is currently required from: dexter, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34351?usp=email ) Change subject: mgcp_client_fsm: fix inconsistent API (param_present, param). .. Patch Set 8: (1 comment) File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/c/osmo-mgw/+/34351/comment/2d415c7c_33c76717 PS8, Line 1374: OSMO_ASSERT(!(mgcp_msg->param_present && mgcp_msg->codecs_param_present)); > when we add a fmtp string to ptmap, then we don't need a codecs_param list > nor a codecs_param_presen […] hmm, can we assume to control all existing osmo_mgcp_cient users? it would be very tempting to just drop the stupid 'param' completely, because its compatibility code would have to compose fmtp strings again... just thinking, probably not going to happen, right -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34351?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I50d737f3f3d45e4004c64101700a471fe75b3436 Gerrit-Change-Number: 34351 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 25 Oct 2023 21:43:29 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
[S] Change in osmo-mgw[master]: mgcp_parse_audio_port_pt(): fix buffer overflow
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34898?usp=email ) Change subject: mgcp_parse_audio_port_pt(): fix buffer overflow .. Patch Set 1: (1 comment) File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/c/osmo-mgw/+/34898/comment/9ebb4e86_7aea0f98 PS1, Line 321: /* Do not allow excessive payload types */ why is this r->ptmap now? I see you are acessing r->codecs[count] below... -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34898?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I18c78d15eb1593f404b4741248225b68878b463f Gerrit-Change-Number: 34898 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Wed, 25 Oct 2023 21:14:57 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-mgw[master]: mgcp_client_fsm: explain member param in struct mgcp_conn_peer better
Attention is currently required from: dexter. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34350?usp=email ) Change subject: mgcp_client_fsm: explain member param in struct mgcp_conn_peer better .. Patch Set 4: (1 comment) Patchset: PS4: ok, though it is a bit weird to improve the documentation for a struct member that we need to replace (in order to allow varying fmtp per ptmap entry) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34350?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iea4dc1e72fccaa464ce503fae88b5d8a867b1d19 Gerrit-Change-Number: 34350 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 25 Oct 2023 20:58:28 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-mgw[master]: client: collapse codecs[] and ptmap[]; allow codec variants
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email
to look at the new patch set (#3).
Change subject: client: collapse codecs[] and ptmap[]; allow codec variants
..
client: collapse codecs[] and ptmap[]; allow codec variants
codecs[] is an array of enum osmo_mgcp_codecs.
ptmap[] is an array of { enum osmo_mgcp_codecs, unsigned int ptmap }.
MGCP lists first a bunch of payload type numbers and then specifies them
again for details, like the numbers 112, 96, 3 in this example:
m=audio RTP/AVP 112 96 3
a=rtpmap:112 AMR/8000
a=rtpmap:96 VND.3GPP.IUFP/16000
a=rtpmap:3 GSM-FR/8000
So far we keep these lists in two separate arrays, in both struct
mgcp_response and struct mgcp_msg:
- codecs[], codecs_len stores the 'm=audio' list
- ptmap[], ptmap_len stores the 'a=rtpmap' list
These are semantically identical, and the separation means we cannot
have the same codec twice, like AMR with different fmtp variations. It
also leads to checks, conversions and dear hopes of correct ordering.
So let's keep only one list with both codec and payload type number in
it. The 'm=audio' list establishes the order of the pt numbers, and the
'a=rtpmap' list adds codec information to the established entries.
Related: OS#6171
Change-Id: I798e02c6663376d3d52f4a74fc4b32411ce95bed
---
M include/osmocom/mgcp_client/mgcp_client.h
M include/osmocom/mgcp_client/mgcp_client_fsm.h
M src/libosmo-mgcp-client/mgcp_client.c
M src/libosmo-mgcp-client/mgcp_client_fsm.c
M tests/mgcp_client/mgcp_client_test.c
5 files changed, 109 insertions(+), 63 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/99/34899/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I798e02c6663376d3d52f4a74fc4b32411ce95bed
Gerrit-Change-Number: 34899
Gerrit-PatchSet: 3
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset
[M] Change in osmo-mgw[master]: client: collapse codecs[] and ptmap[]; allow codec variants
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email
to look at the new patch set (#2).
Change subject: client: collapse codecs[] and ptmap[]; allow codec variants
..
client: collapse codecs[] and ptmap[]; allow codec variants
codecs[] is an array of enum osmo_mgcp_codecs.
ptmap[] is an array of { enum osmo_mgcp_codecs, unsigned int ptmap }.
MGCP lists first a bunch of payload type numbers and then specifies them
again for details, like the numbers 112, 96, 3 in this example:
m=audio RTP/AVP 112 96 3
a=rtpmap:112 AMR/8000
a=rtpmap:96 VND.3GPP.IUFP/16000
a=rtpmap:3 GSM-FR/8000
So far we keep these lists in two separate arrays, in both struct
mgcp_response and struct mgcp_msg:
- codecs[], codecs_len stores the 'm=audio' list
- ptmap[], ptmap_len stores the 'a=rtpmap' list
These are semantically identical, and the separation means we cannot
have the same codec twice, like AMR with different fmtp variations. It
also leads to checks, conversions and dear hopes of correct ordering.
So let's keep only one list with both codec and payload type number in
it. The 'm=audio' list establishes the order of the pt numbers, and the
'a=rtpmap' list adds codec information to the established entries.
Change-Id: I798e02c6663376d3d52f4a74fc4b32411ce95bed
---
M include/osmocom/mgcp_client/mgcp_client.h
M include/osmocom/mgcp_client/mgcp_client_fsm.h
M src/libosmo-mgcp-client/mgcp_client.c
M src/libosmo-mgcp-client/mgcp_client_fsm.c
M tests/mgcp_client/mgcp_client_test.c
5 files changed, 108 insertions(+), 63 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/99/34899/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I798e02c6663376d3d52f4a74fc4b32411ce95bed
Gerrit-Change-Number: 34899
Gerrit-PatchSet: 2
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset
[M] Change in osmo-mgw[master]: eliminate duality of codecs[] and ptmap[]
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email )
Change subject: eliminate duality of codecs[] and ptmap[]
..
eliminate duality of codecs[] and ptmap[]
codecs[] is an array of enum osmo_mgcp_codecs.
ptmap[] is an array of { enum osmo_mgcp_codecs, unsigned int ptmap }.
MGCP lists first a bunch of payload type numbers and then specifies them
again for details, like the numbers 112, 96, 3 in this example:
m=audio RTP/AVP 112 96 3
a=rtpmap:112 AMR/8000
a=rtpmap:96 VND.3GPP.IUFP/16000
a=rtpmap:3 GSM-FR/8000
So far we keep these lists in two separate arrays, in both struct
mgcp_response and struct mgcp_msg:
- codecs[], codecs_len stores the 'm=audio' list
- ptmap[], ptmap_len stores the 'a=rtpmap' list
These are semantically identical, and keeping two instances leads to
numerous checks, conversions and dear hopes of correct ordering.
So let's keep only one list with both codec and payload type number in
it. The 'm=audio' list establishes the order of the pt numbers, and the
'a=rtpmap' list adds codec information to the established entries.
Change-Id: I798e02c6663376d3d52f4a74fc4b32411ce95bed
---
M include/osmocom/mgcp_client/mgcp_client.h
M include/osmocom/mgcp_client/mgcp_client_fsm.h
M src/libosmo-mgcp-client/mgcp_client.c
M src/libosmo-mgcp-client/mgcp_client_fsm.c
M tests/mgcp_client/mgcp_client_test.c
5 files changed, 107 insertions(+), 63 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/99/34899/1
diff --git a/include/osmocom/mgcp_client/mgcp_client.h
b/include/osmocom/mgcp_client/mgcp_client.h
index 9a0611a..31f4ae7 100644
--- a/include/osmocom/mgcp_client/mgcp_client.h
+++ b/include/osmocom/mgcp_client/mgcp_client.h
@@ -95,8 +95,6 @@
uint16_t audio_port;
char audio_ip[INET6_ADDRSTRLEN];
unsigned int ptime;
- enum mgcp_codecs codecs[MGCP_MAX_CODECS];
- unsigned int codecs_len;
struct ptmap ptmap[MGCP_MAX_CODECS];
unsigned int ptmap_len;
};
@@ -129,8 +127,6 @@
char *audio_ip;
enum mgcp_connection_mode conn_mode;
unsigned int ptime;
- enum mgcp_codecs codecs[MGCP_MAX_CODECS];
- unsigned int codecs_len;
struct ptmap ptmap[MGCP_MAX_CODECS];
unsigned int ptmap_len;
uint32_t x_osmo_ign;
diff --git a/include/osmocom/mgcp_client/mgcp_client_fsm.h
b/include/osmocom/mgcp_client/mgcp_client_fsm.h
index ade4f49..25f0732 100644
--- a/include/osmocom/mgcp_client/mgcp_client_fsm.h
+++ b/include/osmocom/mgcp_client/mgcp_client_fsm.h
@@ -29,12 +29,6 @@
/*! RTP packetization interval (optional) */
unsigned int ptime;
- /*! RTP codec list (optional) */
- enum mgcp_codecs codecs[MGCP_MAX_CODECS];
-
- /*! Number of codecs in RTP codec list (optional) */
- unsigned int codecs_len;
-
/*! RTP payload type map (optional, only needed when payload types are
* used that differ from what IANA/3GPP defines) */
struct ptmap ptmap[MGCP_MAX_CODECS];
diff --git a/src/libosmo-mgcp-client/mgcp_client.c
b/src/libosmo-mgcp-client/mgcp_client.c
index 95c7a4b..a66b499 100644
--- a/src/libosmo-mgcp-client/mgcp_client.c
+++ b/src/libosmo-mgcp-client/mgcp_client.c
@@ -302,7 +302,7 @@
char *pt_str;
char *pt_end;
unsigned long int pt;
- unsigned int count = 0;
+ unsigned int ptmap_len;
unsigned int i;
/* Extract port information */
@@ -316,10 +316,15 @@
if (!line)
goto exit;
+ /* Clear any previous entries before writing over r->ptmap */
+ r->ptmap_len = 0;
+ /* Keep a local ptmap_len to show only the full list after parsing
succeeded in whole. */
+ ptmap_len = 0;
+
pt_str = strtok(line, " ");
while (1) {
/* Do not allow excessive payload types */
- if (count >= ARRAY_SIZE(r->ptmap))
+ if (ptmap_len >= ARRAY_SIZE(r->ptmap))
goto response_parse_failure_pt;
pt_str = strtok(NULL, " ");
@@ -335,8 +340,8 @@
goto response_parse_failure_pt;
/* Do not allow duplicate payload types */
- for (i = 0; i < count; i++)
- if (r->codecs[i] == pt)
+ for (i = 0; i < ptmap_len; i++)
+ if (r->ptmap[i].pt == pt)
goto response_parse_failure_pt;
/* Note: The payload type we store may not necessarly match
@@ -345,11 +350,13 @@
* match enum mgcp_codecs, we will go through afterwards and
* remap the affected entries with the inrofmation we learn
* from rtpmap */
- r->codecs[count] = pt;
- count++;
+ r->ptmap[ptmap_len].codec = -1;
+ r->ptmap[ptmap_len].pt = pt;
+
[M] Change in osmo-mgw[master]: mgcp_client_fsm: allow the same codec multiple times in ptmap
Attention is currently required from: dexter, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34349?usp=email ) Change subject: mgcp_client_fsm: allow the same codec multiple times in ptmap .. Patch Set 5: Code-Review-2 (1 comment) Patchset: PS5: i see the actual problem this patch is working around ... let's do this instead: https://gerrit.osmocom.org/c/osmo-mgw/+/34899 ttcn3 test suite says it's good. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34349?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie13ce59d3165936a16e16588b4d58f0ce7e0ae67 Gerrit-Change-Number: 34349 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 25 Oct 2023 20:27:29 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-mgw[master]: mgcp_parse_audio_port_pt(): fix buffer overflow
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/34898?usp=email )
Change subject: mgcp_parse_audio_port_pt(): fix buffer overflow
..
mgcp_parse_audio_port_pt(): fix buffer overflow
Change-Id: I18c78d15eb1593f404b4741248225b68878b463f
---
M src/libosmo-mgcp-client/mgcp_client.c
1 file changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/98/34898/1
diff --git a/src/libosmo-mgcp-client/mgcp_client.c
b/src/libosmo-mgcp-client/mgcp_client.c
index 5df4560..95c7a4b 100644
--- a/src/libosmo-mgcp-client/mgcp_client.c
+++ b/src/libosmo-mgcp-client/mgcp_client.c
@@ -319,7 +319,7 @@
pt_str = strtok(line, " ");
while (1) {
/* Do not allow excessive payload types */
- if (count > ARRAY_SIZE(r->codecs))
+ if (count >= ARRAY_SIZE(r->ptmap))
goto response_parse_failure_pt;
pt_str = strtok(NULL, " ");
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34898?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I18c78d15eb1593f404b4741248225b68878b463f
Gerrit-Change-Number: 34898
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
[M] Change in osmo-mgw[master]: mgcp_client_fsm: allow the same codec multiple times in ptmap
Attention is currently required from: dexter, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34349?usp=email ) Change subject: mgcp_client_fsm: allow the same codec multiple times in ptmap .. Patch Set 5: (1 comment) Patchset: PS4: > Maybe @neels can also say something about this. thanks for the highlight, also for the patience! fortunately someone just pointed out to me that i missed this one. Taking a look now... -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34349?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie13ce59d3165936a16e16588b4d58f0ce7e0ae67 Gerrit-Change-Number: 34349 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 25 Oct 2023 19:12:17 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: dexter Gerrit-MessageType: comment
[M] Change in osmo-gsm-manuals[master]: add static SS7 routing example to cs7-config.adoc
Attention is currently required from: laforge, msuraev, pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273?usp=email to look at the new patch set (#6). Change subject: add static SS7 routing example to cs7-config.adoc .. add static SS7 routing example to cs7-config.adoc I put the cfg files I used for testing this here: https://people.osmocom.org/neels/zoch4ahX/g32273.tgz To test, just start up and verify successful BSSAP RESET ACK. Related: SYS#6422 Change-Id: I44afddf7004f5bf37eec706ca3da12c04f83f8fa --- M common/chapters/cs7-config.adoc 1 file changed, 164 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/73/32273/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I44afddf7004f5bf37eec706ca3da12c04f83f8fa Gerrit-Change-Number: 32273 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: msuraev Gerrit-CC: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: msuraev Gerrit-MessageType: newpatchset
[M] Change in osmo-gsm-manuals[master]: add static SS7 routing example to cs7-config.adoc
Attention is currently required from: laforge, msuraev, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273?usp=email ) Change subject: add static SS7 routing example to cs7-config.adoc .. Patch Set 5: (2 comments) File common/chapters/cs7-config.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273/comment/be233d1c_71303b42 PS1, Line 365: Every component has a distinct M3UA port. For > the main obstacle for me is that i'm so uncertain about what it needs to say > in order to be accurate […] Done File common/chapters/cs7-config.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273/comment/fbf5b420_b1bf503a PS5, Line 375: For static routing, the M3UA port numbers must be fixed, i.e. there must be no `0` for a client's local port as in : `asp foo 2905 0 m3ua`. Instead, you may use `asp foo 2905 2905 m3ua`. This is another fact I'm not so sure about. I just tried it, and whenever i set any local port to 0, the connections fail. So I guess it is accurate, or did i miss something. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I44afddf7004f5bf37eec706ca3da12c04f83f8fa Gerrit-Change-Number: 32273 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: msuraev Gerrit-CC: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: msuraev Gerrit-Comment-Date: Wed, 25 Oct 2023 19:04:06 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-gsm-manuals[master]: add static SS7 routing example to cs7-config.adoc
Attention is currently required from: laforge, msuraev, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273?usp=email ) Change subject: add static SS7 routing example to cs7-config.adoc .. Patch Set 4: (2 comments) File common/chapters/cs7-config.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273/comment/3ad2828c_2cdc2db1 PS1, Line 349: Osmocom SS7 supports dynamic routing, allowing minimal SS7 configuration. If all of your components support dynamic > My point was also to have "Routing Key Management (RKM)" the first time it > appears here so that the […] Done https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273/comment/f7e7cacf_70565a80 PS1, Line 365: Every component has a distinct M3UA port. For > I also think this sentence is too generic or not accurate. […] the main obstacle for me is that i'm so uncertain about what it needs to say in order to be accurate. I think I see what you mean now, all the components could use 2905, i guess? Possibly the 12905 came in because I started out testing with an example from the ttcn3 test suite, and it may have led to an inaccurate conclusion. I just fired up the tests again, and verified it. it also works if i put 2905 everywhere, because of course each is on a different IP address. will try to reword things to remove that aspect. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I44afddf7004f5bf37eec706ca3da12c04f83f8fa Gerrit-Change-Number: 32273 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: msuraev Gerrit-CC: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: msuraev Gerrit-Comment-Date: Wed, 25 Oct 2023 18:51:35 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-gsm-manuals[master]: add static SS7 routing example to cs7-config.adoc
Attention is currently required from: laforge, msuraev, pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: add static SS7 routing example to cs7-config.adoc .. add static SS7 routing example to cs7-config.adoc Related: SYS#6422 Change-Id: I44afddf7004f5bf37eec706ca3da12c04f83f8fa --- M common/chapters/cs7-config.adoc 1 file changed, 160 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/73/32273/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I44afddf7004f5bf37eec706ca3da12c04f83f8fa Gerrit-Change-Number: 32273 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: msuraev Gerrit-CC: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: msuraev Gerrit-MessageType: newpatchset
[S] Change in pysim[master]: runtime: fix tracking of selected_adf
Attention is currently required from: laforge. Hello laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/34897?usp=email to look at the new patch set (#2). Change subject: runtime: fix tracking of selected_adf .. runtime: fix tracking of selected_adf The class property selected_adf is not updated in all locations where an ADF is selected, this means that we may loose track of the currently selected ADF in some locations Change-Id: I4cc0c58ff887422b4f3954d35c8380ddc00baa1d Related: OS#5418 --- M pySim/runtime.py 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/97/34897/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34897?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4cc0c58ff887422b4f3954d35c8380ddc00baa1d Gerrit-Change-Number: 34897 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Attention: laforge Gerrit-MessageType: newpatchset
[M] Change in ...osmo-epdg[master]: s2b: Implement GTPv2C DeleteBearerReq
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34896?usp=email )
Change subject: s2b: Implement GTPv2C DeleteBearerReq
..
s2b: Implement GTPv2C DeleteBearerReq
Sessions are now stored/kept upon CreateSession time until deleted
through DeleteBearerReq.
Related: OS#6046
Change-Id: I1e5af1ead17385d2e494f4c90ffe6455aee850da
---
M src/epdg_gtpc_s2b.erl
1 file changed, 137 insertions(+), 26 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg
refs/changes/96/34896/1
diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl
index 82985a5..a5658f1 100644
--- a/src/epdg_gtpc_s2b.erl
+++ b/src/epdg_gtpc_s2b.erl
@@ -70,7 +70,9 @@
rport :: non_neg_integer(),
restart_counter :: 0..255,
seq_no :: 0..16#,
-sess_list %% TODO: fill it, list of gtp_session
+next_local_control_tei = 1 :: 0..16#,
+next_local_data_tei = 1 :: 0..16#,
+sessions = sets:new()
}).
-record(gtp_bearer, {
@@ -134,36 +136,45 @@
gen_server:call(?SERVER,
{gtpc_create_session_req, {Imsi}}).
-handle_call({gtpc_create_session_req, {Imsi}}, _From, State) ->
-Sess = new_gtp_session(Imsi, State),
-Req = gen_create_session_request(Sess, State),
+handle_call({gtpc_create_session_req, {Imsi}}, _From, State0) ->
+{Sess0, State1} = find_or_new_gtp_session(Imsi, State0),
+Req = gen_create_session_request(Sess0, State1),
%TODO: increment State.seq_no.
-tx_gtp(Req, State),
+tx_gtp(Req, State1),
lager:debug("Waiting for CreateSessionResponse~n", []),
receive
{udp, _Socket, IP, InPortNo, RxMsg} ->
try
Resp = gtp_packet:decode(RxMsg),
-logger:info("s2b: Rx from IP ~p port ~n ~p~n", [IP, InPortNo,
Resp]),
-%% TODO: store Sess in State.
-{reply, {ok, Resp}, State}
+lager:info("s2b: Rx from IP ~p port ~p ~p~n", [IP, InPortNo,
Resp]),
+Sess1 = update_gtp_session_from_create_session_response(Resp,
Sess0),
+lager:info("s2b: Updated Session after
create_session_response: ~p~n", [Sess1]),
+State2 = update_gtp_session(Sess0, Sess1, State1),
+{reply, {ok, Resp}, State2}
catch Any ->
-logger:error("Error sending message to receiver, ERROR: ~p~n",
[Any]),
-{reply, {error, decode_failure}, State}
+lager:error("Error sending message to receiver, ERROR: ~p~n",
[Any]),
+{reply, {error, decode_failure}, State1}
end
after 5000 ->
-logger:error("Timeout waiting for CreateSessionResponse for ~p~n",
[Req]),
-{reply, timeout, State}
+lager:error("Timeout waiting for CreateSessionResponse for ~p~n",
[Req]),
+{reply, timeout, State1}
end.
%% @callback gen_server
handle_cast(stop, State) ->
{stop, normal, State};
-handle_cast(_Req, State) ->
+handle_cast(Req, State) ->
+lager:info("S2b handle_cast: ~p ~n", [Req]),
{noreply, State}.
%% @callback gen_server
-handle_info(_Info, State) ->
+handle_info({udp, _Socket, IP, InPortNo, RxMsg}, State) ->
+lager:info("S2b: Rx from IP ~p port ~p: ~p~n", [IP, InPortNo, RxMsg]),
+Req = gtp_packet:decode(RxMsg),
+lager:info("S2b: Rx from IP ~p port ~p: ~p~n", [IP, InPortNo, Req]),
+rx_gtp(Req, State);
+handle_info(Info, State) ->
+lager:info("S2b handle_info: ~p ~n", [Info]),
{noreply, State}.
%% @callback gen_server
@@ -185,6 +196,76 @@
%% Internal Function Definitions
%% --
+new_gtp_session(Imsi, State) ->
+% TODO: find non-used local TEI inside State
+Bearer = #gtp_bearer{
+ebi = 5,
+local_data_tei = State#gtp_state.next_local_data_tei
+},
+Sess = #gtp_session{imsi = Imsi,
+apn = ?APN,
+local_control_tei = State#gtp_state.next_local_control_tei,
+bearer = Bearer
+},
+NewSt = State#gtp_state{next_local_control_tei =
State#gtp_state.next_local_control_tei + 1,
+next_local_data_tei =
State#gtp_state.next_local_data_tei + 1,
+sessions = sets:add_element(Sess,
State#gtp_state.sessions)},
+{Sess, NewSt}.
+
+% returns Sess if found, undefined it not
+find_gtp_session_by_imsi(Imsi, State) ->
+sets:fold(
+fun(SessIt = #gtp_session{imsi = Imsi}, _AccIn) -> SessIt;
+ (_, AccIn) -> AccIn
+end,
+undefined,
+State#gtp_state.sessions).
+
+find_or_new_gtp_session(Imsi, State) ->
+Sess = find_gtp_session_by_imsi(Imsi, State),
+case Sess of
+#gtp_session{imsi = Imsi} ->
+{Sess, State};
+undefined ->
+
[S] Change in pysim[master]: runtime: fix tracking of selected_adf
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/34897?usp=email )
Change subject: runtime: fix tracking of selected_adf
..
runtime: fix tracking of selected_adf
The class property selected_adf is not updated in all locations where an
ADF is selected, this means that we may loose track of the currently
selected ADF in some locations
Change-Id: I4cc0c58ff887422b4f3954d35c8380ddc00baa1d
Related: OS#5418
---
M pySim/runtime.py
1 file changed, 16 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/97/34897/1
diff --git a/pySim/runtime.py b/pySim/runtime.py
index a54a1b6..1c58f17 100644
--- a/pySim/runtime.py
+++ b/pySim/runtime.py
@@ -111,6 +111,7 @@
for f in sorted(set(apps_profile) - set(apps_taken), key=str):
try:
data, sw = self.card.select_adf_by_aid(f.aid)
+self.selected_adf = f
if sw == "9000":
print(" %s: %s" % (f.name, f.aid))
apps_taken.append(f)
@@ -295,7 +296,6 @@
raise RuntimeError('Cannot determine path from %s to %s' %
(self.selected_file, file))
self._select_pre(cmd_app)
-
for p in inter_path:
try:
if isinstance(p, CardADF):
@@ -344,6 +344,7 @@
try:
if isinstance(f, CardADF):
(data, sw) = self.rs.card.select_adf_by_aid(f.aid,
scc=self.scc)
+self.selected_adf = f
else:
(data, sw) = self.scc.select_file(f.fid)
self.selected_file = f
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/34897?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I4cc0c58ff887422b4f3954d35c8380ddc00baa1d
Gerrit-Change-Number: 34897
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: epdg: Test Handover from Wifi back to LTE
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34895?usp=email )
Change subject: epdg: Test Handover from Wifi back to LTE
..
epdg: Test Handover from Wifi back to LTE
The Handover is informed to the EPDG by the PGW, who sends a
DeleteBearerRequest when receiving an attach from the 3GPP network once
the phone has jumped there.
Related: OS#6046
Change-Id: I299faf28fa51dbc5d2de6c72a39a01eca67a5775
---
M epdg/EPDG_Tests.ttcn
M library/GTPv2_Templates.ttcn
2 files changed, 83 insertions(+), 19 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/95/34895/1
diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn
index e7c8633..83b42fa 100644
--- a/epdg/EPDG_Tests.ttcn
+++ b/epdg/EPDG_Tests.ttcn
@@ -112,20 +112,27 @@
};
+type record BearerConfig {
+/* EPS Bearer ID */
+ uint4_t ebi optional,
+ /* TEI (Data) local side */
+ OCT4teid_local optional,
+ /* TEI (Data) remote side */
+ OCT4 teid_remote optional
+};
+
type record EPDG_ConnHdlrPars {
hexstring imsi,
charstring apn,
charstring ue_ip,
- /* TEI (Data) local side */
- OCT4 teid,
/* TEI (Control) local side */
- OCT4 teic,
- /* TEI (Data) remote side */
- OCT4 teid_remote optional,
+ OCT4 teic_local,
/* TEI (Control) remote side */
OCT4 teic_remote optional,
+ BearerConfig bearer optional,
+
AuthVector vec optional
};
@@ -146,10 +153,13 @@
imsi := f_gen_imsi(imsi_suffix),
apn := "internet",
ue_ip := "192.168.123.50",
- teid := ''O,
- teic := ''O,
- teid_remote := omit,
+ teic_local := ''O,
teic_remote := omit,
+ bearer := {
+ ebi := omit,
+ teid_local := omit,
+ teid_remote := omit
+ },
vec := f_gen_auth_vec_3g()
};
return pars;
@@ -391,31 +401,34 @@
/* Diameter SWx SAR + SAA. */
private altstep as_GTP2C_CreateSession_success() runs on EPDG_ConnHdlr {
var PDU_GTPCv2 rx_msg;
+ var BearerContextIEs rx_bctx_ies;
var template (value) FullyQualifiedTEID fteid_c_ie, fteid_u_ie;
var template (value) PDN_AddressAllocation paa;
- var uint4_t bid;
var template (value) BearerContextIEs bctx_ies;
[] GTP2.receive(tr_GTP2C_CreateSessionReq(g_pars.imsi)) -> value rx_msg
{
- /* TODO: parse TEIC and TEID and store it in
g_pars.remote_tei{c,d} */
- bid :=
rx_msg.gtpcv2_pdu.createSessionRequest.bearerContextGrouped[0].bearerContextIEs.ePS_Bearer_ID.ePS_Bearer_ID_Value;
+ /* Parse TEIC and Bearer EBI and TEID and store it in g_pars */
+ g_pars.teic_remote :=
rx_msg.gtpcv2_pdu.createSessionRequest.fullyQualifiedTEID[0].tEID_GRE_Key;
+ rx_bctx_ies :=
rx_msg.gtpcv2_pdu.createSessionRequest.bearerContextGrouped[0].bearerContextIEs;
+ g_pars.bearer.ebi :=
rx_bctx_ies.ePS_Bearer_ID.ePS_Bearer_ID_Value;
+ g_pars.bearer.teid_remote :=
rx_bctx_ies.fullyQualifiedTEID[0].tEID_GRE_Key;
/* allocate + register TEID-C on local side */
- g_pars.teic := f_gtp2_allocate_teid();
- g_pars.teid := g_pars.teic;
+ g_pars.teic_local := f_gtp2_allocate_teid();
+ g_pars.bearer.teid_local := g_pars.teic_local;
/* Upon rx of CreateSession, emulate PGW asking the AAA server.
*/
f_S6b_AA_success();
- fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S2b_ePDG_GTPC,
g_pars.teic, 0,
+ fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S2b_ePDG_GTPC,
g_pars.teic_local, 0,
f_inet_addr(mp_s2b_local_ip), omit);
- fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S2bU_ePDG_GTPU,
g_pars.teid, 2,
+ fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S2bU_ePDG_GTPU,
g_pars.bearer.teid_local, 2,
f_inet_addr(mp_s2b_local_ip), omit);
paa := ts_GTP2C_PdnAddrAlloc_v4(f_inet_addr(g_pars.ue_ip));
- bctx_ies := ts_GTP2C_BcContextIE(bid := bid,
+ bctx_ies := ts_GTP2C_BcContextIE(ebi := g_pars.bearer.ebi,
teid_list := { fteid_u_ie },
qos :=
ts_GTP2C_BearerQos('09'O, 0,0,0,0),
-charging_id :=
ts_GTP2C_ChargingID(g_pars.teic));
+charging_id :=
ts_GTP2C_ChargingID(g_pars.teic_local));
GTP2.send(ts_GTP2C_CreateSessionResp({ fteid_c_ie }, paa, {
[M] Change in osmo-bts[master]: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2)
Attention is currently required from: fixeria, fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email ) Change subject: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2) .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df Gerrit-Change-Number: 32552 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 25 Oct 2023 16:00:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: Revert "trx_if: Allow calling trx_if_flush/close from within TRXC cal...
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34894?usp=email ) Change subject: Revert "trx_if: Allow calling trx_if_flush/close from within TRXC callback" .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34894?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ideb2d08ac8a2902bceeabfb055c59c9a13dbe3c0 Gerrit-Change-Number: 34894 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 25 Oct 2023 16:00:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: Revert "trx_if: Allow calling trx_if_flush/close from within TRXC cal...
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/34894?usp=email )
Change subject: Revert "trx_if: Allow calling trx_if_flush/close from within
TRXC callback"
..
Revert "trx_if: Allow calling trx_if_flush/close from within TRXC callback"
This reverts commit 262a6ab1e1e231ea81c4ec990f1a1f571a1f.
This commit introduced several side effects:
- tcm is left out of the l1h->trx_ctrl_list and hence won't be ever
retransmitted.
- Since tcm is removed before rsp callback, the llist may become empty
and if somehwere in the rsp callback a new message is enqueud it will
be sent immediatelly, and will be retransmitted again when
trx_ctrl_read_cb() calls trx_ctrl_send() at the end.
Change-Id: Ideb2d08ac8a2902bceeabfb055c59c9a13dbe3c0
Related: OS#6020
---
M src/osmo-bts-trx/trx_if.c
1 file changed, 25 insertions(+), 9 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c
index fef8c22..3f9fc04 100644
--- a/src/osmo-bts-trx/trx_if.c
+++ b/src/osmo-bts-trx/trx_if.c
@@ -721,13 +721,6 @@
rsp.cb = tcm->cb;
- /* Remove command from list, save it to last_acked and remove previous
-* last_acked. Do it before calling callback to avoid user freeing tcm
-* pointer if flushing/closing the iface. */
- llist_del(>list);
- talloc_free(l1h->last_acked);
- l1h->last_acked = tcm;
-
/* check for response code */
rc = trx_ctrl_rx_rsp(l1h, , tcm);
if (rc == -EINVAL)
@@ -735,11 +728,15 @@
/* re-schedule last cmd in rc seconds time */
if (rc > 0) {
- if (!llist_empty(>trx_ctrl_list))
- osmo_timer_schedule(>trx_ctrl_timer, rc, 0);
+ osmo_timer_schedule(>trx_ctrl_timer, rc, 0);
return 0;
}
+ /* remove command from list, save it to last_acked and removed previous
last_acked */
+ llist_del(>list);
+ talloc_free(l1h->last_acked);
+ l1h->last_acked = tcm;
+
trx_ctrl_send(l1h);
return 0;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34894?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ideb2d08ac8a2902bceeabfb055c59c9a13dbe3c0
Gerrit-Change-Number: 34894
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-bts[master]: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2)
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email )
Change subject: trx_if: Allow calling trx_if_flush/close from within TRXC
callback (v2)
..
trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2)
- If the llist is flushed during rx rsp callback, when the flow is
returned to trx_ctrl_read_cb() it would access tcm which was in the
llist and end up in use-after-free.
- We need to store state on whether code path is inside the read_cb in
order to:
-- Delay transmission of new message if callback calls trx_if_flush()
followed by trx_ctrl_send(), since the trx_ctrl_send() at the end of
trx_ctrl_read_cb would retransmit it again immediatelly.
-- Avoid accessing tcm pointer if the callback called trx_if_flush(),
since it has been freed.
Related: OS#6020
Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df
---
M src/osmo-bts-trx/l1_if.h
M src/osmo-bts-trx/trx_if.c
2 files changed, 52 insertions(+), 7 deletions(-)
Approvals:
daniel: Looks good to me, but someone else must approve
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h
index 18d84c2..84fd4b5 100644
--- a/src/osmo-bts-trx/l1_if.h
+++ b/src/osmo-bts-trx/l1_if.h
@@ -120,6 +120,10 @@
struct llist_head trx_ctrl_list;
/* Latest RSPed cmd, used to catch duplicate RSPs from sent
retransmissions */
struct trx_ctrl_msg *last_acked;
+ /* Whether the code path is in the middle of handling a received
message. */
+ boolin_trx_ctrl_read_cb;
+ /* Whether the l1h->trx_ctrl_list was flushed by the callback handling
a received message */
+ boolflushed_while_in_trx_ctrl_read_cb;
//struct gsm_bts_trx*trx;
struct phy_instance *phy_inst;
diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c
index 3f9fc04..89078a3 100644
--- a/src/osmo-bts-trx/trx_if.c
+++ b/src/osmo-bts-trx/trx_if.c
@@ -269,8 +269,10 @@
tcm->cmd, tcm->params_len ? " " : "", tcm->params);
llist_add_tail(>list, >trx_ctrl_list);
- /* send message, if we didn't already have pending messages */
- if (prev == NULL)
+ /* send message, if we didn't already have pending messages.
+* If we are in the rx_rsp callback code path, skip sending, the
+* callback will do so when returning to it. */
+ if (prev == NULL && !l1h->in_trx_ctrl_read_cb)
trx_ctrl_send(l1h);
return 0;
@@ -673,6 +675,7 @@
struct trx_ctrl_rsp rsp;
int len, rc;
struct trx_ctrl_msg *tcm;
+ bool flushed;
len = recv(ofd->fd, buf, sizeof(buf) - 1, 0);
if (len <= 0)
@@ -722,21 +725,34 @@
rsp.cb = tcm->cb;
/* check for response code */
+ l1h->in_trx_ctrl_read_cb = true;
rc = trx_ctrl_rx_rsp(l1h, , tcm);
+ /* Reset state: */
+ flushed = l1h->flushed_while_in_trx_ctrl_read_cb;
+ l1h->flushed_while_in_trx_ctrl_read_cb = false;
+ l1h->in_trx_ctrl_read_cb = false;
+
if (rc == -EINVAL)
goto rsp_error;
/* re-schedule last cmd in rc seconds time */
if (rc > 0) {
- osmo_timer_schedule(>trx_ctrl_timer, rc, 0);
+ /* The queue may have been flushed in the trx_ctrl_rx_rsp(): */
+ if (!llist_empty(>trx_ctrl_list))
+ osmo_timer_schedule(>trx_ctrl_timer, rc, 0);
return 0;
}
- /* remove command from list, save it to last_acked and removed previous
last_acked */
- llist_del(>list);
- talloc_free(l1h->last_acked);
- l1h->last_acked = tcm;
+ if (!flushed) {
+ /* Remove command from list, save it to last_acked and removed
+* previous last_acked */
+ llist_del(>list);
+ talloc_free(l1h->last_acked);
+ l1h->last_acked = tcm;
+ } /* else: tcm was freed by trx_if_flush(), do not access it. */
+
+ /* Send next message waiting in the list: */
trx_ctrl_send(l1h);
return 0;
@@ -1224,6 +1240,10 @@
/* Tx queue is now empty, so there's no point in keeping the retrans
timer armed: */
osmo_timer_del(>trx_ctrl_timer);
+
+ /* If we are in read_cb, signal to the returning code path that we
freed the list. */
+ if (l1h->in_trx_ctrl_read_cb)
+ l1h->flushed_while_in_trx_ctrl_read_cb = true;
}
/*! close the TRX for given handle (data + control socket) */
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df
[M] Change in osmo-bts[master]: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2)
Attention is currently required from: fixeria, fixeria, laforge, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email ) Change subject: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2) .. Patch Set 6: Code-Review+1 (2 comments) File src/osmo-bts-trx/l1_if.h: https://gerrit.osmocom.org/c/osmo-bts/+/32552/comment/2565e7db_0cd7c392 PS5, Line 125: lis > list Done https://gerrit.osmocom.org/c/osmo-bts/+/32552/comment/54d8fa80_a1011157 PS5, Line 126: wile > while Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df Gerrit-Change-Number: 32552 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 25 Oct 2023 15:51:15 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: daniel Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2)
Attention is currently required from: fixeria, fixeria, laforge, pespin. pespin has uploaded a new patch set (#6) to the change originally created by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email ) The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified+1 by Jenkins Builder Change subject: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2) .. trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2) - If the llist is flushed during rx rsp callback, when the flow is returned to trx_ctrl_read_cb() it would access tcm which was in the llist and end up in use-after-free. - We need to store state on whether code path is inside the read_cb in order to: -- Delay transmission of new message if callback calls trx_if_flush() followed by trx_ctrl_send(), since the trx_ctrl_send() at the end of trx_ctrl_read_cb would retransmit it again immediatelly. -- Avoid accessing tcm pointer if the callback called trx_if_flush(), since it has been freed. Related: OS#6020 Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df --- M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/trx_if.c 2 files changed, 52 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/52/32552/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df Gerrit-Change-Number: 32552 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in pysim[master]: pySim-shell: don't get trapped in applications without file system
Attention is currently required from: laforge, lynxis lazus. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34884?usp=email ) Change subject: pySim-shell: don't get trapped in applications without file system .. Patch Set 3: (1 comment) File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/34884/comment/7362d555_a4f43514 PS2, Line 618: # > you're mixing python-style space indent with tabs here. Please avoid tabs in > python source. Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34884?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia2fdd65f430c07acb1afdaf265d24c6928b654e0 Gerrit-Change-Number: 34884 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Attention: laforge Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Wed, 25 Oct 2023 15:04:58 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: don't get trapped in applications without file system
Attention is currently required from: laforge, lynxis lazus. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34884?usp=email ) Change subject: pySim-shell: don't get trapped in applications without file system .. Patch Set 2: (1 comment) File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/34884/comment/e371d6fe_e4a0b750 PS2, Line 620: "a000871002", "a000871004"]: > I like the approach in general, but I think we shouldn't open-code those AIDs > explicitly here. […] I have now changed the code so that it does no longer use the hardcoded identifiers. Also not "ADF.USIM" or "ADF.ISIM". (I still need to add ADF.HPSIM) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34884?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia2fdd65f430c07acb1afdaf265d24c6928b654e0 Gerrit-Change-Number: 34884 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Attention: laforge Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Wed, 25 Oct 2023 15:08:58 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: don't get trapped in applications without file system
Attention is currently required from: laforge, lynxis lazus. Hello Jenkins Builder, laforge, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/34884?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: pySim-shell: don't get trapped in applications without file system .. pySim-shell: don't get trapped in applications without file system When we traverse the file system, we may also end up selecting applications (ADF), which do not support an USIM/ISIM like file system. This will leave us without the ability to select the MF (or any other file) again. The only way out is to select the ISIM or USIM application again to get the access to the file system again. Related: OS#5418 Change-Id: Ia2fdd65f430c07acb1afdaf265d24c6928b654e0 --- M pySim-shell.py 1 file changed, 44 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/84/34884/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34884?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia2fdd65f430c07acb1afdaf265d24c6928b654e0 Gerrit-Change-Number: 34884 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Attention: laforge Gerrit-Attention: lynxis lazus Gerrit-MessageType: newpatchset
[M] Change in osmo-bts[master]: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2)
Attention is currently required from: fixeria, fixeria, laforge, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email ) Change subject: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2) .. Patch Set 5: (3 comments) Patchset: PS5: Found two typos File src/osmo-bts-trx/l1_if.h: https://gerrit.osmocom.org/c/osmo-bts/+/32552/comment/b4fa1225_b234ad68 PS5, Line 125: lis list https://gerrit.osmocom.org/c/osmo-bts/+/32552/comment/864bfb82_a44874aa PS5, Line 126: wile while -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df Gerrit-Change-Number: 32552 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 25 Oct 2023 14:49:51 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in gapk[master]: dist: exclude libgsmhr files downloaded by fetch_sources.py
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/gapk/+/34892?usp=email )
Change subject: dist: exclude libgsmhr files downloaded by fetch_sources.py
..
dist: exclude libgsmhr files downloaded by fetch_sources.py
We deliberately do not include these files in the git repository,
nor do we intend to include them in the release tarballs. This
is done intentionally to avoid potential licensing issues.
Change-Id: I66e31dec37e53bf1a8c7df948fd9316e1467752c
Related: OS#6227
---
M libgsmhr/Makefile.am
1 file changed, 18 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
diff --git a/libgsmhr/Makefile.am b/libgsmhr/Makefile.am
index f3c01b7..ffbde21 100644
--- a/libgsmhr/Makefile.am
+++ b/libgsmhr/Makefile.am
@@ -33,3 +33,7 @@
distclean-local:
-rm -rf ${REFSRC_PATH}/
+
+# exclude files downloaded by fetch_sources.py
+dist-hook:
+ -rm -rf $(distdir)/$(REFSRC_PATH)
--
To view, visit https://gerrit.osmocom.org/c/gapk/+/34892?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gapk
Gerrit-Branch: master
Gerrit-Change-Id: I66e31dec37e53bf1a8c7df948fd9316e1467752c
Gerrit-Change-Number: 34892
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[S] Change in gapk[master]: dist: ensure the license text is included
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/gapk/+/34893?usp=email )
Change subject: dist: ensure the license text is included
..
dist: ensure the license text is included
The autotools pick up COPYING file automatically.
Change-Id: Ib5c7b479fa66291be987230f102ff391f4902988
Related: OS#6227
---
R COPYING
M contrib/gapk.spec.in
2 files changed, 13 insertions(+), 1 deletion(-)
Approvals:
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/gpl-3.0.txt b/COPYING
similarity index 100%
rename from gpl-3.0.txt
rename to COPYING
diff --git a/contrib/gapk.spec.in b/contrib/gapk.spec.in
index e5d06ba..e0466f4 100644
--- a/contrib/gapk.spec.in
+++ b/contrib/gapk.spec.in
@@ -128,7 +128,7 @@
%postun -n libosmogapk%{sover} -p /sbin/ldconfig
%files
-%doc gpl-3.0.txt
+%doc COPYING
%{_bindir}/osmo-gapk
%if 0%{with_gsmhr}
--
To view, visit https://gerrit.osmocom.org/c/gapk/+/34893?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gapk
Gerrit-Branch: master
Gerrit-Change-Id: Ib5c7b479fa66291be987230f102ff391f4902988
Gerrit-Change-Number: 34893
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in gapk[master]: dist: include .[tarball-]version and git-version-gen files
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/gapk/+/34891?usp=email ) Change subject: dist: include .[tarball-]version and git-version-gen files .. dist: include .[tarball-]version and git-version-gen files Most of other [lib]osmo-projects do include these files in the release tarballs. Do the same for the sake of consistency. Change-Id: I5c15cefb68ab787819edaa1a097fe397837e0bcd Related: OS#6227 --- M Makefile.am 1 file changed, 27 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/Makefile.am b/Makefile.am index a1642d4..f2a2c31 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,3 +11,17 @@ endif SUBDIRS += src tests + +BUILT_SOURCES = \ + $(top_srcdir)/.version \ + $(NULL) +EXTRA_DIST = \ + git-version-gen \ + .version \ + $(NULL) + +# versioning magic +$(top_srcdir)/.version: + echo $(VERSION) > $@-t && mv $@-t $@ +dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version -- To view, visit https://gerrit.osmocom.org/c/gapk/+/34891?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I5c15cefb68ab787819edaa1a097fe397837e0bcd Gerrit-Change-Number: 34891 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in gapk[master]: libgsmhr: fix unneeded dependency for libgsmhr.c
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/gapk/+/34890?usp=email )
Change subject: libgsmhr: fix unneeded dependency for libgsmhr.c
..
libgsmhr: fix unneeded dependency for libgsmhr.c
Change-Id: I95900e3d26a7668246ec97d3182bea84156b4725
Related: OS#6227
---
M libgsmhr/Makefile.am
1 file changed, 11 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/libgsmhr/Makefile.am b/libgsmhr/Makefile.am
index 9904098..f3c01b7 100644
--- a/libgsmhr/Makefile.am
+++ b/libgsmhr/Makefile.am
@@ -21,7 +21,7 @@
done
touch $@
-$(REFSRC_SRC) libgsmhr.c: ${REFSRC_PATH}/.downloaded
+$(REFSRC_SRC): ${REFSRC_PATH}/.downloaded
lib_LTLIBRARIES = libgsmhr.la
libgsmhr_la_SOURCES = $(REFSRC_SRC) libgsmhr.c
--
To view, visit https://gerrit.osmocom.org/c/gapk/+/34890?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gapk
Gerrit-Branch: master
Gerrit-Change-Id: I95900e3d26a7668246ec97d3182bea84156b4725
Gerrit-Change-Number: 34890
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in gapk[master]: dist: ensure the license text is included
Attention is currently required from: fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/gapk/+/34893?usp=email ) Change subject: dist: ensure the license text is included .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gapk/+/34893?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: Ib5c7b479fa66291be987230f102ff391f4902988 Gerrit-Change-Number: 34893 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 25 Oct 2023 14:12:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2)
Attention is currently required from: fixeria, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email ) Change subject: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2) .. Patch Set 3: Code-Review+1 (4 comments) File src/osmo-bts-trx/trx_if.c: https://gerrit.osmocom.org/c/osmo-bts/+/32552/comment/5dab35f0_dbd09cfa PS1, Line 737: > I was thinking about this too. But this would make the logging/flow a bit > confusing: […] Done https://gerrit.osmocom.org/c/osmo-bts/+/32552/comment/11319e4a_34c93535 PS1, Line 743: re-schedule last cmd in rc seconds time > Looks like I introduced related issues back in > 262a6ab1e1e231ea81c4ec990f1a1f571a1f (https://ger […] Done File src/osmo-bts-trx/trx_if.c: https://gerrit.osmocom.org/c/osmo-bts/+/32552/comment/fe89a4de_7d8e07b8 PS3, Line 731: goto rsp_error; just to confirm, don't we need to reset `flushed_wile_in_trx_ctrl_read_cb` to `false` here? https://gerrit.osmocom.org/c/osmo-bts/+/32552/comment/9b9642af_af8e78bd PS3, Line 738: return 0; just to confirm, don't we need to reset `flushed_wile_in_trx_ctrl_read_cb` to `false` here? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df Gerrit-Change-Number: 32552 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 25 Oct 2023 13:55:29 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2)
Attention is currently required from: fixeria, fixeria, laforge. pespin has uploaded a new patch set (#5) to the change originally created by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email ) Change subject: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2) .. trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2) - If the llist is flushed during rx rsp callback, when the flow is returned to trx_ctrl_read_cb() it would access tcm which was in the llist and end up in use-after-free. - We need to store state on whether code path is inside the read_cb in order to: -- Delay transmission of new message if callback calls trx_if_flush() followed by trx_ctrl_send(), since the trx_ctrl_send() at the end of trx_ctrl_read_cb would retransmit it again immediatelly. -- Avoid accessing tcm pointer if the callback called trx_if_flush(), since it has been freed. Related: OS#6020 Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df --- M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/trx_if.c 2 files changed, 52 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/52/32552/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df Gerrit-Change-Number: 32552 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[M] Change in osmo-bts[master]: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2)
Attention is currently required from: fixeria, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email ) Change subject: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2) .. Patch Set 5: Code-Review+1 (1 comment) File src/osmo-bts-trx/trx_if.c: https://gerrit.osmocom.org/c/osmo-bts/+/32552/comment/ec7b4506_d65f4b94 PS3, Line 731: goto rsp_error; > Yes, I actually forgot that one, thanks!. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df Gerrit-Change-Number: 32552 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 25 Oct 2023 14:04:00 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: Revert "trx_if: Allow calling trx_if_flush/close from within TRXC cal...
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34894?usp=email ) Change subject: Revert "trx_if: Allow calling trx_if_flush/close from within TRXC callback" .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34894?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ideb2d08ac8a2902bceeabfb055c59c9a13dbe3c0 Gerrit-Change-Number: 34894 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 25 Oct 2023 13:50:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2)
Attention is currently required from: fixeria, fixeria, laforge. pespin has uploaded a new patch set (#4) to the change originally created by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email ) The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified+1 by Jenkins Builder Change subject: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2) .. trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2) - If the llist is flushed during rx rsp callback, when the flow is returned to trx_ctrl_read_cb() it would access tcm which was in the llist and end up in use-after-free. - We need to store state on whether code path is inside the read_cb in order to: -- Delay transmission of new message if callback calls trx_if_flush() followed by trx_ctrl_send(), since the trx_ctrl_send() at the end of trx_ctrl_read_cb would retransmit it again immediatelly. -- Avoid accessing tcm pointer if the callback called trx_if_flush(), since it has been freed. Related: OS#6020 Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df --- M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/trx_if.c 2 files changed, 51 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/52/32552/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df Gerrit-Change-Number: 32552 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[M] Change in osmo-bts[master]: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2)
Attention is currently required from: fixeria, fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email ) Change subject: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2) .. Patch Set 3: (2 comments) File src/osmo-bts-trx/trx_if.c: https://gerrit.osmocom.org/c/osmo-bts/+/32552/comment/7774bd75_2e5857fc PS3, Line 731: goto rsp_error; > just to confirm, don't we need to reset `flushed_wile_in_trx_ctrl_read_cb` to > `false` here? Yes, I actually forgot that one, thanks!. https://gerrit.osmocom.org/c/osmo-bts/+/32552/comment/55832446_86eab842 PS3, Line 738: return 0; > just to confirm, don't we need to reset `flushed_wile_in_trx_ctrl_read_cb` to > `false` here? Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df Gerrit-Change-Number: 32552 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 25 Oct 2023 13:56:31 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2)
Attention is currently required from: fixeria, fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email ) Change subject: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2) .. Patch Set 3: (1 comment) Patchset: PS3: @axilira...@gmail.com do you mind giving a try to this new patch I submitted? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df Gerrit-Change-Number: 32552 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 25 Oct 2023 13:36:23 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2)
Attention is currently required from: laforge, pespin. pespin has uploaded a new patch set (#3) to the change originally created by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email ) The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review-1 by pespin, Verified+1 by Jenkins Builder Change subject: trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2) .. trx_if: Allow calling trx_if_flush/close from within TRXC callback (v2) - If the llist is flushed during rx rsp callback, when the flow is returned to trx_ctrl_read_cb() it would access tcm which was in the llist and end up in use-after-free. - We need to store state on whether code path is inside the read_cb in order to: -- Delay transmission of new message if callback calls trx_if_flush() followed by trx_ctrl_send(), since the trx_ctrl_send() at the end of trx_ctrl_read_cb would retransmit it again immediatelly. -- Avoid accessing tcm pointer if the callback called trx_if_flush(), since it has been freed. Related: OS#6020 Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df --- M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/trx_if.c 2 files changed, 49 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/52/32552/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32552?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibdffa4644aa3a7d219452644d3e74b411734f1df Gerrit-Change-Number: 32552 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmo-bts[master]: Revert "trx_if: Allow calling trx_if_flush/close from within TRXC cal...
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/34894?usp=email )
Change subject: Revert "trx_if: Allow calling trx_if_flush/close from within
TRXC callback"
..
Revert "trx_if: Allow calling trx_if_flush/close from within TRXC callback"
This reverts commit 262a6ab1e1e231ea81c4ec990f1a1f571a1f.
This commit introduced several side effects:
- tcm is left out of the l1h->trx_ctrl_list and hence won't be ever
retransmitted.
- Since tcm is removed before rsp callback, the llist may become empty
and if somehwere in the rsp callback a new message is enqueud it will
be sent immediatelly, and will be retransmitted again when
trx_ctrl_read_cb() calls trx_ctrl_send() at the end.
Change-Id: Ideb2d08ac8a2902bceeabfb055c59c9a13dbe3c0
Related: OS#6020
---
M src/osmo-bts-trx/trx_if.c
1 file changed, 25 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/94/34894/1
diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c
index fef8c22..3f9fc04 100644
--- a/src/osmo-bts-trx/trx_if.c
+++ b/src/osmo-bts-trx/trx_if.c
@@ -721,13 +721,6 @@
rsp.cb = tcm->cb;
- /* Remove command from list, save it to last_acked and remove previous
-* last_acked. Do it before calling callback to avoid user freeing tcm
-* pointer if flushing/closing the iface. */
- llist_del(>list);
- talloc_free(l1h->last_acked);
- l1h->last_acked = tcm;
-
/* check for response code */
rc = trx_ctrl_rx_rsp(l1h, , tcm);
if (rc == -EINVAL)
@@ -735,11 +728,15 @@
/* re-schedule last cmd in rc seconds time */
if (rc > 0) {
- if (!llist_empty(>trx_ctrl_list))
- osmo_timer_schedule(>trx_ctrl_timer, rc, 0);
+ osmo_timer_schedule(>trx_ctrl_timer, rc, 0);
return 0;
}
+ /* remove command from list, save it to last_acked and removed previous
last_acked */
+ llist_del(>list);
+ talloc_free(l1h->last_acked);
+ l1h->last_acked = tcm;
+
trx_ctrl_send(l1h);
return 0;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34894?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ideb2d08ac8a2902bceeabfb055c59c9a13dbe3c0
Gerrit-Change-Number: 34894
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in gapk[master]: dist: exclude libgsmhr files downloaded by fetch_sources.py
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/gapk/+/34892?usp=email ) Change subject: dist: exclude libgsmhr files downloaded by fetch_sources.py .. Patch Set 1: (1 comment) File libgsmhr/Makefile.am: https://gerrit.osmocom.org/c/gapk/+/34892/comment/ab5cbd6e_93f0aaf1 PS1, Line 39: -rm -rf $(distdir)/$(REFSRC_PATH) > Okay, doesn't seem worth spending more time on. […] Exactly. -- To view, visit https://gerrit.osmocom.org/c/gapk/+/34892?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I66e31dec37e53bf1a8c7df948fd9316e1467752c Gerrit-Change-Number: 34892 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 25 Oct 2023 13:33:05 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: ASCI: Control uplink access bursts detection of physical interface
Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34889?usp=email ) Change subject: ASCI: Control uplink access bursts detection of physical interface .. Patch Set 1: Code-Review+1 (1 comment) File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/34889/comment/49c79392_286d801c PS1, Line 2448: struct gsm_bts_trx *trx can we accept `struct gsm_lchan *lchan` directly here? ... and this avoid having to do `gsm_lchan2chan_nr(lchan)` and then `get_lchan_by_chan_nr()` again. Yes, we would still need to do `gsm_lchan2chan_nr(lchan)` here, but this way we avoid unneeded lchan lookups. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34889?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I92d6773a3a463eb747143c85aa149e54c1fda122 Gerrit-Change-Number: 34889 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 25 Oct 2023 13:31:49 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in gapk[master]: dist: ensure the license text is included
Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/gapk/+/34893?usp=email ) Change subject: dist: ensure the license text is included .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/gapk/+/34893?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: Ib5c7b479fa66291be987230f102ff391f4902988 Gerrit-Change-Number: 34893 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 25 Oct 2023 13:26:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in gapk[master]: dist: exclude libgsmhr files downloaded by fetch_sources.py
Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/gapk/+/34892?usp=email ) Change subject: dist: exclude libgsmhr files downloaded by fetch_sources.py .. Patch Set 1: Code-Review+2 (1 comment) File libgsmhr/Makefile.am: https://gerrit.osmocom.org/c/gapk/+/34892/comment/4e2cfbd5_e6d4c1ae PS1, Line 39: -rm -rf $(distdir)/$(REFSRC_PATH) > > However downloading the sources first even if we don't intend to package > > them, and then remove the […] Okay, doesn't seem worth spending more time on. The only user of this is probably the automated release script that runs it once a new release is out. -- To view, visit https://gerrit.osmocom.org/c/gapk/+/34892?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I66e31dec37e53bf1a8c7df948fd9316e1467752c Gerrit-Change-Number: 34892 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 25 Oct 2023 13:26:34 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: ASCI: Add control of uplink access to osmo-bts-trx
Attention is currently required from: jolly, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34886?usp=email ) Change subject: ASCI: Add control of uplink access to osmo-bts-trx .. Patch Set 1: (3 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/34886/comment/d3c9b12a_02a06359 PS1, Line 13: Change-Id: I9045437d52984b7abe00fbc815d7f83c62c0fb5a `Depends: libosmocore.git Ibd6a1d468a70126a8f67e944fcb916969cc3c36b` Also, I think you need to update `TODO-RELEASE` file? File src/common/scheduler.c: https://gerrit.osmocom.org/c/osmo-bts/+/34886/comment/9f6f76fe_d30e02db PS1, Line 1153: /* look for > in which situation would we want to enable/disable rach detection for > multiple l1sched_chan at the s […] AFAIR, in this context it means both main (DCCH/TCH) and associated (SACCH) channels. The scheduler maintains separate states for these. They both have the same `chan_nr`, but different `link_id` in `trx_chan_desc[]`. I am not sure if it's valid to expect Access Bursts on SACCH too. I would expect the MS to transmit them on the main (DCCH/TCH) only. But the transceiver would most likely make no distinction and perform AB detection on both. https://gerrit.osmocom.org/c/osmo-bts/+/34886/comment/1edda4e3_1304c651 PS1, Line 1156: struct l1sched_ts *l1ts = lchan->ts->priv; This pointer can be obtained only once outside of the loop. The code above in `trx_sched_set_lchan()` does additionally check `l1ts` against `NULL` - we may want to do the same here too. Though I don't remember in which cases an `lchan` would have no associated `l1ts`, perhaps when it's not active? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34886?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9045437d52984b7abe00fbc815d7f83c62c0fb5a Gerrit-Change-Number: 34886 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 25 Oct 2023 13:24:07 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: ASCI: Add control of uplink access to osmo-bts-sysmo
Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34887?usp=email ) Change subject: ASCI: Add control of uplink access to osmo-bts-sysmo .. Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/34887/comment/be54f29a_bf110fbf PS1, Line 13: Change-Id: I61f232aa91191dae08404c1f08cad91964d74568 `Depends: libosmocore.git Ibd6a1d468a70126a8f67e944fcb916969cc3c36b` -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34887?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I61f232aa91191dae08404c1f08cad91964d74568 Gerrit-Change-Number: 34887 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 25 Oct 2023 13:25:23 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: ASCI: Enable voice group/broadcast call feature at osmo-bts-trx
Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34888?usp=email ) Change subject: ASCI: Enable voice group/broadcast call feature at osmo-bts-trx .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34888?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3a2e3f94812cec0bbf7e3674172437fa359d014c Gerrit-Change-Number: 34888 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 25 Oct 2023 13:25:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in gapk[master]: dist: ensure the license text is included
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/gapk/+/34893?usp=email )
Change subject: dist: ensure the license text is included
..
dist: ensure the license text is included
The autotools pick up COPYING file automatically.
Change-Id: Ib5c7b479fa66291be987230f102ff391f4902988
Related: OS#6227
---
R COPYING
M contrib/gapk.spec.in
2 files changed, 13 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/gapk refs/changes/93/34893/1
diff --git a/gpl-3.0.txt b/COPYING
similarity index 100%
rename from gpl-3.0.txt
rename to COPYING
diff --git a/contrib/gapk.spec.in b/contrib/gapk.spec.in
index e5d06ba..e0466f4 100644
--- a/contrib/gapk.spec.in
+++ b/contrib/gapk.spec.in
@@ -128,7 +128,7 @@
%postun -n libosmogapk%{sover} -p /sbin/ldconfig
%files
-%doc gpl-3.0.txt
+%doc COPYING
%{_bindir}/osmo-gapk
%if 0%{with_gsmhr}
--
To view, visit https://gerrit.osmocom.org/c/gapk/+/34893?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gapk
Gerrit-Branch: master
Gerrit-Change-Id: Ib5c7b479fa66291be987230f102ff391f4902988
Gerrit-Change-Number: 34893
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[S] Change in gapk[master]: dist: exclude libgsmhr files downloaded by fetch_sources.py
Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/gapk/+/34892?usp=email ) Change subject: dist: exclude libgsmhr files downloaded by fetch_sources.py .. Patch Set 1: (1 comment) File libgsmhr/Makefile.am: https://gerrit.osmocom.org/c/gapk/+/34892/comment/e376410c_57907fd1 PS1, Line 39: -rm -rf $(distdir)/$(REFSRC_PATH) > However downloading the sources first even if we don't intend to package > them, and then remove them, seems like an unclean solution. Can't we > additionally change it so they don't get downloaded in the first place unless > --enable-gsmhr is set? I was thinking of this and first tried to make the autotools not download these files, but could not find any hooks nor examples for that. Maybe this can be achieved by overwriting the `distdir-am` target somehow, but then we would need to manually add these files which need to be in the tarball. I gave up on this. -- To view, visit https://gerrit.osmocom.org/c/gapk/+/34892?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I66e31dec37e53bf1a8c7df948fd9316e1467752c Gerrit-Change-Number: 34892 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 25 Oct 2023 13:05:35 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: ASCI: Add control of uplink access to osmo-bts-trx
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34886?usp=email ) Change subject: ASCI: Add control of uplink access to osmo-bts-trx .. Patch Set 1: (1 comment) File src/common/scheduler.c: https://gerrit.osmocom.org/c/osmo-bts/+/34886/comment/43266327_9700ac8b PS1, Line 1153: /* look for in which situation would we want to enable/disable rach detection for multiple l1sched_chan at the same time? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34886?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9045437d52984b7abe00fbc815d7f83c62c0fb5a Gerrit-Change-Number: 34886 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 25 Oct 2023 12:19:38 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: ASCI: Control uplink access bursts detection of physical interface
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34889?usp=email ) Change subject: ASCI: Control uplink access bursts detection of physical interface .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34889?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I92d6773a3a463eb747143c85aa149e54c1fda122 Gerrit-Change-Number: 34889 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 25 Oct 2023 12:20:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: ASCI: Add control of uplink access to osmo-bts-sysmo
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34887?usp=email ) Change subject: ASCI: Add control of uplink access to osmo-bts-sysmo .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34887?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I61f232aa91191dae08404c1f08cad91964d74568 Gerrit-Change-Number: 34887 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 25 Oct 2023 12:20:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: ASCI: Enable voice group/broadcast call feature at osmo-bts-trx
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34888?usp=email ) Change subject: ASCI: Enable voice group/broadcast call feature at osmo-bts-trx .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34888?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3a2e3f94812cec0bbf7e3674172437fa359d014c Gerrit-Change-Number: 34888 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 25 Oct 2023 12:20:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: ASCI: Add primitive to L1-SAP to switch uplink access detection on or...
Attention is currently required from: jolly, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34885?usp=email ) Change subject: ASCI: Add primitive to L1-SAP to switch uplink access detection on or off .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34885?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibd6a1d468a70126a8f67e944fcb916969cc3c36b Gerrit-Change-Number: 34885 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 25 Oct 2023 12:18:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: gsup: add message type for osmo-epdg CEAI interface
Attention is currently required from: laforge, lynxis lazus. pespin has uploaded a new patch set (#2) to the change originally created by lynxis lazus. ( https://gerrit.osmocom.org/c/libosmocore/+/32033?usp=email ) The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: gsup: add message type for osmo-epdg CEAI interface .. gsup: add message type for osmo-epdg CEAI interface The CEIA interface is an interface between osmo-epdg and strongswan. It is used by the osmo-epdg to synchronize state. Related: OS#6091 Change-Id: I6f7c20340c99f94b1326a8a7dc99c86cf6a0dbc3 --- M include/osmocom/gsm/gsup.h M src/gsm/gsup.c 2 files changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/33/32033/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32033?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6f7c20340c99f94b1326a8a7dc99c86cf6a0dbc3 Gerrit-Change-Number: 32033 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: laforge Gerrit-Attention: lynxis lazus Gerrit-MessageType: newpatchset
[M] Change in osmo-ttcn3-hacks[master]: epdg: Include BearerContext in CreateSessionResponse
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34883?usp=email )
Change subject: epdg: Include BearerContext in CreateSessionResponse
..
epdg: Include BearerContext in CreateSessionResponse
Change-Id: I89e364a5be68105ae8811e8bc917f32511f9e6ef
---
M epdg/EPDG_Tests.ttcn
M library/GTPv2_Templates.ttcn
2 files changed, 49 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn
index 580d4d4..e7c8633 100644
--- a/epdg/EPDG_Tests.ttcn
+++ b/epdg/EPDG_Tests.ttcn
@@ -393,9 +393,12 @@
var PDU_GTPCv2 rx_msg;
var template (value) FullyQualifiedTEID fteid_c_ie, fteid_u_ie;
var template (value) PDN_AddressAllocation paa;
+ var uint4_t bid;
+ var template (value) BearerContextIEs bctx_ies;
[] GTP2.receive(tr_GTP2C_CreateSessionReq(g_pars.imsi)) -> value rx_msg
{
/* TODO: parse TEIC and TEID and store it in
g_pars.remote_tei{c,d} */
+ bid :=
rx_msg.gtpcv2_pdu.createSessionRequest.bearerContextGrouped[0].bearerContextIEs.ePS_Bearer_ID.ePS_Bearer_ID_Value;
/* allocate + register TEID-C on local side */
g_pars.teic := f_gtp2_allocate_teid();
@@ -409,8 +412,11 @@
fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S2bU_ePDG_GTPU,
g_pars.teid, 2,
f_inet_addr(mp_s2b_local_ip), omit);
paa := ts_GTP2C_PdnAddrAlloc_v4(f_inet_addr(g_pars.ue_ip));
-
- GTP2.send(ts_GTP2C_CreateSessionResp({ fteid_c_ie }, paa));
+ bctx_ies := ts_GTP2C_BcContextIE(bid := bid,
+teid_list := { fteid_u_ie },
+qos :=
ts_GTP2C_BearerQos('09'O, 0,0,0,0),
+charging_id :=
ts_GTP2C_ChargingID(g_pars.teic));
+ GTP2.send(ts_GTP2C_CreateSessionResp({ fteid_c_ie }, paa, {
ts_GTP2C_BcGrouped(bctx_ies) } ));
setverdict(pass);
}
[] GTP2.receive(PDU_GTPCv2:?) -> value rx_msg {
diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn
index 6bd3ba6..e1e71f0 100644
--- a/library/GTPv2_Templates.ttcn
+++ b/library/GTPv2_Templates.ttcn
@@ -505,6 +505,25 @@
}
/* 8.28 */
+template (value) BearerContextIEs
+ts_GTP2C_BcContextIE(template (value) uint4_t bid,
+ template (omit) FullyQualifiedTEID_List teid_list := omit,
+ template (omit) Bearer_QoS qos := ts_GTP2C_BearerQos('09'O,
0,0,0,0),
+ template (omit) ChargingID charging_id := omit) := {
+ ePS_Bearer_ID := ts_GTP2C_EpsBearerId(bid),
+ cause := ts_GTP2C_Cause(Request_accepted,
'0'B),
+ ePS_Bearer_TFT := omit,
+ fullyQualifiedTEID := teid_list,
+ bearerLevel_QoS := qos,
+ chargingID := charging_id,
+ bearerFlags := omit,
+ transactionIdentifier := omit,
+ protocolConfigOptions := omit,
+ rAN_NASCause:= omit,
+ additionalProtocolConfigOptions := omit,
+ extendedProtocolConfigOptions := omit
+}
+
template (value) BearerContextGrouped
ts_GTP2C_BcGrouped(template (value) BearerContextIEs ies) := {
elementIdentifier := '5D'O,
@@ -522,7 +541,16 @@
bearerContextIEs := ies
}
-
+/* 8.29 */
+template (value) ChargingID
+ts_GTP2C_ChargingID(template (value) OCT4 chargingID_Value) := {
+ elementIdentifier := '5D'O,
+ lengthIndicator := 0, /* overwritten */
+ instance := ''B,
+ spare := ''B,
+ chargingID_Value := chargingID_Value,
+ additionalOctets := omit
+}
/* 8.30 */
template (value) ChargingCharacteristics
@@ -811,7 +839,8 @@
template (value) PDU_GTPCv2
ts_GTP2C_CreateSessionResp(template (value) FullyQualifiedTEID_List fteids,
- template (value) PDN_AddressAllocation addr) :=
+ template (value) PDN_AddressAllocation addr,
+ template (omit) BearerContextGrouped_List
bearerContextGrouped := omit) :=
ts_PDU_GTP2C(''O, '00'O, '21'O, {
createSessionResponse := {
cause := ts_GTP2C_Cause(Request_accepted, '0'B),
@@ -824,7 +853,7 @@
ambr := omit,
linkedEPS_Bearer_ID := omit,
protocolConfigOptions := omit,
- bearerContextGrouped := omit,
+ bearerContextGrouped := bearerContextGrouped,
recovery := omit,
chargingGatewayName :=
[S] Change in gapk[master]: dist: include .[tarball-]version and git-version-gen files
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/gapk/+/34891?usp=email ) Change subject: dist: include .[tarball-]version and git-version-gen files .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gapk/+/34891?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I5c15cefb68ab787819edaa1a097fe397837e0bcd Gerrit-Change-Number: 34891 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 25 Oct 2023 11:58:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: bsc: Make socket queue max. length configurable
Attention is currently required from: arehbein, dexter, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33892?usp=email ) Change subject: bsc: Make socket queue max. length configurable .. Patch Set 8: Code-Review+1 (2 comments) File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/33892/comment/59475bc3_d0846a7b PS8, Line 2499: size_t to = (net->pcu_sock_wqueue_len_max = atoi(argv[0])); this new variable is really not needed and just makes everything more complex, specially with the parenthesis in there. https://gerrit.osmocom.org/c/osmo-bsc/+/33892/comment/d00434b0_899ce34d PS8, Line 2503: LOGP(DPCU, LOGL_INFO, "Have dropped %zu messages due to shortened max. message queue size (from: %zu to %zu)\n", it may be good to do vty_out with the same message here, to show the user of the VTY what happened as a consequenc eof the cmd typed. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33892?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5f19f4613bccaf582997a4d02b689adee083a0b Gerrit-Change-Number: 33892 Gerrit-PatchSet: 8 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 25 Oct 2023 11:56:40 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in gapk[master]: libgsmhr: fix unneeded dependency for libgsmhr.c
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/gapk/+/34890?usp=email ) Change subject: libgsmhr: fix unneeded dependency for libgsmhr.c .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gapk/+/34890?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I95900e3d26a7668246ec97d3182bea84156b4725 Gerrit-Change-Number: 34890 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 25 Oct 2023 11:57:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: epdg: Include BearerContext in CreateSessionResponse
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34883?usp=email ) Change subject: epdg: Include BearerContext in CreateSessionResponse .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34883?usp=email 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: I89e364a5be68105ae8811e8bc917f32511f9e6ef Gerrit-Change-Number: 34883 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 25 Oct 2023 11:56:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: ASCI: Add primitive to L1-SAP to switch uplink access detection on or...
Attention is currently required from: jolly, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34885?usp=email ) Change subject: ASCI: Add primitive to L1-SAP to switch uplink access detection on or off .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34885?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibd6a1d468a70126a8f67e944fcb916969cc3c36b Gerrit-Change-Number: 34885 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 25 Oct 2023 11:22:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in gapk[master]: dist: exclude libgsmhr files downloaded by fetch_sources.py
Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/gapk/+/34892?usp=email ) Change subject: dist: exclude libgsmhr files downloaded by fetch_sources.py .. Patch Set 1: (1 comment) File libgsmhr/Makefile.am: https://gerrit.osmocom.org/c/gapk/+/34892/comment/e743eb8e_54f4866d PS1, Line 39: -rm -rf $(distdir)/$(REFSRC_PATH) I think removing the sources in a dist-hook is a good idea, so they don't end up in the archive by accident if they were already downloaded. However downloading the sources first even if we don't intend to package them, and then remove them, seems like an unclean solution. Can't we additionally change it so they don't get downloaded in the first place unless --enable-gsmhr is set? -- To view, visit https://gerrit.osmocom.org/c/gapk/+/34892?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I66e31dec37e53bf1a8c7df948fd9316e1467752c Gerrit-Change-Number: 34892 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 25 Oct 2023 10:56:54 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in gapk[master]: dist: include .[tarball-]version and git-version-gen files
Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/gapk/+/34891?usp=email ) Change subject: dist: include .[tarball-]version and git-version-gen files .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/gapk/+/34891?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I5c15cefb68ab787819edaa1a097fe397837e0bcd Gerrit-Change-Number: 34891 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 25 Oct 2023 10:35:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in gapk[master]: libgsmhr: fix unneeded dependency for libgsmhr.c
Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/gapk/+/34890?usp=email ) Change subject: libgsmhr: fix unneeded dependency for libgsmhr.c .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/gapk/+/34890?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I95900e3d26a7668246ec97d3182bea84156b4725 Gerrit-Change-Number: 34890 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 25 Oct 2023 10:35:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in gapk[master]: dist: exclude libgsmhr files downloaded by fetch_sources.py
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/gapk/+/34892?usp=email )
Change subject: dist: exclude libgsmhr files downloaded by fetch_sources.py
..
dist: exclude libgsmhr files downloaded by fetch_sources.py
We deliberately do not include these files in the git repository,
nor do we intend to include them in the release tarballs. This
is done intentionally to avoid potential licensing issues.
Change-Id: I66e31dec37e53bf1a8c7df948fd9316e1467752c
Related: OS#6227
---
M libgsmhr/Makefile.am
1 file changed, 18 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/gapk refs/changes/92/34892/1
diff --git a/libgsmhr/Makefile.am b/libgsmhr/Makefile.am
index f3c01b7..ffbde21 100644
--- a/libgsmhr/Makefile.am
+++ b/libgsmhr/Makefile.am
@@ -33,3 +33,7 @@
distclean-local:
-rm -rf ${REFSRC_PATH}/
+
+# exclude files downloaded by fetch_sources.py
+dist-hook:
+ -rm -rf $(distdir)/$(REFSRC_PATH)
--
To view, visit https://gerrit.osmocom.org/c/gapk/+/34892?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gapk
Gerrit-Branch: master
Gerrit-Change-Id: I66e31dec37e53bf1a8c7df948fd9316e1467752c
Gerrit-Change-Number: 34892
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[S] Change in gapk[master]: libgsmhr: fix unneeded dependency for libgsmhr.c
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/gapk/+/34890?usp=email )
Change subject: libgsmhr: fix unneeded dependency for libgsmhr.c
..
libgsmhr: fix unneeded dependency for libgsmhr.c
Change-Id: I95900e3d26a7668246ec97d3182bea84156b4725
Related: OS#6227
---
M libgsmhr/Makefile.am
1 file changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/gapk refs/changes/90/34890/1
diff --git a/libgsmhr/Makefile.am b/libgsmhr/Makefile.am
index 9904098..f3c01b7 100644
--- a/libgsmhr/Makefile.am
+++ b/libgsmhr/Makefile.am
@@ -21,7 +21,7 @@
done
touch $@
-$(REFSRC_SRC) libgsmhr.c: ${REFSRC_PATH}/.downloaded
+$(REFSRC_SRC): ${REFSRC_PATH}/.downloaded
lib_LTLIBRARIES = libgsmhr.la
libgsmhr_la_SOURCES = $(REFSRC_SRC) libgsmhr.c
--
To view, visit https://gerrit.osmocom.org/c/gapk/+/34890?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gapk
Gerrit-Branch: master
Gerrit-Change-Id: I95900e3d26a7668246ec97d3182bea84156b4725
Gerrit-Change-Number: 34890
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[S] Change in gapk[master]: dist: include .[tarball-]version and git-version-gen files
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/gapk/+/34891?usp=email ) Change subject: dist: include .[tarball-]version and git-version-gen files .. dist: include .[tarball-]version and git-version-gen files Most of other [lib]osmo-projects do include these files in the release tarballs. Do the same for the sake of consistency. Change-Id: I5c15cefb68ab787819edaa1a097fe397837e0bcd Related: OS#6227 --- M Makefile.am 1 file changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gapk refs/changes/91/34891/1 diff --git a/Makefile.am b/Makefile.am index a1642d4..f2a2c31 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,3 +11,17 @@ endif SUBDIRS += src tests + +BUILT_SOURCES = \ + $(top_srcdir)/.version \ + $(NULL) +EXTRA_DIST = \ + git-version-gen \ + .version \ + $(NULL) + +# versioning magic +$(top_srcdir)/.version: + echo $(VERSION) > $@-t && mv $@-t $@ +dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version -- To view, visit https://gerrit.osmocom.org/c/gapk/+/34891?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I5c15cefb68ab787819edaa1a097fe397837e0bcd Gerrit-Change-Number: 34891 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
[M] Change in osmo-bts[master]: ASCI: Control uplink access bursts detection of physical interface
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/34889?usp=email )
Change subject: ASCI: Control uplink access bursts detection of physical
interface
..
ASCI: Control uplink access bursts detection of physical interface
An MPH-INFO message is used to turn detection of uplink access bursts on
or off. Whenever the uplink on a voice group channel is free, the uplink
access burst detection is turned on. When the uplink access is granted
to a talker or when the calling subscriber has been assigned to the
channel, the uplink access burst detection is turned off until the
uplink becomes free again.
Related: OS#4851
Change-Id: I92d6773a3a463eb747143c85aa149e54c1fda122
---
M include/osmo-bts/asci.h
M include/osmo-bts/l1sap.h
M src/common/asci.c
M src/common/l1sap.c
M src/common/lchan.c
M src/common/rsl.c
6 files changed, 79 insertions(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/89/34889/1
diff --git a/include/osmo-bts/asci.h b/include/osmo-bts/asci.h
index 59b48b2..9980296 100644
--- a/include/osmo-bts/asci.h
+++ b/include/osmo-bts/asci.h
@@ -11,11 +11,13 @@
void vgcs_rach(struct gsm_lchan *lchan, uint8_t ra, uint8_t acc_delay,
uint32_t fn);
+void vgcs_lchan_activate(struct gsm_lchan *lchan);
+
void vgcs_lchan_react(struct gsm_lchan *lchan);
void vgcs_talker_frame(struct gsm_lchan *lchan);
-void vgcs_talker_reset(struct gsm_lchan *lchan);
+void vgcs_talker_reset(struct gsm_lchan *lchan, bool ul_access);
void vgcs_listener_reset(struct gsm_lchan *lchan);
diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h
index 353fc90..96a80d8 100644
--- a/include/osmo-bts/l1sap.h
+++ b/include/osmo-bts/l1sap.h
@@ -102,6 +102,7 @@
int l1sap_chan_rel(struct gsm_bts_trx *trx, uint8_t chan_nr);
int l1sap_chan_deact_sacch(struct gsm_bts_trx *trx, uint8_t chan_nr);
int l1sap_chan_modify(struct gsm_bts_trx *trx, uint8_t chan_nr);
+int l1sap_uplink_access(struct gsm_bts_trx *trx, uint8_t chan_nr, bool active);
enum l1sap_common_sapi {
L1SAP_COMMON_SAPI_UNKNOWN,
diff --git a/src/common/asci.c b/src/common/asci.c
index ccaacd8..34219df 100644
--- a/src/common/asci.c
+++ b/src/common/asci.c
@@ -126,9 +126,9 @@
/* Stop RACH detection, wait for valid frame */
lchan->asci.talker_active = VGCS_TALKER_WAIT_FRAME;
- if (l1sap_chan_modify(lchan->ts->trx, gsm_lchan2chan_nr(lchan))
!= 0) {
- LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "failed to modify
channel after TALKER DET\n");
- rsl_tx_conn_fail(lchan, RSL_ERR_TALKER_ACC_FAIL);
+ if (l1sap_uplink_access(lchan->ts->trx,
gsm_lchan2chan_nr(lchan), false) != 0) {
+ LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to
deactivate uplink accesss after TALKER DET.\n");
+ rsl_tx_conn_fail(lchan, RSL_ERR_EQUIPMENT_FAIL);
lchan->asci.talker_active = VGCS_TALKER_NONE;
return;
}
@@ -151,11 +151,25 @@
}
}
+/* Received channel activation. */
+void vgcs_lchan_activate(struct gsm_lchan *lchan)
+{
+ LOGPLCHAN(lchan, DASCI, LOGL_INFO, "Channel is activated.\n");
+ if (l1sap_uplink_access(lchan->ts->trx, gsm_lchan2chan_nr(lchan), true)
!= 0) {
+ LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to activate uplink
accesss after channel activation.\n");
+ rsl_tx_conn_fail(lchan, RSL_ERR_EQUIPMENT_FAIL);
+ }
+}
+
/* Received channel reactivation. (for assignment) */
void vgcs_lchan_react(struct gsm_lchan *lchan)
{
LOGPLCHAN(lchan, DASCI, LOGL_INFO, "Channel is activated for
assignment.\n");
lchan->asci.talker_active = VGCS_TALKER_WAIT_FRAME;
+ if (l1sap_uplink_access(lchan->ts->trx, gsm_lchan2chan_nr(lchan),
false) != 0) {
+ LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to deactivate
uplink accesss for assignment.\n");
+ rsl_tx_conn_fail(lchan, RSL_ERR_EQUIPMENT_FAIL);
+ }
radio_link_timeout_reset(lchan);
}
@@ -169,7 +183,7 @@
}
/* Release VGCS Talker state. */
-void vgcs_talker_reset(struct gsm_lchan *lchan)
+void vgcs_talker_reset(struct gsm_lchan *lchan, bool ul_access)
{
if (lchan->asci.talker_active == VGCS_TALKER_NONE)
return;
@@ -179,8 +193,15 @@
/* Stop T3115 */
osmo_timer_del(>asci.t3115);
- /* Talker detection done */
+ /* Talker released. */
lchan->asci.talker_active = VGCS_TALKER_NONE;
+ if (ul_access) {
+ if (l1sap_uplink_access(lchan->ts->trx,
gsm_lchan2chan_nr(lchan), true) != 0) {
+ LOGPLCHAN(lchan, DASCI, LOGL_ERROR,
+ "Failed to activate uplink accesss after
uplink became free.\n");
+ rsl_tx_conn_fail(lchan, RSL_ERR_EQUIPMENT_FAIL);
[M] Change in osmo-bts[master]: ASCI: Control uplink access bursts detection of physical interface
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34889?usp=email ) Change subject: ASCI: Control uplink access bursts detection of physical interface .. Patch Set 1: (4 comments) File src/common/asci.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12091): https://gerrit.osmocom.org/c/osmo-bts/+/34889/comment/a4d0db0b_73590916 PS1, Line 130: LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to deactivate uplink accesss after TALKER DET.\n"); 'accesss' may be misspelled - perhaps 'access'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12091): https://gerrit.osmocom.org/c/osmo-bts/+/34889/comment/b6c72e47_949143a7 PS1, Line 159: LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to activate uplink accesss after channel activation.\n"); 'accesss' may be misspelled - perhaps 'access'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12091): https://gerrit.osmocom.org/c/osmo-bts/+/34889/comment/54099ea4_df24e17d PS1, Line 170: LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to deactivate uplink accesss for assignment.\n"); 'accesss' may be misspelled - perhaps 'access'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12091): https://gerrit.osmocom.org/c/osmo-bts/+/34889/comment/483e3187_27c41c18 PS1, Line 201:"Failed to activate uplink accesss after uplink became free.\n"); 'accesss' may be misspelled - perhaps 'access'? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34889?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I92d6773a3a463eb747143c85aa149e54c1fda122 Gerrit-Change-Number: 34889 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 25 Oct 2023 09:40:07 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: ASCI: Enable voice group/broadcast call feature at osmo-bts-trx
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34888?usp=email ) Change subject: ASCI: Enable voice group/broadcast call feature at osmo-bts-trx .. ASCI: Enable voice group/broadcast call feature at osmo-bts-trx Related: OS#4851 Change-Id: I3a2e3f94812cec0bbf7e3674172437fa359d014c --- M src/osmo-bts-trx/main.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/88/34888/1 diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index c1f5716..c2d1e31 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -156,6 +156,8 @@ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_AMR); osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1); osmo_bts_set_feature(bts->features, BTS_FEAT_VAMOS); + osmo_bts_set_feature(bts->features, BTS_FEAT_VGCS); + osmo_bts_set_feature(bts->features, BTS_FEAT_VBS); bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB); bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_INTERF_MEAS); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34888?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3a2e3f94812cec0bbf7e3674172437fa359d014c Gerrit-Change-Number: 34888 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-MessageType: newchange
[M] Change in osmo-bts[master]: ASCI: Add control of uplink access to osmo-bts-trx
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/34886?usp=email )
Change subject: ASCI: Add control of uplink access to osmo-bts-trx
..
ASCI: Add control of uplink access to osmo-bts-trx
An MPH-INFO message is used to turn detection of uplink access bursts on
or off. This is required for voice group/broadcast channels.
Related: OS#4851
Change-Id: I9045437d52984b7abe00fbc815d7f83c62c0fb5a
---
M include/osmo-bts/scheduler.h
M src/common/scheduler.c
M src/osmo-bts-trx/l1_if.c
3 files changed, 54 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/86/34886/1
diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h
index 94333ea..b9c7350 100644
--- a/include/osmo-bts/scheduler.h
+++ b/include/osmo-bts/scheduler.h
@@ -186,6 +186,9 @@
/*! \brief set all matching logical channels active/inactive */
int trx_sched_set_lchan(struct gsm_lchan *lchan, uint8_t chan_nr, uint8_t
link_id, bool active);
+/*! \brief set uplink access on given logical channels active/inactive */
+int trx_sched_set_ul_access(struct gsm_lchan *lchan, uint8_t chan_nr, bool
active);
+
/*! \brief set all logical channels of BCCH/CCCH active/inactive */
int trx_sched_set_bcch_ccch(struct gsm_lchan *lchan, bool active);
diff --git a/src/common/scheduler.c b/src/common/scheduler.c
index e68d01f..79d69fd 100644
--- a/src/common/scheduler.c
+++ b/src/common/scheduler.c
@@ -1144,6 +1144,27 @@
return found ? 0 : -EINVAL;
}
+int trx_sched_set_ul_access(struct gsm_lchan *lchan, uint8_t chan_nr, bool
active)
+{
+ uint8_t tn = L1SAP_CHAN2TS(chan_nr);
+ uint8_t ss = l1sap_chan2ss(chan_nr);
+ int i;
+
+ /* look for all matching chan_nr */
+ for (i = 0; i < _TRX_CHAN_MAX; i++) {
+ if (trx_chan_desc[i].chan_nr == (chan_nr & RSL_CHAN_NR_MASK)) {
+ struct l1sched_ts *l1ts = lchan->ts->priv;
+ struct l1sched_chan_state *l1cs = >chan_state[i];
+
+ l1cs->ho_rach_detect = active;
+ }
+ }
+
+ _sched_act_rach_det(lchan->ts->trx, tn, ss, active);
+
+ return 0;
+}
+
int trx_sched_set_bcch_ccch(struct gsm_lchan *lchan, bool active)
{
struct l1sched_ts *l1ts = lchan->ts->priv;
diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
index ab66094..54f5bd2 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -417,10 +417,18 @@
/* put data into scheduler's queue */
return trx_sched_tch_req(trx, l1sap);
case OSMO_PRIM(PRIM_MPH_INFO, PRIM_OP_REQUEST):
- if (l1sap->u.info.type == PRIM_INFO_ACT_CIPH)
+ switch (l1sap->u.info.type) {
+ case PRIM_INFO_ACT_CIPH:
chan_nr = l1sap->u.info.u.ciph_req.chan_nr;
- else /* u.act_req used by
PRIM_INFO_{ACTIVATE,DEACTIVATE,MODIFY} */
+ break;
+ case PRIM_INFO_ACT_UL_ACC:
+ case PRIM_INFO_DEACT_UL_ACC:
+ chan_nr = l1sap->u.info.u.ulacc_req.chan_nr;
+ break;
+ default:
+ /* u.act_req used by
PRIM_INFO_{ACTIVATE,DEACTIVATE,MODIFY} */
chan_nr = l1sap->u.info.u.act_req.chan_nr;
+ }
lchan = get_lchan_by_chan_nr(trx, chan_nr);
if (OSMO_UNLIKELY(lchan == NULL)) {
LOGP(DL1C, LOGL_ERROR,
@@ -437,6 +445,12 @@
if (l1sap->u.info.u.ciph_req.downlink)
l1if_set_ciphering(lchan, chan_nr, 1);
break;
+ case PRIM_INFO_ACT_UL_ACC:
+ trx_sched_set_ul_access(lchan, chan_nr, true);
+ break;
+ case PRIM_INFO_DEACT_UL_ACC:
+ trx_sched_set_ul_access(lchan, chan_nr, false);
+ break;
case PRIM_INFO_ACTIVATE:
if ((chan_nr & 0xE0) == 0x80) {
LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Cannot
activate"
@@ -458,8 +472,7 @@
lchan->tch.amr_mr.mode[2].mode,
lchan->tch.amr_mr.mode[3].mode,
amr_get_initial_mode(lchan),
- (lchan->ho.active ==
HANDOVER_ENABLED) ||
-
rsl_chan_rt_is_asci(lchan->rsl_chan_rt));
+ (lchan->ho.active ==
HANDOVER_ENABLED));
/* set lchan active */
lchan_set_state(lchan, LCHAN_S_ACTIVE);
/* set initial ciphering */
--
To view, visit
[S] Change in osmo-bts[master]: ASCI: Add control of uplink access to osmo-bts-sysmo
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/34887?usp=email )
Change subject: ASCI: Add control of uplink access to osmo-bts-sysmo
..
ASCI: Add control of uplink access to osmo-bts-sysmo
An MPH-INFO message is used to turn detection of uplink access bursts on
or off. This is required for voice group/broadcast channels.
Related: OS#4851
Change-Id: I61f232aa91191dae08404c1f08cad91964d74568
---
M src/osmo-bts-sysmo/l1_if.c
M src/osmo-bts-sysmo/l1_if.h
M src/osmo-bts-sysmo/oml.c
3 files changed, 35 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/87/34887/1
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index 4ab2ef6..49a8c5d 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -604,6 +604,15 @@
else
l1if_rsl_chan_rel(lchan);
break;
+ case PRIM_INFO_ACT_UL_ACC:
+ case PRIM_INFO_DEACT_UL_ACC:
+ chan_nr = l1sap->u.info.u.ulacc_req.chan_nr;
+ lchan = get_lchan_by_chan_nr(trx, chan_nr);
+ if (l1sap->u.info.type == PRIM_INFO_ACT_UL_ACC)
+ l1if_set_ul_acc(lchan, true);
+ else
+ l1if_set_ul_acc(lchan, false);
+ break;
default:
LOGP(DL1C, LOGL_NOTICE, "unknown MPH-INFO.req %d\n",
l1sap->u.info.type);
diff --git a/src/osmo-bts-sysmo/l1_if.h b/src/osmo-bts-sysmo/l1_if.h
index 5b2da04..c81b6bd 100644
--- a/src/osmo-bts-sysmo/l1_if.h
+++ b/src/osmo-bts-sysmo/l1_if.h
@@ -145,6 +145,7 @@
int l1if_rsl_chan_mod(struct gsm_lchan *lchan);
int l1if_rsl_deact_sacch(struct gsm_lchan *lchan);
int l1if_rsl_mode_modify(struct gsm_lchan *lchan);
+int l1if_set_ul_acc(struct gsm_lchan *lchan, bool active);
/* calibration loading */
int calib_load(struct femtol1_hdl *fl1h);
diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c
index 9b760a3..e19c481 100644
--- a/src/osmo-bts-sysmo/oml.c
+++ b/src/osmo-bts-sysmo/oml.c
@@ -1172,8 +1172,8 @@
LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Trying to activate lchan,
but commands in queue\n");
/* For handover, always start the main channel immediately.
lchan->want_dl_sacch_active indicates whether dl
-* SACCH should be activated. Also, for HO and VGCS listener/talker
detection, start the RACH SAPI. */
- if (lchan->ho.active == HANDOVER_ENABLED ||
rsl_chan_rt_is_asci(lchan->rsl_chan_rt))
+* SACCH should be activated. */
+ if (lchan->ho.active == HANDOVER_ENABLED)
enqueue_sapi_act_cmd(lchan, GsmL1_Sapi_Rach,
GsmL1_Dir_RxUplink);
for (i = 0; i < s4l->num_sapis; i++) {
@@ -1470,6 +1470,16 @@
return 0;
}
+int l1if_set_ul_acc(struct gsm_lchan *lchan, bool active)
+{
+ if (active)
+ enqueue_sapi_act_cmd(lchan, GsmL1_Sapi_Rach,
GsmL1_Dir_RxUplink);
+ else
+ check_sapi_release(lchan, GsmL1_Sapi_Rach, GsmL1_Dir_RxUplink);
+
+ return 0;
+}
+
int bts_model_adjst_ms_pwr(struct gsm_lchan *lchan)
{
if (lchan->state != LCHAN_S_ACTIVE)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34887?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I61f232aa91191dae08404c1f08cad91964d74568
Gerrit-Change-Number: 34887
Gerrit-PatchSet: 1
Gerrit-Owner: jolly
Gerrit-MessageType: newchange
[S] Change in libosmocore[master]: ASCI: Add primitive to L1-SAP to switch uplink access detection on or...
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/34885?usp=email )
Change subject: ASCI: Add primitive to L1-SAP to switch uplink access detection
on or off
..
ASCI: Add primitive to L1-SAP to switch uplink access detection on or off
Related: OS#4851
Change-Id: Ibd6a1d468a70126a8f67e944fcb916969cc3c36b
---
M include/osmocom/gsm/l1sap.h
1 file changed, 18 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/34885/1
diff --git a/include/osmocom/gsm/l1sap.h b/include/osmocom/gsm/l1sap.h
index d139690..0faab7e 100644
--- a/include/osmocom/gsm/l1sap.h
+++ b/include/osmocom/gsm/l1sap.h
@@ -27,6 +27,8 @@
PRIM_INFO_MODIFY, /*!< Mode Modify of channel */
PRIM_INFO_ACT_CIPH, /*!< Activation of ciphering */
PRIM_INFO_DEACT_CIPH, /*!< Deactivation of ciphering */
+ PRIM_INFO_ACT_UL_ACC, /*!< Activation of uplink access detection */
+ PRIM_INFO_DEACT_UL_ACC, /*!< Deactivation of uplink access detection */
};
/*! PH-DATA presence information */
@@ -142,6 +144,11 @@
uint8_t uplink; /*!< Apply to uplink */
};
+/*! for {ACT_UL_ACC,DEACT_UL_ACC} MPH-INFO.req */
+struct info_ulacc_req_param {
+ uint8_t chan_nr;/*!< Channel Number (Like RSL) */
+};
+
/*! for MPH-INFO.ind */
struct mph_info_param {
enum osmo_mph_info_type type; /*!< Info message type */
@@ -151,6 +158,7 @@
struct info_act_req_param act_req;
struct info_act_cnf_param act_cnf;
struct info_ciph_req_param ciph_req;
+ struct info_ulacc_req_param ulacc_req;
} u;
};
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34885?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ibd6a1d468a70126a8f67e944fcb916969cc3c36b
Gerrit-Change-Number: 34885
Gerrit-PatchSet: 1
Gerrit-Owner: jolly
Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: epdg: Include BearerContext in CreateSessionResponse
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34883?usp=email ) Change subject: epdg: Include BearerContext in CreateSessionResponse .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34883?usp=email 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: I89e364a5be68105ae8811e8bc917f32511f9e6ef Gerrit-Change-Number: 34883 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 25 Oct 2023 08:41:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-e1d[master]: usb: Deal with truncated ISO IN transfers
Attention is currently required from: manawyrm, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27579?usp=email ) Change subject: usb: Deal with truncated ISO IN transfers .. Patch Set 2: (1 comment) Patchset: PS2: > This still isn't merged, but it probably should be. […] it should be pushed into the flow->cb callback instead of being in the generic code path. also, we probably want a rate_ctr for observability. And possibly a rate limit to give up if this happens too frequently. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27579?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ic453325b93b0e12727625a1495a948d96df4b542 Gerrit-Change-Number: 27579 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: manawyrm Gerrit-Reviewer: tnt Gerrit-Attention: manawyrm Gerrit-Attention: tnt Gerrit-Comment-Date: Wed, 25 Oct 2023 08:30:13 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: manawyrm Gerrit-MessageType: comment
[M] Change in osmo-e1d[master]: Automatically reset RIFO on underrun/overflow
Attention is currently required from: jolly, manawyrm, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/34554?usp=email ) Change subject: Automatically reset RIFO on underrun/overflow .. Patch Set 3: (3 comments) Patchset: PS3: see detailed comments. what do others think? also, I think such resync events should be counted in a rate counter. File src/octoi/e1oip.c: https://gerrit.osmocom.org/c/osmo-e1d/+/34554/comment/79fdcc40_9034c19f PS3, Line 274: iline_ctr_add(iline, LINE_CTR_E1oIP_E1T_OVERFLOW, 1); I'm a bit worried that we do this after the first packet with out of range frame nr. so a single late or duplicated packet can cause a full reset here. It might be worth considering to wait for several such packets or a certain rate of them? File src/octoi/octoi_srv_vty.c: https://gerrit.osmocom.org/c/osmo-e1d/+/34554/comment/d6959207_cc88c233 PS3, Line 419: void set_frames_per_fifo_str(void) why do we have those runtime generated strings? can't we generate them at compile time? We're passing a constant/define only -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/34554?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id7ccbfbdb288990c01f185dec79a1022a68b4748 Gerrit-Change-Number: 34554 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: manawyrm Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Attention: manawyrm Gerrit-Attention: jolly Gerrit-Attention: tnt Gerrit-Comment-Date: Wed, 25 Oct 2023 08:25:51 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
