diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2017-06-28 00:51:43 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2017-07-12 23:42:47 +0200 |
| commit | 0d55fcd795456adc964122fcf493e3b11b669de9 (patch) | |
| tree | 15044e3c347e577e34525242b009f0eef95b42fe /src | |
| parent | 49c6311b59aeb4f18254aea450764c01337c9c71 (diff) | |
aoip: don't use iu struct: move rtp ports from .iu to new subscr_conn.rtp
Change-Id: Ib1a84b0733655b2e87c1598ae9df0640cdca833b
Diffstat (limited to 'src')
| -rw-r--r-- | src/libmsc/a_iface.c | 2 | ||||
| -rw-r--r-- | src/libmsc/a_iface_bssap.c | 2 | ||||
| -rw-r--r-- | src/libmsc/msc_ifaces.c | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c index ce38e20db..869cd7887 100644 --- a/src/libmsc/a_iface.c +++ b/src/libmsc/a_iface.c @@ -291,7 +291,7 @@ int a_iface_tx_assignment(struct gsm_trans *trans) /* Package RTP-Address data */ memset(&rtp_addr_in, 0, sizeof(rtp_addr_in)); rtp_addr_in.sin_family = AF_INET; - rtp_addr_in.sin_port = osmo_htons(conn->iu.mgcp_rtp_port_ue); + rtp_addr_in.sin_port = osmo_htons(conn->rtp.port_subscr); rtp_addr_in.sin_addr.s_addr = osmo_htonl(mgcpgw_client_remote_addr_n(gsm_network->mgcpgw.client)); memset(&rtp_addr, 0, sizeof(rtp_addr)); diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 8a40314e6..cdddac7e7 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -584,7 +584,7 @@ static int bssmap_rx_ass_compl(struct osmo_sccp_user *scu, struct a_conn_info *a * transport address element */ if (rtp_addr.ss_family == AF_INET) { rtp_addr_in = (struct sockaddr_in *)&rtp_addr; - conn->iu.mgcp_rtp_port_ue = osmo_ntohs(rtp_addr_in->sin_port); + conn->rtp.port_subscr = osmo_ntohs(rtp_addr_in->sin_port); /* FIXME: We also get the IP-Address of the remote (e.g. BTS) * end with the response. Currently we just ignore that address. * Instead we expect that our local MGCP gateway and the code diff --git a/src/libmsc/msc_ifaces.c b/src/libmsc/msc_ifaces.c index 8d5364767..cdc724b5b 100644 --- a/src/libmsc/msc_ifaces.c +++ b/src/libmsc/msc_ifaces.c @@ -170,18 +170,18 @@ static void mgcp_response_rab_act_cs_crcx(struct mgcp_response *r, void *priv) goto rab_act_cs_error; } - conn->iu.mgcp_rtp_port_cn = r->audio_port; + conn->rtp.port_cn = r->audio_port; rtp_ip = mgcpgw_client_remote_addr_n(conn->network->mgcpgw.client); if (trans->conn->via_ran == RAN_UTRAN_IU) { /* Assign a voice channel via RANAP on 3G */ iu_rab_act_cs(uectx, conn->iu.rab_id, rtp_ip, - conn->iu.mgcp_rtp_port_ue); + conn->rtp.port_subscr); /* use_x213_nsap == 0 for ip.access nano3G */ } else if (trans->conn->via_ran == RAN_GERAN_A) { /* Assign a voice channel via A on 2G */ - if (a_iface_tx_assignment(trans) == -EINVAL) + if (a_iface_tx_assignment(trans)) goto rab_act_cs_error; } else goto rab_act_cs_error; @@ -213,7 +213,7 @@ static int conn_iu_rab_act_cs(struct gsm_trans *trans) * gets the endpoint ID via the CRCX. It will do the same calculation * on his side too to get knowledge of the rtp port. */ bts_base = mgcp->actual.bts_base; - conn->iu.mgcp_rtp_port_ue = bts_base + 2 * conn->iu.mgcp_rtp_endpoint; + conn->rtp.port_subscr = bts_base + 2 * conn->iu.mgcp_rtp_endpoint; /* Since we know now the endpoint number, we enforce a DLCX on tha * endpoint in order to ensure that this endpoint is not occupied @@ -286,7 +286,7 @@ static void mgcp_bridge(struct gsm_trans *from, struct gsm_trans *to, msg = mgcp_msg_mdcx(mgcp, conn1->iu.mgcp_rtp_endpoint, - ip, conn2->iu.mgcp_rtp_port_cn, + ip, conn2->rtp.port_cn, mode); if (mgcpgw_client_tx(mgcp, msg, mgcp_response_bridge_mdcx, from)) LOGP(DMGCP, LOGL_ERROR, |