Z991239-5647 #comment 删除不再使用的集中配置逻辑

Module/mod_counterconnector/ConnectorFSM.cpp

@@ -136,10 +136,6 @@ ACMCallFSM::ACMCallFSM()
 	m_pSyncServiceClient = NULL;
 	m_bConAssist = false;
 	m_bConSipphone = false;
-	memset(m_strSIPProxyIP, 0, sizeof(m_strSIPProxyIP));
-	memset(m_strSIPCallNum, 0, sizeof(m_strSIPCallNum));
-	memset(m_iSIPProxyPort, 0, sizeof(m_iSIPProxyPort));
-	memset(m_strChanCallNum, 0, sizeof(m_strChanCallNum));
 	memset(m_strChanProxyIP, 0, sizeof(m_strChanProxyIP));
 	memset(m_iChanProxyPort, 0, sizeof(m_iChanProxyPort));
 	m_pCallRouteList = NULL;
@@ -148,7 +144,6 @@ ACMCallFSM::ACMCallFSM()
 	m_strHttpServerAPI = RVC_CALLROUTE_HTTP_API;
 	m_strQueueName = NULL;
 	m_strAddClientLevel = NULL;
-	m_iCallRouteType = 0;
 	m_LastSipError = Error_Succeed;
 	m_LastAssistError = Error_Succeed;
 	m_bNeedQueueName = false;
@@ -175,12 +170,6 @@ ErrorCodeEnum ACMCallFSM::OnInit()
 	if (Error != Error_Succeed) {
 		goto on_error;
 	}
-		
-	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("sip proxy ip1:%s,num1:%s,port1:%d;ip2:%s,num2:%s,port2:%d", (LPCSTR)m_strSIPProxyIP[0],(LPCSTR)m_strSIPCallNum[0], m_iSIPProxyPort[0],(LPCSTR)m_strSIPProxyIP[1],(LPCSTR)m_strSIPCallNum[1], m_iSIPProxyPort[1]);
-	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("chan proxy ip1:%s,num1:%s,port1:%d;ip2:%s,num2:%s,port2:%d", (LPCSTR)m_strChanProxyIP[0],(LPCSTR)m_strChanCallNum[0], m_iChanProxyPort[0],(LPCSTR)m_strChanProxyIP[1],(LPCSTR)m_strChanCallNum[1], m_iChanProxyPort[1]);
-	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("TerminalId: %s", (LPCSTR)m_strTerminalId);
-	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("default_voip_server: %s", m_strDefaultServer.GetData());
-	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("HttpCallRouteAddr: %s", m_strHttpCallRouteAddr.GetData());
 
 	if(m_strDefaultServer.GetLength() > 0){
 		ParseDefaultServer(m_strDefaultServer.GetData());

Module/mod_counterconnector/ConnectorFSM.h

@@ -561,32 +561,6 @@ private:
 #endif //RVC_OS_WIN
 	}
 
-	ErrorCodeEnum MakeCall(const char *hint_callnum,int nSipServer)
-	{
-		if (!m_pPhoneClient) {
-			return Error_NetBroken;
-		}
-			
-		if((m_strSIPCallNum[nSipServer]=="")&&(m_strSIPProxyIP[nSipServer]=="")&&(m_iSIPProxyPort[nSipServer]==0)){
-			return Error_Param;
-		}
-
-		CSimpleStringA strCode;
-		PhoneService_MakeCall_Req Req;
-		PhoneService_MakeCall_Ans Ans;
-		Req.to_uri = MakeCallUri(hint_callnum,nSipServer);
-
-		PhoneService_SetCallingParam_Info info;
-		info.CallType = NORMAL_CALLTYPE;
-		if (DOUBLERECORD_CALLTYPE == m_CallingParam.nCallType){
-			info.CallType = DOUBLERECORD_CALLTYPE;
-		}
-		(*m_pPhoneClient)(EntityResource::getLink().upgradeLink())->SetCallingParam(info);
-
-		ErrorCodeEnum Error = (*m_pPhoneClient)(EntityResource::getLink().upgradeLink())->MakeCall(Req, Ans, 10000);
-		return Error;
-	}
-
 	ErrorCodeEnum MakeCall(const char *to_uri, const char *from_uri, const char *call_id, CallingParam callingparam)
 	{
 		if (!m_pPhoneClient){
@@ -641,12 +615,11 @@ private:
 			return Error_NetBroken;
 		}
 			
-		if ((m_strChanProxyIP[nChanServer]=="")&&(m_strChanCallNum[nChanServer]=="")&&(m_iChanProxyPort[nChanServer]==0)){
+		if ((m_strChanProxyIP[nChanServer]=="")&&(m_iChanProxyPort[nChanServer]==0)){
 			return Error_Param;
 		}
 		ChannelService_Connect_Req Req;
 		ChannelService_Connect_Ans Ans;
-		Req.callno = m_strChanCallNum[nChanServer];
 		Req.ip = m_strChanProxyIP[nChanServer];
 		Req.port = m_iChanProxyPort[nChanServer];
 		return m_pChannelClient->Connect(Req, Ans, 10000);
@@ -661,11 +634,10 @@ private:
 		ChannelService_Connect_Req Req;
 		ChannelService_Connect_Ans Ans;
 
-		if ((m_strChanProxyIP[nChanServer]=="")&&(m_strChanCallNum[nChanServer]=="")&&(m_iChanProxyPort[nChanServer]==0)){
+		if ((m_strChanProxyIP[nChanServer]=="")&&(m_iChanProxyPort[nChanServer]==0)){
 			return Error_Param;
 		}
 		else{
-			Req.callno = m_strChanCallNum[nChanServer];
 			Req.ip = m_strChanProxyIP[nChanServer];
 			Req.port = m_iChanProxyPort[nChanServer];
 			Req.etype = NORMAL_CALLTYPE;
@@ -691,37 +663,11 @@ private:
 				callnum, serverip, serverport);
 	}
 
-	CSimpleStringA MakeCallUri(const char *hint_callnum,int nServer)
-	{
-		if (m_iSIPProxyPort[nServer] == 5060) 
-		{
-			return CSimpleStringA::Format("sip:%s@%s;transport=UDP", 
-				hint_callnum, m_strSIPProxyIP[nServer].GetData());
-		} 
-		else 
-		{
-			return CSimpleStringA::Format("sip:%s@%s:%d;transport=UDP", 
-				hint_callnum, m_strSIPProxyIP[nServer].GetData(), m_iSIPProxyPort[nServer]);
-		}
-	}
-
 	ErrorCodeEnum LoadConfig()
 	{
 		int iTimeOut = RVC_DEFAULT_HTTPTIMEOUT;
 		int iPrintDbg = 0;
 		SpIniMappingTable table;
-		table.AddEntryString("CounterConnector", "sip_proxy_ip", m_strSIPProxyIP[0], NULL);
-		table.AddEntryInt("CounterConnector", "sip_proxy_port", m_iSIPProxyPort[0], 0);
-		table.AddEntryString("CounterConnector", "sip_default_call_no", m_strSIPCallNum[0], NULL);
-		table.AddEntryString("CounterConnector", "chan_proxy_ip", m_strChanProxyIP[0], NULL);
-		table.AddEntryInt("CounterConnector", "chan_proxy_port", m_iChanProxyPort[0], 0);
-		table.AddEntryString("CounterConnector", "chan_default_call_no", m_strChanCallNum[0], NULL);
-		table.AddEntryString("CounterConnector", "sip_proxy_ip_backup", m_strSIPProxyIP[1], NULL);
-		table.AddEntryInt("CounterConnector", "sip_proxy_port_backup", m_iSIPProxyPort[1], 0);
-		table.AddEntryString("CounterConnector", "sip_default_call_no_backup", m_strSIPCallNum[1], NULL);
-		table.AddEntryString("CounterConnector", "chan_proxy_ip_backup", m_strChanProxyIP[1], NULL);
-		table.AddEntryInt("CounterConnector", "chan_proxy_port_backup", m_iChanProxyPort[1], 0);
-		table.AddEntryString("CounterConnector", "chan_default_call_no_backup", m_strChanCallNum[1], NULL);
 		table.AddEntryString("CounterConnector", "default_voip_server", m_strDefaultServer, NULL);
 		table.AddEntryString("CounterConnector", "http_call_route_addr", m_strHttpCallRouteAddr, NULL);
 		table.AddEntryInt("CounterConnector", "http_timeout", iTimeOut, 0);
@@ -846,7 +792,6 @@ public:
 	int m_iFailedLastState;
 	bool m_bConAssist;
 	bool m_bConSipphone;
-	int m_iCallRouteType;
 	CSimpleStringA m_strQueueName;
 	CSimpleStringA m_strAddClientLevel;
 	bool m_bNeedQueueName;
@@ -857,12 +802,8 @@ private:
 	ChannelService_ClientBase *m_pChannelClient;
 	SyncService_ClientBase*m_pSyncServiceClient;
 	CSimpleStringA m_strTerminalId;
-	CSimpleStringA m_strSIPProxyIP[2];
-	int m_iSIPProxyPort[2];
-	CSimpleStringA m_strSIPCallNum[2];
 	CSimpleStringA m_strChanProxyIP[2];
 	int m_iChanProxyPort[2];
-	CSimpleStringA m_strChanCallNum[2];
 
 	//去分行化
 	node_list_head_t *m_pCallRouteList;

Module/mod_counterconnector/mod_counterconnector.cpp

@@ -124,10 +124,6 @@ void CCounterConnectorEntity::OnStarted()
 	}
 
 	m_fsm.ReConnectionSyncService();
-
-	LoadEntityConfig();
-
-	m_fsm.m_iCallRouteType = m_iRouteType;
 }
 
 ErrorCodeEnum CCounterConnectorEntity::ConnectAssistChannel()
@@ -223,34 +219,6 @@ void CCounterConnectorEntity::OnSysVarEvent(const char *pszKey,  const char *psz
 }
 
 
-ErrorCodeEnum CCounterConnectorEntity::LoadEntityConfig()
-{
-	SpIniMappingTable table;
-	int iRouteType = 0;
-	int iPickUpCallType = 0;
-	table.AddEntryInt("CounterConnector", "CallRouteType", iRouteType, 0);
-	table.AddEntryInt("CounterConnector", "PickUpCallType", iPickUpCallType, 0);
-	CSmartPointer<IConfigInfo> spConfig;
-	ErrorCodeEnum Error = GetFunction()->OpenConfig(Config_CenterSetting, spConfig);
-	if (Error == Error_Succeed) {
-		Error = table.Load(spConfig);
-	}
-
-	if (1 == iRouteType) {
-		m_iRouteType = 1;
-	}
-
-	if (1 == iPickUpCallType) {
-		m_iPickUpCallType = 1;
-	}
-
-	if (1 != m_iRouteType) {
-		LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_TYPE, CSimpleStringA::Format("call route type is %d.", m_iRouteType).GetData());
-	}
-
-	return Error;
-}
-
 ErrorCodeEnum CCounterConnectorEntity::SetCallRouteParams(CSimpleStringA strQueueName, CSimpleStringA strClientLevel)
 {
 	ErrorCodeEnum Error = Error_Succeed;
@@ -264,17 +232,10 @@ ErrorCodeEnum CCounterConnectorEntity::SetCallRouteParams(CSimpleStringA strQueu
 
 void CCounterConnectorEntity::HandlePickUpCallEvent()
 {
-	if (1 == m_iPickUpCallType) {
-		PickUpCallMsg evt;
-		evt.infos = "pickup call";
-		SpSendBroadcast(GetFunction(), SP_MSG_OF(PickUpCallMsg), SP_MSG_SIG_OF(PickUpCallMsg), evt);
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("SpSendBroadcast PickUpCallMsg to UI.");
-	}
-	else {
-		m_fsm.PostEventFIFO(new FSMEvent(USER_EVT_PICKUP_CALL));
-		m_fsm.m_bNeedQueueName = false;
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Terminate pickup call.");
-	}
+	PickUpCallMsg evt;
+	evt.infos = "pickup call";
+	SpSendBroadcast(GetFunction(), SP_MSG_OF(PickUpCallMsg), SP_MSG_SIG_OF(PickUpCallMsg), evt);
+	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("SpSendBroadcast PickUpCallMsg to UI.");
 }
 
 
@@ -954,7 +915,6 @@ void ChannelCounterConnectorClient::OnMessage(ErrorCodeEnum Error, ChannelServic
 		if (Msg.state == eChannelState_Idle) 
 		{
 			pEntity->m_fsm.m_bIsAgentControl = false;
-			//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("ChannelState is eChannelState_Idle");
 
 			if (eChannelState_Connecting == m_eLastState){
 				LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_ASSIST_CONNECT_FAILED,"make call failed for assistant channel connect failed!");
@@ -964,13 +924,11 @@ void ChannelCounterConnectorClient::OnMessage(ErrorCodeEnum Error, ChannelServic
 		{
 			pEntity->m_fsm.m_bIsAgentControl = true;
 			pEntity->SendCurAudioDevice();
-			//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("ChannelState is eChannelState_Connected");
 		}
 		else if (eChannelState_Connecting == Msg.state){
-			//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("ChannelState is eChannelState_Connecting");
+
 		}
 		else if(eChannelState_Closing == Msg.state){
-			//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("ChannelState is eChannelState_Closing");
 			if (eChannelState_Connecting == m_eLastState){
 				LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_ASSIST_CONNECT_FAILED,"make call failed for assistant channel closed.");
 			}

Module/mod_counterconnector/mod_counterconnector.h

@@ -51,7 +51,7 @@ private:
 class CCounterConnectorEntity : public CEntityBase, public ILogListener, public ISysVarListener, public ITimerListener
 {
 public:
-	CCounterConnectorEntity() : m_fsm(), m_pCounterConnectorChannel(NULL), m_bConnectAssist(false), m_bConnectSipphone(false), m_iRouteType(0), m_iPickUpCallType(0){
+	CCounterConnectorEntity() : m_fsm(), m_pCounterConnectorChannel(NULL), m_bConnectAssist(false), m_bConnectSipphone(false), m_iRouteType(1){
 		m_iConSipphoneFaileTimes = 0;
 	}
 	virtual ~CCounterConnectorEntity() {}
@@ -85,7 +85,6 @@ public:
 	void Handle_StartRemoteRecord(const char* pszMessage);
 	void Handle_StartRecordPreview(const char* pszMessage);
 	DeviceTypeEnum RvcGetDeviceType();
-	ErrorCodeEnum LoadEntityConfig();
 	ErrorCodeEnum SetCallRouteParams(CSimpleStringA strQueueName, CSimpleStringA strClientLevel);
 	void HandlePickUpCallEvent();
 	void HandleGetVideoFailedEvent();
@@ -100,7 +99,6 @@ public:
 	bool m_bHasLaunched;
 	CServerSessionBase *m_pCurrentSession;
 	int m_iRouteType;
-	int m_iPickUpCallType;
 
 private:
 	bool m_IsStandType;