added noptcp interface (not working yet)

4 files changed, 87 insertions, 0 deletions

diff --git a/sample-config.toml b/sample-config.toml
index d0dc81f..a7db9dc 100644
--- a/sample-config.toml
+++ b/sample-config.toml
@@ -40,3 +40,6 @@ inputs = [ { number = 1, server = "master", channel = "main" },
 
   [clients.telnet]
   addr = "localhost:4023"
+
+  [clients.noptcp]
+  addr = "localhost:4079"
diff --git a/src/rhctl/conf.go b/src/rhctl/conf.go
index 3edacdc..30a5181 100644
--- a/src/rhctl/conf.go
+++ b/src/rhctl/conf.go
@@ -95,6 +95,9 @@ type Config struct {
 		Telnet struct {
 			Address string `toml:"addr"`
 		}
+		Noptcp struct {
+			Address string `toml:"addr"`
+		}
 	}
 }
 
diff --git a/src/rhctl/main.go b/src/rhctl/main.go
index 2302e6b..f09fe73 100644
--- a/src/rhctl/main.go
+++ b/src/rhctl/main.go
@@ -109,6 +109,11 @@ func main() {
 		return
 	}
 	web := WebInit(conf, ctrl)
+	nop, err := NopTCPInit(conf, ctrl)
+	if err != nil {
+		rhl.Printf("Error: failed to initialize nop-tcp interface: %v", err)
+		return
+	}
 
 	//**************************************************
 	// running essential parts
@@ -154,6 +159,14 @@ func main() {
 		}()
 	}
 
+	if conf.Clients.Noptcp.Address != "" {
+		go func() {
+			rhl.Printf("starting nop-tcp interface")
+			nop.Run()
+			rhl.Printf("nop-tcp interface just stopped")
+		}()
+	}
+
 	//**************************************************
 	<-stop
 	rhl.Printf("at least one essential part has stopped - bringing down the whole process")
diff --git a/src/rhctl/noptcp.go b/src/rhctl/noptcp.go
new file mode 100644
index 0000000..66495ec
--- /dev/null
+++ b/src/rhctl/noptcp.go
@@ -0,0 +1,68 @@
+//
+//  rhctl
+//
+//  Copyright (C) 2009-2016 Christian Pointner <equinox@helsinki.at>
+//
+//  This file is part of rhctl.
+//
+//  rhctl is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  any later version.
+//
+//  rhctl is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with rhctl. If not, see <http://www.gnu.org/licenses/>.
+//
+
+package main
+
+import (
+	"net"
+)
+
+type NopTCPInterface struct {
+	ln   net.Listener
+	ctrl *SwitchControl
+}
+
+func handleClient(con net.Conn, ctrl *SwitchControl) {
+	con.Write([]byte("hello world"))
+	con.Close()
+}
+
+func (nop *NopTCPInterface) Run() {
+	rhdl.Printf("NopTCP: handler running...")
+
+	for {
+		con, err := nop.ln.Accept()
+		if err != nil {
+			switch err.(type) {
+			case *net.OpError:
+				if !err.(*net.OpError).Temporary() {
+					rhl.Printf("NopTCP: server exiting: %s", err)
+					return
+				}
+			default:
+				rhl.Printf("NopTCP: server exiting: %s", err)
+				return
+			}
+		}
+		go handleClient(con, nop.ctrl)
+	}
+}
+
+func NopTCPInit(conf *Config, ctrl *SwitchControl) (nop *NopTCPInterface, err error) {
+	nop = &NopTCPInterface{}
+	nop.ctrl = ctrl
+	if nop.ln, err = net.Listen("tcp", conf.Clients.Noptcp.Address); err != nil {
+		return
+	}
+	rhdl.Printf("NopTCP: listening on %s", nop.ln.Addr())
+
+	return
+}