Merge pull request #29 from cheftako/master

k8s-ci-robot · web-flow · commit 8ebdad54073f · 2019-07-16T11:28:47.000-07:00
Fix error on DIAL_RSP for http-connect.
diff --git a/pkg/agent/agentserver/server.go b/pkg/agent/agentserver/server.go
@@ -44,6 +44,8 @@ func (c *ProxyClientConnection) send(pkt *agent.Packet) error {
 		} else if pkt.Type == agent.PacketType_DATA {
 			_, err := c.Http.Write(pkt.GetData().Data)
 			return err
+		} else if pkt.Type == agent.PacketType_DIAL_RSP {
+			return nil
 		} else {
 			return fmt.Errorf("attempt to send via unrecognized connection type %v", pkt.Type)
 		}
diff --git a/pkg/agent/agentserver/tunnel.go b/pkg/agent/agentserver/tunnel.go
@@ -75,6 +75,7 @@ func (t *Tunnel) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	t.Server.PendingDial[random] = connection
 	if t.Server.Backend == nil {
 		http.Error(w, "currently no tunnels available", http.StatusInternalServerError)
+		return
 	}
 	if err := t.Server.Backend.Send(dialRequest); err != nil {
 		klog.Errorf("failed to tunnel dial request %v", err)

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@ func (c ProxyClientConnection) send(pkt agent.Packet) error {`
`44`	`44`	`} else if pkt.Type == agent.PacketType_DATA {`
`45`	`45`	`_, err := c.Http.Write(pkt.GetData().Data)`
`46`	`46`	`return err`
	`47`	`+ } else if pkt.Type == agent.PacketType_DIAL_RSP {`
	`48`	`+ return nil`
`47`	`49`	`} else {`
`48`	`50`	`return fmt.Errorf("attempt to send via unrecognized connection type %v", pkt.Type)`
`49`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ func (t Tunnel) ServeHTTP(w http.ResponseWriter, r http.Request) {`
`75`	`75`	`t.Server.PendingDial[random] = connection`
`76`	`76`	`if t.Server.Backend == nil {`
`77`	`77`	`http.Error(w, "currently no tunnels available", http.StatusInternalServerError)`
	`78`	`+ return`
`78`	`79`	`}`
`79`	`80`	`if err := t.Server.Backend.Send(dialRequest); err != nil {`
`80`	`81`	`klog.Errorf("failed to tunnel dial request %v", err)`