[asterisk-commits] may: trunk r408315 - in /trunk: ./ addons/ooh323c/src/ooh323.c

[SVN commits to the Asterisk project]

Author: may
Date: Wed Feb 19 04:41:01 2014
New Revision: 408315

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=408315
Log:
Allow different socket and signalling ip on h.323 connection if gk mode is active
Reported by: Gabriele Odone
Patches:
	ASTERISK-22738-1.patch
Tested by: Gabriele Odone
(closes issue ASTERISK-22738)
........

Merged revisions 408312 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 408314 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/addons/ooh323c/src/ooh323.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/addons/ooh323c/src/ooh323.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/ooh323.c?view=diff&rev=408315&r1=408314&r2=408315
==============================================================================
--- trunk/addons/ooh323c/src/ooh323.c (original)
+++ trunk/addons/ooh323c/src/ooh323.c Wed Feb 19 04:41:01 2014
@@ -535,11 +535,13 @@
       }
    }
 
+/* Allow sourceCallSignallAddress different with socket IP for gk routed calls */
    if (strncmp(remoteIP, call->remoteIP, strlen(remoteIP))) {
-     OOTRACEERR5("ERROR: Security denial remote sig IP isn't a socket ip, %s not %s "
-		     "(%s, %s)\n", remoteIP, call->remoteIP, call->callType, 
-		     call->callToken);
-     return OO_FAILED;
+	if(!gH323ep.gkClient || OO_TESTFLAG(call->flags, OO_M_DISABLEGK) || (gH323ep.gkClient->state != GkClientRegistered)) {
+     		OOTRACEERR5("ERROR: Security denial remote sig IP isn't a socket ip, %s not %s "
+		     	"(%s, %s)\n", remoteIP, call->remoteIP, call->callType, call->callToken);
+     		return OO_FAILED;
+	}
    }
    
    /* check for fast start */