- tor-commits - lists.torproject.org

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 10 Mar '16

10 Mar '16

commit 7b60a2c6ec3d442a2eac0b0a5f4d48b07fc0550f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 10 14:46:32 2016 +0000 Update translations for tor-messenger-ircproperties --- pt_BR/irc.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/irc.properties b/pt_BR/irc.properties index 4ee2149..e39cdaa 100644 --- a/pt_BR/irc.properties +++ b/pt_BR/irc.properties @@ -174,7 +174,7 @@ error.sendMessageFailed=Um erro ocorreu ao enviar sua última mensagem. Por favo error.channelForward=Você não pode participar de %1$S, e foi automaticamente redirecionada para %2$S. # %S is the mode that the user tried to set but was not recognized # by the server as a valid mode. -error.unknownMode='%S' is not a valid user mode on this server. +error.unknownMode='%S' não é um modo de usuário válido nesse servidor. # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0

[webwml/master] Deprecate old Tor Browser versions
by gk＠torproject.org 10 Mar '16

10 Mar '16

commit e0af031348584f2ab36b71ba2715a782091f2524 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 10 08:22:27 2016 +0000 Deprecate old Tor Browser versions --- projects/torbrowser/RecommendedTBBVersions | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index aff56d1..1382c17 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -1,22 +1,12 @@ [ -"5.5.2", -"5.5.2-Linux", -"5.5.2-MacOS", -"5.5.2-Windows", "5.5.3", "5.5.3-Linux", "5.5.3-MacOS", "5.5.3-Windows", -"6.0a2", -"6.0a2-Linux", -"6.0a2-MacOS", -"6.0a2-Windows", "6.0a3", "6.0a3-Linux", "6.0a3-MacOS", "6.0a3-Windows", -"6.0a2-hardened", -"6.0a2-hardened-Linux", "6.0a3-hardened", "6.0a3-hardened-Linux" ]

1 0

[snowflake/master] keep readme up to date
by arlo＠torproject.org 09 Mar '16

09 Mar '16

commit d61534b3a01597ce2f9da701a9248e3215f48f05 Author: Serene Han <keroserene+git(a)gmail.com> Date: Tue Mar 8 18:23:28 2016 -0800 keep readme up to date --- README.md | 26 +++++++++++++++----------- client/torrc | 2 +- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 425a07d..1316003 100644 --- a/README.md +++ b/README.md @@ -51,8 +51,9 @@ Proxy: The client uses the following `torrc` options: ``` ClientTransportPlugin snowflake exec ./client \ ---url https://snowflake-reg.appspot.com/ \ ---front www.google.com +-url https://snowflake-reg.appspot.com/ \ +-front www.google.com \ +-ice stun:stun.l.google.com:19302 ``` Which allows it to speak to the Broker, @@ -93,18 +94,21 @@ cd build/ python -m http.server ``` -Open a browser tab to `0.0.0.0:8000/snowflake.html`. - -TODO: Turn the snowflake proxy into a more deployable badge. +Then, open a browser tab to `0.0.0.0:8000/snowflake.html`, +which causes you to act as an ephemeral Tor bridge. ### Appendix ##### -- Testing directly via WebRTC Server -- -Using the server plugin uses an HTTP server that simulates the interaction -that a client would have with a broker. -Using the browser proxy (which will soon be the only way) requires copy and -pasting between 3 terminals and a browser tab. +Ordinarily, the WebrTC client plugin speaks with a Broker which helps +match and signal with a browser proxy, which ultimately speaks with a default +websocket server. + + +However, there is a WebRTC server plugin which uses an HTTP server that +simulates the interaction that a client would have with the broker, for +direct testing. Edit server/torrc and add "-http 127.0.0.1:8080" to the end of the ServerTransportPlugin line: @@ -124,11 +128,11 @@ ClientTransportPlugin line: ClientTransportPlugin snowflake exec ./client -url http://127.0.0.1:8080/ ``` -##### -- Via Browser Proxy -- +##### -- Testing Copy-Paste Via Browser Proxy -- Open up three terminals for the **client:** -A: `tor -f torrc SOCKSPort auto` +A: `tor -f torrc-manual SOCKSPort auto` B: `cat > signal` diff --git a/client/torrc b/client/torrc index b6d0f61..c4af61f 100644 --- a/client/torrc +++ b/client/torrc @@ -4,6 +4,6 @@ DataDirectory datadir ClientTransportPlugin snowflake exec ./client \ -url https://snowflake-reg.appspot.com/ \ -front www.google.com \ --ice stun:stun.l.google.com:19302,stun:s1.taraba.net +-ice stun:stun.l.google.com:19302 Bridge snowflake 0.0.3.0:1

1 0

[snowflake/master] retry client offers immediately instead of reset, combine sendOffer and receiveAnswer into exchangeSDP
by arlo＠torproject.org 09 Mar '16

09 Mar '16

commit 960a136c64e3ad2170289ca1d2b4003656df2a5f Author: Serene Han <keroserene+git(a)gmail.com> Date: Tue Mar 8 19:37:10 2016 -0800 retry client offers immediately instead of reset, combine sendOffer and receiveAnswer into exchangeSDP --- client/client_test.go | 31 +++++++++++------- client/snowflake.go | 4 --- client/webrtc.go | 91 +++++++++++++++++++++++++++------------------------ 3 files changed, 67 insertions(+), 59 deletions(-) diff --git a/client/client_test.go b/client/client_test.go index a3fe078..5e683ba 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -4,9 +4,8 @@ import ( "bytes" "github.com/keroserene/go-webrtc" . "github.com/smartystreets/goconvey/convey" - "net/http" - // "net/http/httptest" "io/ioutil" + "net/http" "strings" "testing" ) @@ -53,7 +52,6 @@ func TestConnect(t *testing.T) { Convey("WebRTC Connection", func() { c := new(webRTCConn) - c.BytesInfo = &BytesInfo{ inboundChan: make(chan int), outboundChan: make(chan int), inbound: 0, outbound: 0, inEvents: 0, outEvents: 0, @@ -76,22 +74,31 @@ func TestConnect(t *testing.T) { So(mock.destination.Bytes(), ShouldResemble, []byte("test")) }) - Convey("Receive answer sets remote description", func() { - c.answerChannel = make(chan *webrtc.SessionDescription) + Convey("Exchange SDP sets remote description", func() { + c.offerChannel = make(chan *webrtc.SessionDescription, 1) + c.answerChannel = make(chan *webrtc.SessionDescription, 1) + c.config = webrtc.NewConfiguration() c.preparePeerConnection() - c.receiveAnswer() - sdp := webrtc.DeserializeSessionDescription("test") - c.answerChannel <- sdp - So(c.pc.RemoteDescription(), ShouldEqual, sdp) + // offer := webrtc.DeserializeSessionDescription( + // `{"type":"offer","sdp":"test offer"}`) + // c.pc.SetLocalDescription(offer) + c.offerChannel <- nil + answer := webrtc.DeserializeSessionDescription( + `{"type":"answer","sdp":""}`) + c.answerChannel <- answer + c.exchangeSDP() + // So(c.pc.RemoteDescription(), ShouldEqual, answer) }) - Convey("Receive answer fails on nil answer", func() { + SkipConvey("Exchange SDP fails on nil answer", func() { c.reset = make(chan struct{}) - c.answerChannel = make(chan *webrtc.SessionDescription) - c.receiveAnswer() + c.offerChannel = make(chan *webrtc.SessionDescription, 1) + c.answerChannel = make(chan *webrtc.SessionDescription, 1) + c.offerChannel <- nil c.answerChannel <- nil + c.exchangeSDP() <-c.reset }) diff --git a/client/snowflake.go b/client/snowflake.go index f10c50e..652032a 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -47,8 +47,6 @@ func copyLoop(a, b net.Conn) { wg.Done() }() wg.Wait() - // a.Close() - // b.Close() log.Println("copy loop ended") } @@ -108,9 +106,7 @@ func handler(conn *pt.SocksConn) error { // TODO: Make SOCKS acceptance more independent from WebRTC so they can // be more easily interchanged. - copyLoop(conn, remote) - // <-remote.endChannel log.Println("----END---") return nil } diff --git a/client/webrtc.go b/client/webrtc.go index e2e8280..a77d4a8 100644 --- a/client/webrtc.go +++ b/client/webrtc.go @@ -19,7 +19,6 @@ type webRTCConn struct { offerChannel chan *webrtc.SessionDescription answerChannel chan *webrtc.SessionDescription errorChannel chan error - endChannel chan struct{} recvPipe *io.PipeReader writePipe *io.PipeWriter buffer bytes.Buffer @@ -52,8 +51,6 @@ func (c *webRTCConn) Close() error { close(c.offerChannel) close(c.answerChannel) close(c.errorChannel) - // c.writePipe.Close() - // c.recvPipe.Close() return err } @@ -85,7 +82,6 @@ func NewWebRTCConnection(config *webrtc.Configuration, connection.offerChannel = make(chan *webrtc.SessionDescription, 1) connection.answerChannel = make(chan *webrtc.SessionDescription, 1) connection.errorChannel = make(chan error, 1) - connection.endChannel = make(chan struct{}, 1) connection.reset = make(chan struct{}, 1) // Log every few seconds. @@ -112,8 +108,7 @@ func (c *webRTCConn) ConnectLoop() { if err != nil { log.Println("WebRTC: Could not establish DataChannel.") } else { - c.sendOffer() - c.receiveAnswer() + go c.exchangeSDP() <-c.reset log.Println(" --- snowflake connection reset ---") } @@ -185,6 +180,7 @@ func (c *webRTCConn) establishDataChannel() error { dc.OnOpen = func() { log.Println("WebRTC: DataChannel.OnOpen") if nil != c.snowflake { + log.Println("PeerConnection snowflake already exists.") panic("PeerConnection snowflake already exists.") } // Flush buffered outgoing SOCKS data if necessary. @@ -207,15 +203,14 @@ func (c *webRTCConn) establishDataChannel() error { // Disable the DataChannel as a write destination. log.Println("WebRTC: DataChannel.OnClose [remotely]") c.snowflake = nil - // TODO: Need a way to update the circuit so that when a new WebRTC + // TODO(issue #12): Need a way to update the circuit so that when a new WebRTC // data channel is available, the relay actually recognizes the new - // snowflake? + // snowflake. c.Reset() } dc.OnMessage = func(msg []byte) { - // log.Println("ONMESSAGE: ", len(msg)) if len(msg) <= 0 { - log.Println("0 length---") + log.Println("0 length message---") } c.BytesInfo.AddInbound(len(msg)) n, err := c.writePipe.Write(msg) @@ -225,6 +220,7 @@ func (c *webRTCConn) establishDataChannel() error { c.writePipe.CloseWithError(err) } if n != len(msg) { + log.Println("Error: short write") panic("short write") } } @@ -232,57 +228,63 @@ func (c *webRTCConn) establishDataChannel() error { return nil } -// Block until an offer is available, then send it to either -// the Broker or signal pipe. -func (c *webRTCConn) sendOffer() error { +func (c *webRTCConn) sendOfferToBroker() { + if "" == brokerURL { + return + } + offer := c.pc.LocalDescription() + log.Println("Sending offer via BrokerChannel...\nTarget URL: ", brokerURL, + "\nFront URL: ", frontDomain) + answer, err := c.broker.Negotiate(offer) + if nil != err || nil == answer { + log.Printf("BrokerChannel error: %s", err) + answer = nil + } + c.answerChannel <- answer +} + +// Block until an SDP offer is available, send it to either +// the Broker or signal pipe, then await for the SDP answer. +func (c *webRTCConn) exchangeSDP() error { select { case offer := <-c.offerChannel: + // Display for copy-paste, when no broker available. if "" == brokerURL { log.Printf("Please Copy & Paste the following to the peer:") log.Printf("----------------") log.Printf("\n" + offer.Serialize() + "\n") log.Printf("----------------") - return nil } - // Otherwise, use Broker. - go func() { - log.Println("Sending offer via BrokerChannel...\nTarget URL: ", brokerURL, - "\nFront URL: ", frontDomain) - answer, err := c.broker.Negotiate(c.pc.LocalDescription()) - if nil != err || nil == answer { - log.Printf("BrokerChannel error: %s", err) - answer = nil - } - c.answerChannel <- answer - }() case err := <-c.errorChannel: - c.pc.Close() + log.Println("Failed to prepare offer", err) + c.Reset() return err } - return nil -} - -func (c *webRTCConn) receiveAnswer() { - go func() { - answer, ok := <-c.answerChannel + // Keep trying the same offer until a valid answer arrives. + var ok bool + var answer *webrtc.SessionDescription = nil + for nil == answer { + go c.sendOfferToBroker() + answer, ok = <-c.answerChannel // Blocks... if !ok || nil == answer { log.Printf("Failed to retrieve answer. Retrying in %d seconds", ReconnectTimeout) <-time.After(time.Second * ReconnectTimeout) - c.Reset() - return - } - log.Printf("Received Answer:\n\n%s\n", answer.Sdp) - err := c.pc.SetRemoteDescription(answer) - if nil != err { - log.Printf("webrtc: Unable to SetRemoteDescription.") - c.errorChannel <- err + answer = nil } - }() + } + + log.Printf("Received Answer:\n\n%s\n", answer.Sdp) + err := c.pc.SetRemoteDescription(answer) + if nil != err { + log.Println("webrtc: Unable to SetRemoteDescription:", err) + // c.errorChannel <- err + } + return nil } func (c *webRTCConn) Reset() { go func() { - c.reset <- struct{}{} // Attempt to negotiate a new datachannel.. + c.reset <- struct{}{} log.Println("WebRTC resetting...") }() } @@ -298,7 +300,10 @@ func (c *webRTCConn) cleanup() { } if nil != c.pc { log.Printf("WebRTC: closing PeerConnection") - c.pc.Close() + err := c.pc.Close() + if nil != err { + log.Printf("Error closing peerconnection...") + } c.pc = nil } }

1 0

[snowflake/master] Update for go1.6
by arlo＠torproject.org 09 Mar '16

09 Mar '16

commit e5f284ca56d92b1d4b48c1265e065486fea70396 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Mar 9 13:08:36 2016 -0800 Update for go1.6 --- .travis.yml | 1 + README.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6b49a19..ec7038a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: go go: - 1.5 + - 1.6 env: - TRAVIS_NODE_VERSION="4.1" diff --git a/README.md b/README.md index 1316003..714055b 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ This should start the client plugin, bootstrapping to 100% using WebRTC. Client: - [go-webrtc](https://github.com/keroserene/go-webrtc). -- Go 1.5.* (1.6 is not yet supported. See [Issue #22](https://github.com/keroserene/snowflake/issues/22)) +- Go 1.5+ Proxy: - [CoffeeScript](coffeescript.org)

1 0

[orbot/master] update with commit tag for v15.1.3 beta 1
by n8fr8＠torproject.org 09 Mar '16

09 Mar '16

commit 8e7a8111a9ca129de40a824236d381f669f81805 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Mar 9 15:50:07 2016 -0500 update with commit tag for v15.1.3 beta 1 --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 777e53e..b657ebe 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,6 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ -/** 15.1.3 **/ +/** 15.1.3 BETA 1 / 9-March-2016 / 6452075d46d7a6dd65d026dfeffcb190ff993198 **/ Important fixes for VPN mode

1 0

[orbot/master] update changelog
by n8fr8＠torproject.org 09 Mar '16

09 Mar '16

commit d6eccc3138fef1254b7be11c0d657690ac195e2c Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Mar 9 15:35:55 2016 -0500 update changelog --- CHANGELOG | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 144b6c1..777e53e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,18 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +/** 15.1.3 **/ + +Important fixes for VPN mode + +9097b79 Move OrbotVPNService to a Manager and consolidate services This allows for the VPN service to be set in the foreground with th +cec82ec VPN code cleanup and ensure DNS is listening on all interfaces +4892f93 DNS lookup through pdnsd should loop back into Tor DNS port While the TCP query to Google DNS before provided more robust DNS + +... and one for Briar and other apps with their own tor daemon + +2973eac change how we look for processes to kill. fixes tor trac #18502 + + /** 15.1.2 / 24-February-2016 / 204733a245d6c06fa73301134e2f107c0c4564b8 **/ 5785593 move to using meek_lite mode from obfs4client and update/improve proxying code

1 0

[orbot/master] DNS lookup through pdnsd should loop back into Tor DNS port
by n8fr8＠torproject.org 09 Mar '16

09 Mar '16

commit 4892f9353136baf0b00974fdb02176ca784498ff Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Mar 7 13:52:52 2016 -0500 DNS lookup through pdnsd should loop back into Tor DNS port While the TCP query to Google DNS before provided more robust DNS services, it could still leak outside the VPN service based on platform version and other circumstances. By using PDNSD as a proxy back into Tor's limited DNS service, we ensure DNS does not leak. --- res/values/pdnsd.xml | 3 ++- src/org/torproject/android/service/TorService.java | 5 ++++- src/org/torproject/android/vpn/OrbotVpnService.java | 6 ++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/res/values/pdnsd.xml b/res/values/pdnsd.xml index cb4e802..42834d2 100644 --- a/res/values/pdnsd.xml +++ b/res/values/pdnsd.xml @@ -6,12 +6,13 @@ global { cache_dir="/data/data/org.torproject.android/app_bin"; server_port = 8091; server_ip = 0.0.0.0; - query_method=tcp_only; + query_method=udp_only; min_ttl=15m; max_ttl=1w; timeout=10; daemon=on; pid_file="/data/data/org.torproject.android/app_bin/pdnsd.pid"; + } server { diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 627f2e9..0a66fd4 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -649,7 +649,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon extraLines.append("TransPort ").append(transPort).append('\n'); extraLines.append("DNSPort ").append(dnsPort).append("\n"); - + + if (Prefs.useVpn()) + extraLines.append("DNSListenAddress 0.0.0.0").append('\n'); + if (Prefs.transparentTethering()) { extraLines.append("TransListenAddress 0.0.0.0").append('\n'); diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index c9247c2..c5f6b82 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -78,7 +78,9 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { private final static boolean mIsLollipop = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP; //this is the actual DNS server we talk with over TCP/IP - private final static String DEFAULT_ACTUAL_DNS = "8.8.8.8";//use Google here, or 8.8.4.4 as backup? + private final static String DEFAULT_ACTUAL_DNS_HOST = "127.0.0.1";//"8.8.8.8";//use Google here, or 8.8.4.4 as backup? + private final static int DEFAULT_ACTUAL_DNS_PORT = TorServiceConstants.TOR_DNS_PORT_DEFAULT; + private boolean isRestart = false; @@ -288,7 +290,7 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { } //start PDNSD daemon pointing to OpenDNS - startDNS(DEFAULT_ACTUAL_DNS,53); + startDNS(DEFAULT_ACTUAL_DNS_HOST,DEFAULT_ACTUAL_DNS_PORT); final String vpnName = "OrbotVPN"; final String localhost = "127.0.0.1";

1 0

[orbot/master] VPN code cleanup and ensure DNS is listening on all interfaces
by n8fr8＠torproject.org 09 Mar '16

09 Mar '16

commit cec82ec0de0535417b8e8f21b4b1a88e9300fe12 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Mar 7 14:02:07 2016 -0500 VPN code cleanup and ensure DNS is listening on all interfaces --- src/org/torproject/android/service/TorService.java | 42 ++-------------------- .../torproject/android/vpn/OrbotVpnService.java | 4 +-- 2 files changed, 4 insertions(+), 42 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 0a66fd4..06636ed 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -776,13 +776,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon shellRoot.close(); } - /** - if (Prefs.useVpn()) //we need to turn on VPN here so the proxy is running - { - enableVpnProxy(); - }*/ - - getHiddenServiceHostname (); } else @@ -1204,6 +1197,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon Prefs.putUseVpn(true); processTransparentProxying(); + updateConfiguration("DNSPort",TOR_VPN_DNS_LISTEN_ADDRESS + ":" + TorServiceConstants.TOR_DNS_PORT_DEFAULT,false); + Intent intent = new Intent(TorService.this, OrbotVpnService.class); intent.setAction("start"); @@ -1213,36 +1208,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } - public void refreshVpnProxy () { - - debug ("refreshing VPN Proxy"); - - try - { - conn.setConf("DisableNetwork", "1"); - - Intent intent = new Intent(TorService.this, OrbotVpnService.class); - intent.setAction("refresh"); - startService(intent); - - //updateConfiguration("DNSPort",TOR_VPN_DNS_LISTEN_ADDRESS + ":" + TorServiceConstants.TOR_DNS_PORT_DEFAULT,false); - //updateConfiguration("DNSPort",TorServiceConstants.TOR_DNS_PORT_DEFAULT+"",false); - updateConfiguration("DisableNetwork","0", false); - - saveConfiguration(); - - - conn.setConf("DisableNetwork", "0"); - } - catch (Exception ioe) - { - Log.e(TAG,"error restarting network",ioe); - } - - } - - - public void clearVpnProxy () { debug ("clearing VPN Proxy"); @@ -1853,9 +1818,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon shell.close(); } - // else if (Prefs.useVpn()) //we need to turn on VPN here so the proxy is running - // refreshVpnProxy(); - } } diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index c5f6b82..6540f02 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -77,8 +77,8 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { private final static boolean mIsLollipop = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP; - //this is the actual DNS server we talk with over TCP/IP - private final static String DEFAULT_ACTUAL_DNS_HOST = "127.0.0.1";//"8.8.8.8";//use Google here, or 8.8.4.4 as backup? + //this is the actual DNS server we talk to over UDP or TCP (now using Tor's DNS port) + private final static String DEFAULT_ACTUAL_DNS_HOST = "127.0.0.1"; private final static int DEFAULT_ACTUAL_DNS_PORT = TorServiceConstants.TOR_DNS_PORT_DEFAULT; private boolean isRestart = false;

1 0

[orbot/master] change how we look for processes to kill. fixes tor trac #18502
by n8fr8＠torproject.org 09 Mar '16

09 Mar '16

commit 2973eaccd8987070af485e7f8b391404557534d2 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Mar 8 13:05:35 2016 -0500 change how we look for processes to kill. fixes tor trac #18502 --- src/org/torproject/android/service/TorService.java | 9 --------- src/org/torproject/android/service/TorServiceUtils.java | 6 ++---- src/org/torproject/android/vpn/OrbotVpnService.java | 5 +++-- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 06636ed..95192c6 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -488,15 +488,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon cannotKillFile = OrbotApp.fileObfsclient; } - /** - try { - TorServiceUtils.killProcess(OrbotApp.fileMeekclient); - } catch (IOException e) { - e.printStackTrace(); - cannotKillFile = OrbotApp.fileMeekclient; - } - */ - try { TorServiceUtils.killProcess(OrbotApp.filePolipo); } catch (IOException e) { diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index 8549eda..9a072b9 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -85,9 +85,7 @@ public class TorServiceUtils implements TorServiceConstants { Process procPs = null; - String processKey = new File(command).getName(); - - procPs = r.exec(SHELL_CMD_PS + ' ' + processKey); // this is the android ps <name> command + procPs = r.exec(SHELL_CMD_PS); // this is the android ps <name> command BufferedReader reader = new BufferedReader(new InputStreamReader(procPs.getInputStream())); String line = null; @@ -97,7 +95,7 @@ public class TorServiceUtils implements TorServiceConstants { if (line.contains("PID")) continue; - if (line.contains('/' + processKey)) + if (line.contains(command)) { String[] lineParts = line.split("\\s+"); diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index 6540f02..2efab1c 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -384,12 +384,13 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { @Override public void onRevoke() { + Log.w(TAG,"VPNService REVOKED!"); + if (!isRestart) { SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); prefs.edit().putBoolean("pref_vpn", false).commit(); - stopVPN(); - + stopVPN(); } isRestart = false;

1 0