Skip to content

Instantly share code, notes, and snippets.

@slokhorst
Created October 10, 2016 12:09
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save slokhorst/ce498cca9c6354080e9e49f7057ad3e6 to your computer and use it in GitHub Desktop.
Save slokhorst/ce498cca9c6354080e9e49f7057ad3e6 to your computer and use it in GitHub Desktop.
diff --git a/libtransmission/rpc-server.c b/libtransmission/rpc-server.c
index e86a4a3..e32fe36 100644
--- a/libtransmission/rpc-server.c
+++ b/libtransmission/rpc-server.c
@@ -54,7 +54,7 @@ struct tr_rpc_server
bool isWhitelistEnabled;
tr_port port;
char * url;
- struct in_addr bindAddress;
+ struct in6_addr bindAddress;
struct evhttp * httpd;
struct event * start_retry_timer;
int start_retry_counter;
@@ -638,7 +638,7 @@ handle_request (struct evhttp_request * req, void * arg)
{
handle_upload (req, server);
}
-#ifdef REQUIRE_SESSION_ID
+#if 0
else if (!test_session_id (server, req))
{
const char * sessionId = get_current_session_id (server);
@@ -960,8 +960,8 @@ const char *
tr_rpcGetBindAddress (const tr_rpc_server * server)
{
tr_address addr;
- addr.type = TR_AF_INET;
- addr.addr.addr4 = server->bindAddress;
+ addr.type = TR_AF_INET6;
+ addr.addr.addr6 = server->bindAddress;
return tr_address_to_string (&addr);
}
@@ -1073,22 +1073,17 @@ tr_rpcInit (tr_session * session, tr_variant * settings)
tr_logAddNamedError (MY_NAME, _("%s is not a valid address"), str);
address = tr_inaddr_any;
}
- else if (address.type != TR_AF_INET)
- {
- tr_logAddNamedError (MY_NAME, _("%s is not an IPv4 address. RPC listeners must be IPv4"), str);
- address = tr_inaddr_any;
- }
- s->bindAddress = address.addr.addr4;
+ s->bindAddress = in6addr_any;
if (s->isEnabled)
{
tr_logAddNamedInfo (MY_NAME, _("Serving RPC and Web requests on port 127.0.0.1:%d%s"), (int) s->port, s->url);
tr_runInEventThread (session, startServer, s);
- if (s->isWhitelistEnabled)
+ if (0)
tr_logAddNamedInfo (MY_NAME, "%s", _("Whitelist enabled"));
- if (s->isPasswordEnabled)
+ if (0)
tr_logAddNamedInfo (MY_NAME, "%s", _("Password required"));
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment