Commit 15f83653 authored by David Fifield's avatar David Fifield
Browse files

Don't wait for handlers to finish after SIGTERM in examples. 

The requirement to wait until handlers are finished, as well as the
complicated signal counting logic, was removed from pt-spec.txt in 2014.

https://bugs.torproject.org/26389#comment:5
parent 7d56ec4f

examples/dummy-client/dummy-client.go

+2 −23
Changes for examples/dummy-client/dummy-client.go: 2 added lines, 23 removed lines.
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ import "git.torproject.org/pluggable-transports/goptlib.git" 


var ptInfo pt.ClientInfo



// When a connection handler starts, +1 is written to this channel; when it

// ends, -1 is written.

var handlerChan = make(chan int)



func copyLoop(a, b net.Conn) {

	var wg sync.WaitGroup

	wg.Add(2)
@@ -45,11 +41,6 @@ func copyLoop(a, b net.Conn) { 
}



func handler(conn *pt.SocksConn) error {

	handlerChan <- 1

	defer func() {

		handlerChan <- -1

	}()



	defer conn.Close()

	remote, err := net.Dial("tcp", conn.Req.Target)

	if err != nil {
@@ -112,8 +103,6 @@ func main() { 
	}

	pt.CmethodsDone()



	var numHandlers int = 0

	var sig os.Signal

	sigChan := make(chan os.Signal, 1)

	signal.Notify(sigChan, syscall.SIGTERM)
@@ -126,21 +115,11 @@ func main() { 
		}()

	}



	// keep track of handlers and wait for a signal

	sig = nil

	for sig == nil {

		select {

		case n := <-handlerChan:

			numHandlers += n

		case sig = <-sigChan:

		}

	}

	// wait for a signal

	<-sigChan



	// signal received, shut down

	for _, ln := range listeners {

		ln.Close()

	}

	for numHandlers > 0 {

		numHandlers += <-handlerChan

	}

}

examples/dummy-server/dummy-server.go

+2 −23
Changes for examples/dummy-server/dummy-server.go: 2 added lines, 23 removed lines.
Original line number Diff line number Diff line
@@ -25,10 +25,6 @@ import "git.torproject.org/pluggable-transports/goptlib.git" 


var ptInfo pt.ServerInfo



// When a connection handler starts, +1 is written to this channel; when it

// ends, -1 is written.

var handlerChan = make(chan int)



func copyLoop(a, b net.Conn) {

	var wg sync.WaitGroup

	wg.Add(2)
@@ -48,11 +44,6 @@ func copyLoop(a, b net.Conn) { 
func handler(conn net.Conn) error {

	defer conn.Close()



	handlerChan <- 1

	defer func() {

		handlerChan <- -1

	}()



	or, err := pt.DialOr(&ptInfo, conn.RemoteAddr().String(), "dummy")

	if err != nil {

		return err
@@ -104,8 +95,6 @@ func main() { 
	}

	pt.SmethodsDone()



	var numHandlers int = 0

	var sig os.Signal

	sigChan := make(chan os.Signal, 1)

	signal.Notify(sigChan, syscall.SIGTERM)
@@ -118,21 +107,11 @@ func main() { 
		}()

	}



	// keep track of handlers and wait for a signal

	sig = nil

	for sig == nil {

		select {

		case n := <-handlerChan:

			numHandlers += n

		case sig = <-sigChan:

		}

	}

	// wait for a signal

	<-sigChan



	// signal received, shut down

	for _, ln := range listeners {

		ln.Close()

	}

	for numHandlers > 0 {

		numHandlers += <-handlerChan

	}

}