laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/28095 )
Change subject: Add CBSP port number to default list of ports
......................................................................
Add CBSP port number to default list of ports
Change-Id: Ifff8eb076bef29a64d9d20237fe5c8ee402788dc
---
M common/chapters/port_numbers.adoc
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/95/28095/1
diff --git a/common/chapters/port_numbers.adoc b/common/chapters/port_numbers.adoc
index 477c3b3..5faf3cf 100644
--- a/common/chapters/port_numbers.adoc
+++ b/common/chapters/port_numbers.adoc
@@ -55,6 +55,7 @@
|UDP|4729|GSMTAP|Almost every osmocom project
|TCP|5000|A/IP|osmo-bsc, osmo-bsc_nat
|UDP|23000|GPRS-NS over IP default port|osmo-pcu, osmo-sgsn, osmo-gbproxy
+|TCP|48049|BSC-CBC (CBSP) default port|osmo-bsc, osmo-cbc
|===============
////
ATTENTION: Keep this list in sync with all of:
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/28095
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Change-Id: Ifff8eb076bef29a64d9d20237fe5c8ee402788dc
Gerrit-Change-Number: 28095
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newchange
Attention is currently required from: fixeria.
laforge has removed pespin from this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28094 )
Change subject: smscb: "Warning Security Information is always present in ETWS
......................................................................
Removed reviewer pespin.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28094
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ib1b8e4af37b1f9f9398b81dad29942e82218c70b
Gerrit-Change-Number: 28094
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: Jenkins Builder
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: deleteReviewer
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28094 )
Change subject: smscb: "Warning Security Information is always present in ETWS
......................................................................
smscb: "Warning Security Information is always present in ETWS
As per TS 48.049 Table 8.1.3.1.1 the WRITE-REPLACE message always
has a Warning Security Information IE if it relates to ETWS. This
is also implemented in the libosmocore CBSP parser.
As the previous Change Id369bb3676ba279bafc234378fbe21dbc7b0614b has
pointed out, the CBSP parser structure doesn't even permit any way
of handing a decoded message to us without the warning_sec_info
static struct member.
So as a result, there's also no need to dynamically allocate
bts_etws_state.input.sec_info via talloc. We can have it in-line
as a static struct member and reduce code complexity and runtime
memory allocations.
Change-Id: Ib1b8e4af37b1f9f9398b81dad29942e82218c70b
---
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/smscb.c
2 files changed, 4 insertions(+), 12 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/94/28094/1
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index cb20b9e..6df7c61 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -29,6 +29,7 @@
#include <osmocom/gsm/rxlev_stat.h>
#include <osmocom/gsm/protocol/gsm_08_58.h>
#include <osmocom/gsm/protocol/gsm_12_21.h>
+#include <osmocom/gsm/protocol/gsm_03_41.h>
#include <osmocom/abis/e1_input.h>
#include <osmocom/bsc/meas_rep.h>
#include <osmocom/bsc/acc.h>
@@ -1098,7 +1099,7 @@
uint16_t msg_id;
uint16_t serial_nr;
uint16_t warn_type;
- uint8_t *sec_info;
+ uint8_t sec_info[ETWS_SEC_INFO_SIZE];
} input;
/* encoded ETWS primary notification */
uint8_t primary[ETWS_PRIM_NOTIF_SIZE];
diff --git a/src/osmo-bsc/smscb.c b/src/osmo-bsc/smscb.c
index 3a06697..8e2eb0c 100644
--- a/src/osmo-bsc/smscb.c
+++ b/src/osmo-bsc/smscb.c
@@ -70,9 +70,7 @@
osmo_store16be(serial_nr, out);
etws->msg_id = osmo_htons(msg_id);
etws->warning_type = osmo_htons(warn_type);
-
- if (sec_info)
- memcpy(etws->data, sec_info, ETWS_PRIM_NOTIF_SIZE - sizeof(*etws));
+ memcpy(etws->data, sec_info, ETWS_PRIM_NOTIF_SIZE - sizeof(*etws));
return ETWS_PRIM_NOTIF_SIZE;
}
@@ -557,18 +555,11 @@
}
}
- if (bes->input.sec_info) {
- talloc_free(bes->input.sec_info);
- bes->input.sec_info = NULL;
- }
-
/* copy over all the data to per-BTS private state */
bes->input.msg_id = wrepl->msg_id;
bes->input.serial_nr = wrepl->new_serial_nr;
bes->input.warn_type = wrepl->u.emergency.warning_type;
- bes->input.sec_info = talloc_named_const(bts, ETWS_SEC_INFO_SIZE, "etws_sec_info");
- if (bes->input.sec_info)
- memcpy(bes->input.sec_info, wrepl->u.emergency.warning_sec_info, ETWS_SEC_INFO_SIZE);
+ memcpy(bes->input.sec_info, wrepl->u.emergency.warning_sec_info, sizeof(bes->input.sec_info));
/* generate the encoded ETWS PN */
gen_etws_primary_notification(bes->primary, bes->input.serial_nr, bes->input.msg_id,
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28094
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ib1b8e4af37b1f9f9398b81dad29942e82218c70b
Gerrit-Change-Number: 28094
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newchange
Attention is currently required from: fixeria.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28088 )
Change subject: smscb: fix meaningless condition in etws_primary_to_bts()
......................................................................
Patch Set 1: Code-Review+2
(1 comment)
Patchset:
PS1:
> The real bug is likely that libosmocore doesn't provide us with a way to detect if the received/deco […]
No, I was wrong. warning_sec_info is present for all emergency messages. so the check is indeed bogus.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28088
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Id369bb3676ba279bafc234378fbe21dbc7b0614b
Gerrit-Change-Number: 28088
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 13 May 2022 06:33:55 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28088 )
Change subject: smscb: fix meaningless condition in etws_primary_to_bts()
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
The real bug is likely that libosmocore doesn't provide us with a way to detect if the received/decoded CBSP message contained warning_sec_info or not.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28088
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Id369bb3676ba279bafc234378fbe21dbc7b0614b
Gerrit-Change-Number: 28088
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 13 May 2022 06:30:11 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28023 )
Change subject: abis_nm: run gsm_bts_check_cfg during oml bring up
......................................................................
abis_nm: run gsm_bts_check_cfg during oml bring up
Don't wait until RSL link goes up to check the reported features against
the config. Do it in the OML bring up right after the features are
reported.
Related: SYS#5922, OS#5538
Change-Id: I6b1b4ef3e163528ed186050d848ec089a4315a7c
---
M src/osmo-bsc/abis_nm.c
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c
index cdb1fa6..a460f3e 100644
--- a/src/osmo-bsc/abis_nm.c
+++ b/src/osmo-bsc/abis_nm.c
@@ -719,6 +719,12 @@
else
rc = parse_attr_resp_info_attr(bts, trx, foh, &tp);
+ if (gsm_bts_check_cfg(bts) != 0) {
+ LOGP(DLINP, LOGL_ERROR, "(bts=%u) BTS config invalid, dropping BTS!\n", bts->nr);
+ ipaccess_drop_oml_deferred(bts);
+ return -EINVAL;
+ }
+
osmo_signal_dispatch(SS_NM, S_NM_GET_ATTR_REP, mb);
return rc;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28023
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I6b1b4ef3e163528ed186050d848ec089a4315a7c
Gerrit-Change-Number: 28023
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged