1.初始化添加是否鉴权模式的日志

2.增加对200 类型的处理

1.初始化添加是否鉴权模式的日志
2.增加对200 类型的处理
Hu Chunming
1 parent 6958b5be
Showing 2 changed files with 17 additions and 7 deletions
bin/sip_server_cfg.xml
sip/SipServer.cpp
@@ -3,10 +3,10 @@
 	<Ua>SY_Sip_Server</Ua>
 	<Nonce>12345678</Nonce>
 	<Ip>192.168.60.179</Ip>
-	<Port>15060</Port>
+	<Port>5060</Port>
 	<SipId>34020000002000000002</SipId>
 	<SipRealm>3402000000</SipRealm>
-	<Password>sy123456</Password>
+	<Password></Password>
 	<Timeout>1800</Timeout>
 	<Expiry>3600</Expiry>
 	<WsPort>9006</WsPort>
@@ -96,6 +96,12 @@ bool SipServer::Init(ServerInfo* pInfo, WebSocketServer* pServer) {
     mInfo = *pInfo;
+    if (mInfo.isNoAuth()) {
+        LOG_INFO("do not need password");
+    } else {
+        LOG_INFO("need password");
+    }
+
     m_pWsServer = pServer;
     m_event_loop_thread = new std::thread(event_loop_thread, this);
@@ -493,8 +499,9 @@ void SipServer::cacheClient(osip_uri_t *url, int expiry) {
         RequestCatalog(client);
     } else if (type >= 131 && type <= 199) {
         RequestDeviceInfo(client);
-    }
-    else {
+    } else if (type >= 200 && type <= 299) {
+        RequestCatalog(client);
+    } else {
         LOG_WARN("device type is not supported:{}",type);
     }
@@ -574,7 +581,7 @@ void SipServer::response_message(eXosip_event_t *evtp) {
     } else if(!strcmp(CmdType, "Keepalive")){
         this->response_message_answer(evtp,200);
-        // LOG_INFO("CmdType={},DeviceID={}", CmdType, DeviceID);
+        LOG_INFO("CmdType={},DeviceID={}", CmdType, DeviceID);
         std::lock_guard<std::mutex> l_c(m_client_map_mtx);
         auto it = mClientMap.find(DeviceID);
         if (it != mClientMap.end()) {
@@ -873,9 +880,12 @@ void SipServer::cacheCatalog() {
         if (type >= 111 && type <= 130) {
             // NVR注册成功，立即请求设备目录
             RequestCatalog(client);
-        }
-        else if (type >= 131 && type <= 199) {
+        } else if (type >= 131 && type <= 199) {
             RequestDeviceInfo(client);
+        } else if (type >= 200 && type <= 299) {
+            RequestCatalog(client);
+        } else {
+            LOG_WARN("device type is not supported:{}",type);
         }
     }