From 109ffe9a777658936a38d0c146579a67c60a0d17 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 11 五月 2017 17:48:48 +0800
Subject: [PATCH] 

---
 ProxyServer/proxyserver.h |   52 ++++++++++++++++++++++------------------------------
 1 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/ProxyServer/proxyserver.h b/ProxyServer/proxyserver.h
index 7d3a242..c75e125 100644
--- a/ProxyServer/proxyserver.h
+++ b/ProxyServer/proxyserver.h
@@ -1,25 +1,26 @@
 #include<sys/socket.h>
 #include<sys/types.h>
 #include<netinet/in.h>
-#include<netdb.h>
-#include<stdio.h>
-#include<string.h>
-#include<stdlib.h>
-#include<unistd.h>
-#include<errno.h>
-#include<arpa/inet.h>
-#include<time.h>
-#include<signal.h>
-#include<pthread.h>
-#include<sys/time.h>
-#include<stdbool.h>
-#include<fcntl.h>
-#include<sys/stat.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <arpa/inet.h>
+#include <time.h>
+#include <signal.h>
+#include <pthread.h>
+#include <sys/time.h>
+#include <stdbool.h>
+#include <fcntl.h>
+#include "/usr/include/mysql/mysql.h"
+#include <sys/stat.h>
 #define _DELETE_FILE
-#include<dirent.h>
-#include<limits.h>
-#include<sys/io.h>
-#include<signal.h>
+#include <dirent.h>
+#include <limits.h>
+#include <sys/io.h>
+#include <signal.h>
 int RealAlarmEventNum[16];
 typedef struct{
 	int Year;
@@ -92,16 +93,6 @@
 
 void zclock_sleep (int msecs);
 
-
-
-void zclock_sleep (int msecs)
-{
-    struct timespec t;
-    t.tv_sec  =  msecs / 1000;
-    t.tv_nsec = (msecs % 1000) * 1000000;
-    nanosleep (&t, NULL);
-}
-
 typedef struct{
    char name[1024];
 }filenames,*lpfilenames;
@@ -110,8 +101,9 @@
 	char IP[32];
 }SESSION;
 
-
+int doesFileExist(const char *filename);
 void delete_file(const char *path);
+void delete_folder(const char *path);
 void AnalySerFile(char* p_save_buf,int res, int SearchStartTm, int SearchEndTm);
 int GetFileNameInFolder(char* dirname,lpfilenames lpfilename);
 int net_test(char* serverIP,char* port);
@@ -141,7 +133,7 @@
 char* GetSearchMetaInfo(char* AnalyserIP,char* user,char* pass,int Channel,lpMyTime StartTm,lpMyTime EndTm);	//4.鏌ヨ璁板綍				鍙傛暟锛氬垎鏋愬櫒IP锛屽紑濮嬫椂闂达紝缁撴潫鏃堕棿锛屼俊閬撳彿銆傝繑鍥烇細鏌ヨ缁撴灉銆傦紙鍖呮嫭淇¢亾鍙凤紝鎶ヨ鏃堕棿锛屾挱鏀惧湴鍧�锛岀瓑銆傦級
 char* GetAnalyserNet(void);																												//5.鑾峰彇褰撳墠杞彂鍣ㄧ殑ip		鍙傛暟锛氭棤銆傝繑鍥烇細褰撳墠鐨刬p鍦板潃瀛愮綉鎺╃爜鍜岀綉鍏�
 int SetAnalyserNet(char* NetInfo);	
-
+char* GetMp4Info(char* AnalyserIP,char* user,char* pass,int Channel,char* path)	;	
 char* GetAnalyserAll();																													//9.鏌ヨ璁惧   鍙傛暟锛氭棤		杩斿洖锛氬垎鏋愬櫒鐨勫悕绉板拰ip
 int DeleteAnalyser(char* AnalyserIP);																									//8.鍒犻櫎璁惧   鍙傛暟锛氳澶噄p	杩斿洖锛氭垚鍔熸垨澶辫触鐨勬彁绀恒��
 int InsertAnalyser(char *AnalyserName,char* AnalyserIP,char* AnalyserPort,char* ServerIP,char* ServerPort,char* user,char* pass,char* resol,char* commType);//																	7.娣诲姞璁惧   鍙傛暟锛氳澶囧睘鎬с�傝繑鍥烇細鎴愬姛杩斿洖瀵瑰簲鐨勮棰戞祦鍦板潃锛屽け璐ヨ繑鍥炰竴涓彁绀恒��

--
Gitblit v1.8.0