From d9dea060d30ff0355d36d0794490a61d7357de35 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Wed, 28 Feb 2018 10:58:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=AB=AF=E5=8F=A3=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 c_wrapper/src/common.cpp | 18 +++++++++---------
 c_wrapper/src/common.h   | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/c_wrapper/src/common.cpp b/c_wrapper/src/common.cpp
index 190a169e..687fb415 100755
--- a/c_wrapper/src/common.cpp
+++ b/c_wrapper/src/common.cpp
@@ -79,38 +79,38 @@ API_EXPORT void API_CALL setGlobalOptionString(const char *key,const char *val){
     }
     mINI::Instance()[key] = val;
 }
-API_EXPORT int API_CALL initHttpServer(unsigned short port){
+API_EXPORT unsigned short API_CALL initHttpServer(unsigned short port){
 	s_pHttpSrv.reset(new TcpServer());
 	try {
 		s_pHttpSrv->start<HttpSession>(port);
-		return 0;
+		return s_pHttpSrv->getPort();
 	} catch (std::exception &ex) {
 		s_pHttpSrv.reset();
 		WarnL << ex.what();
-		return -1;
+		return 0;
 	}
 }
-API_EXPORT int API_CALL initRtspServer(unsigned short port) {
+API_EXPORT unsigned short API_CALL initRtspServer(unsigned short port) {
 	s_pRtspSrv.reset(new TcpServer());
 	try {
 		s_pRtspSrv->start<RtspSession>(port);
-		return 0;
+		return s_pRtspSrv->getPort();
 	} catch (std::exception &ex) {
 		s_pRtspSrv.reset();
 		WarnL << ex.what();
-		return -1;
+		return 0;
 	}
 }
 
-API_EXPORT int API_CALL initRtmpServer(unsigned short port) {
+API_EXPORT unsigned short API_CALL initRtmpServer(unsigned short port) {
 	s_pRtmpSrv.reset(new TcpServer());
 	try {
 		s_pRtmpSrv->start<RtmpSession>(port);
-		return 0;
+		return s_pRtmpSrv->getPort();
 	} catch (std::exception &ex) {
 		s_pRtmpSrv.reset();
 		WarnL << ex.what();
-		return -1;
+		return 0;
 	}
 }
 
diff --git a/c_wrapper/src/common.h b/c_wrapper/src/common.h
index 12cd777a..008bddd6 100755
--- a/c_wrapper/src/common.h
+++ b/c_wrapper/src/common.h
@@ -56,24 +56,24 @@ API_EXPORT void API_CALL setGlobalOptionString(const char *key,const char *val);
 
 /*
  * 描述:创建Http服务器
- * 参数:port:htt监听端口，推荐80
- * 返回值:0:成功;-1:失败
+ * 参数:port:htt监听端口，推荐80，传入0则随机分配
+ * 返回值:0:失败,非0:端口号
  */
-API_EXPORT int API_CALL initHttpServer(unsigned short port);
+API_EXPORT unsigned short API_CALL initHttpServer(unsigned short port);
 
 /*
  * 描述:创建RTSP服务器
- * 参数:port:rtsp监听端口，推荐554
- * 返回值:0:成功;-1:失败
+ * 参数:port:rtsp监听端口，推荐554，传入0则随机分配
+ * 返回值:0:失败,非0:端口号
  */
-API_EXPORT int API_CALL initRtspServer(unsigned short port);
+API_EXPORT unsigned short API_CALL initRtspServer(unsigned short port);
 
 /*
  * 描述:创建RTMP服务器
- * 参数:port:rtmp监听端口，推荐1935
- * 返回值:0:成功;-1:失败
+ * 参数:port:rtmp监听端口，推荐1935，传入0则随机分配
+ * 返回值:0:失败,非0:端口号
  */
-API_EXPORT int API_CALL initRtmpServer(unsigned short port);
+API_EXPORT unsigned short API_CALL initRtmpServer(unsigned short port);
 
 
 /////////////////////////日志////////////////////////////////