nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename _UseFilteringSSLBufferevents to lose its _. Bug 3155

Browse Source
This commit is contained in:
Nick Mathewson 2012-09-10 10:09:19 -04:00
parent 38f3f3baf9
commit 20e0e7d9d1
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changes/bug3155
View File

@ -2,3 +2,5 @@
- Rename the (internal-use-only) UsingTestingNetworkDefaults option - Rename the (internal-use-only) UsingTestingNetworkDefaults option
to start with a triple-underscore so the controller won't touch it. to start with a triple-underscore so the controller won't touch it.
Patch by Meejah. Fixes bug 3155. Bugfix on 0.2.2.23-alpha. Patch by Meejah. Fixes bug 3155. Bugfix on 0.2.2.23-alpha.
- Rename the (testing-use-only) _UseFilteringSSLBufferevents option
so it doesn't start with _. Fixes bug3155. Bugfix on 0.2.3.1-alpha.

3
src/or/config.c
View File

@ -130,6 +130,7 @@ static config_abbrev_t _option_abbrevs[] = {
{ "HashedControlPassword", "__HashedControlSessionPassword", 1, 0}, { "HashedControlPassword", "__HashedControlSessionPassword", 1, 0},
{ "StrictEntryNodes", "StrictNodes", 0, 1}, { "StrictEntryNodes", "StrictNodes", 0, 1},
{ "StrictExitNodes", "StrictNodes", 0, 1}, { "StrictExitNodes", "StrictNodes", 0, 1},
{ "_UseFilteringSSLBufferevents", "UseFilteringSSLBufferevents", 0, 1},
{ NULL, NULL, 0, 0}, { NULL, NULL, 0, 0},
}; };
@ -449,7 +450,7 @@ static config_var_t _option_vars[] = {
VAR("VersioningAuthoritativeDirectory",BOOL,VersioningAuthoritativeDir, "0"), VAR("VersioningAuthoritativeDirectory",BOOL,VersioningAuthoritativeDir, "0"),
V(VirtualAddrNetwork, STRING, "127.192.0.0/10"), V(VirtualAddrNetwork, STRING, "127.192.0.0/10"),
V(WarnPlaintextPorts, CSV, "23,109,110,143"), V(WarnPlaintextPorts, CSV, "23,109,110,143"),
V(_UseFilteringSSLBufferevents, BOOL, "0"), V(UseFilteringSSLBufferevents, BOOL, "0"),
VAR("__ReloadTorrcOnSIGHUP", BOOL, ReloadTorrcOnSIGHUP, "1"), VAR("__ReloadTorrcOnSIGHUP", BOOL, ReloadTorrcOnSIGHUP, "1"),
VAR("__AllDirActionsPrivate", BOOL, AllDirActionsPrivate, "0"), VAR("__AllDirActionsPrivate", BOOL, AllDirActionsPrivate, "0"),
VAR("__DisablePredictedCircuits",BOOL,DisablePredictedCircuits, "0"), VAR("__DisablePredictedCircuits",BOOL,DisablePredictedCircuits, "0"),

2
src/or/connection_or.c
View File

@ -1152,7 +1152,7 @@ connection_tls_start_handshake(or_connection_t *conn, int receiving)
#ifdef USE_BUFFEREVENTS #ifdef USE_BUFFEREVENTS
if (connection_type_uses_bufferevent(TO_CONN(conn))) { if (connection_type_uses_bufferevent(TO_CONN(conn))) {
const int filtering = get_options()->_UseFilteringSSLBufferevents; const int filtering = get_options()->UseFilteringSSLBufferevents;
struct bufferevent *b = struct bufferevent *b =
tor_tls_init_bufferevent(conn->tls, conn->_base.bufev, conn->_base.s, tor_tls_init_bufferevent(conn->tls, conn->_base.bufev, conn->_base.s,
receiving, filtering); receiving, filtering);

4
src/or/or.h
View File

@ -3578,8 +3578,8 @@ typedef struct {
/** If true, do not enable IOCP on windows with bufferevents, even if /** If true, do not enable IOCP on windows with bufferevents, even if
* we think we could. */ * we think we could. */
int DisableIOCP; int DisableIOCP;
/** For testing only: will go away in 0.2.3.x. */ /** For testing only: will go away eventually. */
int _UseFilteringSSLBufferevents; int UseFilteringSSLBufferevents;
/** Set to true if the TestingTorNetwork configuration option is set. /** Set to true if the TestingTorNetwork configuration option is set.
* This is used so that options_validate() has a chance to realize that * This is used so that options_validate() has a chance to realize that