mii/libdatachannel
1
0
Fork 0
mirror of https://github.com/mii443/libdatachannel.git synced 2025-08-23 15:48:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

proxyServer param as optional

Browse Source
This commit is contained in:
Murat Dogan
2020-04-28 14:36:37 +03:00
parent 56bd8c98b3
commit 44361714a5
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/rtc/configuration.hpp
View File

@ -54,7 +54,7 @@ struct IceServer {
struct ProxyServer { struct ProxyServer {
enum class Type { None = 0, Socks5, Http, Last = Http }; enum class Type { None = 0, Socks5, Http, Last = Http };
Type type = Type::None; Type type;
string ip; string ip;
uint16_t port; uint16_t port;
string username; string username;
@ -63,7 +63,7 @@ struct ProxyServer {
struct Configuration { struct Configuration {
std::vector<IceServer> iceServers; std::vector<IceServer> iceServers;
ProxyServer proxyServer; std::optional<ProxyServer> proxyServer;
bool enableIceTcp = false; bool enableIceTcp = false;
uint16_t portRangeBegin = 1024; uint16_t portRangeBegin = 1024;
uint16_t portRangeEnd = 65535; uint16_t portRangeEnd = 65535;

16
src/icetransport.cpp
View File

@ -320,15 +320,15 @@ IceTransport::IceTransport(const Configuration &config, Description::Role role,
g_object_set(G_OBJECT(mNiceAgent.get()), "upnp-timeout", 200, nullptr); g_object_set(G_OBJECT(mNiceAgent.get()), "upnp-timeout", 200, nullptr);
// Proxy // Proxy
if (config.proxyServer.type != ProxyServer::Type::None) { if (config.proxyServer.has_value()) {
g_object_set(G_OBJECT(mNiceAgent.get()), "proxy-type", config.proxyServer.type, nullptr); ProxyServer proxyServer = config.proxyServer.value();
g_object_set(G_OBJECT(mNiceAgent.get()), "proxy-ip", config.proxyServer.ip.c_str(), g_object_set(G_OBJECT(mNiceAgent.get()), "proxy-type", proxyServer.type, nullptr);
g_object_set(G_OBJECT(mNiceAgent.get()), "proxy-ip", proxyServer.ip.c_str(), nullptr);
g_object_set(G_OBJECT(mNiceAgent.get()), "proxy-port", proxyServer.port, nullptr);
g_object_set(G_OBJECT(mNiceAgent.get()), "proxy-username", proxyServer.username.c_str(),
nullptr);
g_object_set(G_OBJECT(mNiceAgent.get()), "proxy-password", proxyServer.password.c_str(),
nullptr); nullptr);
g_object_set(G_OBJECT(mNiceAgent.get()), "proxy-port", config.proxyServer.port, nullptr);
g_object_set(G_OBJECT(mNiceAgent.get()), "proxy-username",
config.proxyServer.username.c_str(), nullptr);
g_object_set(G_OBJECT(mNiceAgent.get()), "proxy-password",
config.proxyServer.password.c_str(), nullptr);
} }
// Randomize order // Randomize order