添加发送按键功能

FreeSWITCH-linux/Agent.cpp

@@ -78,7 +78,9 @@ bool Agent::setState(AGENT_STATE a_AgentState)
 	break;
 	case AGENT_STATE_REPOSE:
 	{
-		m_ReposeNum++;
+		if (m_IsRepose) {
+			m_ReposeNum++;
+		}
 		m_IsRepose = true;
 	}
 	break;
@@ -91,16 +93,12 @@ bool Agent::setState(AGENT_STATE a_AgentState)
 	default:
 		break;
 	}
-	//if (m_State == AGENT_STATE_BUSY)  // 通话中变空闲，为话后处理
-	//	m_State = AGENT_STATE_POST_PROCESSING;
-	//else
+	
 	m_State = a_AgentState;
-	if (a_AgentState == AGENT_STATE_REQUESTED || a_AgentState == AGENT_STATE_BUSY || a_AgentState == AGENT_STATE_FREE || a_AgentState == AGENT_STATE_REPOSE || a_AgentState == AGENT_STATE_LOGING || a_AgentState == AGENT_STATE_LOGOUT)
-	{
-		Format fmt("insert into agent_state(agent,exten,cur_time,state,group_no) values('%s','%s','%s',%d,'%s')");
-		fmt %m_AgentID %m_Exten %__FormatTime(__getCurTime()) % m_State %m_Group;
-		SqlWrite::GetInstance()->addSql(fmt.str());
-	}
+
+	Format fmt("insert into agent_state(agent,exten,cur_time,state,group_no) values('%s','%s','%s',%d,'%s')");
+	fmt %m_AgentID %m_Exten %__FormatTime(__getCurTime()) % m_State %m_Group;
+	SqlWrite::GetInstance()->addSql(fmt.str());
 
 	return true;
 }

FreeSWITCH-linux/Config.cpp

@@ -69,7 +69,7 @@ std::string CConfig::fsAddr()
 short int CConfig::fsPort()
 {
 	//return 8021;
-	return root["fsPort"].asInt();
+	return (int16_t)root["fsPort"].asInt();
 }
 
 std::string CConfig::fsPwd()
@@ -80,7 +80,7 @@ std::string CConfig::fsPwd()
 uint16_t CConfig::wsPort()
 {
 	//return 9002;
-	return root["wsPort"].asUInt();
+	return (uint16_t)root["wsPort"].asUInt();
 }
 std::string CConfig::dbAddr()
 {

FreeSWITCH-linux/DevInfoInc.h

@@ -38,6 +38,8 @@ typedef enum tagLINE_OP
 	LINE_OP_AGENT_MONI_FORCE_STATE = 31,      // 强制状态控制
 	LINE_OP_MULTI_CONFERENCE = 32,            // 多步会议
 	LINE_OP_MULTI_CONFERENCE_TAKEBACK = 33,   // 多步会议接回
+	LINE_OP_SEND_DTMF = 34,       //  发送按键， 
+	LINE_OP_SET_CHANNEL_VARIABLE = 35,      // 设置通道变量，单腿设置
 } LINE_OP;
 
 // 设备资源类型常量 
@@ -103,6 +105,7 @@ typedef struct tagLineOpParam			/* 线路控制参数信息 */
 	std::string		szParam2;	// 被叫号码
 											// 班长操作: 被操作的分机号
 	std::string		szParam3;	// 继续排队命令: 放音文件 /录音文件名
+	std::string     szDtmf;     // 按键内容
 } LineOpParam;
 
 

FreeSWITCH-linux/EslGateway.cpp

@@ -30,7 +30,7 @@ bool CEslGateway::start(void)
 	LOG_INFO_S(("{EslGateway}: 处理客户端连接m_EslHdl4Listen OK"));
 
 	esl_events(&m_EslHdl4Listen, ESL_EVENT_TYPE_PLAIN,
-		"BACKGROUND_JOB CHANNEL_CREATE CHANNEL_PROGRESS CHANNEL_PROGRESS_MEDIA CHANNEL_ANSWER CHANNEL_HANGUP_COMPLETE CHANNEL_HOLD CHANNEL_UNHOLD DTMF CUSTOM sofia::register sofia::unregister");
+		"BACKGROUND_JOB CHANNEL_CREATE CHANNEL_PROGRESS CHANNEL_PROGRESS_MEDIA CHANNEL_ANSWER CHANNEL_HANGUP_COMPLETE CHANNEL_HOLD CHANNEL_UNHOLD DTMF CUSTOM sofia::register sofia::unregister callcenter::info");
 	LOG_INFO(("{EslGateway}: 处理客户端连接, ip = %s,port=%d,pwd=%s"), cfg->fsAddr().c_str(), cfg->fsPort(), cfg->fsPwd().c_str());
 	esl_connect(&m_EslHdl4Send, cfg->fsAddr().c_str(), cfg->fsPort(), NULL, cfg->fsPwd().c_str());
 	if (!m_EslHdl4Send.connected)
@@ -331,8 +331,6 @@ void CEslGateway::__onEslDisconnect(void)
 
 void CEslGateway::__onEslEvtBgJobDone(esl_event_t * pEvent)
 {
-	//try
-	{
 		BG_JOB_NOTIFY Notify;
 		memset(&Notify, '\0', sizeof(BG_JOB_NOTIFY));
 		char* HeaderValue = esl_event_get_header(pEvent, ESL_HEADER_JOB_UUID);
@@ -345,11 +343,6 @@ void CEslGateway::__onEslEvtBgJobDone(esl_event_t * pEvent)
 		if (HeaderValue != nullptr)
 			Notify.JobBody = HeaderValue;
 		m_pParent->onEslEvtBgJobDone(&Notify);
-	}
-	//catch (const std::exception& e)
-	{
-	//	LOG_ERROR_S(e.what());
-	}
 	
 }
 
@@ -486,6 +479,19 @@ void CEslGateway::__onEslEvtCustom(esl_event_t * pEvent)
 			m_pParent->onEslExtenUnreg(ExtenNo);
 		}
 	}
+	else if (strcmp(HeaderValue, "callcenter::info") == 0) {
+		const char* queueName = esl_event_get_header(pEvent, "CC-Queue");
+		const char* callsWaitingStr = esl_event_get_header(pEvent, "CC-Count");
+		if (callsWaitingStr) {
+			LOG_INFO("队列[%s]当前排队人数[%s]", queueName, callsWaitingStr);
+			m_pParent->onCallcenterQueue(queueName, callsWaitingStr);
+		}
+
+		char *pContent = new char[2048];
+		esl_event_serialize(pEvent, &pContent, ESL_TRUE);
+		LOG_DEBUG_S(pContent);
+		FS_LINK_DELETE(pContent);
+	}
 }
 
 void CEslGateway::__onEslEvtDtmf(esl_event_t * pEvent)

FreeSWITCH-linux/FreeSWITCH-linux.vcxproj

@@ -113,6 +113,7 @@
     <ClCompile Include="OpMute.cpp" />
     <ClCompile Include="OpMyd.cpp" />
     <ClCompile Include="OpRecord.cpp" />
+    <ClCompile Include="OpSendDtmf.cpp" />
     <ClCompile Include="OpTransfer.cpp" />
     <ClCompile Include="Session.cpp" />
     <ClCompile Include="SoftAuth.cpp" />
@@ -158,6 +159,7 @@
     <ClInclude Include="OpMute.h" />
     <ClInclude Include="OpMyd.h" />
     <ClInclude Include="OpRecord.h" />
+    <ClInclude Include="OpSendDtmf.h" />
     <ClInclude Include="OpTransfer.h" />
     <ClInclude Include="Session.h" />
     <ClInclude Include="SoftAuth.h" />
@@ -191,6 +193,7 @@
       <AdditionalOptions>-D _WEBSOCKETPP_CPP11_STL_ %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <DebugInformationFormat>FullDebug</DebugInformationFormat>
+      <CppLanguageStandard>c++17</CppLanguageStandard>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

FreeSWITCH-linux/FreeSWITCH-linux.vcxproj.filters

@@ -116,6 +116,9 @@
     <ClCompile Include="AgentDetail.cpp">
       <Filter>Statistics</Filter>
     </ClCompile>
+    <ClCompile Include="OpSendDtmf.cpp">
+      <Filter>Operator</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Net">
@@ -335,6 +338,9 @@
     <ClInclude Include="AgentDetail.h">
       <Filter>Statistics</Filter>
     </ClInclude>
+    <ClInclude Include="OpSendDtmf.h">
+      <Filter>Operator</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="log4cpp.conf">

FreeSWITCH-linux/FsProxy.cpp

@@ -186,82 +186,67 @@ void CFsProxy::onChanStateUpdate(long OpInstance, VirtualChan * pChan)
 	}
 	Format fmt("lineType = %s[%s],lineState = %s,chanState = %d");
 	fmt % lineType % chanNo % state % chanState;
-	LOG_DEBUG_S(fmt.str())
+	LOG_DEBUG_S(fmt.str());
 
-		if (devType == DEV_RES_TYPE_EXT) {
-			map<std::string, Agent*>::iterator it;
-			
-			std::unique_lock<std::mutex>lock(m_AgentLock);
-			it = m_MapAgent.find(chanNo);
-		
-			if (it != m_MapAgent.end())
-			{
-				if (it->second == nullptr)
-				{
-					LOG_DEBUG("查不到分机[%s]", chanNo.c_str());
-				}
-				else
-				{
-					LOG_DEBUG("查到分机[%s]", chanNo.c_str());
+	if (devType == DEV_RES_TYPE_EXT) {
+		map<std::string, Agent*>::iterator it;
+
+		std::unique_lock<std::mutex>lock(m_AgentLock);
+		it = m_MapAgent.find(chanNo);
+
+		if (it != m_MapAgent.end()) {
+			if (it->second == nullptr) {
+				LOG_WARN("查到分机[%s]对应坐席空", chanNo.c_str());
+				return;
+			}
+
+			if (chanState == CHAN_LOGIC_STATE_FREE) {
+				if (it->second->isRepose()) {
+					it->second->setState(AGENT_STATE_REPOSE);
+					state = it->second->state_s();
 				}
-				if (chanState == CHAN_LOGIC_STATE_FREE && !it->second->isRepose()) {
+				else {
 					if (it->second->state() == AGENT_STATE_BUSY) {
 						__setStatePostProcessing(it->second->id()); // 在fs中设置坐席话后处理
 						it->second->setState(AGENT_STATE_POST_PROCESSING);
-						state = "话后处理";
 						state = it->second->state_s();
 					}
 					else {
 						it->second->setState(AGENT_STATE_FREE);
 					}
 				}
-				else if (chanState == CHAN_LOGIC_STATE_TALKING)
-					it->second->setState(AGENT_STATE_BUSY);
-				else if (chanState == CHAN_LOGIC_STATE_RING_BACK || chanState == CHAN_LOGIC_STATE_ALERTING)
-					it->second->setState(AGENT_STATE_REQUESTED);
-
-				if (it->second->isRepose() /*&& chanState == CHAN_LOGIC_STATE_FREE*/)
-				{
-					state = "小休";
-				}
-				/*else if (it->second->state() == AGENT_STATE_POST_PROCESSING)
-				{
-					state = it->second->state_s();
-					__setStatePostProcessing(it->second->id());
-				}*/
-				if (!state.empty())    // 过滤掉保持状态
-				{
-					std::string data = creatJson("LineState", state);
-					m_Server.sendMsg(it->second->hdl(), data);
-
-					data = creatJson("Monitor", state, it->second->id(), chanNo);
-					m_MonitAgents.loopAgent(m_Server, data);  // 通知班长坐席监控
+			}
+			else if (chanState == CHAN_LOGIC_STATE_TALKING) {
+				it->second->setState(AGENT_STATE_BUSY);
+			}
+			else if (chanState == CHAN_LOGIC_STATE_RING_BACK || chanState == CHAN_LOGIC_STATE_ALERTING) {
+				if (AGENT_STATE_REQUESTED == it->second->state()) {  // 当前状态已通知过，不在重复通知
+					return;
 				}
+				it->second->setState(AGENT_STATE_REQUESTED);
+			}
 
-				__agentDetail(lock.release()); // 通知坐席详情变化
+			if (!state.empty()) { // 过滤掉保持状态
+				std::string data = creatJson("LineState", state);
+				m_Server.sendMsg(it->second->hdl(), data);
 
-				// 坐席空闲且没有置忙 执行外呼 2022-06-28 不用自动外呼
-				//if (it->second->state() == AGENT_STATE_FREE && !it->second->isRepose())
-				//{
-				//	//LOG_DEBUG_S("进自动外呼等待");
-				//	m_AutoCall.waitTask(it->second->id());
-				//	//LOG_DEBUG_S("出自动外呼等待");
-				//}
-			}
-			else
-			{
-				LOG_WARN("线路状态通知失败，找不到分机[%s]对应的坐席", chanNo.c_str());
+				data = creatJson("Monitor", state, it->second->id(), chanNo);
+				m_MonitAgents.loopAgent(m_Server, data);  // 通知班长坐席监控
 			}
-
+			__agentDetail(lock.release()); // 通知坐席详情变化
 		}
-		else if (devType == DEV_RES_TYPE_TRUNK) {
-			if (CHAN_LOGIC_STATE_ALERTING == chanState) {
-				__agentDetailTrunkChange(1);  // 计算呼入数量
-			}
-			else if (CHAN_LOGIC_STATE_FREE == chanState) {
-				__agentDetailTrunkChange(-1);
-			}
+		else {
+			LOG_WARN("线路状态通知失败，找不到分机[%s]对应的坐席", chanNo.c_str());
+		}
+	}
+	else if (devType == DEV_RES_TYPE_TRUNK) {
+		if (CHAN_LOGIC_STATE_ALERTING == chanState) {
+			__agentDetailTrunkChange(1);  // 计算呼入数量
 		}
+		else if (CHAN_LOGIC_STATE_FREE == chanState) {
+			__agentDetailTrunkChange(-1);
+		}
+	}
 }
 
 void CFsProxy::onChanPoor(Session * pSession, PCHAN_EVENT_NOTIFY pNotify)
@@ -270,6 +255,42 @@ void CFsProxy::onChanPoor(Session * pSession, PCHAN_EVENT_NOTIFY pNotify)
 	__kill(FS_LINK_JOBID_INVALID, pNotify->ChanId);
 }
 
+void CFsProxy::onCallcenterQueue(const std::string & strQueueName, const std::string & strQueueCount)
+{
+	std::unique_lock<std::shared_mutex>lock(m_mutQueryCount);
+	m_QueryCount[strQueueName] = strQueueCount;
+	Json::Value root;
+	Json::StreamWriterBuilder jsrocd;
+	root["Type"] = "WaitCount";
+	root["Result"] = true;
+	std::int32_t nTotal = 0;
+
+	for (auto it = m_QueryCount.begin(); it != m_QueryCount.end(); ++it) {
+		root[it->first] = it->second;
+		try {
+			auto n = stoi(it->second);
+			nTotal += n;
+		}
+		catch (const std::exception& e) {
+			LOG_ERROR("坐席组[%s]数量[%s]转换失败:[%s]", it->first.c_str(), it->second.c_str(), e.what());
+		}
+	}
+
+	root["Total"] = nTotal;
+	auto strJson = Json::writeString(jsrocd, root);
+
+	// 发送给需要的坐席
+	for (auto it = m_subWaitCount.begin(); it != m_subWaitCount.end();) {
+		auto bOk = m_Server.sendMsg(*it, strJson);
+		if (bOk) {
+			++it;
+		}
+		else {
+			it = m_subWaitCount.erase(it);
+		}
+	}
+}
+
 void CFsProxy::onEslDisconnect(void)
 {
 	// esl 断开重连
@@ -714,6 +735,31 @@ bool CFsProxy::transfer2Context(long JobId, std::string DestChanId, std::string
 	return m_Gateway.sendCmd(EslCmd);
 }
 
+bool CFsProxy::setChannelVariable(long JobId, std::string DestChanId, std::string VarName, std::string Content)
+{
+	std::string EslCmd;
+	Format fmt("bgapi uuid_setvar %s %s %s\r\n%s: %ld");
+	fmt % DestChanId % VarName % Content % ESL_HEADER_JOB_UUID % JobId;
+	EslCmd = fmt.str();
+	bool ret = m_Gateway.sendCmd(EslCmd);
+	return ret;
+}
+
+bool CFsProxy::ExecteApp(std::string App, std::string Param, std::string ChanId)
+{
+	return m_Gateway.Execte(App.c_str(), Param.c_str(), ChanId.c_str());
+}
+
+bool CFsProxy::sendDtmf(long JobId, std::string DestChanId, std::string Content)
+{
+	std::string EslCmd;
+	Format fmt("bgapi uuid_send_dtmf %s %s\r\n%s: %ld");
+	fmt %DestChanId %Content %ESL_HEADER_JOB_UUID % JobId;
+	EslCmd = fmt.str();
+	bool ret = m_Gateway.sendCmd(EslCmd);
+	return ret;
+}
+
 bool CFsProxy::getConferenceMemberId(std::string MeetingId, std::string ChanId, std::string & MemberId)
 {
 	return m_Gateway.getConferenceMemberId(MeetingId, ChanId, MemberId);
@@ -782,6 +828,19 @@ std::string CFsProxy::creatJson(std::string type, bool result)
 	return os.str();
 }
 
+std::string CFsProxy::creatJson(std::string type, bool result, std::string desc)
+{
+	Json::Value root;
+	Json::StreamWriterBuilder jsrocd;
+	std::unique_ptr<Json::StreamWriter> write(jsrocd.newStreamWriter());
+	Json::OStringStream os;
+	root["Type"] = type;
+	root["Result"] = result;
+	root["Desc"] = desc;
+	write->write(root, &os);
+	return os.str();
+}
+
 std::string CFsProxy::creatJson(std::string type, std::string result, std::string agentId)
 {
 	Format fmt("{ \"Type\":\"%s\",\"Result\":\"%s\",\"AgentID\":\"%s\" }");
@@ -1084,8 +1143,8 @@ bool CFsProxy::__login(std::string AgentID, std::string ExtenNo, std::list<std::
 
 	cmd = boost::str(Format("bgapi callcenter_config agent set max_no_answer %1% 0") % AgentID);   // 0禁用 
 	ret &= m_Gateway.sendCmd(cmd);
-	//cmd = boost::str(Format("bgapi callcenter_config agent set wrap_up_time %1% 20") % AgentID);   // 话后处理时长
-	cmd = boost::str(Format("bgapi callcenter_config agent set wrap_up_time %1% %2%") % AgentID %CConfig::GetInstance()->postProcessTime());
+	cmd = boost::str(Format("bgapi callcenter_config agent set wrap_up_time %1% 2") % AgentID);   // 话后处理时长,2秒
+	//cmd = boost::str(Format("bgapi callcenter_config agent set wrap_up_time %1% %2%") % AgentID %CConfig::GetInstance()->postProcessTime());
 	ret &= m_Gateway.sendCmd(cmd);
 	cmd = boost::str(Format("bgapi callcenter_config agent set reject_delay_time %1% 0") % AgentID);
 	ret &= m_Gateway.sendCmd(cmd);
@@ -1278,81 +1337,50 @@ void CFsProxy::__recvMsgFun(websocketpp::connection_hdl hdl, string msg)
 				return;
 			}
 			// 判断 坐席，分机是否已被签入
-			//{
-				std::unique_lock<std::mutex>lock(m_AgentLock);
+			std::unique_lock<std::mutex>lock(m_AgentLock);
 
-				auto it = m_MapAgent.begin();
-				while (it != m_MapAgent.end()) {
-					if (it->second->id() == AgentID) {
-						Format fmt("坐席已被绑定,Agent = %s,Exten = %s");
-						fmt % AgentID % AgentExten;
-						LOG_INFO_S(fmt.str());
-						m_Server.sendMsg(hdl, creatJson(type, std::string("坐席已被绑定")));
-						return;
-					}
-					else if (it->first == AgentExten) {
-						Format fmt("分机已被绑定,Agent = %s,Exten = %s");
-						fmt % AgentID % AgentExten;
-						LOG_INFO_S(fmt.str());
-						m_Server.sendMsg(hdl, creatJson(type, std::string("分机已被绑定")));
-						return;
-					}
-					++it;
+			auto it = m_MapAgent.begin();
+			while (it != m_MapAgent.end()) {
+				if (it->second->id() == AgentID) {
+					Format fmt("坐席已被绑定,Agent = %s,Exten = %s");
+					fmt % AgentID % AgentExten;
+					LOG_INFO_S(fmt.str());
+					m_Server.sendMsg(hdl, creatJson(type, std::string("坐席已被绑定")));
+					return;
 				}
-
-				std::string AgentGroup = root["AgentGroup"].asString();
-				Agent  *agent = new Agent(AgentID, AgentExten, AgentGroup);
-				agent->hdl() = hdl;
-				m_MapAgent[AgentExten] = agent;   // 分机号作为key
-
-				if (!__login(AgentID, AgentExten, agent->groups())){
-					m_MapAgent.erase(AgentExten);
-
-					Format fmt("座席签入失败,Agent = %s,Exten = %d, %s");
-					fmt % AgentID % AgentExten % hdl.lock().get();
+				else if (it->first == AgentExten) {
+					Format fmt("分机已被绑定,Agent = %s,Exten = %s");
+					fmt % AgentID % AgentExten;
 					LOG_INFO_S(fmt.str());
-					m_Server.sendMsg(hdl, creatJson(type, false));
+					m_Server.sendMsg(hdl, creatJson(type, std::string("分机已被绑定")));
 					return;
 				}
-				Format fmt("座席签入成功,Agent = %s,Exten = %d,AgentGroup = %s %s");
-				fmt % AgentID % AgentExten % AgentGroup % hdl.lock().get();
-				LOG_INFO_S(fmt.str());
-				m_Server.sendMsg(hdl, creatJson(type, true));
-
-				__agentDetail(lock.release()); // 通知坐席详情变化
-
-				std::string data = creatJson("Monitor", "空闲", AgentID, AgentExten);
-				m_MonitAgents.loopAgent(m_Server, data);  // 通知班长坐席监控
-			//}
-
-			//std::string AgentGroup = root["AgentGroup"].asString();
-			//Agent  *agent = new Agent(AgentID, AgentExten, AgentGroup);
-			//agent->hdl() = hdl;
-			//{
-			//	std::unique_lock<std::mutex>lock(m_AgentLock);
-			//	m_MapAgent[AgentExten] = agent;   // 分机号作为key
-			//}
+				++it;
+			}
 
-			//if (!__login(AgentID, AgentExten, agent->groups()))
-			//{
-			//	m_MapAgent.erase(AgentExten);
+			std::string AgentGroup = root["AgentGroup"].asString();
+			Agent  *agent = new Agent(AgentID, AgentExten, AgentGroup);
+			agent->hdl() = hdl;
+			m_MapAgent[AgentExten] = agent;   // 分机号作为key
 
-			//	Format fmt("座席签入失败,Agent = %s,Exten = %d, %s");
-			//	fmt % AgentID % AgentExten % hdl.lock().get();
-			//	LOG_INFO_S(fmt.str());
-			//	m_Server.sendMsg(hdl, creatJson(type, false));
-			//	return;
-			//}
+			if (!__login(AgentID, AgentExten, agent->groups())) {
+				m_MapAgent.erase(AgentExten);
 
-			//Format fmt("座席签入成功,Agent = %s,Exten = %d,AgentGroup = %s %s");
-			//fmt % AgentID % AgentExten % AgentGroup % hdl.lock().get();
-			//LOG_INFO_S(fmt.str());
-			//m_Server.sendMsg(hdl, creatJson(type, true));
+				Format fmt("座席签入失败,Agent = %s,Exten = %d, %s");
+				fmt % AgentID % AgentExten % hdl.lock().get();
+				LOG_INFO_S(fmt.str());
+				m_Server.sendMsg(hdl, creatJson(type, false));
+				return;
+			}
+			Format fmt("座席签入成功,Agent = %s,Exten = %d,AgentGroup = %s %s");
+			fmt % AgentID % AgentExten % AgentGroup % hdl.lock().get();
+			LOG_INFO_S(fmt.str());
+			m_Server.sendMsg(hdl, creatJson(type, true));
 
-			//std::string data = creatJson("Monitor", "空闲", AgentID, AgentExten);
-			//m_MonitAgents.loopAgent(m_Server, data);  // 通知班长坐席监控
+			__agentDetail(lock.release()); // 通知坐席详情变化
 
-		//	__agentDetail(); // 通知坐席详情变化
+			std::string data = creatJson("Monitor", "空闲", AgentID, AgentExten);
+			m_MonitAgents.loopAgent(m_Server, data);  // 通知班长坐席监控
 
 		}
 		else if ("Logout" == type) {    // 签出
@@ -1368,19 +1396,19 @@ void CFsProxy::__recvMsgFun(websocketpp::connection_hdl hdl, string msg)
 		}
 		else if ("SayBusy" == type) {   // 置忙
 			bool ret = __setState(AgentID, false);
-			 
-				std::unique_lock<std::mutex>lock(m_AgentLock);
-				auto it = m_MapAgent.find(AgentExten);
-				if (it != m_MapAgent.end())
-					it->second->setState(AGENT_STATE_REPOSE);
-				__agentDetail(lock.release()); // 通知坐席详情变化
+
+			std::unique_lock<std::mutex>lock(m_AgentLock);
+			auto it = m_MapAgent.find(AgentExten);
+			if (it != m_MapAgent.end())
+				it->second->setState(AGENT_STATE_REPOSE);
+			__agentDetail(lock.release()); // 通知坐席详情变化
 
 			m_Server.sendMsg(hdl, creatJson(type, ret));
 
 			std::string data = creatJson("Monitor", "小休", AgentID, AgentExten);
 			m_MonitAgents.loopAgent(m_Server, data);  // 通知班长坐席监控
 
-			
+
 		}
 		else if ("SayFree" == type) {   // 置闲
 			bool ret = __setState(AgentID, true);
@@ -1394,7 +1422,6 @@ void CFsProxy::__recvMsgFun(websocketpp::connection_hdl hdl, string msg)
 			std::string data = creatJson("Monitor", "空闲", AgentID, AgentExten);
 			m_MonitAgents.loopAgent(m_Server, data);  // 通知班长坐席监控
 
-			 
 		}
 		else if ("ForceAgentState" == type) {   // 强制更改座席状态
 
@@ -1622,19 +1649,84 @@ void CFsProxy::__recvMsgFun(websocketpp::connection_hdl hdl, string msg)
 		else if ("TurnIvr" == type) {   // 转满意度
 			COperationReactor::GetInstance()->procOperation(opInstance++, LINE_OP_TURNIVR, ExtenNo, nullptr);
 		}
+		else if ("Heart" == type) {   // 心跳
+			m_Server.sendMsg(hdl, msg);
+		}
 		else if ("AutoCall" == type) {   // 自动外呼
 			//m_AutoCall.addTask();   // 从数据库刷新任务
 			m_Server.sendMsg(hdl, creatJson(type, true));
 		}
-		else if ("Heart" == type) {   // 心跳
-			m_Server.sendMsg(hdl, msg);
-		}
 		else if ("GetAgentDetail" == type) {
 			auto data = m_AgentDetail.to_string();
 			m_Server.sendMsg(hdl, data);
 
 			m_mpAgentDetailHdl[conID] = hdl;
 		}
+		else if ("WaitCount" == type) {
+
+			std::unique_lock<std::shared_mutex>lock(m_mutQueryCount);
+			auto it = std::find_if(m_subWaitCount.begin(), m_subWaitCount.end(), [=](websocketpp::connection_hdl hdltmp) {return hdltmp.lock() == hdl.lock(); });
+			if (it == m_subWaitCount.end()) {  // 第一次发送则保存
+				m_subWaitCount.emplace_back(hdl);  // 保存订阅排队数量的坐席
+			}
+			Json::Value root;
+			Json::StreamWriterBuilder jsrocd;
+			root["Type"] = "WaitCount";
+			root["Result"] = true;
+			std::int32_t nTotal = 0;
+
+			for (auto it = m_QueryCount.begin(); it != m_QueryCount.end(); ++it) {
+				root[it->first] = it->second;
+				try {
+					auto n = stoi(it->second);
+					nTotal += n;
+				}
+				catch (const std::exception& e) {
+					LOG_ERROR("坐席组[%s]数量[%s]转换失败:[%s]", it->first.c_str(), it->second.c_str(), e.what());
+				}
+			}
+			lock.unlock();
+			root["Total"] = nTotal;
+			auto data = Json::writeString(jsrocd, root);
+			m_Server.sendMsg(hdl, data);
+		}
+		else if ("SendDtmf" == type){
+            std::string Dtmf = root["Dtmf"].asString();
+			std::unique_lock<std::mutex>lock(m_AgentLock);
+			auto it = m_MapAgent.find(AgentExten);
+			if (it == m_MapAgent.end()) { // 坐席未签入
+				lock.unlock();
+				m_Server.sendMsg(hdl, creatJson(type, false,"坐席未签入"));
+				return;
+			}
+			if (AGENT_STATE_BUSY != it->second->state()) {
+				lock.unlock();
+				m_Server.sendMsg(hdl, creatJson(type, false, "坐席未通话"));
+				return;
+			}
+			auto pChanIter = m_MapChanExt.find(ExtenNo);
+			if (pChanIter == m_MapChanExt.end()) {
+				return;
+			}
+			auto pChan = pChanIter->second;
+			auto pSession = __getSessionByChanId(pChan->chanId());
+			auto pFinalChan = pSession->getAssoFinalChan();
+			if (CHAN_LOGIC_STATE_TALKING != pFinalChan->state() || !pFinalChan->isInMeeting()) {
+				m_Server.sendMsg(hdl, creatJson(type, false, "目标线路未通话或未在会议中"));
+				return;
+			}
+			LineOpParam param;
+			param.szParam1 = AgentExten;
+			param.szParam2 = std::to_string(pFinalChan->no());
+			param.szParam3 = pFinalChan->chanId();
+			param.szDtmf = Dtmf; // 按键
+			bool ret = COperationReactor::GetInstance()->procOperation(ExtenNo, LINE_OP_SEND_DTMF, pFinalChan->no(), &param);
+			if (!ret)
+				m_Server.sendMsg(hdl, creatJson(type, std::string("操作失败")));
+		}
+		else {
+
+		}
 		// try 结束
 	}
 	catch (const Json::LogicError& e)
@@ -1833,4 +1925,43 @@ void CFsProxy::__agentDetailTrunkChange(const std::int32_t& nCount)
 	}
 }
 
+std::string CFsProxy::__queryCount(const bool & bIsLock)
+{
+	Json::Value root;
+	Json::StreamWriterBuilder jsrocd;
+	root["Type"] = "WaitCount";
+	root["Result"] = true;
+	std::int32_t nTotal = 0;
+	if (bIsLock) {
+		std::shared_lock<std::shared_mutex>lock(m_mutQueryCount);
+		for (auto it = m_QueryCount.begin(); it != m_QueryCount.end(); ++it) {
+			root[it->first] = it->second;
+			try {
+				auto n = stoi(it->second);
+				nTotal += n;
+			}
+			catch (const std::exception& e) {
+				LOG_ERROR("坐席组[%s]数量[%s]转换失败:[%s]", it->first.c_str(), it->second.c_str(), e.what());
+			}
+		}
+		lock.unlock();
+	}
+	else {
+		for (auto it = m_QueryCount.begin(); it != m_QueryCount.end(); ++it) {
+			root[it->first] = it->second;
+			try {
+				auto n = stoi(it->second);
+				nTotal += n;
+			}
+			catch (const std::exception& e) {
+				LOG_ERROR("坐席组[%s]数量[%s]转换失败:[%s]", it->first.c_str(), it->second.c_str(), e.what());
+			}
+		}
+	}
+	//m_WaitCounter
+	root["Total"] = nTotal;
+	auto strJson = Json::writeString(jsrocd, root);
+	return strJson;
+}
+
 CFsProxy CFsProxy::instance;

FreeSWITCH-linux/FsProxy.h

@@ -9,7 +9,10 @@
 #include "TtsBaidu.h"
 #include "CallStringMaker.h"
 #include <map>
+#include <list>
 #include <mutex>
+#include <shared_mutex>
+ 
 #include "AutoCall.h"
 #include "AgentDetail.h"
 
@@ -62,6 +65,7 @@ public:
 	void onExtenDirectOp(DEV_OP OpType, VirtualChan* pHostChan, PCHAN_EVENT_NOTIFY pNotify);
 	void onChanStateUpdate(long OpInstance, VirtualChan* pChan);
 	void onChanPoor(Session* pSession, PCHAN_EVENT_NOTIFY pNotify);
+	void onCallcenterQueue(const std::string& strQueueName, const std::string&strQueueCount); // 技能组排队数量
 
 	// ESL事件
 	void onEslDisconnect(void);
@@ -109,6 +113,11 @@ public:
 	bool turnIvr(long JobId, VirtualChan* pChan);  // 转满意度
 	bool transfer(long JobId, VirtualChan* pChan, std::string DestNum);
 	bool transfer2Context(long JobId, std::string DestChanId, std::string Exten, std::string Context, bool BothSide = false);
+	
+	bool setChannelVariable(long JobId, std::string DestChanId, std::string VarName, std::string Content); // 2021-12-2 设置单腿通道变量
+	bool ExecteApp(std::string App, std::string Param, std::string ChanId);  //执行app 2021-12-09
+	bool sendDtmf(long JobId, std::string DestChanId, std::string Content);   // 发送按键 2022-01-12
+	
 	bool getConferenceMemberId(std::string MeetingId, std::string ChanId, std::string &MemberId);
 	bool setConferenceExitSound(std::string MeetingId, bool isPlay);
 	bool setConferenceIsMute(long JobId, std::string MeetingId, std::string MemberId, bool isMute);
@@ -117,6 +126,7 @@ public:
 	// 创建json字符串
 	std::string creatJson(std::string type, std::string result);
 	std::string creatJson(std::string type, bool result);
+	std::string creatJson(std::string type, bool result,std::string desc);
 	std::string creatJson(std::string type, std::string result, std::string agentId);
 	std::string creatJson(std::string type, std::string result, std::string agentId, std::string extenNo);
 	std::string creatJsonIncoming(std::string callid, std::string caller, std::string callee, std::string trunkNumber,int incomintType);
@@ -163,6 +173,9 @@ private:
 	void __agentDetail(std::mutex*p_mtx,bool islock=false);  // 第一个参数，locak.release()
 	void __agentDetailTrunkChange(const std::int32_t& nCount);
 
+	// 坐席组排队数量
+	std::string __queryCount(const bool&bIsLock );  // 返回json字符串
+
 private:
 	CEslGateway m_Gateway;
 	CWebSocketServer m_Server;
@@ -177,6 +190,10 @@ private:
 	std::map<std::string, Agent*> m_MapAgent;   // 分机-坐席
 	std::mutex m_AgentLock;
 
+	std::map<std::string, std::string> m_QueryCount; // 排队数量,组-数量
+	std::shared_mutex m_mutQueryCount;
+	std::list<websocketpp::connection_hdl> m_subWaitCount; // 需要接收排队数量的坐席
+	
 	MonitorAgent m_MonitAgents;     // 坐席监控集合
 
 	::AutoCall m_AutoCall;    // 自动外呼类

FreeSWITCH-linux/OpSendDtmf.cpp

@@ -0,0 +1,62 @@
+#include "OpSendDtmf.h"
+#include "VirtualChan.h"
+#include "FsProxy.h"
+#include "OperationReactor.h"
+
+COpSendDtmf::COpSendDtmf(COperationReactor * pParent, long Instance) :COperation(pParent, Instance)
+{
+}
+
+COpSendDtmf::~COpSendDtmf(void)
+{
+}
+
+bool COpSendDtmf::attachHostChan(VirtualChan * pChan)
+{
+	m_pHostChan = pChan;
+	return true;
+}
+
+void COpSendDtmf::detachHostChan(void)
+{
+	m_pHostChan = NULL;
+}
+
+bool COpSendDtmf::start(LineOpParam * pParam)
+{
+	if (m_pHostChan == NULL || m_pHostChan->state() != CHAN_LOGIC_STATE_TALKING)
+	{
+		LOG_ERROR("通道[%s]发送[%s]按键失败，未在通话中", pParam->szParam1.c_str(), pParam->szParam2.c_str());
+		return false;
+	}
+	m_dtmf = pParam->szDtmf;
+	LOG_INFO("{COpSendDtmf}: 通道[%s]执行通道[%lu]发送按键, DTMF = %s", pParam->szParam1.c_str(), m_pHostChan->no(), m_dtmf.c_str());
+	return CFsProxy::GetInstance().sendDtmf(uniqueId(), m_pHostChan->chanId(), m_dtmf);
+}
+
+void COpSendDtmf::onBackgroudJobDone(PBG_JOB_NOTIFY pNotify)
+{
+	if (pNotify->JobBody.find(ESL_JOB_DONE_RES_FAILED) == std::string::npos)
+		_end(true);
+	else
+		_end(false);
+}
+
+void COpSendDtmf::_end(bool IsSucceed)
+{
+	if (IsSucceed)
+	{
+		LOG_INFO("{COpSendDtmf}: 线路[%ld][%lu]发送按键成功, DTMF = %s", m_Instance, m_pHostChan->no(), m_dtmf.c_str());
+	}
+	else
+	{
+		LOG_ERROR("{COpSendDtmf}: 线路[%ld][%lu]发送按键失败, DTMF = %s", m_Instance, m_pHostChan->no(), m_dtmf.c_str());
+	}
+
+	// 返回执行结果
+	if (m_InstanceCancel != FS_LINK_INSTANCE_INVALID)
+		m_pParent->onOpResult(m_InstanceCancel, !IsSucceed);
+
+	m_pParent->onOpResult(m_Instance, this, IsSucceed, std::to_string(m_Instance));
+}
+

FreeSWITCH-linux/OpSendDtmf.h

@@ -0,0 +1,27 @@
+#pragma once
+#include "Operation.h"
+
+class COpSendDtmf : public COperation
+{
+public:
+	COpSendDtmf(COperationReactor* pParent, long Instance);
+	virtual ~COpSendDtmf(void);
+
+	virtual LINE_OP type(void) const { return LINE_OP_SEND_DTMF; }
+
+	// 关联操作
+	virtual bool attachHostChan(VirtualChan* pChan);			// 设置主控通道的关联
+	virtual void detachHostChan(void);							// 取消通道关联
+
+	virtual bool start(LineOpParam* pParam);
+
+	// 事件响应接口
+	virtual void onBackgroudJobDone(PBG_JOB_NOTIFY pNotify);	// 后台命令执行结束事件处理
+
+protected:
+	virtual void _end(bool IsSucceed);			// 操作完成(注：此操作之后只能调用 return 语句)
+
+private:
+	std::string m_dtmf;  // 要发送的按键
+};
+

FreeSWITCH-linux/OperationReactor.cpp

@@ -18,6 +18,7 @@
 #include "OpMyd.h"
 #include "OpAutoCall.h"
 #include "OpForceAgentState.h"
+#include "OpSendDtmf.h"
 #include "VirtualChan.h"
 #include "FsProxy.h"
 #include "JsonStringMaker.h"
@@ -89,6 +90,9 @@ bool COperationReactor::procOperation(long Instance, uint32_t OpType, uint32_t R
 	case LINE_OP_AGENT_MONI_FORCE_STATE:          // 强制状态控制
 		Res = __procOpForceAgentState(Instance, ResID, pParam);
 		break;
+	case LINE_OP_SEND_DTMF:  // 发送按键
+		Res=__procOpSendDtmf(Instance, ResID, pParam);
+		break;
 	default:
 		break;
 	}
@@ -108,17 +112,6 @@ void COperationReactor::onOpResult(long Instance, COperation * pOp, bool IsSucce
 {
 	if (pOp == nullptr) return;
 	int OpType = pOp->type();
-	//if (CurOpType != "MuteOn" && (CurOpType != "Hold"))    // 静音,保持操作时不能释放op 
-	//{
-	//	if (__delOperation(pOp))		// 非取消操作的返回结果
-	//	{
-	//		LOG_DEBUG("释放操作[%d]", pOp->type());
-	//		// 关闭线路关联
-	//		pOp->detachHostChan();
-	//		// 释放操作
-	//		FS_LINK_DELETE(pOp);
-	//	} // end if
-	//}
 
 	if ((CurOpType != "MuteOn" && (CurOpType != "Hold")&&(CurOpType!="MultiMeeting")) || IsSucceed == false)    // 静音,保持操作时不能释放op 
 	{
@@ -181,7 +174,11 @@ void COperationReactor::onOpResult(long Instance, COperation * pOp, bool IsSucce
 	//case LINE_OP_MUTE_END:				// 静音结束
 	//	data = CFsProxy::GetInstance().creatJson("MuteOff", IsSucceed);
 	//	break;
+	case LINE_OP_SEND_DTMF:
+		data = CFsProxy::GetInstance().creatJson("SendDtmf", IsSucceed);
+		break;
 	default:
+		data = CFsProxy::GetInstance().creatJson(CurOpType, IsSucceed);
 		break;
 	}
 
@@ -721,4 +718,29 @@ bool COperationReactor::__procOpForceAgentState(long Instance, uint32_t ResID, L
 	return __execOp(pOp, pParam);
 }
 
+bool COperationReactor::__procOpSendDtmf(long Instance, uint32_t ResID, LineOpParam * pParam)
+{
+	VirtualChan* pChan = CFsProxy::GetInstance().getTrunk(ResID);
+	if (pChan == nullptr) {
+		pChan = CFsProxy::GetInstance().getExten(ResID);
+	}
+	if (pChan == nullptr)
+	{
+		LOG_WARN(("{OperationReactor}: 执行发送按键失败, 未找到分机通道[%lu]"), ResID);
+		return false;
+	}
+	auto pOp = new COpSendDtmf(this, Instance);
+	if (!pOp->attachHostChan(pChan))
+	{
+		// 如果线路正在执行其它操作
+		LOG_WARN(("{OperationReactor}: 执行发送按键叫失败, 无法绑定通道[%lu], ChanCurTask = %d"), ResID,
+			(pChan->currOp() == NULL ? LINE_OP_UNKNOWN : pChan->currOp()->type()));
+
+		FS_LINK_DELETE(pOp);
+		return false;
+	}
+	// 启动操作
+	return __execOp(pOp, pParam);
+}
+
 COperationReactor COperationReactor::instance;

FreeSWITCH-linux/OperationReactor.h

@@ -55,6 +55,7 @@ private:
 	bool __procOpMyd(long Instance, uint32_t ResID, LineOpParam* pParam);			     	// 满意度
 	bool __procOpAutoCall(long Instance, uint32_t ResID, LineOpParam* pParam);			    // 自动外呼
 	bool __procOpForceAgentState(long Instance, uint32_t ResID, LineOpParam* pParam);		// 强制状态控制
+	bool __procOpSendDtmf(long Instance, uint32_t ResID, LineOpParam* pParam);              // 发送按键
 
 private:
 	static COperationReactor instance;

FreeSWITCH-linux/Session.cpp

@@ -1,4 +1,8 @@
-#include "Session.h"
+#include "..\AsrService\Session.h"
+#include "..\AsrService\Session.h"
+#include "..\AsrService\Session.h"
+#include "..\AsrService\Session.h"
+#include "Session.h"
 #include <boost/filesystem.hpp>
 #include "FsProxy.h"
 #include "ChanTrunk.h"
@@ -12,7 +16,6 @@ Session::Session(CFsProxy* pParent, string Id) : m_pParent(pParent), m_Id(Id), m
 {
 }
 
-
 Session::~Session()
 {
 }
@@ -101,6 +104,20 @@ VirtualChan * Session::getAssoChan(VirtualChan * pChan)
 	return nullptr;
 }
 
+VirtualChan * Session::getAssoFinalChan()
+{
+	std::unique_lock<std::mutex> lock(m_ChanLock);
+	return m_ListChan.back();
+}
+
+VirtualChan * Session::getAssoFinalChan(VirtualChan * pChan)
+{
+	std::unique_lock<std::mutex> lock(m_ChanLock);
+	auto pFinalChan = m_ListChan.back();
+	if (pFinalChan == pChan)return nullptr; // 是同一条，返回空
+	return m_ListChan.back();
+}
+
 VirtualChan * Session::__getFirstChan()
 {
 	std::unique_lock<std::mutex> lock(m_ChanLock);
@@ -516,7 +533,7 @@ void Session::__onRecord(VirtualChan * pChan, PCHAN_EVENT_NOTIFY pNotify)
 	*/
 	
 	// 保持状态过滤
-	uint Status = (HELD_STATE_FILTER_MASK & pChan->state());
+	auto Status = (HELD_STATE_FILTER_MASK & pChan->state());
 	// 通话
 	if (Status == TRUNK_STATE_TALKING || Status == INNER_STATE_TALKING)
 	{
@@ -524,8 +541,8 @@ void Session::__onRecord(VirtualChan * pChan, PCHAN_EVENT_NOTIFY pNotify)
 		{
 			if (pTempChan == NULL || pTempChan == pChan)
 				continue;
-			uint nTempStatus = (HELD_STATE_FILTER_MASK & pTempChan->state());
-			if (Status == TRUNK_STATE_TALKING || Status == INNER_STATE_TALKING)
+			auto nTempStatus = (HELD_STATE_FILTER_MASK & pTempChan->state());
+			if (nTempStatus == TRUNK_STATE_TALKING || nTempStatus == INNER_STATE_TALKING)
 			{
 				__onLineTalking(pChan);
 				__onLineTalking(pTempChan);
@@ -541,7 +558,7 @@ void Session::__createFileName(VirtualChan * pChan)
 	{
 		std::string strCurTime = Util::CurTime();
 		strCurTime = std::regex_replace(strCurTime, std::regex("-|:"), "");
-		std::int32_t index = strCurTime.find(" ");
+		auto index = strCurTime.find(" ");
 		std::string data = strCurTime.substr(0, index);
 		std::string time = strCurTime.substr(index+1);
 		std::string strTempCallID = regex_replace(m_Id, std::regex("-"), "");

FreeSWITCH-linux/Session.h

@@ -29,6 +29,8 @@ public:
 	void onChanDtmf(PDTMF_NOTIFY pNotify);
 	void onChanHold(PHOLD_NOTIFY pNotify);
 	VirtualChan* getAssoChan(VirtualChan* pChan);
+	VirtualChan* getAssoFinalChan();  // 最后一条通道
+	VirtualChan* getAssoFinalChan(VirtualChan* pChan);  // 最后一条通道
 
 private:
 	VirtualChan* __getFirstChan();

FreeSWITCH-linux/WebSocketServer.cpp

@@ -52,14 +52,17 @@ bool CWebSocketServer::sendMsg(websocketpp::connection_hdl hdl, string msg)
 	{
 		websocketpp::frame::opcode::value op = websocketpp::frame::opcode::value::TEXT;
 		m_endpoint.send(hdl, msg, op);
+		LOG_INFO("消息发送到坐席成功,[%s]",msg.c_str());
 	}
 	catch (websocketpp::exception const & e) {
 		stringstream str;
 		str << "Echo failed because: "
 			<< "(" << e.what() << ")";
 		LOG_ERROR_S(str.str());
+		LOG_ERROR("消息发送到坐席失败,[%s]", msg.c_str());
 		return false;
 	}
+	
 	return true;
 }
 

FreeSWITCH-linux/obj/x64/Release/1149391537.CopySourcesUpToDateFile.tlog

@@ -1,23 +1,23 @@
-G:\git\Middlewares-Linux\FreeSWITCH-linux\Agent.cpp|638217550335409049|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\Agent.cpp|638218384452441233|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\AgentDetail.cpp|638205475825278208|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\AutoCall.cpp|637896099232125673|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\CallStringMaker.cpp|637896099232135650|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\ChanExten.cpp|637896099232145619|~/projects/FreeSWITCH-linux|
-G:\git\Middlewares-Linux\FreeSWITCH-linux\Config.cpp|637896099232155594|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\Config.cpp|638218346880218213|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\JsonStringMaker.cpp|637896099232215431|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpAutoCall.cpp|637896099232235381|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpForceAgentState.cpp|637896099232235381|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpHangup.cpp|637896099232245354|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpHoldon.cpp|637896099232255325|~/projects/FreeSWITCH-linux|
-G:\git\Middlewares-Linux\FreeSWITCH-linux\EslGateway.cpp|638192507892748488|~/projects/FreeSWITCH-linux|
-G:\git\Middlewares-Linux\FreeSWITCH-linux\FsProxy.cpp|638218191461288534|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\EslGateway.cpp|638218437376967127|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\FsProxy.cpp|638223546421547704|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\ChanTrunk.cpp|637896099232145619|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\JdbcHelper.cpp|637896099232205458|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\Log.cpp|637896099232215431|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\main.cpp|637896204514450062|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\Md5.cpp|637896099232225407|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\Operation.cpp|637896099232305186|~/projects/FreeSWITCH-linux|
-G:\git\Middlewares-Linux\FreeSWITCH-linux\OperationReactor.cpp|638200254361890753|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\OperationReactor.cpp|638223368584261454|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpInsert.cpp|637896099232255325|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpInstead.cpp|637896099232255325|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpIntercept.cpp|637896099232265297|~/projects/FreeSWITCH-linux|
@@ -28,15 +28,16 @@ G:\git\Middlewares-Linux\FreeSWITCH-linux\OpMultiMeeting.cpp|638200250259459506|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpMute.cpp|637896099232275272|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpMyd.cpp|637896099232285247|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpRecord.cpp|637920930843653676|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\OpSendDtmf.cpp|638223397880165293|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpTransfer.cpp|637920240908673583|~/projects/FreeSWITCH-linux|
-G:\git\Middlewares-Linux\FreeSWITCH-linux\Session.cpp|637921161580448044|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\Session.cpp|638223331393607724|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\SoftAuth.cpp|637896160351710859|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\SqlWrite.cpp|637896099232335119|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\TimeScheduler.cpp|637896099232335119|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\TtsBaidu.cpp|637896099232345089|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\Util.cpp|637896099232345089|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\VirtualChan.cpp|637920964767764556|~/projects/FreeSWITCH-linux|
-G:\git\Middlewares-Linux\FreeSWITCH-linux\WebSocketServer.cpp|638215805950679872|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\WebSocketServer.cpp|638223406777131312|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\Agent.h|638215748197194972|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\AgentDetail.h|638205475044108214|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\AutoCall.h|637896099232125673|~/projects/FreeSWITCH-linux|
@@ -50,17 +51,17 @@ G:\git\Middlewares-Linux\FreeSWITCH-linux\OpAutoCall.h|637896099232235381|~/proj
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpForceAgentState.h|637896099232245354|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpHangup.h|637896099232245354|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpHoldon.h|637896099232255325|~/projects/FreeSWITCH-linux|
-G:\git\Middlewares-Linux\FreeSWITCH-linux\DevInfoInc.h|638200167490028303|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\DevInfoInc.h|638223606730398680|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\EslGateway.h|638192505089056425|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\FsLinkInc.h|637896099232185522|~/projects/FreeSWITCH-linux|
-G:\git\Middlewares-Linux\FreeSWITCH-linux\FsProxy.h|638207083837560879|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\FsProxy.h|638223305044392825|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\ChanTrunk.h|637896099232155594|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\ITimer.h|637896099232205458|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\JdbcHelper.h|637896099232215431|~/projects/FreeSWITCH-linux|
-G:\git\Middlewares-Linux\FreeSWITCH-linux\Log.h|637896099232225407|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\Log.h|638218343685357293|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\Md5.h|637896099232225407|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\Operation.h|637919392157788133|~/projects/FreeSWITCH-linux|
-G:\git\Middlewares-Linux\FreeSWITCH-linux\OperationReactor.h|638200177340692951|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\OperationReactor.h|638223368631410046|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpInsert.h|637896099232255325|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpInstead.h|637896099232255325|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpIntercept.h|637896099232265297|~/projects/FreeSWITCH-linux|
@@ -71,8 +72,9 @@ G:\git\Middlewares-Linux\FreeSWITCH-linux\OpMultiMeeting.h|638199984789291357|~/
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpMute.h|637896099232285247|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpMyd.h|637896099232285247|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpRecord.h|637896099232295217|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\OpSendDtmf.h|638222746994875868|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpTransfer.h|637920240990215499|~/projects/FreeSWITCH-linux|
-G:\git\Middlewares-Linux\FreeSWITCH-linux\Session.h|637920955680078317|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\Session.h|638223333460349527|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\SoftAuth.h|637896099232335119|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\SqlWrite.h|637896099232335119|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\TimeScheduler.h|637896099232335119|~/projects/FreeSWITCH-linux|

FreeSWITCH-linux/obj/x64/Release/1149391537.Local_Remote_PathMapping.tlog

@@ -30,6 +30,7 @@ G:\git\Middlewares-Linux\FreeSWITCH-linux\OpMultiMeeting.cpp|/root/projects/Free
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpMute.cpp|/root/projects/FreeSWITCH-linux/OpMute.cpp
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpMyd.cpp|/root/projects/FreeSWITCH-linux/OpMyd.cpp
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpRecord.cpp|/root/projects/FreeSWITCH-linux/OpRecord.cpp
+G:\git\Middlewares-Linux\FreeSWITCH-linux\OpSendDtmf.cpp|/root/projects/FreeSWITCH-linux/OpSendDtmf.cpp
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpTransfer.cpp|/root/projects/FreeSWITCH-linux/OpTransfer.cpp
 G:\git\Middlewares-Linux\FreeSWITCH-linux\Session.cpp|/root/projects/FreeSWITCH-linux/Session.cpp
 G:\git\Middlewares-Linux\FreeSWITCH-linux\SoftAuth.cpp|/root/projects/FreeSWITCH-linux/SoftAuth.cpp
@@ -73,6 +74,7 @@ G:\git\Middlewares-Linux\FreeSWITCH-linux\OpMultiMeeting.h|/root/projects/FreeSW
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpMute.h|/root/projects/FreeSWITCH-linux/OpMute.h
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpMyd.h|/root/projects/FreeSWITCH-linux/OpMyd.h
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpRecord.h|/root/projects/FreeSWITCH-linux/OpRecord.h
+G:\git\Middlewares-Linux\FreeSWITCH-linux\OpSendDtmf.h|/root/projects/FreeSWITCH-linux/OpSendDtmf.h
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpTransfer.h|/root/projects/FreeSWITCH-linux/OpTransfer.h
 G:\git\Middlewares-Linux\FreeSWITCH-linux\Session.h|/root/projects/FreeSWITCH-linux/Session.h
 G:\git\Middlewares-Linux\FreeSWITCH-linux\SoftAuth.h|/root/projects/FreeSWITCH-linux/SoftAuth.h

FreeSWITCH-linux/obj/x64/Release/FreeSWITCH-linux.log

@@ -3,6 +3,81 @@
   Validating architecture
   Starting remote build
   Compiling sources:
+  Agent.cpp
+  AgentDetail.cpp
+  AutoCall.cpp
+  CallStringMaker.cpp
+  ChanExten.cpp
+  Config.cpp
+  JsonStringMaker.cpp
+  OpAutoCall.cpp
+  OpForceAgentState.cpp
+  OpHangup.cpp
+  OpHoldon.cpp
+  EslGateway.cpp
   FsProxy.cpp
+  ChanTrunk.cpp
+  JdbcHelper.cpp
+  Log.cpp
+  main.cpp
+  Md5.cpp
+  Operation.cpp
+  OperationReactor.cpp
+  OpInsert.cpp
+  OpInstead.cpp
+  OpIntercept.cpp
+  OpListen.cpp
+  OpMakeCall.cpp
+  OpMeeting.cpp
+  OpMultiMeeting.cpp
+  OpMute.cpp
+  OpMyd.cpp
+  OpRecord.cpp
+  OpSendDtmf.cpp
+  OpTransfer.cpp
+  Session.cpp
+  SoftAuth.cpp
+  SqlWrite.cpp
+  TimeScheduler.cpp
+  TtsBaidu.cpp
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(50,67): warning : conversion to ‘unsigned char’ from ‘int’ may alter its value [-Wconversion]
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(50,67): warning :                  char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(50,67): warning :                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(51,67): warning : conversion to ‘unsigned char’ from ‘int’ may alter its value [-Wconversion]
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(51,67): warning :                  char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(51,67): warning :                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(70,63): warning : conversion to ‘unsigned char’ from ‘int’ may alter its value [-Wconversion]
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(70,63): warning :              char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(70,63): warning :                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(71,63): warning : conversion to ‘unsigned char’ from ‘int’ may alter its value [-Wconversion]
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(71,63): warning :              char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(71,63): warning :                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(102,56): warning : conversion to ‘unsigned char’ from ‘std::__cxx11::basic_string<char>::size_type {aka long unsigned int}’ may alter its value [-Wconversion]
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(102,56): warning :                      char_array_4[i] = base64_chars.find(char_array_4[i]);
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(102,56): warning :                                        ~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(104,58): warning : conversion to ‘unsigned char’ from ‘int’ may alter its value [-Wconversion]
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(104,58): warning :                  char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(104,58): warning :                                    ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(105,66): warning : conversion to ‘unsigned char’ from ‘int’ may alter its value [-Wconversion]
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(105,66): warning :                  char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(105,66): warning :                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(106,66): warning : conversion to ‘unsigned char’ from ‘int’ may alter its value [-Wconversion]
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(106,66): warning :                  char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(106,66): warning :                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(119,52): warning : conversion to ‘unsigned char’ from ‘std::__cxx11::basic_string<char>::size_type {aka long unsigned int}’ may alter its value [-Wconversion]
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(119,52): warning :                  char_array_4[j] = base64_chars.find(char_array_4[j]);
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(119,52): warning :                                    ~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(121,54): warning : conversion to ‘unsigned char’ from ‘int’ may alter its value [-Wconversion]
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(121,54): warning :              char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(121,54): warning :                                ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(122,62): warning : conversion to ‘unsigned char’ from ‘int’ may alter its value [-Wconversion]
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(122,62): warning :              char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(122,62): warning :                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(123,62): warning : conversion to ‘unsigned char’ from ‘int’ may alter its value [-Wconversion]
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(123,62): warning :              char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
+G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\base\base64.h(123,62): warning :                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~
+  Util.cpp
+  VirtualChan.cpp
+  WebSocketServer.cpp
   Linking objects
   FreeSWITCH-linux.vcxproj -> G:\git\Middlewares-Linux\FreeSWITCH-linux\bin\x64\Release\middleware