fix #146 (interface cleanup) - fix #148 (listeners api not working)

Author: Nicolas Chatelain

cmd/proxy/app/daemon.go

@@ -365,11 +365,25 @@ func StartLigoloApi() {
 				c.JSON(http.StatusInternalServerError, gin.H{"error": "invalid agent"})
 				return
 			}
-			if _, err := AgentList[listenerRequest.AgentID].AddListener(listenerRequest.ListenerAddr, listenerRequest.Network, listenerRequest.RedirectAddr); err != nil {
+			CurrentAgent := AgentList[listenerRequest.AgentID]
+			proxyListener, err := CurrentAgent.AddListener(listenerRequest.ListenerAddr, listenerRequest.Network, listenerRequest.RedirectAddr)
+			if err != nil {
 				c.Error(err)
 				c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 				return
 			}
+
+			go func() {
+				err := proxyListener.StartRelay()
+				if err != nil {
+					logrus.WithFields(logrus.Fields{"listener": proxyListener.String(), "agent": CurrentAgent.Name, "id": CurrentAgent.SessionID}).Error("Listener relay failed with error: ", err)
+					return
+				}
+
+				logrus.WithFields(logrus.Fields{"listener": proxyListener.String(), "agent": CurrentAgent.Name, "id": CurrentAgent.SessionID}).Warning("Listener ended without error.")
+				return
+			}()
+
 			c.JSON(http.StatusOK, gin.H{"message": "listener created"})
 		})
 

cmd/proxy/app/interfaces.go

@@ -115,7 +115,7 @@ func init() {
 			if ifName == "" {
 				return errors.New("please specify a valid interface using --name [interface]")
 			}
-			if len(config.GetInterfaceRoutesConfig(ifName)) > 0 {
+			if config.GetInterfaceConfig(ifName) != nil {
 				if ask("Remove all interface routes and settings from config?") {
 					if err := config.DeleteInterfaceConfig(ifName); err != nil {
 						return err

cmd/proxy/config/ifconfig.go

@@ -203,9 +203,15 @@ func AddInterfaceConfig(ifName string) error {
 	return nil
 }
 
-func GetInterfaceRoutesConfig(ifName string) []string {
-	configPath := fmt.Sprintf("interface.%s.routes", ifName)
-	return Config.GetStringSlice(configPath)
+func GetInterfaceConfig(ifName string) *InterfaceConfig {
+	var ifaceInfo map[string]InterfaceConfig
+	// Unmarshal current interfaces config
+	Config.UnmarshalKey("interface", &ifaceInfo)
+	// Check if empty interface
+	if iface, ok := ifaceInfo[ifName]; ok {
+		return &iface
+	}
+	return nil
 }
 
 func DeleteInterfaceConfig(ifName string) error {

pkg/agent/handler.go

@@ -278,7 +278,12 @@ func HandleConn(conn net.Conn) {
 			if err := encoder.Encode(listenerResponse); err != nil {
 				logrus.Error(err)
 			}
-			go relay.StartRelay(conn, udplistener)
+			go func() {
+				err := relay.StartRelay(conn, udplistener)
+				if err != nil {
+					logrus.Error(err)
+				}
+			}()
 		}
 
 		listenerID++