From afa028e40b4195bd79bcc3d1a856e4a752d06e4b Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 09 十二月 2016 15:46:54 +0800
Subject: [PATCH] merge 12.9 update
---
ProxyServer/proxyserver.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ProxyServer/proxyserver.c b/ProxyServer/proxyserver.c
index 52b930d..6420895 100644
--- a/ProxyServer/proxyserver.c
+++ b/ProxyServer/proxyserver.c
@@ -23,7 +23,6 @@
int gMySock[16];
int threadIdx=0;
char byte_array[2600];
-char buff[102400];
int gGettingStep=0;
char uri[300];
time_t StartTm,EndTm;
@@ -78,6 +77,7 @@
}
char* GetDeviceInfo(char* AnalyserIP)
{
+ char buff[102400];
memset(EventString,0,sizeof(EventString));
gAnalyzerIP = AnalyserIP;
@@ -223,6 +223,8 @@
//// 杈撳嚭锛�0锛堟垚鍔燂級, -1(鍒濆鍖栧け璐�),-2(杩炴帴澶辫触)
int RealEventStart(char* AnalyserIP,char* user,char* pass)
{
+ char buff[10240];
+
gAnalyzerIP = AnalyserIP;
gUser = user;
gPass = pass;
@@ -366,6 +368,7 @@
{
int eidx = (int)arg;
int length;
+ char buff[10240];
puts("Step.2 ========>Equipment Thread is strarted......");
@@ -489,6 +492,7 @@
char* GetMp4Info(char* AnalyserIP,char* user,char* pass,int Channel,char* path)
{
char Pathbuffer[100] = {0};
+ char buff[102400];
RequestChannel = Channel;
gAnalyzerIP = AnalyserIP;
@@ -633,6 +637,7 @@
//// 杈撳嚭锛氭煡璇㈢粨鏋溿�傦紙鍖呮嫭淇￠亾鍙凤紝鎶ヨ鏃堕棿锛屾挱鏀惧湴鍧�锛岀瓑銆傦級
char* GetSearchMetaInfo(char* AnalyserIP,char* user,char* pass,int Channel,lpMyTime StartTm,lpMyTime EndTm)
{
+ char buff[102400];
//reset
memset(ZipSerFileName, 0, sizeof(ZipSerFileName));
ZipSerFileNum=0;
@@ -1043,6 +1048,7 @@
//// 杈撳嚭锛�0锛堟垚鍔燂級, -1(鍒濆鍖栧け璐�),-2(杩炴帴澶辫触)
int RestartCommand(char* AnalyserIP,char* user,char* pass)
{
+ char buff[10240];
gAnalyzerIP = AnalyserIP;
gUser = user;
gPass = pass;
--
Gitblit v1.8.0