From 755cfc4c72d8cda3161701a7f5454959175fa042 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 12 十二月 2016 11:47:19 +0800
Subject: [PATCH] add HCNetSDK support
---
ProxyConsole/proxyconsole.c | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/ProxyConsole/proxyconsole.c b/ProxyConsole/proxyconsole.c
index e009a9b..9f06efd 100644
--- a/ProxyConsole/proxyconsole.c
+++ b/ProxyConsole/proxyconsole.c
@@ -95,7 +95,7 @@
t.tv_nsec = (msecs % 1000) * 1000000;
nanosleep (&t, NULL);
}
-void u_alarm_handler()
+void u_alarm_handler(int)
{
//printf("connect fail==============");
@@ -439,7 +439,7 @@
int Read_MysqlData()
{
- static sockinfo equipments_config[] = {
+ static sockinfo equipments_config[1] = {
//{
// .m_id = 1,
// .ip = "192.168.1.5", // equipmentip (analizer)
@@ -450,8 +450,18 @@
// .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 },
+
+ //{ .m_id = 1, .ip = "192.168.1.5", .port = "80", .user = "supervisor", .pass = "supervisor", .serverIP = "192.168.1.2", .serverport = "5015", .reboot = 0 },
};
+
+ equipments_config[0].m_id = 1;
+ strcpy(equipments_config[0].ip, "192.168.1.5");
+ strcpy(equipments_config[0].port, "80");
+ strcpy(equipments_config[0].user, "supervisor");
+ strcpy(equipments_config[0].pass, "supervisor");
+ strcpy(equipments_config[0].serverIP, "192.168.1.2");
+ strcpy(equipments_config[0].serverport, "5015");
+ equipments_config[0].reboot = 0;
memcpy(equipments, equipments_config, sizeof(equipments_config));
NUM = sizeof(equipments_config) / sizeof(sockinfo);
@@ -846,11 +856,11 @@
memset(domain_buf4,0,512);
CharToByte((char*)buff, Device, length,Realm_buf1,nonce_buf2,auth_buf3,domain_buf4, len);
- char* cnonce_buf="163acd0e58793a190f29ee879d4b224f";//"08a9d86c1b5e45963cf82f43dca59c51";
+ const char* cnonce_buf="163acd0e58793a190f29ee879d4b224f";//"08a9d86c1b5e45963cf82f43dca59c51";
Realm_buf1[len[0]]=0;
nonce_buf2[len[1]]=0;
auth_buf3[len[2]]=0;
- char* nc="00000001";
+ const char* nc="00000001";
//CString qop;qop=auth_buf3;/////////////////////////////
char User[200];
memset(User,0,200);
--
Gitblit v1.8.0