From 1ca24862fd175cf02bc6d18703ef724f8d22cf1c Mon Sep 17 00:00:00 2001 From: Chalith Desaman Date: Thu, 14 Sep 2023 11:57:48 +0530 Subject: [PATCH] Bind udp ports for peer connection (#279) --- mb-xrpl/lib/appenv.js | 2 +- src/hp_manager.cpp | 6 +++--- src/version.hpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mb-xrpl/lib/appenv.js b/mb-xrpl/lib/appenv.js index 1f02532..cbe8fa3 100644 --- a/mb-xrpl/lib/appenv.js +++ b/mb-xrpl/lib/appenv.js @@ -28,7 +28,7 @@ appenv = { ORPHAN_PRUNE_SCHEDULER_INTERVAL_HOURS: 4, SASHIMONO_SCHEDULER_INTERVAL_SECONDS: 2, SASHI_CLI_PATH: appenv.IS_DEV_MODE ? "../build/sashi" : "/usr/bin/sashi", - MB_VERSION: '0.6.6', + MB_VERSION: '0.6.7', TOS_HASH: '757A0237B44D8B2BBB04AE2BAD5813858E0AECD2F0B217075E27E0630BA74314' // This is the sha256 hash of TOS text. } Object.freeze(appenv); diff --git a/src/hp_manager.cpp b/src/hp_manager.cpp index 5a7403c..0b61d67 100644 --- a/src/hp_manager.cpp +++ b/src/hp_manager.cpp @@ -32,7 +32,7 @@ namespace hp // We keep docker logs at size limit of 10mb, We only need these logs for docker instance failure debugging since all other logs are kept in files. // For the local log driver compression, minimum max-file should be 2. So we keep two logs each max-size is 5mb constexpr const char *DOCKER_CREATE = "DOCKER_HOST=unix:///run/user/$(id -u %s)/docker.sock timeout --foreground -v -s SIGINT %ss %s/dockerbin/docker create -t -i --stop-signal=SIGINT --log-driver local \ - --log-opt max-size=5m --log-opt max-file=2 --name=%s -p %s:%s -p %s:%s --restart unless-stopped --mount type=bind,source=%s,target=/contract %s run /contract"; + --log-opt max-size=5m --log-opt max-file=2 --name=%s -p %s:%s -p %s:%s -p %s:%s/udp --restart unless-stopped --mount type=bind,source=%s,target=/contract %s run /contract"; constexpr const char *DOCKER_START = "DOCKER_HOST=unix:///run/user/$(id -u %s)/docker.sock %s/dockerbin/docker start %s"; constexpr const char *DOCKER_STOP = "DOCKER_HOST=unix:///run/user/$(id -u %s)/docker.sock %s/dockerbin/docker stop %s"; constexpr const char *DOCKER_REMOVE = "DOCKER_HOST=unix:///run/user/$(id -u %s)/docker.sock %s/dockerbin/docker rm -f %s"; @@ -310,10 +310,10 @@ namespace hp const std::string user_port = std::to_string(assigned_ports.user_port); const std::string peer_port = std::to_string(assigned_ports.peer_port); const std::string timeout = std::to_string(DOCKER_CREATE_TIMEOUT_SECS); - const int len = 367 + username.length() + timeout.length() + conf::ctx.exe_dir.length() + container_name.length() + (user_port.length() * 2) + (peer_port.length() * 2) + contract_dir.length() + image_name.length(); + const int len = 376 + username.length() + timeout.length() + conf::ctx.exe_dir.length() + container_name.length() + (user_port.length() * 2) + (peer_port.length() * 4) + contract_dir.length() + image_name.length(); char command[len]; sprintf(command, DOCKER_CREATE, username.data(), timeout.data(), conf::ctx.exe_dir.data(), container_name.data(), - user_port.data(), user_port.data(), peer_port.data(), peer_port.data(), contract_dir.data(), image_name.data()); + user_port.data(), user_port.data(), peer_port.data(), peer_port.data(), peer_port.data(), peer_port.data(), contract_dir.data(), image_name.data()); LOG_INFO << "Creating the docker container. name: " << container_name; if (system(command) != 0) { diff --git a/src/version.hpp b/src/version.hpp index 99dbf2b..e9132f1 100644 --- a/src/version.hpp +++ b/src/version.hpp @@ -6,7 +6,7 @@ namespace version { // Sashimono agent version. Written to new configs. - constexpr const char *AGENT_VERSION = "0.6.6"; + constexpr const char *AGENT_VERSION = "0.6.7"; // Minimum compatible config version (this will be used to validate configs). constexpr const char *MIN_CONFIG_VERSION = "0.5.0";