Huge code refactoring

[govpn.git] / src / govpn / cmd / govpn-server / proxy.go

diff --git a/src/govpn/cmd/govpn-server/proxy.go b/src/govpn/cmd/govpn-server/proxy.go
index f1e84192bff8f739c189c77f53f9a8ee2eaa50a4..c05a3604887492cfb28405cad3c64b0ec355efd7 100644 (file)
--- a/src/govpn/cmd/govpn-server/proxy.go
+++ b/src/govpn/cmd/govpn-server/proxy.go
@@ -23,9 +23,7 @@ import (
        "net/http"
 )
 
-type proxyHandler struct {
-       sink chan Pkt
-}
+type proxyHandler struct{}
 
 func (p proxyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
        conn, _, err := w.(http.Hijacker).Hijack()
@@ -34,17 +32,14 @@ func (p proxyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
                return
        }
        conn.Write([]byte("HTTP/1.0 200 OK\n\n"))
-       ready := make(chan struct{}, 1)
-       go handleTCP(conn, p.sink, ready)
-       ready <- struct{}{}
-
+       go handleTCP(conn)
 }
 
-func proxyStart(sink chan Pkt) {
+func proxyStart() {
        log.Println("HTTP proxy listening on:", *proxy)
        s := &http.Server{
                Addr:    *proxy,
-               Handler: proxyHandler{sink},
+               Handler: proxyHandler{},
        }
        log.Println("HTTP proxy result:", s.ListenAndServe())
 }