From f4b343920668280b39ddb95209f6ab0ceccab630 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 28 Aug 2010 16:08:39 +0800 Subject: nat: Make the code work in terms of endpoints instead of timeslot/multiplex We are going to have more than one trunk, so all code hardcoding the multiplex to zero must go. Avoid this kind of problem by saving the MGCP endpoint number and comparing that. --- openbsc/include/openbsc/bsc_nat_sccp.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'openbsc/include/openbsc/bsc_nat_sccp.h') diff --git a/openbsc/include/openbsc/bsc_nat_sccp.h b/openbsc/include/openbsc/bsc_nat_sccp.h index 73e9c690c..fcfd23beb 100644 --- a/openbsc/include/openbsc/bsc_nat_sccp.h +++ b/openbsc/include/openbsc/bsc_nat_sccp.h @@ -79,10 +79,13 @@ struct sccp_connections { int con_type; int con_local; - /* GSM audio handling. That is 32 * multiplex + ts */ + /* + * audio handling. Remember if we have ever send a CRCX, + * remember the endpoint used by the MSC and BSC. + */ int crcx; - int msc_timeslot; - int bsc_timeslot; + int msc_endp; + int bsc_endp; /* timeout handling */ struct timespec creation_time; -- cgit v1.2.3 From 39cd32e650d490ba2d5e74f2df90a3f12514d618 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 28 Aug 2010 18:11:07 +0800 Subject: 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. --- openbsc/include/openbsc/bsc_nat_sccp.h | 1 - 1 file changed, 1 deletion(-) (limited to 'openbsc/include/openbsc/bsc_nat_sccp.h') diff --git a/openbsc/include/openbsc/bsc_nat_sccp.h b/openbsc/include/openbsc/bsc_nat_sccp.h index fcfd23beb..4f1afcb2b 100644 --- a/openbsc/include/openbsc/bsc_nat_sccp.h +++ b/openbsc/include/openbsc/bsc_nat_sccp.h @@ -83,7 +83,6 @@ struct sccp_connections { * 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; -- cgit v1.2.3