<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hnodeb/+/26671">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add initial support for IuUP RTP based Transport Layer<br><br>Use the recently introduced IuUP support in libosmocore to send and receive<br>proper IuUP over RTP instead of regular RTP.<br>The LLSK AUDIO primitives are updated to provide required information<br>back and forth.<br><br>Depends: libosmocore.git Change-Id Ibe356fa7b1abaca0091e368db8478e79c09c6cb0<br>Related: SYS#5516<br>Change-Id: Ie137809e1f91dfd702853c52be97ca79e8604eab<br>---<br>M TODO-RELEASE<br>M include/osmocom/hnodeb/hnb_prim.h<br>M include/osmocom/hnodeb/llsk.h<br>M include/osmocom/hnodeb/rtp.h<br>M src/osmo-hnodeb/llsk_audio.c<br>M src/osmo-hnodeb/rtp.c<br>6 files changed, 158 insertions(+), 18 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/71/26671/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/TODO-RELEASE b/TODO-RELEASE</span><br><span>index 9e75c9a..d847efe 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -8,3 +8,4 @@</span><br><span> # If any interfaces have been removed or changed since the last public release: c:r:0.</span><br><span> #library what description / commit summary line</span><br><span> libosmo-netif >1.1.0 use of netif/sctp.h</span><br><span style="color: hsl(120, 100%, 40%);">+libosmocore > 1.6.0 use of core/iuup.h</span><br><span>diff --git a/include/osmocom/hnodeb/hnb_prim.h b/include/osmocom/hnodeb/hnb_prim.h</span><br><span>index 0b0a545..ba3223d 100644</span><br><span>--- a/include/osmocom/hnodeb/hnb_prim.h</span><br><span>+++ b/include/osmocom/hnodeb/hnb_prim.h</span><br><span>@@ -186,12 +186,23 @@</span><br><span> };</span><br><span> </span><br><span> /* HNB_AUDIO_PRIM_CONN_ESTABLISH, UL */</span><br><span style="color: hsl(120, 100%, 40%);">+#define HNB_MAX_RFCIS 64</span><br><span style="color: hsl(120, 100%, 40%);">+#define HNB_MAX_SUBFLOWS 7</span><br><span> struct hnb_audio_conn_establish_req_param {</span><br><span> uint32_t context_id;</span><br><span> uint16_t remote_rtp_port;</span><br><span> uint8_t spare1;</span><br><span> uint8_t remote_rtp_address_type; /* enum u_addr_type */</span><br><span> union u_addr remote_rtp_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* IuUP related: */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t transparent; /* 1=transparent; 0=SMpSDU */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t data_pdu_type;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t supported_versions_mask; /* host byte order */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t num_rfci;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t num_subflows;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t subflow_sizes[HNB_MAX_RFCIS][HNB_MAX_SUBFLOWS];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t IPTIs_present; /* 1=present; 0=not present */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t IPTIs[HNB_MAX_RFCIS]; /* values range 0-15, 4 bits */</span><br><span> } __attribute__ ((packed));</span><br><span> </span><br><span> /* HNB_AUDIO_PRIM_CONN_ESTABLISH, DL */</span><br><span>@@ -212,6 +223,10 @@</span><br><span> /* HNB_AUDIO_PRIM_CONN_DATA, UL */</span><br><span> struct hnb_audio_conn_data_req_param {</span><br><span> uint32_t audio_conn_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t frame_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t fqc;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t rfci;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t spare;</span><br><span> uint32_t data_len; /* RTP payload length in bytes */</span><br><span> uint8_t data[0]; /* RTP payload (aka IP packet) */</span><br><span> } __attribute__ ((packed));</span><br><span>@@ -219,6 +234,10 @@</span><br><span> /* HNB_AUDIO_PRIM_CONN_DATA, DL */</span><br><span> struct hnb_audio_conn_data_ind_param {</span><br><span> uint32_t audio_conn_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t frame_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t fqc;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t rfci;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t spare;</span><br><span> uint32_t data_len; /* RTP payload length in bytes */</span><br><span> uint8_t data[0]; /* RTP payload (aka IP packet) */</span><br><span> } __attribute__ ((packed));</span><br><span>diff --git a/include/osmocom/hnodeb/llsk.h b/include/osmocom/hnodeb/llsk.h</span><br><span>index fe1dce1..78eb065 100644</span><br><span>--- a/include/osmocom/hnodeb/llsk.h</span><br><span>+++ b/include/osmocom/hnodeb/llsk.h</span><br><span>@@ -53,7 +53,8 @@</span><br><span> </span><br><span> extern const struct value_string hnb_audio_prim_type_names[];</span><br><span> int llsk_rx_audio(struct hnb *hnb, struct osmo_prim_hdr *oph);</span><br><span style="color: hsl(0, 100%, 40%);">-int llsk_audio_tx_conn_data_ind(struct rtp_conn *conn, const uint8_t *payload, uint32_t len);</span><br><span style="color: hsl(120, 100%, 40%);">+int llsk_audio_tx_conn_data_ind(struct rtp_conn *conn, uint8_t frame_nr, uint8_t fqc, uint8_t rfci,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *payload, uint32_t len);</span><br><span> </span><br><span> extern const struct value_string hnb_gtp_prim_type_names[];</span><br><span> int llsk_rx_gtp(struct hnb *hnb, struct osmo_prim_hdr *oph);</span><br><span>diff --git a/include/osmocom/hnodeb/rtp.h b/include/osmocom/hnodeb/rtp.h</span><br><span>index 8035175..5eaec7b 100644</span><br><span>--- a/include/osmocom/hnodeb/rtp.h</span><br><span>+++ b/include/osmocom/hnodeb/rtp.h</span><br><span>@@ -18,8 +18,11 @@</span><br><span> */</span><br><span> #pragma once</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdint.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <osmocom/core/socket.h></span><br><span> #include <osmocom/core/linuxlist.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hnodeb/hnb_prim.h></span><br><span> </span><br><span> struct hnb;</span><br><span> struct hnb_ue;</span><br><span>@@ -31,9 +34,11 @@</span><br><span> struct osmo_rtp_socket *socket;</span><br><span> struct osmo_sockaddr loc_addr;</span><br><span> struct osmo_sockaddr rem_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_iuup_instance *iui;</span><br><span> };</span><br><span> </span><br><span> struct rtp_conn *rtp_conn_alloc(struct hnb_ue *ue);</span><br><span> void rtp_conn_free(struct rtp_conn *conn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int rtp_conn_setup(struct rtp_conn *conn, const struct osmo_sockaddr *rem_addr);</span><br><span style="color: hsl(120, 100%, 40%);">+int rtp_conn_setup(struct rtp_conn *conn, const struct osmo_sockaddr *rem_addr, const struct hnb_audio_conn_establish_req_param *ce_req);</span><br><span style="color: hsl(120, 100%, 40%);">+int rtp_conn_tx_data(struct rtp_conn *conn, uint8_t frame_nr, uint8_t fqc, uint8_t rfci, const uint8_t *data, unsigned int data_len);</span><br><span>diff --git a/src/osmo-hnodeb/llsk_audio.c b/src/osmo-hnodeb/llsk_audio.c</span><br><span>index a600c3c..da54d28 100644</span><br><span>--- a/src/osmo-hnodeb/llsk_audio.c</span><br><span>+++ b/src/osmo-hnodeb/llsk_audio.c</span><br><span>@@ -101,13 +101,16 @@</span><br><span> }</span><br><span> </span><br><span> static struct hnb_audio_prim *hnb_audio_makeprim_conn_data_ind(uint32_t audio_conn_id,</span><br><span style="color: hsl(0, 100%, 40%);">- const uint8_t *data,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t data_len)</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t frame_nr, uint8_t fqc, uint8_t rfci,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *data, uint32_t data_len)</span><br><span> {</span><br><span> struct hnb_audio_prim *audio_prim;</span><br><span> </span><br><span> audio_prim = hnb_audio_prim_alloc(HNB_AUDIO_PRIM_CONN_DATA, PRIM_OP_INDICATION, data_len);</span><br><span> audio_prim->u.conn_data_ind.audio_conn_id = audio_conn_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ audio_prim->u.conn_data_ind.frame_nr = frame_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ audio_prim->u.conn_data_ind.fqc = fqc;</span><br><span style="color: hsl(120, 100%, 40%);">+ audio_prim->u.conn_data_ind.rfci = rfci;</span><br><span> audio_prim->u.conn_data_ind.data_len = data_len;</span><br><span> if (data_len) {</span><br><span> msgb_put(audio_prim->hdr.msg, data_len);</span><br><span>@@ -117,13 +120,15 @@</span><br><span> return audio_prim;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int llsk_audio_tx_conn_data_ind(struct rtp_conn *conn, const uint8_t *payload, uint32_t len)</span><br><span style="color: hsl(120, 100%, 40%);">+int llsk_audio_tx_conn_data_ind(struct rtp_conn *conn, uint8_t frame_nr, uint8_t fqc, uint8_t rfci,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *payload, uint32_t len)</span><br><span> {</span><br><span> struct hnb_audio_prim *audio_prim;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGUE(conn->ue, DLLSK, LOGL_INFO, "Tx AUDIO-CONN_DATA.ind\n");</span><br><span style="color: hsl(0, 100%, 40%);">- audio_prim = hnb_audio_makeprim_conn_data_ind(conn->id, payload, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGUE(conn->ue, DLLSK, LOGL_DEBUG, "Tx AUDIO-CONN_DATA.ind conn_id=%u fn=%u fqc=%u rfci=%u data_len=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->id, frame_nr, fqc, rfci, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ audio_prim = hnb_audio_makeprim_conn_data_ind(conn->id, frame_nr, fqc, rfci, payload, len);</span><br><span> if ((rc = osmo_prim_srv_send(conn->ue->hnb->llsk, audio_prim->hdr.msg)) < 0)</span><br><span> LOGUE(conn->ue, DLLSK, LOGL_ERROR, "Failed sending AUDIO-CONN_DATA.ind\n");</span><br><span> return rc;</span><br><span>@@ -186,7 +191,7 @@</span><br><span> </span><br><span> /* Create the socket: */</span><br><span> conn = rtp_conn_alloc(ue);</span><br><span style="color: hsl(0, 100%, 40%);">- if ((rc = rtp_conn_setup(conn, &rem_osa)) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((rc = rtp_conn_setup(conn, &rem_osa, ce_req)) < 0) {</span><br><span> LOGUE(ue, DLLSK, LOGL_ERROR, "Rx AUDIO-CONN_ESTABLISH.req: Failed to set up audio socket rem_addr=%s\n",</span><br><span> rem_addrstr);</span><br><span> return _send_conn_establish_cnf_failed(hnb, ce_req->context_id, 4);</span><br><span>@@ -248,14 +253,8 @@</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: transmit data_req->data through RTP/Iu-UP socket */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmo_rtp_send_frame_ext(conn->socket, data_req->data,</span><br><span style="color: hsl(0, 100%, 40%);">- data_req->data_len, GSM_RTP_DURATION, false);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGUE(conn->ue, DLLSK, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Rx AUDIO-CONN_DATA.req: Failed sending RTP frame! id=%u data_len=%u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- data_req->audio_conn_id, data_req->data_len);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Transmit data_req->data through RTP/Iu-UP socket */</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = rtp_conn_tx_data(conn, data_req->frame_nr, data_req->fqc, data_req->rfci, data_req->data, data_req->data_len);</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-hnodeb/rtp.c b/src/osmo-hnodeb/rtp.c</span><br><span>index 41fb668..837a555 100644</span><br><span>--- a/src/osmo-hnodeb/rtp.c</span><br><span>+++ b/src/osmo-hnodeb/rtp.c</span><br><span>@@ -22,14 +22,88 @@</span><br><span> #include <errno.h></span><br><span> #include <sys/socket.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/prim.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/iuup.h></span><br><span> #include <osmocom/trau/osmo_ortp.h></span><br><span> </span><br><span> #include <osmocom/hnodeb/rtp.h></span><br><span> #include <osmocom/hnodeb/hnodeb.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define HNB_IUUP_MSGB_SIZE 4096</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static struct osmo_iuup_rnl_prim *llsk_audio_ce_to_iuup_rnl_cfg(void *ctx, const struct hnb_audio_conn_establish_req_param *ce_req)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_iuup_rnl_prim *irp;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_iuup_rnl_config *cfg;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ irp = osmo_iuup_rnl_prim_alloc(ctx, OSMO_IUUP_RNL_CONFIG, PRIM_OP_REQUEST, HNB_IUUP_MSGB_SIZE);</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg = &irp->u.config;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->transparent = !!ce_req->transparent;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->active = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->data_pdu_type = ce_req->data_pdu_type;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->supported_versions_mask = ce_req->supported_versions_mask;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->num_rfci = ce_req->num_rfci;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->num_subflows = ce_req->num_subflows;</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(cfg->num_rfci <= ARRAY_SIZE(cfg->subflow_sizes));</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(cfg->num_subflows <= ARRAY_SIZE(cfg->subflow_sizes[0]));</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i< cfg->num_rfci; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&cfg->subflow_sizes[i][0], &ce_req->subflow_sizes[i][0], cfg->num_subflows*sizeof(uint16_t));</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->IPTIs_present = ce_req->IPTIs_present;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cfg->IPTIs_present)</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(cfg->IPTIs, ce_req->IPTIs, cfg->num_rfci);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->t_init = (struct osmo_iuup_rnl_config_timer){ .t_ms = IUUP_TIMER_INIT_T_DEFAULT, .n_max = IUUP_TIMER_INIT_N_DEFAULT };</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->t_ta = (struct osmo_iuup_rnl_config_timer){ .t_ms = IUUP_TIMER_TA_T_DEFAULT, .n_max = IUUP_TIMER_TA_N_DEFAULT };</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->t_rc = (struct osmo_iuup_rnl_config_timer){ .t_ms = IUUP_TIMER_RC_T_DEFAULT, .n_max = IUUP_TIMER_RC_N_DEFAULT };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return irp;</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 _iuup_user_prim_cb(struct osmo_prim_hdr *oph, void *ctx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rtp_conn *conn = (struct rtp_conn *)ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_iuup_rnl_prim *irp = (struct osmo_iuup_rnl_prim *)oph;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = oph->msg;</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%);">+ switch (OSMO_PRIM_HDR(&irp->oph)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_PRIM(OSMO_IUUP_RNL_DATA, PRIM_OP_INDICATION):</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = llsk_audio_tx_conn_data_ind(conn, irp->u.data.frame_nr, irp->u.data.fqc,</span><br><span style="color: hsl(120, 100%, 40%);">+ irp->u.data.rfci, msgb_l3(msg), msgb_l3len(msg));</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%);">+ LOGUE(conn->ue, DRTP, LOGL_NOTICE, "Rx Unknown prim=%u op=%u from IuUP layer",</span><br><span style="color: hsl(120, 100%, 40%);">+ irp->oph.primitive, irp->oph.operation);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -1;</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 _iuup_transport_prim_cb(struct osmo_prim_hdr *oph, void *ctx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rtp_conn *conn = (struct rtp_conn *)ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = oph->msg;</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%);">+ rc = osmo_rtp_send_frame_ext(conn->socket, msgb_l2(msg), msgb_l2len(msg),</span><br><span style="color: hsl(120, 100%, 40%);">+ GSM_RTP_DURATION, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGUE(conn->ue, DLLSK, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Rx IuUP Transport UNITDATA.req: Failed sending RTP frame! id=%u data_len=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->id, msgb_l2len(msg));</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> struct rtp_conn *rtp_conn_alloc(struct hnb_ue *ue)</span><br><span> {</span><br><span> struct rtp_conn *conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ char iuup_id[64];</span><br><span> </span><br><span> conn = talloc_zero(ue, struct rtp_conn);</span><br><span> if (!conn)</span><br><span>@@ -37,6 +111,11 @@</span><br><span> </span><br><span> conn->ue = ue;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(iuup_id, sizeof(iuup_id), "ue-%u", conn->ue->conn_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->iui = osmo_iuup_instance_alloc(conn, iuup_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_iuup_instance_set_user_prim_cb(conn->iui, _iuup_user_prim_cb, conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_iuup_instance_set_transport_prim_cb(conn->iui, _iuup_transport_prim_cb, conn);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> llist_add(&conn->list, &ue->conn_cs.conn_list);</span><br><span> </span><br><span> return conn;</span><br><span>@@ -51,6 +130,10 @@</span><br><span> osmo_rtp_socket_free(conn->socket);</span><br><span> conn->socket = NULL;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn->iui) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_iuup_instance_free(conn->iui);</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->iui = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> llist_del(&conn->list);</span><br><span> talloc_free(conn);</span><br><span> }</span><br><span>@@ -158,13 +241,23 @@</span><br><span> uint32_t timestamp, bool marker)</span><br><span> {</span><br><span> struct rtp_conn *conn = (struct rtp_conn *)rs->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_iuup_tnl_prim *itp;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span> </span><br><span> LOGUE(conn->ue, DRTP, LOGL_DEBUG, "Rx RTP seq=%u ts=%u M=%u pl=%p len=%u\n",</span><br><span> seq_number, timestamp, marker, rtp_pl, rtp_pl_len);</span><br><span style="color: hsl(0, 100%, 40%);">- llsk_audio_tx_conn_data_ind(conn, rtp_pl, rtp_pl_len);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ itp = osmo_iuup_tnl_prim_alloc(conn, OSMO_IUUP_TNL_UNITDATA, PRIM_OP_INDICATION, HNB_IUUP_MSGB_SIZE);</span><br><span style="color: hsl(120, 100%, 40%);">+ itp->oph.msg->l2h = msgb_put(itp->oph.msg, rtp_pl_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(itp->oph.msg->l2h, rtp_pl, rtp_pl_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_iuup_tnl_prim_up(conn->iui, itp);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGUE(conn->ue, DRTP, LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Failed passing rx rtp up to IuUP layer: %d\n", rc);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int rtp_conn_setup(struct rtp_conn *conn, const struct osmo_sockaddr *rem_addr)</span><br><span style="color: hsl(120, 100%, 40%);">+int rtp_conn_setup(struct rtp_conn *conn, const struct osmo_sockaddr *rem_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct hnb_audio_conn_establish_req_param *ce_req)</span><br><span> {</span><br><span> int rc;</span><br><span> char cname[256+4];</span><br><span>@@ -173,6 +266,7 @@</span><br><span> const char *local_wildcard_ipstr = "0.0.0.0";</span><br><span> char remote_ipstr[INET6_ADDRSTRLEN];</span><br><span> uint16_t remote_port;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_iuup_rnl_prim *irp;</span><br><span> struct hnb_ue *ue = conn->ue;</span><br><span> struct hnb *hnb = ue->hnb;</span><br><span> </span><br><span>@@ -231,9 +325,30 @@</span><br><span> goto free_ret;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Now configure the IuUP layer: */</span><br><span style="color: hsl(120, 100%, 40%);">+ irp = llsk_audio_ce_to_iuup_rnl_cfg(conn, ce_req);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_iuup_rnl_prim_down(conn->iui, irp);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGUE(ue, DRTP, LOGL_ERROR, "Failed setting up IuUP layer: %d\n", rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ goto free_ret;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return rc;</span><br><span> free_ret:</span><br><span> osmo_rtp_socket_free(conn->socket);</span><br><span> conn->socket = NULL;</span><br><span> return rc;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int rtp_conn_tx_data(struct rtp_conn *conn, uint8_t frame_nr, uint8_t fqc, uint8_t rfci, const uint8_t *data, unsigned int data_len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_iuup_rnl_prim *irp;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ irp = osmo_iuup_rnl_prim_alloc(conn, OSMO_IUUP_RNL_DATA, PRIM_OP_REQUEST, HNB_IUUP_MSGB_SIZE);</span><br><span style="color: hsl(120, 100%, 40%);">+ irp->u.data.rfci = rfci;</span><br><span style="color: hsl(120, 100%, 40%);">+ irp->u.data.frame_nr = frame_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ irp->u.data.fqc = fqc;</span><br><span style="color: hsl(120, 100%, 40%);">+ irp->oph.msg->l3h = msgb_put(irp->oph.msg, data_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(irp->oph.msg->l3h, data, data_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_iuup_rnl_prim_down(conn->iui, irp);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hnodeb/+/26671">change 26671</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/+/26671"/><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: Ie137809e1f91dfd702853c52be97ca79e8604eab </div>
<div style="display:none"> Gerrit-Change-Number: 26671 </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>