Unverified Commit eb581755 authored by Georg Koppen's avatar Georg Koppen
Browse files

Merge remote-tracking branch 'gitlab/merge-requests/9'

parents 97c7e5d0 b0171e40
...@@ -62,6 +62,10 @@ sub monitor_bootstrap { ...@@ -62,6 +62,10 @@ sub monitor_bootstrap {
print $sock 'AUTHENTICATE "', $control_passwd, "\"\n"; print $sock 'AUTHENTICATE "', $control_passwd, "\"\n";
my $r = <$sock>; my $r = <$sock>;
exit_error "Authentication error: $r" unless $r =~ m/^250 OK/; exit_error "Authentication error: $r" unless $r =~ m/^250 OK/;
print $sock "SETCONF DisableNetwork=0\n";
$r = <$sock>;
exit_error "SETCONF DisableNetwork=0 error: $r" unless $r =~ m/^250 OK/;
my $i = 0; my $i = 0;
while (1) { while (1) {
print $sock "GETINFO status/bootstrap-phase\n"; print $sock "GETINFO status/bootstrap-phase\n";
...@@ -162,7 +166,8 @@ sub start_tor { ...@@ -162,7 +166,8 @@ sub start_tor {
'GeoIPFile', winpath($tbbinfos->{torgeoip}), 'GeoIPFile', winpath($tbbinfos->{torgeoip}),
'ClientOnionAuthDir', winpath("$tbbinfos->{datadir}/Tor/onion-auth"), 'ClientOnionAuthDir', winpath("$tbbinfos->{datadir}/Tor/onion-auth"),
'__SocksPort', "$options->{'tor-socks-port'} ExtendedErrors IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth", '__SocksPort', "$options->{'tor-socks-port'} ExtendedErrors IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth",
'__OwningControllerProcess', winpid($$)); '__OwningControllerProcess', winpid($$),
'DisableNetwork', '1');
$tbbinfos->{torpid} = fork; $tbbinfos->{torpid} = fork;
if ($tbbinfos->{torpid} == 0) { if ($tbbinfos->{torpid} == 0) {
$ENV{LD_LIBRARY_PATH} = "$tbbinfos->{tbbdir}:$tbbinfos->{tordir}"; $ENV{LD_LIBRARY_PATH} = "$tbbinfos->{tbbdir}:$tbbinfos->{tordir}";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment