nat: Remove the CRCX value from the nat
Assume that if the MSC has assigned a timeslot/multiplex it will
also be used for the MGCP. So we just assume that it was allocated
on the BSC as well... in the worse case we will send a DLCX downstream
but it should be fine.
diff --git a/openbsc/include/openbsc/bsc_nat_sccp.h b/openbsc/include/openbsc/bsc_nat_sccp.h
index fcfd23b..4f1afcb 100644
--- a/openbsc/include/openbsc/bsc_nat_sccp.h
+++ b/openbsc/include/openbsc/bsc_nat_sccp.h
@@ -83,7 +83,6 @@
* audio handling. Remember if we have ever send a CRCX,
* remember the endpoint used by the MSC and BSC.
*/
- int crcx;
int msc_endp;
int bsc_endp;
diff --git a/openbsc/src/nat/bsc_mgcp_utils.c b/openbsc/src/nat/bsc_mgcp_utils.c
index 567c325..8ed9301 100644
--- a/openbsc/src/nat/bsc_mgcp_utils.c
+++ b/openbsc/src/nat/bsc_mgcp_utils.c
@@ -149,13 +149,12 @@
{
con->msc_endp = -1;
con->bsc_endp = -1;
- con->crcx = 0;
}
void bsc_mgcp_dlcx(struct sccp_connections *con)
{
/* send a DLCX down the stream */
- if (con->bsc_endp != -1 && con->crcx) {
+ if (con->bsc_endp != -1) {
bsc_mgcp_send_dlcx(con->bsc, con->bsc_endp);
bsc_mgcp_free_endpoint(con->bsc->nat, con->msc_endp);
}
@@ -253,7 +252,6 @@
}
/* send the message and a fake MDCX to force sending of a dummy packet */
- sccp->crcx = 1;
bsc_write(sccp->bsc, bsc_msg, NAT_IPAC_PROTO_MGCP);
bsc_mgcp_send_mdcx(sccp->bsc, mgcp_endp);
return MGCP_POLICY_DEFER;
@@ -288,7 +286,6 @@
} else {
if (con->bsc == bsc) {
bsc_mgcp_send_dlcx(bsc, ENDPOINT_NUMBER(endp));
- con->crcx = 0;
} else {
LOGP(DMGCP, LOGL_ERROR,
"Endpoint belongs to a different BSC\n");