<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hnodeb/+/26570">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Update AUDIO and GTP SAPs to support multiple conns per UE<br><br>This is needed for instance:<br>* AUDIO: video calls<br>* GTP: secondary pdp contexts<br><br>For better abstraction, now both AUDIO and GTP conns use unique ID<br>namespaces, and one ID is used to identify each one. Each conn relate in<br>turn to a UE since a context_id is passed during connection<br>establishment.<br><br>Related: SYS#5516<br>Change-Id: Ib3f60d5ba21defe5259c25e2034fc2217c4d93df<br>---<br>M doc/hnodeb.msc<br>M include/osmocom/hnodeb/gtp.h<br>M include/osmocom/hnodeb/hnb_prim.h<br>M include/osmocom/hnodeb/hnodeb.h<br>M include/osmocom/hnodeb/llsk.h<br>M include/osmocom/hnodeb/rtp.h<br>M src/osmo-hnodeb/gtp.c<br>M src/osmo-hnodeb/hnb.c<br>M src/osmo-hnodeb/llsk_audio.c<br>M src/osmo-hnodeb/llsk_gtp.c<br>M src/osmo-hnodeb/rtp.c<br>11 files changed, 265 insertions(+), 177 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/hnodeb.msc b/doc/hnodeb.msc</span><br><span>index 6ad6e7c..10de180 100644</span><br><span>--- a/doc/hnodeb.msc</span><br><span>+++ b/doc/hnodeb.msc</span><br><span>@@ -43,19 +43,19 @@</span><br><span> --- [ label = "Subscriber set up PS data:" ];</span><br><span> hnodeb <= hnbgw [label="RANAP RAB-Assignment Request(TEI, ADDR)"];</span><br><span> trx <= hnodeb [label="IUH-CONN_DATA.ind[RANAP RAB-Assignment Request(remote_ip, remote_port, remote_tei)]"];</span><br><span style="color: hsl(0, 100%, 40%);">- trx => hnodeb [label="GTP-CONN_ESTABLISH.req(remote_ip,remote_port,remote_tei)"];</span><br><span style="color: hsl(120, 100%, 40%);">+ trx => hnodeb [label="GTP-CONN_ESTABLISH.req(context_id,remote_ip,remote_port,remote_tei)"];</span><br><span> ... [ label = "HnodeB sets up GTP-U connection" ];</span><br><span style="color: hsl(0, 100%, 40%);">- trx <= hnodeb [label="GTP-CONN_ESTABLISH.cnf(local_ip,local_port,local_tei,remote_tei)"];</span><br><span style="color: hsl(120, 100%, 40%);">+ trx <= hnodeb [label="GTP-CONN_ESTABLISH.cnf(context_id,gtp_conn_id,local_ip,local_port,local_tei)"];</span><br><span> |||;</span><br><span> ...;</span><br><span> |||;</span><br><span> |||;</span><br><span> --- [ label = "PS data transmission over GTP-U:" ];</span><br><span> ue => trx [label="..."];</span><br><span style="color: hsl(0, 100%, 40%);">- trx => hnodeb [label="GTP-CONN_DATA.req[remote_tei,payload]"];</span><br><span style="color: hsl(120, 100%, 40%);">+ trx => hnodeb [label="GTP-CONN_DATA.req[gtp_conn_id,payload]"];</span><br><span> hnodeb => ggsn [label="GTP-U(remote_tei, local_addr, remote_addr, payload)"];</span><br><span> hnodeb <= ggsn [label="GTP-U(local_tei, remote_addr, local_addr, payload)"];</span><br><span style="color: hsl(0, 100%, 40%);">- trx <= hnodeb [label="GTP-CONN_DATA.ind[local_tei,payload]"];</span><br><span style="color: hsl(120, 100%, 40%);">+ trx <= hnodeb [label="GTP-CONN_DATA.ind[gtp_conn_id,payload]"];</span><br><span> ue <= trx [label="..."];</span><br><span> |||;</span><br><span> ...;</span><br><span>@@ -67,7 +67,7 @@</span><br><span> hnodeb <= hnbgw [label="RANAP IU Release Command"];</span><br><span> trx <= hnodeb [label="IUH-CONN_DATA.ind[RANAP IU Release Command]"];</span><br><span> ...;</span><br><span style="color: hsl(0, 100%, 40%);">- trx => hnodeb [label="GTP-CONN_RELEASE.req(remote_tei)"];</span><br><span style="color: hsl(120, 100%, 40%);">+ trx => hnodeb [label="GTP-CONN_RELEASE.req(gtp_conn_id)"];</span><br><span> </span><br><span> trx => hnodeb [label="IUH-CONN_RELEASE.req[RANAP IU Release Complete]"];</span><br><span> hnodeb => hnbgw [label="RUA-Disconnect(RANAP IU Release Complete)"];</span><br><span>diff --git a/include/osmocom/hnodeb/gtp.h b/include/osmocom/hnodeb/gtp.h</span><br><span>index af9e007..477e82b 100644</span><br><span>--- a/include/osmocom/hnodeb/gtp.h</span><br><span>+++ b/include/osmocom/hnodeb/gtp.h</span><br><span>@@ -18,7 +18,11 @@</span><br><span> */</span><br><span> #pragma once</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <gtp.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <pdp.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <osmocom/core/socket.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/linuxlist.h></span><br><span> </span><br><span> struct hnb;</span><br><span> struct hnb_ue;</span><br><span>@@ -26,7 +30,19 @@</span><br><span> int hnb_gtp_bind(struct hnb *hnb);</span><br><span> void hnb_gtp_unbind(struct hnb *hnb);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int hnb_ue_gtp_bind(struct hnb_ue *ue, const struct osmo_sockaddr *rem_addr, uint32_t rem_tei,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *loc_addr, uint32_t *loc_tei);</span><br><span style="color: hsl(0, 100%, 40%);">-int hnb_ue_gtp_unbind(struct hnb_ue *ue);</span><br><span style="color: hsl(0, 100%, 40%);">-int hnb_ue_gtp_tx(struct hnb_ue *ue, void *gtpu_payload, unsigned gtpu_payload_len);</span><br><span style="color: hsl(120, 100%, 40%);">+struct gtp_conn {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head list; /* Item in struct hnb->ue_list */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct hnb_ue *ue; /* backpointer */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t id;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr loc_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr rem_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t loc_tei;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t rem_tei;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct pdp_t *pdp_lib;</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 gtp_conn *gtp_conn_alloc(struct hnb_ue *ue);</span><br><span style="color: hsl(120, 100%, 40%);">+void gtp_conn_free(struct gtp_conn *conn);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int gtp_conn_setup(struct gtp_conn *conn, const struct osmo_sockaddr *rem_addr, uint32_t rem_tei);</span><br><span style="color: hsl(120, 100%, 40%);">+int gtp_conn_tx(struct gtp_conn *conn, void *gtpu_payload, unsigned gtpu_payload_len);</span><br><span>diff --git a/include/osmocom/hnodeb/hnb_prim.h b/include/osmocom/hnodeb/hnb_prim.h</span><br><span>index f0e3a96..0b0a545 100644</span><br><span>--- a/include/osmocom/hnodeb/hnb_prim.h</span><br><span>+++ b/include/osmocom/hnodeb/hnb_prim.h</span><br><span>@@ -197,6 +197,7 @@</span><br><span> /* HNB_AUDIO_PRIM_CONN_ESTABLISH, DL */</span><br><span> struct hnb_audio_conn_establish_cnf_param {</span><br><span> uint32_t context_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t audio_conn_id;</span><br><span> uint16_t local_rtp_port;</span><br><span> uint8_t error_code; /* 0 = success, !0 = failure */</span><br><span> uint8_t local_rtp_address_type; /* enum u_addr_type */</span><br><span>@@ -205,19 +206,19 @@</span><br><span> </span><br><span> /* HNB_AUDIO_PRIM_CONN_RELEASE, UL */</span><br><span> struct hnb_audio_conn_release_req_param {</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t context_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t audio_conn_id;</span><br><span> } __attribute__ ((packed));</span><br><span> </span><br><span> /* HNB_AUDIO_PRIM_CONN_DATA, UL */</span><br><span> struct hnb_audio_conn_data_req_param {</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t context_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t audio_conn_id;</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> </span><br><span> /* HNB_AUDIO_PRIM_CONN_DATA, DL */</span><br><span> struct hnb_audio_conn_data_ind_param {</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t context_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t audio_conn_id;</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>@@ -256,6 +257,7 @@</span><br><span> /* HNB_GTP_PRIM_CONN_ESTABLISH, DL */</span><br><span> struct hnb_gtp_conn_establish_cnf_param {</span><br><span> uint32_t context_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t gtp_conn_id;</span><br><span> uint32_t local_tei;</span><br><span> uint8_t error_code; /* 0 = success, !0 = failure */</span><br><span> uint8_t local_gtpu_address_type; /* enum u_addr_type */</span><br><span>@@ -264,28 +266,19 @@</span><br><span> </span><br><span> /* HNB_GTP_PRIM_CONN_RELEASE, UL */</span><br><span> struct hnb_gtp_conn_release_req_param {</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t context_id;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t remote_tei;</span><br><span style="color: hsl(0, 100%, 40%);">-} __attribute__ ((packed));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* HNB_GTP_PRIM_CONN_RELEASE, DL */</span><br><span style="color: hsl(0, 100%, 40%);">-struct hnb_gtp_conn_release_ind_param {</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t context_id;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t local_tei;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t gtp_conn_id;</span><br><span> } __attribute__ ((packed));</span><br><span> </span><br><span> /* HNB_GTP_PRIM_CONN_DATA, DL */</span><br><span> struct hnb_gtp_conn_data_ind_param {</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t context_id;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t local_tei;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t gtp_conn_id;</span><br><span> uint32_t data_len; /* GTP-U payload length in bytes */</span><br><span> uint8_t data[0]; /* GTP-U payload (aka IP packet) */</span><br><span> } __attribute__ ((packed));</span><br><span> </span><br><span> /* HNB_GTP_PRIM_CONN_DATA, UL */</span><br><span> struct hnb_gtp_conn_data_req_param {</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t context_id;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t remote_tei;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t gtp_conn_id;</span><br><span> uint32_t data_len; /* GTP-U payload length in bytes */</span><br><span> uint8_t data[0]; /* GTP-U payload (aka IP packet) */</span><br><span> } __attribute__ ((packed));</span><br><span>diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h</span><br><span>index 52d1bec..82b43c3 100644</span><br><span>--- a/include/osmocom/hnodeb/hnodeb.h</span><br><span>+++ b/include/osmocom/hnodeb/hnodeb.h</span><br><span>@@ -35,9 +35,6 @@</span><br><span> #include <osmocom/gsm/protocol/gsm_23_003.h></span><br><span> #include <osmocom/netif/stream.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include <gtp.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <pdp.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #include <osmocom/hnodeb/llsk.h></span><br><span> </span><br><span> enum {</span><br><span>@@ -62,16 +59,12 @@</span><br><span> struct hnb_ue_cs_ctx {</span><br><span> bool active; /* Is this chan in use? */</span><br><span> bool conn_est_cnf_pending; /* Did we send CONN_ESTABLISH_CNF to lower layers? */</span><br><span style="color: hsl(0, 100%, 40%);">- struct {</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_rtp_socket *socket;</span><br><span style="color: hsl(0, 100%, 40%);">- } rtp;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head conn_list; /* list of struct rtp_conn */</span><br><span> } conn_cs;</span><br><span> struct hnb_ue_ps_ctx {</span><br><span> bool active; /* Is this chan in use? */</span><br><span> bool conn_est_cnf_pending; /* Did we send CONN_ESTABLISH_CNF to lower layers? */</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t local_tei;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t remote_tei;</span><br><span style="color: hsl(0, 100%, 40%);">- struct pdp_t *pdp_lib;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head conn_list; /* list of struct gtp_conn */</span><br><span> } conn_ps;</span><br><span> };</span><br><span> struct hnb_ue *hnb_ue_alloc(struct hnb *hnb, uint32_t conn_id);</span><br><span>@@ -132,9 +125,11 @@</span><br><span> struct hnb *hnb_alloc(void *tall_ctx);</span><br><span> void hnb_free(struct hnb *hnb);</span><br><span> struct hnb_ue *hnb_find_ue_by_id(const struct hnb *hnb, uint32_t conn_id);</span><br><span style="color: hsl(0, 100%, 40%);">-struct hnb_ue *hnb_find_ue_by_tei(const struct hnb *hnb, uint32_t tei, bool is_remote);</span><br><span> struct hnb_ue *hnb_find_ue_by_imsi(const struct hnb *hnb, char *imsi);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct rtp_conn *hnb_find_rtp_conn_by_id(const struct hnb *hnb, uint32_t audio_conn_id);</span><br><span style="color: hsl(120, 100%, 40%);">+struct gtp_conn *hnb_find_gtp_conn_by_id(const struct hnb *hnb, uint32_t gtp_conn_id);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> extern void *tall_hnb_ctx;</span><br><span> extern struct hnb *g_hnb;</span><br><span> </span><br><span>diff --git a/include/osmocom/hnodeb/llsk.h b/include/osmocom/hnodeb/llsk.h</span><br><span>index 6d98cd0..fe1dce1 100644</span><br><span>--- a/include/osmocom/hnodeb/llsk.h</span><br><span>+++ b/include/osmocom/hnodeb/llsk.h</span><br><span>@@ -27,7 +27,7 @@</span><br><span> #include <osmocom/hnodeb/hnb_prim.h></span><br><span> </span><br><span> struct hnb;</span><br><span style="color: hsl(0, 100%, 40%);">-struct hnb_ue;</span><br><span style="color: hsl(120, 100%, 40%);">+struct rtp_conn;</span><br><span> </span><br><span> int hnb_llsk_alloc(struct hnb *hnb);</span><br><span> bool hnb_llsk_connected(const struct hnb *hnb);</span><br><span>@@ -53,9 +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 hnb_ue *ue, 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, 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 style="color: hsl(0, 100%, 40%);">-struct hnb_gtp_prim *hnb_gtp_makeprim_conn_data_ind(uint32_t context_id, uint32_t local_tei,</span><br><span style="color: hsl(0, 100%, 40%);">- const uint8_t *data, uint32_t data_len);</span><br><span style="color: hsl(120, 100%, 40%);">+struct hnb_gtp_prim *hnb_gtp_makeprim_conn_data_ind(uint32_t gtp_conn_id, const uint8_t *data, uint32_t data_len);</span><br><span>diff --git a/include/osmocom/hnodeb/rtp.h b/include/osmocom/hnodeb/rtp.h</span><br><span>index 01ec1c4..8035175 100644</span><br><span>--- a/include/osmocom/hnodeb/rtp.h</span><br><span>+++ b/include/osmocom/hnodeb/rtp.h</span><br><span>@@ -19,9 +19,21 @@</span><br><span> #pragma once</span><br><span> </span><br><span> #include <osmocom/core/socket.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/linuxlist.h></span><br><span> </span><br><span> struct hnb;</span><br><span> struct hnb_ue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int hnb_ue_voicecall_setup(struct hnb_ue *ue, const struct osmo_sockaddr *rem_addr, struct osmo_sockaddr *loc_addr);</span><br><span style="color: hsl(0, 100%, 40%);">-int hnb_ue_voicecall_release(struct hnb_ue *ue);</span><br><span style="color: hsl(120, 100%, 40%);">+struct rtp_conn {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head list; /* Item in struct hnb->ue_list */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct hnb_ue *ue; /* backpointer */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t id;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_rtp_socket *socket;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr loc_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr rem_addr;</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 rtp_conn *rtp_conn_alloc(struct hnb_ue *ue);</span><br><span style="color: hsl(120, 100%, 40%);">+void rtp_conn_free(struct rtp_conn *conn);</span><br><span style="color: hsl(120, 100%, 40%);">+</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>diff --git a/src/osmo-hnodeb/gtp.c b/src/osmo-hnodeb/gtp.c</span><br><span>index b8bfebc..22d4074 100644</span><br><span>--- a/src/osmo-hnodeb/gtp.c</span><br><span>+++ b/src/osmo-hnodeb/gtp.c</span><br><span>@@ -27,8 +27,38 @@</span><br><span> #include <gtp.h></span><br><span> #include <pdp.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static uint32_t next_gtp_conn_id = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct gtp_conn *gtp_conn_alloc(struct hnb_ue *ue)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gtp_conn *conn;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ conn = talloc_zero(ue, struct gtp_conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conn)</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%);">+ conn->ue = ue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add(&conn->list, &ue->conn_ps.conn_list);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return conn;</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%);">+void gtp_conn_free(struct gtp_conn *conn)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conn)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn->pdp_lib) {</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp_freepdp(conn->pdp_lib);</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->pdp_lib = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&conn->list);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(conn);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Get osa of locally bound GTP-U socket */</span><br><span style="color: hsl(0, 100%, 40%);">-int sk_get_bound_addr(int fd, struct osmo_sockaddr *osa)</span><br><span style="color: hsl(120, 100%, 40%);">+static int sk_get_bound_addr(int fd, struct osmo_sockaddr *osa)</span><br><span> {</span><br><span> int rc;</span><br><span> socklen_t alen = sizeof(*osa);</span><br><span>@@ -44,19 +74,21 @@</span><br><span> static int hnb_gtp_cb_data_ind(struct pdp_t *lib, void *packet, unsigned int len)</span><br><span> {</span><br><span> struct hnb_gtp_prim *gtp_prim;</span><br><span style="color: hsl(0, 100%, 40%);">- struct hnb_ue *ue = lib->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gtp_conn *conn = lib->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct hnb_ue *ue;</span><br><span> struct hnb *hnb;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!ue || !ue->conn_ps.active) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGTP, LOGL_NOTICE, "Tx GTP-CONN_DATA.ind data=%p len=%u but UE conn_ps is not active!\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conn || !conn->ue->conn_ps.active) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGUE(conn->ue, DGTP, LOGL_NOTICE, "Tx GTP-CONN_DATA.ind data=%p len=%u but UE conn_ps is not active!\n",</span><br><span> packet, len);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ ue = conn->ue;</span><br><span> hnb = ue->hnb;</span><br><span> </span><br><span> LOGUE(ue, DGTP, LOGL_DEBUG, "Tx GTP-CONN_DATA.ind data=%p len=%u\n", packet, len);</span><br><span style="color: hsl(0, 100%, 40%);">- gtp_prim = hnb_gtp_makeprim_conn_data_ind(ue->conn_id, ue->conn_ps.local_tei, packet, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ gtp_prim = hnb_gtp_makeprim_conn_data_ind(conn->id, packet, len);</span><br><span> if ((rc = osmo_prim_srv_send(hnb->llsk, gtp_prim->hdr.msg)) < 0) {</span><br><span> LOGUE(ue, DGTP, LOGL_ERROR, "Failed Tx GTP-CONN_DATA.ind data=%p len=%u\n",</span><br><span> packet, len);</span><br><span>@@ -130,10 +162,10 @@</span><br><span> hnb->gtp.fd1u.fd = -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int hnb_ue_gtp_bind(struct hnb_ue *ue, const struct osmo_sockaddr *rem_addr, uint32_t rem_tei,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *loc_addr, uint32_t *loc_tei)</span><br><span style="color: hsl(120, 100%, 40%);">+int gtp_conn_setup(struct gtp_conn *conn, const struct osmo_sockaddr *rem_addr, uint32_t rem_tei)</span><br><span> {</span><br><span> int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct hnb_ue *ue = conn->ue;</span><br><span> struct hnb *hnb = ue->hnb;</span><br><span> struct pdp_t *pdp;</span><br><span> struct in_addr rem_in;</span><br><span>@@ -147,15 +179,18 @@</span><br><span> return -ENOTSUP;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ conn->rem_addr = *rem_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->rem_tei = rem_tei;</span><br><span> rem_in = rem_addr->u.sin.sin_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->id = next_gtp_conn_id++; /* TODO: validate next one is not already taken due to wrap-around */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = gtp_pdp_newpdp(hnb->gtp.gsn, &pdp, ue->conn_id, 0 /* TODO: NSAPI? */, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gtp_pdp_newpdp(hnb->gtp.gsn, &pdp, conn->id, 0 /* TODO: NSAPI? */, NULL);</span><br><span> if (rc < 0) {</span><br><span> LOGUE(ue, DGTP, LOGL_ERROR, "Failed creating PDP context: %s\n", strerror(-rc));</span><br><span> return rc;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- pdp->priv = ue;</span><br><span style="color: hsl(0, 100%, 40%);">- ue->conn_ps.pdp_lib = pdp;</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp->priv = conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->pdp_lib = pdp;</span><br><span> </span><br><span> pdp->teid_gn = rem_tei;</span><br><span> pdp->version = 1;</span><br><span>@@ -170,40 +205,32 @@</span><br><span> memcpy(pdp->gsnlu.v, &hnb->gtp.local_addr.u.sin.sin_addr,</span><br><span> sizeof(hnb->gtp.local_addr.u.sin.sin_addr));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- *loc_addr = hnb->gtp.local_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->loc_addr = hnb->gtp.local_addr;</span><br><span> //loc_addr->u.sin.sin_family = AF_INET;</span><br><span> //loc_addr->u.sin.sin_addr = hnb->gtp.gsn->gsnu;</span><br><span> //loc_addr->u.sin.sin_port = GTP1U_PORT;</span><br><span style="color: hsl(0, 100%, 40%);">- *loc_tei = pdp->teid_own;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->loc_tei = pdp->teid_own;</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int hnb_ue_gtp_tx(struct hnb_ue *ue, void *gtpu_payload, unsigned gtpu_payload_len)</span><br><span style="color: hsl(120, 100%, 40%);">+int gtp_conn_tx(struct gtp_conn *conn, void *gtpu_payload, unsigned gtpu_payload_len)</span><br><span> {</span><br><span> int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct hnb_ue *ue;</span><br><span> struct hnb *hnb;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!ue || !ue->conn_ps.pdp_lib) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGUE(ue, DGTP, LOGL_ERROR, "Tx: UE PDP Ctx not available\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conn || !conn->pdp_lib) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGTP, LOGL_ERROR, "Tx: PDP Ctx not available\n");</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ ue = conn->ue;</span><br><span> hnb = ue->hnb;</span><br><span> if (!hnb->gtp.gsn) {</span><br><span> LOGUE(ue, DGTP, LOGL_ERROR, "Tx: GTP socket not bound\n");</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = gtp_data_req(hnb->gtp.gsn, ue->conn_ps.pdp_lib, gtpu_payload, gtpu_payload_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gtp_data_req(hnb->gtp.gsn, conn->pdp_lib, gtpu_payload, gtpu_payload_len);</span><br><span> return rc;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int hnb_ue_gtp_unbind(struct hnb_ue *ue)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ue->conn_ps.pdp_lib)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- pdp_freepdp(ue->conn_ps.pdp_lib);</span><br><span style="color: hsl(0, 100%, 40%);">- ue->conn_ps.pdp_lib = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/osmo-hnodeb/hnb.c b/src/osmo-hnodeb/hnb.c</span><br><span>index b733d15..fe2f4f5 100644</span><br><span>--- a/src/osmo-hnodeb/hnb.c</span><br><span>+++ b/src/osmo-hnodeb/hnb.c</span><br><span>@@ -109,6 +109,9 @@</span><br><span> ue->hnb = hnb;</span><br><span> ue->conn_id = conn_id;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&ue->conn_cs.conn_list);</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&ue->conn_ps.conn_list);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> llist_add(&ue->list, &hnb->ue_list);</span><br><span> </span><br><span> return ue;</span><br><span>@@ -125,11 +128,17 @@</span><br><span> void hnb_ue_reset_chan(struct hnb_ue *ue, bool is_ps)</span><br><span> {</span><br><span> if (is_ps) {</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_ue_gtp_unbind(ue);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gtp_conn *conn, *conn_tmp;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry_safe(conn, conn_tmp, &ue->conn_ps.conn_list, list)</span><br><span style="color: hsl(120, 100%, 40%);">+ gtp_conn_free(conn);</span><br><span> ue->conn_ps = (struct hnb_ue_ps_ctx){0};</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&ue->conn_ps.conn_list);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_ue_voicecall_release(ue);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rtp_conn *conn, *conn_tmp;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry_safe(conn, conn_tmp, &ue->conn_cs.conn_list, list)</span><br><span style="color: hsl(120, 100%, 40%);">+ rtp_conn_free(conn);</span><br><span> ue->conn_cs = (struct hnb_ue_cs_ctx){0};</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&ue->conn_cs.conn_list);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -145,21 +154,6 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct hnb_ue *hnb_find_ue_by_tei(const struct hnb *hnb, uint32_t tei, bool is_remote)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct hnb_ue *ue;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(ue, &hnb->ue_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ue->conn_ps.active)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t ue_tei = is_remote ? ue->conn_ps.remote_tei : ue->conn_ps.local_tei;</span><br><span style="color: hsl(0, 100%, 40%);">- if (tei != ue_tei)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- return ue;</span><br><span style="color: hsl(0, 100%, 40%);">- }</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> struct hnb_ue *hnb_find_ue_by_imsi(const struct hnb *hnb, char *imsi)</span><br><span> {</span><br><span> struct hnb_ue *ue;</span><br><span>@@ -176,3 +170,35 @@</span><br><span> }</span><br><span> return NULL;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct rtp_conn *hnb_find_rtp_conn_by_id(const struct hnb *hnb, uint32_t audio_conn_id)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct hnb_ue *ue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(ue, &hnb->ue_list, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rtp_conn *conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ue->conn_cs.active)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(conn, &ue->conn_cs.conn_list, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn->id == audio_conn_id)</span><br><span style="color: hsl(120, 100%, 40%);">+ return conn;</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%);">+ return NULL;</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 gtp_conn *hnb_find_gtp_conn_by_id(const struct hnb *hnb, uint32_t gtp_conn_id)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct hnb_ue *ue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(ue, &hnb->ue_list, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gtp_conn *conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ue->conn_ps.active)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(conn, &ue->conn_ps.conn_list, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn->id == gtp_conn_id)</span><br><span style="color: hsl(120, 100%, 40%);">+ return conn;</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%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/osmo-hnodeb/llsk_audio.c b/src/osmo-hnodeb/llsk_audio.c</span><br><span>index 4fa8079..7ce5c09 100644</span><br><span>--- a/src/osmo-hnodeb/llsk_audio.c</span><br><span>+++ b/src/osmo-hnodeb/llsk_audio.c</span><br><span>@@ -81,14 +81,16 @@</span><br><span> return (struct hnb_audio_prim *)oph;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct hnb_audio_prim *hnb_audio_makeprim_conn_establish_cnf(uint32_t context_id, uint8_t error_code,</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t local_rtp_port, uint8_t local_rtp_address_type,</span><br><span style="color: hsl(0, 100%, 40%);">- const union u_addr *local_rtp_addr)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct hnb_audio_prim *hnb_audio_makeprim_conn_establish_cnf(uint32_t context_id, uint32_t audio_conn_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t error_code, uint16_t local_rtp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t local_rtp_address_type,</span><br><span style="color: hsl(120, 100%, 40%);">+ const union u_addr *local_rtp_addr)</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_ESTABLISH, PRIM_OP_CONFIRM, 0);</span><br><span> audio_prim->u.conn_establish_cnf.context_id = context_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ audio_prim->u.conn_establish_cnf.audio_conn_id = audio_conn_id;</span><br><span> audio_prim->u.conn_establish_cnf.local_rtp_port = local_rtp_port;</span><br><span> audio_prim->u.conn_establish_cnf.error_code = error_code;</span><br><span> audio_prim->u.conn_establish_cnf.local_rtp_address_type = local_rtp_address_type;</span><br><span>@@ -98,15 +100,14 @@</span><br><span> return audio_prim;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct hnb_audio_prim *hnb_audio_makeprim_conn_data_ind(uint32_t context_id,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t domain,</span><br><span style="color: hsl(120, 100%, 40%);">+static struct hnb_audio_prim *hnb_audio_makeprim_conn_data_ind(uint32_t audio_conn_id,</span><br><span> const uint8_t *data,</span><br><span> 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 style="color: hsl(0, 100%, 40%);">- audio_prim->u.conn_data_ind.context_id = context_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ audio_prim->u.conn_data_ind.audio_conn_id = audio_conn_id;</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>@@ -116,15 +117,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 hnb_ue *ue, 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, 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(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(ue->conn_id, 0 /* CS */, payload, len);</span><br><span style="color: hsl(0, 100%, 40%);">- if ((rc = osmo_prim_srv_send(ue->hnb->llsk, audio_prim->hdr.msg)) < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGUE(ue, DLLSK, LOGL_ERROR, "Failed sending AUDIO-CONN_DATA.ind\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGUE(conn->ue, DLLSK, LOGL_INFO, "Tx AUDIO-CONN_DATA.ind\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ audio_prim = hnb_audio_makeprim_conn_data_ind(conn->id, payload, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((rc = osmo_prim_srv_send(conn->ue->hnb->llsk, audio_prim->hdr.msg)) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGUE(conn->ue, DLLSK, LOGL_ERROR, "Failed sending AUDIO-CONN_DATA.ind\n");</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span>@@ -134,7 +135,7 @@</span><br><span> int rc;</span><br><span> LOGP(DLLSK, LOGL_ERROR, "Tx AUDIO-CONN_ESTABLISH.cnf: ctx=%u error_code=%u\n",</span><br><span> context_id, error_code);</span><br><span style="color: hsl(0, 100%, 40%);">- audio_prim = hnb_audio_makeprim_conn_establish_cnf(context_id, error_code, 0, HNB_PRIM_ADDR_TYPE_UNSPEC, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ audio_prim = hnb_audio_makeprim_conn_establish_cnf(context_id, 0, error_code, 0, HNB_PRIM_ADDR_TYPE_UNSPEC, NULL);</span><br><span> if ((rc = osmo_prim_srv_send(hnb->llsk, audio_prim->hdr.msg)) < 0) {</span><br><span> LOGP(DLLSK, LOGL_ERROR, "Failed sending AUDIO-CONN_ESTABLISH.cnf context_id=%u error_code=%u\n",</span><br><span> context_id, error_code);</span><br><span>@@ -150,9 +151,9 @@</span><br><span> int af;</span><br><span> char rem_addrstr[INET6_ADDRSTRLEN+32];</span><br><span> struct osmo_sockaddr rem_osa = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr loc_osa = {0};</span><br><span> union u_addr loc_uaddr = {0};</span><br><span> uint16_t loc_port;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rtp_conn *conn = NULL;</span><br><span> </span><br><span> rc = ll_addr2osa(ce_req->remote_rtp_address_type, &ce_req->remote_rtp_addr, ce_req->remote_rtp_port, &rem_osa);</span><br><span> if (rc < 0) {</span><br><span>@@ -184,14 +185,15 @@</span><br><span> }</span><br><span> </span><br><span> /* Create the socket: */</span><br><span style="color: hsl(0, 100%, 40%);">- if ((rc = hnb_ue_voicecall_setup(ue, &rem_osa, &loc_osa)) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ conn = rtp_conn_alloc(ue);</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((rc = rtp_conn_setup(conn, &rem_osa)) < 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> }</span><br><span> </span><br><span> /* Convert resulting local address back to LLSK format: */</span><br><span style="color: hsl(0, 100%, 40%);">- if (osa2_ll_addr(&loc_osa, &loc_uaddr, &loc_port) != ce_req->remote_rtp_address_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osa2_ll_addr(&conn->loc_addr, &loc_uaddr, &loc_port) != ce_req->remote_rtp_address_type) {</span><br><span> LOGUE(ue, DLLSK, LOGL_ERROR, "Rx AUDIO-CONN_ESTABLISH.req: Failed to provide proper local address rem_addr=%s\n",</span><br><span> rem_addrstr);</span><br><span> rc = _send_conn_establish_cnf_failed(hnb, ce_req->context_id, 4);</span><br><span>@@ -200,8 +202,8 @@</span><br><span> </span><br><span> /* Submit successful confirmation */</span><br><span> LOGUE(ue, DLLSK, LOGL_INFO, "Tx AUDIO-CONN_ESTABLISH.cnf: error_code=0 rem_addr=%s loc_addr=%s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- rem_addrstr, osmo_sockaddr_to_str(&loc_osa));</span><br><span style="color: hsl(0, 100%, 40%);">- audio_prim = hnb_audio_makeprim_conn_establish_cnf(ce_req->context_id, 0, loc_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ rem_addrstr, osmo_sockaddr_to_str(&conn->loc_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ audio_prim = hnb_audio_makeprim_conn_establish_cnf(ce_req->context_id, conn->id, 0, loc_port,</span><br><span> ce_req->remote_rtp_address_type, &loc_uaddr);</span><br><span> if ((rc = osmo_prim_srv_send(hnb->llsk, audio_prim->hdr.msg)) < 0) {</span><br><span> LOGUE(ue, DLLSK, LOGL_ERROR, "Failed sending AUDIO-CONN_ESTABLISH.cnf error_code=0\n");</span><br><span>@@ -210,47 +212,49 @@</span><br><span> </span><br><span> return rc;</span><br><span> release_sock:</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_ue_voicecall_release(ue);</span><br><span style="color: hsl(120, 100%, 40%);">+ rtp_conn_free(conn);</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span> static int llsk_rx_audio_conn_release_req(struct hnb *hnb, struct hnb_audio_conn_release_req_param *rel_req)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct hnb_ue *ue;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rtp_conn *conn;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLLSK, LOGL_DEBUG, "Rx AUDIO-CONN_RELEASE.req ctx=%u\n", rel_req->context_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLLSK, LOGL_DEBUG, "Rx AUDIO-CONN_RELEASE.req id=%u\n", rel_req->audio_conn_id);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ue = hnb_find_ue_by_id(hnb, rel_req->context_id);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ue) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLLSK, LOGL_ERROR, "Rx AUDIO-CONN_RELEASE.req: UE not found! ctx=%u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- rel_req->context_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ conn = hnb_find_rtp_conn_by_id(hnb, rel_req->audio_conn_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conn) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLLSK, LOGL_ERROR, "Rx AUDIO-CONN_RELEASE.req: RTP conn not found! id=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rel_req->audio_conn_id);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> /* Release RTP socket: */</span><br><span style="color: hsl(0, 100%, 40%);">- return hnb_ue_voicecall_release(ue);</span><br><span style="color: hsl(120, 100%, 40%);">+ rtp_conn_free(conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> static int llsk_rx_audio_conn_data_req(struct hnb *hnb, struct hnb_audio_conn_data_req_param *data_req)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct hnb_ue *ue;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rtp_conn *conn;</span><br><span> int rc = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLLSK, LOGL_DEBUG, "Rx AUDIO-CONN_DATA.req ctx=%u data_len=%u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- data_req->context_id, data_req->data_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLLSK, LOGL_DEBUG, "Rx AUDIO-CONN_DATA.req id=%u data_len=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ data_req->audio_conn_id, data_req->data_len);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ue = hnb_find_ue_by_id(hnb, data_req->context_id);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ue) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLLSK, LOGL_ERROR, "Rx AUDIO-CONN_DATA.req: UE not found! ctx=%u data_len=%u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- data_req->context_id, data_req->data_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ conn = hnb_find_rtp_conn_by_id(hnb, data_req->audio_conn_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conn) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLLSK, LOGL_ERROR, "Rx AUDIO-CONN_DATA.req: RTP conn not found! id=%u data_len=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ data_req->audio_conn_id, data_req->data_len);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span> /* 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(ue->conn_cs.rtp.socket, data_req->data,</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_rtp_send_frame_ext(conn->socket, data_req->data,</span><br><span> data_req->data_len, GSM_RTP_DURATION, false);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGUE(ue, DLLSK, LOGL_ERROR, "Rx AUDIO-CONN_DATA.req: UE not found! ctx=%u data_len=%u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- data_req->context_id, data_req->data_len);</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 AUDIO-CONN_DATA.req: Failed sending RTP frame! id=%u data_len=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ data_req->audio_conn_id, data_req->data_len);</span><br><span> }</span><br><span> return rc;</span><br><span> }</span><br><span>diff --git a/src/osmo-hnodeb/llsk_gtp.c b/src/osmo-hnodeb/llsk_gtp.c</span><br><span>index e75c497..30451a0 100644</span><br><span>--- a/src/osmo-hnodeb/llsk_gtp.c</span><br><span>+++ b/src/osmo-hnodeb/llsk_gtp.c</span><br><span>@@ -79,14 +79,16 @@</span><br><span> return (struct hnb_gtp_prim *)oph;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct hnb_gtp_prim *hnb_gtp_makeprim_conn_establish_cnf(uint32_t context_id, uint8_t error_code,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t local_tei, uint8_t local_gtpu_address_type,</span><br><span style="color: hsl(120, 100%, 40%);">+static struct hnb_gtp_prim *hnb_gtp_makeprim_conn_establish_cnf(uint32_t context_id, uint32_t gtp_conn_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t error_code, uint32_t local_tei,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t local_gtpu_address_type,</span><br><span> const union u_addr *local_gtpu_addr)</span><br><span> {</span><br><span> struct hnb_gtp_prim *gtp_prim;</span><br><span> </span><br><span> gtp_prim = hnb_gtp_prim_alloc(HNB_GTP_PRIM_CONN_ESTABLISH, PRIM_OP_CONFIRM, 0);</span><br><span> gtp_prim->u.conn_establish_cnf.context_id = context_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ gtp_prim->u.conn_establish_cnf.gtp_conn_id = gtp_conn_id;</span><br><span> gtp_prim->u.conn_establish_cnf.local_tei = local_tei;</span><br><span> gtp_prim->u.conn_establish_cnf.error_code = error_code;</span><br><span> gtp_prim->u.conn_establish_cnf.local_gtpu_address_type = local_gtpu_address_type;</span><br><span>@@ -96,14 +98,12 @@</span><br><span> return gtp_prim;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct hnb_gtp_prim *hnb_gtp_makeprim_conn_data_ind(uint32_t context_id, uint32_t local_tei,</span><br><span style="color: hsl(0, 100%, 40%);">- const uint8_t *data, uint32_t data_len)</span><br><span style="color: hsl(120, 100%, 40%);">+struct hnb_gtp_prim *hnb_gtp_makeprim_conn_data_ind(uint32_t gtp_conn_id, const uint8_t *data, uint32_t data_len)</span><br><span> {</span><br><span> struct hnb_gtp_prim *gtp_prim;</span><br><span> </span><br><span> gtp_prim = hnb_gtp_prim_alloc(HNB_GTP_PRIM_CONN_DATA, PRIM_OP_INDICATION, data_len);</span><br><span style="color: hsl(0, 100%, 40%);">- gtp_prim->u.conn_data_ind.context_id = context_id;</span><br><span style="color: hsl(0, 100%, 40%);">- gtp_prim->u.conn_data_ind.local_tei = local_tei;</span><br><span style="color: hsl(120, 100%, 40%);">+ gtp_prim->u.conn_data_ind.gtp_conn_id = gtp_conn_id;</span><br><span> gtp_prim->u.conn_data_ind.data_len = data_len;</span><br><span> if (data_len) {</span><br><span> msgb_put(gtp_prim->hdr.msg, data_len);</span><br><span>@@ -119,7 +119,7 @@</span><br><span> int rc;</span><br><span> LOGP(DLLSK, LOGL_ERROR, "Tx GTP-CONN_ESTABLISH.cnf: ctx=%u error_code=%u\n",</span><br><span> context_id, error_code);</span><br><span style="color: hsl(0, 100%, 40%);">- gtp_prim = hnb_gtp_makeprim_conn_establish_cnf(context_id, error_code, 0, HNB_PRIM_ADDR_TYPE_UNSPEC, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ gtp_prim = hnb_gtp_makeprim_conn_establish_cnf(context_id, 0, error_code, 0, HNB_PRIM_ADDR_TYPE_UNSPEC, NULL);</span><br><span> if ((rc = osmo_prim_srv_send(hnb->llsk, gtp_prim->hdr.msg)) < 0) {</span><br><span> LOGP(DLLSK, LOGL_ERROR, "Failed sending GTP-CONN_ESTABLISH.cnf context_id=%u error_code=%u\n",</span><br><span> context_id, error_code);</span><br><span>@@ -135,9 +135,8 @@</span><br><span> int af;</span><br><span> char rem_addrstr[INET6_ADDRSTRLEN+32];</span><br><span> struct osmo_sockaddr rem_osa = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr loc_osa = {0};</span><br><span> union u_addr loc_uaddr = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t loc_tei;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gtp_conn *conn = NULL;</span><br><span> </span><br><span> rc = ll_addr2osa(ce_req->remote_gtpu_address_type, &ce_req->remote_gtpu_addr, GTP1U_PORT, &rem_osa);</span><br><span> if (rc < 0) {</span><br><span>@@ -169,14 +168,15 @@</span><br><span> }</span><br><span> </span><br><span> /* Create the socket: */</span><br><span style="color: hsl(0, 100%, 40%);">- if ((rc = hnb_ue_gtp_bind(ue, &rem_osa, ce_req->remote_tei, &loc_osa, &loc_tei)) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ conn = gtp_conn_alloc(ue);</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((rc = gtp_conn_setup(conn, &rem_osa, ce_req->remote_tei)) < 0) {</span><br><span> LOGUE(ue, DLLSK, LOGL_ERROR, "Rx GTP-CONN_ESTABLISH.req: Failed to set up gtp socket rem_tei=%u rem_addr=%s\n",</span><br><span> ce_req->remote_tei, rem_addrstr);</span><br><span> return _send_conn_establish_cnf_failed(hnb, ce_req->context_id, 4);</span><br><span> }</span><br><span> </span><br><span> /* Convert resulting local address back to LLSK format: */</span><br><span style="color: hsl(0, 100%, 40%);">- if (osa2_ll_addr(&loc_osa, &loc_uaddr, NULL) != ce_req->remote_gtpu_address_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osa2_ll_addr(&conn->loc_addr, &loc_uaddr, NULL) != ce_req->remote_gtpu_address_type) {</span><br><span> LOGUE(ue, DLLSK, LOGL_ERROR, "Rx GTP-CONN_ESTABLISH.req: Failed to provide proper local address rem_addr=%s\n",</span><br><span> rem_addrstr);</span><br><span> rc = _send_conn_establish_cnf_failed(hnb, ce_req->context_id, 4);</span><br><span>@@ -185,56 +185,53 @@</span><br><span> </span><br><span> /* Submit successful confirmation */</span><br><span> LOGUE(ue, DLLSK, LOGL_INFO, "Tx GTP-CONN_ESTABLISH.cnf: error_code=0 rem_addr=%s rem_tei=%u loc_addr=%s local_tei=%u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- rem_addrstr, ce_req->remote_tei, osmo_sockaddr_to_str(&loc_osa), loc_tei);</span><br><span style="color: hsl(0, 100%, 40%);">- gtp_prim = hnb_gtp_makeprim_conn_establish_cnf(ce_req->context_id, 0, loc_tei, ce_req->remote_gtpu_address_type, &loc_uaddr);</span><br><span style="color: hsl(120, 100%, 40%);">+ rem_addrstr, ce_req->remote_tei, osmo_sockaddr_to_str(&conn->loc_addr), conn->loc_tei);</span><br><span style="color: hsl(120, 100%, 40%);">+ gtp_prim = hnb_gtp_makeprim_conn_establish_cnf(ce_req->context_id, conn->id, 0, conn->loc_tei,</span><br><span style="color: hsl(120, 100%, 40%);">+ ce_req->remote_gtpu_address_type, &loc_uaddr);</span><br><span> if ((rc = osmo_prim_srv_send(hnb->llsk, gtp_prim->hdr.msg)) < 0) {</span><br><span> LOGUE(ue, DLLSK, LOGL_ERROR, "Failed sending GTP-CONN_ESTABLISH.cnf error_code=0\n");</span><br><span> goto release_sock;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ue->conn_ps.local_tei = loc_tei;</span><br><span style="color: hsl(0, 100%, 40%);">- ue->conn_ps.remote_tei = ce_req->remote_tei;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> return rc;</span><br><span> release_sock:</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_ue_gtp_unbind(ue);</span><br><span style="color: hsl(120, 100%, 40%);">+ gtp_conn_free(conn);</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span> static int llsk_rx_gtp_conn_release_req(struct hnb *hnb, struct hnb_gtp_conn_release_req_param *rel_req)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct hnb_ue *ue;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gtp_conn *conn;</span><br><span> int rc = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLLSK, LOGL_DEBUG, "Rx GTP-CONN_RELEASE.req ctx=%u\n", rel_req->context_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLLSK, LOGL_DEBUG, "Rx GTP-CONN_RELEASE.req id=%u\n", rel_req->gtp_conn_id);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ue = hnb_find_ue_by_id(hnb, rel_req->context_id);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ue) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLLSK, LOGL_ERROR, "Rx GTP-CONN_RELEASE.req: UE not found! ctx=%u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- rel_req->context_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ conn = hnb_find_gtp_conn_by_id(hnb, rel_req->gtp_conn_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conn) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLLSK, LOGL_ERROR, "Rx GTP-CONN_RELEASE.req: GTP conn not found! id=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rel_req->gtp_conn_id);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> /* release GTP pdp ctx: */</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_ue_gtp_unbind(ue);</span><br><span style="color: hsl(120, 100%, 40%);">+ gtp_conn_free(conn);</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span> static int llsk_rx_gtp_conn_data_req(struct hnb *hnb, struct hnb_gtp_conn_data_req_param *data_req)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct hnb_ue *ue;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gtp_conn *conn;</span><br><span> int rc = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLLSK, LOGL_DEBUG, "Rx GTP-CONN_DATA.req ctx=%u rem_tei=%u data_len=%u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- data_req->context_id, data_req->remote_tei, data_req->data_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLLSK, LOGL_DEBUG, "Rx GTP-CONN_DATA.req id=%u data_len=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ data_req->gtp_conn_id, data_req->data_len);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ue = hnb_find_ue_by_id(hnb, data_req->context_id);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ue) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLLSK, LOGL_ERROR, "Rx GTP-CONN_DATA.req: UE not found! ctx=%u data_len=%u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- data_req->context_id, data_req->data_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ conn = hnb_find_gtp_conn_by_id(hnb, data_req->gtp_conn_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conn) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLLSK, LOGL_ERROR, "Rx GTP-CONN_DATA.req: GTP conn not found! id=%u data_len=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ data_req->gtp_conn_id, data_req->data_len);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = hnb_ue_gtp_tx(ue, data_req->data, data_req->data_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gtp_conn_tx(conn, 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 cc03c6c..2f40d99 100644</span><br><span>--- a/src/osmo-hnodeb/rtp.c</span><br><span>+++ b/src/osmo-hnodeb/rtp.c</span><br><span>@@ -27,6 +27,33 @@</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%);">+struct rtp_conn *rtp_conn_alloc(struct hnb_ue *ue)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rtp_conn *conn;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ conn = talloc_zero(ue, struct rtp_conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conn)</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%);">+ conn->ue = ue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add(&conn->list, &ue->conn_cs.conn_list);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return conn;</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%);">+void rtp_conn_free(struct rtp_conn *conn)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conn)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn->socket) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_rtp_socket_free(conn->socket);</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->socket = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&conn->list);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(conn);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> /* Mixture between osmo_rtp_get_bound_addr and osmo_rtp_get_bound_ip_port using osmo_sockaddr */</span><br><span> /*static int rtp_get_bound_addr(struct osmo_rtp_socket *rs, struct osmo_sockaddr *osa)</span><br><span>@@ -97,11 +124,13 @@</span><br><span> </span><br><span> tries = (hnb->rtp.port_range_end - hnb->rtp.port_range_start) / 2;</span><br><span> for (i = 0; i < tries; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t port;</span><br><span> </span><br><span> if (hnb->rtp.port_range_next >= hnb->rtp.port_range_end)</span><br><span> hnb->rtp.port_range_next = hnb->rtp.port_range_start;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmo_rtp_socket_bind(rs, ip, hnb->rtp.port_range_next);</span><br><span style="color: hsl(120, 100%, 40%);">+ port = hnb->rtp.port_range_next;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_rtp_socket_bind(rs, ip, port);</span><br><span> </span><br><span> hnb->rtp.port_range_next += 2;</span><br><span> </span><br><span>@@ -118,7 +147,7 @@</span><br><span> LOGP(DRTP, LOGL_ERROR, "failed to set socket priority %d: %s\n",</span><br><span> hnb->rtp.priority, strerror(errno));</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return port;</span><br><span> }</span><br><span> </span><br><span> return -1;</span><br><span>@@ -128,14 +157,14 @@</span><br><span> unsigned int rtp_pl_len, uint16_t seq_number,</span><br><span> uint32_t timestamp, bool marker)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct hnb_ue *ue = (struct hnb_ue *)rs->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rtp_conn *conn = (struct rtp_conn *)rs->priv;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGUE(ue, DRTP, LOGL_DEBUG, "Rx RTP seq=%u ts=%u M=%u pl=%p len=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ 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(ue, rtp_pl, rtp_pl_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ llsk_audio_tx_conn_data_ind(conn, rtp_pl, rtp_pl_len);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int hnb_ue_voicecall_setup(struct hnb_ue *ue, const struct osmo_sockaddr *rem_addr, struct osmo_sockaddr *loc_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> {</span><br><span> int rc;</span><br><span> char cname[256+4];</span><br><span>@@ -144,6 +173,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 hnb_ue *ue = conn->ue;</span><br><span> struct hnb *hnb = ue->hnb;</span><br><span> </span><br><span> if (osmo_sockaddr_to_str_and_uint(remote_ipstr, sizeof(remote_ipstr), &remote_port, &rem_addr->u.sa) == 0) {</span><br><span>@@ -151,12 +181,9 @@</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (ue->conn_cs.rtp.socket) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGUE(ue, DRTP, LOGL_ERROR, "Setting up rtp socket but it already exists!\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->rem_addr = *rem_addr;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rs = ue->conn_cs.rtp.socket = osmo_rtp_socket_create(ue, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ rs = conn->socket = osmo_rtp_socket_create(ue, 0);</span><br><span> rc = osmo_rtp_socket_set_param(rs,</span><br><span> hnb->rtp.jitter_adaptive ?</span><br><span> OSMO_RTP_P_JIT_ADAP :</span><br><span>@@ -166,7 +193,7 @@</span><br><span> LOGUE(ue, DRTP, LOGL_ERROR, "Failed to set RTP socket parameters: %s\n", strerror(-rc));</span><br><span> goto free_ret;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- rs->priv = ue;</span><br><span style="color: hsl(120, 100%, 40%);">+ rs->priv = conn;</span><br><span> rs->rx_cb = &rtp_rx_cb;</span><br><span> </span><br><span> rc = rtp_bind(hnb, rs, local_wildcard_ipstr);</span><br><span>@@ -174,10 +201,11 @@</span><br><span> LOGUE(ue, DRTP, LOGL_ERROR, "Failed to bind RTP/RTCP sockets\n");</span><br><span> goto free_ret;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->id = rc; /* We use local port as rtp conn ID */</span><br><span> </span><br><span> /* Ensure RTCP SDES contains some useful information */</span><br><span> snprintf(cname, sizeof(cname), "hnb@%s", local_wildcard_ipstr);</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(name, sizeof(name), "ue@%u", ue->conn_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(name, sizeof(name), "ue@%u-%u", conn->ue->conn_id, conn->id);</span><br><span> osmo_rtp_set_source_desc(rs, cname, name, NULL, NULL, NULL,</span><br><span> "OsmoHNodeB-" PACKAGE_VERSION, NULL);</span><br><span> </span><br><span>@@ -188,8 +216,8 @@</span><br><span> }</span><br><span> </span><br><span> /* osmo_rtp_socket_connect() is broken, OS#5356 */</span><br><span style="color: hsl(0, 100%, 40%);">- //rc = rtp_get_bound_addr(rs, loc_addr);</span><br><span style="color: hsl(0, 100%, 40%);">- rc = rtp_get_bound_addr(rs, rem_addr, loc_addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ //rc = rtp_get_bound_addr(rs, &conn->loc_addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = rtp_get_bound_addr(rs, rem_addr, &conn->loc_addr);</span><br><span> if (rc < 0) {</span><br><span> LOGUE(ue, DRTP, LOGL_ERROR, "Cannot obtain locally bound IP/port: %d\n", rc);</span><br><span> goto free_ret;</span><br><span>@@ -197,16 +225,7 @@</span><br><span> </span><br><span> return rc;</span><br><span> free_ret:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_rtp_socket_free(ue->conn_cs.rtp.socket);</span><br><span style="color: hsl(0, 100%, 40%);">- ue->conn_cs.rtp.socket = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_rtp_socket_free(conn->socket);</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->socket = NULL;</span><br><span> return rc;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int hnb_ue_voicecall_release(struct hnb_ue *ue)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ue->conn_cs.rtp.socket)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_rtp_socket_free(ue->conn_cs.rtp.socket);</span><br><span style="color: hsl(0, 100%, 40%);">- ue->conn_cs.rtp.socket = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hnodeb/+/26570">change 26570</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/+/26570"/><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: Ib3f60d5ba21defe5259c25e2034fc2217c4d93df </div>
<div style="display:none"> Gerrit-Change-Number: 26570 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>