June 2016 - tor-commits - lists.torproject.org

[snowflake/master] able to break out of ConnectLoop, try separate webrtcConfigs as well
by serene＠torproject.org 13 Jun '16

13 Jun '16

commit a71c98c0aef198e7cf7308dee414e3e17a14059b Author: Serene Han <keroserene+git(a)gmail.com> Date: Mon Jun 13 15:11:55 2016 -0700 able to break out of ConnectLoop, try separate webrtcConfigs as well --- client/client_test.go | 11 ++++++----- client/interfaces.go | 3 +++ client/peers.go | 23 +++++++++++++++++++---- client/rendezvous.go | 11 +++++++---- client/snowflake.go | 16 ++++++++++------ client/webrtc.go | 49 +++++++++++++++++++++++---------------------… [View More]----- 6 files changed, 68 insertions(+), 45 deletions(-) diff --git a/client/client_test.go b/client/client_test.go index 87fb2cb..41d4870 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -65,8 +65,9 @@ func (f FakeSocksConn) Grant(addr *net.TCPAddr) error { return nil } type FakePeers struct{ toRelease *webRTCConn } -func (f FakePeers) Collect() error { return nil } -func (f FakePeers) Pop() Snowflake { return nil } +func (f FakePeers) Collect() error { return nil } +func (f FakePeers) Pop() Snowflake { return nil } +func (f FakePeers) Melted() <-chan struct{} { return nil } func TestSnowflakeClient(t *testing.T) { @@ -144,6 +145,7 @@ func TestSnowflakeClient(t *testing.T) { } So(p.Count(), ShouldEqual, cnt) p.End() + <-p.Melted() So(p.Count(), ShouldEqual, 0) }) @@ -168,7 +170,6 @@ func TestSnowflakeClient(t *testing.T) { Convey("Can construct a WebRTCConn", func() { s := NewWebRTCConnection(nil, nil) So(s, ShouldNotBeNil) - So(s.index, ShouldEqual, 0) So(s.offerChannel, ShouldNotBeNil) So(s.answerChannel, ShouldNotBeNil) s.Close() @@ -176,13 +177,13 @@ func TestSnowflakeClient(t *testing.T) { Convey("Write buffers when datachannel is nil", func() { c.Write([]byte("test")) - c.snowflake = nil + c.transport = nil So(c.buffer.Bytes(), ShouldResemble, []byte("test")) }) Convey("Write sends to datachannel when not nil", func() { mock := new(MockDataChannel) - c.snowflake = mock + c.transport = mock mock.done = make(chan bool, 1) c.Write([]byte("test")) <-mock.done diff --git a/client/interfaces.go b/client/interfaces.go index 4fb0dcf..502eefb 100644 --- a/client/interfaces.go +++ b/client/interfaces.go @@ -38,6 +38,9 @@ type SnowflakeCollector interface { // Remove and return the most available Snowflake from the collection. Pop() Snowflake + + // Signal when the collector has stopped collecting. + Melted() <-chan struct{} } // Interface to adapt to goptlib's SocksConn struct. diff --git a/client/peers.go b/client/peers.go index eb435fd..74b804f 100644 --- a/client/peers.go +++ b/client/peers.go @@ -25,6 +25,8 @@ type Peers struct { snowflakeChan chan Snowflake activePeers *list.List capacity int + + melt chan struct{} } // Construct a fresh container of remote peers. @@ -33,17 +35,19 @@ func NewPeers(max int) *Peers { // Use buffered go channel to pass snowflakes onwards to the SOCKS handler. p.snowflakeChan = make(chan Snowflake, max) p.activePeers = list.New() + p.melt = make(chan struct{}, 1) return p } // As part of |SnowflakeCollector| interface. func (p *Peers) Collect() error { - cnt := p.Count() + s := fmt.Sprintf("Currently at [%d/%d]", cnt, p.capacity) if cnt >= p.capacity { s := fmt.Sprintf("At capacity [%d/%d]", cnt, p.capacity) return errors.New(s) } + log.Println("WebRTC: Collecting a new Snowflake.", s) // Engage the Snowflake Catching interface, which must be available. if nil == p.Tongue { return errors.New("Missing Tongue to catch Snowflakes with.") @@ -60,7 +64,6 @@ func (p *Peers) Collect() error { // As part of |SnowflakeCollector| interface. func (p *Peers) Pop() Snowflake { - // Blocks until an available snowflake appears. snowflake, ok := <-p.snowflakeChan if !ok { @@ -71,6 +74,11 @@ func (p *Peers) Pop() Snowflake { return snowflake } +// As part of |SnowflakeCollector| interface. +func (p *Peers) Melted() <-chan struct{} { + return p.melt +} + // Returns total available Snowflakes (including the active one) // The count only reduces when connections themselves close, rather than when // they are popped. @@ -93,9 +101,16 @@ func (p *Peers) purgeClosedPeers() { // Close all Peers contained here. func (p *Peers) End() { - log.Printf("WebRTC: Ending all peer connections.") - for e := p.activePeers.Front(); e != nil; e = e.Next() { + close(p.snowflakeChan) + p.melt <- struct{}{} + cnt := p.Count() + for e := p.activePeers.Front(); e != nil; { + log.Println(e, e.Value) + next := e.Next() conn := e.Value.(*webRTCConn) conn.Close() + p.activePeers.Remove(e) + e = next } + log.Println("WebRTC: melted all", cnt, "snowflakes.") } diff --git a/client/rendezvous.go b/client/rendezvous.go index 6c7aa44..2bcce17 100644 --- a/client/rendezvous.go +++ b/client/rendezvous.go @@ -115,15 +115,17 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( // Implements the |Tongue| interface to catch snowflakes, using BrokerChannel. type WebRTCDialer struct { *BrokerChannel - webrtcConfig *webrtc.Configuration + // webrtcConfig *webrtc.Configuration + iceServers IceServerList } func NewWebRTCDialer( broker *BrokerChannel, iceServers IceServerList) *WebRTCDialer { - config := webrtc.NewConfiguration(iceServers...) + return &WebRTCDialer{ BrokerChannel: broker, - webrtcConfig: config, + iceServers: iceServers, + // webrtcConfig: config, } } @@ -134,7 +136,8 @@ func (w WebRTCDialer) Catch() (Snowflake, error) { } // TODO: [#3] Fetch ICE server information from Broker. // TODO: [#18] Consider TURN servers here too. - connection := NewWebRTCConnection(w.webrtcConfig, w.BrokerChannel) + config := webrtc.NewConfiguration(w.iceServers...) + connection := NewWebRTCConnection(config, w.BrokerChannel) err := connection.Connect() return connection, err } diff --git a/client/snowflake.go b/client/snowflake.go index 9f5cdc7..d122494 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -30,17 +30,19 @@ var handlerChan = make(chan int) // transfer to the Tor SOCKS handler when needed. func ConnectLoop(snowflakes SnowflakeCollector) { for { + // Check if ending is necessary. err := snowflakes.Collect() if nil != err { log.Println("WebRTC:", err, " Retrying in", ReconnectTimeout, "seconds...") - // Failed collections get a timeout. - <-time.After(time.Second * ReconnectTimeout) + } + select { + case <-time.After(time.Second * ReconnectTimeout): continue + case <-snowflakes.Melted(): + log.Println("ConnectLoop: stopped.") + return } - // Successful collection gets rate limited to once per second. - log.Println("WebRTC: Connected to new Snowflake.") - <-time.After(time.Second) } } @@ -50,7 +52,7 @@ func socksAcceptLoop(ln *pt.SocksListener, snowflakes SnowflakeCollector) error log.Println("Started SOCKS listener.") for { conn, err := ln.AcceptSocks() - log.Println("SOCKS accepted ", conn.Req) + log.Println("SOCKS accepted: ", conn.Req) if err != nil { if e, ok := err.(net.Error); ok && e.Temporary() { continue @@ -72,6 +74,7 @@ func handler(socks SocksConnector, snowflakes SnowflakeCollector) error { handlerChan <- -1 }() // Obtain an available WebRTC remote. May block. + log.Println("handler: awaiting Snowflake...") snowflake := snowflakes.Pop() if nil == snowflake { socks.Reject() @@ -85,6 +88,7 @@ func handler(socks SocksConnector, snowflakes SnowflakeCollector) error { } // Begin exchanging data. + // BUG(serene): There's a leak here when multiplexed. go copyLoop(socks, snowflake) // When WebRTC resets, close the SOCKS connection, which induces new handler. diff --git a/client/webrtc.go b/client/webrtc.go index c7a46ea..6cd5da6 100644 --- a/client/webrtc.go +++ b/client/webrtc.go @@ -15,19 +15,17 @@ import ( type webRTCConn struct { config *webrtc.Configuration pc *webrtc.PeerConnection - snowflake SnowflakeDataChannel // Holds the WebRTC DataChannel. + transport SnowflakeDataChannel // Holds the WebRTC DataChannel. broker *BrokerChannel offerChannel chan *webrtc.SessionDescription answerChannel chan *webrtc.SessionDescription errorChannel chan error - endChannel chan struct{} recvPipe *io.PipeReader writePipe *io.PipeWriter buffer bytes.Buffer reset chan struct{} - index int closed bool BytesLogger @@ -43,11 +41,11 @@ func (c *webRTCConn) Read(b []byte) (int, error) { // As part of |io.ReadWriter| func (c *webRTCConn) Write(b []byte) (int, error) { c.BytesLogger.AddOutbound(len(b)) - if nil == c.snowflake { + if nil == c.transport { log.Printf("Buffered %d bytes --> WebRTC", len(b)) c.buffer.Write(b) } else { - c.snowflake.Send(b) + c.transport.Send(b) } return len(b), nil } @@ -57,15 +55,6 @@ func (c *webRTCConn) Close() error { var err error = nil log.Printf("WebRTC: Closing") c.cleanup() - if nil != c.offerChannel { - close(c.offerChannel) - } - if nil != c.answerChannel { - close(c.answerChannel) - } - if nil != c.errorChannel { - close(c.errorChannel) - } // Mark for deletion. c.closed = true return err @@ -106,7 +95,6 @@ func NewWebRTCConnection(config *webrtc.Configuration, // As part of |Connector| interface. func (c *webRTCConn) Connect() error { - log.Printf("Establishing WebRTC connection #%d...", c.index) // TODO: When go-webrtc is more stable, it's possible that a new // PeerConnection won't need to be re-prepared each time. err := c.preparePeerConnection() @@ -174,7 +162,7 @@ func (c *webRTCConn) preparePeerConnection() error { // Create a WebRTC DataChannel locally. func (c *webRTCConn) establishDataChannel() error { - if c.snowflake != nil { + if c.transport != nil { panic("Unexpected datachannel already exists!") } dc, err := c.pc.CreateDataChannel("snowflake", webrtc.Init{}) @@ -187,9 +175,8 @@ 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.") + if nil != c.transport { + panic("WebRTC: transport already exists.") } // Flush buffered outgoing SOCKS data if necessary. if c.buffer.Len() > 0 { @@ -198,11 +185,11 @@ func (c *webRTCConn) establishDataChannel() error { c.buffer.Reset() } // Then enable the datachannel. - c.snowflake = dc + c.transport = dc } dc.OnClose = func() { // Future writes will go to the buffer until a new DataChannel is available. - if nil == c.snowflake { + if nil == c.transport { // Closed locally, as part of a reset. log.Println("WebRTC: DataChannel.OnClose [locally]") return @@ -210,7 +197,7 @@ func (c *webRTCConn) establishDataChannel() error { // Closed remotely, need to reset everything. // Disable the DataChannel as a write destination. log.Println("WebRTC: DataChannel.OnClose [remotely]") - c.snowflake = nil + c.transport = nil c.Reset() } dc.OnMessage = func(msg []byte) { @@ -284,13 +271,23 @@ func (c *webRTCConn) exchangeSDP() error { return nil } +// Close all channels and transports func (c *webRTCConn) cleanup() { - if nil != c.snowflake { + if nil != c.offerChannel { + close(c.offerChannel) + } + if nil != c.answerChannel { + close(c.answerChannel) + } + if nil != c.errorChannel { + close(c.errorChannel) + } + if nil != c.transport { log.Printf("WebRTC: closing DataChannel") - dataChannel := c.snowflake - // Setting snowflake to nil *before* Close indicates to OnClose that it + dataChannel := c.transport + // Setting dc to nil *before* Close indicates to OnClose that it // was locally triggered. - c.snowflake = nil + c.transport = nil dataChannel.Close() } if nil != c.pc { [View Less]

1 0

[torsocks/master] Return EIO, not whatever 1 is, on EOF in recv_data.
by dgoulet＠torproject.org 13 Jun '16

13 Jun '16

commit 6907dcdb8324642c39a56b961d6062cb6b354130 Author: Taylor R Campbell <campbell+torsocks(a)mumble.net> Date: Fri Jun 19 05:12:16 2015 +0000 Return EIO, not whatever 1 is, on EOF in recv_data. --- src/common/socks5.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/socks5.c b/src/common/socks5.c index f56d69c..6d58f4d 100644 --- a/src/common/socks5.c +++ b/src/common/socks5.c @@ -60,7 +60,7 @@ static ssize_t recv_data_impl(int fd, void *buf, size_t … [View More]

1 0

[torsocks/master] Hijack execve() syscall to check for cap/setuid
by dgoulet＠torproject.org 13 Jun '16

13 Jun '16

commit 6111dd4b49b8d4892d183c650c3d71592452209a Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Jun 13 15:12:58 2016 -0400 Hijack execve() syscall to check for cap/setuid If a binary is set with capabilities or is setuid/gid, the kernel will strip out the LD_PRELOAD thus making torsocks useless. This is only working on Linux at this point. This is not a complete fix but it's a good start and useful to have. See ticket #14322 for more information. … [View More] Patch from cypherpunks with minor syntax edit. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/Makefile.am | 2 +- src/lib/execve.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/lib/torsocks.c | 5 ++-- src/lib/torsocks.h | 15 ++++++++++ 4 files changed, 101 insertions(+), 3 deletions(-) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 6e137f3..a81b5cf 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -9,6 +9,6 @@ lib_LTLIBRARIES = libtorsocks.la libtorsocks_la_SOURCES = torsocks.c torsocks.h \ connect.c gethostbyname.c getaddrinfo.c close.c \ getpeername.c socket.c syscall.c socketpair.c recv.c \ - exit.c accept.c listen.c fclose.c sendto.c + exit.c accept.c listen.c fclose.c sendto.c execve.c libtorsocks_la_LIBADD = $(top_builddir)/src/common/libcommon.la diff --git a/src/lib/execve.c b/src/lib/execve.c new file mode 100644 index 0000000..ec3d12c --- /dev/null +++ b/src/lib/execve.c @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2016 - David Goulet <dgoulet(a)ev0ke.net> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License, version 2 only, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <sys/types.h> +#include <sys/xattr.h> +#include <sys/stat.h> + +#include "torsocks.h" + +/* execve(2) */ +TSOCKS_LIBC_DECL(execve, LIBC_EXECVE_RET_TYPE, LIBC_EXECVE_SIG) + +/* + * Check the file for setuid or security capabilities. Return 1 if + * capabilities or suid is set which indicates that LD_PRELOAD will be + * stripped. If none of those are present, return 0. + */ +int +check_cap_suid(const char *filename) +{ + struct stat perms; + + if (stat(filename, &perms) == 0) { + if (perms.st_mode & (S_ISUID | S_ISGID)) { + /* setXuid is enabled, LD_PRELOAD will be stripped */ + return -1; + } + } + +/* Capabilities as such are just on Linux. */ +#ifdef __linux__ + static const char *sec_cap = "security.capability"; + ssize_t len = getxattr(filename, sec_cap, NULL, 0); + if (len > 0) { + /* security capabilities are set, LD_PRELOAD will be stripped */ + return -1; + } + /* On failure or a value of zero, either no caps are present or the + * filename wasn't found so in both cases, let execve() call handle the + * failure if one. */ +#endif /* __linux__ */ + + return 0; +} + +/* + * execve() is hijacked to avoid executing setuid or setcap binaries which + * will strip the LD_PRELOAD settings. + */ +LIBC_EXECVE_RET_TYPE tsocks_execve(LIBC_EXECVE_SIG) +{ + if (check_cap_suid(filename) < 0) { + errno = EPERM; + return -1; + } + return tsocks_libc_execve(filename, argv, envp); +} + +/* + * Libc hijacked symbol execve(2). + */ +LIBC_EXECVE_DECL +{ + if (!tsocks_libc_execve) { + tsocks_initialize(); + } + return tsocks_execve(LIBC_EXECVE_ARGS); +} diff --git a/src/lib/torsocks.c b/src/lib/torsocks.c index 0342aeb..9d92e82 100644 --- a/src/lib/torsocks.c +++ b/src/lib/torsocks.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2008 - Shaun Clowes <delius(a)progsoc.org> + * Copyright (C) 2000-2008 - Shaun Clowes <delius(a)progsoc.org> * 2008-2011 - Robert Hogan <robert(a)roberthogan.net> * 2013 - David Goulet <dgoulet(a)ev0ke.net> * @@ -217,8 +217,9 @@ static void init_libc_symbols(void) tsocks_libc_close = dlsym(libc_ptr, LIBC_CLOSE_NAME_STR); tsocks_libc_socket = dlsym(libc_ptr, LIBC_SOCKET_NAME_STR); tsocks_libc_syscall = dlsym(libc_ptr, LIBC_SYSCALL_NAME_STR); + tsocks_libc_execve = dlsym(libc_ptr, LIBC_EXECVE_NAME_STR); if (!tsocks_libc_connect || !tsocks_libc_close || !tsocks_libc_socket - || !tsocks_libc_syscall) { + || !tsocks_libc_syscall || !tsocks_libc_execve) { ERR("Unable to lookup symbols in " LIBC_NAME "(%s)", dlerror()); goto error; } diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h index 0eeef2a..a7907f5 100644 --- a/src/lib/torsocks.h +++ b/src/lib/torsocks.h @@ -75,6 +75,15 @@ #define LIBC_CLOSE_SIG int fd #define LIBC_CLOSE_ARGS fd +/* execve(2) */ +#define LIBC_EXECVE_NAME execve +#define LIBC_EXECVE_NAME_STR XSTR(LIBC_EXECVE_NAME) +#define LIBC_EXECVE_RET_TYPE int +#define LIBC_EXECVE_SIG \ + const char *filename, char *const argv[], char *const envp[] +#define LIBC_EXECVE_ARGS \ + filename, argv, envp + /* fclose(3) */ #include <stdio.h> @@ -325,6 +334,12 @@ TSOCKS_DECL(close, LIBC_CLOSE_RET_TYPE, LIBC_CLOSE_SIG) #define LIBC_CLOSE_DECL \ LIBC_CLOSE_RET_TYPE LIBC_CLOSE_NAME(LIBC_CLOSE_SIG) +/* execve(2) */ +extern TSOCKS_LIBC_DECL(execve, LIBC_EXECVE_RET_TYPE, LIBC_EXECVE_SIG) +TSOCKS_DECL(execve, LIBC_EXECVE_RET_TYPE, LIBC_EXECVE_SIG) +#define LIBC_EXECVE_DECL \ + LIBC_EXECVE_RET_TYPE LIBC_EXECVE_NAME(LIBC_EXECVE_SIG) + /* fclose(3) */ extern TSOCKS_LIBC_DECL(fclose, LIBC_FCLOSE_RET_TYPE, LIBC_FCLOSE_SIG) TSOCKS_DECL(fclose, LIBC_FCLOSE_RET_TYPE, LIBC_FCLOSE_SIG) [View Less]

1 0

[torsocks/master] Block, rather than busy-wait, in send/recv_data_impl.
by dgoulet＠torproject.org 13 Jun '16

13 Jun '16

commit 3f39f4f0c1ee39116d720282f912303279b02d93 Author: Taylor R Campbell <campbell+torsocks(a)mumble.net> Date: Mon Jun 13 15:56:49 2016 -0400 Block, rather than busy-wait, in send/recv_data_impl. The send_data_impl and recv_data_impl functions can enter an annoying busy loop if a connection is laggy. Potentially if the connection never establishes, this can continue for minutes, until the connection times out, having at least one core running at 100% the … [View More]

1 0

[torsocks/master] Include <sys/param.h> for __NetBSD_Prereq__ on NetBSD.
by dgoulet＠torproject.org 13 Jun '16

13 Jun '16

commit 59ce5f3b34641fd243a7e349fb72bcf408a7c6a0 Author: Taylor R Campbell <campbell+torsocks(a)mumble.net> Date: Mon Jun 13 16:02:32 2016 -0400 Include <sys/param.h> for __NetBSD_Prereq__ on NetBSD. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/torsocks.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h index a7907f5..f00af75 100644 --- a/src/lib/torsocks.h +++ b/src/lib/torsocks.h @@ -36,6 +36,10 @… [View More]

1 0

[torsocks/master] Block, rather than busy-wait, in send/recv_data_impl.
by dgoulet＠torproject.org 13 Jun '16

13 Jun '16

commit 6e36f49c5f08cc96b4c8469e245c28c3b58c23bb Author: Taylor R Campbell <campbell+torsocks(a)mumble.net> Date: Wed Jun 17 17:39:02 2015 +0000 Block, rather than busy-wait, in send/recv_data_impl. --- src/common/socks5.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/common/socks5.c b/src/common/socks5.c index 3f284ca..f56d69c 100644 --- a/src/common/socks5.c +++ b/src/common/socks5.c @@ -49,9 +49,13 @@ static ssize_t recv_data_impl(… [View More]

1 0

[torsocks/master] Add support for musl-libc
by dgoulet＠torproject.org 13 Jun '16

13 Jun '16

commit 3e793e9eac05ad926cc016da5129e95986d105f2 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Jun 13 14:39:53 2016 -0400 Add support for musl-libc Musl library does not have a specific define so use __linux__ instead. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/compat.c | 5 +++-- src/common/compat.h | 5 +++-- src/common/ref.h | 5 +++-- src/lib/torsocks.h | 9 +++++---- 4 files changed, 14 insertions(+), 10 deletions(-) … [View More]diff --git a/src/common/compat.c b/src/common/compat.c index a861b3d..323f2ed 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -19,7 +19,8 @@ #include "compat.h" -#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__)) +#if (defined(__linux__) || defined(__GLIBC__) || defined(__FreeBSD__) || \ + defined(__darwin__) || defined(__NetBSD__)) /* * Initialize a pthread mutex. This never fails. @@ -96,4 +97,4 @@ void tsocks_once(tsocks_once_t *o, void (*init_routine)(void)) tsocks_mutex_unlock(&o->mutex); } -#endif /* __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */ +#endif /* __linux__, __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */ diff --git a/src/common/compat.h b/src/common/compat.h index ce47129..6c8ce32 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -22,7 +22,8 @@ #define __darwin__ 1 #endif -#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__)) +#if (defined(__linux__) || defined(__GLIBC__) || defined(__FreeBSD__) || \ + defined(__darwin__) || defined(__NetBSD__)) #define RTLD_NEXT ((void *) -1) @@ -55,7 +56,7 @@ void tsocks_once(tsocks_once_t *o, void (*init_routine)(void)); #else #error "OS not supported." -#endif /* __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */ +#endif /* __linux__, __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */ #if defined(__linux__) #include <unistd.h> diff --git a/src/common/ref.h b/src/common/ref.h index 88aec2e..d9b9df8 100644 --- a/src/common/ref.h +++ b/src/common/ref.h @@ -26,7 +26,8 @@ struct ref { long count; }; -#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__)) +#if (defined(__linux__) || defined(__GLIBC__) || defined(__FreeBSD__) || \ + defined(__darwin__) || defined(__NetBSD__)) /* * Get a reference by incrementing the refcount. @@ -57,6 +58,6 @@ static inline void ref_put(struct ref *r, #else #error "OS not supported" -#endif /* __GLIBC__, __FreeBSD__, __darwin__ */ +#endif /* __linux__, __GLIBC__, __FreeBSD__, __darwin__, __NetBSD__ */ #endif /* TORSOCKS_REF_H */ diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h index 076f3a5..0eeef2a 100644 --- a/src/lib/torsocks.h +++ b/src/lib/torsocks.h @@ -33,7 +33,8 @@ #define TSOCKS_DECL(name, type, sig) \ extern type tsocks_##name(sig); -#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__)) +#if (defined(__linux__) || defined(__GLIBC__) || defined(__FreeBSD__) || \ + defined(__darwin__) || defined(__NetBSD__)) /* connect(2) */ #include <sys/types.h> @@ -207,7 +208,7 @@ struct hostent **result, int *h_errnop #else #error "OS not supported." -#endif /* __GLIBC__ , __FreeBSD__, __darwin__, __NetBSD__ */ +#endif /* __linux__, __GLIBC__ , __FreeBSD__, __darwin__, __NetBSD__ */ #if (defined(__linux__)) @@ -241,7 +242,7 @@ struct hostent **result, int *h_errnop #endif /* __FreeBSD__, __darwin__, __NetBSD__ */ -#if defined(__GLIBC__) && defined(__FreeBSD_kernel__) +#if (defined(__linux__) || defined(__GLIBC__)) && defined(__FreeBSD_kernel__) /* syscall(2) */ #define LIBC_SYSCALL_NAME syscall @@ -250,7 +251,7 @@ struct hostent **result, int *h_errnop #define LIBC_SYSCALL_SIG long int number, ... #define LIBC_SYSCALL_ARGS number -#endif /* __GLIBC__ && __FreeBSD_kernel__ */ +#endif /* (__linux__ || __GLIBC__) && __FreeBSD_kernel__ */ /* __syscall(2) */ #if defined(__FreeBSD__) [View Less]

1 0

[torsocks/master] test: Change IPs with the new ones TPO just setup
by dgoulet＠torproject.org 13 Jun '16

13 Jun '16

commit 3e875fd3f4ea8a0c723b9c416e24ea22a03ea80d Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Jun 13 14:52:24 2016 -0400 test: Change IPs with the new ones TPO just setup Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- tests/test_dns.c | 4 ++-- tests/test_fd_passing.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_dns.c b/tests/test_dns.c index 7d592ac..03ce976 100644 --- a/tests/test_dns.c +++ b/tests/… [View More]

1 0

[torsocks/master] Use the correct libc symbol for socket, __socket30, on newer NetBSD.
by dgoulet＠torproject.org 13 Jun '16

13 Jun '16

commit ede9da87cc79004992d70f5a494d4e2dfe1920be Author: Taylor R Campbell <campbell+torsocks(a)mumble.net> Date: Wed Jun 17 17:05:18 2015 +0000 Use the correct libc symbol for socket, __socket30, on newer NetBSD. Otherwise, we will define the ELF symbol __socket30 due to the declaration of socket in <sys/socket.h>, but try using dlsym to call the libc symbol "socket", which in NetBSD is defined as a compatibility wrapper that calls __socket30...which, … [View More]

1 0

[torsocks/master] Suppress signed/unsigned comparison warnings with justified casts.
by dgoulet＠torproject.org 13 Jun '16

13 Jun '16

commit 9b146f3762744c02d7646596e396dda149a0d61e Author: Taylor R Campbell <campbell+torsocks(a)mumble.net> Date: Tue Jun 16 20:37:12 2015 +0000 Suppress signed/unsigned comparison warnings with justified casts. --- tests/test_fd_passing.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/test_fd_passing.c b/tests/test_fd_passing.c index e5eb10f..70d3fef 100644 --- a/tests/test_fd_passing.c +++ b/tests/test_fd_passing.c @@ -137,6 +137,8 @@ static … [View More]

1 0