Merge pull request #1617 from kevinGC:iptables-write-filter-proto

PiperOrigin-RevId: 291249314

1 files changed, 18 insertions, 21 deletions

diff --git a/test/iptables/iptables_util.go b/test/iptables/iptables_util.go
index 1c4f4f665..043114c78 100644
--- a/test/iptables/iptables_util.go
+++ b/test/iptables/iptables_util.go
@@ -19,6 +19,8 @@ import (
 	"net"
 	"os/exec"
 	"time"
+
+	"gvisor.dev/gvisor/runsc/testutil"
 )
 
 const iptablesBinary = "iptables"
@@ -105,31 +107,26 @@ func listenTCP(port int, timeout time.Duration) error {
 }
 
 // connectTCP connects the TCP server over specified local port, server IP and remote/server port.
-func connectTCP(ip net.IP, remotePort, localPort int, duration time.Duration) error {
-	remote := net.TCPAddr{
+func connectTCP(ip net.IP, remotePort, localPort int, timeout time.Duration) error {
+	contAddr := net.TCPAddr{
 		IP:   ip,
 		Port: remotePort,
 	}
-
-	local := net.TCPAddr{
-		Port: localPort,
-	}
-
-	// Container may not be up. Retry DialTCP over a duration.
-	to := time.After(duration)
-	for {
-		conn, err := net.DialTCP("tcp4", &local, &remote)
-		if err == nil {
-			conn.Close()
-			return nil
+	// The container may not be listening when we first connect, so retry
+	// upon error.
+	callback := func() error {
+		localAddr := net.TCPAddr{
+			Port: localPort,
 		}
-		select {
-		// Timed out waiting for connection to be accepted.
-		case <-to:
-			return err
-		default:
-			time.Sleep(200 * time.Millisecond)
+		conn, err := net.DialTCP("tcp4", &localAddr, &contAddr)
+		if conn != nil {
+			conn.Close()
 		}
+		return err
 	}
-	return fmt.Errorf("Failed to establish connection on port %d", localPort)
+	if err := testutil.Poll(callback, timeout); err != nil {
+		return fmt.Errorf("timed out waiting to send IP, most recent error: %v", err)
+	}
+
+	return nil
 }