From 1b26f1dd275e7ff947fcf2ecdbbad8f6bc1e0b49 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 19 六月 2020 16:06:14 +0800
Subject: [PATCH] update
---
data/config.txt | 4 ++--
service/Makefile | 2 ++
service/test_client | 0
Makefile | 4 ++--
service/netdisk_service | 0
service/test_netdisk.c | 0
service/netdisk_service.c | 6 ++----
service/test_client.c | 14 ++++++++------
8 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/Makefile b/Makefile
index a2ae35a..12edad4 100755
--- a/Makefile
+++ b/Makefile
@@ -20,14 +20,14 @@
PACKAGE_NAME=netdisk_bin.tar.gz
package:
- ls ./build/bin > /dev/null 2> /dev/null || mkdir -p ./build/bin && cp ./service/netdisk_service ./build/bin/
+ ls ./build/bin > /dev/null 2> /dev/null || mkdir -p ./build/bin && cp ./service/netdisk_service ./build/bin/ && cp ./service/test_client ./build/bin/
ls ./build/common > /dev/null 2> /dev/null || mkdir -p ./build/common && cp ./common/libusgcommon.a ./build/common && cp ./common/libusgcommon.so ./build/common
cp -a ./data ./build
cp -avx ./script/* ./build
tar -czvf $(PACKAGE_NAME) build
-tarname = netdis_str.tar.gz
+tarname = netdisk_src.tar.gz
tar:
rm -f $(tarname)
diff --git a/data/config.txt b/data/config.txt
index 5280a71..6fa76c2 100644
--- a/data/config.txt
+++ b/data/config.txt
@@ -1,8 +1,8 @@
# nng鏈湴鏈嶅姟鍦板潃
-local_url=tcp://127.0.0.1:8899
+server_url=tcp://127.0.0.1:8801
# nng杩滅▼璋冪敤鍦板潃鍦板潃
-remote_url=tcp://127.0.0.1:9988
+client_url=tcp://127.0.0.1:7701
# 璐熻矗涓嬭浇浠诲姟鐨勭嚎绋嬫睜鐨勬暟閲�
workers=4
\ No newline at end of file
diff --git a/service/Makefile b/service/Makefile
index 67e9f73..0d94dca 100644
--- a/service/Makefile
+++ b/service/Makefile
@@ -28,6 +28,8 @@
netdisk_service: $(ROOT)/device/hcnetdisk.c $(ROOT)/device/netdisk_factory.c login_store.c request_handler.c properties_config.c
+test_client: test_client.c properties_config.c
+
test: $(ROOT)/device/hcnetdisk.c
test_properties: properties_config.c
diff --git a/service/netdisk_service b/service/netdisk_service
index d0e9580..37aa2b8 100755
--- a/service/netdisk_service
+++ b/service/netdisk_service
Binary files differ
diff --git a/service/netdisk_service.c b/service/netdisk_service.c
index 5e322dc..1f55786 100644
--- a/service/netdisk_service.c
+++ b/service/netdisk_service.c
@@ -17,7 +17,6 @@
int WORKERS ;
-std::string localUrl;
std::string remoteUrl;
PropertiesConfig config("../data/config.txt");
@@ -201,8 +200,7 @@
{
//鐜鍙橀噺鍒濆鍖�
WORKERS = config.getInt("workers");
- localUrl = config.get("local_url");
- remoteUrl = config.get("remote_url");
+ remoteUrl = config.get("client_url");
//娴峰悍璁惧鐜鍒濆鍖�
Netdisk_EnvConfig hcEnvConfig;
@@ -215,7 +213,7 @@
initThreadPool();
- startServer(localUrl.c_str());
+ startServer(config.get("server_url").c_str());
HCNetdisk::netdisk_deinit();
diff --git a/service/test_client b/service/test_client
index baf8670..580b0c5 100755
--- a/service/test_client
+++ b/service/test_client
Binary files differ
diff --git a/service/test_client.c b/service/test_client.c
index 368f641..b204c11 100644
--- a/service/test_client.c
+++ b/service/test_client.c
@@ -1,12 +1,14 @@
#include "usg_common.h"
#include "netdisk.h"
#include "hcnetdisk.h"
+#include "properties_config.h"
#include <jsoncpp/json/json.h>
#include <nng/nng.h>
#include <nng/protocol/reqrep0/rep.h>
#include <nng/protocol/reqrep0/req.h>
-const char *url = "tcp://127.0.0.1:8899";
-const char *localUrl = "tcp://127.0.0.1:9988";
+
+PropertiesConfig config("../data/config.txt");
+
void
fatal(const char *func, int rv)
{
@@ -152,7 +154,7 @@
if ((rv = nng_req0_open(&sock)) != 0) {
fatal("nng_socket", rv);
}
- if ((rv = nng_dial(sock, url, NULL, 0)) != 0) {
+ if ((rv = nng_dial(sock, config.get("server_url").c_str(), NULL, 0)) != 0) {
fatal("nng_dial", rv);
}
//printf("CLIENT: SENDING DATE REQUEST\n");
@@ -187,7 +189,7 @@
}
int
-server()
+server(const char *url)
{
nng_socket sock;
int rv;
@@ -195,7 +197,7 @@
if ((rv = nng_rep0_open(&sock)) != 0) {
fatal("nng_rep0_open", rv);
}
- if ((rv = nng_listen(sock, localUrl, NULL, 0)) != 0) {
+ if ((rv = nng_listen(sock, url, NULL, 0)) != 0) {
fatal("nng_listen", rv);
}
for (;;) {
@@ -230,7 +232,7 @@
pthread_t tid;
pthread_create(&tid, NULL, client, NULL);
- server();
+ server(config.get("client_url").c_str());
return 0;
}
\ No newline at end of file
diff --git a/service/test.c b/service/test_netdisk.c
similarity index 100%
rename from service/test.c
rename to service/test_netdisk.c
--
Gitblit v1.8.0