<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hnodeb/+/26412">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Drop NAS and RANAP code and VTY commands<br><br>The higher level bits were used in originally imported hnb-test code in<br>order to control interaction with the HNBGW over the VTY. This is no<br>longer needed in osmo-hnodeb, as NAS is in layers above the ones being<br>handled by an hNodeB.<br>Regarding RANAP, most of it is going to be handled by the LowerLayer UD<br>socket peer to be introduced in the future, so we can drop most of it,<br>as in osmo-hnodeb we'll basically be speaking RUA to the HNBGW and<br>passing RANAP buffers transparently.<br>We keep the .c/.h files since some small helpers functions will be<br>ntroduced later on when adding support for the mentioned LL socket.<br><br>Related: SYS#5516<br>Change-Id: I6aae54734c1c4607beede19169f16bafe35b3a61<br>---<br>M include/osmocom/hnodeb/Makefile.am<br>M include/osmocom/hnodeb/hnodeb.h<br>D include/osmocom/hnodeb/nas.h<br>M include/osmocom/hnodeb/ranap.h<br>M include/osmocom/hnodeb/rua.h<br>M include/osmocom/hnodeb/vty.h<br>M src/osmo-hnodeb/Makefile.am<br>M src/osmo-hnodeb/debug.c<br>D src/osmo-hnodeb/nas.c<br>M src/osmo-hnodeb/ranap.c<br>M src/osmo-hnodeb/rua.c<br>M src/osmo-hnodeb/vty.c<br>12 files changed, 2 insertions(+), 550 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/hnodeb/Makefile.am b/include/osmocom/hnodeb/Makefile.am</span><br><span>index b1acb7e..6fa587d 100644</span><br><span>--- a/include/osmocom/hnodeb/Makefile.am</span><br><span>+++ b/include/osmocom/hnodeb/Makefile.am</span><br><span>@@ -3,7 +3,6 @@</span><br><span> hnbap.h \</span><br><span> hnodeb.h \</span><br><span> iuh.h \</span><br><span style="color: hsl(0, 100%, 40%);">- nas.h \</span><br><span> ranap.h \</span><br><span> rua.h \</span><br><span> vty.h \</span><br><span>diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h</span><br><span>index 3bc2fb3..a629b4e 100644</span><br><span>--- a/include/osmocom/hnodeb/hnodeb.h</span><br><span>+++ b/include/osmocom/hnodeb/hnodeb.h</span><br><span>@@ -34,7 +34,6 @@</span><br><span> DRUA,</span><br><span> DRANAP,</span><br><span> DSCTP,</span><br><span style="color: hsl(0, 100%, 40%);">- DNAS,</span><br><span> };</span><br><span> extern const struct log_info hnb_log_info;</span><br><span> </span><br><span>diff --git a/include/osmocom/hnodeb/nas.h b/include/osmocom/hnodeb/nas.h</span><br><span>deleted file mode 100644</span><br><span>index f6a7976..0000000</span><br><span>--- a/include/osmocom/hnodeb/nas.h</span><br><span>+++ /dev/null</span><br><span>@@ -1,24 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* (C) 2015 by Daniel Willmann <dwillmann@sysmocom.de></span><br><span style="color: hsl(0, 100%, 40%);">- * (C) 2021 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(0, 100%, 40%);">- * Author: Pau Espin Pedrol <pespin@sysmocom.de></span><br><span style="color: hsl(0, 100%, 40%);">- * All Rights Reserved</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(0, 100%, 40%);">- * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(0, 100%, 40%);">- * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(0, 100%, 40%);">- * (at your option) any later version.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(0, 100%, 40%);">- * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(0, 100%, 40%);">- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(0, 100%, 40%);">- * GNU Affero General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(0, 100%, 40%);">- * along with this program. If not, see <http://www.gnu.org/lienses/>.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#pragma once</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct hnb;</span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_nas_rx_dtap(struct hnb *hnb, void *data, int len);</span><br><span>diff --git a/include/osmocom/hnodeb/ranap.h b/include/osmocom/hnodeb/ranap.h</span><br><span>index 15e0609..474de70 100644</span><br><span>--- a/include/osmocom/hnodeb/ranap.h</span><br><span>+++ b/include/osmocom/hnodeb/ranap.h</span><br><span>@@ -19,15 +19,4 @@</span><br><span> */</span><br><span> #pragma once</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct hnb;</span><br><span style="color: hsl(0, 100%, 40%);">-struct ranap_message_s;</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/hnodeb/hnodeb.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_rx_iu_release(struct hnb *hnb);</span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_rx_paging(struct hnb *hnb, const char *imsi);</span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_rx_secmode_cmd(struct hnb *hnb, long ip_alg);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_rua_dt_handle_ranap(void *ctx, struct ranap_message_s *ranap_msg);</span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_rua_cl_handle_ranap(void *ctx, struct ranap_message_s *ranap_msg);</span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_tx_iu_release_req(struct hnb *hnb);</span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *gen_initue_lu(const struct hnb *hnb, int is_ps, uint32_t conn_id, const char *imsi);</span><br><span>diff --git a/include/osmocom/hnodeb/rua.h b/include/osmocom/hnodeb/rua.h</span><br><span>index 52221be..ea7e81c 100644</span><br><span>--- a/include/osmocom/hnodeb/rua.h</span><br><span>+++ b/include/osmocom/hnodeb/rua.h</span><br><span>@@ -25,4 +25,3 @@</span><br><span> struct msgb;</span><br><span> </span><br><span> int hnb_rua_rx(struct hnb *hnb, struct msgb *msg);</span><br><span style="color: hsl(0, 100%, 40%);">-int hnb_tx_dt(struct hnb *hnb, struct msgb *txm);</span><br><span>diff --git a/include/osmocom/hnodeb/vty.h b/include/osmocom/hnodeb/vty.h</span><br><span>index 7144d3f..e30019e 100644</span><br><span>--- a/include/osmocom/hnodeb/vty.h</span><br><span>+++ b/include/osmocom/hnodeb/vty.h</span><br><span>@@ -27,7 +27,6 @@</span><br><span> enum hnb_vty_nodes {</span><br><span> HNODEB_NODE = _LAST_OSMOVTY_NODE,</span><br><span> IUH_NODE,</span><br><span style="color: hsl(0, 100%, 40%);">- CHAN_NODE,</span><br><span> };</span><br><span> </span><br><span> void hnb_vty_init(void);</span><br><span>diff --git a/src/osmo-hnodeb/Makefile.am b/src/osmo-hnodeb/Makefile.am</span><br><span>index 7325728..82ccd37 100644</span><br><span>--- a/src/osmo-hnodeb/Makefile.am</span><br><span>+++ b/src/osmo-hnodeb/Makefile.am</span><br><span>@@ -35,7 +35,6 @@</span><br><span> hnb.c \</span><br><span> hnb_shutdown_fsm.c \</span><br><span> iuh.c \</span><br><span style="color: hsl(0, 100%, 40%);">- nas.c \</span><br><span> ranap.c \</span><br><span> rua.c \</span><br><span> vty.c \</span><br><span>diff --git a/src/osmo-hnodeb/debug.c b/src/osmo-hnodeb/debug.c</span><br><span>index 10d1655..45ccc0c 100644</span><br><span>--- a/src/osmo-hnodeb/debug.c</span><br><span>+++ b/src/osmo-hnodeb/debug.c</span><br><span>@@ -47,11 +47,6 @@</span><br><span> .color = "\033[1;36m",</span><br><span> .description = "SCTP connection on the Iuh link",</span><br><span> },</span><br><span style="color: hsl(0, 100%, 40%);">- [DNAS] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "NAS", .loglevel = LOGL_NOTICE, .enabled = 1,</span><br><span style="color: hsl(0, 100%, 40%);">- .color = "\033[1;32m",</span><br><span style="color: hsl(0, 100%, 40%);">- .description = "Non-Access Stratum",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span> };</span><br><span> </span><br><span> const struct log_info hnb_log_info = {</span><br><span>diff --git a/src/osmo-hnodeb/nas.c b/src/osmo-hnodeb/nas.c</span><br><span>deleted file mode 100644</span><br><span>index 293c46e..0000000</span><br><span>--- a/src/osmo-hnodeb/nas.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,268 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* (C) 2015 by Daniel Willmann <dwillmann@sysmocom.de></span><br><span style="color: hsl(0, 100%, 40%);">- * (C) 2021 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(0, 100%, 40%);">- * Author: Pau Espin Pedrol <pespin@sysmocom.de></span><br><span style="color: hsl(0, 100%, 40%);">- * All Rights Reserved</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(0, 100%, 40%);">- * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(0, 100%, 40%);">- * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(0, 100%, 40%);">- * (at your option) any later version.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(0, 100%, 40%);">- * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(0, 100%, 40%);">- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(0, 100%, 40%);">- * GNU Affero General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(0, 100%, 40%);">- * along with this program. If not, see <http://www.gnu.org/lienses/>.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include "config.h"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdlib.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <unistd.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdio.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/msgb.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/gsm/tlv.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/gsm/protocol/gsm_04_08.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/gsm/gsm48.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/crypt/auth.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/ranap/ranap_msg_factory.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/hnodeb/rua.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/hnodeb/ranap.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/hnodeb/nas.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/hnodeb/hnodeb.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static struct msgb *gen_nas_id_resp()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t id_resp[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_MM,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_MT_MM_ID_RESP,</span><br><span style="color: hsl(0, 100%, 40%);">- /* IMEISV */</span><br><span style="color: hsl(0, 100%, 40%);">- 0x09, /* len */</span><br><span style="color: hsl(0, 100%, 40%);">- 0x03, /* first digit (0000) + even (0) + id IMEISV (011) */</span><br><span style="color: hsl(0, 100%, 40%);">- 0x31, 0x91, 0x06, 0x00, 0x28, 0x47, 0x11, /* digits */</span><br><span style="color: hsl(0, 100%, 40%);">- 0xf2, /* filler (1111) + last digit (0010) */</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return ranap_new_msg_dt(0, id_resp, sizeof(id_resp));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static struct msgb *gen_nas_tmsi_realloc_compl()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t id_resp[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_MM,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_MT_MM_TMSI_REALL_COMPL,</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return ranap_new_msg_dt(0, id_resp, sizeof(id_resp));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static struct msgb *gen_nas_auth_resp(uint8_t *sres)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t id_resp[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_MM,</span><br><span style="color: hsl(0, 100%, 40%);">- 0x80 | GSM48_MT_MM_AUTH_RESP, /* simulate sequence nr 2 */</span><br><span style="color: hsl(0, 100%, 40%);">- 0x61, 0xb5, 0x69, 0xf5 /* hardcoded SRES */</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(id_resp + 2, sres, 4);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return ranap_new_msg_dt(0, id_resp, sizeof(id_resp));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static struct tlv_parsed *parse_mm(struct gsm48_hdr *gh, int len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- static struct tlv_parsed tp;</span><br><span style="color: hsl(0, 100%, 40%);">- int parse_res;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- len -= (const char *)&gh->data[0] - (const char *)gh;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(gsm48_hdr_pdisc(gh) == GSM48_PDISC_MM);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- parse_res = tlv_parse(&tp, &gsm48_mm_att_tlvdef, &gh->data[0], len, 0, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (parse_res <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t msg_type = gsm48_hdr_msg_type(gh);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNAS, LOGL_ERROR, "Error parsing MM message 0x%hhx: %d\n", msg_type, parse_res);</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return &tp;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int hnb_nas_rx_lu_accept(struct gsm48_hdr *gh, int len, int *sent_tmsi)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNAS, LOGL_INFO, " :D Location Update Accept :D\n");</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm48_loc_area_id *lai;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- lai = (struct gsm48_loc_area_id *)&gh->data[0];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_location_area_id laid;</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_decode_lai2(lai, &laid);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNAS, LOGL_INFO, "LU: mcc %s mnc %s lac %hd\n",</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mcc_name(laid.plmn.mcc), osmo_mnc_name(laid.plmn.mnc, laid.plmn.mnc_3_digits),</span><br><span style="color: hsl(0, 100%, 40%);">- laid.lac);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- struct tlv_parsed tp;</span><br><span style="color: hsl(0, 100%, 40%);">- int parse_res;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- len -= (const char *)&gh->data[0] - (const char *)gh;</span><br><span style="color: hsl(0, 100%, 40%);">- parse_res = tlv_parse(&tp, &gsm48_mm_att_tlvdef, &gh->data[0], len, 0, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (parse_res <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNAS, LOGL_ERROR, "Error parsing Location Update Accept message: %d\n", parse_res);</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (TLVP_PRESENT(&tp, GSM48_IE_MOBILE_ID)) {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t type = TLVP_VAL(&tp, GSM48_IE_NAME_SHORT)[0] & 0x0f;</span><br><span style="color: hsl(0, 100%, 40%);">- if (type == GSM_MI_TYPE_TMSI)</span><br><span style="color: hsl(0, 100%, 40%);">- *sent_tmsi = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- else *sent_tmsi = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_nas_rx_mm_info(struct gsm48_hdr *gh, int len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNAS, LOGL_INFO, " :) MM Info :)\n");</span><br><span style="color: hsl(0, 100%, 40%);">- struct tlv_parsed *tp = parse_mm(gh, len);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!tp)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (TLVP_PRESENT(tp, GSM48_IE_NAME_SHORT)) {</span><br><span style="color: hsl(0, 100%, 40%);">- char name[128] = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_7bit_decode_n(name, 127,</span><br><span style="color: hsl(0, 100%, 40%);">- TLVP_VAL(tp, GSM48_IE_NAME_SHORT)+1,</span><br><span style="color: hsl(0, 100%, 40%);">- (TLVP_LEN(tp, GSM48_IE_NAME_SHORT)-1)*8/7);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNAS, LOGL_INFO, "Info: Short Network Name: %s\n", name);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (TLVP_PRESENT(tp, GSM48_IE_NAME_LONG)) {</span><br><span style="color: hsl(0, 100%, 40%);">- char name[128] = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_7bit_decode_n(name, 127,</span><br><span style="color: hsl(0, 100%, 40%);">- TLVP_VAL(tp, GSM48_IE_NAME_LONG)+1,</span><br><span style="color: hsl(0, 100%, 40%);">- (TLVP_LEN(tp, GSM48_IE_NAME_LONG)-1)*8/7);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNAS, LOGL_INFO, "Info: Long Network Name: %s\n", name);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int hnb_nas_rx_auth_req(struct hnb *hnb, struct gsm48_hdr *gh,</span><br><span style="color: hsl(0, 100%, 40%);">- int len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm48_auth_req *ar;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- len -= (const char *)&gh->data[0] - (const char *)gh;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (len < sizeof(*ar)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNAS, LOGL_ERROR, "GSM48 Auth Req does not fit.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNAS, LOGL_INFO, " :) Authentication Request :)\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ar = (struct gsm48_auth_req*) &gh->data[0];</span><br><span style="color: hsl(0, 100%, 40%);">- int seq = ar->key_seq;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Generate SRES from *HARDCODED* Ki for Iuh testing */</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_auth_vector vec;</span><br><span style="color: hsl(0, 100%, 40%);">- /* Ki 000102030405060708090a0b0c0d0e0f */</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sub_auth_data auth = {</span><br><span style="color: hsl(0, 100%, 40%);">- .type = OSMO_AUTH_TYPE_GSM,</span><br><span style="color: hsl(0, 100%, 40%);">- .algo = OSMO_AUTH_ALG_COMP128v1,</span><br><span style="color: hsl(0, 100%, 40%);">- .u.gsm.ki = {</span><br><span style="color: hsl(0, 100%, 40%);">- 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,</span><br><span style="color: hsl(0, 100%, 40%);">- 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d,</span><br><span style="color: hsl(0, 100%, 40%);">- 0x0e, 0x0f</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- memset(&vec, 0, sizeof(vec));</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_auth_gen_vec(&vec, &auth, ar->rand);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNAS, LOGL_DEBUG, "seq %d rand %s",</span><br><span style="color: hsl(0, 100%, 40%);">- seq, osmo_hexdump(ar->rand, sizeof(ar->rand)));</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNAS, LOGL_DEBUG, " --> sres %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_hexdump(vec.sres, 4));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return hnb_tx_dt(hnb, gen_nas_auth_resp(vec.sres));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int hnb_nas_rx_mm(struct hnb *hnb, struct gsm48_hdr *gh, int len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct hnb_chan *chan;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- chan = hnb->cs.chan;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!chan) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNAS, LOGL_ERROR, "hnb_nas_rx_mm(): No CS channel established yet.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(!chan->is_ps);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t msg_type = gsm48_hdr_msg_type(gh);</span><br><span style="color: hsl(0, 100%, 40%);">- int sent_tmsi;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (msg_type) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_MT_MM_ID_REQ:</span><br><span style="color: hsl(0, 100%, 40%);">- return hnb_tx_dt(hnb, gen_nas_id_resp());</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_MT_MM_LOC_UPD_ACCEPT:</span><br><span style="color: hsl(0, 100%, 40%);">- if (hnb_nas_rx_lu_accept(gh, len, &sent_tmsi))</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- if (sent_tmsi)</span><br><span style="color: hsl(0, 100%, 40%);">- return hnb_tx_dt(hnb, gen_nas_tmsi_realloc_compl());</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_MT_MM_LOC_UPD_REJECT:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNAS, LOGL_INFO, "Received Location Update Reject\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_MT_MM_INFO:</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_nas_rx_mm_info(gh, len);</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_tx_iu_release_req(hnb);</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_MT_MM_AUTH_REQ:</span><br><span style="color: hsl(0, 100%, 40%);">- return hnb_nas_rx_auth_req(hnb, gh, len);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNAS, LOGL_INFO, "04.08 message type not handled by hnb-test: 0x%x\n",</span><br><span style="color: hsl(0, 100%, 40%);">- msg_type);</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_nas_rx_dtap(struct hnb *hnb, void *data, int len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNAS, LOGL_INFO, "got %d bytes: %s\n", len, osmo_hexdump(data, len));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- // nas_pdu == '05 08 12' ==> IMEI Identity request</span><br><span style="color: hsl(0, 100%, 40%);">- // '05 04 0d' ==> LU reject</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm48_hdr *gh = data;</span><br><span style="color: hsl(0, 100%, 40%);">- if (len < sizeof(*gh)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNAS, LOGL_ERROR, "hnb_nas_rx_dtap(): NAS PDU is too short: %d. Ignoring.\n",</span><br><span style="color: hsl(0, 100%, 40%);">- len);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t pdisc = gsm48_hdr_pdisc(gh);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (pdisc) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_PDISC_MM:</span><br><span style="color: hsl(0, 100%, 40%);">- rc = hnb_nas_rx_mm(hnb, gh, len);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc != 0)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNAS, LOGL_ERROR, "Error receiving MM message: %d\n", rc);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNAS, LOGL_NOTICE, "04.08 discriminator not handled by hnb-test: %d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- pdisc);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/osmo-hnodeb/ranap.c b/src/osmo-hnodeb/ranap.c</span><br><span>index b5b7b9c..99c4bab 100644</span><br><span>--- a/src/osmo-hnodeb/ranap.c</span><br><span>+++ b/src/osmo-hnodeb/ranap.c</span><br><span>@@ -25,152 +25,5 @@</span><br><span> #include <osmocom/ranap/iu_helpers.h></span><br><span> #include <osmocom/ranap/ranap_msg_factory.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/hnodeb/nas.h></span><br><span> #include <osmocom/hnodeb/rua.h></span><br><span> #include <osmocom/hnodeb/ranap.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static const char *printstr(OCTET_STRING_t *s)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_hexdump((const unsigned char*)s->buf, s->size);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define PP(octet_string_t) \</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRANAP, LOGL_INFO, #octet_string_t " = %s\n",\</span><br><span style="color: hsl(0, 100%, 40%);">- printstr(&octet_string_t))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_rua_dt_handle_ranap(void *ctx, struct ranap_message_s *ranap_msg)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct hnb *hnb = (struct hnb *)ctx;</span><br><span style="color: hsl(0, 100%, 40%);">- int len;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *data;</span><br><span style="color: hsl(0, 100%, 40%);">- RANAP_PermittedIntegrityProtectionAlgorithms_t *algs;</span><br><span style="color: hsl(0, 100%, 40%);">- RANAP_IntegrityProtectionAlgorithm_t *first_alg;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRANAP, LOGL_INFO, "rx ranap_msg->procedureCode %d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ranap_msg->procedureCode);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (ranap_msg->procedureCode) {</span><br><span style="color: hsl(0, 100%, 40%);">- case RANAP_ProcedureCode_id_DirectTransfer:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRANAP, LOGL_INFO, "rx DirectTransfer: presence = %hx\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ranap_msg->msg.directTransferIEs.presenceMask);</span><br><span style="color: hsl(0, 100%, 40%);">- PP(ranap_msg->msg.directTransferIEs.nas_pdu);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- len = ranap_msg->msg.directTransferIEs.nas_pdu.size;</span><br><span style="color: hsl(0, 100%, 40%);">- data = ranap_msg->msg.directTransferIEs.nas_pdu.buf;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_nas_rx_dtap(hnb, data, len);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case RANAP_ProcedureCode_id_SecurityModeControl:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRANAP, LOGL_INFO, "rx SecurityModeControl: presence = %hx\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ranap_msg->msg.securityModeCommandIEs.presenceMask);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Just pick the first available IP alg, don't care about</span><br><span style="color: hsl(0, 100%, 40%);">- * encryption (yet?) */</span><br><span style="color: hsl(0, 100%, 40%);">- algs = &ranap_msg->msg.securityModeCommandIEs.integrityProtectionInformation.permittedAlgorithms;</span><br><span style="color: hsl(0, 100%, 40%);">- if (algs->list.count < 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRANAP, LOGL_INFO, "Security Mode Command: No permitted algorithms.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- first_alg = *algs->list.array;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_rx_secmode_cmd(hnb, *first_alg);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case RANAP_ProcedureCode_id_Iu_Release:</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_rx_iu_release(hnb);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_rua_cl_handle_ranap(void *ctx, struct ranap_message_s *ranap_msg)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct hnb *hnb = (struct hnb *)ctx;</span><br><span style="color: hsl(0, 100%, 40%);">- char imsi[16];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRANAP, LOGL_INFO, "rx ranap_msg->procedureCode %d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ranap_msg->procedureCode);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (ranap_msg->procedureCode) {</span><br><span style="color: hsl(0, 100%, 40%);">- case RANAP_ProcedureCode_id_Paging:</span><br><span style="color: hsl(0, 100%, 40%);">- if (ranap_msg->msg.pagingIEs.permanentNAS_UE_ID.present == RANAP_PermanentNAS_UE_ID_PR_iMSI) {</span><br><span style="color: hsl(0, 100%, 40%);">- ranap_bcd_decode(imsi, sizeof(imsi),</span><br><span style="color: hsl(0, 100%, 40%);">- ranap_msg->msg.pagingIEs.permanentNAS_UE_ID.choice.iMSI.buf,</span><br><span style="color: hsl(0, 100%, 40%);">- ranap_msg->msg.pagingIEs.permanentNAS_UE_ID.choice.iMSI.size);</span><br><span style="color: hsl(0, 100%, 40%);">- } else imsi[0] = '\0';</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRANAP, LOGL_INFO, "rx Paging: presence=%hx domain=%ld IMSI=%s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ranap_msg->msg.pagingIEs.presenceMask,</span><br><span style="color: hsl(0, 100%, 40%);">- ranap_msg->msg.pagingIEs.cN_DomainIndicator,</span><br><span style="color: hsl(0, 100%, 40%);">- imsi</span><br><span style="color: hsl(0, 100%, 40%);">- );</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_rx_paging(hnb, imsi);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *gen_initue_lu(const struct hnb *hnb, int is_ps, uint32_t conn_id, const char *imsi)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t lu[] = { GSM48_PDISC_MM, GSM48_MT_MM_LOC_UPD_REQUEST,</span><br><span style="color: hsl(0, 100%, 40%);">- 0x70, 0x62, 0xf2, 0x30, 0xff, 0xf3, 0x57,</span><br><span style="color: hsl(0, 100%, 40%);">- /* len, IMSI/type, IMSI-------------------------------- */</span><br><span style="color: hsl(0, 100%, 40%);">- 0x08, 0x29, 0x26, 0x24, 0x10, 0x32, 0x54, 0x76, 0x98,</span><br><span style="color: hsl(0, 100%, 40%);">- 0x33, 0x03, 0x57, 0x18 , 0xb2 };</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t plmn_id[3];</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_plmn_to_bcd(plmn_id, &hnb->plmn);</span><br><span style="color: hsl(0, 100%, 40%);">- RANAP_GlobalRNC_ID_t rnc_id = {</span><br><span style="color: hsl(0, 100%, 40%);">- .rNC_ID = g_hnb->rnc_id,</span><br><span style="color: hsl(0, 100%, 40%);">- .pLMNidentity.buf = plmn_id,</span><br><span style="color: hsl(0, 100%, 40%);">- .pLMNidentity.size = sizeof(plmn_id),</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: patch imsi */</span><br><span style="color: hsl(0, 100%, 40%);">- /* Note: the Mobile Identitiy IE's IMSI data has the identity type and</span><br><span style="color: hsl(0, 100%, 40%);">- * an even/odd indicator bit encoded in the first octet. So the first</span><br><span style="color: hsl(0, 100%, 40%);">- * octet looks like this:</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * 8 7 6 5 | 4 | 3 2 1</span><br><span style="color: hsl(0, 100%, 40%);">- * IMSI-digit | even/odd | type</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * followed by the remaining IMSI digits.</span><br><span style="color: hsl(0, 100%, 40%);">- * If digit count is even (bit 4 == 0), that first high-nibble is 0xf.</span><br><span style="color: hsl(0, 100%, 40%);">- * (derived from Iu pcap Location Update Request msg and TS 25.413)</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * TODO I'm only 90% sure about this</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return ranap_new_msg_initial_ue(conn_id, is_ps, &rnc_id, lu, sizeof(lu));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_tx_iu_release_req(struct hnb *hnb)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- RANAP_Cause_t cause = {</span><br><span style="color: hsl(0, 100%, 40%);">- .present = RANAP_Cause_PR_radioNetwork,</span><br><span style="color: hsl(0, 100%, 40%);">- .choice.transmissionNetwork = RANAP_CauseRadioNetwork_release_due_to_UE_generated_signalling_connection_release,</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_tx_dt(hnb, ranap_new_msg_iu_rel_req(&cause));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_tx_iu_release_compl(struct hnb *hnb)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_tx_dt(hnb, ranap_new_msg_iu_rel_compl());</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_rx_secmode_cmd(struct hnb *hnb, long ip_alg)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRANAP, LOGL_INFO, " :) Security Mode Command :)\n");</span><br><span style="color: hsl(0, 100%, 40%);">- /* not caring about encryption yet, just pass 0 for No Encryption. */</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_tx_dt(hnb, ranap_new_msg_sec_mod_compl(ip_alg, 0));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_rx_iu_release(struct hnb *hnb)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_tx_iu_release_compl(hnb);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_rx_paging(struct hnb *hnb, const char *imsi)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRANAP, LOGL_INFO, " :) Paging Request for %s :)\n", imsi);</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO reply */</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/osmo-hnodeb/rua.c b/src/osmo-hnodeb/rua.c</span><br><span>index 907cd60..9bf5403 100644</span><br><span>--- a/src/osmo-hnodeb/rua.c</span><br><span>+++ b/src/osmo-hnodeb/rua.c</span><br><span>@@ -21,6 +21,7 @@</span><br><span> #include <errno.h></span><br><span> </span><br><span> #include <asn1c/ANY.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <asn1c/asn1helpers.h></span><br><span> </span><br><span> #include <osmocom/rua/rua_ies_defs.h></span><br><span> #include <osmocom/ranap/ranap_common_cn.h></span><br><span>@@ -29,22 +30,7 @@</span><br><span> #include <osmocom/hnodeb/rua.h></span><br><span> #include <osmocom/hnodeb/ranap.h></span><br><span> #include <osmocom/hnodeb/iuh.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int hnb_tx_dt(struct hnb *hnb, struct msgb *txm)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct hnb_chan *chan;</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *rua;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- chan = hnb->cs.chan;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!chan) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRUA, LOGL_INFO, "hnb_nas_tx_tmsi_realloc_compl(): No CS channel established yet.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rua = rua_new_dt(chan->is_ps, chan->conn_id, txm);</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_iuh_send(hnb, rua);</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hnodeb/hnodeb.h></span><br><span> </span><br><span> static void hnb_rua_dt_handle(struct hnb *hnb, ANY_t *in)</span><br><span> {</span><br><span>@@ -57,7 +43,6 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = ranap_cn_rx_co(hnb_rua_dt_handle_ranap, hnb, ies.ranaP_Message.buf, ies.ranaP_Message.size);</span><br><span> </span><br><span> /* FIXME: what to do with the asn1c-allocated memory */</span><br><span> rua_free_directtransferies(&ies);</span><br><span>@@ -74,7 +59,6 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = ranap_cn_rx_cl(hnb_rua_cl_handle_ranap, hnb, ies.ranaP_Message.buf, ies.ranaP_Message.size);</span><br><span> </span><br><span> /* FIXME: what to do with the asn1c-allocated memory */</span><br><span> rua_free_connectionlesstransferies(&ies);</span><br><span>diff --git a/src/osmo-hnodeb/vty.c b/src/osmo-hnodeb/vty.c</span><br><span>index e11fc2d..93ec25f 100644</span><br><span>--- a/src/osmo-hnodeb/vty.c</span><br><span>+++ b/src/osmo-hnodeb/vty.c</span><br><span>@@ -270,41 +270,9 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct cmd_node chan_node = {</span><br><span style="color: hsl(0, 100%, 40%);">- CHAN_NODE,</span><br><span style="color: hsl(0, 100%, 40%);">- "%s(chan)> ",</span><br><span style="color: hsl(0, 100%, 40%);">- 1,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define HNBAP_STR "HNBAP related commands\n"</span><br><span style="color: hsl(0, 100%, 40%);">-#define HNB_STR "HomeNodeB commands\n"</span><br><span style="color: hsl(0, 100%, 40%);">-#define UE_STR "User Equipment commands\n"</span><br><span> #define RANAP_STR "RANAP related commands\n"</span><br><span> #define CSPS_STR "Circuit Switched\n" "Packet Switched\n"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(hnb_register, hnb_register_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "hnbap hnb register", HNBAP_STR HNB_STR "Send HNB-REGISTER REQUEST")</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_send_register_req(g_hnb);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(hnb_deregister, hnb_deregister_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "hnbap hnb deregister", HNBAP_STR HNB_STR "Send HNB-DEREGISTER REQUEST")</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_send_deregister_req(g_hnb);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(ue_register, ue_register_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "hnbap ue register IMSI", HNBAP_STR UE_STR "Send UE-REGISTER REQUEST")</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_ue_register_tx(g_hnb, argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span> </span><br><span> DEFUN(asn_dbg, asn_dbg_cmd,</span><br><span> "asn-debug (1|0)", "Enable or disable libasn1c debugging")</span><br><span>@@ -336,40 +304,6 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(chan, chan_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "channel (cs|ps) lu imsi IMSI",</span><br><span style="color: hsl(0, 100%, 40%);">- "Open a new Signalling Connection\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "To Circuit-Switched CN\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "To Packet-Switched CN\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "Performing a Location Update\n"</span><br><span style="color: hsl(0, 100%, 40%);">- )</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct hnb_chan *chan;</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg, *rua;</span><br><span style="color: hsl(0, 100%, 40%);">- static uint16_t conn_id = 42;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- chan = talloc_zero(tall_hnb_ctx, struct hnb_chan);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!strcmp(argv[0], "ps"))</span><br><span style="color: hsl(0, 100%, 40%);">- chan->is_ps = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- chan->imsi = talloc_strdup(chan, argv[1]);</span><br><span style="color: hsl(0, 100%, 40%);">- chan->conn_id = conn_id;</span><br><span style="color: hsl(0, 100%, 40%);">- conn_id++;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- msg = gen_initue_lu(g_hnb, chan->is_ps, chan->conn_id, chan->imsi);</span><br><span style="color: hsl(0, 100%, 40%);">- rua = rua_new_conn(chan->is_ps, chan->conn_id, msg);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_iuh_send(g_hnb, rua);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- vty->index = chan;</span><br><span style="color: hsl(0, 100%, 40%);">- vty->node = CHAN_NODE;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!chan->is_ps)</span><br><span style="color: hsl(0, 100%, 40%);">- g_hnb->cs.chan = chan;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> void hnb_vty_init(void)</span><br><span> {</span><br><span> install_element(CONFIG_NODE, &cfg_hnodeb_cmd);</span><br><span>@@ -389,11 +323,5 @@</span><br><span> install_element(IUH_NODE, &cfg_hnodeb_iuh_remote_port_cmd);</span><br><span> </span><br><span> install_element_ve(&asn_dbg_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element_ve(&hnb_register_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element_ve(&hnb_deregister_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element_ve(&ue_register_cmd);</span><br><span> install_element_ve(&ranap_reset_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element_ve(&chan_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- install_node(&chan_node, NULL);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hnodeb/+/26412">change 26412</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-hnodeb/+/26412"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hnodeb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I6aae54734c1c4607beede19169f16bafe35b3a61 </div>
<div style="display:none"> Gerrit-Change-Number: 26412 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>