From d1c93384e932d2dc3c786cb5ca509ea7dccd51d1 Mon Sep 17 00:00:00 2001
From: Meir Fischer <meirfischer@gmail.com>
Date: Sat, 29 Nov 2014 21:32:45 -0500
Subject: [PATCH] Set initial timeout on UDP proxy connection creation

---
 pkg/proxy/proxier.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/proxy/proxier.go b/pkg/proxy/proxier.go
index 449b9ffb694..e6ccffb4404 100644
--- a/pkg/proxy/proxier.go
+++ b/pkg/proxy/proxier.go
@@ -226,6 +226,10 @@ func (udp *udpProxySocket) getBackendConn(activeClients *clientCache, cliAddr ne
 		if err != nil {
 			return nil, err
 		}
+		if err = svrConn.SetDeadline(time.Now().Add(timeout)); err != nil {
+			glog.Errorf("SetDeadline failed: %v", err)
+			return nil, err
+		}
 		activeClients.clients[cliAddr.String()] = svrConn
 		go func(cliAddr net.Addr, svrConn net.Conn, activeClients *clientCache, timeout time.Duration) {
 			defer util.HandleCrash()