diff options
| author | Yawning Angel <yawning@schwanenlied.me> | 2014-09-09 18:21:19 +0000 |
|---|---|---|
| committer | Yawning Angel <yawning@schwanenlied.me> | 2014-09-09 18:21:19 +0000 |
| commit | cae44838fecc550f2df16de44b0ef297ecb509a6 (patch) | |
| tree | f03142b8b754d05d11c80eba9807ae48caffe3e1 /src | |
| parent | 60ac9f1c90f6036356f778513f0eb3e2f9760fa3 (diff) | |
| download | tor-cae44838fecc550f2df16de44b0ef297ecb509a6.tar.gz tor-cae44838fecc550f2df16de44b0ef297ecb509a6.zip | |
Fix issues brought up in nickm's review.
* Update pt_get_proxy_uri() documentation.
* proxy_supported is now unsigned.
* Added a changes file.
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/transports.c | 4 | ||||
| -rw-r--r-- | src/or/transports.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/or/transports.c b/src/or/transports.c index eee159d374..8dc2cfd4bd 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -754,7 +754,9 @@ managed_proxy_destroy(managed_proxy_t *mp, tor_free(mp); } -/** Convert the tor proxy options to a URI suitable for TOR_PT_PROXY. */ +/** Convert the tor proxy options to a URI suitable for TOR_PT_PROXY. + * Return a newly allocated string containing the URI, or NULL if no + * proxy is set. */ STATIC char * get_pt_proxy_uri(void) { diff --git a/src/or/transports.h b/src/or/transports.h index bc2331d01b..25fe5a29a9 100644 --- a/src/or/transports.h +++ b/src/or/transports.h @@ -82,7 +82,7 @@ typedef struct { int conf_protocol; /* the configuration protocol version used */ char *proxy_uri; /* the outgoing proxy in TOR_PT_PROXY URI format */ - int proxy_supported : 1; /* the proxy claims to honor TOR_PT_PROXY */ + unsigned int proxy_supported : 1; /* the proxy honors TOR_PT_PROXY */ int is_server; /* is it a server proxy? */ |