diff --git a/.gitmodules b/.gitmodules index f6454d0..345da44 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "libtgvoip"] path = libtgvoip url = https://github.com/danog/libtgvoip -[submodule "backward-cpp"] - path = backward-cpp - url = https://github.com/bombela/backward-cpp diff --git a/backward-cpp b/backward-cpp deleted file mode 160000 index 857bc8f..0000000 --- a/backward-cpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 857bc8fc311e6e990539be691be8c8a6f98b1be5 diff --git a/libtgvoip b/libtgvoip index ff2ccbd..b09ce7f 160000 --- a/libtgvoip +++ b/libtgvoip @@ -1 +1 @@ -Subproject commit ff2ccbd985fc9e42ab224ca40221f047f8c2be43 +Subproject commit b09ce7f5e418b1a09a22e3dc290e5f8218b1a7fe diff --git a/main.cpp b/main.cpp index cbad8c6..28b9679 100644 --- a/main.cpp +++ b/main.cpp @@ -273,7 +273,8 @@ void VoIP::parseConfig() { memset(cfg.statsDumpFilePath, 0, sizeof(cfg.statsDumpFilePath)); } Php::Value shared_config = self["configuration"]["shared_config"]; - ServerConfig::GetSharedInstance()->Update(shared_config); + std::map copyconfig(shared_config); + ServerConfig::GetSharedInstance()->Update(copyconfig); inst->SetConfig(&cfg); char *key = (char *) malloc(256); @@ -304,6 +305,7 @@ void VoIP::parseConfig() { } eps.push_back(Endpoint(endpoints[i]["id"], (int32_t)endpoints[i]["port"], v4addr, v6addr, EP_TYPE_UDP_RELAY, pTag)); + eps.push_back(Endpoint(endpoints[i]["id"], (int32_t)endpoints[i]["port"], v4addr, v6addr, EP_TYPE_TCP_RELAY, pTag)); free(pTag); }