Change in osmo-bsc[master]: Implement RR Classmark Enquiry
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/10910 )
Change subject: Implement RR Classmark Enquiry
..
Implement RR Classmark Enquiry
If the MSC sends a BSSMAP Classmark Request, send an RR Classmark Enquiry to
the MS.
(The reverse direction, i.e. sending a BSSMAP Classmark Update back to the MSC,
is already implemented.)
Related: OS#3043 (A5/3 encryption)
Related: osmo-ttcn3-hacks Idaab4d568cf986b4897ba008f6262c839d1592fb
Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf
---
M include/osmocom/bsc/gsm_04_08_rr.h
M src/osmo-bsc/gsm_04_08_rr.c
M src/osmo-bsc/osmo_bsc_bssap.c
3 files changed, 19 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
Vadim Yanitskiy: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
diff --git a/include/osmocom/bsc/gsm_04_08_rr.h
b/include/osmocom/bsc/gsm_04_08_rr.h
index 7b7a62f..e2e861d 100644
--- a/include/osmocom/bsc/gsm_04_08_rr.h
+++ b/include/osmocom/bsc/gsm_04_08_rr.h
@@ -21,6 +21,7 @@
uint8_t *classmark2_lv);
int gsm48_handle_paging_resp(struct gsm_subscriber_connection *conn,
struct msgb *msg, struct bsc_subscr *bsub);
+int gsm48_send_rr_classmark_enquiry(struct gsm_lchan *lchan);
int gsm48_send_rr_ciph_mode(struct gsm_lchan *lchan, int want_imeisv);
int gsm48_multirate_config(uint8_t *lv, const struct amr_multirate_conf *mr,
const struct amr_mode *modes);
struct msgb *gsm48_make_ho_cmd(struct gsm_lchan *new_lchan, uint8_t
power_command, uint8_t ho_ref);
diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c
index 2b4a1ba..35044a3 100644
--- a/src/osmo-bsc/gsm_04_08_rr.c
+++ b/src/osmo-bsc/gsm_04_08_rr.c
@@ -273,6 +273,21 @@
return rsl_siemens_mrpci(lchan, );
}
+/* 3GPP 44.018 9.1.12 Classmark Enquiry */
+int gsm48_send_rr_classmark_enquiry(struct gsm_lchan *lchan)
+{
+ struct msgb *msg = gsm48_msgb_alloc_name("GSM 44.018 Classmark
Enquiry");
+ struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh));
+
+ msg->lchan = lchan;
+ gh->proto_discr = GSM48_PDISC_RR;
+ gh->msg_type = GSM48_MT_RR_CLSM_ENQ;
+
+ DEBUGP(DRR, "%s TX CLASSMARK ENQUIRY %u\n", gsm_lchan_name(lchan),
msgb_length(msg));
+
+ return gsm48_sendmsg(msg);
+}
+
/* Chapter 9.1.9: Ciphering Mode Command */
int gsm48_send_rr_ciph_mode(struct gsm_lchan *lchan, int want_imeisv)
{
diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c
index d6b0b6d..97daa5c 100644
--- a/src/osmo-bsc/osmo_bsc_bssap.c
+++ b/src/osmo-bsc/osmo_bsc_bssap.c
@@ -870,6 +870,9 @@
case BSS_MAP_MSG_HANDOVER_CMD:
ret = bssmap_handle_handover_cmd(conn, msg, length);
break;
+ case BSS_MAP_MSG_CLASSMARK_RQST:
+ ret = gsm48_send_rr_classmark_enquiry(conn->lchan);
+ break;
default:
LOGP(DMSC, LOGL_NOTICE, "Unimplemented msg type: %s\n",
gsm0808_bssmap_name(msg->l4h[0]));
--
To view, visit https://gerrit.osmocom.org/10910
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf
Gerrit-Change-Number: 10910
Gerrit-PatchSet: 2
Gerrit-Owner: Neels Hofmeyr
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr
Gerrit-Reviewer: Vadim Yanitskiy
Change in osmo-bsc[master]: Implement RR Classmark Enquiry
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10910 ) Change subject: Implement RR Classmark Enquiry .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf Gerrit-Change-Number: 10910 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Sep 2018 20:33:09 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bsc[master]: Implement RR Classmark Enquiry
Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10910 ) Change subject: Implement RR Classmark Enquiry .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf Gerrit-Change-Number: 10910 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Sep 2018 16:06:54 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bsc[master]: Implement RR Classmark Enquiry
Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10910 ) Change subject: Implement RR Classmark Enquiry .. Patch Set 2: tested by https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/11012 -- To view, visit https://gerrit.osmocom.org/10910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf Gerrit-Change-Number: 10910 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 18 Sep 2018 12:38:46 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-bsc[master]: Implement RR Classmark Enquiry
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10910 to look at the new patch set (#2). Change subject: Implement RR Classmark Enquiry .. Implement RR Classmark Enquiry If the MSC sends a BSSMAP Classmark Request, send an RR Classmark Enquiry to the MS. (The reverse direction, i.e. sending a BSSMAP Classmark Update back to the MSC, is already implemented.) Related: OS#3043 (A5/3 encryption) Related: osmo-ttcn3-hacks Idaab4d568cf986b4897ba008f6262c839d1592fb Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf --- M include/osmocom/bsc/gsm_04_08_rr.h M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/osmo_bsc_bssap.c 3 files changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/10/10910/2 -- To view, visit https://gerrit.osmocom.org/10910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf Gerrit-Change-Number: 10910 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102)
Change in osmo-bsc[master]: Implement RR Classmark Enquiry
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10910 ) Change subject: Implement RR Classmark Enquiry .. Patch Set 1: Code-Review+1 cvan we please right away introduce a BSC_Tests.ttcn testing for this newly-supported message? -- To view, visit https://gerrit.osmocom.org/10910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf Gerrit-Change-Number: 10910 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Comment-Date: Thu, 13 Sep 2018 13:53:47 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bsc[master]: Implement RR Classmark Enquiry
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10910 ) Change subject: Implement RR Classmark Enquiry .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf Gerrit-Change-Number: 10910 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Comment-Date: Thu, 13 Sep 2018 13:53:04 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bsc[master]: Implement RR Classmark Enquiry
Neels Hofmeyr has uploaded this change for review. (
https://gerrit.osmocom.org/10910
Change subject: Implement RR Classmark Enquiry
..
Implement RR Classmark Enquiry
If the MSC sends a BSSMAP Classmark Request, send an RR Classmark Enquiry to
the MS.
(The reverse direction, i.e. sending a BSSMAP Classmark Update back to the MSC,
is already implemented.)
Related: OS#3043 (A5/3 encryption)
Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf
---
M include/osmocom/bsc/gsm_04_08_rr.h
M src/osmo-bsc/gsm_04_08_rr.c
M src/osmo-bsc/osmo_bsc_bssap.c
3 files changed, 19 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/10/10910/1
diff --git a/include/osmocom/bsc/gsm_04_08_rr.h
b/include/osmocom/bsc/gsm_04_08_rr.h
index 7b7a62f..e2e861d 100644
--- a/include/osmocom/bsc/gsm_04_08_rr.h
+++ b/include/osmocom/bsc/gsm_04_08_rr.h
@@ -21,6 +21,7 @@
uint8_t *classmark2_lv);
int gsm48_handle_paging_resp(struct gsm_subscriber_connection *conn,
struct msgb *msg, struct bsc_subscr *bsub);
+int gsm48_send_rr_classmark_enquiry(struct gsm_lchan *lchan);
int gsm48_send_rr_ciph_mode(struct gsm_lchan *lchan, int want_imeisv);
int gsm48_multirate_config(uint8_t *lv, const struct amr_multirate_conf *mr,
const struct amr_mode *modes);
struct msgb *gsm48_make_ho_cmd(struct gsm_lchan *new_lchan, uint8_t
power_command, uint8_t ho_ref);
diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c
index 2b4a1ba..35044a3 100644
--- a/src/osmo-bsc/gsm_04_08_rr.c
+++ b/src/osmo-bsc/gsm_04_08_rr.c
@@ -273,6 +273,21 @@
return rsl_siemens_mrpci(lchan, );
}
+/* 3GPP 44.018 9.1.12 Classmark Enquiry */
+int gsm48_send_rr_classmark_enquiry(struct gsm_lchan *lchan)
+{
+ struct msgb *msg = gsm48_msgb_alloc_name("GSM 44.018 Classmark
Enquiry");
+ struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh));
+
+ msg->lchan = lchan;
+ gh->proto_discr = GSM48_PDISC_RR;
+ gh->msg_type = GSM48_MT_RR_CLSM_ENQ;
+
+ DEBUGP(DRR, "%s TX CLASSMARK ENQUIRY %u\n", gsm_lchan_name(lchan),
msgb_length(msg));
+
+ return gsm48_sendmsg(msg);
+}
+
/* Chapter 9.1.9: Ciphering Mode Command */
int gsm48_send_rr_ciph_mode(struct gsm_lchan *lchan, int want_imeisv)
{
diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c
index d6b0b6d..97daa5c 100644
--- a/src/osmo-bsc/osmo_bsc_bssap.c
+++ b/src/osmo-bsc/osmo_bsc_bssap.c
@@ -870,6 +870,9 @@
case BSS_MAP_MSG_HANDOVER_CMD:
ret = bssmap_handle_handover_cmd(conn, msg, length);
break;
+ case BSS_MAP_MSG_CLASSMARK_RQST:
+ ret = gsm48_send_rr_classmark_enquiry(conn->lchan);
+ break;
default:
LOGP(DMSC, LOGL_NOTICE, "Unimplemented msg type: %s\n",
gsm0808_bssmap_name(msg->l4h[0]));
--
To view, visit https://gerrit.osmocom.org/10910
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf
Gerrit-Change-Number: 10910
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr
