添加视频功能

FreeSWITCH-linux/Agent.cpp

@@ -62,6 +62,8 @@ void Agent::removeAgent(std::string HostAgent)
 
 bool Agent::setState(AGENT_STATE a_AgentState)
 {
+	m_bVideoLock = false; // 取消视频请求锁定状态，其它状态可以保证该坐席不会被分配
+
 	__statistics(a_AgentState);
 
 	switch (a_AgentState)

FreeSWITCH-linux/Agent.h

@@ -44,6 +44,21 @@ public:
 
 	std::list<std::string> groups() const { return m_Groups; };
 	std::string group() const { return m_Group; };
+
+	/*视频相关,请求空闲坐席*/
+	bool VideoLock() {
+		if (m_State == AGENT_STATE_FREE && !m_bVideoLock) {
+			m_bVideoLock = true;
+			return true;
+		}
+		return false;
+	}
+	/*取消视频请求锁定*/
+	bool CancelVideoLock() {
+		m_bVideoLock = false;
+		return true;
+	}
+
 private:
 	bool __login();
 	bool __logout();
@@ -84,5 +99,8 @@ private:
 	std::string m_Group;  // 坐席组，未分割
 
 	websocketpp::connection_hdl m_hdl;
+
+	/*视频相关*/
+	bool m_bVideoLock; // 是否锁定
 };
 

FreeSWITCH-linux/Config.cpp

@@ -158,4 +158,12 @@ std::string CConfig::aesMark()
 {
 	return root["secretMark"].asString();
 }
+bool CConfig::isVideo()
+{
+	return root["isVideo"].asBool();
+}
+bool CConfig::isWss()
+{
+	return root["isWss"].asBool();
+}
 CConfig CConfig::cfg;

FreeSWITCH-linux/Config.h

@@ -30,7 +30,9 @@ public:
 	bool isAutoRecord();           // 是否自动录音
 	int postProcessTime();         // 话后处理时长
 	std::string aesKey();          // aes密码
-	std::string aesMark();        // 标识
+	std::string aesMark();         // 标识
+	bool isVideo();                // 是否是视频 
+	bool isWss();                  // 是否开启wss
 	static CConfig* GetInstance() { return &cfg; }
 private:
 	static CConfig cfg;

FreeSWITCH-linux/DepttelextOffice.cpp

@@ -0,0 +1,85 @@
+#include "DepttelextOffice.h"
+#include <iostream>
+#include <json/json.h>
+#include "Log.h"
+#include "JdbcHelper.h"
+
+CDepttelextOffice::~CDepttelextOffice()
+{
+	std::unique_lock<std::mutex>lock(mut);
+	auto it = m_DeptTelextmap.begin();
+	DeptTelext *pDeptTelext = nullptr;
+	while (it != m_DeptTelextmap.end())
+	{
+		pDeptTelext = it->second;
+		if (pDeptTelext) {
+			delete pDeptTelext;
+			pDeptTelext = nullptr;
+		}
+		++it;
+	}
+}
+
+bool CDepttelextOffice::InitDepttelext()
+{
+	LOG_INFO("督办分机号码列表开始初始化");
+	std::string strSQL = "SELECT id,Name,Telephone,Extension FROM  rep_video_depttelext";
+	std::unique_lock<std::mutex>lock(mut);
+	JdbcHelper::GetInstance()->jdbc_executeQuery(strSQL, NULL, [this](sql::ResultSet* result) {
+
+		while (result->next()){
+			DeptTelext *pDeptTelext = new DeptTelext();
+			pDeptTelext->Name = result->getString("Name");
+			pDeptTelext->Telephone = result->getString("Telephone");
+			pDeptTelext->Extension = result->getString("Extension");
+			pDeptTelext->State = 0;// 默认不可用
+			 
+			auto extenId = std::stoul(pDeptTelext->Extension);
+			m_DeptTelextmap.insert(std::make_pair(extenId, pDeptTelext));
+		}
+	}, NULL);
+	LOG_INFO("督办分机号码列表结束初始化");
+	return true;
+}
+
+bool CDepttelextOffice::UpdateDepttelext(uint32_t extno, int state)
+{
+	std::unique_lock<std::mutex>lock(mut);
+	auto it = m_DeptTelextmap.find(extno);
+	if (it == m_DeptTelextmap.end()) return false;
+	if (it->second) {
+		it->second->UpdateState(state);
+	}
+	return true;
+}
+
+std::string CDepttelextOffice::GetAllDeptTelext()
+{
+	Json::Value root;
+	Json::Value person;
+	
+	Json::FastWriter writer;
+	person["Type"] = "";
+	person["Result"] = true;
+
+	std::unique_lock<std::mutex>lock(mut);
+	auto it = m_DeptTelextmap.begin();
+	DeptTelext *pDeptTelext = nullptr;
+	while (it != m_DeptTelextmap.end()) {
+		pDeptTelext = it->second;
+		if (pDeptTelext) {
+			Json::Value body;
+			body["Name"] = pDeptTelext->Name;
+			body["Telephone"] = pDeptTelext->Telephone;
+			body["AgentExten"] = pDeptTelext->Extension;
+			body["State"] = pDeptTelext->State;
+
+			person["ExtenList"].append(body);
+		}
+		++it;
+	}
+	lock.unlock();
+	root.append(person);
+	return writer.write(root);
+}
+

FreeSWITCH-linux/DepttelextOffice.h

@@ -0,0 +1,45 @@
+#pragma once
+#include <map>
+#include <string>
+#include <iostream>
+#include <atomic>
+#include <mutex>
+
+class CDepttelextOffice
+{
+public:
+	CDepttelextOffice() {};
+	~CDepttelextOffice();
+
+	bool InitDepttelext();
+	bool UpdateDepttelext(uint32_t extno, int state);
+	std::string GetAllDeptTelext();
+
+private:
+
+private:
+	typedef struct tagtel_depttelext {
+		int Id;
+		std::string Name;
+		std::string Telephone;
+		std::string Extension;
+		std::string AgentID;
+		int State;
+
+		tagtel_depttelext() {
+			State = 0;
+		}
+		void UpdateState(int state) {
+			this->State = state;
+			
+		}
+		
+		void print() {
+			std::cout << Name << "-" << Telephone << "-" << Extension << "-" << AgentID << "-" << State << std::endl;
+		}
+	}DeptTelext;
+
+	std::map<uint32_t, DeptTelext*> m_DeptTelextmap;  
+	std::mutex mut;
+};
+

FreeSWITCH-linux/FreeSWITCH-linux.vcxproj

@@ -89,6 +89,7 @@
     <ClCompile Include="CallStringMaker.cpp" />
     <ClCompile Include="ChanExten.cpp" />
     <ClCompile Include="Config.cpp" />
+    <ClCompile Include="DepttelextOffice.cpp" />
     <ClCompile Include="JsonStringMaker.cpp" />
     <ClCompile Include="OpAutoCall.cpp" />
     <ClCompile Include="OpForceAgentState.cpp" />
@@ -122,6 +123,9 @@
     <ClCompile Include="TokenList.cpp" />
     <ClCompile Include="TtsBaidu.cpp" />
     <ClCompile Include="Util.cpp" />
+    <ClCompile Include="VideoExten.cpp" />
+    <ClCompile Include="VideoExtenHdl.cpp" />
+    <ClCompile Include="VideoOffice.cpp" />
     <ClCompile Include="VirtualChan.cpp" />
     <ClCompile Include="WebSocketServer.cpp" />
   </ItemGroup>
@@ -133,6 +137,7 @@
     <ClInclude Include="CallStringMaker.h" />
     <ClInclude Include="ChanExten.h" />
     <ClInclude Include="Config.h" />
+    <ClInclude Include="DepttelextOffice.h" />
     <ClInclude Include="ICdr.h" />
     <ClInclude Include="JsonStringMaker.h" />
     <ClInclude Include="OpAutoCall.h" />
@@ -181,6 +186,9 @@
     <ClInclude Include="ttsapi\speech.h" />
     <ClInclude Include="TtsBaidu.h" />
     <ClInclude Include="Util.h" />
+    <ClInclude Include="VideoExten.h" />
+    <ClInclude Include="VideoExtenHdl.h" />
+    <ClInclude Include="VideoOffice.h" />
     <ClInclude Include="VirtualChan.h" />
     <ClInclude Include="WebSocketServer.h" />
   </ItemGroup>
@@ -199,7 +207,7 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <LibraryDependencies>pthread;esl;log4cpp;jsoncpp;mysqlcppconn;curl;crypto;boost_filesystem;boost_date_time;cryptopp</LibraryDependencies>
+      <LibraryDependencies>pthread;esl;log4cpp;jsoncpp;mysqlcppconn;curl;crypto;ssl;boost_filesystem;boost_date_time;cryptopp</LibraryDependencies>
       <AdditionalOptions>-lm  %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <PreBuildEvent>

FreeSWITCH-linux/FreeSWITCH-linux.vcxproj.filters

@@ -122,6 +122,18 @@
     <ClCompile Include="TokenList.cpp">
       <Filter>Token</Filter>
     </ClCompile>
+    <ClCompile Include="VideoExten.cpp">
+      <Filter>VideoExten</Filter>
+    </ClCompile>
+    <ClCompile Include="VideoOffice.cpp">
+      <Filter>VideoExten</Filter>
+    </ClCompile>
+    <ClCompile Include="DepttelextOffice.cpp">
+      <Filter>VideoExten</Filter>
+    </ClCompile>
+    <ClCompile Include="VideoExtenHdl.cpp">
+      <Filter>VideoExten</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Net">
@@ -181,6 +193,9 @@
     <Filter Include="Token">
       <UniqueIdentifier>{c15f03ed-a70f-4eb0-bcd7-7f984b36dfc5}</UniqueIdentifier>
     </Filter>
+    <Filter Include="VideoExten">
+      <UniqueIdentifier>{b3ad3ea7-78bf-4dda-b3a8-913703708f2d}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="WebSocketServer.h">
@@ -350,6 +365,18 @@
     <ClInclude Include="TokenList.h">
       <Filter>Token</Filter>
     </ClInclude>
+    <ClInclude Include="VideoExten.h">
+      <Filter>VideoExten</Filter>
+    </ClInclude>
+    <ClInclude Include="VideoOffice.h">
+      <Filter>VideoExten</Filter>
+    </ClInclude>
+    <ClInclude Include="DepttelextOffice.h">
+      <Filter>VideoExten</Filter>
+    </ClInclude>
+    <ClInclude Include="VideoExtenHdl.h">
+      <Filter>VideoExten</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="log4cpp.conf">

FreeSWITCH-linux/FsProxy.cpp

@@ -48,6 +48,9 @@ bool CFsProxy::init()
 		LOG_ERROR(fmt.str().c_str());
 	});
 
+	m_VideoOffice.initVideoExten();
+	m_DepttelOffice.InitDepttelext();
+
 	if (!m_Server.init(cfg->wsPort()))
 	{
 		LOG_ERROR("程序运行失败，请检查端口[%d]是否已被占用", cfg->wsPort());
@@ -190,6 +193,13 @@ void CFsProxy::onChanStateUpdate(long OpInstance, VirtualChan * pChan)
 	LOG_DEBUG_S(fmt.str());
 
 	if (devType == DEV_RES_TYPE_EXT) {
+		// 更新督办分机状态
+		if (m_DepttelOffice.UpdateDepttelext(pChan->no(), chanState)) {
+			return;
+		}
+	}
+	
+	if (devType == DEV_RES_TYPE_EXT) {
 		map<std::string, Agent*>::iterator it;
 
 		std::unique_lock<std::mutex>lock(m_AgentLock);
@@ -858,6 +868,13 @@ std::string CFsProxy::creatJson(std::string type, std::string result, std::strin
 
 std::string CFsProxy::creatJsonIncoming(std::string callid, std::string caller, std::string callee, std::string trunkNumber, int incomintType)
 {
+	if (incomintType == 1) { // 视频通话，来电弹屏将来电分机号替换为相应手机号
+		auto it = m_ExtPhone.find(atoi(caller.c_str()));
+		if (it != m_ExtPhone.end()) {
+			caller = it->second;
+		}
+	}
+	
 	Json::Value root;
 	Json::StreamWriterBuilder jsrocd;
 	root["Type"] = "Incoming";
@@ -881,6 +898,45 @@ std::string CFsProxy::creatJsonRecord(std::string callid, std::string recordPath
 	return Json::writeString(jsrocd, root);
 }
 
+std::string CFsProxy::creatJson2(std::string type, bool result)
+{
+	Json::Value root;
+	Json::StreamWriterBuilder jsrocd;
+	Json::Value person;
+
+	person["Type"] = type;
+	person["Result"] = result;
+	root.append(person);
+	return Json::writeString(jsrocd, root);
+}
+
+std::string CFsProxy::creatJson2(std::string type, bool result, int extenID)
+{
+	Json::Value root;
+	Json::StreamWriterBuilder jsrocd;
+	Json::Value person;
+
+	person["Type"] = type;
+	person["Result"] = result;
+	person["AgentExten"] = extenID;
+	root.append(person);
+	return Json::writeString(jsrocd, root);
+}
+
+std::string CFsProxy::creatJson2(std::string type, bool result, int extenID, std::string pwd)
+{
+	Json::Value root;
+	Json::StreamWriterBuilder jsrocd;
+	Json::Value person;
+
+	person["Type"] = type;
+	person["Result"] = result;
+	person["AgentExten"] = extenID;
+	person["ExtenPwd"] = pwd;
+	root.append(person);
+	return Json::writeString(jsrocd, root);
+}
+
 bool CFsProxy::__init()
 {
 	__initTrunkChan();
@@ -1740,6 +1796,66 @@ void CFsProxy::__recvMsgFun(websocketpp::connection_hdl hdl, string msg)
 			if (!ret)
 				m_Server.sendMsg(hdl, creatJson(type, std::string("操作失败")));
 		}
+		// 以下是视频接口
+		else if ("VideoReqExten" == type) {  // 请求可以注册的分机号
+		   uint32_t extenId;
+		   std::string pwd;
+		   auto ret = m_VideoOffice.findVideoExten(extenId, pwd);
+		   if (ret) {
+			   auto agent = AgentID;
+			   ret = m_VideoExtenHdl.add(ExtenNo, agent, hdl);
+			   if (!ret) {
+				   m_VideoOffice.recoverVideoExten(extenId);
+			   }
+		   }
+		   auto data = creatJson2("VideoReqExten", ret, extenId, pwd);
+		   m_Server.sendMsg(hdl, data);
+		}
+		else if ("VideoReqBindExtPhone" == type) { // 绑定分机号-手机号关系
+		   const string DestinationNumber = root["DestinationNumber"].asString();
+		   m_ExtPhone[ExtenNo] = DestinationNumber;
+		   auto data = creatJson2(type, true);
+		   m_Server.sendMsg(hdl, data);
+		}
+		else if ("VideoReqIdeAgent" == type) { // 请求空闲坐席
+		    std::unique_lock<std::mutex>lock(m_AgentLock);
+		    bool ret = false;
+		    uint32_t exten = 0;
+		    for (auto it = m_MapAgent.begin(); it != m_MapAgent.end(); ++it) {
+			   if (it->second->VideoLock()) {
+				  exten = (uint32_t)stoul(it->first);
+				  ret = true;
+				  break;
+			   }
+		    }
+			lock.unlock();
+		    auto data = creatJson2(type, ret, exten);
+		    m_Server.sendMsg(hdl, data);
+			ret = m_VideoExtenHdl.bindReqAgentExten(ExtenNo, exten);
+			if (!ret && exten != 0) {
+				lock.lock();
+				auto it = m_MapAgent.find(std::to_string(exten));
+				if (ret && it != m_MapAgent.end()) {
+					it->second->CancelVideoLock();
+				}
+				lock.unlock();
+			}
+		}
+		else if ("VideoDesExten" == type) { // 销毁/回收请求的分机号
+		   m_VideoOffice.recoverVideoExten(ExtenNo);
+		   std::string data = creatJson2(type, true);
+		   m_Server.sendMsg(hdl, data);
+		}
+		else if ("VideoReqBindAgent" == type) { //督办专员 保存
+		   auto agent = AgentID;
+		   auto ret = m_VideoExtenHdl.add(ExtenNo, agent,hdl);
+		   std::string data = creatJson2(type, ret);
+		   m_Server.sendMsg(hdl, data);
+		}
+		else if ("GetExtenList" == type) { // 获取督办部门状态
+		  auto data = m_DepttelOffice.GetAllDeptTelext();
+		  m_Server.sendMsg(hdl, data);
+		}
 		else {
 
 		}
@@ -1764,6 +1880,19 @@ void CFsProxy::__closeFun(websocketpp::connection_hdl hdl)
 
 	m_mpAgentDetailHdl.erase(conID);
 
+	/*视频处理*/
+	auto pair = m_VideoExtenHdl.del(hdl);
+	if (pair.first > 0) {
+		m_VideoOffice.recoverVideoExten(pair.first, true);
+		m_DepttelOffice.UpdateDepttelext(pair.first, 0);
+		if (pair.second > 0) {
+			std::unique_lock<std::mutex>lock(m_AgentLock);
+			auto it = m_MapAgent.find(std::to_string(pair.second));
+			it->second->CancelVideoLock();
+		}
+		return;
+	}
+	
 	std::string agentId;
 	std::string extenNo;
 	std::unique_lock<std::mutex>lock(m_AgentLock);

FreeSWITCH-linux/FsProxy.h

@@ -16,6 +16,9 @@
 #include "AutoCall.h"
 #include "AgentDetail.h"
 #include "TokenList.h"
+#include "VideoOffice.h"
+#include "DepttelextOffice.h"
+#include "VideoExtenHdl.h"
 
 typedef struct MyStruct
 {
@@ -132,7 +135,11 @@ public:
 	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);
 	std::string creatJsonRecord(std::string callid,std::string recordPath);
-
+	// 视频
+	std::string creatJson2(std::string type, bool result);
+	std::string creatJson2(std::string type, bool result, int extenID);
+	std::string creatJson2(std::string type, bool result, int extenID, std::string pwd);
+	
 private:
 	bool __init();
 	uint32_t __transLogicState2CtiState(DEV_RES_TYPE ChanType, CHAN_LOGIC_STATE State);
@@ -202,6 +209,13 @@ private:
 	std::map<long,websocketpp::connection_hdl> m_mpAgentDetailHdl;  // 保存坐席详情hdl
 	
 	TokenList m_ToeknList; // token验证
+
+	/*视频相关*/
+	CVideoOffice m_VideoOffice; // 市民分机管理
+	CDepttelextOffice m_DepttelOffice; // 督办分机状态管理
+	CVideoExtenHdl m_VideoExtenHdl; // 保存市民/督办 分机-连接关系
+	std::unordered_map<int, std::string> m_ExtPhone;// 分机号-手机号
+
 	//static
 	volatile long opInstance = 1l;  // 无实际意义
 	static CFsProxy instance; 

FreeSWITCH-linux/Session.cpp

@@ -571,9 +571,14 @@ void Session::__createFileName(VirtualChan * pChan)
 		{
 			boost::filesystem::create_directories(p);
 		}
-
 		std::stringstream ss;
-		ss << m_RecordFile << pChan->no() << "/" << strTempCallID << ".wav";
+		ss << m_RecordFile << pChan->no() << "/" << strTempCallID;
+		if (CConfig::GetInstance()->isVideo()) {
+			ss << ".mp4";
+		}
+		else {
+			ss << ".wav";
+		}
 		m_RecordFile = ss.str();
 	}
 }

FreeSWITCH-linux/VideoExten.cpp

@@ -0,0 +1,10 @@
+#include "VideoExten.h"
+
+CVideoExten::CVideoExten(uint32_t a_ExtId, std::string a_ExtPwd, bool a_IsUsed) :m_Id(a_ExtId), m_Password(a_ExtPwd), m_IsUsed(a_IsUsed)
+{
+	std::cout << m_Id << "-" << m_Password << std::endl;
+}
+
+CVideoExten::~CVideoExten()
+{
+}

FreeSWITCH-linux/VideoExten.h

@@ -0,0 +1,23 @@
+#pragma once
+#include <iostream>
+#include <string>
+
+class CVideoExten
+{
+public:
+	CVideoExten(uint32_t a_ExtId, std::string a_ExtPwd, bool a_IsUsed = false);
+	~CVideoExten();
+
+	uint32_t id() const { return m_Id; }
+	std::string pwd() const { return m_Password; }
+	bool isUsed() const { return m_IsUsed; };
+	bool& isUsed() { return m_IsUsed; }
+
+
+private:
+	uint32_t m_Id;   // 分机号
+	std::string m_Password; // 分机密码
+	bool m_IsUsed;   // 是否被用  true已被用，false可用
+
+};
+

FreeSWITCH-linux/VideoExtenHdl.cpp

@@ -0,0 +1,89 @@
+#include "VideoExtenHdl.h"
+
+bool CVideoExtenHdl::add(uint32_t & exten, std::string & agent, websocketpp::connection_hdl hdl)
+{
+	std::unique_lock<std::mutex>lock(mut);
+	auto it = m_ExtenAgent.find(exten);
+	if (it == m_ExtenAgent.end()) {
+		m_ExtenAgent[exten] = agent;
+		m_ExtenHdl[exten] = hdl;
+		return true;
+	}
+	return false;
+}
+
+bool CVideoExtenHdl::bindReqAgentExten(const uint32_t & exten, uint32_t & agentExten)
+{
+	std::unique_lock<std::mutex>lock(mut);
+	{
+		auto it = m_ExtenAgent.find(exten);
+		if (it == m_ExtenAgent.end()) {
+			return false;
+		}
+	}
+	for (auto it = m_ExtenBindReqAgentExten.begin(); it != m_ExtenBindReqAgentExten.end();) {
+		if (it->second == agentExten) {
+			it = m_ExtenBindReqAgentExten.erase(it);
+		}
+		else {
+			++it;
+		}
+	}
+	auto it = m_ExtenBindReqAgentExten.find(exten);
+	if (it == m_ExtenBindReqAgentExten.end()) {
+		m_ExtenBindReqAgentExten[exten] = agentExten;
+		return true;
+	}
+	else { // 如果之前绑定过，需要解除之前绑定
+		uint32_t oldAgentExten = it->second;
+		m_ExtenBindReqAgentExten[exten] = agentExten;
+		if (oldAgentExten == agentExten|| oldAgentExten == 0)return true;
+		agentExten = oldAgentExten;
+		return false;
+	}
+}
+
+std::pair<uint32_t, uint32_t> CVideoExtenHdl::del(websocketpp::connection_hdl hdl)
+{
+	std::unique_lock<std::mutex>lock(mut);
+	for (auto it = m_ExtenHdl.begin(); it != m_ExtenHdl.end(); ++it) {
+		if (it->second.lock() == hdl.lock()) {
+			uint32_t exten = 0;
+			uint32_t bindAgentExten = 0;
+			exten = it->first;
+			m_ExtenAgent.erase(exten);
+			m_ExtenHdl.erase(it);
+
+			auto itBind = m_ExtenBindReqAgentExten.find(exten);
+			if (itBind != m_ExtenBindReqAgentExten.end()) {
+				bindAgentExten = itBind->second;
+				m_ExtenBindReqAgentExten.erase(itBind);
+			}
+			return std::pair(exten, bindAgentExten);
+		}
+	}
+	return std::pair(0, 0);
+}
+
+void CVideoExtenHdl::del(uint32_t & exten)
+{
+	std::unique_lock<std::mutex>lock(mut);
+	m_ExtenAgent.erase(exten);
+	m_ExtenHdl.erase(exten);
+	m_ExtenBindReqAgentExten.erase(exten);
+}
+
+void CVideoExtenHdl::del(std::string & agent)
+{
+	std::unique_lock<std::mutex>lock(mut);
+	for (auto it = m_ExtenAgent.begin(); it != m_ExtenAgent.end(); ++it) {
+		if (it->second == agent) {
+			uint32_t exten = 0;
+			exten = it->first;
+			m_ExtenAgent.erase(exten);
+			m_ExtenHdl.erase(exten);
+			m_ExtenBindReqAgentExten.erase(exten);
+			break;
+		}
+	}
+}

FreeSWITCH-linux/VideoExtenHdl.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#include <map>
+#include <mutex>
+#include <websocketpp/connection.hpp>
+
+class CVideoExtenHdl
+{
+public:
+	CVideoExtenHdl() {};
+	~CVideoExtenHdl() {};
+
+	bool add(uint32_t&exten,std::string&agent, websocketpp::connection_hdl hdl);
+	bool bindReqAgentExten(const uint32_t&exten, uint32_t& agentExten);
+	std::pair<uint32_t, uint32_t> del(websocketpp::connection_hdl hdl);
+	void del(uint32_t&exten);
+	void del(std::string&agent);
+
+private:
+	std::map<uint32_t, std::string> m_ExtenAgent;
+	std::map<uint32_t, websocketpp::connection_hdl> m_ExtenHdl;
+	std::map<uint32_t, uint32_t> m_ExtenBindReqAgentExten; // °ó¶¨ÇëÇóµ½µÄ×øϯ·Ö»ú
+	std::mutex mut;
+};
+

FreeSWITCH-linux/VideoOffice.cpp

@@ -0,0 +1,90 @@
+#include "VideoOffice.h"
+#include "VideoExten.h"
+#include "JdbcHelper.h"
+#include "Log.h"
+
+CVideoOffice::CVideoOffice()
+{
+}
+
+CVideoOffice::~CVideoOffice()
+{
+}
+
+bool CVideoOffice::initVideoExten()
+{
+	LOG_INFO("视频账号开始初始化");
+	std::string strSQL = "SELECT exten ,pwd FROM rep_video_account";
+	JdbcHelper::GetInstance()->jdbc_executeQuery(strSQL, NULL, [this](sql::ResultSet* result) {
+
+		while (result->next())
+		{
+			auto extenId = result->getUInt(1);
+			sql::SQLString pwd = result->getString(2);
+			CVideoExten *pExten = new CVideoExten(extenId, pwd);
+			m_VideoExtens.insert(std::make_pair(extenId, pExten));
+			LOG_INFO("添加视频账号[%lu]密码[%s]", extenId, pwd.c_str());
+		}
+	}, NULL);
+	LOG_INFO("视频账号结束初始化");
+	return true;
+}
+
+bool CVideoOffice::findVideoExten(uint32_t & a_VideoExtId, std::string & a_VideoExtPwd)
+{
+	std::unique_lock<std::mutex> lock(mut);
+	auto it = m_VideoExtens.begin();
+	while (it != m_VideoExtens.end())
+	{
+		if (it->second->isUsed() == false)
+		{
+			it->second->isUsed() = true;
+			a_VideoExtId = it->second->id();
+			a_VideoExtPwd = it->second->pwd();
+			LOG_INFO("获取视频分机号[%lu]密码[%s]",a_VideoExtId,a_VideoExtPwd.c_str());
+			return true;
+		}
+		++it;
+	}
+	LOG_WARN("找不到可用视频账号");
+	return false;
+}
+
+bool CVideoOffice::recoverVideoExten(uint32_t a_VideoExtId, bool bIsRm)
+{
+	bool ret = false;
+	std::unique_lock<std::mutex> lock(mut);
+	auto it = m_VideoExtens.find(a_VideoExtId);
+	if (it != m_VideoExtens.end()) {
+		ret = true;
+		it->second->isUsed() = false;
+		if (!bIsRm) {
+			LOG_INFO("释放视频分机号[%lu]状态[%s]", a_VideoExtId, it->second->isUsed() ? "不可用" : "可用");
+		}
+		else {
+			LOG_INFO("释放视频分机号[%lu]状态[%s],话机取消注册", a_VideoExtId, it->second->isUsed() ? "不可用" : "可用");
+		}
+	}
+	else {
+		return ret;
+	}
+
+	auto iter = m_VideoExtens.begin();
+	while (iter != m_VideoExtens.end()) {
+		LOG_DEBUG("分机[%lu]状态[%s]", iter->second->id(), iter->second->isUsed() ? "已被用" : "可用");
+		++iter;
+	}
+	return ret;
+}
+
+void CVideoOffice::close()
+{
+	std::unique_lock<std::mutex> lock(mut);
+	auto it = m_VideoExtens.begin();
+	while (it != m_VideoExtens.end()){
+		delete it->second;
+		it->second = nullptr;
+		++it;
+	}
+	m_VideoExtens.clear();
+}

FreeSWITCH-linux/VideoOffice.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <map>
+#include <mutex>
+
+class CVideoExten;
+class CVideoOffice
+{
+public:
+	CVideoOffice();
+	~CVideoOffice();
+
+	bool initVideoExten();
+	bool findVideoExten(uint32_t &a_VideoExtId, std::string &a_VideoExtPwd);
+	bool recoverVideoExten(uint32_t a_VideoExtId, bool bIsRm = false);
+
+	void close();
+
+private:
+	std::map<uint32_t, CVideoExten*> m_VideoExtens;
+	std::mutex mut;
+};
+

FreeSWITCH-linux/WebSocketServer - 副本.cpp

@@ -0,0 +1,123 @@
+#include "WebSocketServer.h"
+#include "Log.h"
+#include <json/json.h>
+
+CWebSocketServer::CWebSocketServer() 
+{
+	// Set logging settings
+	/*m_endpoint.set_error_channels(websocketpp::log::elevel::all);*/
+	/*m_endpoint.set_access_channels(websocketpp::log::alevel::all ^ websocketpp::log::alevel::frame_payload);*/
+	m_endpoint.set_access_channels(websocketpp::log::alevel::none ^ websocketpp::log::alevel::none);
+
+	// Register our message handler
+
+	m_endpoint.set_message_handler(bind(&CWebSocketServer::on_message, this, &m_endpoint, std::placeholders::_1, std::placeholders::_2));
+	m_endpoint.set_open_handler(bind(&CWebSocketServer::on_open, this, &m_endpoint, std::placeholders::_1));
+	m_endpoint.set_close_handler(bind(&CWebSocketServer::on_close, this, &m_endpoint, std::placeholders::_1));
+	m_endpoint.set_fail_handler(bind(&CWebSocketServer::on_fail, this, &m_endpoint, std::placeholders::_1));
+	m_endpoint.init_asio();
+
+	m_endpoint.set_reuse_addr(true);
+	m_endpoint.start_perpetual();
+}
+
+CWebSocketServer::~CWebSocketServer()
+{
+	m_endpoint.stop_perpetual();
+	if (!m_endpoint.stopped()) {
+		m_endpoint.stop();
+	}
+}
+
+bool CWebSocketServer::init(uint16_t port)
+{
+	m_port = port;
+	try
+	{
+		m_endpoint.listen(m_port);
+		// Queues a connection accept operation
+		m_endpoint.start_accept();
+	}
+	catch (const std::exception& e)
+	{
+		LOG_ERROR_S(e.what());
+		return false;
+	}
+	return true;
+}
+
+bool CWebSocketServer::sendMsg(websocketpp::connection_hdl hdl, string msg)
+{
+	try
+	{
+		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;
+}
+
+void CWebSocketServer::run()
+{
+	// Start the Asio io_service run loop
+	m_endpoint.run(); 
+}
+
+void CWebSocketServer::close(websocketpp::connection_hdl hdl)
+{
+	m_endpoint.close(hdl, websocketpp::close::status::normal, "123");
+}
+
+void CWebSocketServer::stop()
+{
+	if (!m_endpoint.stopped()) {
+		m_endpoint.stop();
+	}
+}
+
+// Define a callback to handle incoming messages
+void CWebSocketServer::on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg)
+{
+	string msgInfo;
+	msgInfo = msg->get_payload();
+	stringstream str;
+	str << "on_message called with hdl: " << hdl.lock().get()
+		<< " and message: " <<
+		msgInfo << s->get_con_from_hdl(hdl)->get_remote_endpoint();
+	LOG_DEBUG_S(str.str());
+	if (this->pRecvFun != nullptr)
+		this->pRecvFun(hdl, msgInfo);   // 收到消息回调函数
+}
+
+void CWebSocketServer::on_open(server* s, websocketpp::connection_hdl hdl) {
+	stringstream str;
+	str << "on_open called with hdl: " << hdl.lock().get()
+		<< s->get_con_from_hdl(hdl)->get_remote_endpoint();
+	LOG_DEBUG_S(str.str());
+}
+
+void CWebSocketServer::on_close(server* s, websocketpp::connection_hdl hdl) {
+	stringstream str;
+	str << "on_close called with hdl: " << hdl.lock().get()
+		<< s->get_con_from_hdl(hdl)->get_remote_endpoint();
+	LOG_DEBUG_S(str.str());
+	if (this->pCloseFun != nullptr)
+		this->pCloseFun(hdl);    // 连接断开回调函数
+}
+
+void CWebSocketServer::on_fail(server* s, websocketpp::connection_hdl hdl)
+{
+	stringstream str;
+	str << "on_fail called with hdl: " << hdl.lock().get()
+		<< s->get_con_from_hdl(hdl)->get_remote_endpoint();
+	LOG_DEBUG_S(str.str());
+}

FreeSWITCH-linux/WebSocketServer - 副本.h

@@ -0,0 +1,60 @@
+#pragma once
+
+#include <websocketpp/config/asio_no_tls.hpp>
+#include <websocketpp/server.hpp>
+#include <functional>
+#include <iostream>
+#include <string>
+
+#include <unordered_map>
+#include <mutex>
+#include <regex>
+#include <json/json.h>
+
+using namespace std;
+
+typedef enum MyDirect
+{
+	UNKNOWN = 0,
+	FS = 1,
+	CTI = 2,
+	ACD = 3,
+	IVR = 4,
+	WS = 5
+}Direct;
+
+class CWebSocketServer
+{
+private:
+	typedef websocketpp::server<websocketpp::config::asio> server;
+	typedef server::message_ptr message_ptr;
+
+public:
+	CWebSocketServer();
+	~CWebSocketServer();
+
+	bool init(uint16_t port = 9002);
+	bool sendMsg(websocketpp::connection_hdl hdl, string msg);
+	void run();
+	void close(websocketpp::connection_hdl hdl);  // 关闭与指定客户端的连接
+	void stop();
+	typedef function<void(websocketpp::connection_hdl hdl, string msg)> Callback_RecvMsg;
+	typedef function<void(websocketpp::connection_hdl hdl)> Callback_Close;
+	void setCallbackRecvMsg(Callback_RecvMsg pRecvFun) { this->pRecvFun = pRecvFun; };
+	void setCallbackClose(Callback_Close pCloseFun) { this->pCloseFun = pCloseFun; };
+
+private:
+
+	void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg);
+	void on_open(server* s, websocketpp::connection_hdl hdl);
+	void on_close(server* s, websocketpp::connection_hdl hdl);
+	void on_fail(server* s, websocketpp::connection_hdl hdl);
+
+private:
+	server m_endpoint;
+	uint16_t m_port;      // 端口
+
+	Callback_RecvMsg pRecvFun;   // 接收消息回调函数
+	Callback_Close pCloseFun;    // 连接断开回调函数
+};
+

FreeSWITCH-linux/WebSocketServer.cpp

@@ -2,30 +2,44 @@
 #include "Log.h"
 #include <json/json.h>
 
-CWebSocketServer::CWebSocketServer() 
+CWebSocketServer::CWebSocketServer()
 {
-	// Set logging settings
-	/*m_endpoint.set_error_channels(websocketpp::log::elevel::all);*/
-	/*m_endpoint.set_access_channels(websocketpp::log::alevel::all ^ websocketpp::log::alevel::frame_payload);*/
-	m_endpoint.set_access_channels(websocketpp::log::alevel::none ^ websocketpp::log::alevel::none);
-
-	// Register our message handler
-
-	m_endpoint.set_message_handler(bind(&CWebSocketServer::on_message, this, &m_endpoint, std::placeholders::_1, std::placeholders::_2));
-	m_endpoint.set_open_handler(bind(&CWebSocketServer::on_open, this, &m_endpoint, std::placeholders::_1));
-	m_endpoint.set_close_handler(bind(&CWebSocketServer::on_close, this, &m_endpoint, std::placeholders::_1));
-	m_endpoint.set_fail_handler(bind(&CWebSocketServer::on_fail, this, &m_endpoint, std::placeholders::_1));
-	m_endpoint.init_asio();
-
-	m_endpoint.set_reuse_addr(true);
-	m_endpoint.start_perpetual();
+	if (CConfig::GetInstance()->isWss()) {
+		m_endpoint_tls.set_access_channels(websocketpp::log::alevel::none ^ websocketpp::log::alevel::none);
+		m_endpoint_tls.set_message_handler(bind(&CWebSocketServer::on_message<server>, this, &m_endpoint, std::placeholders::_1, std::placeholders::_2));
+		m_endpoint_tls.set_open_handler(bind(&CWebSocketServer::on_open<server>, this, &m_endpoint, std::placeholders::_1));
+		m_endpoint_tls.set_close_handler(bind(&CWebSocketServer::on_close<server>, this, &m_endpoint, std::placeholders::_1));
+		m_endpoint_tls.set_fail_handler(bind(&CWebSocketServer::on_fail<server>, this, &m_endpoint, std::placeholders::_1));
+		m_endpoint_tls.set_tls_init_handler(bind(&CWebSocketServer::on_tls_init, this, std::placeholders::_1));
+		m_endpoint_tls.init_asio();
+		m_endpoint_tls.set_reuse_addr(true);
+		m_endpoint_tls.start_perpetual();
+	}
+	else {
+		m_endpoint.set_access_channels(websocketpp::log::alevel::none ^ websocketpp::log::alevel::none);
+		m_endpoint.set_message_handler(bind(&CWebSocketServer::on_message<server>, this, &m_endpoint, std::placeholders::_1, std::placeholders::_2));
+		m_endpoint.set_open_handler(bind(&CWebSocketServer::on_open<server>, this, &m_endpoint, std::placeholders::_1));
+		m_endpoint.set_close_handler(bind(&CWebSocketServer::on_close<server>, this, &m_endpoint, std::placeholders::_1));
+		m_endpoint.set_fail_handler(bind(&CWebSocketServer::on_fail<server>, this, &m_endpoint, std::placeholders::_1));
+		m_endpoint.init_asio();
+		m_endpoint.set_reuse_addr(true);
+		m_endpoint.start_perpetual();
+	}
 }
 
 CWebSocketServer::~CWebSocketServer()
 {
-	m_endpoint.stop_perpetual();
-	if (!m_endpoint.stopped()) {
-		m_endpoint.stop();
+	if (CConfig::GetInstance()->isWss()) {
+		m_endpoint_tls.stop_perpetual();
+		if (!m_endpoint_tls.stopped()) {
+			m_endpoint_tls.stop();
+		}
+	}
+	else {
+		m_endpoint.stop_perpetual();
+		if (!m_endpoint.stopped()) {
+			m_endpoint.stop();
+		}
 	}
 }
 
@@ -34,9 +48,14 @@ bool CWebSocketServer::init(uint16_t port)
 	m_port = port;
 	try
 	{
-		m_endpoint.listen(m_port);
-		// Queues a connection accept operation
-		m_endpoint.start_accept();
+		if (CConfig::GetInstance()->isWss()) {
+			m_endpoint_tls.listen(m_port);
+			m_endpoint_tls.start_accept();
+		}
+		else {
+			m_endpoint.listen(m_port);
+			m_endpoint.start_accept();
+		}
 	}
 	catch (const std::exception& e)
 	{
@@ -51,7 +70,12 @@ bool CWebSocketServer::sendMsg(websocketpp::connection_hdl hdl, string msg)
 	try
 	{
 		websocketpp::frame::opcode::value op = websocketpp::frame::opcode::value::TEXT;
-		m_endpoint.send(hdl, msg, op);
+		if (CConfig::GetInstance()->isWss()) {
+			m_endpoint_tls.send(hdl, msg, op);
+		}
+		else {
+			m_endpoint.send(hdl, msg, op);
+		}
 		LOG_INFO("消息发送到坐席成功,[%s]",msg.c_str());
 	}
 	catch (websocketpp::exception const & e) {
@@ -69,23 +93,41 @@ bool CWebSocketServer::sendMsg(websocketpp::connection_hdl hdl, string msg)
 void CWebSocketServer::run()
 {
 	// Start the Asio io_service run loop
-	m_endpoint.run(); 
+	if (CConfig::GetInstance()->isWss()) {
+		m_endpoint_tls.run();
+	}
+	else {
+		m_endpoint.run();
+	}
 }
 
 void CWebSocketServer::close(websocketpp::connection_hdl hdl)
 {
-	m_endpoint.close(hdl, websocketpp::close::status::normal, "123");
+	if (CConfig::GetInstance()->isWss()) {
+		m_endpoint_tls.close(hdl, websocketpp::close::status::normal, "Normal");
+	}
+	else {
+		m_endpoint.close(hdl, websocketpp::close::status::normal, "Normal");
+	}
 }
 
 void CWebSocketServer::stop()
 {
-	if (!m_endpoint.stopped()) {
-		m_endpoint.stop();
+	if (CConfig::GetInstance()->isWss()) {
+		if (!m_endpoint_tls.stopped()) {
+			m_endpoint_tls.stop();
+		}
+	}
+	else {
+		if (!m_endpoint.stopped()) {
+			m_endpoint.stop();
+		}
 	}
 }
 
 // Define a callback to handle incoming messages
-void CWebSocketServer::on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg)
+template <typename EndpointType>
+void CWebSocketServer::on_message(EndpointType* s, websocketpp::connection_hdl hdl, typename EndpointType::message_ptr msg)
 {
 	string msgInfo;
 	msgInfo = msg->get_payload();
@@ -98,14 +140,16 @@ void CWebSocketServer::on_message(server* s, websocketpp::connection_hdl hdl, me
 		this->pRecvFun(hdl, msgInfo);   // 收到消息回调函数
 }
 
-void CWebSocketServer::on_open(server* s, websocketpp::connection_hdl hdl) {
+template <typename EndpointType>
+void CWebSocketServer::on_open(EndpointType* s, websocketpp::connection_hdl hdl) {
 	stringstream str;
 	str << "on_open called with hdl: " << hdl.lock().get()
 		<< s->get_con_from_hdl(hdl)->get_remote_endpoint();
 	LOG_DEBUG_S(str.str());
 }
 
-void CWebSocketServer::on_close(server* s, websocketpp::connection_hdl hdl) {
+template <typename EndpointType>
+void CWebSocketServer::on_close(EndpointType* s, websocketpp::connection_hdl hdl) {
 	stringstream str;
 	str << "on_close called with hdl: " << hdl.lock().get()
 		<< s->get_con_from_hdl(hdl)->get_remote_endpoint();
@@ -114,7 +158,8 @@ void CWebSocketServer::on_close(server* s, websocketpp::connection_hdl hdl) {
 		this->pCloseFun(hdl);    // 连接断开回调函数
 }
 
-void CWebSocketServer::on_fail(server* s, websocketpp::connection_hdl hdl)
+template <typename EndpointType>
+void CWebSocketServer::on_fail(EndpointType* s, websocketpp::connection_hdl hdl)
 {
 	stringstream str;
 	str << "on_fail called with hdl: " << hdl.lock().get()

FreeSWITCH-linux/WebSocketServer.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <websocketpp/config/asio_no_tls.hpp>
+#include <websocketpp/config/asio.hpp>
 #include <websocketpp/server.hpp>
 #include <functional>
 #include <iostream>
@@ -10,24 +10,17 @@
 #include <mutex>
 #include <regex>
 #include <json/json.h>
+#include "Config.h"
 
 using namespace std;
 
-typedef enum MyDirect
-{
-	UNKNOWN = 0,
-	FS = 1,
-	CTI = 2,
-	ACD = 3,
-	IVR = 4,
-	WS = 5
-}Direct;
-
 class CWebSocketServer
 {
 private:
+	
 	typedef websocketpp::server<websocketpp::config::asio> server;
-	typedef server::message_ptr message_ptr;
+	typedef websocketpp::server<websocketpp::config::asio_tls> server_tls;
+	typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
 
 public:
 	CWebSocketServer();
@@ -44,14 +37,38 @@ public:
 	void setCallbackClose(Callback_Close pCloseFun) { this->pCloseFun = pCloseFun; };
 
 private:
+	template <typename EndpointType>
+	void on_message(EndpointType* s, websocketpp::connection_hdl hdl, typename EndpointType::message_ptr msg);
+	template <typename EndpointType>
+	void on_open(EndpointType* s, websocketpp::connection_hdl hdl) ;
+	template <typename EndpointType>
+	void on_close(EndpointType* s, websocketpp::connection_hdl hdl);
+	template <typename EndpointType>
+	void on_fail(EndpointType* s, websocketpp::connection_hdl hdl);
 
-	void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg);
-	void on_open(server* s, websocketpp::connection_hdl hdl);
-	void on_close(server* s, websocketpp::connection_hdl hdl);
-	void on_fail(server* s, websocketpp::connection_hdl hdl);
+	context_ptr on_tls_init(websocketpp::connection_hdl hdl) {
+		std::cout << "on_tls_init called with hdl: " << hdl.lock().get() << std::endl;
+		context_ptr ctx = websocketpp::lib::make_shared<boost::asio::ssl::context>(boost::asio::ssl::context::tlsv13_server);
+		try {
+			ctx->set_options(boost::asio::ssl::context::default_workarounds |
+				boost::asio::ssl::context::no_sslv2 |
+				boost::asio::ssl::context::no_sslv3 |
+				boost::asio::ssl::context::no_tlsv1 |
+				boost::asio::ssl::context::single_dh_use);
+			ctx->use_certificate_file("server.crt", boost::asio::ssl::context::pem); // "server.crt"
+			ctx->use_private_key_file("server.crt", boost::asio::ssl::context::pem);  // "server.key"
+		}
+		catch (std::exception& e) {
+			char str[1024];
+			snprintf(str, 1024, "[%s :%d][ %s]", __FUNCTION__, __LINE__, e.what());
+			std::cout << str << std::endl;
+		}
+		return ctx;
+	}
 
 private:
 	server m_endpoint;
+	server_tls m_endpoint_tls;
 	uint16_t m_port;      // 端口
 
 	Callback_RecvMsg pRecvFun;   // 接收消息回调函数

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

@@ -1,16 +1,17 @@
-G:\git\Middlewares-Linux\FreeSWITCH-linux\Agent.cpp|638382332410785639|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\Agent.cpp|638410849006740925|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\AgentDetail.cpp|638205475825278208|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\AutoCall.cpp|638381656275151342|~/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|638399591786298776|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\Config.cpp|638411714408988430|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\DepttelextOffice.cpp|638412824704159927|~/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|638218437376967127|~/projects/FreeSWITCH-linux|
-G:\git\Middlewares-Linux\FreeSWITCH-linux\FsProxy.cpp|638400449303370548|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\FsProxy.cpp|638411690436030254|~/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|
@@ -30,22 +31,26 @@ G:\git\Middlewares-Linux\FreeSWITCH-linux\OpMyd.cpp|637896099232285247|~/project
 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|638381656307903616|~/projects/FreeSWITCH-linux|
-G:\git\Middlewares-Linux\FreeSWITCH-linux\Session.cpp|638398979641674785|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\Session.cpp|638411664847316761|~/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\TokenList.cpp|638400474677115478|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\TtsBaidu.cpp|638382420351585953|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\Util.cpp|637896099232345089|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\VideoExten.cpp|638409371328568295|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\VideoExtenHdl.cpp|638410989456407634|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\VideoOffice.cpp|638412821590723920|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\VirtualChan.cpp|637920964767764556|~/projects/FreeSWITCH-linux|
-G:\git\Middlewares-Linux\FreeSWITCH-linux\WebSocketServer.cpp|638398762958484059|~/projects/FreeSWITCH-linux|
-G:\git\Middlewares-Linux\FreeSWITCH-linux\Agent.h|638215748197194972|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\WebSocketServer.cpp|638411794538810813|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\Agent.h|638410830352582766|~/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|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\CalllDetaillnc.h|637896099232135650|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\CallStringMaker.h|637896099232135650|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\ChanExten.h|637896099232145619|~/projects/FreeSWITCH-linux|
-G:\git\Middlewares-Linux\FreeSWITCH-linux\Config.h|638399591585432459|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\Config.h|638411714059473498|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\DepttelextOffice.h|638410227868797627|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\ICdr.h|637896099232205458|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\JsonStringMaker.h|637896099232215431|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpAutoCall.h|637896099232235381|~/projects/FreeSWITCH-linux|
@@ -55,7 +60,7 @@ G:\git\Middlewares-Linux\FreeSWITCH-linux\OpHoldon.h|637896099232255325|~/projec
 G:\git\Middlewares-Linux\FreeSWITCH-linux\DevInfoInc.h|638398966841084583|~/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|638399617411892117|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\FsProxy.h|638410242930221943|~/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|
@@ -94,7 +99,10 @@ G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\ocr.h|637896099233422205|~/proj
 G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\speech.h|637896099233422205|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\TtsBaidu.h|637896099232345089|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\Util.h|637896099232345089|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\VideoExten.h|638410846849221261|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\VideoExtenHdl.h|638410885286258034|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\VideoOffice.h|638409372699760257|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\VirtualChan.h|637920937052225722|~/projects/FreeSWITCH-linux|
-G:\git\Middlewares-Linux\FreeSWITCH-linux\WebSocketServer.h|638398763100301030|~/projects/FreeSWITCH-linux|
+G:\git\Middlewares-Linux\FreeSWITCH-linux\WebSocketServer.h|638411794868715952|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\log4cpp.conf|637896204483512822|~/projects/FreeSWITCH-linux|
 G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\README.md|637896099233392290|~/projects/FreeSWITCH-linux|

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

@@ -6,6 +6,7 @@ G:\git\Middlewares-Linux\FreeSWITCH-linux\AutoCall.cpp|/root/projects/FreeSWITCH
 G:\git\Middlewares-Linux\FreeSWITCH-linux\CallStringMaker.cpp|/root/projects/FreeSWITCH-linux/CallStringMaker.cpp
 G:\git\Middlewares-Linux\FreeSWITCH-linux\ChanExten.cpp|/root/projects/FreeSWITCH-linux/ChanExten.cpp
 G:\git\Middlewares-Linux\FreeSWITCH-linux\Config.cpp|/root/projects/FreeSWITCH-linux/Config.cpp
+G:\git\Middlewares-Linux\FreeSWITCH-linux\DepttelextOffice.cpp|/root/projects/FreeSWITCH-linux/DepttelextOffice.cpp
 G:\git\Middlewares-Linux\FreeSWITCH-linux\JsonStringMaker.cpp|/root/projects/FreeSWITCH-linux/JsonStringMaker.cpp
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpAutoCall.cpp|/root/projects/FreeSWITCH-linux/OpAutoCall.cpp
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpForceAgentState.cpp|/root/projects/FreeSWITCH-linux/OpForceAgentState.cpp
@@ -39,6 +40,9 @@ G:\git\Middlewares-Linux\FreeSWITCH-linux\TimeScheduler.cpp|/root/projects/FreeS
 G:\git\Middlewares-Linux\FreeSWITCH-linux\TokenList.cpp|/root/projects/FreeSWITCH-linux/TokenList.cpp
 G:\git\Middlewares-Linux\FreeSWITCH-linux\TtsBaidu.cpp|/root/projects/FreeSWITCH-linux/TtsBaidu.cpp
 G:\git\Middlewares-Linux\FreeSWITCH-linux\Util.cpp|/root/projects/FreeSWITCH-linux/Util.cpp
+G:\git\Middlewares-Linux\FreeSWITCH-linux\VideoExten.cpp|/root/projects/FreeSWITCH-linux/VideoExten.cpp
+G:\git\Middlewares-Linux\FreeSWITCH-linux\VideoExtenHdl.cpp|/root/projects/FreeSWITCH-linux/VideoExtenHdl.cpp
+G:\git\Middlewares-Linux\FreeSWITCH-linux\VideoOffice.cpp|/root/projects/FreeSWITCH-linux/VideoOffice.cpp
 G:\git\Middlewares-Linux\FreeSWITCH-linux\VirtualChan.cpp|/root/projects/FreeSWITCH-linux/VirtualChan.cpp
 G:\git\Middlewares-Linux\FreeSWITCH-linux\WebSocketServer.cpp|/root/projects/FreeSWITCH-linux/WebSocketServer.cpp
 G:\git\Middlewares-Linux\FreeSWITCH-linux\Agent.h|/root/projects/FreeSWITCH-linux/Agent.h
@@ -48,6 +52,7 @@ G:\git\Middlewares-Linux\FreeSWITCH-linux\CalllDetaillnc.h|/root/projects/FreeSW
 G:\git\Middlewares-Linux\FreeSWITCH-linux\CallStringMaker.h|/root/projects/FreeSWITCH-linux/CallStringMaker.h
 G:\git\Middlewares-Linux\FreeSWITCH-linux\ChanExten.h|/root/projects/FreeSWITCH-linux/ChanExten.h
 G:\git\Middlewares-Linux\FreeSWITCH-linux\Config.h|/root/projects/FreeSWITCH-linux/Config.h
+G:\git\Middlewares-Linux\FreeSWITCH-linux\DepttelextOffice.h|/root/projects/FreeSWITCH-linux/DepttelextOffice.h
 G:\git\Middlewares-Linux\FreeSWITCH-linux\ICdr.h|/root/projects/FreeSWITCH-linux/ICdr.h
 G:\git\Middlewares-Linux\FreeSWITCH-linux\JsonStringMaker.h|/root/projects/FreeSWITCH-linux/JsonStringMaker.h
 G:\git\Middlewares-Linux\FreeSWITCH-linux\OpAutoCall.h|/root/projects/FreeSWITCH-linux/OpAutoCall.h
@@ -100,6 +105,9 @@ G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\ocr.h|/root/projects/FreeSWITCH
 G:\git\Middlewares-Linux\FreeSWITCH-linux\ttsapi\speech.h|/root/projects/FreeSWITCH-linux/ttsapi/speech.h
 G:\git\Middlewares-Linux\FreeSWITCH-linux\TtsBaidu.h|/root/projects/FreeSWITCH-linux/TtsBaidu.h
 G:\git\Middlewares-Linux\FreeSWITCH-linux\Util.h|/root/projects/FreeSWITCH-linux/Util.h
+G:\git\Middlewares-Linux\FreeSWITCH-linux\VideoExten.h|/root/projects/FreeSWITCH-linux/VideoExten.h
+G:\git\Middlewares-Linux\FreeSWITCH-linux\VideoExtenHdl.h|/root/projects/FreeSWITCH-linux/VideoExtenHdl.h
+G:\git\Middlewares-Linux\FreeSWITCH-linux\VideoOffice.h|/root/projects/FreeSWITCH-linux/VideoOffice.h
 G:\git\Middlewares-Linux\FreeSWITCH-linux\VirtualChan.h|/root/projects/FreeSWITCH-linux/VirtualChan.h
 G:\git\Middlewares-Linux\FreeSWITCH-linux\WebSocketServer.h|/root/projects/FreeSWITCH-linux/WebSocketServer.h
 G:\git\Middlewares-Linux\FreeSWITCH-linux\log4cpp.conf|/root/projects/FreeSWITCH-linux/log4cpp.conf

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

@@ -3,7 +3,6 @@
   Validating architecture
   Starting remote build
   Compiling sources:
-  TokenList.cpp
-G:\git\Middlewares-Linux\FreeSWITCH-linux\TokenList.cpp(72,82): warning : conversion to ‘int’ from ‘std::__cxx11::basic_string<char>::size_type {aka long unsigned int}’ may alter its value [-Wconversion]
+  DepttelextOffice.cpp
   Linking objects
   FreeSWITCH-linux.vcxproj -> G:\git\Middlewares-Linux\FreeSWITCH-linux\bin\x64\Release\middleware