mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-12 09:25:03 +00:00
Code Issues Releases Wiki Activity

(libT) copyediting: indentation/whitespace in rpc-server.c

Browse source
This commit is contained in:
Jordan Lee 2013-02-02 16:22:21 +00:00
parent 1f2bccd17b
commit 273e0a4504
1 changed files with 539 additions and 527 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
libtransmission/rpc-server.c
View file

@ -218,12 +218,15 @@ handle_upload (struct evhttp_request * req,
n = tr_ptrArraySize (&parts);
/* first look for the session id */
for (i=0; i<n; ++i) {
for (i=0; i<n; ++i)
{
struct tr_mimepart * p = tr_ptrArrayNth (&parts, i);
if (tr_memmem (p->headers, p->headers_len, TR_RPC_SESSION_ID_HEADER, strlen (TR_RPC_SESSION_ID_HEADER)))
break;
}
if (i<n) {
if (i<n)
{
const struct tr_mimepart * p = tr_ptrArrayNth (&parts, i);
const char * ours = get_current_session_id (server);
const int ourlen = strlen (ours);
@ -301,8 +304,7 @@ mimetype_guess (const char * path)
{
unsigned int i;
const struct
{
const struct {
const char * suffix;
const char * mime_type;
} types[] = {
@ -324,8 +326,10 @@ mimetype_guess (const char * path)
}
static void
add_response (struct evhttp_request * req, struct tr_rpc_server * server,
struct evbuffer * out, struct evbuffer * content)
add_response (struct evhttp_request * req,
struct tr_rpc_server * server,
struct evbuffer * out,
struct evbuffer * content)
{
#ifndef HAVE_ZLIB
evbuffer_add_buffer (out, content);
@ -400,7 +404,9 @@ add_response (struct evhttp_request * req, struct tr_rpc_server * server,
}
static void
add_time_header (struct evkeyvalq * headers, const char * key, time_t value)
add_time_header (struct evkeyvalq * headers,
const char * key,
time_t value)
{
/* According to RFC 2616 this must follow RFC 1123's date format,
so use gmtime instead of localtime... */
@ -411,7 +417,9 @@ add_time_header (struct evkeyvalq * headers, const char * key, time_t value)
}
static void
evbuffer_ref_cleanup_tr_free (const void * data UNUSED, size_t datalen UNUSED, void * extra)
evbuffer_ref_cleanup_tr_free (const void * data UNUSED,
size_t datalen UNUSED,
void * extra)
{
tr_free (extra);
}
@ -535,8 +543,7 @@ rpc_response_func (tr_session * session UNUSED,
static void
handle_rpc (struct evhttp_request * req,
struct tr_rpc_server * server)
handle_rpc (struct evhttp_request * req, struct tr_rpc_server * server)
{
struct rpc_response_data * data = tr_new0 (struct rpc_response_data, 1);
@ -560,8 +567,7 @@ handle_rpc (struct evhttp_request * req,
}
static bool
isAddressAllowed (const tr_rpc_server * server,
const char * address)
isAddressAllowed (const tr_rpc_server * server, const char * address)
{
tr_list * l;
@ -689,7 +695,6 @@ startServer (void * vserver)
server->httpd = evhttp_new (server->session->event_base);
evhttp_bind_socket (server->httpd, tr_address_to_string (&addr), server->port);
evhttp_set_gencb (server->httpd, handle_request, server);
}
}
@ -793,7 +798,8 @@ tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr)
tr_free (tmp);
/* build the new whitelist entries */
for (walk=whitelistStr; walk && *walk;) {
for (walk=whitelistStr; walk && *walk;)
{
const char * delimiters = " ,;";
const size_t len = strcspn (walk, delimiters);
char * token = tr_strndup (walk, len);
@ -805,6 +811,7 @@ tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr)
if (walk[len]=='\0')
break;
walk += len + 1;
}
}
@ -988,13 +995,18 @@ tr_rpcInit (tr_session * session, tr_variant * settings)
tr_rpcSetPassword (s, str);
key = TR_KEY_rpc_bind_address;
if (!tr_variantDictFindStr (settings, key, &str, NULL)) {
if (!tr_variantDictFindStr (settings, key, &str, NULL))
{
missing_settings_key (key);
address = tr_inaddr_any;
} else if (!tr_address_from_string (&address, str)) {
}
else if (!tr_address_from_string (&address, str))
{
tr_logAddNamedError (MY_NAME, _("%s is not a valid address"), str);
address = tr_inaddr_any;
} else if (address.type != TR_AF_INET) {
}
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;
}