nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.3'

Browse Source
This commit is contained in:
Nick Mathewson 2012-06-23 15:54:33 -04:00
commit 8e5d3cab26
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/checkSpace.pl
View File

@ -36,6 +36,14 @@ for $fn (@ARGV) {
if (($lastline =~ /^\# *else/) and ($_ =~ /^\# *if/)) { if (($lastline =~ /^\# *else/) and ($_ =~ /^\# *if/)) {
print " #else#if:$fn:$.\n"; print " #else#if:$fn:$.\n";
} }
## Warn about some K&R violations
if (/^\s+\{/ and $lastline =~ /^\s*(if|while|for|else if)/ and
$lastline !~ /\{$/) {
print "non-K&R {:$fn:$.\n";
}
if (/^\s*else/ and $lastline =~ /\}$/) {
print " }\\nelse:$fn:$.\n";
}
$lastline = $_; $lastline = $_;
## Warn about unnecessary empty lines. ## Warn about unnecessary empty lines.
if ($lastnil && /^\s*}\n/) { if ($lastnil && /^\s*}\n/) {

3
src/or/circuitbuild.c
View File

@ -5602,8 +5602,7 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node)
/* XXXipv6 we lack support for falling back to another address for /* XXXipv6 we lack support for falling back to another address for
the same relay, warn the user */ the same relay, warn the user */
if (!tor_addr_is_null(&ri->ipv6_addr)) if (!tor_addr_is_null(&ri->ipv6_addr)) {
{
tor_addr_port_t ap; tor_addr_port_t ap;
router_get_pref_orport(ri, &ap); router_get_pref_orport(ri, &ap);
log_notice(LD_CONFIG, log_notice(LD_CONFIG,

3
src/or/main.c
View File

@ -2597,8 +2597,7 @@ tor_main(int argc, char *argv[])
// a file on a folder shared by the wm emulator. // a file on a folder shared by the wm emulator.
// if no flashcard (real or emulated) is present, // if no flashcard (real or emulated) is present,
// log files will be written in the root folder // log files will be written in the root folder
if (find_flashcard_path(path,MAX_PATH) == -1) if (find_flashcard_path(path,MAX_PATH) == -1) {
{
redir = _wfreopen( L"\\stdout.log", L"w", stdout ); redir = _wfreopen( L"\\stdout.log", L"w", stdout );
redirdbg = _wfreopen( L"\\stderr.log", L"w", stderr ); redirdbg = _wfreopen( L"\\stderr.log", L"w", stderr );
} else { } else {

3
src/or/nodelist.c
View File

@ -689,8 +689,7 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t *ap_out)
{ {
if (node->ri) { if (node->ri) {
router_get_prim_orport(node->ri, ap_out); router_get_prim_orport(node->ri, ap_out);
} } else if (node->rs) {
else if (node->rs) {
tor_addr_from_ipv4h(&ap_out->addr, node->rs->addr); tor_addr_from_ipv4h(&ap_out->addr, node->rs->addr);
ap_out->port = node->rs->or_port; ap_out->port = node->rs->or_port;
} }