Added interval and broken cli arguments into groups

Author: dzervas

inout/interval.go

@@ -0,0 +1,17 @@
+package inout
+
+import (
+	"io"
+	"time"
+)
+
+type Interval struct {
+	io.ReadWriteCloser
+	Interval int
+}
+
+func (this *Interval) Read(p []byte) (n int, err error) {
+	time.Sleep(time.Duration(this.Interval) * time.Second)
+	n, err = this.ReadWriteCloser.Read(p)
+	return n, err
+}

main.go

@@ -37,52 +37,65 @@ func NewReadWriteCloser(r io.Reader, w io.Writer, c io.Closer) io.ReadWriteClose
 var opts struct {
 	// This is already the behaviour. Probably too difficult (and no reason) to implement
 	// Close		bool		`short:"c" long:"close"         description:"Close connection on EOF from stdin"`
-	Detect		bool		`short:"D" long:"detect"        description:"Detect remote shell automatically and try to raise a TTY on the remote (action)"`
-	Exec		string		`short:"e" long:"exec"          description:"Program to exec after connect"`
-	// TODO
-	Gateway		[]string	`short:"g" long:"gateway"       description:"Source-routing hop point[s], up to 8"`
-	// TODO
-	Pointer		int			`short:"G" long:"pointer"       description:"Source-routing pointer:4, 8, 12, ..."`
-	// TODO
-	IdleTimeout	int			`short:"i" long:"interval"      description:"Delay interval for lines sent, ports scanned"`
+	// TODO: WTF is this?
+	// Gateway		[]string	`short:"g" long:"gateway"       description:"Source-routing hop point[s], up to 8"`
+	// TODO: WTF is this?
+	// Pointer		int			`short:"G" long:"pointer"       description:"Source-routing pointer:4, 8, 12, ..."`
 	Listen		bool		`short:"l" long:"listen"        description:"Listen mode, for inbound connects"`
-	// TODO
-	Tunnel		string		`short:"L" long:"tunnel"        description:"Forward local port to remote address"`
-	// TODO
-	DontResolve	bool		`short:"n" long:"dont-resolve"  description:"Numeric-only IP addresses, no DNS"`
-	// TODO
-	Output		string		`short:"o" long:"output"        description:"Output hexdump traffic to FILE (implies -x)"`
+	// TODO: Needs exposure of listen/dial conns
+	// DontResolve	bool		`short:"n" long:"dont-resolve"  description:"Numeric-only IP addresses, no DNS"`
 	Port		string		`short:"p" long:"local-port"    description:"Local port number"`
-	Protocol	string		`short:"P" long:"protocol"      description:"Provide protocol in the form of tcp{,4,6}|udp{,4,6}|unix{,gram,packet}|ip{,4,6}[:<protocol-number>|:<protocol-name>]\nFor <protocol-number> check https://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml"`
 	// Does not have any effect - even on netcat
 	Randomize	bool		`short:"r" long:"randomize"     description:"Randomize local and remote ports"`
-	Raw			bool		`short:"R" long:"auto-raw"      description:"Put local TTY in Raw mode on connect (action)"`
 	Source		string		`short:"s" long:"source"        description:"Local source address (ip or hostname)"`
-	TCP			bool		`short:"t" long:"tcp"           description:"TCP mode (default)"`
 	// TODO
 	Telnet		bool		`short:"T" long:"telnet"        description:"answer using TELNET negotiation"`
-	UDP			bool		`short:"u" long:"udp"           description:"UDP mode"`
 	// TODO
 	Verbose		bool		`short:"v" long:"verbose"       description:"-- Not effective, backwards compatibility"`
 	// TODO
 	Version		bool		`short:"V" long:"version"       description:"Output version information and exit"`
-	HexDump		bool		`short:"x" long:"hexdump"       description:"Hexdump incoming and outgoing traffic"`
-	// TODO
-	Wait		int			`short:"w" long:"wait"          description:"Timeout for connects and final net reads"`
-	Zero		bool		`short:"z" long:"zero"          description:"Zero-I/O mode (used for scanning)"`
+	// TODO: Needs exposure of listen/dial conns
+	// Wait		int			`short:"w" long:"wait"          description:"Timeout for connects and final net reads"`
 
 	Positional struct {
 		Hostname	string	`positional-arg-name:"hostname"`
 		Port		string	`positional-arg-name:"port"`
 	} `positional-args:"yes"`
 }
 
+var optsService struct {
+	Protocol	string		`short:"P" long:"protocol"      description:"Provide protocol in the form of tcp{,4,6}|udp{,4,6}|unix{,gram,packet}|ip{,4,6}[:<protocol-number>|:<protocol-name>]\nFor <protocol-number> check https://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml"`
+	TCP			bool		`short:"t" long:"tcp"           description:"TCP mode (default)"`
+	UDP			bool		`short:"u" long:"udp"           description:"UDP mode"`
+}
+
+var optsInOut struct {
+	// This is already the behaviour. Probably too difficult (and no reason) to implement
+	// Close		bool		`short:"c" long:"close"         description:"Close connection on EOF from stdin"`
+	Exec		string		`short:"e" long:"exec"          description:"Program to exec after connect"`
+	Interval	int			`short:"i" long:"interval"      description:"Delay interval for data sent, ports scanned"`
+	// TODO: Needs exposure of listen/dial conns
+	Tunnel		string		`short:"L" long:"tunnel"        description:"Forward local port to remote address"`
+	// TODO
+	Output		string		`short:"o" long:"output"        description:"Output hexdump traffic to FILE (implies -x)"`
+	HexDump		bool		`short:"x" long:"hexdump"       description:"Hexdump incoming and outgoing traffic"`
+	Zero		bool		`short:"z" long:"zero"          description:"Zero-I/O mode (used for scanning)"`
+}
+
+var optsAction struct {
+	Detect		bool		`short:"D" long:"detect"        description:"Detect remote shell automatically and try to raise a TTY on the remote" group:"Actions"`
+	Raw			bool		`short:"R" long:"auto-raw"      description:"Put local TTY in Raw mode on connect (action)"`
+}
+
 func main() {
 	// Arguments
 	// TODO: Break this into groups, in a different small function
 	// TODO: Add option name to all arguments (tunnel=<something>)
 	parser := flags.NewNamedParser("netcatty", flags.Default)
 	parser.AddGroup("Application Options", "", &opts)
+	parser.AddGroup("Service", "", &optsService)
+	parser.AddGroup("InOut", "", &optsInOut)
+	parser.AddGroup("Action", "", &optsAction)
 	_, err := parser.Parse()
 	if err != nil { return }
 
@@ -99,11 +112,11 @@ func main() {
 	address := strings.Join([]string{hostname, port}, ":")
 
 	protocol := "tcp"
-	if opts.UDP {
+	if optsService.UDP {
 		protocol = "udp"
 	}
-	if len(opts.Protocol) > 0 {
-		protocol = opts.Protocol
+	if len(optsService.Protocol) > 0 {
+		protocol = optsService.Protocol
 	}
 
 	// Logo & Help
@@ -114,10 +127,10 @@ func main() {
 	var ioc io.ReadWriteCloser
 	var actions []func(service.Server) action.Actor
 
-	if len(opts.Exec) > 0 {
-		ioc, err = inout.NewExec(opts.Exec)
+	if len(optsInOut.Exec) > 0 {
+		ioc, err = inout.NewExec(optsInOut.Exec)
 		handleErr(err)
-	} else if opts.Zero {
+	} else if optsInOut.Zero {
 		ioc, err = inout.NewZero()
 		handleErr(err)
 	} else {
@@ -135,20 +148,21 @@ func main() {
 
 		ioc = NewReadWriteCloser(in, t.Output(), t)
 
-		if opts.Raw {
+		if optsAction.Raw {
 			a := action.AutoRawActionGetter{t}
 			actions = append(actions, a.GetAutoRawAction)
 		}
 	}
 
-	if opts.HexDump { ioc = &inout.HexDump{ioc} }
+	if optsInOut.HexDump { ioc = &inout.HexDump{ioc} }
+	if optsInOut.Interval > 0 { ioc = &inout.Interval{ioc, optsInOut.Interval} }
 
 	// Service
 	var s service.Server
 	s = service.NewNet(ioc, protocol, address)
 
 	// Actions
-	if opts.Detect { action.NewRaiseTTY(s).Register() }
+	if optsAction.Detect { action.NewRaiseTTY(s).Register() }
 
 	for _, a := range actions {
 		a(s).Register()