Just check port and cport one place

Signed-off-by: hwware <[email protected]>

src/cluster.c

@@ -777,33 +777,6 @@ int isValidAuxString(char *s, unsigned int length) {
     return 1;
 }
 
-int parseAndValidateConnectionPorts(client *c, long long *port, long long *cport) {
-    if (getLongLongFromObject(c->argv[3], port) != C_OK) {
-        addReplyErrorFormat(c, "Invalid base port specified: %s", (char *)c->argv[3]->ptr);
-        return C_ERR;
-    }
-    if (*port <= 0 || *port > 65535) {
-        addReplyErrorFormat(c, "Port number is out of range");
-        return C_ERR;
-    }
-
-    if (c->argc == 5) {
-        if (getLongLongFromObject(c->argv[4], cport) != C_OK) {
-            addReplyErrorFormat(c, "Invalid bus port specified: %s", (char *)c->argv[4]->ptr);
-            return C_ERR;
-        }
-    } else {
-        *cport = *port + CLUSTER_PORT_INCR;
-    }
-
-    if (*cport <= 0 || *cport > 65535) {
-        addReplyErrorFormat(c, "Cport number is out of range");
-        return C_ERR;
-    }
-
-    return C_OK;
-}
-
 void clusterCommandMyId(client *c) {
     char *name = clusterNodeGetName(getMyClusterNode());
     if (name) {

src/cluster.h

@@ -133,5 +133,4 @@ int isNodeAvailable(clusterNode *node);
 long long getNodeReplicationOffset(clusterNode *node);
 sds aggregateClientOutputBuffer(client *c);
 void resetClusterStats(void);
-int parseAndValidateConnectionPorts(client *c, long long *port, long long *cport);
 #endif /* __CLUSTER_H */

src/cluster_legacy.c

@@ -6891,7 +6891,26 @@ int clusterCommandSpecial(client *c) {
         /* CLUSTER MEET <ip> <port> [cport] */
         long long port, cport;
 
-        if (parseAndValidateConnectionPorts(c, &port, &cport) == C_ERR) {
+        if (getLongLongFromObject(c->argv[3], &port) != C_OK) {
+            addReplyErrorFormat(c, "Invalid base port specified: %s", (char *)c->argv[3]->ptr);
+            return 1;
+        }
+        if (port <= 0 || port > 65535) {
+            addReplyErrorFormat(c, "Port number is out of range");
+            return 1;
+        }
+
+        if (c->argc == 5) {
+            if (getLongLongFromObject(c->argv[4], &cport) != C_OK) {
+                addReplyErrorFormat(c, "Invalid bus port specified: %s", (char *)c->argv[4]->ptr);
+                return 1;
+            }
+        } else {
+            cport = port + CLUSTER_PORT_INCR;
+        }
+
+        if (cport <= 0 || cport > 65535) {
+            addReplyErrorFormat(c, "Cport number is out of range");
             return 1;
         }