Change in osmocom-bb[master]: layer23: Introduce APN VTY node
Attention is currently required from: pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30992 ) Change subject: layer23: Introduce APN VTY node .. Patch Set 5: (1 comment) Patchset: PS4: > It's definetly impossible to submit a full working patch with the entire > thing, since there are so m […] it might be useful to have such important information as part of the changelog of each related patch. At the very least include a WIP in the subject line, if you don't want to add a line/sentence to the body of the commit. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7b4eaa0de428b418bb1d89bd544694e89beb3e6e Gerrit-Change-Number: 30992 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 18 Jan 2023 06:58:43 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: main: Log line about using config file before parsing it
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31006 ) Change subject: layer23: main: Log line about using config file before parsing it .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I66b5b18887b8deb37c3784fec90644470498d7b5 Gerrit-Change-Number: 31006 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 18 Jan 2023 06:57:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hlr[master]: Add vty `reject-cause` to set the reject cause
Attention is currently required from: fixeria, keith, lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16808 ) Change subject: Add vty `reject-cause` to set the reject cause .. Patch Set 11: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icea39020c23fbbea9e92847df76af8986fdbf48a Gerrit-Change-Number: 16808 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: keith Gerrit-CC: pespin Gerrit-Attention: fixeria Gerrit-Attention: keith Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Wed, 18 Jan 2023 06:56:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: cards: also program EF.AD under ADF.USIM
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/31004 ) Change subject: cards: also program EF.AD under ADF.USIM .. Patch Set 1: (2 comments) Patchset: PS1: I expect the split was introduced in sysmoISIM-SJA2v2 (September 2021) when according to the changelog in the sysmoUSIM/ISIM user manual we have the item "EF.AD: set the bit that allows powering down the card during eDRX cycles". Splitting a previously linked file is always needed when the specs start to diverge, for example by introducing new bits in UICC/USIM which are not specified in classic DF_GSM File pySim/cards.py: https://gerrit.osmocom.org/c/pysim/+/31004/comment/366ffadb_a733def8 PS1, Line 1587: pleaes don't mix tab and space indentation. We've switched to the (more pythonic) space-only indenting in pySim quite some time ago. Mixing both will render different formatting depending on how wide a tab is rendered (in python sometimes 4 spaces rather than 8). Python also often warns or errs about mixed tab/space indent for that reason -- To view, visit https://gerrit.osmocom.org/c/pysim/+/31004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic9dd4acc8d9a72acbb7376ddf3e2128125d4a8f5 Gerrit-Change-Number: 31004 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 18 Jan 2023 06:54:03 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-hnbgw[master]: fix msgb leak for RANAP RAB Ass. Req.
Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31009 ) Change subject: fix msgb leak for RANAP RAB Ass. Req. .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ie30e880301346ffca72f98f8c467e56d622fb03f Gerrit-Change-Number: 31009 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: neels Gerrit-Comment-Date: Wed, 18 Jan 2023 06:49:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hnbgw[master]: fix segfault on MGCP timeout
Attention is currently required from: neels, pespin, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31008 ) Change subject: fix segfault on MGCP timeout .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I460d7249f4fc7edcfd94f6084fc8f933b491520c Gerrit-Change-Number: 31008 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 18 Jan 2023 06:49:19 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hnbgw[master]: fix msgb leak for RANAP RAB Ass. Req.
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31009 ) Change subject: fix msgb leak for RANAP RAB Ass. Req. .. fix msgb leak for RANAP RAB Ass. Req. Fix leaked msgb introduced by the MGW support recently added, and from there copied to the UPF support added after that. Fixes leaked "RANAP Tx" msgb, one per RAB Assignment that involves an MGW or UPF proxying of user data. Related: SYS#6297 Change-Id: Ie30e880301346ffca72f98f8c467e56d622fb03f --- M src/osmo-hnbgw/mgw_fsm.c M src/osmo-hnbgw/ps_rab_ass_fsm.c 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/09/31009/1 diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c index f09300e..764e9a7 100644 --- a/src/osmo-hnbgw/mgw_fsm.c +++ b/src/osmo-hnbgw/mgw_fsm.c @@ -256,6 +256,7 @@ LOGPFSML(fi, LOGL_DEBUG, "forwarding modified RAB-AssignmentRequest to HNB\n"); rua_tx_dt(map->hnb_ctx, map->is_ps, map->rua_ctx_id, msg->data, msg->len); + msgb_free(msg); } static void mgw_fsm_assign(struct osmo_fsm_inst *fi, uint32_t event, void *data) diff --git a/src/osmo-hnbgw/ps_rab_ass_fsm.c b/src/osmo-hnbgw/ps_rab_ass_fsm.c index b298e45..e676c2c 100644 --- a/src/osmo-hnbgw/ps_rab_ass_fsm.c +++ b/src/osmo-hnbgw/ps_rab_ass_fsm.c @@ -352,6 +352,7 @@ return; } rua_tx_dt(rab_ass->map->hnb_ctx, rab_ass->map->is_ps, rab_ass->map->rua_ctx_id, msg->data, msg->len); + msgb_free(msg); /* The request message has been forwarded. The response will be handled by a new FSM instance. * We are done. */ osmo_fsm_inst_term(rab_ass->fi, OSMO_FSM_TERM_REGULAR, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ie30e880301346ffca72f98f8c467e56d622fb03f Gerrit-Change-Number: 31009 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange
Change in osmo-hnbgw[master]: drop bogus error log 'no MGW fsm'
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/30688 )
Change subject: drop bogus error log 'no MGW fsm'
..
drop bogus error log 'no MGW fsm'
Looking at a customer's log, these error logs got my attention. There
seems to be no point in logging this at all.
Change-Id: I89dd4fb6913bfb84b6667b159e09968734e2102a
---
M src/osmo-hnbgw/mgw_fsm.c
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
dexter: Looks good to me, but someone else must approve
neels: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c
index b58d01f..656066b 100644
--- a/src/osmo-hnbgw/mgw_fsm.c
+++ b/src/osmo-hnbgw/mgw_fsm.c
@@ -782,10 +782,8 @@
* \returns 0 on success; negative on error. */
int mgw_fsm_release(struct hnbgw_context_map *map)
{
- if (!map->mgw_fi) {
- LOGP(DMGW, LOGL_ERROR, "mgw_fsm_release() rua_ctx_id=%d, no MGW
fsm -- ignored!\n", map->rua_ctx_id);
+ if (!map->mgw_fi)
return -EINVAL;
- }
osmo_fsm_inst_dispatch(map->mgw_fi, MGW_EV_RELEASE, NULL);
return 0;
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/30688
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I89dd4fb6913bfb84b6667b159e09968734e2102a
Gerrit-Change-Number: 30688
Gerrit-PatchSet: 2
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-hnbgw[master]: fix segfault on MGCP timeout
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/31008 )
Change subject: fix segfault on MGCP timeout
..
fix segfault on MGCP timeout
bisect shows that the segfault was introduced by using the MGCP client
pool:
e62af4d46a74af4a98dc9399082f4277fb6379e5 is the first bad commit
Author: Pau Espin Pedrol
Introduce support for libosmo-mgcp-client MGW pooling
Change-Id I371dc773b58788ee21037dc25d77f556c89c6b61
The segfault:
20230117224550365 DLMGCP DEBUG
MGCP_CONN(to-HNB)[0x61203ca0]{ST_CRCX_RESP}: Timeout of T1 (fsm.c:317)
[...]
20230117224550366 DLMGCP DEBUG
mgw-endp(mgw-fsm-14429752-0)[0x61203b20]{WAIT_MGW_RESPONSE}: Deallocated
(fsm.c:568)
20230117224550366 DMGW DEBUG
mgw(mgw-fsm-14429752-0)[0x61203820]{MGW_ST_CRCX_HNB}: Received Event
MGW_EV_MGCP_TERM (mgcp_client_endpoint_fsm.c:869)
=
==255699==ERROR: AddressSanitizer: heap-use-after-free on address
0x62b00260 at pc 0x7f282a6ee143 bp 0x7fff0d9bcae0 sp 0x7fff0d9bcad8
READ of size 8 at 0x62b00260 thread T0
#0 0x7f282a6ee142 in osmo_mgcpc_ep_client
../../../../src/osmo-mgw/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c:223
#1 0x55e2a84f1889 in mgw_fsm_allstate_action
../../../../src/osmo-hnbgw/src/osmo-hnbgw/mgw_fsm.c:504
#2 0x7f2829d50c56 in _osmo_fsm_inst_dispatch
../../../src/libosmocore/src/fsm.c:863
#3 0x7f2829d55a08 in _osmo_fsm_inst_term
../../../src/libosmocore/src/fsm.c:962
#4 0x7f282a72679a in osmo_mgcpc_ep_fsm_check_state_chg_after_response
../../../../src/osmo-mgw/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c:869
#5 0x7f282a6f1869 in on_failure
../../../../src/osmo-mgw/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c:414
#6 0x7f282a727ac6 in osmo_mgcpc_ep_fsm_handle_ci_events
../../../../src/osmo-mgw/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c:935
[...]
When a CRCX times out, MGCP_CONN fsm terminates (libosmo-mgcp-client).
In turn the parent mgw-endp fsm terminates (libosmo-mgcp-client).
This generates an MGW_EV_MGCP_TERM event to the mgw_fsm (osmo-ttcn3-hacks).
This attempts to retrieve a pointer from mgw_fsm state:
mgw_fsm_priv->mgcpc_ep->mgcp_client
where the middle one, mgcpc_ep, is the 'mgw-endp' that already deallocated
above.
To fix, add to /osmo-hnbgw/mgw_fsm.c a separate pointer to the
mgcp_client, to call mgcp_client_pool_put() on it. Do not use mgcpc_ep
to get the mgcp_client, because mgcpc_ep deallocates independently.
Related: OS#5862
Change-Id: I460d7249f4fc7edcfd94f6084fc8f933b491520c
---
M src/osmo-hnbgw/mgw_fsm.c
1 file changed, 9 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/08/31008/1
diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c
index b58d01f..d99a7b4 100644
--- a/src/osmo-hnbgw/mgw_fsm.c
+++ b/src/osmo-hnbgw/mgw_fsm.c
@@ -115,6 +115,7 @@
struct osmo_prim_hdr *ranap_rab_ass_resp_oph;
/* MGW context */
+ struct mgcp_client *mgcpc;
struct osmo_mgcpc_ep *mgcpc_ep;
struct osmo_mgcpc_ep_ci *mgcpc_ep_ci_hnb;
struct osmo_mgcpc_ep_ci *mgcpc_ep_ci_msc;
@@ -141,7 +142,6 @@
RANAP_RAB_AssignmentRequestIEs_t *ies;
const char *epname;
struct mgcp_conn_peer mgw_info;
- struct mgcp_client *mgcp_client;
int rc;
LOGPFSML(fi, LOGL_DEBUG, "RAB-AssignmentRequest received, creating HNB
side call-leg on MGW...\n");
@@ -173,16 +173,16 @@
mgw_info.codecs[0] = CODEC_IUFP;
mgw_info.codecs_len = 1;
- mgcp_client = mgcp_client_pool_get(map->hnb_ctx->gw->mgw_pool);
- if (!mgcp_client) {
+ mgw_fsm_priv->mgcpc = mgcp_client_pool_get(map->hnb_ctx->gw->mgw_pool);
+ if (!mgw_fsm_priv->mgcpc) {
LOGPFSML(fi, LOGL_ERROR,
"cannot ensure MGW endpoint -- no MGW configured,
check configuration!\n");
osmo_fsm_inst_state_chg(fi, MGW_ST_FAILURE, 0, 0);
return;
}
- epname = mgcp_client_rtpbridge_wildcard(mgcp_client);
+ epname = mgcp_client_rtpbridge_wildcard(mgw_fsm_priv->mgcpc);
mgw_fsm_priv->mgcpc_ep =
- osmo_mgcpc_ep_alloc(fi, MGW_EV_MGCP_TERM, mgcp_client,
mgw_fsm_T_defs, fi->id, "%s", epname);
+ osmo_mgcpc_ep_alloc(fi, MGW_EV_MGCP_TERM, mgw_fsm_priv->mgcpc,
mgw_fsm_T_defs, fi->id, "%s", epname);
mgw_fsm_priv->mgcpc_ep_ci_hnb =
osmo_mgcpc_ep_ci_add(mgw_fsm_priv->mgcpc_ep, "to-HNB");
osmo_mgcpc_ep_ci_request(mgw_fsm_priv->mgcpc_ep_ci_hnb, MGCP_VERB_CRCX,
&mgw_info, fi, MGW_EV_MGCP_OK,
@@ -496,13 +496,14 @@
static void mgw_fsm_allstate_action(struct osmo_fsm_inst *fi, uint32_t event,
void *data)
{
struct mgw_fsm_priv *mgw_fsm_priv = fi->priv;
- struct mgcp_client *mgcp_client;
switch (event) {
case MGW_EV_MGCP_
Change in osmo-upf[master]: manual: fix broken reference to netinst section
neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/30923 ) Change subject: manual: fix broken reference to netinst section .. manual: fix broken reference to netinst section Change-Id: Ifeee1e90eb2af0e5bff357a000189c047fda03fb --- M doc/manuals/chapters/netinst.adoc 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/doc/manuals/chapters/netinst.adoc b/doc/manuals/chapters/netinst.adoc index 3add2bb..d29c190 100644 --- a/doc/manuals/chapters/netinst.adoc +++ b/doc/manuals/chapters/netinst.adoc @@ -1,3 +1,4 @@ +[[netinst]] == Local GTP Addresses / Network Instance PFCP features optional Network Instance IEs, in which the CPF may tell the UPF which local network interface to use for -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/30923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ifeee1e90eb2af0e5bff357a000189c047fda03fb Gerrit-Change-Number: 30923 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-upf[master]: manual: fix broken reference to netinst section
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/30923 ) Change subject: manual: fix broken reference to netinst section .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/30923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ifeee1e90eb2af0e5bff357a000189c047fda03fb Gerrit-Change-Number: 30923 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 17 Jan 2023 20:55:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: upf: test Session Mod, test Network Instance
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30929 )
Change subject: upf: test Session Mod, test Network Instance
..
upf: test Session Mod, test Network Instance
Add tests and enhance the upf test suite to be closer to real world
usage:
- properly verify the F-TEIDs chosen by osmo-upf.
- add tests with two-step session creation, i.e. with a Session
Establishment followed by Session Modification indicating the remote
F-TEID to use on the core side, as is the usual case.
- Add module parameters for network instances to use in the test;
dynamically configure osmo-upf's "netinst" config via VTY.
- pass Network Instance in Create PDR, verify that osmo-upf returns the
matching GTP IP addresses in Created PDR.
Related: SYS#6192 SYS#5599
Change-Id: I440466f1cc9689391869ac2579a4497ef6008adb
---
M upf/CPF_ConnectionHandler.ttcn
M upf/UPF_Tests.ttcn
M upf/osmo-upf.cfg
3 files changed, 442 insertions(+), 33 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/upf/CPF_ConnectionHandler.ttcn b/upf/CPF_ConnectionHandler.ttcn
index 25f99b9..f983ff0 100644
--- a/upf/CPF_ConnectionHandler.ttcn
+++ b/upf/CPF_ConnectionHandler.ttcn
@@ -47,11 +47,6 @@
return int2oct(g_next_seid_state, 8);
}
-function f_next_local_teid() runs on CPF_ConnHdlr return OCT4 {
- g_next_local_teid_state := g_next_local_teid_state + 1;
- return int2oct(g_next_local_teid_state, 4);
-}
-
function f_next_remote_teid() runs on CPF_ConnHdlr return OCT4 {
g_next_remote_teid_state := g_next_remote_teid_state + 1;
return int2oct(g_next_remote_teid_state, 4);
diff --git a/upf/UPF_Tests.ttcn b/upf/UPF_Tests.ttcn
index b5c65d2..5db143a 100644
--- a/upf/UPF_Tests.ttcn
+++ b/upf/UPF_Tests.ttcn
@@ -42,6 +42,11 @@
charstring mp_pfcp_ip_upf := "127.0.0.1";
charstring mp_pfcp_ip_local := "127.0.0.2";
+ charstring mp_netinst_access_ip_1 := "127.0.1.1";
+ charstring mp_netinst_access_ip_2 := "127.0.1.2";
+ charstring mp_netinst_core_ip_1 := "127.0.2.1";
+ charstring mp_netinst_core_ip_2 := "127.0.2.2";
+
/* When testing with gtp mockup, actions will not show. */
boolean mp_verify_gtp_actions := false;
}
@@ -162,13 +167,60 @@
GTP_Action gtp
}
+/* _r and _l means 'remote' and 'local', from the perspective of the osmo-upf
process. */
+type record GTP_Action_tunend {
+ /* the PDR Id detecting packets from this side */
+ integer pdr_id,
+ /* IP packets arriving from this side are arriving on ip_l */
+ charstring ip_l,
+
+ /* the FAR Id forwarding packets to this side */
+ integer far_id
+}
+
+/* _r and _l means 'remote' and 'local', from the perspective of the osmo-upf
process. */
+type record GTP_Action_tun {
+ /* the PDR Id detecting packets from this side */
+ integer pdr_id,
+ /* GTP arriving from this side is arriving on gtp_ip_l with teid_l */
+ charstring gtp_ip_l,
+ OCT4 teid_l,
+
+ /* the FAR Id forwarding packets to this side */
+ integer far_id,
+ /* GTP going out to this side should be sent to gtp_ip_r with teid_r */
+ charstring gtp_ip_r,
+ OCT4 teid_r
+}
+
+type union GTP_Action_core {
+ /* For kind = "tunend", the local IP that the UE has on 'the internet'
*/
+ GTP_Action_tunend tunend,
+ /* For kind = "tunmap", the second GTP tunnel */
+ GTP_Action_tun tunmap
+}
+
+/* State of what GTP functionality osmo-upf should put in place, after a PFCP
request was ACKed by it.
+ * _r and _l means 'remote' and 'local', from the perspective of the osmo-upf
process.
+ *
+ * tunend:
+ * AccessUPF
Core
+ * GTP-r:127.0.0.2,0x1 <-FAR-1-- | 192.168.0.1 <-PDR-1--
+ * --PDR-2-> GTP-l:127.0.0.1,0x2 | --FAR-2->
(IP destination is in each GTP payload)
+ *
+ * tunmap:
+ * AccessUPF
Core
+ * GTP-r:127.0.0.2,0x1 <-FAR-1-- | 127.0.0.1,0x1
<-PDR-1--
+ * --PDR-2-> GTP-l:127.0.0.1,0x2 |
--FAR-2-> GTP-r:127.0.0.3,0x2
+ */
type record GTP_Action {
/* kind = ("tunend"|"tunmap") */
charstring kind,
- charstring gtp_access_ip,
- OCT4 teid_access_r,
- OCT4 teid_access_l,
- charstring core_ip,
+ /* The access side GTP tunnel. (The 'Access' side is always GTP.) */
+ GTP_Action_tun access,
+ /* The core side GTP tunnel (tunmap) or local IP (tunend) */
+ GTP_Action_core core,
+ /* Reference to the PFCP Session that created this GTP action: PFCP
session's F-SEID as seen from osmo-upf */
charstring pfcp_peer,
Change in osmo-ttcn3-hacks[master]: PFCP_Templates: add Session Modification templates
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30927 )
Change subject: PFCP_Templates: add Session Modification templates
..
PFCP_Templates: add Session Modification templates
Related: SYS#6192 SYS#5599
Change-Id: Id9ca1eff44a4759d25b31f34ededfcc6074517d5
---
M library/PFCP_Templates.ttcn
1 file changed, 76 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/library/PFCP_Templates.ttcn b/library/PFCP_Templates.ttcn
index 3f14a1f..4e58f32 100644
--- a/library/PFCP_Templates.ttcn
+++ b/library/PFCP_Templates.ttcn
@@ -371,13 +371,33 @@
}
}
+template (value) Update_Forwarding_Parameters
ts_PFCP_Update_Forwarding_Parameters(
+ e_PFCP_Dest_Iface dest_iface,
+ template (omit) Outer_Header_Creation outer_header_creation :=
omit
+ ) := {
+elementIdentifier := 11,
+lengthIndicator := 0,
+grouped_ie := {
+ destination_interface :=
ts_PFCP_Destination_Interface(dest_iface),
+ pdn_Instance := omit,
+ redirect_information := omit,
+ outer_header_creation := outer_header_creation,
+ transport_level_marking := omit,
+ forwarding_policy := omit,
+ header_enrichment := omit,
+ pfcpSMReq_flags := omit,
+ traffic_endpoint_id := omit
+ }
+}
+
template (value) FAR_ID ts_PFCP_FAR_ID(LIN4_BO_LAST far_id) := {
elementIdentifier := 108,
lengthIndicator := 0,
id_value := far_id
}
-template (value) Create_FAR ts_PFCP_Create_FAR(LIN4_BO_LAST far_id, template
(value) Apply_Action aa, Forwarding_Parameters fp) := {
+template (value) Create_FAR ts_PFCP_Create_FAR(LIN4_BO_LAST far_id, template
(value) Apply_Action aa,
+ template (omit)
Forwarding_Parameters fp) := {
elementIdentifier := 3,
lengthIndicator := 0,
grouped_ie := {
@@ -389,6 +409,19 @@
}
}
+template (value) Update_FAR ts_PFCP_Update_FAR(LIN4_BO_LAST far_id, template
(value) Apply_Action aa,
+ template (omit)
Update_Forwarding_Parameters fp) := {
+elementIdentifier := 10,
+lengthIndicator := 0,
+ grouped_ie := {
+ far_id := ts_PFCP_FAR_ID(far_id),
+ apply_action := aa,
+ forwarding_parameters := fp,
+ duplicating_parameters := omit,
+ bar_id := omit
+}
+}
+
template (value) PDR_ID ts_PFCP_PDR_ID(OCT2 pdr_id) := {
elementIdentifier := 56,
lengthIndicator := 0,
@@ -493,6 +526,40 @@
return t;
}
+function ts_PFCP_Session_Mod_Req(OCT8 up_seid, Update_FAR update_far)
+ return template (value) PDU_PFCP {
+ var template (value) PDU_PFCP t := ts_PDU_PFCP(seid := up_seid);
+ t.message_body := {
+ pfcp_session_modification_request := {
+ f_seid := omit,
+ remove_PDR_list := omit,
+ remove_FAR_list := omit,
+ remove_URR_list := omit,
+ remove_QER_list := omit,
+ remove_BAR := omit,
+ remove_traffic_endpoint := omit,
+ create_PDR_list := omit,
+ create_FAR_list := omit,
+ create_URR_list := omit,
+ create_QER_list := omit,
+ create_BAR := omit,
+ create_traffic_endpoint := omit,
+ update_PDR_list := omit,
+ update_FAR_list := { update_far },
+ update_URR_list := omit,
+ update_QER_list := omit,
+ update_BAR := omit,
+ update_traffic_endpoint := omit,
+ pfcpSMReq_flags := omit,
+ query_URR_list := omit,
+ node_list := omit,
+ up_inactivity_timer := omit,
+ querry_urr_reference := omit
+ }
+ };
+ return t;
+}
+
function tr_PFCP_Session_Mod_Req(template (present) OCT8 seid := ?) return
template (present) PDU_PFCP {
var template PDU_PFCP t := tr_PDU_PFCP(seid);
t.message_body := {
@@ -519,6 +586,14 @@
return t;
}
+function tr_PFCP_Session_Mod_Resp(template (present) OCT8 seid := ?) return
template (present) PDU_PFCP {
+ var template PDU_PFCP t := tr_PDU_PFCP(seid);
+ t.message_body := {
+ pfcp_session_modification_response := ?
+ };
+ return t;
+}
+
function ts_PFCP_Session_Del_Req(OCT8 seid) return template (value) PDU_PFCP {
Change in osmo-ttcn3-hacks[master]: PFCP: add support for Network Instance IE
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30928 )
Change subject: PFCP: add support for Network Instance IE
..
PFCP: add support for Network Instance IE
Related: SYS#6192
Change-Id: Iba8d423cd91e73ea40139a5b58c4e22f1a741dc1
---
M library/PFCP_Templates.ttcn
1 file changed, 24 insertions(+), 4 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/library/PFCP_Templates.ttcn b/library/PFCP_Templates.ttcn
index 4e58f32..3acc287 100644
--- a/library/PFCP_Templates.ttcn
+++ b/library/PFCP_Templates.ttcn
@@ -273,15 +273,34 @@
choose_id := choose_id
}
+/* Convert plain Network Instance name to encoded (length-byte + "name")
format.
+ * Works only for single-label names, i.e. no dots in the name. */
+private function f_netinst_str_to_qname(charstring name) return octetstring
+{
+ var octetstring qname := int2oct(lengthof(name), 1) & char2oct(name);
+ return qname;
+}
+
+function ts_PFCP_Network_Instance(charstring netinst_name) return
Network_Instance
+{
+ var Network_Instance netinst := {
+ elementIdentifier := 22,
+ lengthIndicator := 0,
+ pdn_instance := f_netinst_str_to_qname(netinst_name)
+ }
+ return netinst;
+}
+
template (value) PDI_IE ts_PFCP_PDI(e_PFCP_Src_Iface src_iface,
template (omit) F_TEID local_F_TEID := omit,
- template (omit) UE_IP_Address ue_addr_v4 :=
omit) := {
+ template (omit) UE_IP_Address ue_addr_v4 :=
omit,
+ template (omit) Network_Instance
network_instance := omit) := {
elementIdentifier := 2,
lengthIndicator := 0,
grouped_ie := {
source_interface := ts_PFCP_Src_Iface(src_iface),
local_F_TEID := local_F_TEID,
- pdn_instance := omit,
+ pdn_instance := network_instance,
ue_ip_address := ue_addr_v4,
traffic_endpoint_id := omit,
sdf_filter_list := omit,
@@ -355,13 +374,14 @@
template (value) Forwarding_Parameters ts_PFCP_Forwarding_Parameters(
e_PFCP_Dest_Iface dest_iface,
- template (omit) Outer_Header_Creation outer_header_creation :=
omit
+ template (omit) Outer_Header_Creation outer_header_creation :=
omit,
+ template (omit) Network_Instance network_instance := omit
) := {
elementIdentifier := 4,
lengthIndicator := 0,
grouped_ie := {
destination_interface :=
ts_PFCP_Destination_Interface(dest_iface),
- pdn_Instance := omit,
+ pdn_Instance := network_instance,
redirect_information := omit,
outer_header_creation := outer_header_creation,
transport_level_marking := omit,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30928
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: Iba8d423cd91e73ea40139a5b58c4e22f1a741dc1
Gerrit-Change-Number: 30928
Gerrit-PatchSet: 3
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: upf: rename tc_session_est to tc_session_est_tunend
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30924 )
Change subject: upf: rename tc_session_est to tc_session_est_tunend
..
upf: rename tc_session_est to tc_session_est_tunend
The other use case, tunmap, needs some space next to tunend, too. tunmap
tests will be added soon.
Related: SYS#6192 SYS#5599
Change-Id: If4a4534aa237e6ff1acb6d50e3738dd4dd6e9dfa
---
M upf/UPF_Tests.ttcn
1 file changed, 11 insertions(+), 11 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/upf/UPF_Tests.ttcn b/upf/UPF_Tests.ttcn
index 3dd469b..8382943 100644
--- a/upf/UPF_Tests.ttcn
+++ b/upf/UPF_Tests.ttcn
@@ -650,7 +650,7 @@
log("established PFCP session: ", s);
}
-private function f_create_PFCP_session() runs on CPF_ConnHdlr return
PFCP_session
+private function f_create_PFCP_session_tunend() runs on CPF_ConnHdlr return
PFCP_session
{
var PFCP_session s := {
up_seid := -,
@@ -668,10 +668,10 @@
return s;
}
-/* Do a PFCP Session Establishment with default values (see
f_create_PFCP_session()) */
-private function f_session_est_default() runs on CPF_ConnHdlr return
PFCP_session
+/* Do a PFCP Session Establishment with default values (see
f_create_PFCP_session_tunend()) */
+private function f_session_est_tunend() runs on CPF_ConnHdlr return
PFCP_session
{
- var PFCP_session s := f_create_PFCP_session();
+ var PFCP_session s := f_create_PFCP_session_tunend();
f_session_est(s, f_ruleset_tunend(s.gtp));
return s;
}
@@ -711,9 +711,9 @@
}
/* Verify PFCP Session Establishment and Deletion */
-private function f_tc_session_est(charstring id) runs on CPF_ConnHdlr {
+private function f_tc_session_est_tunend(charstring id) runs on CPF_ConnHdlr {
f_assoc_setup();
- var PFCP_session s := f_session_est_default();
+ var PFCP_session s := f_session_est_tunend();
f_sleep(1.0);
f_vty_expect_session_active(UPFVTY, s);
f_session_del(s);
@@ -722,11 +722,11 @@
f_assoc_release();
setverdict(pass);
}
-testcase TC_session_est() runs on test_CT {
+testcase TC_session_est_tunend() runs on test_CT {
var CPF_ConnHdlr vc_conn;
f_init(guard_timeout := 15.0);
- vc_conn := f_start_handler(refers(f_tc_session_est));
+ vc_conn := f_start_handler(refers(f_tc_session_est_tunend));
vc_conn.done;
f_shutdown_helper();
}
@@ -734,7 +734,7 @@
/* Verify that releasing a PFCP Association also releases all its sessions and
GTP actions. */
private function f_tc_session_term_by_assoc_rel(charstring id) runs on
CPF_ConnHdlr {
f_assoc_setup();
- var PFCP_session s := f_session_est_default();
+ var PFCP_session s := f_session_est_tunend();
f_sleep(1.0);
f_vty_expect_session_active(UPFVTY, s);
f_assoc_release();
@@ -754,7 +754,7 @@
/* Verify that PFCP Sessions with a src-interface other than ACCESS or CORE
are ACKed by osmo-upf but have no effect. */
private function f_tc_session_est_noop(charstring id) runs on CPF_ConnHdlr {
f_assoc_setup();
- var PFCP_session s := f_create_PFCP_session();
+ var PFCP_session s := f_create_PFCP_session_tunend();
f_session_est(s, f_ruleset_noop());
f_sleep(1.0);
@@ -778,7 +778,7 @@
control {
execute( TC_assoc_node_id_v4() );
execute( TC_assoc_node_id_fqdn() );
- execute( TC_session_est() );
+ execute( TC_session_est_tunend() );
execute( TC_session_term_by_assoc_rel() );
execute( TC_session_est_noop() );
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30924
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: If4a4534aa237e6ff1acb6d50e3738dd4dd6e9dfa
Gerrit-Change-Number: 30924
Gerrit-PatchSet: 2
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: upf/PFCP: do not imply f_inet_addr()
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30926 )
Change subject: upf/PFCP: do not imply f_inet_addr()
..
upf/PFCP: do not imply f_inet_addr()
PFCP_Templates.ttcn is not the place to do the conversion between string
and OCT4.
When I wanted to use an OCT4 address in some ts_PFCP_* template, it
dawned on me that it is stupid to convert the OCT4 to a string, just so
that the ts_PFCP_* template converts it back to OCT4.
Related: SYS#6192 SYS#5599
Change-Id: Ib068831787f4256f70a2189a5f36ca1ea1f40c9e
---
M hnbgw/HNBGW_Tests.ttcn
M library/PFCP_Templates.ttcn
M upf/UPF_Tests.ttcn
3 files changed, 24 insertions(+), 19 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
neels: Looks good to me, approved
dexter: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn
index d77a18f..d76ff9d 100644
--- a/hnbgw/HNBGW_Tests.ttcn
+++ b/hnbgw/HNBGW_Tests.ttcn
@@ -18,6 +18,7 @@
import from GSM_Types all;
import from Osmocom_Types all;
import from IPL4asp_Types all;
+import from Native_Functions all;
import from Osmocom_CTRL_Functions all;
import from Osmocom_CTRL_Types all;
@@ -1314,7 +1315,7 @@
/* Acting as UPF, invent a new PFCP SEID to send to HNBGW. Respond to
the Session Establishment.
* The PFCP response must have the same sequence_number as the request.
*/
- var F_SEID up_f_seid := valueof(ts_PFCP_F_SEID_ipv4("127.0.0.1",
''O));
+ var F_SEID up_f_seid :=
valueof(ts_PFCP_F_SEID_ipv4(f_inet_addr("127.0.0.1"), ''O));
var template PDU_PFCP r := ts_PFCP_Session_Est_Resp(m.sequence_number,
upf_node_id, hnbgw_f_seid.seid);
r.message_body.pfcp_session_establishment_response := {
offending_ie := omit,
@@ -1322,10 +1323,10 @@
created_PDR_list := {
ts_PFCP_Created_PDR(pdr_id :=
serq.create_PDR_list[0].grouped_ie.pdr_id,
local_F_TEID :=
ts_PFCP_F_TEID_ipv4(gtp_pars.core.local.teid,
-
gtp_pars.core.local.addr)),
+
f_inet_addr(gtp_pars.core.local.addr))),
ts_PFCP_Created_PDR(pdr_id :=
serq.create_PDR_list[1].grouped_ie.pdr_id,
local_F_TEID :=
ts_PFCP_F_TEID_ipv4(gtp_pars.access.local.teid,
-
gtp_pars.access.local.addr))
+
f_inet_addr(gtp_pars.access.local.addr)))
},
load_control_information := omit,
overload_control_information := omit,
diff --git a/library/PFCP_Templates.ttcn b/library/PFCP_Templates.ttcn
index d0e8b67..3f14a1f 100644
--- a/library/PFCP_Templates.ttcn
+++ b/library/PFCP_Templates.ttcn
@@ -11,7 +11,6 @@
module PFCP_Templates {
import from General_Types all;
-import from Native_Functions all;
import from Osmocom_Types all;
import from PFCP_Types all;
@@ -209,14 +208,14 @@
return t;
};
-template (value) F_SEID ts_PFCP_F_SEID_ipv4(charstring addr_v4, OCT8 seid) := {
+template (value) F_SEID ts_PFCP_F_SEID_ipv4(OCT4 addr_v4, OCT8 seid) := {
elementIdentifier := 57,
lengthIndicator := 0,
v6 := '0'B,
v4 := '1'B,
spare := '00'B,
seid := seid,
-ipv4_address := f_inet_addr(addr_v4),
+ipv4_address := addr_v4,
ipv6_address := omit
}
@@ -235,18 +234,18 @@
spare := ''B
}
-template (value) UE_IP_Address ts_PFCP_UE_IP_Address_v4(charstring addr_v4,
boolean is_destination := true) := {
+template (value) UE_IP_Address ts_PFCP_UE_IP_Address_v4(OCT4 addr_v4, boolean
is_destination := true) := {
elementIdentifier := 93,
lengthIndicator := 0,
v6 := '0'B,
v4 := '1'B,
sd := bool2bit(is_destination),
spare := '0'B,
-ipv4_address := f_inet_addr(addr_v4),
+ipv4_address := addr_v4,
ipv6_address := omit
}
-template (value) F_TEID ts_PFCP_F_TEID_ipv4(OCT4 teid, charstring addr_v4) := {
+template (value) F_TEID ts_PFCP_F_TEID_ipv4(OCT4 teid, OCT4 addr_v4) := {
elementIdentifier := 21,
lengthIndicator := 0,
v4 := '1'B,
@@ -255,7 +254,7 @@
chid := '0'B,
spare := ''B,
teid := teid,
-ipv4_address := f_inet_addr(addr_v4),
+ipv4_address := addr_v4,
ipv6_address := omit,
choose_id := omit
}
@@ -325,13 +324,13 @@
spare := ''B
}
-template (value)
Change in osmo-ttcn3-hacks[master]: upf: tweak f_ruleset_add_GTP_decaps
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30925 )
Change subject: upf: tweak f_ruleset_add_GTP_decaps
..
upf: tweak f_ruleset_add_GTP_decaps
Improve function doc.
Always use F-TEID = CHOOSE.
Related: SYS#6192 SYS#5599
Change-Id: Ic88075001c1a7c3bd724ff8d618cef1dbd7423b7
---
M upf/UPF_Tests.ttcn
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/upf/UPF_Tests.ttcn b/upf/UPF_Tests.ttcn
index 8382943..796dc16 100644
--- a/upf/UPF_Tests.ttcn
+++ b/upf/UPF_Tests.ttcn
@@ -505,9 +505,10 @@
Create_FAR_list far
};
-/* Add to r a rule set that does GTP decapsulation (half of
encapsulation/decapsulation) */
-private function f_ruleset_add_GTP_decaps(inout PFCP_Ruleset r,
- template F_TEID local_f_teid := omit)
{
+/* Add to r a rule set that does GTP decapsulation (half of
encapsulation/decapsulation):
+ * Receive GTP on src_iface = ACCESS by a local F-TEID to be chosen by
osmo-upf.
+ * Dispatch GTP payload as plain IP on dest_iface = CORE. */
+private function f_ruleset_add_GTP_decaps(inout PFCP_Ruleset r) {
var integer pdr_id := lengthof(r.pdr) + 1;
var integer far_id := lengthof(r.far) + 1;
@@ -517,7 +518,7 @@
pdr_id,
ts_PFCP_PDI(
ACCESS,
- local_F_TEID := local_f_teid),
+ local_F_TEID := ts_PFCP_F_TEID_choose_v4()),
ts_PFCP_Outer_Header_Removal(GTP_U_UDP_IPV4),
far_id
)
@@ -633,7 +634,7 @@
private function f_ruleset_tunend(GTP_Action gtp) return PFCP_Ruleset
{
var PFCP_Ruleset rules := { {}, {} };
- f_ruleset_add_GTP_decaps(rules, ts_PFCP_F_TEID_choose_v4());
+ f_ruleset_add_GTP_decaps(rules);
f_ruleset_add_GTP_encaps(rules, gtp.core_ip, gtp.teid_access_r,
gtp.gtp_access_ip);
return rules;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30925
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: Ic88075001c1a7c3bd724ff8d618cef1dbd7423b7
Gerrit-Change-Number: 30925
Gerrit-PatchSet: 2
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmocom-bb[master]: layer23: Introduce tun.{c,h}
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30994 )
Change subject: layer23: Introduce tun.{c,h}
..
Patch Set 5: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30994
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Id8611b720ada17a3c602872fe095bb91eeb17bcd
Gerrit-Change-Number: 30994
Gerrit-PatchSet: 5
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Tue, 17 Jan 2023 19:22:15 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Introduce tun.{c,h}
Attention is currently required from: pespin.
pespin has removed a vote from this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30994 )
Change subject: layer23: Introduce tun.{c,h}
..
Removed Verified-1 by Jenkins Builder (102)
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30994
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Id8611b720ada17a3c602872fe095bb91eeb17bcd
Gerrit-Change-Number: 30994
Gerrit-PatchSet: 5
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-MessageType: deleteVote
Change in osmocom-bb[master]: layer23: Introduce netdev.{c,h}
Attention is currently required from: laforge, pespin.
pespin has removed a vote from this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30993 )
Change subject: layer23: Introduce netdev.{c,h}
..
Removed Verified-1 by Jenkins Builder (102)
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30993
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I6085dc6861687bd4e9c32e86221c0375ad95ba22
Gerrit-Change-Number: 30993
Gerrit-PatchSet: 5
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: laforge
Gerrit-Attention: pespin
Gerrit-MessageType: deleteVote
Change in osmocom-bb[master]: layer23: Introduce netdev.{c,h}
Attention is currently required from: laforge.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30993 )
Change subject: layer23: Introduce netdev.{c,h}
..
Patch Set 5: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30993
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I6085dc6861687bd4e9c32e86221c0375ad95ba22
Gerrit-Change-Number: 30993
Gerrit-PatchSet: 5
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: laforge
Gerrit-Comment-Date: Tue, 17 Jan 2023 19:22:09 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Use shift operand to define bitmask values
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/31005 )
Change subject: layer23: Use shift operand to define bitmask values
..
layer23: Use shift operand to define bitmask values
Change-Id: I22e2f543c077a4df4623c5e3bd44f8f068596baf
---
M src/host/layer23/include/osmocom/bb/common/l23_app.h
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
diff --git a/src/host/layer23/include/osmocom/bb/common/l23_app.h
b/src/host/layer23/include/osmocom/bb/common/l23_app.h
index 3c07f70..46c3f44 100644
--- a/src/host/layer23/include/osmocom/bb/common/l23_app.h
+++ b/src/host/layer23/include/osmocom/bb/common/l23_app.h
@@ -6,11 +6,11 @@
/* Options supported by the l23 app */
enum {
- L23_OPT_SAP = 1,
- L23_OPT_ARFCN = 2,
- L23_OPT_TAP = 4,
- L23_OPT_VTY = 8,
- L23_OPT_DBG = 16,
+ L23_OPT_SAP = 1 << 0,
+ L23_OPT_ARFCN = 1 << 1,
+ L23_OPT_TAP = 1 << 2,
+ L23_OPT_VTY = 1 << 3,
+ L23_OPT_DBG = 1 << 4,
};
extern void *l23_ctx;
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31005
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I22e2f543c077a4df4623c5e3bd44f8f068596baf
Gerrit-Change-Number: 31005
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmocom-bb[master]: layer23: Introduce tun.{c,h}
Attention is currently required from: pespin.
Jenkins Builder has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30994 )
Change subject: layer23: Introduce tun.{c,h}
..
Patch Set 5:
(19 comments)
File src/host/layer23/include/osmocom/bb/common/tun.h:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/4a8afc1f_b93cc2fb
PS5, Line 39: int (*cb_ind) (struct tun_t * tun, void *pack, unsigned len);
"foo * bar" should be "foo *bar"
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/775cd2d5_6d44e762
PS5, Line 39: int (*cb_ind) (struct tun_t * tun, void *pack, unsigned len);
Unnecessary space before function pointer arguments
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/71c7215a_b42beb30
PS5, Line 53: int (*cb_ind) (struct tun_t * tun, void *pack,
"foo * bar" should be "foo *bar"
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/92199383_9fa808c1
PS5, Line 53: int (*cb_ind) (struct tun_t * tun, void *pack,
Unnecessary space before function pointer arguments
File src/host/layer23/src/common/tun.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/a6231ea6_20e15f84
PS5, Line 48: #elif defined (__FreeBSD__)
space prohibited between function name and open parenthesis '('
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/b3de3dea_39df748b
PS5, Line 53: #elif defined (__APPLE__)
space prohibited between function name and open parenthesis '('
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/ed5fcd65_7ba99531
PS5, Line 65: #define SYS_ERR(sub, pri, en, fmt, args...)
\
Macros starting with if should be enclosed by a do - while loop to avoid
possible if/else logic defects
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/d0672de6_06b7e72e
PS5, Line 104: #if defined(__FreeBSD__) || defined (__APPLE__)
space prohibited between function name and open parenthesis '('
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/f5b25576_d09e507d
PS5, Line 123: #if defined(__FreeBSD__) || defined (__APPLE__)
space prohibited between function name and open parenthesis '('
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/26a9409c_7e36fdf1
PS5, Line 186: #elif defined(__FreeBSD__) || defined (__APPLE__)
space prohibited between function name and open parenthesis '('
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/471bf806_9355b96d
PS5, Line 214: strcpy(ifr.ifr_name, dev_name);
Instead of strncpy()/strcpy(), use osmo_strlcpy() or OSMO_STRLCPY_ARRAY()
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/6e9eb573_37dc9c7b
PS5, Line 221: strncpy((*tun)->devname, ifr.ifr_name, IFNAMSIZ);
Instead of strncpy()/strcpy(), use osmo_strlcpy() or OSMO_STRLCPY_ARRAY()
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/15f4d77d_fd68634f
PS5, Line 229: } else {
else is not generally useful after a break or return
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/b10b6205_a672c748
PS5, Line 230: strncpy((*tun)->devname, dev_name, IFNAMSIZ);
Instead of strncpy()/strcpy(), use osmo_strlcpy() or OSMO_STRLCPY_ARRAY()
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/4e9f57a6_07a540c4
PS5, Line 243: #elif defined(__FreeBSD__) || defined (__APPLE__)
space prohibited between function name and open parenthesis '('
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/d1d4e1e9_601e7a14
PS5, Line 273: strncpy(areq.ifra_name, (*tun)->devname, IFNAMSIZ);
Instead of strncpy()/strcpy(), use osmo_strlcpy() or OSMO_STRLCPY_ARRAY()
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2822):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/3b156a88_b929cdb2
PS5, Line 283: while (ioctl(fd, SIOCDIFADDR, (void *)&areq) != -1) ;
space prohibited before semicolon
Robot Comment from checkpatch (run ID jenkins-
Change in osmocom-bb[master]: modem: Initial integration of libosmo-gprs-{llc,sndcp}
Jenkins Builder has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/31007 )
Change subject: modem: Initial integration of libosmo-gprs-{llc,sndcp}
..
Patch Set 1:
(1 comment)
File src/host/layer23/src/modem/sndcp.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2818):
https://gerrit.osmocom.org/c/osmocom-bb/+/31007/comment/41db37a8_945be893
PS1, Line 196: }
adding a line without newline at end of file
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31007
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I820328009ccdd1f8112aeb163efa064ec1465d2a
Gerrit-Change-Number: 31007
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-CC: Jenkins Builder
Gerrit-Comment-Date: Tue, 17 Jan 2023 19:18:40 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Introduce netdev.{c,h}
Attention is currently required from: laforge.
Jenkins Builder has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30993 )
Change subject: layer23: Introduce netdev.{c,h}
..
Patch Set 5:
(42 comments)
File src/host/layer23/include/osmocom/bb/common/netdev.h:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/a5dd17f5_d153a58d
PS5, Line 33: {
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/c75e4485_212c1a94
PS5, Line 33: {
open brace '{' following struct go on the same line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/d67c0539_72bba0dc
PS5, Line 35: unsigned int ihl:4;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/de26b202_8c562839
PS5, Line 36: unsigned int version:4;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/1618f8e3_c652898f
PS5, Line 38: unsigned int version:4;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/977e63f6_881052e3
PS5, Line 39: unsigned int ihl:4;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/266ab51b_84cf7837
PS5, Line 43: u_int8_t tos;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/03a8713e_083f24df
PS5, Line 44: u_int16_t tot_len;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/c31b7302_94df4c8c
PS5, Line 45: u_int16_t id;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/bd93e3fe_dda3b5eb
PS5, Line 46: u_int16_t frag_off;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/bea2e2de_646a4495
PS5, Line 47: u_int8_t ttl;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/663f5f82_d98d66f7
PS5, Line 48: u_int8_t protocol;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/74dd9f87_9f7e275f
PS5, Line 49: u_int16_t check;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/a546a4a7_605fda5f
PS5, Line 50: u_int32_t saddr;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/9e7647ae_f32531f3
PS5, Line 51: u_int32_t daddr;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/e5a5b9ff_4962009c
PS5, Line 53: };
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/f5df8216_d9151cd9
PS5, Line 57: struct osmo_sockaddr addr;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/dd9f506f_76aa85dd
PS5, Line 58: uint8_t prefixlen;
please, no spaces at the start of a line
File src/host/layer23/src/common/netdev.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/f93fe8ff_eb02a58f
PS5, Line 45: #elif defined (__FreeBSD__)
space prohibited between function name and open parenthesis '('
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/a484a9e8_2543f66e
PS5, Line 49: #elif defined (__APPLE__)
space prohibited between function name and open parenthesis '('
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2815):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/0f6b3aa3_c0551ad1
PS5, Line 61: #define SYS_ERR(sub, pri, en, fmt, args...)
Change in osmocom-bb[master]: layer23: Initial integration of tun device
Attention is currently required from: pespin. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30996 ) Change subject: layer23: Initial integration of tun device .. Patch Set 5: (1 comment) File src/host/layer23/src/modem/app_modem.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2816): https://gerrit.osmocom.org/c/osmocom-bb/+/30996/comment/1595b3f5_6b234642 PS5, Line 102: iph->version == 4 ? '4' : '6', osmo_sockaddr_ntop(&dst, addrstr), len); code indent should use tabs where possible -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I86cac406843157aa2e51727cf8ccac9804d7961d Gerrit-Change-Number: 30996 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 17 Jan 2023 19:18:35 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmocom-bb[master]: modem: Initial integration of libosmo-gprs-{llc,sndcp}
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/31007 )
Change subject: modem: Initial integration of libosmo-gprs-{llc,sndcp}
..
modem: Initial integration of libosmo-gprs-{llc,sndcp}
Change-Id: I820328009ccdd1f8112aeb163efa064ec1465d2a
---
M src/host/layer23/include/osmocom/bb/common/logging.h
M src/host/layer23/include/osmocom/bb/common/settings.h
M src/host/layer23/include/osmocom/bb/modem/Makefile.am
A src/host/layer23/include/osmocom/bb/modem/llc.h
A src/host/layer23/include/osmocom/bb/modem/sndcp.h
M src/host/layer23/src/common/logging.c
M src/host/layer23/src/modem/Makefile.am
M src/host/layer23/src/modem/app_modem.c
A src/host/layer23/src/modem/llc.c
A src/host/layer23/src/modem/sndcp.c
10 files changed, 436 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/07/31007/1
diff --git a/src/host/layer23/include/osmocom/bb/common/logging.h
b/src/host/layer23/include/osmocom/bb/common/logging.h
index 5259f35..912b7d4 100644
--- a/src/host/layer23/include/osmocom/bb/common/logging.h
+++ b/src/host/layer23/include/osmocom/bb/common/logging.h
@@ -27,6 +27,8 @@
DLUA,
DGAPK,
DTUN,
+ DLLC,
+ DSNDCP,
};
extern const struct log_info log_info;
diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h
b/src/host/layer23/include/osmocom/bb/common/settings.h
index 523ad8e..5e04894 100644
--- a/src/host/layer23/include/osmocom/bb/common/settings.h
+++ b/src/host/layer23/include/osmocom/bb/common/settings.h
@@ -183,6 +183,22 @@
struct gprs_settings {
struct llist_head apn_list;
+
+ /* RFC1144 TCP/IP header compression */
+ struct {
+ int active;
+ int passive;
+ int s01;
+ } pcomp_rfc1144;
+
+ /* V.42vis data compression */
+ struct {
+ int active;
+ int passive;
+ int p0;
+ int p1;
+ int p2;
+ } dcomp_v42bis;
};
int gprs_settings_init(struct osmocom_ms *ms);
diff --git a/src/host/layer23/include/osmocom/bb/modem/Makefile.am
b/src/host/layer23/include/osmocom/bb/modem/Makefile.am
index 309a514..4a91c39 100644
--- a/src/host/layer23/include/osmocom/bb/modem/Makefile.am
+++ b/src/host/layer23/include/osmocom/bb/modem/Makefile.am
@@ -1,4 +1,6 @@
noinst_HEADERS = \
modem.h \
+llc.h \
+sndcp.h \
vty.h \
$(NULL)
diff --git a/src/host/layer23/include/osmocom/bb/modem/llc.h
b/src/host/layer23/include/osmocom/bb/modem/llc.h
new file mode 100644
index 000..5fe5d49
--- /dev/null
+++ b/src/host/layer23/include/osmocom/bb/modem/llc.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include
+
+struct osmocom_ms;
+
+int modem_llc_init(struct osmocom_ms *ms, const char *cipher_plugin_path);
+
diff --git a/src/host/layer23/include/osmocom/bb/modem/sndcp.h
b/src/host/layer23/include/osmocom/bb/modem/sndcp.h
new file mode 100644
index 000..b2e6f0f
--- /dev/null
+++ b/src/host/layer23/include/osmocom/bb/modem/sndcp.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include
+
+struct osmocom_ms;
+struct osmobb_apn;
+
+int modem_sndcp_init(struct osmocom_ms *ms);
+int modem_sndcp_sn_xid_req(struct osmobb_apn *apn);
+int modem_sndcp_sn_unitdata_req(struct osmobb_apn *apn, uint8_t *npdu, size_t
npdu_len);
diff --git a/src/host/layer23/src/common/logging.c
b/src/host/layer23/src/common/logging.c
index 34c171f..66dc416 100644
--- a/src/host/layer23/src/common/logging.c
+++ b/src/host/layer23/src/common/logging.c
@@ -153,6 +153,18 @@
.color = "\033[0;37m",
.enabled = 1, .loglevel = LOGL_NOTICE,
},
+ [DLLC] = {
+ .name = "DLLC",
+ .description = "GPRS Logical Link Control Protocol (LLC)",
+ .color = "\033[0;38m",
+ .enabled = 1, .loglevel = LOGL_NOTICE,
+ },
+ [DSNDCP] = {
+ .name = "DSNDCP",
+ .description = "GPRS Sub-Network Dependent Control Protocol
(SNDCP)",
+ .color = "\033[0;39m",
+ .enabled = 1, .loglevel = LOGL_NOTICE,
+ },
};
const struct log_info log_info = {
diff --git a/src/host/layer23/src/modem/Makefile.am
b/src/host/layer23/src/modem/Makefile.am
index 4f369ad..e13ea2d 100644
--- a/src/host/layer23/src/modem/Makefile.am
+++ b/src/host/layer23/src/modem/Makefile.am
@@ -18,6 +18,8 @@
modem_SOURCES = \
$(top_srcdir)/src/common/main.c \
app_modem.c \
+ llc.c \
+ sndcp.c \
vty.c \
$(NULL)
modem_LDADD = \
diff --git a/src/host/layer23/src/modem/app_modem.c
b/src/host/layer23/src/modem/app_modem.c
index 7f563a1..780ad61 100644
--- a/src/host/layer23/src/modem/app_modem.c
+++ b/src/host/layer23/src/modem/app_modem.c
@@ -47,6 +47,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -101,8
Change in osmocom-bb[master]: layer23: Introduce APN VTY node
Attention is currently required from: laforge, fixeria. Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/30992 to look at the new patch set (#5). Change subject: layer23: Introduce APN VTY node .. layer23: Introduce APN VTY node Change-Id: I7b4eaa0de428b418bb1d89bd544694e89beb3e6e --- M doc/examples/modem/modem.cfg M src/host/layer23/include/osmocom/bb/common/Makefile.am A src/host/layer23/include/osmocom/bb/common/apn.h M src/host/layer23/include/osmocom/bb/common/ms.h M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/include/osmocom/bb/modem/vty.h M src/host/layer23/src/common/Makefile.am A src/host/layer23/src/common/apn.c M src/host/layer23/src/common/ms.c M src/host/layer23/src/common/settings.c M src/host/layer23/src/modem/app_modem.c M src/host/layer23/src/modem/vty.c 12 files changed, 365 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/92/30992/5 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7b4eaa0de428b418bb1d89bd544694e89beb3e6e Gerrit-Change-Number: 30992 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
Change in osmocom-bb[master]: layer23: Initial integration of tun device
Attention is currently required from: pespin. Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/30996 to look at the new patch set (#5). Change subject: layer23: Initial integration of tun device .. layer23: Initial integration of tun device Change-Id: I86cac406843157aa2e51727cf8ccac9804d7961d --- M src/host/layer23/include/osmocom/bb/common/apn.h M src/host/layer23/include/osmocom/bb/common/l23_app.h M src/host/layer23/src/common/apn.c M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/modem/app_modem.c 5 files changed, 109 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/96/30996/5 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I86cac406843157aa2e51727cf8ccac9804d7961d Gerrit-Change-Number: 30996 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
Change in osmocom-bb[master]: layer23: main: Log line about using config file before parsing it
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/31006 )
Change subject: layer23: main: Log line about using config file before parsing
it
..
layer23: main: Log line about using config file before parsing it
Change-Id: I66b5b18887b8deb37c3784fec90644470498d7b5
---
M src/host/layer23/src/common/main.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/06/31006/1
diff --git a/src/host/layer23/src/common/main.c
b/src/host/layer23/src/common/main.c
index 2cdf5d4..82bbc60 100644
--- a/src/host/layer23/src/common/main.c
+++ b/src/host/layer23/src/common/main.c
@@ -231,6 +231,7 @@
if (app->vty_init)
app->vty_init();
if (config_file) {
+ LOGP(DLGLOBAL, LOGL_INFO, "Using configuration from '%s'\n",
config_file);
l23_vty_reading = true;
rc = vty_read_config_file(config_file, NULL);
l23_vty_reading = false;
@@ -239,7 +240,6 @@
"Failed to parse the configuration file
'%s'\n", config_file);
return rc;
}
- LOGP(DLGLOBAL, LOGL_INFO, "Using configuration from '%s'\n",
config_file);
}
rc = telnet_init_default(l23_ctx, NULL, OSMO_VTY_PORT_BB);
if (rc < 0) {
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31006
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I66b5b18887b8deb37c3784fec90644470498d7b5
Gerrit-Change-Number: 31006
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmocom-bb[master]: layer23: Introduce APN VTY node
Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30992 ) Change subject: layer23: Introduce APN VTY node .. Patch Set 4: (1 comment) Patchset: PS4: > lookes more like a WIP patch to me? It's definetly impossible to submit a full working patch with the entire thing, since there are so many things which are still missing. Since several people are working on different areas I'm simply pushing a set of patches adding the first stones on different places which later con can be extended and glued together. I'm basically filling holes. Having a way to configure APNs is one those. Other fields will come in the future, but once this is merged it becomes easier to add new stuff for people working on other stuff too. So yes, don't take these patches as fully working implementations. Some interfaces will change, some implementations will change. But we need to start with something. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7b4eaa0de428b418bb1d89bd544694e89beb3e6e Gerrit-Change-Number: 30992 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 17 Jan 2023 18:47:11 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Introduce netdev.{c,h}
Attention is currently required from: laforge.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30993 )
Change subject: layer23: Introduce netdev.{c,h}
..
Patch Set 4:
(1 comment)
Patchset:
PS4:
> I'm not sure if we really want to import all that legacy code from osmo-ggsn,
> which back then suppor […]
We can later on move that to libosmocore or libosmonetif if we want, but for
now I'd like to keep it here.
Regarding dropping non-linux stuff, I'm fine dropping it but I'd prefer doing
that as a followup patch since in this one I'm mostly importing stuff as much
as is as it can be.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30993
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I6085dc6861687bd4e9c32e86221c0375ad95ba22
Gerrit-Change-Number: 30993
Gerrit-PatchSet: 4
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: laforge
Gerrit-Comment-Date: Tue, 17 Jan 2023 18:21:14 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge
Gerrit-MessageType: comment
Change in osmocom-bb[master]: Depend on libosmo-gprs-{llc,sndcp}
Attention is currently required from: pespin.
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30999 )
Change subject: Depend on libosmo-gprs-{llc,sndcp}
..
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30999
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I80811f73b798151257107bc94aedabe71fee0300
Gerrit-Change-Number: 30999
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Attention: pespin
Gerrit-Comment-Date: Tue, 17 Jan 2023 18:19:20 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Introduce tun.{c,h}
Attention is currently required from: pespin.
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30994 )
Change subject: layer23: Introduce tun.{c,h}
..
Patch Set 4: Code-Review-1
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30994
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Id8611b720ada17a3c602872fe095bb91eeb17bcd
Gerrit-Change-Number: 30994
Gerrit-PatchSet: 4
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-Comment-Date: Tue, 17 Jan 2023 18:18:56 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Introduce tun.{c,h}
Attention is currently required from: pespin.
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30994 )
Change subject: layer23: Introduce tun.{c,h}
..
Patch Set 4:
(1 comment)
Patchset:
PS4:
I'm not sure if we really want to import all that legacy code from osmo-ggsn,
which back then supported a variety of operating systems. At the very least
all the untested/unmaintained non-linux stuff should be removed. And
all-in-all it might be a candidate for libosmocore?
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30994
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Id8611b720ada17a3c602872fe095bb91eeb17bcd
Gerrit-Change-Number: 30994
Gerrit-PatchSet: 4
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-CC: laforge
Gerrit-Attention: pespin
Gerrit-Comment-Date: Tue, 17 Jan 2023 18:18:51 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Introduce APN VTY node
Attention is currently required from: laforge, fixeria.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30992 )
Change subject: layer23: Introduce APN VTY node
..
Patch Set 4:
(1 comment)
File src/host/layer23/include/osmocom/bb/common/apn.h:
https://gerrit.osmocom.org/c/osmocom-bb/+/30992/comment/c78e284c_9be2bd78
PS4, Line 29: struct apn_name {
: struct llist_head list;
: char *name;
: };
> this doesn't seem to be used? I also don't understand how it should/might be.
That's a leftover indeed.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30992
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I7b4eaa0de428b418bb1d89bd544694e89beb3e6e
Gerrit-Change-Number: 30992
Gerrit-PatchSet: 4
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-CC: fixeria
Gerrit-CC: laforge
Gerrit-Attention: laforge
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Tue, 17 Jan 2023 18:18:30 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge
Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Introduce netdev.{c,h}
Attention is currently required from: pespin.
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30993 )
Change subject: layer23: Introduce netdev.{c,h}
..
Patch Set 4: Code-Review-1
(1 comment)
Patchset:
PS4:
I'm not sure if we really want to import all that legacy code from osmo-ggsn,
which back then supported a variety of operating systems. At the very least
all the untested/unmaintained non-linux stuff should be removed. And
all-in-all it might be a candidate for libosmocore?
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30993
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I6085dc6861687bd4e9c32e86221c0375ad95ba22
Gerrit-Change-Number: 30993
Gerrit-PatchSet: 4
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-Comment-Date: Tue, 17 Jan 2023 18:18:11 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Introduce APN VTY node
Attention is currently required from: pespin, fixeria.
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30992 )
Change subject: layer23: Introduce APN VTY node
..
Patch Set 4:
(2 comments)
Patchset:
PS4:
lookes more like a WIP patch to me?
File src/host/layer23/include/osmocom/bb/common/apn.h:
https://gerrit.osmocom.org/c/osmocom-bb/+/30992/comment/06ba8e5f_66c6acd1
PS4, Line 29: struct apn_name {
: struct llist_head list;
: char *name;
: };
this doesn't seem to be used? I also don't understand how it should/might be.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30992
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I7b4eaa0de428b418bb1d89bd544694e89beb3e6e
Gerrit-Change-Number: 30992
Gerrit-PatchSet: 4
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-CC: fixeria
Gerrit-CC: laforge
Gerrit-Attention: pespin
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Tue, 17 Jan 2023 18:16:40 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: generate config.h
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30991 )
Change subject: layer23: generate config.h
..
layer23: generate config.h
Follow-up commits will add some extra checks we want to have in config.h
Include config.h in files using PACKAGE_VERSION.
Change-Id: Ic779a3168012780feef8d173371387d09d383bfd
---
M src/host/layer23/configure.ac
M src/host/layer23/src/common/main.c
M src/host/layer23/src/mobile/app_mobile.c
M src/host/layer23/src/modem/app_modem.c
4 files changed, 9 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/host/layer23/configure.ac b/src/host/layer23/configure.ac
index 85765ae..81c0e65 100644
--- a/src/host/layer23/configure.ac
+++ b/src/host/layer23/configure.ac
@@ -89,6 +89,9 @@
AC_MSG_RESULT([CFLAGS="$CFLAGS"])
AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
+dnl Generate the output
+AM_CONFIG_HEADER(config.h)
+
AC_OUTPUT(
src/Makefile
src/common/Makefile
diff --git a/src/host/layer23/src/common/main.c
b/src/host/layer23/src/common/main.c
index eecd29f..2cdf5d4 100644
--- a/src/host/layer23/src/common/main.c
+++ b/src/host/layer23/src/common/main.c
@@ -50,6 +50,8 @@
#include
#include
+#include "config.h"
+
void *l23_ctx = NULL;
static char *sap_socket_path = "/tmp/osmocom_sap";
diff --git a/src/host/layer23/src/mobile/app_mobile.c
b/src/host/layer23/src/mobile/app_mobile.c
index ae4845d..5bb1920 100644
--- a/src/host/layer23/src/mobile/app_mobile.c
+++ b/src/host/layer23/src/mobile/app_mobile.c
@@ -54,6 +54,8 @@
#include
+#include "config.h"
+
extern void *l23_ctx;
extern struct llist_head ms_list;
extern int vty_reading;
diff --git a/src/host/layer23/src/modem/app_modem.c
b/src/host/layer23/src/modem/app_modem.c
index 93f3b54..7dcda17 100644
--- a/src/host/layer23/src/modem/app_modem.c
+++ b/src/host/layer23/src/modem/app_modem.c
@@ -46,6 +46,8 @@
#include
+#include "config.h"
+
static struct {
struct osmocom_ms *ms;
enum ccch_mode ccch_mode;
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30991
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ic779a3168012780feef8d173371387d09d383bfd
Gerrit-Change-Number: 30991
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmocom-bb[master]: layer23: ms.h: Use enum type in ms->shutdown
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30983 )
Change subject: layer23: ms.h: Use enum type in ms->shutdown
..
layer23: ms.h: Use enum type in ms->shutdown
Change-Id: I5456f7a8675e6ab620bc93b56e2c4ad22d3900e8
---
M src/host/layer23/include/osmocom/bb/common/ms.h
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
dexter: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/host/layer23/include/osmocom/bb/common/ms.h
b/src/host/layer23/include/osmocom/bb/common/ms.h
index f40e181..a706a4c 100644
--- a/src/host/layer23/include/osmocom/bb/common/ms.h
+++ b/src/host/layer23/include/osmocom/bb/common/ms.h
@@ -59,7 +59,7 @@
int16_t s, rl_fail;
};
-enum {
+enum osmobb_ms_shutdown_st {
MS_SHUTDOWN_NONE = 0,
MS_SHUTDOWN_IMSI_DETACH = 1,
MS_SHUTDOWN_WAIT_RESET = 2,
@@ -74,7 +74,7 @@
struct osmol1_entity l1_entity;
bool started, deleting;
- uint8_t shutdown;
+ enum osmobb_ms_shutdown_st shutdown;
struct gsm_support support;
struct gsm_settings settings;
struct gsm_subscriber subscr;
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30983
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I5456f7a8675e6ab620bc93b56e2c4ad22d3900e8
Gerrit-Change-Number: 30983
Gerrit-PatchSet: 4
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmocom-bb[master]: layer23: Move '(no) shutdown' VTY code to common/vty.c
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30972 )
Change subject: layer23: Move '(no) shutdown' VTY code to common/vty.c
..
layer23: Move '(no) shutdown' VTY code to common/vty.c
Change-Id: Ib5c9b6f3efa255d67980945db9f98dd8a112af0e
---
A doc/examples/modem/modem.cfg
M src/host/layer23/include/osmocom/bb/common/osmocom_data.h
M src/host/layer23/include/osmocom/bb/common/vty.h
M src/host/layer23/src/common/vty.c
M src/host/layer23/src/mobile/vty_interface.c
M src/host/layer23/src/modem/vty.c
6 files changed, 151 insertions(+), 61 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/doc/examples/modem/modem.cfg b/doc/examples/modem/modem.cfg
new file mode 100644
index 000..d2cb81f
--- /dev/null
+++ b/doc/examples/modem/modem.cfg
@@ -0,0 +1,9 @@
+!
+! OsmocomBB example configuration for modem application
+!!
+!
+line vty
+ no login
+!
+ms 1
+ no shutdown
diff --git a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
index d78edc3..600c412 100644
--- a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
+++ b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
@@ -1,13 +1,16 @@
#pragma once
#include
+#include
struct osmocom_ms;
struct gapk_io_state;
+struct vty;
enum osmobb_sig_subsys {
SS_L1CTL,
SS_GLOBAL,
+ SS_L23_VTY,
};
enum osmobb_l1ctl_sig {
@@ -26,6 +29,26 @@
S_GLOBAL_SHUTDOWN,
};
+enum osmobb_l23_vty_sig {
+ S_L23_VTY_MS_START,
+ S_L23_VTY_MS_STOP,
+};
+
+struct osmobb_l23_vty_sig_data {
+ struct vty *vty;
+ union {
+ struct {
+ struct osmocom_ms *ms;
+ int rc; /* CMD_SUCCESS/CMD_WARNING */
+ } ms_start;
+ struct {
+ struct osmocom_ms *ms;
+ bool force;
+ int rc; /* CMD_SUCCESS/CMD_WARNING */
+ } ms_stop;
+ };
+};
+
struct osmobb_fbsb_res {
struct osmocom_ms *ms;
int8_t snr;
diff --git a/src/host/layer23/include/osmocom/bb/common/vty.h
b/src/host/layer23/include/osmocom/bb/common/vty.h
index dd5e7f2..f345260 100644
--- a/src/host/layer23/include/osmocom/bb/common/vty.h
+++ b/src/host/layer23/include/osmocom/bb/common/vty.h
@@ -4,6 +4,7 @@
#include
#include
#include
+#include
struct osmocom_ms;
@@ -12,13 +13,13 @@
_LAST_L23VTY_NODE,
};
-int l23_vty_init(int (*config_write_ms_node_cb)(struct vty *));
+int l23_vty_init(int (*config_write_ms_node_cb)(struct vty *),
osmo_signal_cbfn *l23_vty_signal_cb);
struct osmocom_ms *l23_vty_get_ms(const char *name, struct vty *vty);
void l23_ms_dump(struct osmocom_ms *ms, struct vty *vty);
void l23_vty_config_write_ms_node(struct vty *vty, const struct osmocom_ms
*ms, const char *prefix);
void l23_vty_config_write_ms_node_contents(struct vty *vty, const struct
osmocom_ms *ms, const char *prefix);
-
+void l23_vty_config_write_ms_node_contents_final(struct vty *vty, const struct
osmocom_ms *ms, const char *prefix);
extern struct llist_head ms_list;
extern struct cmd_element l23_show_ms_cmd;
diff --git a/src/host/layer23/src/common/vty.c
b/src/host/layer23/src/common/vty.c
index 34d39b0..a7b65b3 100644
--- a/src/host/layer23/src/common/vty.c
+++ b/src/host/layer23/src/common/vty.c
@@ -152,6 +152,56 @@
return CMD_WARNING;
}
+DEFUN(cfg_ms_no_shutdown, cfg_ms_no_shutdown_cmd, "no shutdown",
+ NO_STR "Activate and run MS")
+{
+ struct osmocom_ms *ms = vty->index;
+
+ struct osmobb_l23_vty_sig_data data;
+ memset(&data, 0, sizeof(data));
+
+ data.vty = vty;
+ data.ms_start.ms = ms;
+ data.ms_start.rc = CMD_SUCCESS;
+ osmo_signal_dispatch(SS_L23_VTY, S_L23_VTY_MS_START, &data);
+
+ return data.ms_start.rc;
+}
+
+DEFUN(cfg_ms_shutdown, cfg_ms_shutdown_cmd, "shutdown",
+ "Shut down and deactivate MS")
+{
+ struct osmocom_ms *ms = vty->index;
+
+ struct osmobb_l23_vty_sig_data data;
+ memset(&data, 0, sizeof(data));
+
+ data.vty = vty;
+ data.ms_stop.ms = ms;
+ data.ms_stop.force = false;
+ data.ms_stop.rc = CMD_SUCCESS;
+ osmo_signal_dispatch(SS_L23_VTY, S_L23_VTY_MS_STOP, &data);
+
+ return data.ms_stop.rc;
+}
+
+DEFUN(cfg_ms_shutdown_force, cfg_ms_shutdown_force_cmd, "shutdown force",
+ "Shut down and deactivate MS\nDo not perform IMSI detach")
+{
+ struct osmocom_ms *ms = vty->index;
+
+ struct osmobb_l23_vty_sig_data data;
+ memset(&data, 0, sizeof(data));
+
+ data.vty = vty;
+ data.ms_stop.ms = ms;
+ data.ms_stop.force = true;
+ data.ms_stop.rc = CMD_SUCCESS;
+
Change in osmocom-bb[master]: layer23: Let each app allocate its ms obj and start layer2 when needed
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30979 )
Change subject: layer23: Let each app allocate its ms obj and start layer2 when
needed
..
layer23: Let each app allocate its ms obj and start layer2 when needed
This allows apps to allocate the objects as they please: simple apps can
statically allocate it at startup. Others may want to allocate them
through VTY.
Some apps may also want to dynamically start and stop layer2.
Change-Id: I32f99df76a5513eff9df5489d28d60aedf96dec3
---
M src/host/layer23/include/osmocom/bb/common/l23_app.h
M src/host/layer23/include/osmocom/bb/common/ms.h
M src/host/layer23/src/common/main.c
M src/host/layer23/src/common/ms.c
M src/host/layer23/src/misc/app_bcch_scan.c
M src/host/layer23/src/misc/app_cbch_sniff.c
M src/host/layer23/src/misc/app_ccch_scan.c
M src/host/layer23/src/misc/app_cell_log.c
M src/host/layer23/src/misc/app_echo_test.c
M src/host/layer23/src/modem/app_modem.c
10 files changed, 114 insertions(+), 48 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/host/layer23/include/osmocom/bb/common/l23_app.h
b/src/host/layer23/include/osmocom/bb/common/l23_app.h
index 633c764..3c07f70 100644
--- a/src/host/layer23/include/osmocom/bb/common/l23_app.h
+++ b/src/host/layer23/include/osmocom/bb/common/l23_app.h
@@ -16,14 +16,14 @@
extern void *l23_ctx;
/* initialization, called once when starting the app, before reading VTY
config */
-extern int l23_app_init(struct osmocom_ms *ms);
+extern int l23_app_init(void);
/* Start work after reading VTY config and starting layer23 components,
* immediately before entering main select loop */
-extern int (*l23_app_start)(struct osmocom_ms *ms);
+extern int (*l23_app_start)(void);
-extern int (*l23_app_work)(struct osmocom_ms *ms);
-extern int (*l23_app_exit)(struct osmocom_ms *ms);
+extern int (*l23_app_work)(void);
+extern int (*l23_app_exit)(void);
/* configuration options */
struct l23_app_info {
diff --git a/src/host/layer23/include/osmocom/bb/common/ms.h
b/src/host/layer23/include/osmocom/bb/common/ms.h
index 9fd4c7a..f40e181 100644
--- a/src/host/layer23/include/osmocom/bb/common/ms.h
+++ b/src/host/layer23/include/osmocom/bb/common/ms.h
@@ -99,3 +99,5 @@
};
struct osmocom_ms *osmocom_ms_alloc(void *ctx, const char *name);
+
+extern uint16_t cfg_test_arfcn;
diff --git a/src/host/layer23/src/common/main.c
b/src/host/layer23/src/common/main.c
index c0064c5..eecd29f 100644
--- a/src/host/layer23/src/common/main.c
+++ b/src/host/layer23/src/common/main.c
@@ -54,13 +54,12 @@
static char *sap_socket_path = "/tmp/osmocom_sap";
struct llist_head ms_list;
-static struct osmocom_ms *ms = NULL;
static char *gsmtap_ip = NULL;
static char *config_file = NULL;
-int (*l23_app_start)(struct osmocom_ms *ms) = NULL;
-int (*l23_app_work)(struct osmocom_ms *ms) = NULL;
-int (*l23_app_exit)(struct osmocom_ms *ms) = NULL;
+int (*l23_app_start)(void) = NULL;
+int (*l23_app_work)(void) = NULL;
+int (*l23_app_exit)(void) = NULL;
int quit = 0;
struct gsmtap_inst *gsmtap_inst;
@@ -169,7 +168,7 @@
sap_socket_path = talloc_strdup(l23_ctx, optarg);
break;
case 'a':
- ms->test_arfcn = atoi(optarg);
+ cfg_test_arfcn = atoi(optarg);
break;
case 'i':
gsmtap_ip = optarg;
@@ -200,7 +199,7 @@
fprintf(stderr, "Signal %d received.\n", sigset);
if (l23_app_exit)
- rc = l23_app_exit(ms);
+ rc = l23_app_exit();
if (rc != -EBUSY)
exit (0);
@@ -270,10 +269,7 @@
print_copyright();
- ms = osmocom_ms_alloc(l23_ctx, "1");
- OSMO_ASSERT(ms);
-
- rc = l23_app_init(ms);
+ rc = l23_app_init();
if (rc < 0) {
fprintf(stderr, "Failed during l23_app_init()\n");
exit(1);
@@ -290,12 +286,6 @@
exit(1);
}
- rc = layer2_open(ms, ms->settings.layer2_socket_path);
- if (rc < 0) {
- fprintf(stderr, "Failed during layer2_open()\n");
- exit(1);
- }
-
if (gsmtap_ip) {
gsmtap_inst = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1);
if (!gsmtap_inst) {
@@ -306,7 +296,7 @@
}
if (l23_app_start) {
- rc = l23_app_start(ms);
+ rc = l23_app_start();
if (rc < 0) {
fprintf(stderr, "Failed during l23_app_start()\n");
exit(1);
@@ -320,7 +310,7 @@
while (!quit) {
if (l23_app_work)
- l23_app_work(ms);
+
Change in osmocom-bb[master]: layer23: Move layer2-socket VTY command to common/
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30978 )
Change subject: layer23: Move layer2-socket VTY command to common/
..
layer23: Move layer2-socket VTY command to common/
This allows configuring layer2-socket for other apps than mobile, like
the "modem" one.
Change-Id: If7419f8fc54a54eed68a076968d93dba5ac977b7
---
M src/host/layer23/include/osmocom/bb/common/l1l2_interface.h
M src/host/layer23/include/osmocom/bb/common/settings.h
M src/host/layer23/include/osmocom/bb/common/vty.h
M src/host/layer23/src/common/main.c
M src/host/layer23/src/common/ms.c
M src/host/layer23/src/common/settings.c
M src/host/layer23/src/common/vty.c
M src/host/layer23/src/mobile/app_mobile.c
M src/host/layer23/src/mobile/vty_interface.c
9 files changed, 51 insertions(+), 25 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/host/layer23/include/osmocom/bb/common/l1l2_interface.h
b/src/host/layer23/include/osmocom/bb/common/l1l2_interface.h
index 4f46914..9cb993c 100644
--- a/src/host/layer23/include/osmocom/bb/common/l1l2_interface.h
+++ b/src/host/layer23/include/osmocom/bb/common/l1l2_interface.h
@@ -3,6 +3,8 @@
#include
+#define L2_DEFAULT_SOCKET_PATH "/tmp/osmocom_l2"
+
int layer2_open(struct osmocom_ms *ms, const char *socket_path);
int layer2_close(struct osmocom_ms *ms);
int osmo_send_l1(struct osmocom_ms *ms, struct msgb *msg);
diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h
b/src/host/layer23/include/osmocom/bb/common/settings.h
index c9a3622..8ebf049 100644
--- a/src/host/layer23/include/osmocom/bb/common/settings.h
+++ b/src/host/layer23/include/osmocom/bb/common/settings.h
@@ -180,5 +180,7 @@
char *gsm_check_imei(const char *imei, const char *sv);
int gsm_random_imei(struct gsm_settings *set);
+extern char *layer2_socket_path;
+
#endif /* _settings_h */
diff --git a/src/host/layer23/include/osmocom/bb/common/vty.h
b/src/host/layer23/include/osmocom/bb/common/vty.h
index f345260..259725e 100644
--- a/src/host/layer23/include/osmocom/bb/common/vty.h
+++ b/src/host/layer23/include/osmocom/bb/common/vty.h
@@ -20,6 +20,9 @@
void l23_vty_config_write_ms_node(struct vty *vty, const struct osmocom_ms
*ms, const char *prefix);
void l23_vty_config_write_ms_node_contents(struct vty *vty, const struct
osmocom_ms *ms, const char *prefix);
void l23_vty_config_write_ms_node_contents_final(struct vty *vty, const struct
osmocom_ms *ms, const char *prefix);
+
+extern bool l23_vty_reading;
+
extern struct llist_head ms_list;
extern struct cmd_element l23_show_ms_cmd;
diff --git a/src/host/layer23/src/common/main.c
b/src/host/layer23/src/common/main.c
index 8017898..c0064c5 100644
--- a/src/host/layer23/src/common/main.c
+++ b/src/host/layer23/src/common/main.c
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
#include
@@ -51,7 +52,6 @@
void *l23_ctx = NULL;
-static char *layer2_socket_path = "/tmp/osmocom_l2";
static char *sap_socket_path = "/tmp/osmocom_sap";
struct llist_head ms_list;
static struct osmocom_ms *ms = NULL;
@@ -163,7 +163,7 @@
exit(0);
break;
case 's':
- layer2_socket_path = talloc_strdup(l23_ctx, optarg);
+ layer2_socket_path = optarg;
break;
case 'S':
sap_socket_path = talloc_strdup(l23_ctx, optarg);
@@ -230,7 +230,9 @@
if (app->vty_init)
app->vty_init();
if (config_file) {
+ l23_vty_reading = true;
rc = vty_read_config_file(config_file, NULL);
+ l23_vty_reading = false;
if (rc < 0) {
LOGP(DLGLOBAL, LOGL_FATAL,
"Failed to parse the configuration file
'%s'\n", config_file);
@@ -288,7 +290,7 @@
exit(1);
}
- rc = layer2_open(ms, layer2_socket_path);
+ rc = layer2_open(ms, ms->settings.layer2_socket_path);
if (rc < 0) {
fprintf(stderr, "Failed during layer2_open()\n");
exit(1);
diff --git a/src/host/layer23/src/common/ms.c b/src/host/layer23/src/common/ms.c
index 74dabc2..9851ebe 100644
--- a/src/host/layer23/src/common/ms.c
+++ b/src/host/layer23/src/common/ms.c
@@ -45,5 +45,8 @@
/* Register a new MS */
llist_add_tail(&ms->entity, &ms_list);
+ gsm_support_init(ms);
+ gsm_settings_init(ms);
+
return ms;
}
diff --git a/src/host/layer23/src/common/settings.c
b/src/host/layer23/src/common/settings.c
index d607aff..fd7177d 100644
--- a/src/host/layer23/src/common/settings.c
+++ b/src/host/layer23/src/common/settings.c
@@ -27,8 +27,11 @@
Change in osmocom-bb[master]: layer23: generate config.h
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30991 ) Change subject: layer23: generate config.h .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic779a3168012780feef8d173371387d09d383bfd Gerrit-Change-Number: 30991 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 17 Jan 2023 18:16:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: ms.h: Use enum type in ms->shutdown
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30983 ) Change subject: layer23: ms.h: Use enum type in ms->shutdown .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5456f7a8675e6ab620bc93b56e2c4ad22d3900e8 Gerrit-Change-Number: 30983 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 17 Jan 2023 18:16:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Let each app allocate its ms obj and start layer2 when needed
Attention is currently required from: neels, msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30979 ) Change subject: layer23: Let each app allocate its ms obj and start layer2 when needed .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I32f99df76a5513eff9df5489d28d60aedf96dec3 Gerrit-Change-Number: 30979 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: msuraev Gerrit-Attention: neels Gerrit-Attention: msuraev Gerrit-Comment-Date: Tue, 17 Jan 2023 18:16:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Move layer2-socket VTY command to common/
Attention is currently required from: neels, msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30978 ) Change subject: layer23: Move layer2-socket VTY command to common/ .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If7419f8fc54a54eed68a076968d93dba5ac977b7 Gerrit-Change-Number: 30978 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: msuraev Gerrit-CC: neels Gerrit-Attention: neels Gerrit-Attention: msuraev Gerrit-Comment-Date: Tue, 17 Jan 2023 18:15:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Move '(no) shutdown' VTY code to common/vty.c
Attention is currently required from: neels, daniel, msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30972 ) Change subject: layer23: Move '(no) shutdown' VTY code to common/vty.c .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib5c9b6f3efa255d67980945db9f98dd8a112af0e Gerrit-Change-Number: 30972 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: msuraev Gerrit-CC: neels Gerrit-Attention: neels Gerrit-Attention: daniel Gerrit-Attention: msuraev Gerrit-Comment-Date: Tue, 17 Jan 2023 18:15:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: ms.h: Use enum type in ms->shutdown
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30983 ) Change subject: layer23: ms.h: Use enum type in ms->shutdown .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5456f7a8675e6ab620bc93b56e2c4ad22d3900e8 Gerrit-Change-Number: 30983 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 17 Jan 2023 18:15:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Let each app allocate its ms obj and start layer2 when needed
Attention is currently required from: neels, pespin, msuraev. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30979 ) Change subject: layer23: Let each app allocate its ms obj and start layer2 when needed .. Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I32f99df76a5513eff9df5489d28d60aedf96dec3 Gerrit-Change-Number: 30979 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: msuraev Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Attention: msuraev Gerrit-Comment-Date: Tue, 17 Jan 2023 18:14:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Move layer2-socket VTY command to common/
Attention is currently required from: neels, pespin, msuraev. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30978 ) Change subject: layer23: Move layer2-socket VTY command to common/ .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If7419f8fc54a54eed68a076968d93dba5ac977b7 Gerrit-Change-Number: 30978 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: msuraev Gerrit-CC: neels Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Attention: msuraev Gerrit-Comment-Date: Tue, 17 Jan 2023 18:14:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Move '(no) shutdown' VTY code to common/vty.c
Attention is currently required from: neels, pespin, daniel, msuraev. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30972 ) Change subject: layer23: Move '(no) shutdown' VTY code to common/vty.c .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib5c9b6f3efa255d67980945db9f98dd8a112af0e Gerrit-Change-Number: 30972 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: msuraev Gerrit-CC: neels Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-Attention: msuraev Gerrit-Comment-Date: Tue, 17 Jan 2023 18:13:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: fix integer overflow in l1ctl_tx_data_req()
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30962 )
Change subject: layer23: fix integer overflow in l1ctl_tx_data_req()
..
layer23: fix integer overflow in l1ctl_tx_data_req()
Found by clang:
l1ctl.c:397:52: warning: implicit conversion from 'int' to 'int8_t'
(aka 'signed char') changes value from 255 to -1
[-Wconstant-conversion]
Change-Id: I23e9ea5ad59099c24db60057c8e7da1e6a0d2293
---
M src/host/layer23/src/common/l1ctl.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
dexter: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/host/layer23/src/common/l1ctl.c
b/src/host/layer23/src/common/l1ctl.c
index 2695e53..5ba1a1f 100644
--- a/src/host/layer23/src/common/l1ctl.c
+++ b/src/host/layer23/src/common/l1ctl.c
@@ -395,7 +395,7 @@
if (rsl_dec_chan_nr(chan_nr, &chan_type, &chan_ss, &chan_ts) == 0) {
uint8_t gsmtap_chan_type = chantype_rsl2gsmtap2(chan_type,
link_id, false);
gsmtap_send(gsmtap_inst, ms->rrlayer.cd_now.arfcn |
GSMTAP_ARFCN_F_UPLINK,
- chan_ts, gsmtap_chan_type, chan_ss, 0, 127, 255,
+ chan_ts, gsmtap_chan_type, chan_ss, 0, 127, 0,
msg->l2h, msgb_l2len(msg));
} else {
LOGP(DL1C, LOGL_ERROR,
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30962
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I23e9ea5ad59099c24db60057c8e7da1e6a0d2293
Gerrit-Change-Number: 30962
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-CC: neels
Gerrit-MessageType: merged
Change in osmocom-bb[master]: layer23: Introduce tun.{c,h}
Attention is currently required from: pespin.
dexter has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30994 )
Change subject: layer23: Introduce tun.{c,h}
..
Patch Set 4: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30994
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Id8611b720ada17a3c602872fe095bb91eeb17bcd
Gerrit-Change-Number: 30994
Gerrit-PatchSet: 4
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-Comment-Date: Tue, 17 Jan 2023 17:53:02 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: fix integer overflow in l1ctl_tx_data_req()
Attention is currently required from: neels, fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30962 ) Change subject: layer23: fix integer overflow in l1ctl_tx_data_req() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I23e9ea5ad59099c24db60057c8e7da1e6a0d2293 Gerrit-Change-Number: 30962 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Attention: neels Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 17 Jan 2023 17:51:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: Add osmo_io with initial poll backend
Attention is currently required from: osmith, Hoernchen, neels, pespin, fixeria, daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30934 ) Change subject: Add osmo_io with initial poll backend .. Patch Set 3: (2 comments) File src/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/eb441ae7_22c37abb PS3, Line 367: iofd->name = talloc_strdup(iofd, name); > This can be split into a separate func osmo_iofd_set_name(), simplifying the > current osmo_iofd_setup […] I actually think it is rather important to encourage all useres to provide a name. If it's a separate API call, it means many users will froget about it. Having meaningful names allows the osmo_io provider to do meaningful logging (with context) in error conditions, etc. File src/osmo_io_internal.h: https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/f801206b_17d8d58c PS3, Line 87: // TODO: SCTP_* > I'd say this needs to be added before merging the patch? or not needed? it is only needed later one when we start to support sctp_sendmsg/sctp_recvmsg, which are just API wrappers around normal sendmsg/recvmsg. But in order to provide the same level of API abstraction, we thought it would be good to offer a sctp_recvmsg callback for the applications. The TODO is therefore intentionally for a later follow-up patch. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I50d73cf550d6ce8154bf827bf47408131cf5b0a0 Gerrit-Change-Number: 30934 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Attention: osmith Gerrit-Attention: Hoernchen Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Comment-Date: Tue, 17 Jan 2023 17:33:58 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in libosmo-abis[master]: Fix support for HDLC/RAW type channels at mISDN.c
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-abis/+/30446 )
Change subject: Fix support for HDLC/RAW type channels at mISDN.c
..
Fix support for HDLC/RAW type channels at mISDN.c
Change-Id: Ie9a2a3f6ae1ad7da1711b6ff2f0aeda39839a427
---
M src/input/misdn.c
1 file changed, 102 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/input/misdn.c b/src/input/misdn.c
index 874b627..5f6dd62 100644
--- a/src/input/misdn.c
+++ b/src/input/misdn.c
@@ -69,6 +69,7 @@
/*! \brief driver-specific data for \ref e1inp_line::driver_data */
struct misdn_line {
int use_userspace_lapd;
+ int unconfirmed_ts[NUM_E1_TS];
int dummy_dchannel;
};
@@ -430,7 +431,7 @@
struct e1inp_line *line = bfd->data;
unsigned int ts_nr = bfd->priv_nr;
struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1];
- struct msgb *msg = msgb_alloc(TSX_ALLOC_SIZE, "mISDN Tx RAW");
+ struct msgb *msg = msgb_alloc(TSX_ALLOC_SIZE, "mISDN TS RAW");
struct mISDNhead *hh;
int ret;
@@ -471,6 +472,92 @@
return ret;
}
+/* write to a hdlc channel TS */
+static int handle_ts_hdlc_write(struct osmo_fd *bfd)
+{
+ struct e1inp_line *line = bfd->data;
+ struct misdn_line *mline = line->driver_data;
+ unsigned int ts_nr = bfd->priv_nr;
+ struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1];
+ struct msgb *msg;
+ struct mISDNhead *hh;
+ int ret;
+
+ osmo_fd_write_disable(bfd);
+
+ if (mline->unconfirmed_ts[ts_nr-1])
+ return 0;
+
+ /* get the next msg for this timeslot */
+ msg = e1inp_tx_ts(e1i_ts, NULL);
+ if (!msg)
+ return 0;
+
+ LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "HDLC CHAN TX: %s\n",
osmo_hexdump(msg->data, msg->len));
+
+ hh = (struct mISDNhead *) msgb_push(msg, sizeof(*hh));
+ hh->prim = PH_DATA_REQ;
+ hh->id = 0;
+
+ ret = write(bfd->fd, msg->data, msg->len);
+ if (ret < msg->len)
+ LOGPITS(e1i_ts, DLINP, LOGL_NOTICE, "send returns %d instead of
%d\n", ret, msg->len);
+ else
+ mline->unconfirmed_ts[ts_nr-1] = 1;
+ msgb_free(msg);
+
+
+ return ret;
+}
+
+static int handle_ts_hdlc_read(struct osmo_fd *bfd)
+{
+ struct e1inp_line *line = bfd->data;
+ struct misdn_line *mline = line->driver_data;
+ unsigned int ts_nr = bfd->priv_nr;
+ struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1];
+ struct msgb *msg = msgb_alloc(TSX_ALLOC_SIZE, "mISDN TS HDLC");
+ struct mISDNhead *hh;
+ int ret;
+
+ if (!msg)
+ return -ENOMEM;
+
+ hh = (struct mISDNhead *) msg->data;
+
+ ret = recv(bfd->fd, msg->data, TSX_ALLOC_SIZE, 0);
+ if (ret < 0) {
+ fprintf(stderr, "recvfrom error %s\n", strerror(errno));
+ return ret;
+ }
+
+ msgb_put(msg, ret);
+
+ if (hh->prim != PH_CONTROL_IND)
+ LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "<= HDLC CHAN len = %d,
prim(0x%x) id(0x%x): %s\n",
+ ret, hh->prim, hh->id, get_value_string(prim_names,
hh->prim));
+
+ switch (hh->prim) {
+ case PH_DATA_IND:
+ msg->l2h = msg->data + MISDN_HEADER_LEN;
+ LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "HDLC CHAN RX: %s\n",
+ osmo_hexdump(msgb_l2(msg), ret - MISDN_HEADER_LEN));
+ return e1inp_rx_ts(e1i_ts, msg, 0, 0);
+ case PH_ACTIVATE_IND:
+ break;
+ case PH_DATA_CNF:
+ mline->unconfirmed_ts[ts_nr-1] = 0;
+ osmo_fd_write_enable(bfd);
+ break;
+ default:
+ break;
+ }
+ /* FIXME: why do we free signalling msgs in the caller, and trau not? */
+ msgb_free(msg);
+
+ return ret;
+}
+
/* callback from select.c in case one of the fd's can be read/written */
static int misdn_fd_cb(struct osmo_fd *bfd, unsigned int what)
{
@@ -501,6 +588,12 @@
* writeset, since it doesn't support poll() based
* write flow control */
break;
+ case E1INP_TS_TYPE_HDLC:
+ if (what & OSMO_FD_READ)
+ rc = handle_ts_hdlc_read(bfd);
+ if (what & OSMO_FD_WRITE)
+ rc = handle_ts_hdlc_write(bfd);
+ break;
default:
fprintf(stderr, "unknown E1 TS type %u\n", e1i_ts->type);
break;
@@ -598,8 +691,9 @@
continue;
break;
case E1INP_TS_TYPE_HDLC:
+ /* TS 16 is the D-channel, so we use D-channel proto */
bfd->fd = socket(PF_ISDN, SOCK_DGRAM,
-
Change in libosmo-abis[master]: Add missing functions to send HDLC/RAW data
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-abis/+/30447 )
Change subject: Add missing functions to send HDLC/RAW data
..
Add missing functions to send HDLC/RAW data
Change-Id: Iebcb99f491b945d364b1044a59638524637dd8b2
---
M include/osmocom/abis/e1_input.h
M src/e1_input.c
2 files changed, 33 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h
index 2c8f4d8..8e7f20b 100644
--- a/include/osmocom/abis/e1_input.h
+++ b/include/osmocom/abis/e1_input.h
@@ -365,4 +365,7 @@
int abis_sendmsg(struct msgb *msg);
int abis_rsl_sendmsg(struct msgb *msg);
+int e1inp_ts_send_raw(struct e1inp_ts *ts, struct msgb *msg);
+int e1inp_ts_send_hdlc(struct e1inp_ts *ts, struct msgb *msg);
+
#endif /* _E1_INPUT_H */
diff --git a/src/e1_input.c b/src/e1_input.c
index 02f3b30..6c82d08 100644
--- a/src/e1_input.c
+++ b/src/e1_input.c
@@ -331,6 +331,36 @@
return abis_sendmsg(msg);
}
+int e1inp_ts_send_raw(struct e1inp_ts *ts, struct msgb *msg)
+{
+ struct e1inp_driver *driver;
+
+ OSMO_ASSERT(ts->type == E1INP_TS_TYPE_RAW);
+
+ /* notify the driver we have something to write */
+ driver = ts->line->driver;
+ driver->want_write(ts);
+
+ msgb_enqueue(&ts->raw.tx_queue, msg);
+
+ return 0;
+}
+
+int e1inp_ts_send_hdlc(struct e1inp_ts *ts, struct msgb *msg)
+{
+ struct e1inp_driver *driver;
+
+ OSMO_ASSERT(ts->type == E1INP_TS_TYPE_HDLC);
+
+ /* notify the driver we have something to write */
+ driver = ts->line->driver;
+ driver->want_write(ts);
+
+ msgb_enqueue(&ts->hdlc.tx_queue, msg);
+
+ return 0;
+}
+
/* Timeslot */
int e1inp_ts_config_trau(struct e1inp_ts *ts, struct e1inp_line *line,
int (*trau_rcv_cb)(struct subch_demux *dmx, int ch,
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/30447
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: Iebcb99f491b945d364b1044a59638524637dd8b2
Gerrit-Change-Number: 30447
Gerrit-PatchSet: 2
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in libosmo-abis[master]: Fix support for HDLC/RAW type channels at mISDN.c
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/30446 ) Change subject: Fix support for HDLC/RAW type channels at mISDN.c .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/30446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie9a2a3f6ae1ad7da1711b6ff2f0aeda39839a427 Gerrit-Change-Number: 30446 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Tue, 17 Jan 2023 17:27:38 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-abis[master]: Fix support for HDLC/RAW type channels at mISDN.c
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/30446 ) Change subject: Fix support for HDLC/RAW type channels at mISDN.c .. Patch Set 2: Code-Review+1 (1 comment) File include/osmocom/abis/e1_input.h: https://gerrit.osmocom.org/c/libosmo-abis/+/30446/comment/e39bd516_b30f879a PS1, Line 120: in > unfortunately still no entry in the TODO-RELEASE file I overlooked that the latest version of the patch doesn't touch public ABI anymore, so this is fine now. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/30446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie9a2a3f6ae1ad7da1711b6ff2f0aeda39839a427 Gerrit-Change-Number: 30446 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Tue, 17 Jan 2023 17:27:35 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Initial integration of tun device
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30996 ) Change subject: layer23: Initial integration of tun device .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I86cac406843157aa2e51727cf8ccac9804d7961d Gerrit-Change-Number: 30996 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 17 Jan 2023 16:30:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ggsn[master]: Fix typos in comments and VTY descriptions
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/31002 )
Change subject: Fix typos in comments and VTY descriptions
..
Fix typos in comments and VTY descriptions
Change-Id: I359425152dc18d29c57047f1b10942480b7a61e5
---
M ggsn/ggsn.h
M ggsn/ggsn_vty.c
2 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, approved
diff --git a/ggsn/ggsn.h b/ggsn/ggsn.h
index 46f8778..1abbc9a 100644
--- a/ggsn/ggsn.h
+++ b/ggsn/ggsn.h
@@ -66,9 +66,9 @@
uint32_t apn_type_mask;
/* GTP-U via TUN device or in Linux kernel */
enum apn_gtpu_mode gtpu_mode;
- /* administratively shut-down (true) or not (false) */
+ /* administratively shut down (true) or not (false) */
bool shutdown;
- /* transmit G-PDU sequeence numbers (true) or not (false) */
+ /* transmit G-PDU sequence numbers (true) or not (false) */
bool tx_gpdu_seq;
} cfg;
@@ -128,7 +128,7 @@
char *state_dir;
/* Time between Echo requests on each SGSN */
unsigned int echo_interval;
- /* administratively shut-down (true) or not (false) */
+ /* administratively shut down (true) or not (false) */
bool shutdown;
} cfg;
diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c
index fb0caa2..2d49a94 100644
--- a/ggsn/ggsn_vty.c
+++ b/ggsn/ggsn_vty.c
@@ -299,7 +299,7 @@
DEFUN(cfg_ggsn_shutdown, cfg_ggsn_shutdown_cmd,
"shutdown ggsn",
- "Put the GGSN in administrative shut-down\n" GGSN_STR)
+ "Put the GGSN in administrative shutdown\n" GGSN_STR)
{
struct ggsn_ctx *ggsn = (struct ggsn_ctx *) vty->index;
@@ -316,7 +316,7 @@
DEFUN(cfg_ggsn_no_shutdown, cfg_ggsn_no_shutdown_cmd,
"no shutdown ggsn",
- NO_STR GGSN_STR "Remove the GGSN from administrative shut-down\n")
+ NO_STR GGSN_STR "Remove the GGSN from administrative shutdown\n")
{
struct ggsn_ctx *ggsn = (struct ggsn_ctx *) vty->index;
@@ -344,7 +344,7 @@
DEFUN(cfg_ggsn_show_sgsn, cfg_ggsn_show_sgsn_cmd,
"show sgsn",
- NO_STR GGSN_STR "Remove the GGSN from administrative shut-down\n")
+ NO_STR GGSN_STR "Remove the GGSN from administrative shutdown\n")
{
struct ggsn_ctx *ggsn = (struct ggsn_ctx *) vty->index;
struct sgsn_peer *sgsn;
@@ -681,7 +681,7 @@
DEFUN(cfg_apn_shutdown, cfg_apn_shutdown_cmd,
"shutdown",
- "Put the APN in administrative shut-down\n")
+ "Put the APN in administrative shutdown\n")
{
struct apn_ctx *apn = (struct apn_ctx *) vty->index;
@@ -698,7 +698,7 @@
DEFUN(cfg_apn_no_shutdown, cfg_apn_no_shutdown_cmd,
"no shutdown",
- NO_STR "Remove the APN from administrative shut-down\n")
+ NO_STR "Remove the APN from administrative shutdown\n")
{
struct apn_ctx *apn = (struct apn_ctx *) vty->index;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31002
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: I359425152dc18d29c57047f1b10942480b7a61e5
Gerrit-Change-Number: 31002
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ggsn[master]: Fix typos in comments and VTY descriptions
Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/31002 ) Change subject: Fix typos in comments and VTY descriptions .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I359425152dc18d29c57047f1b10942480b7a61e5 Gerrit-Change-Number: 31002 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 17 Jan 2023 16:23:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Use shift operand to define bitmask values
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31005 ) Change subject: layer23: Use shift operand to define bitmask values .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I22e2f543c077a4df4623c5e3bd44f8f068596baf Gerrit-Change-Number: 31005 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 17 Jan 2023 16:19:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: Depend on libosmo-gprs-{llc,sndcp}
Attention is currently required from: pespin.
dexter has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30999 )
Change subject: Depend on libosmo-gprs-{llc,sndcp}
..
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30999
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I80811f73b798151257107bc94aedabe71fee0300
Gerrit-Change-Number: 30999
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: osmith
Gerrit-Attention: pespin
Gerrit-Comment-Date: Tue, 17 Jan 2023 16:19:27 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Use shift operand to define bitmask values
Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31005 ) Change subject: layer23: Use shift operand to define bitmask values .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I22e2f543c077a4df4623c5e3bd44f8f068596baf Gerrit-Change-Number: 31005 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 17 Jan 2023 16:18:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hnbgw[master]: drop bogus error log 'no MGW fsm'
Attention is currently required from: neels. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/30688 ) Change subject: drop bogus error log 'no MGW fsm' .. Patch Set 2: Code-Review+1 (1 comment) File src/osmo-hnbgw/mgw_fsm.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/30688/comment/0a53e9b2_82a3354a PS2, Line 785: if (!map->mgw_fi) A missing MGW FSM in this situation might be a problem still. Maybe change the loglevel to debug? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/30688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I89dd4fb6913bfb84b6667b159e09968734e2102a Gerrit-Change-Number: 30688 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Tue, 17 Jan 2023 16:17:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Introduce tun.{c,h}
Attention is currently required from: pespin.
pespin has removed a vote from this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30994 )
Change subject: layer23: Introduce tun.{c,h}
..
Removed Verified-1 by Jenkins Builder (102)
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30994
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Id8611b720ada17a3c602872fe095bb91eeb17bcd
Gerrit-Change-Number: 30994
Gerrit-PatchSet: 4
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-MessageType: deleteVote
Change in osmocom-bb[master]: layer23: Introduce tun.{c,h}
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30994 )
Change subject: layer23: Introduce tun.{c,h}
..
Patch Set 4: Verified+1
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30994
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Id8611b720ada17a3c602872fe095bb91eeb17bcd
Gerrit-Change-Number: 30994
Gerrit-PatchSet: 4
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Tue, 17 Jan 2023 15:35:31 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Introduce netdev.{c,h}
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30993 )
Change subject: layer23: Introduce netdev.{c,h}
..
Patch Set 4: Verified+1
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30993
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I6085dc6861687bd4e9c32e86221c0375ad95ba22
Gerrit-Change-Number: 30993
Gerrit-PatchSet: 4
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Tue, 17 Jan 2023 15:35:26 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Introduce netdev.{c,h}
Attention is currently required from: pespin.
pespin has removed a vote from this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30993 )
Change subject: layer23: Introduce netdev.{c,h}
..
Removed Verified-1 by Jenkins Builder (102)
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30993
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I6085dc6861687bd4e9c32e86221c0375ad95ba22
Gerrit-Change-Number: 30993
Gerrit-PatchSet: 4
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-MessageType: deleteVote
Change in osmocom-bb[master]: layer23: Use shift operand to define bitmask values
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/31005 )
Change subject: layer23: Use shift operand to define bitmask values
..
layer23: Use shift operand to define bitmask values
Change-Id: I22e2f543c077a4df4623c5e3bd44f8f068596baf
---
M src/host/layer23/include/osmocom/bb/common/l23_app.h
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/05/31005/1
diff --git a/src/host/layer23/include/osmocom/bb/common/l23_app.h
b/src/host/layer23/include/osmocom/bb/common/l23_app.h
index 3c07f70..46c3f44 100644
--- a/src/host/layer23/include/osmocom/bb/common/l23_app.h
+++ b/src/host/layer23/include/osmocom/bb/common/l23_app.h
@@ -6,11 +6,11 @@
/* Options supported by the l23 app */
enum {
- L23_OPT_SAP = 1,
- L23_OPT_ARFCN = 2,
- L23_OPT_TAP = 4,
- L23_OPT_VTY = 8,
- L23_OPT_DBG = 16,
+ L23_OPT_SAP = 1 << 0,
+ L23_OPT_ARFCN = 1 << 1,
+ L23_OPT_TAP = 1 << 2,
+ L23_OPT_VTY = 1 << 3,
+ L23_OPT_DBG = 1 << 4,
};
extern void *l23_ctx;
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31005
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I22e2f543c077a4df4623c5e3bd44f8f068596baf
Gerrit-Change-Number: 31005
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmocom-bb[master]: layer23: Introduce netdev.{c,h}
Attention is currently required from: pespin.
Jenkins Builder has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30993 )
Change subject: layer23: Introduce netdev.{c,h}
..
Patch Set 4:
(42 comments)
File src/host/layer23/include/osmocom/bb/common/netdev.h:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/5cca2146_5d94189b
PS4, Line 33: {
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/67d5c7f1_3cb79a58
PS4, Line 33: {
open brace '{' following struct go on the same line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/764ca7aa_d2ab1bd9
PS4, Line 35: unsigned int ihl:4;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/d130cc4b_135ebc9b
PS4, Line 36: unsigned int version:4;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/a9b2b1ea_84aa9c38
PS4, Line 38: unsigned int version:4;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/26a88708_e0c397b0
PS4, Line 39: unsigned int ihl:4;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/9b09ea95_a9da3a03
PS4, Line 43: u_int8_t tos;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/73d097a0_622d2625
PS4, Line 44: u_int16_t tot_len;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/3881047a_d51ec8b0
PS4, Line 45: u_int16_t id;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/e1c51d64_cfcc4c28
PS4, Line 46: u_int16_t frag_off;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/fabb92a8_094086cd
PS4, Line 47: u_int8_t ttl;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/9b59ca45_b4558bf9
PS4, Line 48: u_int8_t protocol;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/7870de6d_171ecfa9
PS4, Line 49: u_int16_t check;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/5a603b79_85756af8
PS4, Line 50: u_int32_t saddr;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/cc09c3d1_db9dceff
PS4, Line 51: u_int32_t daddr;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/8ac51e92_d0eb828d
PS4, Line 53: };
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/cca37578_1016c849
PS4, Line 57: struct osmo_sockaddr addr;
please, no spaces at the start of a line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/21b86069_f2f13e18
PS4, Line 58: uint8_t prefixlen;
please, no spaces at the start of a line
File src/host/layer23/src/common/netdev.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/579cef39_3f2027bf
PS4, Line 45: #elif defined (__FreeBSD__)
space prohibited between function name and open parenthesis '('
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/42dbc390_3df65347
PS4, Line 49: #elif defined (__APPLE__)
space prohibited between function name and open parenthesis '('
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2810):
https://gerrit.osmocom.org/c/osmocom-bb/+/30993/comment/607eb07d_91e2a74d
PS4, Line 61: #define SYS_ERR(sub, pri, en, fmt, args...)
Change in osmocom-bb[master]: layer23: Introduce tun.{c,h}
Attention is currently required from: pespin.
Jenkins Builder has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30994 )
Change subject: layer23: Introduce tun.{c,h}
..
Patch Set 4:
(19 comments)
File src/host/layer23/include/osmocom/bb/common/tun.h:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2811):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/573a4857_bcafdfdb
PS4, Line 39: int (*cb_ind) (struct tun_t * tun, void *pack, unsigned len);
"foo * bar" should be "foo *bar"
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2811):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/5225cfd9_a47a1ddd
PS4, Line 39: int (*cb_ind) (struct tun_t * tun, void *pack, unsigned len);
Unnecessary space before function pointer arguments
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2811):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/8f1647c4_d425c49b
PS4, Line 53: int (*cb_ind) (struct tun_t * tun, void *pack,
"foo * bar" should be "foo *bar"
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2811):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/e8348cf4_22643c27
PS4, Line 53: int (*cb_ind) (struct tun_t * tun, void *pack,
Unnecessary space before function pointer arguments
File src/host/layer23/src/common/tun.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2811):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/eab543b1_78f877c5
PS4, Line 48: #elif defined (__FreeBSD__)
space prohibited between function name and open parenthesis '('
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2811):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/07427985_f59ab32e
PS4, Line 53: #elif defined (__APPLE__)
space prohibited between function name and open parenthesis '('
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2811):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/9d9bd55f_7b67766c
PS4, Line 65: #define SYS_ERR(sub, pri, en, fmt, args...)
\
Macros starting with if should be enclosed by a do - while loop to avoid
possible if/else logic defects
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2811):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/0036de06_8388573b
PS4, Line 104: #if defined(__FreeBSD__) || defined (__APPLE__)
space prohibited between function name and open parenthesis '('
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2811):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/dd607443_87916a4d
PS4, Line 123: #if defined(__FreeBSD__) || defined (__APPLE__)
space prohibited between function name and open parenthesis '('
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2811):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/c79d4e60_5cb27927
PS4, Line 186: #elif defined(__FreeBSD__) || defined (__APPLE__)
space prohibited between function name and open parenthesis '('
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2811):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/9ff3c9f1_c40a7665
PS4, Line 214: strcpy(ifr.ifr_name, dev_name);
Instead of strncpy()/strcpy(), use osmo_strlcpy() or OSMO_STRLCPY_ARRAY()
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2811):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/640a53ab_1565d70d
PS4, Line 221: strncpy((*tun)->devname, ifr.ifr_name, IFNAMSIZ);
Instead of strncpy()/strcpy(), use osmo_strlcpy() or OSMO_STRLCPY_ARRAY()
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2811):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/425cbba1_0d881df5
PS4, Line 229: } else {
else is not generally useful after a break or return
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2811):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/4f04445e_f959c25d
PS4, Line 230: strncpy((*tun)->devname, dev_name, IFNAMSIZ);
Instead of strncpy()/strcpy(), use osmo_strlcpy() or OSMO_STRLCPY_ARRAY()
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2811):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/fc41a734_01996b9d
PS4, Line 243: #elif defined(__FreeBSD__) || defined (__APPLE__)
space prohibited between function name and open parenthesis '('
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2811):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/526394a5_0618c4ea
PS4, Line 273: strncpy(areq.ifra_name, (*tun)->devname, IFNAMSIZ);
Instead of strncpy()/strcpy(), use osmo_strlcpy() or OSMO_STRLCPY_ARRAY()
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2811):
https://gerrit.osmocom.org/c/osmocom-bb/+/30994/comment/ccc1421e_c25e5bc6
PS4, Line 283: while (ioctl(fd, SIOCDIFADDR, (void *)&areq) != -1) ;
space prohibited before semicolon
Robot Comment from checkpatch (run ID jenkins-
Change in osmocom-bb[master]: layer23: Initial integration of tun device
Attention is currently required from: osmith. Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/30996 to look at the new patch set (#4). Change subject: layer23: Initial integration of tun device .. layer23: Initial integration of tun device Change-Id: I86cac406843157aa2e51727cf8ccac9804d7961d --- M src/host/layer23/include/osmocom/bb/common/apn.h M src/host/layer23/src/common/apn.c 2 files changed, 94 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/96/30996/4 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I86cac406843157aa2e51727cf8ccac9804d7961d Gerrit-Change-Number: 30996 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-MessageType: newpatchset
Change in libosmo-gprs[master]: sndcp: Fix missing dep link against libmath
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31003 ) Change subject: sndcp: Fix missing dep link against libmath .. sndcp: Fix missing dep link against libmath It is already present in libosmo-gprs-sndcp.pc.in Libs.private, but it was forgotten at compile time. That makes it fail under some systems when linking against it (like jenkins): /build/deps/install/stow/libosmo-gprs/lib/libosmo-gprs-sndcp.so: undefined reference to `ceil' Change-Id: Iba9629b323b50b28cc4c54cf35b2e39ee89bc192 --- M src/sndcp/Makefile.am 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/sndcp/Makefile.am b/src/sndcp/Makefile.am index 0395ef1..26ca24f 100644 --- a/src/sndcp/Makefile.am +++ b/src/sndcp/Makefile.am @@ -44,4 +44,5 @@ libosmo_gprs_sndcp_la_LIBADD = \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ + -lm \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Iba9629b323b50b28cc4c54cf35b2e39ee89bc192 Gerrit-Change-Number: 31003 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in docker-playground[master]: kernel_test_wait_for_vm: increase timeout to 15s
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31001 ) Change subject: kernel_test_wait_for_vm: increase timeout to 15s .. kernel_test_wait_for_vm: increase timeout to 15s As we run more testsuites in parallel, the load was higher and so this timeout was reached. Related: OS#5802 Change-Id: I823010106a99a4906e32198ed42b36f9fe662c4e --- M jenkins-common.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/jenkins-common.sh b/jenkins-common.sh index 2eb9aad..08d4e4e 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -420,7 +420,7 @@ return fi - for i in $(seq 1 10); do + for i in $(seq 1 15); do sleep 1 if grep -q KERNEL_TEST_VM_IS_READY "$log"; then -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I823010106a99a4906e32198ed42b36f9fe662c4e Gerrit-Change-Number: 31001 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in docker-playground[master]: kernel_test_wait_for_vm: increase timeout to 15s
Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31001 ) Change subject: kernel_test_wait_for_vm: increase timeout to 15s .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I823010106a99a4906e32198ed42b36f9fe662c4e Gerrit-Change-Number: 31001 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Tue, 17 Jan 2023 14:46:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-gprs[master]: sndcp: Fix missing dep link against libmath
Attention is currently required from: pespin, fixeria, daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31003 ) Change subject: sndcp: Fix missing dep link against libmath .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Iba9629b323b50b28cc4c54cf35b2e39ee89bc192 Gerrit-Change-Number: 31003 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Comment-Date: Tue, 17 Jan 2023 13:41:19 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: cards: also program EF.AD under ADF.USIM
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/31004 )
Change subject: cards: also program EF.AD under ADF.USIM
..
cards: also program EF.AD under ADF.USIM
DF.GSM and ADF.USIM have an EF.AD with nearly the same contents. Usually
there is one file physically present and the other is just a link.
Apparantly this is not always the case for sysmo-ismi-sja2 cards, so
lets program EF.AD in both locations.
Change-Id: Ic9dd4acc8d9a72acbb7376ddf3e2128125d4a8f5
Related: OS#5830
---
M pySim/cards.py
1 file changed, 15 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/04/31004/1
diff --git a/pySim/cards.py b/pySim/cards.py
index b8a37d4..d222d6a 100644
--- a/pySim/cards.py
+++ b/pySim/cards.py
@@ -178,7 +178,7 @@
data, sw = self._scc.update_record(EF['SMSP'], 1, rpad(smsp, 84))
return sw
-def update_ad(self, mnc=None, opmode=None, ofm=None):
+def update_ad(self, mnc=None, opmode=None, ofm=None, path=EF['AD']):
"""
Update Administrative Data (AD)
@@ -191,6 +191,7 @@
mnc (str): MNC of IMSI
opmode (Hex-str, 1 Byte): MS Operation Mode
ofm (Hex-str, 1 Byte): Operational Feature Monitor (OFM) aka
Ciphering Indicator
+path (optional list with file path e.g. ['3f00', '7f20',
'6fad'])
Returns:
str: Return code of write operation
@@ -200,7 +201,7 @@
# read from card
raw_hex_data, sw = self._scc.read_binary(
-EF['AD'], length=None, offset=0)
+path, length=None, offset=0)
abstract_data = ad.decode_hex(raw_hex_data)
# perform updates
@@ -223,7 +224,7 @@
# write to card
raw_hex_data = ad.encode_hex(abstract_data)
-data, sw = self._scc.update_binary(EF['AD'], raw_hex_data)
+data, sw = self._scc.update_binary(path, raw_hex_data)
return sw
def read_spn(self):
@@ -1576,6 +1577,17 @@
data, sw = self.select_adf_by_aid(adf="usim")
if sw == '9000':
+# EF.AD in ADF.USIM
+if (p.get('mcc') and p.get('mnc')) or p.get('opmode'):
+ if p.get('mcc') and p.get('mnc'):
+ mnc = p['mnc']
+ else:
+ mnc = None
+sw = self.update_ad(mnc=mnc, opmode=p.get('opmode'),
+ path=EF_USIM_ADF_map['AD'])
+if sw != '9000':
+print("Programming AD failed with code %s" % sw)
+
# update EF-USIM_AUTH_KEY in ADF.USIM
if p.get('ki'):
self._scc.update_binary('af20', p['ki'], 1)
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/31004
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ic9dd4acc8d9a72acbb7376ddf3e2128125d4a8f5
Gerrit-Change-Number: 31004
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
Change in libosmo-gprs[master]: sndcp: Fix missing dep link against libmath
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31003 ) Change subject: sndcp: Fix missing dep link against libmath .. sndcp: Fix missing dep link against libmath It is already present in libosmo-gprs-sndcp.pc.in Libs.private, but it was forgotten at compile time. That makes it fail under some systems when linking against it (like jenkins): /build/deps/install/stow/libosmo-gprs/lib/libosmo-gprs-sndcp.so: undefined reference to `ceil' Change-Id: Iba9629b323b50b28cc4c54cf35b2e39ee89bc192 --- M src/sndcp/Makefile.am 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/03/31003/1 diff --git a/src/sndcp/Makefile.am b/src/sndcp/Makefile.am index 0395ef1..26ca24f 100644 --- a/src/sndcp/Makefile.am +++ b/src/sndcp/Makefile.am @@ -44,4 +44,5 @@ libosmo_gprs_sndcp_la_LIBADD = \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ + -lm \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Iba9629b323b50b28cc4c54cf35b2e39ee89bc192 Gerrit-Change-Number: 31003 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmocom-bb[master]: layer23: Introduce APN VTY node
Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30992 ) Change subject: layer23: Introduce APN VTY node .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7b4eaa0de428b418bb1d89bd544694e89beb3e6e Gerrit-Change-Number: 30992 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 17 Jan 2023 13:27:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Initial integration of tun device
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30996 ) Change subject: layer23: Initial integration of tun device .. Patch Set 3: (2 comments) File src/host/layer23/src/common/apn.c: https://gerrit.osmocom.org/c/osmocom-bb/+/30996/comment/0d350cbd_4c768368 PS3, Line 88: /* TODO: prepare & transmit SNDCP UNITDATA.req */ > unresolved TODO on purpose? Yes, this will be a follow-up step (actually another set of patches perhaps). https://gerrit.osmocom.org/c/osmocom-bb/+/30996/comment/49da02bc_9df1c524 PS3, Line 94: what > use "flags" instead of "what" here, so it's more descriptive? I realize that > it's also "what" in lib […] what is fine here imho, otherwise it may be confused with other types of flags, like recv()/send() ones. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I86cac406843157aa2e51727cf8ccac9804d7961d Gerrit-Change-Number: 30996 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Comment-Date: Tue, 17 Jan 2023 13:26:59 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment
Change in osmocom-bb[master]: Depend on libosmo-gprs-{llc,sndcp}
Attention is currently required from: pespin.
osmith has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30999 )
Change subject: Depend on libosmo-gprs-{llc,sndcp}
..
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30999
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I80811f73b798151257107bc94aedabe71fee0300
Gerrit-Change-Number: 30999
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-Attention: pespin
Gerrit-Comment-Date: Tue, 17 Jan 2023 13:26:30 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Initial integration of tun device
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30996 ) Change subject: layer23: Initial integration of tun device .. Patch Set 3: Code-Review+1 (2 comments) File src/host/layer23/src/common/apn.c: https://gerrit.osmocom.org/c/osmocom-bb/+/30996/comment/eb42a6cc_acf262cb PS3, Line 88: /* TODO: prepare & transmit SNDCP UNITDATA.req */ unresolved TODO on purpose? https://gerrit.osmocom.org/c/osmocom-bb/+/30996/comment/c5c41d2a_dd72c6da PS3, Line 94: what use "flags" instead of "what" here, so it's more descriptive? I realize that it's also "what" in libosmocore, but still -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I86cac406843157aa2e51727cf8ccac9804d7961d Gerrit-Change-Number: 30996 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 17 Jan 2023 13:25:26 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Introduce tun.{c,h}
Attention is currently required from: pespin.
osmith has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30994 )
Change subject: layer23: Introduce tun.{c,h}
..
Patch Set 3: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30994
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Id8611b720ada17a3c602872fe095bb91eeb17bcd
Gerrit-Change-Number: 30994
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-Comment-Date: Tue, 17 Jan 2023 13:17:53 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmo-ggsn[master]: Fix typos in comments and VTY descriptions
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/31002 )
Change subject: Fix typos in comments and VTY descriptions
..
Fix typos in comments and VTY descriptions
Change-Id: I359425152dc18d29c57047f1b10942480b7a61e5
---
M ggsn/ggsn.h
M ggsn/ggsn_vty.c
2 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/02/31002/1
diff --git a/ggsn/ggsn.h b/ggsn/ggsn.h
index 46f8778..1abbc9a 100644
--- a/ggsn/ggsn.h
+++ b/ggsn/ggsn.h
@@ -66,9 +66,9 @@
uint32_t apn_type_mask;
/* GTP-U via TUN device or in Linux kernel */
enum apn_gtpu_mode gtpu_mode;
- /* administratively shut-down (true) or not (false) */
+ /* administratively shut down (true) or not (false) */
bool shutdown;
- /* transmit G-PDU sequeence numbers (true) or not (false) */
+ /* transmit G-PDU sequence numbers (true) or not (false) */
bool tx_gpdu_seq;
} cfg;
@@ -128,7 +128,7 @@
char *state_dir;
/* Time between Echo requests on each SGSN */
unsigned int echo_interval;
- /* administratively shut-down (true) or not (false) */
+ /* administratively shut down (true) or not (false) */
bool shutdown;
} cfg;
diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c
index fb0caa2..2d49a94 100644
--- a/ggsn/ggsn_vty.c
+++ b/ggsn/ggsn_vty.c
@@ -299,7 +299,7 @@
DEFUN(cfg_ggsn_shutdown, cfg_ggsn_shutdown_cmd,
"shutdown ggsn",
- "Put the GGSN in administrative shut-down\n" GGSN_STR)
+ "Put the GGSN in administrative shutdown\n" GGSN_STR)
{
struct ggsn_ctx *ggsn = (struct ggsn_ctx *) vty->index;
@@ -316,7 +316,7 @@
DEFUN(cfg_ggsn_no_shutdown, cfg_ggsn_no_shutdown_cmd,
"no shutdown ggsn",
- NO_STR GGSN_STR "Remove the GGSN from administrative shut-down\n")
+ NO_STR GGSN_STR "Remove the GGSN from administrative shutdown\n")
{
struct ggsn_ctx *ggsn = (struct ggsn_ctx *) vty->index;
@@ -344,7 +344,7 @@
DEFUN(cfg_ggsn_show_sgsn, cfg_ggsn_show_sgsn_cmd,
"show sgsn",
- NO_STR GGSN_STR "Remove the GGSN from administrative shut-down\n")
+ NO_STR GGSN_STR "Remove the GGSN from administrative shutdown\n")
{
struct ggsn_ctx *ggsn = (struct ggsn_ctx *) vty->index;
struct sgsn_peer *sgsn;
@@ -681,7 +681,7 @@
DEFUN(cfg_apn_shutdown, cfg_apn_shutdown_cmd,
"shutdown",
- "Put the APN in administrative shut-down\n")
+ "Put the APN in administrative shutdown\n")
{
struct apn_ctx *apn = (struct apn_ctx *) vty->index;
@@ -698,7 +698,7 @@
DEFUN(cfg_apn_no_shutdown, cfg_apn_no_shutdown_cmd,
"no shutdown",
- NO_STR "Remove the APN from administrative shut-down\n")
+ NO_STR "Remove the APN from administrative shutdown\n")
{
struct apn_ctx *apn = (struct apn_ctx *) vty->index;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31002
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: I359425152dc18d29c57047f1b10942480b7a61e5
Gerrit-Change-Number: 31002
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmocom-bb[master]: layer23: Introduce netdev.{c,h}
Attention is currently required from: pespin.
osmith has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30993 )
Change subject: layer23: Introduce netdev.{c,h}
..
Patch Set 3: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30993
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I6085dc6861687bd4e9c32e86221c0375ad95ba22
Gerrit-Change-Number: 30993
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-Comment-Date: Tue, 17 Jan 2023 13:15:08 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Introduce APN VTY node
Attention is currently required from: osmith, fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/30992 to look at the new patch set (#4). Change subject: layer23: Introduce APN VTY node .. layer23: Introduce APN VTY node Change-Id: I7b4eaa0de428b418bb1d89bd544694e89beb3e6e --- M doc/examples/modem/modem.cfg M src/host/layer23/include/osmocom/bb/common/Makefile.am A src/host/layer23/include/osmocom/bb/common/apn.h M src/host/layer23/include/osmocom/bb/common/ms.h M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/include/osmocom/bb/modem/vty.h M src/host/layer23/src/common/Makefile.am A src/host/layer23/src/common/apn.c M src/host/layer23/src/common/ms.c M src/host/layer23/src/common/settings.c M src/host/layer23/src/modem/app_modem.c M src/host/layer23/src/modem/vty.c 12 files changed, 369 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/92/30992/4 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7b4eaa0de428b418bb1d89bd544694e89beb3e6e Gerrit-Change-Number: 30992 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: osmith Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
Change in osmocom-bb[master]: layer23: Introduce APN VTY node
Attention is currently required from: osmith, fixeria.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30992 )
Change subject: layer23: Introduce APN VTY node
..
Patch Set 3:
(3 comments)
File src/host/layer23/include/osmocom/bb/common/apn.h:
https://gerrit.osmocom.org/c/osmocom-bb/+/30992/comment/658b8428_5835d2b0
PS3, Line 49: shut-down
> this spelling looks weird, "shutdown" or "shut down"?
> https://en.wikipedia.org/wiki/Shutdown […]
Ack
https://gerrit.osmocom.org/c/osmocom-bb/+/30992/comment/02ee4398_4aca2cdb
PS3, Line 51: sequeence
> sequence
Ack
File src/host/layer23/src/common/apn.c:
https://gerrit.osmocom.org/c/osmocom-bb/+/30992/comment/88cbdce7_fd738219
PS3, Line 47: {
> should it remove itself from ms->gprs.apn_list here? […]
It's doing exactly that in the line below (48).
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30992
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I7b4eaa0de428b418bb1d89bd544694e89beb3e6e
Gerrit-Change-Number: 30992
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: fixeria
Gerrit-CC: osmith
Gerrit-Attention: osmith
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Tue, 17 Jan 2023 13:13:04 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith
Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Introduce APN VTY node
Attention is currently required from: pespin, fixeria.
osmith has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30992 )
Change subject: layer23: Introduce APN VTY node
..
Patch Set 3:
(3 comments)
File src/host/layer23/include/osmocom/bb/common/apn.h:
https://gerrit.osmocom.org/c/osmocom-bb/+/30992/comment/19cdf139_02da3fe3
PS3, Line 49: shut-down
this spelling looks weird, "shutdown" or "shut down"?
https://en.wikipedia.org/wiki/Shutdown
(but also not that important)
https://gerrit.osmocom.org/c/osmocom-bb/+/30992/comment/24f2ad6e_480f566e
PS3, Line 51: sequeence
sequence
File src/host/layer23/src/common/apn.c:
https://gerrit.osmocom.org/c/osmocom-bb/+/30992/comment/4176a35b_6387c65b
PS3, Line 47: {
should it remove itself from ms->gprs.apn_list here?
otherwise it looks like with "no apn ..." vty cmd, it will still be in apn_list
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30992
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I7b4eaa0de428b418bb1d89bd544694e89beb3e6e
Gerrit-Change-Number: 30992
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: fixeria
Gerrit-CC: osmith
Gerrit-Attention: pespin
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Tue, 17 Jan 2023 13:05:54 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Initial integration of tun device
Attention is currently required from: pespin. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30996 ) Change subject: layer23: Initial integration of tun device .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I86cac406843157aa2e51727cf8ccac9804d7961d Gerrit-Change-Number: 30996 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 17 Jan 2023 12:59:23 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bsc: Fix regression in TC_assignment_emerg_setup_deny_bts
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30997 )
Change subject: bsc: Fix regression in TC_assignment_emerg_setup_deny_bts
..
bsc: Fix regression in TC_assignment_emerg_setup_deny_bts
A recent commit introduced a regression which made
TC_assignment_emerg_setup_deny_bts fail.
The problematic commit (see hash below) set "pars.ra :=
f_rnd_ra_emerg()" in the helper function, which made the BSC early
reject the CHAN RQD with ImmAssRej in the case the BTS policy forbids
emergency calls.
In that scenario, rejection can be done early because there's no need to
wait to find out which MSC it is aimed at.
This scenario, however, is already being validated by test
TC_chan_rqd_emerg_deny.
The scenario TC_assignment_emerg_setup_deny_bts was testing is actually
one where CHAN RQD doesn't contain reason="emergency call", which means
BTS doesn't early reject it, but only knows about it being an emergency
call when a CC Emergency Setup is sent to it, time at which it releases
the call.
Hence, this commit sets back pars.ra = f_rnd_ra_emerg() only on the ..._deny_msc
testcase, since it's the only test really needing it.
Fixes: 14076d3b721030c5f0610403cbc7e75a6eed5351
Related: OS#5849
Change-Id: I8d342e5938f6293ae45ee399796417651768af5d
---
M bsc/BSC_Tests.ttcn
1 file changed, 10 insertions(+), 6 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index a9d7c9d..6902744 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -9249,10 +9249,6 @@
var PDU_BSSAP emerg_setup_data_ind_bssap;
timer T := 3.0;
- /* Make sure the CHAN RQD indicates an emergency call (0b101x). The
difference is that osmo-bsc directly
-* assigns a TCH lchan and establishing voice for the emergency call
will use Mode Modify, not reassignment to
-* another lchan. */
- g_pars.ra := f_rnd_ra_emerg();
f_assignment_emerg_setup();
T.start;
@@ -9316,12 +9312,19 @@
f_vty_allow_emerg_msc(false);
f_vty_allow_emerg_bts(true, 0);
+ /* Make sure the CHAN RQD indicates an emergency call (0b101x): */
+ pars.ra := f_rnd_ra_emerg();
vc_conn := f_start_handler(refers(f_TC_assignment_emerg_setup_deny),
pars);
vc_conn.done;
f_shutdown_helper();
}
-/* EMERGENCY CALL situation #3, allowed globally but forbidden by BTS */
+/* EMERGENCY CALL situation #3, allowed globally but forbidden by BTS.
+ * The RACH req (and hence CHAN RQD) indicate other than emergency call.
+ * Hence BSC only learns about it being an emergency call later during call
setup.
+ * If interested in the ra="emergency call" + deny bts policy case,
+ * see TC_chan_rqd_emerg_deny.
+ */
testcase TC_assignment_emerg_setup_deny_bts() runs on test_CT {
var TestHdlrParams pars := f_gen_test_hdlr_pars();
var MSC_ConnHdlr vc_conn;
@@ -9329,13 +9332,14 @@
/* Note: This simulates a spec violation by the MS, correct MS
* implementations would not try to establish an emergency call because
* the system information tells in advance that emergency calls are
-* not forbidden */
+* not allowed */
f_init(1, true);
f_sleep(1.0);
f_vty_allow_emerg_msc(true);
f_vty_allow_emerg_bts(false, 0);
+ /* Note: Here we implicitly leave default g_pars.ra which is different
than "emergency call" */
vc_conn := f_start_handler(refers(f_TC_assignment_emerg_setup_deny),
pars);
vc_conn.done;
f_shutdown_helper();
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30997
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: I8d342e5938f6293ae45ee399796417651768af5d
Gerrit-Change-Number: 30997
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: bsc: Fix regression in TC_assignment_emerg_setup_deny_bts
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30997 ) Change subject: bsc: Fix regression in TC_assignment_emerg_setup_deny_bts .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30997 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: I8d342e5938f6293ae45ee399796417651768af5d Gerrit-Change-Number: 30997 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 17 Jan 2023 12:55:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: network_create: set NET_NAME after next SUBNET
osmith has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/31000 )
Change subject: network_create: set NET_NAME after next SUBNET
..
network_create: set NET_NAME after next SUBNET
Put the current SUBNET into NET_NAME, not the previous one. Without this
patch it works too, but this makes more sense.
Related: OS#5802
Change-Id: I6c90505fd6c0ba62244ff67709b0bf31bf44b449
---
M jenkins-common.sh
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/jenkins-common.sh b/jenkins-common.sh
index 484e513..2eb9aad 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -200,8 +200,8 @@
network_create() {
SUBNET="$PPID"
for i in $(seq 1 30); do
- NET_NAME="$SUITE_NAME-$SUBNET"
SUBNET="$(echo "($SUBNET + 1) % 256" | bc)"
+ NET_NAME="$SUITE_NAME-$SUBNET"
SUB4="172.18.$SUBNET.0/24"
SUB6="fd02:db8:$SUBNET::/64"
set +x
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31000
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I6c90505fd6c0ba62244ff67709b0bf31bf44b449
Gerrit-Change-Number: 31000
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmocom-bb[master]: layer23: Move '(no) shutdown' VTY code to common/vty.c
Attention is currently required from: neels, pespin, msuraev. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30972 ) Change subject: layer23: Move '(no) shutdown' VTY code to common/vty.c .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib5c9b6f3efa255d67980945db9f98dd8a112af0e Gerrit-Change-Number: 30972 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: msuraev Gerrit-CC: neels Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Attention: msuraev Gerrit-Comment-Date: Tue, 17 Jan 2023 12:46:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: layer23: Move layer2-socket VTY command to common/
Attention is currently required from: neels, pespin, msuraev. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30978 ) Change subject: layer23: Move layer2-socket VTY command to common/ .. Patch Set 4: Code-Review+1 (1 comment) File src/host/layer23/src/common/vty.c: https://gerrit.osmocom.org/c/osmocom-bb/+/30978/comment/6f9cfc48_a9ccd9dd PS3, Line 55: l23_vty_restart > I'll submit renaming since this seem to be creating trouble. ah, didn't realize this was discussed before in the patch. the new name is better, thanks! -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If7419f8fc54a54eed68a076968d93dba5ac977b7 Gerrit-Change-Number: 30978 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-CC: msuraev Gerrit-CC: neels Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Attention: msuraev Gerrit-Comment-Date: Tue, 17 Jan 2023 12:45:52 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bsc: Fix regression in TC_assignment_emerg_setup_deny_bts
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30997 ) Change subject: bsc: Fix regression in TC_assignment_emerg_setup_deny_bts .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30997 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: I8d342e5938f6293ae45ee399796417651768af5d Gerrit-Change-Number: 30997 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 17 Jan 2023 12:44:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: network_create: set NET_NAME after next SUBNET
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31000 ) Change subject: network_create: set NET_NAME after next SUBNET .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6c90505fd6c0ba62244ff67709b0bf31bf44b449 Gerrit-Change-Number: 31000 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Tue, 17 Jan 2023 12:43:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: kernel_test_wait_for_vm: increase timeout to 15s
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31001 ) Change subject: kernel_test_wait_for_vm: increase timeout to 15s .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I823010106a99a4906e32198ed42b36f9fe662c4e Gerrit-Change-Number: 31001 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Tue, 17 Jan 2023 12:43:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
