new variable %{from-parent} for SQLAuth CallQuery

kodakkey · Jul 27, 2018 · 3e160b0 · 3e160b0
1 parent 4004440
commit 3e160b0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/RasTbl.h b/RasTbl.h
@@ -942,7 +942,7 @@ class CallRec {
 
 	void SetH245Routed(PBoolean routed) { m_h245Routed = routed; }
 	bool IsH245Routed() const { return m_h245Routed; }
-	bool IsToParent() const { return m_toParent; }	// to _or_ from parnet
+	bool IsToParent() const { return m_toParent; }	// to _or_ from parent
 	bool IsFromParent() const { return m_fromParent; }	// from parent only
 	bool IsForwarded() const { return m_forwarded; }
 	bool IsSocketAttached() const { return (m_callingSocket != NULL); }

diff --git a/changes.txt b/changes.txt
@@ -1,5 +1,6 @@
 Changes from 4.9 to 5.0
 =======================
+- new variable %{from-parent} for SQLAuth CallQuery
 - new variable %{Calling-Station-Id} for SQLAuth RegQuery
 - BUGFIX(Toolkit.cxx) fix route matching
 - BUGFIX(ProxyChannel.cxx) fix RTP multiplexing when child calls parent

diff --git a/docs/manual/auth.sgml b/docs/manual/auth.sgml
@@ -668,6 +668,7 @@ replacement is made before each query is executed. The following parameters are
 <item><tt/%{bandwidth}/ - requested bandwidth, if present in the ARQ
 <item><tt/%{answer}/ - 1, if the request is an answering ARQ
 <item><tt/%{arq}/ - 1 for ARQ triggered query, 0 for Setup triggered query
+<item><tt/%{from-parent}/ - 1 calls from parent gatekeeper, 0 for other calls
 </itemize>
 <p>
 If the query returns no rows, the result is undefined, which basically

diff --git a/sqlauth.cxx b/sqlauth.cxx
@@ -159,7 +159,7 @@ class SQLAuth : public GkAuthenticator
 		#GkAuthenticator::Status enum# with the result of authentication.
 	*/
 	virtual int Check(
-		/// ARQ nessage to be authenticated
+		/// ARQ message to be authenticated
 		RasPDU<H225_AdmissionRequest> & arqPdu,
 		/// authorization data (call duration limit, reject reason, ...)
 		ARQAuthData & authData
@@ -620,7 +620,7 @@ int SQLAuth::Check(
 }
 
 int SQLAuth::Check(
-	/// ARQ nessage to be authenticated
+	/// ARQ message to be authenticated
 	RasPDU<H225_AdmissionRequest> & arqPdu,
 	/// authorization data (call duration limit, reject reason, ...)
 	ARQAuthData & authData
@@ -648,6 +648,7 @@ int SQLAuth::Check(
 	params["bandwidth"] = PString(arq.m_bandWidth.GetValue());
 	params["answer"] = arq.m_answerCall ? "1" : "0";
 	params["arq"] = "1";
+	params["from-parent"] = "0";
 	params["CallId"] = AsString(arq.m_callIdentifier);
 	params["SrcInfo"] = AsString(arq.m_srcInfo, false);
     params["Vendor"] = "";
@@ -886,6 +887,7 @@ int SQLAuth::Check(
 	params["Dialed-Number"] = GetDialedNumber(setup, authData);
 	params["answer"] = "0";
 	params["arq"] = "0";
+	params["from-parent"] = authData.m_call->IsFromParent() ? "1" : "0";
 	params["CallId"] = AsString(setup.GetUUIEBody().m_callIdentifier);
     params["SrcInfo"] = "";
 	if (setup.GetUUIEBody().HasOptionalField(H225_Setup_UUIE::e_sourceAddress)