removed the need to use port flag for protocols that do not have the …

…notion of a port (eg. icmp)
greenstatic · Aug 17, 2018 · eecf0e8 · eecf0e8
1 parent 8b3f7b9
commit eecf0e8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/cmd/openspa-client/cmd/request.go b/cmd/openspa-client/cmd/request.go
@@ -207,13 +207,13 @@ var requestCmd = &cobra.Command{
 			return
 		}
 
-		// Parse ports
-		if startPort == 0 {
-			log.Error("Port cannot be 0")
+		if !tools.PortCanBeZero(protocolByte) && startPort == 0 {
+			log.Error("Protocol requires port")
 			os.Exit(badPrameters)
 			return
 		}
 
+		// Parse ports
 		if endPort == 0 {
 			endPort = startPort
 		}
@@ -283,7 +283,7 @@ func init() {
 	requestCmd.Flags().StringVar(&echoIPv6Server, "echo-ipv6-server", ipresolver.DefaultEchoIpV6Server,
 		"The IPv6 Echo-IP server to use for automatic public IP discovery (can be a domain or IP address)")
 
-	requestCmd.MarkFlagRequired("port")
+	//requestCmd.MarkFlagRequired("port")
 
 	rootCmd.AddCommand(requestCmd)
 }
@@ -399,6 +399,7 @@ func request(clientPrivKey *rsa.PrivateKey, clientPubKey *rsa.PublicKey, serverP
 		}
 
 		log.WithFields(log.Fields{
+			"protocol": tools.ConvertProtoByteToStr(resp.Payload.Protocol),
 			"startPort": resp.Payload.StartPort,
 			"endPort":   resp.Payload.EndPort,
 			"duration":  resp.Payload.Duration,

diff --git a/internal/client/version.go b/internal/client/version.go
@@ -4,6 +4,6 @@ import "fmt"
 
 const VersionMajor = 0
 const VersionMinor = 1
-const VersionBugfix = 0
+const VersionBugfix = 1
 
 var Version = fmt.Sprintf("%d.%d.%d", VersionMajor, VersionMinor, VersionBugfix)
diff --git a/internal/server/version.go b/internal/server/version.go
@@ -4,6 +4,6 @@ import "fmt"
 
 const VersionMajor = 0
 const VersionMinor = 1
-const VersionBugfix = 0
+const VersionBugfix = 1
 
 var Version = fmt.Sprintf("%d.%d.%d", VersionMajor, VersionMinor, VersionBugfix)