added unlinked controller; change create forwarded to createOrUpdate; added global proxy mutex

app/rproxy/rproxy.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io"
 	"strings"
 	"sync"
 
@@ -13,10 +12,11 @@ import (
 
 type Proxy struct {
 	Forwarders []*Forwarder       `json:"forwarders"  yaml:"forwarders"`
-	ctx        context.Context    `jsreturn errors.New("Zero dport")on:"-"           yaml:"-"`
+	ctx        context.Context    `json:"-"           yaml:"-"`
 	cancel     context.CancelFunc `json:"-"           yaml:"-"`
 	wg         sync.WaitGroup     `json:"-"           yaml:"-"`
 	log        *logger.Logger     `json:"-"           yaml:"-"`
+	mtx        sync.Mutex         `json:"-"           yaml:"-"`
 }
 
 func NewProxy() *Proxy {
@@ -29,106 +29,118 @@ func NewProxy() *Proxy {
 	}
 }
 
-func (bal *Proxy) AddForwarder(ctx context.Context, typ string, lport, dport uint32, addrs ...string) error {
+func (prox *Proxy) ListForwarders(ctx context.Context) []*Forwarder {
+	prox.mtx.Lock()
+	defer prox.mtx.Unlock()
+	forwards := make([]*Forwarder, 0)
+	for _, forw := range prox.Forwarders {
+		dests := make([]string, 0)
+		for _, dest := range forw.Dests {
+			dests = append(dests, dest.Address)
+		}
+		newForw, _ := NewForwarder(ctx, forw.Type, forw.Lport, forw.Dport, dests...)
+		forwards = append(forwards, newForw)
+	}
+	return forwards
+}
+
+func (prox *Proxy) CreateOrUpdateForwarder(ctx context.Context, proto string, lport, dport uint32, addrs ...string) error {
 	var err error
 	if lport == 0 {
-		return errors.New("Zero lport")
+		return errors.New("Zero forwarder lport")
 	}
 	if dport == 0 {
-		return errors.New("Zero dport")
+		return errors.New("Zero forwarder dport")
 	}
-	if typ == "" {
-		return errors.New("Empty type")
+	if proto == "" {
+		return errors.New("Empty forwarder type")
 	}
-	typ = strings.ToLower(typ)
-	if typ != TCP {
-		return fmt.Errorf("Unknown type %s", typ)
+	proto = strings.ToLower(proto)
+	if proto != TCP && proto != UDP {
+		return fmt.Errorf("Unknown forwarder protocol %s", proto)
 	}
-	forw, err := NewForwarder(ctx, typ, lport, dport, addrs...)
-	if err != nil {
-		return err
+	prox.mtx.Lock()
+	defer prox.mtx.Unlock()
+
+	var forw *Forwarder
+	for _, iforw := range prox.Forwarders {
+		if iforw.Lport == lport && iforw.Type == proto {
+			forw = iforw
+			break
+		}
+	}
+	switch {
+	case forw == nil:
+		prox.log.Debugf("Create rorwarder %s:%d", proto, lport)
+		forw, err = NewForwarder(ctx, proto, lport, dport, addrs...)
+		if err != nil {
+			return err
+		}
+		prox.Forwarders = append(prox.Forwarders, forw)
+		prox.wg.Add(1)
+		go forw.Listen(&prox.wg)
+	default:
+		prox.log.Debugf("Update forwarder %s:%d", proto, lport)
+		forw.Dport = dport
+		dests := make([]*Destination, 0)
+		for _, addr := range addrs {
+			dest := NewDestination(addr)
+			forw.Dests = append(dests, dest)
+		}
+		forw.Dests = dests
 	}
-	bal.Forwarders = append(bal.Forwarders, forw)
-	bal.wg.Add(1)
-	go forw.ListenTCP(&bal.wg)
 	return err
 }
 
-func (bal *Proxy) DeleteForwarder(ctx context.Context, lport uint32) error {
+func (prox *Proxy) DeleteForwarder(ctx context.Context, proto string, lport uint32) error {
 	var err error
 	var forw *Forwarder
-	for _, iforw := range bal.Forwarders {
-		if iforw.Lport == lport {
+	prox.mtx.Lock()
+	defer prox.mtx.Unlock()
+	for _, iforw := range prox.Forwarders {
+		if iforw.Lport == lport && iforw.Type == proto {
 			forw = iforw
 			break
 		}
 	}
 	if forw == nil {
-		bal.log.Debugf("Forwarder for lport %d not found", lport)
+		prox.log.Debugf("Forwarder for %s:%d not found", proto, lport)
 		return err
 	}
-	bal.log.Debugf("Stop forwarder for lport %d", lport)
+	prox.log.Debugf("Stop forwarder for %s:%d", proto, lport)
 	err = forw.Stop()
 	if err != nil {
 		return err
 	}
 	forwarders := make([]*Forwarder, 0)
-	for _, forw := range bal.Forwarders {
-		if forw.Lport == lport {
+	for _, forw := range prox.Forwarders {
+		if forw.Lport == lport && forw.Type == proto {
 			continue
 		}
 		forwarders = append(forwarders, forw)
 	}
-	bal.Forwarders = forwarders
+	prox.Forwarders = forwarders
 	return err
 }
 
-func (bal *Proxy) Start() error {
+func (prox *Proxy) Start() error {
 	var err error
-	for _, forw := range bal.Forwarders {
-		bal.wg.Add(1)
-		go forw.ListenTCP(&bal.wg)
+	prox.mtx.Lock()
+	defer prox.mtx.Unlock()
+	for _, forw := range prox.Forwarders {
+		prox.wg.Add(1)
+		go forw.Listen(&prox.wg)
 	}
-	bal.wg.Wait()
+	prox.wg.Wait()
 	return err
 }
 
-func (bal *Proxy) Stop() error {
+func (prox *Proxy) Stop() error {
 	var err error
-	for _, forw := range bal.Forwarders {
+	prox.mtx.Lock()
+	defer prox.mtx.Unlock()
+	for _, forw := range prox.Forwarders {
 		forw.Stop()
 	}
 	return err
 }
-
-func iocopy(ctx context.Context, writer io.Writer, reader io.Reader) (int64, error) {
-	var err error
-	var size int64
-	var halt bool
-	buffer := make([]byte, 1024*4)
-	for {
-		select {
-		case <-ctx.Done():
-			err = errors.New("Break copy by context")
-			break
-		default:
-		}
-		rsize, err := reader.Read(buffer)
-		if err == io.EOF {
-			err = nil
-			halt = true
-		}
-		if err != nil {
-			return size, err
-		}
-		wsize, err := writer.Write(buffer[0:rsize])
-		size += int64(wsize)
-		if err != nil {
-			return size, err
-		}
-		if halt {
-			break
-		}
-	}
-	return size, err
-}