diff --git a/libdotnet/Config.cpp b/libdotnet/Config.cpp index 46f651eb..2e6f674f 100644 --- a/libdotnet/Config.cpp +++ b/libdotnet/Config.cpp @@ -82,7 +82,7 @@ namespace config { httpserver.add_options() ("http.enabled", value()->default_value(true), "Enable or disable webconsole") ("http.address", value()->default_value("127.0.0.1"), "Webconsole listen address") - ("http.port", value()->default_value(7070), "Webconsole listen port") + ("http.port", value()->default_value(5050), "Webconsole listen port") ("http.auth", value()->default_value(false), "Enable Basic HTTP auth for webconsole") ("http.user", value()->default_value("dotnet"), "Username for basic auth") ("http.pass", value()->default_value(""), "Password for basic auth (default: random, see logs)") @@ -95,7 +95,7 @@ namespace config { httpproxy.add_options() ("httpproxy.enabled", value()->default_value(true), "Enable or disable HTTP Proxy") ("httpproxy.address", value()->default_value("127.0.0.1"), "HTTP Proxy listen address") - ("httpproxy.port", value()->default_value(4444), "HTTP Proxy listen port") + ("httpproxy.port", value()->default_value(5555), "HTTP Proxy listen port") ("httpproxy.keys", value()->default_value(""), "File to persist HTTP Proxy keys") ("httpproxy.signaturetype", value()->default_value(dotnet::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519), "Signature type for new keys. 7 (EdDSA) by default") ("httpproxy.inbound.length", value()->default_value("3"), "HTTP proxy inbound tunnel length") @@ -112,7 +112,7 @@ namespace config { socksproxy.add_options() ("socksproxy.enabled", value()->default_value(true), "Enable or disable SOCKS Proxy") ("socksproxy.address", value()->default_value("127.0.0.1"), "SOCKS Proxy listen address") - ("socksproxy.port", value()->default_value(4447), "SOCKS Proxy listen port") + ("socksproxy.port", value()->default_value(5055), "SOCKS Proxy listen port") ("socksproxy.keys", value()->default_value(""), "File to persist SOCKS Proxy keys") ("socksproxy.signaturetype", value()->default_value(dotnet::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519), "Signature type for new keys. 7 (EdDSA) by default") ("socksproxy.inbound.length", value()->default_value("3"), "SOCKS proxy inbound tunnel length") @@ -123,35 +123,35 @@ namespace config { ("socksproxy.latency.max", value()->default_value("0"), "SOCKS proxy max latency for tunnels") ("socksproxy.outproxy.enabled", value()->default_value(false), "Enable or disable SOCKS outproxy") ("socksproxy.outproxy", value()->default_value("127.0.0.1"), "Upstream outproxy address for SOCKS Proxy") - ("socksproxy.outproxyport", value()->default_value(9050), "Upstream outproxy port for SOCKS Proxy") + ("socksproxy.outproxyport", value()->default_value(5505), "Upstream outproxy port for SOCKS Proxy") ; options_description sam("SAM bridge options"); sam.add_options() ("sam.enabled", value()->default_value(true), "Enable or disable SAM Application bridge") ("sam.address", value()->default_value("127.0.0.1"), "SAM listen address") - ("sam.port", value()->default_value(7656), "SAM listen port") + ("sam.port", value()->default_value(50000), "SAM listen port") ; options_description bob("BOB options"); bob.add_options() ("bob.enabled", value()->default_value(false), "Enable or disable BOB command channel") ("bob.address", value()->default_value("127.0.0.1"), "BOB listen address") - ("bob.port", value()->default_value(2827), "BOB listen port") + ("bob.port", value()->default_value(50505), "BOB listen port") ; options_description dncp("DNCP options"); dncp.add_options() ("dncp.enabled", value()->default_value(false), "Enable or disable DNCP") ("dncp.address", value()->default_value("127.0.0.1"), "DNCP listen address") - ("dncp.port", value()->default_value(7654), "DNCP listen port") + ("dncp.port", value()->default_value(50555), "DNCP listen port") ; options_description dotnetcontrol("DotNetControl options"); dotnetcontrol.add_options() ("dotnetcontrol.enabled", value()->default_value(false), "Enable or disable DOTNET Control Protocol") ("dotnetcontrol.address", value()->default_value("127.0.0.1"), "DOTNETCP listen address") - ("dotnetcontrol.port", value()->default_value(7650), "DOTNETCP listen port") + ("dotnetcontrol.port", value()->default_value(55505), "DOTNETCP listen port") ("dotnetcontrol.password", value()->default_value("dotnet"), "DOTNETCP access password") ("dotnetcontrol.cert", value()->default_value("dotnetcontrol.crt.pem"), "DOTNETCP connection certificate") ("dotnetcontrol.key", value()->default_value("dotnetcontrol.key.pem"), "DOTNETCP connection certificate key") @@ -195,7 +195,7 @@ namespace config { options_description addressbook("AddressBook options"); addressbook.add_options() ("addressbook.defaulturl", value()->default_value( - "http://joajgazyztfssty4w2on5oaqksz6tqoxbduy553y34mf4byv6gpq.b32.dotnet/export/alive-hosts.txt" + "http://f26brxp77ydqc7cnjctnj75ktcgjhh3tqqvrgf4a6l25aqk3vp3a.dot.net/export/alive-hosts.txt" ), "AddressBook subscription URL for initial setup") ("addressbook.subscriptions", value()->default_value(""), "AddressBook subscriptions URLs, separated by comma"); @@ -211,7 +211,7 @@ namespace config { websocket.add_options() ("websockets.enabled", value()->default_value(false), "Enable websocket server") ("websockets.address", value()->default_value("127.0.0.1"), "Address to bind websocket server on") - ("websockets.port", value()->default_value(7666), "Port to bind websocket server on") + ("websockets.port", value()->default_value(55555), "Port to bind websocket server on") ; options_description exploratory("Exploratory Options"); diff --git a/libdotnet/Destination.cpp b/libdotnet/Destination.cpp index baa55be4..59cdcd70 100644 --- a/libdotnet/Destination.cpp +++ b/libdotnet/Destination.cpp @@ -1102,7 +1102,7 @@ namespace client return; } - LogPrint (eLogInfo, "Destination: Creating new temporary keys of type for address ", ident, ".b32.dotnet"); + LogPrint (eLogInfo, "Destination: Creating new temporary keys of type for address ", ident, ".dot.net"); memset (m_EncryptionPrivateKey, 0, 256); memset (m_EncryptionPublicKey, 0, 256); dotnet::data::PrivateKeys::GenerateCryptoKeyPair (GetIdentity ()->GetCryptoKeyType (), m_EncryptionPrivateKey, m_EncryptionPublicKey); diff --git a/libdotnet/LeaseSet.h b/libdotnet/LeaseSet.h index 01536a0d..6ba53fc5 100644 --- a/libdotnet/LeaseSet.h +++ b/libdotnet/LeaseSet.h @@ -134,7 +134,7 @@ namespace data public: BlindedPublicKey (std::shared_ptr identity, SigningKeyType blindedKeyType = dotnet::data::SIGNING_KEY_TYPE_REDDSA_SHA512_ED25519); - BlindedPublicKey (const std::string& b33); // from b33 without .b32.dotnet + BlindedPublicKey (const std::string& b33); // from b33 without .dot.net std::string ToB33 () const; const uint8_t * GetPublicKey () const { return m_PublicKey.data (); }; diff --git a/libdotnet_client/AddressBook.cpp b/libdotnet_client/AddressBook.cpp index b01fc19a..fbbfc122 100644 --- a/libdotnet_client/AddressBook.cpp +++ b/libdotnet_client/AddressBook.cpp @@ -318,7 +318,7 @@ namespace client std::shared_ptr AddressBook::GetAddress (const std::string& address) { - auto pos = address.find(".b32.dotnet"); + auto pos = address.find(".dot.net"); if (pos != std::string::npos) return std::make_shared(address.substr (0, pos)); else @@ -332,7 +332,7 @@ namespace client return addr; } } - // if not .b32 we assume full base64 address + // if not .dot.net we assume full base64 address dotnet::data::IdentityEx dest; if (!dest.FromBase64 (address)) return nullptr; @@ -349,7 +349,7 @@ namespace client void AddressBook::InsertAddress (const std::string& address, const std::string& jump) { - auto pos = jump.find(".b32.dotnet"); + auto pos = jump.find(".dot.net"); if (pos != std::string::npos) { m_Addresses[address] = std::make_shared
(jump.substr (0, pos)); diff --git a/libdotnet_client/AddressBook.h b/libdotnet_client/AddressBook.h index 6adb1945..e708dea9 100644 --- a/libdotnet_client/AddressBook.h +++ b/libdotnet_client/AddressBook.h @@ -42,7 +42,7 @@ namespace client bool IsIdentHash () const { return addressType == eAddressIndentHash; }; }; - inline std::string GetB32Address(const dotnet::data::IdentHash& ident) { return ident.ToBase32().append(".b32.dotnet"); } + inline std::string GetB32Address(const dotnet::data::IdentHash& ident) { return ident.ToBase32().append(".dot.net"); } class AddressBookStorage // interface for storage { @@ -83,7 +83,7 @@ namespace client bool LoadHostsFromStream (std::istream& f, bool is_update); void DownloadComplete (bool success, const dotnet::data::IdentHash& subscription, const std::string& etag, const std::string& lastModified); - //This method returns the ".b32.dotnet" address + //This method returns the ".dot.net" address std::string ToAddress(const dotnet::data::IdentHash& ident) { return GetB32Address(ident); } std::string ToAddress(std::shared_ptr ident) { return ToAddress(ident->GetIdentHash ()); } diff --git a/libdotnet_client/DotNetTunnel.h b/libdotnet_client/DotNetTunnel.h index b70134be..c55b29ab 100644 --- a/libdotnet_client/DotNetTunnel.h +++ b/libdotnet_client/DotNetTunnel.h @@ -25,7 +25,7 @@ namespace client // for HTTP tunnels const char X_DOTNET_DEST_HASH[] = "X-DOTNET-DestHash"; // hash in base64 const char X_DOTNET_DEST_B64[] = "X-DOTNET-DestB64"; // full address in base64 - const char X_DOTNET_DEST_B32[] = "X-DOTNET-DestB32"; // .b32.dotnet address + const char X_DOTNET_DEST_B32[] = "X-DOTNET-DestB32"; // .dot.net address class DotNetTunnelConnection: public DotNetServiceHandler, public std::enable_shared_from_this { diff --git a/libdotnet_client/HTTPProxy.cpp b/libdotnet_client/HTTPProxy.cpp index 12e7db41..d6ecb27d 100644 --- a/libdotnet_client/HTTPProxy.cpp +++ b/libdotnet_client/HTTPProxy.cpp @@ -23,13 +23,12 @@ namespace dotnet { namespace proxy { std::map jumpservices = { - { "inr.dotnet", "http://joajgazyztfssty4w2on5oaqksz6tqoxbduy553y34mf4byv6gpq.b32.dotnet/search/?q=" }, - { "stats.dotnet", "http://7tbay5p4kzeekxvyvbf6v7eauazemsnnl2aoyqhg5jzpr5eke7tq.b32.dotnet/cgi-bin/jump.cgi?a=" }, + { "dot.net", "http://f26brxp77ydqc7cnjctnj75ktcgjhh3tqqvrgf4a6l25aqk3vp3a.dot.net/search/?q=" }, }; static const char *pageHead = "\r\n" - " DOTNET HTTP proxy\r\n" + " .NET HTTP proxy\r\n" "