<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hnodeb/+/26001">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Allocate g_hnb as a pointer, move code to hnb.c/h<br><br>Change-Id: I5ec61d2a72d55d182e1498939209b30b6e652467<br>---<br>M include/osmocom/hnodeb/hnodeb.h<br>M src/osmo-hnodeb/Makefile.am<br>A src/osmo-hnodeb/hnb.c<br>M src/osmo-hnodeb/main.c<br>M src/osmo-hnodeb/vty.c<br>5 files changed, 178 insertions(+), 127 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/01/26001/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h</span><br><span>index b283145..261fc3a 100644</span><br><span>--- a/include/osmocom/hnodeb/hnodeb.h</span><br><span>+++ b/include/osmocom/hnodeb/hnodeb.h</span><br><span>@@ -97,6 +97,8 @@</span><br><span> struct hnb_chan *chan;</span><br><span> } cs;</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+struct hnb *hnb_alloc(void *tall_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+int hnb_connect(struct hnb *hnb);</span><br><span> </span><br><span> void hnb_rx_iu_release(struct hnb *hnb);</span><br><span> void hnb_rx_paging(struct hnb *hnb, const char *imsi);</span><br><span>@@ -106,4 +108,4 @@</span><br><span> struct msgb *gen_initue_lu(int is_ps, uint32_t conn_id, const char *imsi);</span><br><span> </span><br><span> extern void *tall_hnb_ctx;</span><br><span style="color: hsl(0, 100%, 40%);">-extern struct hnb g_hnb;</span><br><span style="color: hsl(120, 100%, 40%);">+extern struct hnb *g_hnb;</span><br><span>diff --git a/src/osmo-hnodeb/Makefile.am b/src/osmo-hnodeb/Makefile.am</span><br><span>index d782a4a..54c7083 100644</span><br><span>--- a/src/osmo-hnodeb/Makefile.am</span><br><span>+++ b/src/osmo-hnodeb/Makefile.am</span><br><span>@@ -32,6 +32,7 @@</span><br><span> main.c \</span><br><span> debug.c \</span><br><span> hnbap.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ hnb.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/hnb.c b/src/osmo-hnodeb/hnb.c</span><br><span>new file mode 100644</span><br><span>index 0000000..335fd3a</span><br><span>--- /dev/null</span><br><span>+++ b/src/osmo-hnodeb/hnb.c</span><br><span>@@ -0,0 +1,161 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/* (C) 2015 by Daniel Willmann <dwillmann@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2021 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ * Author: Pau Espin Pedrol <pespin@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU Affero General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program. If not, see <http://www.gnu.org/lienses/>.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include "config.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <sys/types.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <sys/socket.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <netinet/in.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <netinet/sctp.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <arpa/inet.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/socket.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/talloc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/netif/stream.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hnodeb/hnbap.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hnodeb/rua.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hnodeb/hnodeb.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int sctp_sock_init(int fd)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sctp_event_subscribe event;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* subscribe for all events */</span><br><span style="color: hsl(120, 100%, 40%);">+ memset((uint8_t *)&event, 1, sizeof(event));</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = setsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS,</span><br><span style="color: hsl(120, 100%, 40%);">+ &event, sizeof(event));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int hnb_read_cb(struct osmo_fd *fd)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct hnb *hnb = fd->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sctp_sndrcvinfo sinfo;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = msgb_alloc(IUH_MSGB_SIZE, "Iuh rx");</span><br><span style="color: hsl(120, 100%, 40%);">+ int flags = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msg)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOMEM;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = sctp_recvmsg(fd->fd, msgb_data(msg), msgb_tailroom(msg),</span><br><span style="color: hsl(120, 100%, 40%);">+ NULL, NULL, &sinfo, &flags);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "Error during sctp_recvmsg()\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: clean up after disappeared HNB */</span><br><span style="color: hsl(120, 100%, 40%);">+ close(fd->fd);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_unregister(fd);</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (rc == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_INFO, "Connection to HNB closed\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ close(fd->fd);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_unregister(fd);</span><br><span style="color: hsl(120, 100%, 40%);">+ fd->fd = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put(msg, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & MSG_NOTIFICATION) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_DEBUG, "Ignoring SCTP notification\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ sinfo.sinfo_ppid = ntohl(sinfo.sinfo_ppid);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (sinfo.sinfo_ppid) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case IUH_PPI_HNBAP:</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("HNBAP message received\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = hnb_hnbap_rx(hnb, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case IUH_PPI_RUA:</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("RUA message received\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = hnb_rua_rx(hnb, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case IUH_PPI_SABP:</span><br><span style="color: hsl(120, 100%, 40%);">+ case IUH_PPI_RNA:</span><br><span style="color: hsl(120, 100%, 40%);">+ case IUH_PPI_PUA:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "Unimplemented SCTP PPID=%u received\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ sinfo.sinfo_ppid);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "Unknown SCTP PPID=%u received\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ sinfo.sinfo_ppid);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int hnb_write_cb(struct osmo_fd *fd, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* struct hnb *ctx = fd->data; */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sctp_sndrcvinfo sinfo = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .sinfo_ppid = htonl(msgb_sctp_ppid(msg)),</span><br><span style="color: hsl(120, 100%, 40%);">+ .sinfo_stream = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("Sending: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg)));</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = sctp_send(fd->fd, msgb_data(msg), msgb_length(msg),</span><br><span style="color: hsl(120, 100%, 40%);">+ &sinfo, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* we don't need to msgb_free(), write_queue does this for us */</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct hnb *hnb_alloc(void *tall_ctx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct hnb *hnb;</span><br><span style="color: hsl(120, 100%, 40%);">+ hnb = talloc_zero(tall_ctx, struct hnb);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!hnb)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ hnb->gw_addr = "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ hnb->gw_port = IUH_DEFAULT_SCTP_PORT,</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_wqueue_init(&hnb->wqueue, 16);</span><br><span style="color: hsl(120, 100%, 40%);">+ hnb->wqueue.bfd.data = hnb;</span><br><span style="color: hsl(120, 100%, 40%);">+ hnb->wqueue.read_cb = hnb_read_cb;</span><br><span style="color: hsl(120, 100%, 40%);">+ hnb->wqueue.write_cb = hnb_write_cb;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return hnb;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int hnb_connect(struct hnb *hnb)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_sock_init_ofd(&hnb->wqueue.bfd, AF_INET, SOCK_STREAM,</span><br><span style="color: hsl(120, 100%, 40%);">+ IPPROTO_SCTP, hnb->gw_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ hnb->gw_port, OSMO_SOCK_F_CONNECT);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ sctp_sock_init(hnb->wqueue.bfd.fd);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/osmo-hnodeb/main.c b/src/osmo-hnodeb/main.c</span><br><span>index 3abfc7c..dc662aa 100644</span><br><span>--- a/src/osmo-hnodeb/main.c</span><br><span>+++ b/src/osmo-hnodeb/main.c</span><br><span>@@ -28,20 +28,11 @@</span><br><span> #include <errno.h></span><br><span> #include <signal.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include <sys/types.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <sys/socket.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <netinet/in.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <netinet/sctp.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <arpa/inet.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #include <osmocom/core/application.h></span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include <osmocom/core/select.h></span><br><span> #include <osmocom/core/logging.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/socket.h></span><br><span> #include <osmocom/core/msgb.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/write_queue.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/netif/stream.h></span><br><span> #include <osmocom/gsm/tlv.h></span><br><span> #include <osmocom/gsm/gsm48.h></span><br><span> </span><br><span>@@ -72,11 +63,7 @@</span><br><span> #include <osmocom/hnodeb/hnodeb.h></span><br><span> </span><br><span> void *tall_hnb_ctx;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct hnb g_hnb = {</span><br><span style="color: hsl(0, 100%, 40%);">- .gw_addr = "127.0.0.1",</span><br><span style="color: hsl(0, 100%, 40%);">- .gw_port = IUH_DEFAULT_SCTP_PORT,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(120, 100%, 40%);">+struct hnb *g_hnb;</span><br><span> </span><br><span> struct msgb *rua_new_udt(struct msgb *inmsg);</span><br><span> </span><br><span>@@ -130,7 +117,7 @@</span><br><span> }</span><br><span> </span><br><span> rua = rua_new_dt(chan->is_ps, chan->conn_id, txm);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_wqueue_enqueue(&g_hnb.wqueue, rua);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_wqueue_enqueue(&hnb->wqueue, rua);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -360,105 +347,11 @@</span><br><span> </span><br><span> extern void direct_transfer_nas_pdu_print(ANY_t *in);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int hnb_read_cb(struct osmo_fd *fd)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct hnb *hnb = fd->data;</span><br><span style="color: hsl(0, 100%, 40%);">- struct sctp_sndrcvinfo sinfo;</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = msgb_alloc(IUH_MSGB_SIZE, "Iuh rx");</span><br><span style="color: hsl(0, 100%, 40%);">- int flags = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!msg)</span><br><span style="color: hsl(0, 100%, 40%);">- return -ENOMEM;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rc = sctp_recvmsg(fd->fd, msgb_data(msg), msgb_tailroom(msg),</span><br><span style="color: hsl(0, 100%, 40%);">- NULL, NULL, &sinfo, &flags);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_ERROR, "Error during sctp_recvmsg()\n");</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: clean up after disappeared HNB */</span><br><span style="color: hsl(0, 100%, 40%);">- close(fd->fd);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fd_unregister(fd);</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (rc == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_INFO, "Connection to HNB closed\n");</span><br><span style="color: hsl(0, 100%, 40%);">- close(fd->fd);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fd_unregister(fd);</span><br><span style="color: hsl(0, 100%, 40%);">- fd->fd = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_put(msg, rc);</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 (flags & MSG_NOTIFICATION) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_DEBUG, "Ignoring SCTP notification\n");</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(msg);</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%);">- sinfo.sinfo_ppid = ntohl(sinfo.sinfo_ppid);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (sinfo.sinfo_ppid) {</span><br><span style="color: hsl(0, 100%, 40%);">- case IUH_PPI_HNBAP:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("HNBAP message received\n");</span><br><span style="color: hsl(0, 100%, 40%);">- rc = hnb_hnbap_rx(hnb, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case IUH_PPI_RUA:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA message received\n");</span><br><span style="color: hsl(0, 100%, 40%);">- rc = hnb_rua_rx(hnb, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case IUH_PPI_SABP:</span><br><span style="color: hsl(0, 100%, 40%);">- case IUH_PPI_RNA:</span><br><span style="color: hsl(0, 100%, 40%);">- case IUH_PPI_PUA:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_ERROR, "Unimplemented SCTP PPID=%u received\n",</span><br><span style="color: hsl(0, 100%, 40%);">- sinfo.sinfo_ppid);</span><br><span style="color: hsl(0, 100%, 40%);">- rc = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_ERROR, "Unknown SCTP PPID=%u received\n",</span><br><span style="color: hsl(0, 100%, 40%);">- sinfo.sinfo_ppid);</span><br><span style="color: hsl(0, 100%, 40%);">- rc = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</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%);">- msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</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_write_cb(struct osmo_fd *fd, struct msgb *msg)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- /* struct hnb *ctx = fd->data; */</span><br><span style="color: hsl(0, 100%, 40%);">- struct sctp_sndrcvinfo sinfo = {</span><br><span style="color: hsl(0, 100%, 40%);">- .sinfo_ppid = htonl(msgb_sctp_ppid(msg)),</span><br><span style="color: hsl(0, 100%, 40%);">- .sinfo_stream = 0,</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%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Sending: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg)));</span><br><span style="color: hsl(0, 100%, 40%);">- rc = sctp_send(fd->fd, msgb_data(msg), msgb_length(msg),</span><br><span style="color: hsl(0, 100%, 40%);">- &sinfo, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- /* we don't need to msgb_free(), write_queue does this for us */</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static struct vty_app_info vty_info = {</span><br><span> .name = "OsmohNodeB",</span><br><span> .version = "0",</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int sctp_sock_init(int fd)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct sctp_event_subscribe event;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* subscribe for all events */</span><br><span style="color: hsl(0, 100%, 40%);">- memset((uint8_t *)&event, 1, sizeof(event));</span><br><span style="color: hsl(0, 100%, 40%);">- rc = setsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS,</span><br><span style="color: hsl(0, 100%, 40%);">- &event, sizeof(event));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> </span><br><span> struct msgb *gen_initue_lu(int is_ps, uint32_t conn_id, const char *imsi)</span><br><span> {</span><br><span>@@ -509,10 +402,10 @@</span><br><span> </span><br><span> switch (c) {</span><br><span> case 'u':</span><br><span style="color: hsl(0, 100%, 40%);">- g_hnb.ues = atoi(optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hnb->ues = atoi(optarg);</span><br><span> break;</span><br><span> case 'g':</span><br><span style="color: hsl(0, 100%, 40%);">- g_hnb.gw_addr = optarg;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hnb->gw_addr = optarg;</span><br><span> break;</span><br><span> }</span><br><span> }</span><br><span>@@ -538,6 +431,8 @@</span><br><span> log_set_print_category(osmo_stderr_target, 0);</span><br><span> log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ g_hnb = hnb_alloc(tall_hnb_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> vty_init(&vty_info);</span><br><span> hnb_vty_init();</span><br><span> </span><br><span>@@ -549,19 +444,11 @@</span><br><span> </span><br><span> handle_options(argc, argv);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_wqueue_init(&g_hnb.wqueue, 16);</span><br><span style="color: hsl(0, 100%, 40%);">- g_hnb.wqueue.bfd.data = &g_hnb;</span><br><span style="color: hsl(0, 100%, 40%);">- g_hnb.wqueue.read_cb = hnb_read_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- g_hnb.wqueue.write_cb = hnb_write_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmo_sock_init_ofd(&g_hnb.wqueue.bfd, AF_INET, SOCK_STREAM,</span><br><span style="color: hsl(0, 100%, 40%);">- IPPROTO_SCTP, g_hnb.gw_addr,</span><br><span style="color: hsl(0, 100%, 40%);">- g_hnb.gw_port, OSMO_SOCK_F_CONNECT);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = hnb_connect(g_hnb);</span><br><span> if (rc < 0) {</span><br><span> perror("Error connecting to Iuh port");</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- sctp_sock_init(g_hnb.wqueue.bfd.fd);</span><br><span> </span><br><span> while (1) {</span><br><span> rc = osmo_select_main(0);</span><br><span>diff --git a/src/osmo-hnodeb/vty.c b/src/osmo-hnodeb/vty.c</span><br><span>index a1bb885..b8dc7da 100644</span><br><span>--- a/src/osmo-hnodeb/vty.c</span><br><span>+++ b/src/osmo-hnodeb/vty.c</span><br><span>@@ -51,7 +51,7 @@</span><br><span> DEFUN(hnb_register, hnb_register_cmd,</span><br><span> "hnbap hnb register", HNBAP_STR HNB_STR "Send HNB-REGISTER REQUEST")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_send_register_req(&g_hnb);</span><br><span style="color: hsl(120, 100%, 40%);">+ hnb_send_register_req(g_hnb);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -59,7 +59,7 @@</span><br><span> DEFUN(hnb_deregister, hnb_deregister_cmd,</span><br><span> "hnbap hnb deregister", HNBAP_STR HNB_STR "Send HNB-DEREGISTER REQUEST")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_send_deregister_req(&g_hnb);</span><br><span style="color: hsl(120, 100%, 40%);">+ hnb_send_deregister_req(g_hnb);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -67,7 +67,7 @@</span><br><span> DEFUN(ue_register, ue_register_cmd,</span><br><span> "hnbap ue register IMSI", HNBAP_STR UE_STR "Send UE-REGISTER REQUEST")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_ue_register_tx(&g_hnb, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ hnb_ue_register_tx(g_hnb, argv[0]);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -97,7 +97,7 @@</span><br><span> msg = ranap_new_msg_reset(is_ps, &cause);</span><br><span> rua = rua_new_udt(msg);</span><br><span> //msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_wqueue_enqueue(&g_hnb.wqueue, rua);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_wqueue_enqueue(&g_hnb->wqueue, rua);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -124,13 +124,13 @@</span><br><span> msg = gen_initue_lu(chan->is_ps, chan->conn_id, chan->imsi);</span><br><span> rua = rua_new_conn(chan->is_ps, chan->conn_id, msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_wqueue_enqueue(&g_hnb.wqueue, rua);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_wqueue_enqueue(&g_hnb->wqueue, rua);</span><br><span> </span><br><span> vty->index = chan;</span><br><span> vty->node = CHAN_NODE;</span><br><span> </span><br><span> if (!chan->is_ps)</span><br><span style="color: hsl(0, 100%, 40%);">- g_hnb.cs.chan = chan;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hnb->cs.chan = chan;</span><br><span> </span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hnodeb/+/26001">change 26001</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/+/26001"/><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: I5ec61d2a72d55d182e1498939209b30b6e652467 </div>
<div style="display:none"> Gerrit-Change-Number: 26001 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>