Z991239-5263 #comment 下线acmstrdec_mobile.dll依赖库逻辑

Module/mod_assistantchannel/mod_assistantchannel.cpp

@@ -467,9 +467,9 @@ void CBizChannelEntity::_on_close()
 void ChannelServiceSession::Handle_Connect( SpReqAnsContext<ChannelService_Connect_Req, ChannelService_Connect_Ans>::Pointer ctx )
 {
 	DbgToBeidou(ctx->link, __FUNCTION__)();
-	//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("start connect, %s:%d [%s]", (LPCSTR)ctx->Req.ip, ctx->Req.port, (LPCSTR)ctx->Req.callno);
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("start connect, %s:%d [%s]", (LPCSTR)ctx->Req.ip, ctx->Req.port, (LPCSTR)ctx->Req.callno);
 	ErrorCodeEnum Error = m_pEntity->Connect(ctx->Req.ip, ctx->Req.port, ctx->Req.callno, (CallingTypeEnum)ctx->Req.etype);
-	//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("connect Error = %d", Error);
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("connect Error = %d", Error);
 	ctx->Answer(Error);
 }
 

Module/mod_recorder/recordinfo.cpp

@@ -4,7 +4,7 @@
 
 
 void HttpsLogCallBack(const char* logtxt) {
-	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI("HttpsLogCallBack")("HttpsLogCallBack: %s.", logtxt);
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI("HttpsLogCallBack")("HttpsLogCallBack: %s.", logtxt);
 }
 
 

Other/unix/libbizchan/bizchan.cpp

@@ -145,8 +145,6 @@ typedef int (*lpfn_cryptionfun)(unsigned char *  out ,int outLen,const unsigned
 
 static lpfn_cryptionfun decodestring = NULL;
 static lpfn_cryptionfun encodestring = NULL;
-static lpfn_cryptionfun decodestring_mobile = NULL;
-static lpfn_cryptionfun encodestring_mobile = NULL;
 
 static unsigned char  seed_key []= {0x81,0x32,0x13,0xf5,0x29,0x3b,0x52,0x37,0x61,0x98,0x33,0x15,0x72,0x31,0xfe,0x34};
 
@@ -944,11 +942,6 @@ static void do_shake_send(bizchan_t* chan, SOCKET conn, int* error) {
 	lpfn_cryptionfun encodefun = encodestring;
 	lpfn_cryptionfun decodefun = decodestring;
 
-	if (1 == chan->config.crypt_type) {
-		encodefun = encodestring_mobile;
-		decodefun = decodestring_mobile;
-	}
-
 	int enc_length = KEY_LEN;
 	hdr.tag[0] = 'A';
 	hdr.tag[1] = 'C';
@@ -991,11 +984,6 @@ static void do_shake_recv(bizchan_t* chan, SOCKET conn, int* error) {
 	lpfn_cryptionfun encodefun = encodestring;
 	lpfn_cryptionfun decodefun = decodestring;
 
-	if (1 == chan->config.crypt_type) {
-		encodefun = encodestring_mobile;
-		decodefun = decodestring_mobile;
-	}
-
 	do
 	{
 		t = recv(conn, (char*)&ack_hdr + ack_hdr_recv_bytes, sizeof(ack_hdr) - ack_hdr_recv_bytes, 0);
@@ -1412,25 +1400,6 @@ static int init_decode_func(const bizchan_config_t* config, const bizchan_callba
 			return ret;
 	}
 
-	if (1 == config->crypt_type) {
-		if (!encodestring_mobile) {
-			HMODULE hInst = LoadLibraryA("libacmstrenc_mobile.so");
-			if (hInst) {
-				encodestring_mobile = (lpfn_cryptionfun)GetProcAddress(hInst, "encodestring");
-			}
-			if (!encodestring_mobile)
-				return ret;
-		}
-		if (!decodestring_mobile) {
-			HMODULE hInst = LoadLibraryA("libacmstrdec_mobile.so");
-			if (hInst) {
-				decodestring_mobile = (lpfn_cryptionfun)GetProcAddress(hInst, "decodestring");
-			}
-			if (!decodestring_mobile)
-				return ret;
-		}
-	}
-
 	if (encodestring && decodestring) {
 		ret = 0;
 	}

Other/unix/libbizchan/bizchan.h

@@ -37,7 +37,6 @@ typedef struct bizchan_config_t {
 		int rtp_port;
 		int desc;
 	}video;
-	int crypt_type;
 }bizchan_config_t;
 
 

Other/win/libbizchan/bizchan.c

@@ -98,8 +98,6 @@ typedef int (*lpfn_cryptionfun)(unsigned char *  out ,int outLen,const unsigned
 
 static lpfn_cryptionfun decodestring = NULL;
 static lpfn_cryptionfun encodestring = NULL;
-static lpfn_cryptionfun decodestring_mobile = NULL;
-static lpfn_cryptionfun encodestring_mobile = NULL;
 
 static unsigned char  seed_key []= {0x81,0x32,0x13,0xf5,0x29,0x3b,0x52,0x37,0x61,0x98,0x33,0x15,0x72,0x31,0xfe,0x34};
 
@@ -724,10 +722,7 @@ static void process(bizchan_t *chan)
 		int ack_hdr_recv_bytes = 0;
 		lpfn_cryptionfun encodefun = encodestring;
 		lpfn_cryptionfun decodefun = decodestring;
-		if (1 == chan->config.crypt_type){
-			encodefun = encodestring_mobile;
-			decodefun = decodestring_mobile;
-		}
+
 		while (!chan->stop_flag && !chan->connected) 
 		{ // wait until connected
 			DWORD dwRet = WaitForMultipleObjects(2, evts, FALSE, MAX_TIMEOUT);
@@ -960,24 +955,7 @@ static int init_decode_func()
 			return ret;
 	}
 
-	if (!encodestring_mobile) {
-		HMODULE hInst = LoadLibraryA("acmstrenc_mobile.dll");
-		if (hInst) {
-			encodestring_mobile = (lpfn_cryptionfun)GetProcAddress(hInst, "encodestring");
-		}
-		if (!encodestring_mobile)
-			return ret;
-	}
-	if (!decodestring_mobile) {
-		HMODULE hInst = LoadLibraryA("acmstrdec_mobile.dll");
-		if (hInst) {
-			decodestring_mobile = (lpfn_cryptionfun)GetProcAddress(hInst, "decodestring");
-		}
-		if (!decodestring_mobile)
-			return ret;
-	}
-
-	if (encodestring && decodestring && encodestring_mobile && decodestring_mobile){
+	if (encodestring && decodestring){
 		ret = 0;
 	}
 	return ret;

Other/win/libbizchan/bizchan.h

@@ -33,7 +33,6 @@ typedef struct bizchan_config_t {
 		int rtp_port;
 		int desc;
 	}video;
-	int crypt_type;
 }bizchan_config_t;