openh323gk-cvs — CVS commit notifications for developers

[GnuGk-cvs] openh323gk changes.txt, 1.644, 1.645 gk.cxx, 1.155, 1.156 radauth.cxx, 1.59, 1.60 radauth.h, 1.21, 1.22

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv19684

Modified Files:
	changes.txt gk.cxx radauth.cxx radauth.h 
Log Message:
new switch [RadAliasAuth] EmptyUsername= (thanks Yuriy!)


Index: radauth.h
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/radauth.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** radauth.h	7 Dec 2011 22:42:32 -0000	1.21
--- radauth.h	18 Jan 2012 16:56:40 -0000	1.22
***************
*** 289,292 ****
--- 289,294 ----
  	/// fixed value for User-Name attribute, read from config
  	PString m_fixedUsername;
+ 	/// fixed value for User-Name attribute for unregistered calls with empty h323 id
+ 	PString m_emptyUsername;
  	/// fixed valud for User-Password attribute, read from config
  	PString m_fixedPassword;

Index: radauth.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/radauth.cxx,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** radauth.cxx	7 Dec 2011 22:42:32 -0000	1.59
--- radauth.cxx	18 Jan 2012 16:56:40 -0000	1.60
***************
*** 1171,1176 ****
  	if (!rrq.HasOptionalField(H225_RegistrationRequest::e_terminalAlias)) {
  		PTRACE(3, "RADAUTH\t" << GetName() << " RRQ auth failed: "
! 			"no m_terminalAlias field"
! 			);
  		authData.m_rejectReason = H225_RegistrationRejectReason::e_securityDenial;
  		return GetDefaultStatus();
--- 1171,1175 ----
  	if (!rrq.HasOptionalField(H225_RegistrationRequest::e_terminalAlias)) {
  		PTRACE(3, "RADAUTH\t" << GetName() << " RRQ auth failed: "
! 			"no m_terminalAlias field");
  		authData.m_rejectReason = H225_RegistrationRejectReason::e_securityDenial;
  		return GetDefaultStatus();
***************
*** 1180,1185 ****
  	if (!rrq.HasOptionalField(H225_RegistrationRequest::e_tokens)) {
  		PTRACE(3, "RADAUTH\t" << GetName() << " RRQ auth failed: "
! 			"tokens not found"
! 			);
  		authData.m_rejectReason = H225_RegistrationRejectReason::e_securityDenial;
  		return GetDefaultStatus();
--- 1179,1183 ----
  	if (!rrq.HasOptionalField(H225_RegistrationRequest::e_tokens)) {
  		PTRACE(3, "RADAUTH\t" << GetName() << " RRQ auth failed: "
! 			"tokens not found");
  		authData.m_rejectReason = H225_RegistrationRejectReason::e_securityDenial;
  		return GetDefaultStatus();
***************
*** 1193,1200 ****
  
  int RadAuth::AppendUsernameAndPassword(
! 	RadiusPDU& pdu,
! 	RasPDU<H225_AdmissionRequest>& arqPdu,
! 	ARQAuthData& authData,
! 	PString* username
  	) const
  {
--- 1191,1198 ----
  
  int RadAuth::AppendUsernameAndPassword(
! 	RadiusPDU & pdu,
! 	RasPDU<H225_AdmissionRequest> & arqPdu,
! 	ARQAuthData & authData,
! 	PString * username
  	) const
  {
***************
*** 1204,1209 ****
  	if (!arq.HasOptionalField(H225_AdmissionRequest::e_tokens)) {
  		PTRACE(3, "RADAUTH\t" << GetName() << " ARQ auth failed: "
! 			"tokens not found"
! 			);
  		authData.m_rejectReason = H225_AdmissionRejectReason::e_securityDenial;
  		return GetDefaultStatus();
--- 1202,1206 ----
  	if (!arq.HasOptionalField(H225_AdmissionRequest::e_tokens)) {
  		PTRACE(3, "RADAUTH\t" << GetName() << " ARQ auth failed: "
! 			"tokens not found");
  		authData.m_rejectReason = H225_AdmissionRejectReason::e_securityDenial;
  		return GetDefaultStatus();
***************
*** 1217,1225 ****
  
  int RadAuth::AppendUsernameAndPassword(
! 	RadiusPDU& pdu,
! 	SetupMsg &setup,
! 	endptr& /*callingEP*/,
! 	SetupAuthData& authData,
! 	PString* username
  	) const
  {
--- 1214,1222 ----
  
  int RadAuth::AppendUsernameAndPassword(
! 	RadiusPDU & pdu,
! 	SetupMsg & setup,
! 	endptr & /*callingEP*/,
! 	SetupAuthData & authData,
! 	PString * username
  	) const
  {
***************
*** 1239,1253 ****
  
  RadAliasAuth::RadAliasAuth( 
! 	const char* authName 
! 	)
  	:
  	RadAuthBase(authName, RadAliasAuthConfigSectionName)
  {
  	m_fixedUsername = GetConfig()->GetString(
! 		RadAliasAuthConfigSectionName, "FixedUsername", ""
! 		);
  	m_fixedPassword = Toolkit::Instance()->ReadPassword(
! 		RadAliasAuthConfigSectionName, "FixedPassword"
! 		);
  }
  
--- 1236,1249 ----
  
  RadAliasAuth::RadAliasAuth( 
! 	const char * authName)
  	:
  	RadAuthBase(authName, RadAliasAuthConfigSectionName)
  {
  	m_fixedUsername = GetConfig()->GetString(
! 		RadAliasAuthConfigSectionName, "FixedUsername", "");
  	m_fixedPassword = Toolkit::Instance()->ReadPassword(
! 		RadAliasAuthConfigSectionName, "FixedPassword");
! 	m_emptyUsername = GetConfig()->GetString(
! 		RadAliasAuthConfigSectionName, "EmptyUsername", "");
  }
  
***************
*** 1257,1264 ****
  
  int RadAliasAuth::AppendUsernameAndPassword(
! 	RadiusPDU& pdu,
! 	RasPDU<H225_RegistrationRequest>& rrqPdu, 
! 	RRQAuthData& authData,
! 	PString* username
  	) const
  {
--- 1253,1260 ----
  
  int RadAliasAuth::AppendUsernameAndPassword(
! 	RadiusPDU & pdu,
! 	RasPDU<H225_RegistrationRequest> & rrqPdu, 
! 	RRQAuthData & authData,
! 	PString * username
  	) const
  {
***************
*** 1266,1271 ****
  	if (id.IsEmpty() && m_fixedUsername.IsEmpty()) {
  		PTRACE(3, "RADAUTH\t" << GetName() << " RRQ check failed: "
! 			"neither FixedUsername nor alias inside RRQ were found"
! 			);
  		authData.m_rejectReason = H225_RegistrationRejectReason::e_securityDenial;
  		return GetDefaultStatus();
--- 1262,1266 ----
  	if (id.IsEmpty() && m_fixedUsername.IsEmpty()) {
  		PTRACE(3, "RADAUTH\t" << GetName() << " RRQ check failed: "
! 			"neither FixedUsername nor alias inside RRQ were found");
  		authData.m_rejectReason = H225_RegistrationRejectReason::e_securityDenial;
  		return GetDefaultStatus();
***************
*** 1274,1279 ****
  	// append User-Name
     	pdu.AppendAttr(RadiusAttr::UserName, 
! 		m_fixedUsername.IsEmpty() ? id : m_fixedUsername
! 		);
  	
  	if (username != NULL)
--- 1269,1273 ----
  	// append User-Name
     	pdu.AppendAttr(RadiusAttr::UserName, 
! 		m_fixedUsername.IsEmpty() ? id : m_fixedUsername);
  	
  	if (username != NULL)
***************
*** 1285,1290 ****
  	else 
  		pdu.AppendAttr(RadiusAttr::UserPassword, 
! 			m_fixedUsername.IsEmpty() ? id : m_fixedUsername
! 			);
  		
  	return e_ok;			
--- 1279,1283 ----
  	else 
  		pdu.AppendAttr(RadiusAttr::UserPassword, 
! 			m_fixedUsername.IsEmpty() ? id : m_fixedUsername);
  		
  	return e_ok;			
***************
*** 1292,1299 ****
  
  int RadAliasAuth::AppendUsernameAndPassword(
! 	RadiusPDU& pdu,
! 	RasPDU<H225_AdmissionRequest>& arqPdu,
! 	ARQAuthData& authData,
! 	PString* username
  	) const
  {
--- 1285,1292 ----
  
  int RadAliasAuth::AppendUsernameAndPassword(
! 	RadiusPDU & pdu,
! 	RasPDU<H225_AdmissionRequest> & arqPdu,
! 	ARQAuthData & authData,
! 	PString * username
  	) const
  {
***************
*** 1309,1314 ****
  	// append User-Name
     	pdu.AppendAttr(RadiusAttr::UserName, 
! 		m_fixedUsername.IsEmpty() ? id : m_fixedUsername
! 		);
  
  	if (username != NULL)
--- 1302,1306 ----
  	// append User-Name
     	pdu.AppendAttr(RadiusAttr::UserName, 
! 		m_fixedUsername.IsEmpty() ? id : m_fixedUsername);
  
  	if (username != NULL)
***************
*** 1319,1324 ****
  	else
  		pdu.AppendAttr(RadiusAttr::UserPassword, 
! 			m_fixedUsername.IsEmpty() ? id : m_fixedUsername
! 			);
  			
  	return e_ok;
--- 1311,1315 ----
  	else
  		pdu.AppendAttr(RadiusAttr::UserPassword, 
! 			m_fixedUsername.IsEmpty() ? id : m_fixedUsername);
  			
  	return e_ok;
***************
*** 1326,1349 ****
  
  int RadAliasAuth::AppendUsernameAndPassword(
! 	RadiusPDU& pdu,
! 	SetupMsg &setup,
! 	endptr& /*callingEP*/,
! 	SetupAuthData& authData,
! 	PString* username
  	) const
  {
  	const PString id = GetUsername(setup, authData);
! 	if (id.IsEmpty() && m_fixedUsername.IsEmpty()) {
  		PTRACE(3, "RADAUTH\t" << GetName() << " Setup check failed: "
! 			"neither FixedUsername nor alias inside Setup were found"
  			);
  		authData.m_rejectReason = H225_ReleaseCompleteReason::e_badFormatAddress;
  		return GetDefaultStatus();
  	}
! 	
  	// append User-Name
     	pdu.AppendAttr(RadiusAttr::UserName, 
! 		m_fixedUsername.IsEmpty() ? id : m_fixedUsername
! 		);
  
  	if (username != NULL)
--- 1317,1344 ----
  
  int RadAliasAuth::AppendUsernameAndPassword(
! 	RadiusPDU & pdu,
! 	SetupMsg & setup,
! 	endptr& /* callingEP*/,
! 	SetupAuthData & authData,
! 	PString * username
  	) const
  {
  	const PString id = GetUsername(setup, authData);
! 	if (id.IsEmpty() && m_fixedUsername.IsEmpty() && m_emptyUsername.IsEmpty()) {
  		PTRACE(3, "RADAUTH\t" << GetName() << " Setup check failed: "
! 			"neither EmptyUsername nor FixedUsername nor alias inside Setup were found"
  			);
  		authData.m_rejectReason = H225_ReleaseCompleteReason::e_badFormatAddress;
  		return GetDefaultStatus();
  	}
! 
! 	// append EmptyUsername
! 	if (id.IsEmpty() && !m_emptyUsername.IsEmpty()) {
! 		pdu.AppendAttr(RadiusAttr::UserName, m_emptyUsername);
! 	}
! 
  	// append User-Name
     	pdu.AppendAttr(RadiusAttr::UserName, 
! 		m_fixedUsername.IsEmpty() ? id : m_fixedUsername);
  
  	if (username != NULL)
***************
*** 1354,1359 ****
  	else
  		pdu.AppendAttr(RadiusAttr::UserPassword, 
! 			m_fixedUsername.IsEmpty() ? id : m_fixedUsername
! 			);
  			
  	return e_ok;
--- 1349,1353 ----
  	else
  		pdu.AppendAttr(RadiusAttr::UserPassword, 
! 			m_fixedUsername.IsEmpty() ? id : m_fixedUsername);
  			
  	return e_ok;

Index: changes.txt
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/changes.txt,v
retrieving revision 1.644
retrieving revision 1.645
diff -C2 -d -r1.644 -r1.645
*** changes.txt	18 Jan 2012 16:21:43 -0000	1.644
--- changes.txt	18 Jan 2012 16:56:40 -0000	1.645
***************
*** 1,4 ****
--- 1,5 ----
  Changes from 3.0 to 3.1
  =======================
+ - new switch [RadAliasAuth] EmptyUsername=
  - BUGFIX(Routing.cxx) use same caller alias in RouteRequest and SQL routing as for accounting
  - new switch [GkStatus::Filtering] NewRCFOnly=1

Index: gk.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/gk.cxx,v
retrieving revision 1.155
retrieving revision 1.156
diff -C2 -d -r1.155 -r1.156
*** gk.cxx	17 Jan 2012 20:04:42 -0000	1.155
--- gk.cxx	18 Jan 2012 16:56:40 -0000	1.156
***************
*** 310,313 ****
--- 310,314 ----
  	{ "RadAliasAuth", "SocketDeleteTimeout" },
  	{ "RadAliasAuth", "UseDialedNumber" },
+ 	{ "RadAliasAuth", "EmptyUsername" },
  	{ "RadAuth", "AppendCiscoAttributes" },
  	{ "RadAuth", "DefaultAuthPort" },

[GnuGk-cvs] openh323gk gkauth.cxx,1.120,1.121 gksql.cxx,1.26,1.27

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv13517

Modified Files:
	gkauth.cxx gksql.cxx 
Log Message:
cleanup


Index: gksql.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/gksql.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** gksql.cxx	25 Oct 2010 15:01:51 -0000	1.26
--- gksql.cxx	18 Jan 2012 16:28:48 -0000	1.27
***************
*** 36,42 ****
  GkSQLConnection::GkSQLConnection(
  	/// name to use in the log
! 	const char* name
! 	)
! 	: NamedObject(name),
  	m_minPoolSize(GKSQL_DEFAULT_MIN_POOL_SIZE), 
  	m_maxPoolSize(GKSQL_DEFAULT_MAX_POOL_SIZE),
--- 36,41 ----
  GkSQLConnection::GkSQLConnection(
  	/// name to use in the log
! 	const char * name)
! 	: NamedObject(name), m_port(0),
  	m_minPoolSize(GKSQL_DEFAULT_MIN_POOL_SIZE), 
  	m_maxPoolSize(GKSQL_DEFAULT_MAX_POOL_SIZE),
***************
*** 45,52 ****
  }
  
! GkSQLConnection* GkSQLConnection::Create(
! 	const char* driverName,
! 	const char* connectionName
! 	)
  {
  	return Factory<GkSQLConnection>::Create(driverName, connectionName);
--- 44,48 ----
  }
  
! GkSQLConnection* GkSQLConnection::Create( const char * driverName, const char * connectionName)
  {
  	return Factory<GkSQLConnection>::Create(driverName, connectionName);
***************
*** 55,62 ****
  bool GkSQLConnection::Initialize(
  	/// config to be read
! 	PConfig* cfg,
  	/// name of the config section with SQL settings
! 	const char* cfgSectionName
! 	)
  {
  	PWaitAndSignal lock(m_connectionsMutex);
--- 51,57 ----
  bool GkSQLConnection::Initialize(
  	/// config to be read
! 	PConfig * cfg,
  	/// name of the config section with SQL settings
! 	const char * cfgSectionName)
  {
  	PWaitAndSignal lock(m_connectionsMutex);

Index: gkauth.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/gkauth.cxx,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** gkauth.cxx	4 Jan 2012 14:47:39 -0000	1.120
--- gkauth.cxx	18 Jan 2012 16:28:48 -0000	1.121
***************
*** 46,52 ****
  ARQAuthData::ARQAuthData(
  	/// an endpoint requesting admission
! 	const endptr& ep,
  	/// call record matching this ARQ (if any)
! 	const callptr& call
  	) : m_rejectReason(-1), m_callDurationLimit(-1), 
  	m_requestingEP(ep),	m_call(call), m_billingMode(-1),
--- 46,52 ----
  ARQAuthData::ARQAuthData(
  	/// an endpoint requesting admission
! 	const endptr & ep,
  	/// call record matching this ARQ (if any)
! 	const callptr & call
  	) : m_rejectReason(-1), m_callDurationLimit(-1), 
  	m_requestingEP(ep),	m_call(call), m_billingMode(-1),
***************
*** 57,61 ****
  
  ARQAuthData::ARQAuthData(
! 	const ARQAuthData& obj
  	) : m_rejectReason(obj.m_rejectReason),
  	m_callDurationLimit(obj.m_callDurationLimit), 
--- 57,61 ----
  
  ARQAuthData::ARQAuthData(
! 	const ARQAuthData & obj
  	) : m_rejectReason(obj.m_rejectReason),
  	m_callDurationLimit(obj.m_callDurationLimit), 

[GnuGk-cvs] openh323gk Routing.cxx, 1.141, 1.142 changes.txt, 1.643, 1.644

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv11554

Modified Files:
	Routing.cxx changes.txt 
Log Message:
use same caller alias in RouteRequest and SQL routing as for accounting


Index: Routing.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/Routing.cxx,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -d -r1.141 -r1.142
*** Routing.cxx	17 Jan 2012 13:37:27 -0000	1.141
--- Routing.cxx	18 Jan 2012 16:21:43 -0000	1.142
***************
*** 1243,1247 ****
  {
  	bool reject = false;
! 	H225_ArrayOf_AliasAddress *aliases = new H225_ArrayOf_AliasAddress;
  	aliases->SetSize(1);
  	PString vq = "";
--- 1243,1247 ----
  {
  	bool reject = false;
! 	H225_ArrayOf_AliasAddress * aliases = new H225_ArrayOf_AliasAddress;
  	aliases->SetSize(1);
  	PString vq = "";
***************
*** 1258,1264 ****
  		PString * callerID = new PString();
  		PString callid = AsString(setup.m_callIdentifier.m_guid);
! 		PString src;
! 		if (setup.HasOptionalField(H225_Setup_UUIE::e_sourceAddress))
! 			src = AsString(setup.m_sourceAddress);
  		PIPSocket::Address localAddr;
  		WORD localPort;
--- 1258,1265 ----
  		PString * callerID = new PString();
  		PString callid = AsString(setup.m_callIdentifier.m_guid);
! 		H225_AliasAddress srcAlias;
! 		// convert caller string back to alias to get alias type
! 		H323SetAliasAddress(request.GetCallingStationId(), srcAlias);
! 		PString src = AsString(srcAlias);
  		PIPSocket::Address localAddr;
  		WORD localPort;
***************
*** 1646,1650 ****
  bool SqlPolicy::OnRequest(SetupRequest & request)
  {
! 	H225_Setup_UUIE &setup = request.GetRequest();
  
  	PString source = AsDotString(setup.m_sourceCallSignalAddress);
--- 1647,1651 ----
  bool SqlPolicy::OnRequest(SetupRequest & request)
  {
! 	H225_Setup_UUIE & setup = request.GetRequest();
  
  	PString source = AsDotString(setup.m_sourceCallSignalAddress);
***************
*** 1657,1663 ****
  	request.GetWrapper()->GetLocalAddr(localAddr, localPort);
  	PString calledIP = localAddr;	// TODO: only correct if a gatekeeper IP was called, should we use explicit IP if present ?
! 	PString caller;
! 	if (setup.HasOptionalField(H225_Setup_UUIE::e_sourceAddress))
! 		caller = AsString(setup.m_sourceAddress, FALSE);
  	PString callingStationId = request.GetCallingStationId();
  	PString callid = AsString(setup.m_callIdentifier.m_guid);
--- 1658,1662 ----
  	request.GetWrapper()->GetLocalAddr(localAddr, localPort);
  	PString calledIP = localAddr;	// TODO: only correct if a gatekeeper IP was called, should we use explicit IP if present ?
! 	PString caller = request.GetCallingStationId();
  	PString callingStationId = request.GetCallingStationId();
  	PString callid = AsString(setup.m_callIdentifier.m_guid);

Index: changes.txt
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/changes.txt,v
retrieving revision 1.643
retrieving revision 1.644
diff -C2 -d -r1.643 -r1.644
*** changes.txt	17 Jan 2012 20:04:42 -0000	1.643
--- changes.txt	18 Jan 2012 16:21:43 -0000	1.644
***************
*** 1,4 ****
--- 1,5 ----
  Changes from 3.0 to 3.1
  =======================
+ - BUGFIX(Routing.cxx) use same caller alias in RouteRequest and SQL routing as for accounting
  - new switch [GkStatus::Filtering] NewRCFOnly=1
  - BUGFIX(Routing.cxx) check if Setup contains sourceAddress before using it

[GnuGk-cvs] openh323gk RasSrv.cxx,1.352,1.353

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv5402

Modified Files:
	RasSrv.cxx 
Log Message:
initialize variables


Index: RasSrv.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/RasSrv.cxx,v
retrieving revision 1.352
retrieving revision 1.353
diff -C2 -d -r1.352 -r1.353
*** RasSrv.cxx	17 Jan 2012 20:04:42 -0000	1.352
--- RasSrv.cxx	17 Jan 2012 20:39:35 -0000	1.353
***************
*** 680,683 ****
--- 680,687 ----
  	GKRoutedSignaling = false;
  	GKRoutedH245 = false;
+ 	bRemoveCallOnDRQ = true;
+ 	altGKsSize = 0;
+ 	epLimit = callLimit = P_MAX_INDEX;
+ 	redirectGK = e_noRedirect;
  }
  

[GnuGk-cvs] openh323gk Neighbor.cxx,1.127,1.128

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv3855

Modified Files:
	Neighbor.cxx 
Log Message:
initialize variables


Index: Neighbor.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/Neighbor.cxx,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -d -r1.127 -r1.128
*** Neighbor.cxx	16 Jan 2012 13:48:21 -0000	1.127
--- Neighbor.cxx	17 Jan 2012 20:28:44 -0000	1.128
***************
*** 195,198 ****
--- 195,205 ----
  {
  	m_rasSrv = RasServer::Instance();
+ 	m_port = 0;
+ 	m_forwardHopCount = 0;
+ 	m_dynamic = false;
+ 	m_acceptForwarded = true;
+ 	m_forwardResponse = false;
+ 	m_forwardto = 0;
+ 	m_externalGK = false;
  	m_keepAliveTimer = GkTimerManager::INVALID_HANDLE;
  	m_keepAliveTimerInterval = 0;

[GnuGk-cvs] openh323gk ProxyChannel.cxx, 1.549, 1.550 ProxyChannel.h, 1.95, 1.96

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv3425

Modified Files:
	ProxyChannel.cxx ProxyChannel.h 
Log Message:
variable initialization


Index: ProxyChannel.h
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/ProxyChannel.h,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** ProxyChannel.h	17 Jan 2012 16:21:51 -0000	1.95
--- ProxyChannel.h	17 Jan 2012 20:21:40 -0000	1.96
***************
*** 381,385 ****
  protected:
  	BYTE * wbuffer;
! 	WORD wbufsize, buflen;
  };
  
--- 381,385 ----
  protected:
  	BYTE * wbuffer;
! 	WORD wbufsize;
  };
  

Index: ProxyChannel.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/ProxyChannel.cxx,v
retrieving revision 1.549
retrieving revision 1.550
diff -C2 -d -r1.549 -r1.550
*** ProxyChannel.cxx	17 Jan 2012 16:21:51 -0000	1.549
--- ProxyChannel.cxx	17 Jan 2012 20:21:40 -0000	1.550
***************
*** 455,459 ****
  class LogicalChannel {
  public:
! 	LogicalChannel(WORD flcn = 0) : channelNumber(flcn), used(false) {}
  	virtual ~LogicalChannel() {}
  
--- 455,459 ----
  class LogicalChannel {
  public:
! 	LogicalChannel(WORD flcn = 0) : channelNumber(flcn), port(0), used(false) {}
  	virtual ~LogicalChannel() {}
  
***************
*** 895,898 ****
--- 895,899 ----
  	InternalInit();
  	localAddr = peerAddr = masqAddr = GNUGK_INADDR_ANY;
+ 	peerPort = 0;
  	m_h245Tunneling = true;
  	SetHandler(RasServer::Instance()->GetSigProxyHandler());
***************
*** 6244,6248 ****
  	GetLocalAddress(localAddr, localPort);
  	UnmapIPv4Address(localAddr);
! 	buflen = (WORD)GetLastReadCount();
  	PUInt32b multiplexID = INVALID_MULTIPLEX_ID;
  	if (buflen >= 4)
--- 6245,6249 ----
  	GetLocalAddress(localAddr, localPort);
  	UnmapIPv4Address(localAddr);
! 	WORD buflen = (WORD)GetLastReadCount();
  	PUInt32b multiplexID = INVALID_MULTIPLEX_ID;
  	if (buflen >= 4)
***************
*** 7612,7615 ****
--- 7613,7617 ----
  	listener = new T120Listener(this);
  	port = listener->GetPort();
+ 	peerPort = 0;
  	if (listener->IsOpen())
  		PTRACE(4, "T120\tOpen logical channel " << flcn << " port " << port);

[GnuGk-cvs] openh323gk RasSrv.cxx, 1.351, 1.352 Routing.h, 1.60, 1.61 changes.txt, 1.642, 1.643 gk.cxx, 1.154, 1.155

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv1028

Modified Files:
	RasSrv.cxx Routing.h changes.txt gk.cxx 
Log Message:
new switch [GkStatus::Filtering] NewRCFOnly=1


Index: gk.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/gk.cxx,v
retrieving revision 1.154
retrieving revision 1.155
diff -C2 -d -r1.154 -r1.155
*** gk.cxx	16 Dec 2011 09:44:47 -0000	1.154
--- gk.cxx	17 Jan 2012 20:04:42 -0000	1.155
***************
*** 247,250 ****
--- 247,251 ----
  	{ "GkStatus::Filtering", "ExcludeFilter" },
  	{ "GkStatus::Filtering", "IncludeFilter" },
+ 	{ "GkStatus::Filtering", "NewRCFOnly" },
  	{ "LogFile", "Filename" },
  	{ "LogFile", "Rotate" },

Index: RasSrv.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/RasSrv.cxx,v
retrieving revision 1.351
retrieving revision 1.352
diff -C2 -d -r1.351 -r1.352
*** RasSrv.cxx	16 Jan 2012 14:02:49 -0000	1.351
--- RasSrv.cxx	17 Jan 2012 20:04:42 -0000	1.352
***************
*** 2400,2404 ****
  		+ "|" + ep->GetEndpointIdentifier().GetValue()
  		+ ";";
! 	PrintStatus(log);
  	return bShellSendReply;
  }
--- 2400,2410 ----
  		+ "|" + ep->GetEndpointIdentifier().GetValue()
  		+ ";";
! 	if (Toolkit::AsBool(GkConfig()->GetString("GkStatus::Filtering", "NewRCFOnly", "0"))) {
! 	    if (bNewEP) {
! 		PrintStatus(log);
! 	    }} else {
! 			PrintStatus(log);
! 	}
! 
  	return bShellSendReply;
  }

Index: changes.txt
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/changes.txt,v
retrieving revision 1.642
retrieving revision 1.643
diff -C2 -d -r1.642 -r1.643
*** changes.txt	17 Jan 2012 13:37:27 -0000	1.642
--- changes.txt	17 Jan 2012 20:04:42 -0000	1.643
***************
*** 1,4 ****
--- 1,5 ----
  Changes from 3.0 to 3.1
  =======================
+ - new switch [GkStatus::Filtering] NewRCFOnly=1
  - BUGFIX(Routing.cxx) check if Setup contains sourceAddress before using it
  - BUGFIX(ProxyChannel.cxx) fix H.239 where only one sides uses H.460.19

Index: Routing.h
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/Routing.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** Routing.h	5 Dec 2011 21:33:51 -0000	1.60
--- Routing.h	17 Jan 2012 20:04:42 -0000	1.61
***************
*** 107,111 ****
  	
  	RoutingRequest();
! 	RoutingRequest(const std::list<Route> &failedRoutes);
  	virtual ~RoutingRequest();
  
--- 107,111 ----
  	
  	RoutingRequest();
! 	RoutingRequest(const std::list<Route> & failedRoutes);
  	virtual ~RoutingRequest();
  

[GnuGk-cvs] openh323gk GkClient.cxx,1.107,1.108

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv3842

Modified Files:
	GkClient.cxx 
Log Message:
make sure STUNchangeRequest can only be created in a valid state


Index: GkClient.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/GkClient.cxx,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** GkClient.cxx	1 Oct 2011 21:02:03 -0000	1.107
--- GkClient.cxx	17 Jan 2012 16:24:16 -0000	1.108
***************
*** 280,285 ****
    BYTE flags[4];
    
-   STUNchangeRequest() { }
- 
    STUNchangeRequest(bool changeIP, bool changePort)
    {
--- 280,283 ----

[GnuGk-cvs] openh323gk ProxyChannel.h, 1.94, 1.95 ProxyChannel.cxx, 1.548, 1.549

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv3227

Modified Files:
	ProxyChannel.h ProxyChannel.cxx 
Log Message:
make sure TPKTV3 can only be created in a valid state


Index: ProxyChannel.h
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/ProxyChannel.h,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** ProxyChannel.h	14 Jan 2012 09:24:06 -0000	1.94
--- ProxyChannel.h	17 Jan 2012 16:21:51 -0000	1.95
***************
*** 136,140 ****
  protected:
  	struct TPKTV3 {
- 		TPKTV3() {}
  		TPKTV3(WORD);
  
--- 136,139 ----

Index: ProxyChannel.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/ProxyChannel.cxx,v
retrieving revision 1.548
retrieving revision 1.549
diff -C2 -d -r1.548 -r1.549
*** ProxyChannel.cxx	16 Jan 2012 17:11:06 -0000	1.548
--- ProxyChannel.cxx	17 Jan 2012 16:21:51 -0000	1.549
***************
*** 730,734 ****
  // class TCPProxySocket
  TCPProxySocket::TCPProxySocket(const char *t, TCPProxySocket *s, WORD p)
!       : ServerSocket(p), ProxySocket(this, t), remote(s), bufptr(NULL), tpktlen(0)
  {
  }
--- 730,734 ----
  // class TCPProxySocket
  TCPProxySocket::TCPProxySocket(const char *t, TCPProxySocket *s, WORD p)
!       : ServerSocket(p), ProxySocket(this, t), remote(s), bufptr(NULL), tpkt(0), tpktlen(0)
  {
  }

[GnuGk-cvs] openh323gk h460presence.cxx,1.16,1.17

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv31954

Modified Files:
	h460presence.cxx 
Log Message:
pass parameters by reference


Index: h460presence.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/h460presence.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** h460presence.cxx	16 Jan 2012 13:48:21 -0000	1.16
--- h460presence.cxx	17 Jan 2012 16:11:34 -0000	1.17
***************
*** 200,205 ****
  }
  
! H460P_PresenceSubscription & BuildSubscriptionMsg(const OpalGloballyUniqueID & id, const H225_AliasAddress remote,
! 												const H225_AliasAddress local, H460P_PresencePDU & msg)
  {
  	H323PresenceSubscription sub;
--- 200,205 ----
  }
  
! H460P_PresenceSubscription & BuildSubscriptionMsg(const OpalGloballyUniqueID & id, const H225_AliasAddress & remote,
! 												const H225_AliasAddress & local, H460P_PresencePDU & msg)
  {
  	H323PresenceSubscription sub;

[GnuGk-cvs] openh323gk Routing.cxx, 1.140, 1.141 changes.txt, 1.641, 1.642

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv18317

Modified Files:
	Routing.cxx changes.txt 
Log Message:
check if Setup contains sourceAddress before using it


Index: Routing.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/Routing.cxx,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -d -r1.140 -r1.141
*** Routing.cxx	15 Dec 2011 10:52:38 -0000	1.140
--- Routing.cxx	17 Jan 2012 13:37:27 -0000	1.141
***************
*** 1250,1254 ****
  	}
  	if (m_vqueue->IsDestinationVirtualQueue(vq)) {
! 		H225_Setup_UUIE &setup = request.GetRequest();
  		PString callerip = AsDotString(setup.m_sourceCallSignalAddress);
  		PString epid = "unregistered";
--- 1250,1254 ----
  	}
  	if (m_vqueue->IsDestinationVirtualQueue(vq)) {
! 		H225_Setup_UUIE & setup = request.GetRequest();
  		PString callerip = AsDotString(setup.m_sourceCallSignalAddress);
  		PString epid = "unregistered";
***************
*** 1258,1262 ****
  		PString * callerID = new PString();
  		PString callid = AsString(setup.m_callIdentifier.m_guid);
! 		PString src = AsString(setup.m_sourceAddress);
  		PIPSocket::Address localAddr;
  		WORD localPort;
--- 1258,1264 ----
  		PString * callerID = new PString();
  		PString callid = AsString(setup.m_callIdentifier.m_guid);
! 		PString src;
! 		if (setup.HasOptionalField(H225_Setup_UUIE::e_sourceAddress))
! 			src = AsString(setup.m_sourceAddress);
  		PIPSocket::Address localAddr;
  		WORD localPort;
***************
*** 1655,1659 ****
  	request.GetWrapper()->GetLocalAddr(localAddr, localPort);
  	PString calledIP = localAddr;	// TODO: only correct if a gatekeeper IP was called, should we use explicit IP if present ?
! 	PString caller = AsString(setup.m_sourceAddress, FALSE);
  	PString callingStationId = request.GetCallingStationId();
  	PString callid = AsString(setup.m_callIdentifier.m_guid);
--- 1657,1663 ----
  	request.GetWrapper()->GetLocalAddr(localAddr, localPort);
  	PString calledIP = localAddr;	// TODO: only correct if a gatekeeper IP was called, should we use explicit IP if present ?
! 	PString caller;
! 	if (setup.HasOptionalField(H225_Setup_UUIE::e_sourceAddress))
! 		caller = AsString(setup.m_sourceAddress, FALSE);
  	PString callingStationId = request.GetCallingStationId();
  	PString callid = AsString(setup.m_callIdentifier.m_guid);

Index: changes.txt
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/changes.txt,v
retrieving revision 1.641
retrieving revision 1.642
diff -C2 -d -r1.641 -r1.642
*** changes.txt	12 Jan 2012 14:26:33 -0000	1.641
--- changes.txt	17 Jan 2012 13:37:27 -0000	1.642
***************
*** 1,4 ****
--- 1,5 ----
  Changes from 3.0 to 3.1
  =======================
+ - BUGFIX(Routing.cxx) check if Setup contains sourceAddress before using it
  - BUGFIX(ProxyChannel.cxx) fix H.239 where only one sides uses H.460.19
  - signal H.460.9 as desired feature if QoS monitoring is enabled

[GnuGk-cvs] openh323gk Routing.cxx,1.140,1.140.2.1

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv18279

Modified Files:
      Tag: v3_0_STABLE
	Routing.cxx 
Log Message:
check if Setup contains sourceAddress before using it


Index: Routing.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/Routing.cxx,v
retrieving revision 1.140
retrieving revision 1.140.2.1
diff -C2 -d -r1.140 -r1.140.2.1
*** Routing.cxx	15 Dec 2011 10:52:38 -0000	1.140
--- Routing.cxx	17 Jan 2012 13:37:15 -0000	1.140.2.1
***************
*** 1258,1262 ****
  		PString * callerID = new PString();
  		PString callid = AsString(setup.m_callIdentifier.m_guid);
! 		PString src = AsString(setup.m_sourceAddress);
  		PIPSocket::Address localAddr;
  		WORD localPort;
--- 1258,1264 ----
  		PString * callerID = new PString();
  		PString callid = AsString(setup.m_callIdentifier.m_guid);
! 		PString src;
! 		if (setup.HasOptionalField(H225_Setup_UUIE::e_sourceAddress))
! 			src = AsString(setup.m_sourceAddress);
  		PIPSocket::Address localAddr;
  		WORD localPort;
***************
*** 1655,1659 ****
  	request.GetWrapper()->GetLocalAddr(localAddr, localPort);
  	PString calledIP = localAddr;	// TODO: only correct if a gatekeeper IP was called, should we use explicit IP if present ?
! 	PString caller = AsString(setup.m_sourceAddress, FALSE);
  	PString callingStationId = request.GetCallingStationId();
  	PString callid = AsString(setup.m_callIdentifier.m_guid);
--- 1657,1663 ----
  	request.GetWrapper()->GetLocalAddr(localAddr, localPort);
  	PString calledIP = localAddr;	// TODO: only correct if a gatekeeper IP was called, should we use explicit IP if present ?
! 	PString caller;
! 	if (setup.HasOptionalField(H225_Setup_UUIE::e_sourceAddress))
! 		caller = AsString(setup.m_sourceAddress, FALSE);
  	PString callingStationId = request.GetCallingStationId();
  	PString callid = AsString(setup.m_callIdentifier.m_guid);

[GnuGk-cvs] openh323gk Toolkit.cxx,1.212,1.213

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv28018

Modified Files:
	Toolkit.cxx 
Log Message:
imitialize timeout


Index: Toolkit.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/Toolkit.cxx,v
retrieving revision 1.212
retrieving revision 1.213
diff -C2 -d -r1.212 -r1.213
*** Toolkit.cxx	21 Dec 2011 17:02:07 -0000	1.212
--- Toolkit.cxx	17 Jan 2012 09:25:23 -0000	1.213
***************
*** 2018,2022 ****
  #if HAS_DATABASE
  Toolkit::AssignedGatekeepers::AssignedGatekeepers()
!   : m_sqlactive(false), m_sqlConn(NULL)
  {
  }
--- 2018,2022 ----
  #if HAS_DATABASE
  Toolkit::AssignedGatekeepers::AssignedGatekeepers()
!   : m_sqlactive(false), m_sqlConn(NULL), m_timeout(-1)
  {
  }

[GnuGk-cvs] openh323gk ProxyChannel.cxx,1.547,1.548

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv32313

Modified Files:
	ProxyChannel.cxx 
Log Message:
reduce variable visibility


Index: ProxyChannel.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/ProxyChannel.cxx,v
retrieving revision 1.547
retrieving revision 1.548
diff -C2 -d -r1.547 -r1.548
*** ProxyChannel.cxx	16 Jan 2012 17:08:20 -0000	1.547
--- ProxyChannel.cxx	16 Jan 2012 17:11:06 -0000	1.548
***************
*** 2270,2280 ****
  		if (!q931.HasIE(Q931::CalledPartyNumberIE)) {
  			PString calledNumber;
- 			unsigned plan = Q931::ISDNPlan, type = Q931::InternationalType;
  			if (setupBody.HasOptionalField(H225_Setup_UUIE::e_destinationAddress)) {
  				calledNumber = GetBestAliasAddressString(setupBody.m_destinationAddress,false, 
  				AliasAddressTagMask(H225_AliasAddress::e_dialedDigits) | AliasAddressTagMask(H225_AliasAddress::e_partyNumber));
  				PTRACE(1, "Setting the Q.931 CalledPartyNumber to: " << calledNumber);
! 				if (IsValidE164(calledNumber))
  					q931.SetCalledPartyNumber(calledNumber, plan, type);
  			}
  		}
--- 2270,2281 ----
  		if (!q931.HasIE(Q931::CalledPartyNumberIE)) {
  			PString calledNumber;
  			if (setupBody.HasOptionalField(H225_Setup_UUIE::e_destinationAddress)) {
  				calledNumber = GetBestAliasAddressString(setupBody.m_destinationAddress,false, 
  				AliasAddressTagMask(H225_AliasAddress::e_dialedDigits) | AliasAddressTagMask(H225_AliasAddress::e_partyNumber));
  				PTRACE(1, "Setting the Q.931 CalledPartyNumber to: " << calledNumber);
! 				if (IsValidE164(calledNumber)) {
! 					unsigned plan = Q931::ISDNPlan, type = Q931::InternationalType;
  					q931.SetCalledPartyNumber(calledNumber, plan, type);
+ 				}
  			}
  		}

[GnuGk-cvs] openh323gk ProxyChannel.cxx,1.546,1.547

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv31787

Modified Files:
	ProxyChannel.cxx 
Log Message:
comment out unused code


Index: ProxyChannel.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/ProxyChannel.cxx,v
retrieving revision 1.546
retrieving revision 1.547
diff -C2 -d -r1.546 -r1.547
*** ProxyChannel.cxx	14 Jan 2012 09:24:06 -0000	1.546
--- ProxyChannel.cxx	16 Jan 2012 17:08:20 -0000	1.547
***************
*** 6247,6253 ****
  	if (buflen >= 4)
  		multiplexID = ((int)wbuffer[0] * 16777216) + ((int)wbuffer[1] * 65536) + ((int)wbuffer[2] * 256) + (int)wbuffer[3];
! 	int version = 0;
! 	if (buflen >= 5)
! 		version = (((int)wbuffer[4] & 0xc0) >> 6);
  
  	if (multiplexID == INVALID_MULTIPLEX_ID) {
--- 6247,6253 ----
  	if (buflen >= 4)
  		multiplexID = ((int)wbuffer[0] * 16777216) + ((int)wbuffer[1] * 65536) + ((int)wbuffer[2] * 256) + (int)wbuffer[3];
! //	int version = 0;
! //	if (buflen >= 5)
! //		version = (((int)wbuffer[4] & 0xc0) >> 6);
  
  	if (multiplexID == INVALID_MULTIPLEX_ID) {

[GnuGk-cvs] openh323gk RasPDU.h,1.21,1.22 RasSrv.cxx,1.350,1.351

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv32215

Modified Files:
	RasPDU.h RasSrv.cxx 
Log Message:
remove unused code


Index: RasSrv.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/RasSrv.cxx,v
retrieving revision 1.350
retrieving revision 1.351
diff -C2 -d -r1.350 -r1.351
*** RasSrv.cxx	16 Jan 2012 13:48:21 -0000	1.350
--- RasSrv.cxx	16 Jan 2012 14:02:49 -0000	1.351
***************
*** 386,394 ****
  }
  
- void RasMsg::Release()
- {
- 	m_msg = NULL;
- }
- 
  bool RasMsg::PrintStatus(const PString & log)
  {
--- 386,389 ----
***************
*** 569,579 ****
  }
  
- void RasHandler::ProcessRAS(RasMsg *ras)
- {
- 	ras->Exec();
- 	delete ras;
- 	ras = NULL;
- }
- 
  // class RasRequester
  RasRequester::RasRequester(H225_RasMessage & req) : m_request(&req), m_loAddr(GNUGK_INADDR_ANY)
--- 564,567 ----

Index: RasPDU.h
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/RasPDU.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** RasPDU.h	27 Nov 2011 13:30:05 -0000	1.21
--- RasPDU.h	16 Jan 2012 14:02:49 -0000	1.22
***************
*** 107,111 ****
  	GatekeeperMessage *operator->() { return m_msg; }
  	const GatekeeperMessage *operator->() const { return m_msg; }
- 	void Release();
  
  	static void Initialize();
--- 107,110 ----
***************
*** 229,233 ****
  	// give the derived class an opportunity to create customized PDU
  	// default behavior: return the original one
- 	// Note: call RasMsg::Release() if new one is created
  	virtual RasMsg *CreatePDU(RasMsg *ras) { return ras; }
  
--- 228,231 ----
***************
*** 241,247 ****
  
  private:
- 	// delete the object after running RasMsg::Exec()
- 	static void ProcessRAS(RasMsg *);
- 
  	bool m_tagArray[MaxRasTag + 1];
  };
--- 239,242 ----
***************
*** 310,354 ****
  }
  
- /*****************************************************************
- 
- The template class let you to modify the default handler of a
- given RAS message. Just explicitly specialize the Process method.
- For example,
- 
- template<> bool HookedPDU<H225_RegistrationRequest>::Process()
- {
- 	do_something_before_process();
- 	// call the default handler
- 	bool result = m_opdu->Process();
- 	do_something_after_process();
- 	return result;
- }
- 
- Then add a creator to hook the interested messages
- 
- 	HookedPDU<H225_RegistrationRequest>::Creator HookedRRQ;
- 
- Note the creator must be executed after RasServer::Run().
- 
- *****************************************************************/
- 
- template<class RAS>
- class HookedPDU : public RasPDU<RAS> {
- public:
- 	HookedPDU(GatekeeperMessage *m, RasMsg *p) : RasPDU<RAS>(m), m_opdu(p) {}
- 	~HookedPDU() { m_opdu->Release(); delete m_opdu; }
- 
- 	virtual bool Process() { return m_opdu->Process(); }
- 
- 	typedef typename RasPDU<RAS>::RasCreator RasCreator;
- 	struct Creator : public RasPDU<RAS>::Creator {
- 		Creator() { PAssert(this->m_old, "Error: Hook failed"); } // fix for GCC 3.4.2
- 		virtual RasMsg *operator()(GatekeeperMessage *m) const
- 		{ return new HookedPDU<RAS>(m, dynamic_cast<RasCreator &>(*(this->m_old))(m)); } // fix for GCC 3.4.2
- 	};
- 
- private:
- 	RasMsg *m_opdu;
- };
- 
  #endif // RASPDU_H
--- 305,307 ----

[GnuGk-cvs] openh323gk Neighbor.cxx, 1.126, 1.127 Neighbor.h, 1.31, 1.32 RasSrv.cxx, 1.349, 1.350 RasSrv.h, 1.69, 1.70 RasTbl.cxx, 1.372, 1.373 RasTbl.h, 1.226, 1.227 h460presence.cxx, 1.15, 1.16 h460presence.h, 1.5, 1.6

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv26207

Modified Files:
	Neighbor.cxx Neighbor.h RasSrv.cxx RasSrv.h RasTbl.cxx 
	RasTbl.h h460presence.cxx h460presence.h 
Log Message:
remove unused code


Index: RasSrv.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/RasSrv.cxx,v
retrieving revision 1.349
retrieving revision 1.350
diff -C2 -d -r1.349 -r1.350
*** RasSrv.cxx	14 Jan 2012 09:24:06 -0000	1.349
--- RasSrv.cxx	16 Jan 2012 13:48:21 -0000	1.350
***************
*** 975,983 ****
  }
  
- void RasServer::AddListener(UDPSocket *socket)
- {
- 	AddSocket(socket);
- }
- 
  WORD RasServer::GetRequestSeqNum()
  {
--- 975,978 ----

Index: RasSrv.h
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/RasSrv.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** RasSrv.h	14 Jan 2012 09:24:06 -0000	1.69
--- RasSrv.h	16 Jan 2012 13:48:21 -0000	1.70
***************
*** 96,100 ****
  	void AddListener(TCPListenSocket *);
  	bool CloseListener(TCPListenSocket *);
- 	void AddListener(UDPSocket *);
  
  	WORD GetRequestSeqNum();
--- 96,99 ----

Index: Neighbor.h
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/Neighbor.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Neighbor.h	26 Sep 2011 13:40:48 -0000	1.31
--- Neighbor.h	16 Jan 2012 13:48:21 -0000	1.32
***************
*** 152,156 ****
  	bool CheckLRQ(RasMsg *) const;
  	bool CheckIP(const PIPSocket::Address &) const;
- 	bool IsTraversalZone(const PIPSocket::Address &) const;
  	bool IsTraversalClient(const PIPSocket::Address &) const;
  	bool IsTraversalServer(const PIPSocket::Address &) const;
--- 152,155 ----

Index: h460presence.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/h460presence.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** h460presence.cxx	20 Apr 2011 22:22:48 -0000	1.15
--- h460presence.cxx	16 Jan 2012 13:48:21 -0000	1.16
***************
*** 752,765 ****
  }
  
- void GkPresence::ProcessPresenceElement(const PASN_OctetString & pdu, const H225_TransportAddress & ip)
- {
- 	PWaitAndSignal m(m_AliasMutex);
- 
- 	if (!ReceivedPDU(pdu)) {
- 		PTRACE(4,"H460P\tError processing PDU");
- 	}
- }
- 
- 
  bool GkPresence::BuildPresenceElement(unsigned msgtag, const H225_EndpointIdentifier & ep, PASN_OctetString & pdu)
  {
--- 752,755 ----

Index: Neighbor.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/Neighbor.cxx,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** Neighbor.cxx	28 Dec 2011 16:48:19 -0000	1.126
--- Neighbor.cxx	16 Jan 2012 13:48:21 -0000	1.127
***************
*** 1243,1251 ****
  }
  
- bool NeighborList::IsTraversalZone(const PIPSocket::Address & addr) const
- {
- 	return find_if(m_neighbors.begin(), m_neighbors.end(), bind2nd(mem_fun(&Neighbor::IsTraversalZone), &addr)) != m_neighbors.end();
- }
- 
  bool NeighborList::IsTraversalClient(const PIPSocket::Address & addr) const
  {
--- 1243,1246 ----

Index: h460presence.h
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/h460presence.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** h460presence.h	25 Oct 2010 15:01:51 -0000	1.5
--- h460presence.h	16 Jan 2012 13:48:21 -0000	1.6
***************
*** 43,47 ****
  	bool BuildPresenceElement(unsigned msgtag, const H225_TransportAddress & ip, PASN_OctetString & pdu);
  	void ProcessPresenceElement(const PASN_OctetString & pdu);
- 	void ProcessPresenceElement(const PASN_OctetString & pdu, const H225_TransportAddress & ip);
  
  	bool GetPendingIdentifiers(list<H225_EndpointIdentifier> & epid);
--- 43,46 ----

Index: RasTbl.h
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/RasTbl.h,v
retrieving revision 1.226
retrieving revision 1.227
diff -C2 -d -r1.226 -r1.227
*** RasTbl.h	14 Jan 2012 09:24:06 -0000	1.226
--- RasTbl.h	16 Jan 2012 13:48:21 -0000	1.227
***************
*** 1248,1253 ****
  	bool GetMediaOriginatingIp(PIPSocket::Address &addr) const;
  
- 	void SetRADIUSClass(const PBYTEArray &bytes);
- 	void SetRADIUSClass(void * bytes, PINDEX len);
  	PBYTEArray GetRADIUSClass() const;
  	
--- 1248,1251 ----
***************
*** 1603,1607 ****
  
  	bool InternalRemovePtr(CallRec *call);
- 	void InternalRemove(const H225_CallIdentifier & CallId);
  	void InternalRemove(iterator);
  	void InternalRemoveFailedLeg(iterator);
--- 1601,1604 ----

Index: RasTbl.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/RasTbl.cxx,v
retrieving revision 1.372
retrieving revision 1.373
diff -C2 -d -r1.372 -r1.373
*** RasTbl.cxx	14 Jan 2012 09:24:06 -0000	1.372
--- RasTbl.cxx	16 Jan 2012 13:48:21 -0000	1.373
***************
*** 3711,3726 ****
  #endif  // HAS_H46023
  
- void CallRec::SetRADIUSClass(const PBYTEArray &bytes)
- {
- 	PWaitAndSignal lock(m_usedLock);
- 	m_radiusClass = bytes;
- }
- 
- void CallRec::SetRADIUSClass(void * bytes, PINDEX len)
- {
- 	PWaitAndSignal lock(m_usedLock);
- 	m_radiusClass = PBYTEArray(static_cast<const BYTE*>(bytes), len);
- }
- 
  PBYTEArray CallRec::GetRADIUSClass() const
  {
--- 3711,3714 ----
***************
*** 4462,4475 ****
  }
  
- void CallTable::InternalRemove(const H225_CallIdentifier & CallId)
- {
- 	PTRACE(5, "GK\tRemoving CallId: " << AsString(CallId.m_guid));
- 	WriteLock lock(listLock);
- 	InternalRemove(
- 		find_if(CallList.begin(), CallList.end(),
- 		bind2nd(mem_fun(&CallRec::CompareCallId), &CallId))
- 	);
- }
- 
  void CallTable::InternalRemove(iterator Iter)
  {
--- 4450,4453 ----

[GnuGk-cvs] openh323gk Makefile.in, 1.53, 1.54 ProxyChannel.cxx, 1.545, 1.546 ProxyChannel.h, 1.93, 1.94 RasSrv.cxx, 1.348, 1.349 RasSrv.h, 1.68, 1.69 RasTbl.cxx, 1.371, 1.372 RasTbl.h, 1.225, 1.226

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv11718

Modified Files:
	Makefile.in ProxyChannel.cxx ProxyChannel.h RasSrv.cxx 
	RasSrv.h RasTbl.cxx RasTbl.h 
Log Message:
remove unused code


Index: Makefile.in
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/Makefile.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** Makefile.in	26 Jul 2011 12:07:15 -0000	1.53
--- Makefile.in	14 Jan 2012 09:24:06 -0000	1.54
***************
*** 105,108 ****
--- 105,110 ----
  include $(OPENH323MAKEDIR)/openh323u.mak
  
+ #CXX = callcatcher g++
+ 
  ### Remove -fdata-sections gcc option that cause problems during link step
  temp_STDCCFLAGS := $(subst -fdata-sections,,$(STDCCFLAGS))
***************
*** 163,167 ****
  	$(CXX) -I${GTEST_DIR}/include $(STDCCFLAGS) testrunner.cxx $(TESTCASES) -o testrunner libgtest.a $(TESTOBJS) $(LDFLAGS) -lh323_linux_x86_64__s -lpt_s $(ENDLDLIBS)
  	./testrunner
- 	
  
  #
--- 165,168 ----

Index: RasSrv.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/RasSrv.cxx,v
retrieving revision 1.348
retrieving revision 1.349
diff -C2 -d -r1.348 -r1.349
*** RasSrv.cxx	12 Jan 2012 11:29:35 -0000	1.348
--- RasSrv.cxx	14 Jan 2012 09:24:06 -0000	1.349
***************
*** 820,828 ****
  }
  
- void RasServer::Check()
- {
- 	gkClient->CheckRegistration();
- }
- 
  void RasServer::LoadConfig()
  {
--- 820,823 ----

Index: ProxyChannel.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/ProxyChannel.cxx,v
retrieving revision 1.545
retrieving revision 1.546
diff -C2 -d -r1.545 -r1.546
*** ProxyChannel.cxx	12 Jan 2012 16:04:44 -0000	1.545
--- ProxyChannel.cxx	14 Jan 2012 09:24:06 -0000	1.546
***************
*** 899,911 ****
  }
  
- CallSignalSocket::CallSignalSocket(CallSignalSocket *socket)
- 	: TCPProxySocket("Q931d", socket), m_callerSocket(false)
- {
- 	InternalInit();
- 	remote = socket;
- 	m_call = socket->m_call;
- 	m_h245Tunneling = socket->m_h245Tunneling;
- }
- 
  CallSignalSocket::CallSignalSocket(CallSignalSocket *socket, WORD _port)
  	: TCPProxySocket("Q931d", socket, _port), m_callerSocket(false)
--- 899,902 ----

Index: RasSrv.h
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/RasSrv.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** RasSrv.h	12 Oct 2011 09:38:47 -0000	1.68
--- RasSrv.h	14 Jan 2012 09:24:06 -0000	1.69
***************
*** 92,96 ****
  	bool UnregisterHandler(RasHandler *);
  
- 	void Check();
  	void LoadConfig();
  	void AddListener(RasListener *);
--- 92,95 ----

Index: ProxyChannel.h
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/ProxyChannel.h,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** ProxyChannel.h	2 Nov 2011 16:06:50 -0000	1.93
--- ProxyChannel.h	14 Jan 2012 09:24:06 -0000	1.94
***************
*** 217,224 ****
  	
  protected:
- 	CallSignalSocket(CallSignalSocket *);
- 	
  	void SetRemote(CallSignalSocket *);
  	bool CreateRemote(H225_Setup_UUIE &setupBody);
  public:
  #ifdef HAS_H46018
--- 217,223 ----
  	
  protected:
  	void SetRemote(CallSignalSocket *);
  	bool CreateRemote(H225_Setup_UUIE &setupBody);
+ 
  public:
  #ifdef HAS_H46018

Index: RasTbl.h
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/RasTbl.h,v
retrieving revision 1.225
retrieving revision 1.226
diff -C2 -d -r1.225 -r1.226
*** RasTbl.h	7 Jan 2012 06:28:51 -0000	1.225
--- RasTbl.h	14 Jan 2012 09:24:06 -0000	1.226
***************
*** 444,452 ****
  	*/
  	int GetPriority() const { return priority; }
- 	
- 	/// Set the priority for this gateway.
- 	void SetPriority(
- 		int newPriority
- 		);
  
  	//void DumpPriorities() const;
--- 444,447 ----

Index: RasTbl.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/RasTbl.cxx,v
retrieving revision 1.371
retrieving revision 1.372
diff -C2 -d -r1.371 -r1.372
*** RasTbl.cxx	7 Jan 2012 06:28:51 -0000	1.371
--- RasTbl.cxx	14 Jan 2012 09:24:06 -0000	1.372
***************
*** 1115,1123 ****
  }
  
- void GatewayRec::SetPriority(int newPriority)
- {
- 	priority = newPriority;
- }
- 
  void GatewayRec::SetEndpointType(const H225_EndpointType & t)
  {
--- 1115,1118 ----

[GnuGk-cvs] openh323gk ProxyChannel.cxx,1.541,1.541.2.1

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv28122

Modified Files:
      Tag: v3_0_STABLE
	ProxyChannel.cxx 
Log Message:
fix H.239 where only one sides uses H.460.19


Index: ProxyChannel.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/ProxyChannel.cxx,v
retrieving revision 1.541
retrieving revision 1.541.2.1
diff -C2 -d -r1.541 -r1.541.2.1
*** ProxyChannel.cxx	21 Dec 2011 17:02:07 -0000	1.541
--- ProxyChannel.cxx	13 Jan 2012 14:27:34 -0000	1.541.2.1
***************
*** 7982,7986 ****
--- 7982,7995 ----
  				olc.RemoveOptionalField(H245_OpenLogicalChannel::e_genericInformation);
  		}
+ #endif
  
+ 		// rewrite for forwarding after H.460.19 parameters have been parsed
+ 	    if (UsesH46019fc()) {
+ 			changed |= (h225Params) ? OnLogicalChannelParameters(h225Params, 0) : false;
+ 		} else {
+ 			changed |= (h225Params) ? OnLogicalChannelParameters(h225Params, flcn) : false;
+ 		}
+ 
+ #ifdef HAS_H46018
  		// check if we are doing unidirectional H.239 from a H.460.19 client
  		if (olc.m_forwardLogicalChannelParameters.m_dataType.GetTag() == H245_DataType::e_videoData) {
***************
*** 7994,8007 ****
  			}
  		}
- #endif
  
- 		// rewrite for forwarding after H.460.19 parameters have been parsed
- 	    if (UsesH46019fc()) {
- 			changed |= (h225Params) ? OnLogicalChannelParameters(h225Params, 0) : false;
- 		} else {
- 			changed |= (h225Params) ? OnLogicalChannelParameters(h225Params, flcn) : false;
- 		}
- 
- #ifdef HAS_H46018
  		// We don't put the generic identifier on the reverse OLC.
  		if (UsesH46019fc() && isReverseLC)
--- 8003,8007 ----

[GnuGk-cvs] openh323gk ProxyChannel.cxx,1.544,1.545

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv3820

Modified Files:
	ProxyChannel.cxx 
Log Message:
setting better names to UDPProxySockets


Index: ProxyChannel.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/ProxyChannel.cxx,v
retrieving revision 1.544
retrieving revision 1.545
diff -C2 -d -r1.544 -r1.545
*** ProxyChannel.cxx	12 Jan 2012 14:26:33 -0000	1.544
--- ProxyChannel.cxx	12 Jan 2012 16:04:44 -0000	1.545
***************
*** 357,360 ****
--- 357,361 ----
  	~UDPProxySocket();
  
+ 	void UpdateSocketName();
  	void SetDestination(H245_UnicastAddress &,callptr &);
  	void SetForwardDestination(const Address &, WORD, H245_UnicastAddress *, callptr &);
***************
*** 6687,6690 ****
--- 6688,6706 ----
  }
  
+ void UDPProxySocket::UpdateSocketName()
+ {
+ 	PString src = "(to be detected)";
+ 	PString dst = "(to be detected)";
+ 	Address laddr;
+ 	WORD lport = 0;
+ 	GetLocalAddress(laddr, lport);
+ 	UnmapIPv4Address(laddr);
+ 	if ((DWORD)fSrcIP)
+ 		src = AsString(fSrcIP, fSrcPort);
+ 	if ((DWORD)fDestIP)
+ 		dst = AsString(fDestIP, fDestPort);
+ 	SetName(src + "<=>" + AsString(laddr, lport) + "<=>" + dst);
+ }
+ 
  void UDPProxySocket::SetForwardDestination(const Address & srcIP, WORD srcPort, H245_UnicastAddress * addr, callptr & mcall)
  {
***************
*** 6699,6711 ****
  	}
  
! 	if ((DWORD)srcIP) {
! 		Address laddr;
! 		WORD lport = 0;
! 		GetLocalAddress(laddr, lport);
! 		UnmapIPv4Address(laddr);
! 		SetName(AsString(srcIP, srcPort) + "<=>" + AsString(laddr, lport) + "<=>" + AsString(fDestIP, fDestPort));
! 	} else {
! 		SetName("(To be autodetected)");
! 	}
  	PTRACE(5, Type() << "\tForward " << AsString(srcIP, srcPort)  << " to " << AsString(fDestIP, fDestPort));
  
--- 6715,6719 ----
  	}
  
! 	UpdateSocketName();
  	PTRACE(5, Type() << "\tForward " << AsString(srcIP, srcPort)  << " to " << AsString(fDestIP, fDestPort));
  
***************
*** 6737,6740 ****
--- 6745,6749 ----
  	}
  
+ 	UpdateSocketName();
  	PTRACE(5, Type() << "\tReverse " << AsString(srcIP, srcPort) << " to " << AsString(rDestIP, rDestPort));
  
***************
*** 6856,6859 ****
--- 6865,6869 ----
  				rSrcIP = fromIP; rSrcPort = fromPort;
  				SetMediaIP("SRC", fDestIP);
+ 				UpdateSocketName();
  			}
  			else if ((rDestIP == 0) && (fromAddr != fDestAddr)) {
***************
*** 6863,6866 ****
--- 6873,6877 ----
  				fSrcIP = fromIP; fSrcPort = fromPort;
  				SetMediaIP("DST", rDestIP);
+ 				UpdateSocketName();
  			}
  			if ((fDestIP != 0) && (rDestIP != 0)) {

[GnuGk-cvs] openh323gk ProxyChannel.cxx, 1.543, 1.544 changes.txt, 1.640, 1.641

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv12086

Modified Files:
	ProxyChannel.cxx changes.txt 
Log Message:
fix H.239 where only one sides uses H.460.19


Index: ProxyChannel.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/ProxyChannel.cxx,v
retrieving revision 1.543
retrieving revision 1.544
diff -C2 -d -r1.543 -r1.544
*** ProxyChannel.cxx	10 Jan 2012 11:42:40 -0000	1.543
--- ProxyChannel.cxx	12 Jan 2012 14:26:33 -0000	1.544
***************
*** 7988,7992 ****
--- 7988,8001 ----
  				olc.RemoveOptionalField(H245_OpenLogicalChannel::e_genericInformation);
  		}
+ #endif
  
+ 		// create LC objects, rewrite for forwarding after H.460.19 parameters have been parsed
+ 	    if (UsesH46019fc()) {
+ 			changed |= (h225Params) ? OnLogicalChannelParameters(h225Params, 0) : false;
+ 		} else {
+ 			changed |= (h225Params) ? OnLogicalChannelParameters(h225Params, flcn) : false;
+ 		}
+ 
+ #ifdef HAS_H46018
  		// check if we are doing unidirectional H.239 from a H.460.19 client
  		if (olc.m_forwardLogicalChannelParameters.m_dataType.GetTag() == H245_DataType::e_videoData) {
***************
*** 8000,8013 ****
  			}
  		}
- #endif
  
- 		// rewrite for forwarding after H.460.19 parameters have been parsed
- 	    if (UsesH46019fc()) {
- 			changed |= (h225Params) ? OnLogicalChannelParameters(h225Params, 0) : false;
- 		} else {
- 			changed |= (h225Params) ? OnLogicalChannelParameters(h225Params, flcn) : false;
- 		}
- 
- #ifdef HAS_H46018
  		// We don't put the generic identifier on the reverse OLC.
  		if (UsesH46019fc() && isReverseLC)
--- 8009,8013 ----

Index: changes.txt
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/changes.txt,v
retrieving revision 1.640
retrieving revision 1.641
diff -C2 -d -r1.640 -r1.641
*** changes.txt	12 Jan 2012 11:29:35 -0000	1.640
--- changes.txt	12 Jan 2012 14:26:33 -0000	1.641
***************
*** 1,4 ****
--- 1,5 ----
  Changes from 3.0 to 3.1
  =======================
+ - BUGFIX(ProxyChannel.cxx) fix H.239 where only one sides uses H.460.19
  - signal H.460.9 as desired feature if QoS monitoring is enabled
  - changed behavior of H.235 auth modules: allow call if one token matches, don't reject call

[GnuGk-cvs] openh323gk RasSrv.cxx, 1.347, 1.348 changes.txt, 1.639, 1.640

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv5390

Modified Files:
	RasSrv.cxx changes.txt 
Log Message:
signal H.460.9 as desired feature if QoS monitoring is enabled


Index: RasSrv.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/RasSrv.cxx,v
retrieving revision 1.347
retrieving revision 1.348
diff -C2 -d -r1.347 -r1.348
*** RasSrv.cxx	21 Dec 2011 14:24:52 -0000	1.347
--- RasSrv.cxx	12 Jan 2012 11:29:35 -0000	1.348
***************
*** 1777,1788 ****
  	PASN_OctetString preFeature;
  #endif // HAS_H460P
! 	
  	// Registration Priority and Pre-emption
! 	// This allows the unregistration of duplicate aliases with lower priority 
! 	OpalOID rPriFS = OpalOID(OID6);    
  
  	if (request.HasOptionalField(H225_RegistrationRequest::e_featureSet)) {
  		H460_FeatureSet fs = H460_FeatureSet(request.m_featureSet);
! 		
  #ifdef HAS_H46018
  		// H.460.18
--- 1777,1788 ----
  	PASN_OctetString preFeature;
  #endif // HAS_H460P
! 
  	// Registration Priority and Pre-emption
! 	// This allows the unregistration of duplicate aliases with lower priority
! 	OpalOID rPriFS = OpalOID(OID6);
  
  	if (request.HasOptionalField(H225_RegistrationRequest::e_featureSet)) {
  		H460_FeatureSet fs = H460_FeatureSet(request.m_featureSet);
! 
  #ifdef HAS_H46018
  		// H.460.18
***************
*** 2030,2034 ****
  					desc[sz] = H460_FeatureOID(rPriFS);
  				}
!  
  				// H.460.9
  				if (EPSupportsQoSReporting
--- 2030,2034 ----
  					desc[sz] = H460_FeatureOID(rPriFS);
  				}
! 
  				// H.460.9
  				if (EPSupportsQoSReporting
***************
*** 2036,2041 ****
  					H225_RegistrationConfirm & rcf = m_msg->m_replyRAS;
  					rcf.IncludeOptionalField(H225_RegistrationConfirm::e_featureSet);
! 					rcf.m_featureSet.IncludeOptionalField(H225_FeatureSet::e_supportedFeatures);
! 					H225_ArrayOf_FeatureDescriptor & desc = rcf.m_featureSet.m_supportedFeatures;
  					PINDEX sz = desc.GetSize();
  					desc.SetSize(sz+1);
--- 2036,2041 ----
  					H225_RegistrationConfirm & rcf = m_msg->m_replyRAS;
  					rcf.IncludeOptionalField(H225_RegistrationConfirm::e_featureSet);
! 					rcf.m_featureSet.IncludeOptionalField(H225_FeatureSet::e_desiredFeatures);
! 					H225_ArrayOf_FeatureDescriptor & desc = rcf.m_featureSet.m_desiredFeatures;
  					PINDEX sz = desc.GetSize();
  					desc.SetSize(sz+1);
***************
*** 2352,2358 ****
  		if (EPSupportsQoSReporting
  			&& Toolkit::AsBool(GkConfig()->GetString("GkQoSMonitor", "Enable", "0"))) {
! 			PINDEX lPos = gd.GetSize();
! 			gd.SetSize(lPos+1);
! 			gd[lPos] = H460_FeatureStd(9);
  		}
  
--- 2352,2361 ----
  		if (EPSupportsQoSReporting
  			&& Toolkit::AsBool(GkConfig()->GetString("GkQoSMonitor", "Enable", "0"))) {
! 			rcf.IncludeOptionalField(H225_RegistrationConfirm::e_featureSet);
! 			rcf.m_featureSet.IncludeOptionalField(H225_FeatureSet::e_desiredFeatures);
! 			H225_ArrayOf_FeatureDescriptor & desc = rcf.m_featureSet.m_desiredFeatures;
! 			PINDEX sz = desc.GetSize();
! 			desc.SetSize(sz+1);
! 			desc[sz] = H460_FeatureStd(9);
  		}
  

Index: changes.txt
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/changes.txt,v
retrieving revision 1.639
retrieving revision 1.640
diff -C2 -d -r1.639 -r1.640
*** changes.txt	4 Jan 2012 14:47:39 -0000	1.639
--- changes.txt	12 Jan 2012 11:29:35 -0000	1.640
***************
*** 1,4 ****
--- 1,5 ----
  Changes from 3.0 to 3.1
  =======================
+ - signal H.460.9 as desired feature if QoS monitoring is enabled
  - changed behavior of H.235 auth modules: allow call if one token matches, don't reject call
    if first token is unknown

[GnuGk-cvs] openh323gk ProxyChannel.cxx,1.542,1.543

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv26228

Modified Files:
	ProxyChannel.cxx 
Log Message:
avoid warning when neither .18 or .24b are enabled


Index: ProxyChannel.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/ProxyChannel.cxx,v
retrieving revision 1.542
retrieving revision 1.543
diff -C2 -d -r1.542 -r1.543
*** ProxyChannel.cxx	6 Jan 2012 12:38:58 -0000	1.542
--- ProxyChannel.cxx	10 Jan 2012 11:42:40 -0000	1.543
***************
*** 6808,6812 ****
  		version = (((int)wbuffer[0] & 0xc0) >> 6);
  	bool isRTCP = m_isRTCPType && (version == 2);
! #if (HAS_H46018 || HAS_H46023)
  	bool isRTP = m_isRTPType && (version == 2);
  #endif
--- 6808,6812 ----
  		version = (((int)wbuffer[0] & 0xc0) >> 6);
  	bool isRTCP = m_isRTCPType && (version == 2);
! #if (HAS_H46018 || HAS_H46024B)
  	bool isRTP = m_isRTPType && (version == 2);
  #endif

[GnuGk-cvs] openh323gk gk_2010.sln, 1.1, 1.2 gk_2010.vcxproj, 1.6, 1.7

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv30538

Modified Files:
	gk_2010.sln gk_2010.vcxproj 
Log Message:
using OpenH323 isn't supported on Windows anymore


Index: gk_2010.sln
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/gk_2010.sln,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gk_2010.sln	2 Dec 2009 21:54:05 -0000	1.1
--- gk_2010.sln	10 Jan 2012 10:12:57 -0000	1.2
***************
*** 1,5 ****
  Microsoft Visual Studio Solution File, Format Version 11.00
! # Visual Studio 2010
! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gk", "gk_2010.vcxproj", "{C5052DDD-FADC-4415-B235-92A9761BB21D}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addpasswd", "addpasswd_2010.vcxproj", "{2C306BF0-7FBE-4136-B021-AFA258898341}"
--- 1,5 ----
  Microsoft Visual Studio Solution File, Format Version 11.00
! # Visual C++ Express 2010
! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gnugk", "gk_2010.vcxproj", "{C5052DDD-FADC-4415-B235-92A9761BB21D}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addpasswd", "addpasswd_2010.vcxproj", "{2C306BF0-7FBE-4136-B021-AFA258898341}"
***************
*** 8,52 ****
  	GlobalSection(SolutionConfigurationPlatforms) = preSolution
  		Debug (h323plus)|Win32 = Debug (h323plus)|Win32
- 		Debug (ptlib 1.11+)|Win32 = Debug (ptlib 1.11+)|Win32
  		Debug as Service (h323plus)|Win32 = Debug as Service (h323plus)|Win32
- 		Debug|Win32 = Debug|Win32
  		Release (h323plus)|Win32 = Release (h323plus)|Win32
- 		Release (ptlib 1.11+)|Win32 = Release (ptlib 1.11+)|Win32
  		Release as Service (h323plus)|Win32 = Release as Service (h323plus)|Win32
- 		Release|Win32 = Release|Win32
  	EndGlobalSection
  	GlobalSection(ProjectConfigurationPlatforms) = postSolution
  		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Debug (h323plus)|Win32.ActiveCfg = Debug (h323plus)|Win32
  		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Debug (h323plus)|Win32.Build.0 = Debug (h323plus)|Win32
- 		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Debug (ptlib 1.11+)|Win32.ActiveCfg = Debug (ptlib 1.11)|Win32
- 		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Debug (ptlib 1.11+)|Win32.Build.0 = Debug (ptlib 1.11)|Win32
  		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Debug as Service (h323plus)|Win32.ActiveCfg = Debug as Service (h323plus)|Win32
  		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Debug as Service (h323plus)|Win32.Build.0 = Debug as Service (h323plus)|Win32
- 		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Debug|Win32.ActiveCfg = Debug|Win32
- 		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Debug|Win32.Build.0 = Debug|Win32
  		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Release (h323plus)|Win32.ActiveCfg = Release (h323plus)|Win32
  		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Release (h323plus)|Win32.Build.0 = Release (h323plus)|Win32
- 		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Release (ptlib 1.11+)|Win32.ActiveCfg = Release (ptlib +1.11)|Win32
- 		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Release (ptlib 1.11+)|Win32.Build.0 = Release (ptlib +1.11)|Win32
  		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Release as Service (h323plus)|Win32.ActiveCfg = Release as Service (h323plus)|Win32
  		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Release as Service (h323plus)|Win32.Build.0 = Release as Service (h323plus)|Win32
- 		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Release|Win32.ActiveCfg = Release|Win32
- 		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Release|Win32.Build.0 = Release|Win32
  		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug (h323plus)|Win32.ActiveCfg = Debug|Win32
  		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug (h323plus)|Win32.Build.0 = Debug|Win32
- 		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug (ptlib 1.11+)|Win32.ActiveCfg = Debug|Win32
- 		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug (ptlib 1.11+)|Win32.Build.0 = Debug|Win32
  		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug as Service (h323plus)|Win32.ActiveCfg = Debug|Win32
  		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug as Service (h323plus)|Win32.Build.0 = Debug|Win32
- 		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug|Win32.ActiveCfg = Debug|Win32
- 		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug|Win32.Build.0 = Debug|Win32
  		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release (h323plus)|Win32.ActiveCfg = Release|Win32
  		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release (h323plus)|Win32.Build.0 = Release|Win32
- 		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release (ptlib 1.11+)|Win32.ActiveCfg = Release|Win32
- 		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release (ptlib 1.11+)|Win32.Build.0 = Release|Win32
  		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release as Service (h323plus)|Win32.ActiveCfg = Release|Win32
  		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release as Service (h323plus)|Win32.Build.0 = Release|Win32
- 		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release|Win32.ActiveCfg = Release|Win32
- 		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release|Win32.Build.0 = Release|Win32
  	EndGlobalSection
  	GlobalSection(SolutionProperties) = preSolution
--- 8,32 ----

Index: gk_2010.vcxproj
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/gk_2010.vcxproj,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gk_2010.vcxproj	15 Apr 2011 15:56:33 -0000	1.6
--- gk_2010.vcxproj	10 Jan 2012 10:12:57 -0000	1.7
***************
*** 1,646 ****
! <?xml version="1.0" encoding="utf-8"?>
! <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
!   <ItemGroup Label="ProjectConfigurations">
!     <ProjectConfiguration Include="Debug (h323plus)|Win32">
!       <Configuration>Debug (h323plus)</Configuration>
!       <Platform>Win32</Platform>
!     </ProjectConfiguration>
!     <ProjectConfiguration Include="Debug (ptlib 1.11)|Win32">
!       <Configuration>Debug (ptlib 1.11)</Configuration>
!       <Platform>Win32</Platform>
[...1264 lines suppressed...]
!     <ClInclude Include="singleton.h" />
!     <ClInclude Include="slist.h" />
!     <ClInclude Include="SoftPBX.h" />
!     <ClInclude Include="sqlacct.h" />
!     <ClInclude Include="statusacct.h" />
!     <ClInclude Include="stl_supp.h" />
!     <ClInclude Include="Toolkit.h" />
!     <ClInclude Include="version.h" />
!     <ClInclude Include="yasocket.h" />
!   </ItemGroup>
!   <ItemGroup>
!     <None Include="changes.txt" />
!     <None Include="readme.txt" />
!     <None Include="gnugkbuildopts.h.in" />
!   </ItemGroup>
!   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
!   <ImportGroup Label="ExtensionTargets">
!   </ImportGroup>
! </Project>
\ No newline at end of file

[GnuGk-cvs] openh323gk RasTbl.cxx, 1.370, 1.371 RasTbl.h, 1.224, 1.225

[Simon H. <sh...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv19868

Modified Files:
	RasTbl.cxx RasTbl.h 
Log Message:
BUG fix for endless looping with H46024B.

Index: RasTbl.h
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/RasTbl.h,v
retrieving revision 1.224
retrieving revision 1.225
diff -C2 -d -r1.224 -r1.225
*** RasTbl.h	6 Jan 2012 12:38:58 -0000	1.224
--- RasTbl.h	7 Jan 2012 06:28:51 -0000	1.225
***************
*** 1459,1463 ****
  	void BuildH46024AnnexBMessage(bool initiate,H245_MultimediaSystemControlMessage & h245msg, const std::map<WORD,H46024Balternate> & alt);
  	list<int> m_h46024Bflag;
- 	PMutex m_H46024Bmutex;
  #endif
  	/// unregistered caller NAT'd
--- 1459,1462 ----

Index: RasTbl.cxx
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/RasTbl.cxx,v
retrieving revision 1.370
retrieving revision 1.371
diff -C2 -d -r1.370 -r1.371
*** RasTbl.cxx	6 Jan 2012 12:38:58 -0000	1.370
--- RasTbl.cxx	7 Jan 2012 06:28:51 -0000	1.371
***************
*** 3581,3586 ****
  	std::map<WORD,H46024Balternate>::iterator i = m_H46024Balternate.begin();
  	while (i != m_H46024Balternate.end()) {
! 		if (i->second.sent >= (initiate ? 1 : 2))
  			continue;
  		int sz = addrs.GetSize();
  		addrs.SetSize(sz+1);
--- 3581,3588 ----
  	std::map<WORD,H46024Balternate>::iterator i = m_H46024Balternate.begin();
  	while (i != m_H46024Balternate.end()) {
! 		if (i->second.sent >= (initiate ? 1 : 2)) {
! 			i++;
  			continue;
+ 		}
  		int sz = addrs.GetSize();
  		addrs.SetSize(sz+1);
***************
*** 3649,3653 ****
  void CallRec::H46024BInitiate(WORD sessionID, const H323TransportAddress & fwd, const H323TransportAddress & rev, unsigned muxID_fwd, unsigned muxID_rev)
  {
- 	//PWaitAndSignal m(m_H46024Bmutex);
  
  	if (fwd.IsEmpty() || rev.IsEmpty()) {
--- 3651,3654 ----
***************
*** 3696,3701 ****
  void CallRec::H46024BRespond()
  {
- 	//PWaitAndSignal m(m_H46024Bmutex);
-  
  	if (m_H46024Balternate.size() == 0)
  		return;
--- 3697,3700 ----
***************
*** 3706,3710 ****
  	H245_MultimediaSystemControlMessage h245msg;
  	BuildH46024AnnexBMessage(false,h245msg,m_H46024Balternate);
! 	//m_H46024Balternate.clear();
   
  	// If we are tunneling
--- 3705,3710 ----
  	H245_MultimediaSystemControlMessage h245msg;
  	BuildH46024AnnexBMessage(false,h245msg,m_H46024Balternate);
! 	m_H46024Balternate.clear();
! 	m_h46024Bflag.clear();
   
  	// If we are tunneling