move RTP socket information from timeslot to lchan
With ip.access, in case of TCH/H, we have one RTP stream for each half-slot
(lchan), not just one per on-air timeslot. This is quite different from
a classic BTS where the TRAU frames of the two TCH/H channels would be
part of the same 16k sub-slot in a E1 timeslot.
diff --git a/openbsc/src/abis_rsl.c b/openbsc/src/abis_rsl.c
index 1d41d2b..e7be9ba 100644
--- a/openbsc/src/abis_rsl.c
+++ b/openbsc/src/abis_rsl.c
@@ -1555,7 +1555,7 @@
{
struct abis_rsl_dchan_hdr *dh = msgb_l2(msg);
struct tlv_parsed tv;
- struct gsm_bts_trx_ts *ts = msg->lchan->ts;
+ struct gsm_lchan *lchan = msg->lchan;
struct in_addr ip;
u_int16_t port, attr_f8;
@@ -1578,16 +1578,16 @@
inet_ntoa(ip), ntohs(port), ntohs(attr_f8));
if (TLVP_PRESENT(&tv, RSL_IE_IPAC_RTP_PAYLOAD2)) {
- ts->abis_ip.rtp_payload2 =
+ lchan->abis_ip.rtp_payload2 =
*TLVP_VAL(&tv, RSL_IE_IPAC_RTP_PAYLOAD2);
DEBUGPC(DRSL, "RTP_PAYLOAD2=0x%02x ",
- ts->abis_ip.rtp_payload2);
+ lchan->abis_ip.rtp_payload2);
}
/* update our local information about this TS */
- ts->abis_ip.bound_ip = ntohl(ip.s_addr);
- ts->abis_ip.bound_port = ntohs(port);
- ts->abis_ip.conn_id = ntohs(attr_f8);
+ lchan->abis_ip.bound_ip = ntohl(ip.s_addr);
+ lchan->abis_ip.bound_port = ntohs(port);
+ lchan->abis_ip.conn_id = ntohs(attr_f8);
dispatch_signal(SS_ABISIP, S_ABISIP_CRCX_ACK, msg->lchan);