From b39645c1a9514c6e89dcc179ed93f9f64d22e6e5 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 09 十二月 2016 18:27:58 +0800
Subject: [PATCH] test for pc server
---
ProxyConsole/proxyconsole.c | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/ProxyConsole/proxyconsole.c b/ProxyConsole/proxyconsole.c
index df5effc..e009a9b 100644
--- a/ProxyConsole/proxyconsole.c
+++ b/ProxyConsole/proxyconsole.c
@@ -12,7 +12,7 @@
#include <pthread.h>
#include <sys/time.h>
#include <fcntl.h>
-#include "/usr/include/mysql/mysql.h"
+//#include "/usr/include/mysql/mysql.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -437,6 +437,29 @@
pthread_exit((void*)thread_Real[eidx]);
}
+int Read_MysqlData()
+{
+ static sockinfo equipments_config[] = {
+ //{
+ // .m_id = 1,
+ // .ip = "192.168.1.5", // equipmentip (analizer)
+ // .port = "80", // equipmentport
+ // .user = "supervisor", // equipment username
+ // .pass = "supervisor", // equipment password
+ // .serverIP = "192.168.1.2", // serverip
+ // .serverport = "5015", // serverport
+ // .reboot = 0
+ //},
+ { .m_id = 1, .ip = "192.168.1.5", .port = "80", .user = "supervisor", .pass = "supervisor", .serverIP = "192.168.1.2", .serverport = "5015", .reboot = 0 },
+ };
+
+ memcpy(equipments, equipments_config, sizeof(equipments_config));
+ NUM = sizeof(equipments_config) / sizeof(sockinfo);
+
+ return 1;
+}
+
+/*
int Read_MysqlData(){
int ret=0;
MYSQL *conn;
@@ -529,7 +552,8 @@
mysql_close(conn);
return ret;
-}
+}*/
+
int net_test(char* serverIP,char* port){
struct sockaddr_in servaddr;
int strlen=sizeof(servaddr);
--
Gitblit v1.8.0