Instead I'm just going to have it assume it's a server now.

README.md.asc

@@ -170,12 +170,12 @@ figure I give it a web interface to configure stuff with.
 TLS configuration is experimental.
 -----BEGIN PGP SIGNATURE-----
 
-iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAluZwxsACgkQ11wDs5te
-FOHOgggAtCZwOhsiXIkEhl5uAEYWQL7u0YLs0E6vHQfAHfRvBoKtAPpDOzPRvvDC
-BcLBCgTpmqZRehFPLnd866hoX/mThprZ5A6+9ec3X+EwCmRbNrl+/JMQhiDcnE2C
-zCezs+jPcwBEkQfpgTaXiOPMOcJbSJ56qOktx3UAEf4rjJ1zZmBKdKWODXmq355q
-tt8dn95baVKL4ZgwtmMwcrI0FCIKLX9/LYBJhqGxR6SV8GyipYaF0qK8RXEMqlno
-IuldZJkQO/6IEhDN1yYfO7VjyTIZIWGNY3peFz5wcSkIVIw1/nJZwsipwQ/dUNA5
-bavLRtB5bvDNIMu8JTaXk+U0q8JBEA==
-=9hAD
+iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAluZxRMACgkQ11wDs5te
+FOFFIAf/f37rIx0HD/P68WsDaWiKoONZj9R/5qpWVvP5V/cgzjCAClcyytjg6uo9
+eMuxudOJTmeJyJFKDXrinn2BtgVslpijMxZt+bpO1VGDLFnoqS3QJsg4auUldv8d
+HlTuKFZYwMmpp3IKGVJG7C4K9Aj1hTkdD5fEVcBzTZlN6Fib8+DQLkt0dZNAea3d
+Fuyyoz71PQS3DOa6SQuvkmh9N4kcO5XyB2+FWxOcVvnuWXLwQTBcznPUzsmWlbaL
+xzNHGJphJ2fNTKNJmJ8RPQg8XsO+iBO7XjGzbwSM4jaip1JZ+lV8O5F5DQ6jZBxW
+SXZ6AeGQK3lioaOqeVIue0ka5s4vfw==
+=EgAK
 -----END PGP SIGNATURE-----

forwarder-client.go

@@ -18,6 +18,7 @@ type SAMClientForwarder struct {
 	SamHost string
 	SamPort string
 	TunName string
+    Type    string
 
 	TargetHost string
 	TargetPort string
@@ -200,6 +201,7 @@ func NewSAMClientForwarderFromOptions(opts ...func(*SAMClientForwarder) error) (
 	s.closeIdle = "false"
 	s.closeIdleTime = "300000"
 	s.dest = "none"
+    s.Type = "client"
 	for _, o := range opts {
 		if err := o(&s); err != nil {
 			return nil, err

manager/manager-options.go

@@ -39,7 +39,7 @@ func SetManagerPort(s string) func(*SAMManager) error {
 	return func(c *SAMManager) error {
 		port, err := strconv.Atoi(s)
 		if err != nil {
-			return fmt.Errorf("Invalid Server Port %s; non-number ", s)
+			return fmt.Errorf("Invalid Manager Server Port %s; non-number ", s)
 		}
 		if port < 65536 && port > -1 {
 			c.ServerPort = s
@@ -62,7 +62,7 @@ func SetManagerSAMPort(s string) func(*SAMManager) error {
 	return func(c *SAMManager) error {
 		port, err := strconv.Atoi(s)
 		if err != nil {
-			return fmt.Errorf("Invalid SAM Port %s; non-number", s)
+			return fmt.Errorf("Invalid Manager SAM Port %s; non-number", s)
 		}
 		if port < 65536 && port > -1 {
 			c.SamPort = s

udp/forwarder-client-udp.go

@@ -20,6 +20,7 @@ type SAMSSUClientForwarder struct {
 	SamHost string
 	SamPort string
 	TunName string
+    Type    string
 
 	TargetHost string
 	TargetPort string
@@ -204,6 +205,7 @@ func NewSAMSSUClientForwarderFromOptions(opts ...func(*SAMSSUClientForwarder) er
 	s.closeIdleTime = "30"
 	s.reduceIdleQuantity = "4"
 	s.dest = "none"
+    s.Type = "udpclient"
 	for _, o := range opts {
 		if err := o(&s); err != nil {
 			return nil, err

udp/forwarder-udp.go

@@ -20,6 +20,7 @@ type SAMSSUForwarder struct {
 	SamHost string
 	SamPort string
 	TunName string
+    Type    string
 
 	TargetHost string
 	TargetPort string
@@ -206,6 +207,7 @@ func NewSAMSSUForwarderFromOptions(opts ...func(*SAMSSUForwarder) error) (*SAMSS
 	s.closeIdle = "false"
 	s.closeIdleTime = "300000"
 	s.reduceIdleQuantity = "4"
+    s.Type = "udpserver"
 	for _, o := range opts {
 		if err := o(&s); err != nil {
 			return nil, err