5 files changed, 33 insertions, 4 deletions
diff --git a/scripts/rabbitmq-diagnostics.bat b/scripts/rabbitmq-diagnostics.bat
index 58b6c69e4f..311cfa3f5e 100644
--- a/scripts/rabbitmq-diagnostics.bat
+++ b/scripts/rabbitmq-diagnostics.bat
@@ -49,6 +49,8 @@ if not defined ERL_CRASH_DUMP_SECONDS (
 -boot !CLEAN_BOOT_FILE! ^
 -noinput -noshell -hidden -smp enable ^
 !RABBITMQ_CTL_ERL_ARGS! ^
+-kernel inet_dist_listen_min !RABBITMQ_CTL_DIST_PORT_MIN! ^
+-kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^
 -sasl errlog_type error ^
 -mnesia dir \""!RABBITMQ_MNESIA_DIR:\=/!"\" ^
 -nodename !RABBITMQ_NODENAME! ^
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index 614d50c996..e1518ff049 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -87,7 +87,7 @@ DEFAULT_SCHEDULER_BIND_TYPE="db"
 DEFAULT_DISTRIBUTION_BUFFER_SIZE=128000
 [ "x" = "x$RABBITMQ_DISTRIBUTION_BUFFER_SIZE" ] && RABBITMQ_DISTRIBUTION_BUFFER_SIZE=${DEFAULT_DISTRIBUTION_BUFFER_SIZE}
 
-## Common defaults
+## Common server defaults
 SERVER_ERL_ARGS="+P 1048576 +t 5000000 +stbt $RABBITMQ_SCHEDULER_BIND_TYPE +zdbbl $RABBITMQ_DISTRIBUTION_BUFFER_SIZE"
 
 # We save the current value of $RABBITMQ_PID_FILE in case it was set by
@@ -180,6 +180,7 @@ rmq_check_if_shared_with_mnesia() {
 
 DEFAULT_NODE_IP_ADDRESS=auto
 DEFAULT_NODE_PORT=5672
+
 [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
 [ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
 
@@ -190,6 +191,12 @@ DEFAULT_NODE_PORT=5672
 [ "x" = "x$RABBITMQ_DIST_PORT" ] && [ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_DIST_PORT=$((${DEFAULT_NODE_PORT} + 20000))
 [ "x" = "x$RABBITMQ_DIST_PORT" ] && [ "x" != "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_DIST_PORT=$((${RABBITMQ_NODE_PORT} + 20000))
 
+[ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS}
+[ "x" = "x$RABBITMQ_CTL_DIST_PORT_MIN" ] && RABBITMQ_CTL_DIST_PORT_MIN=${CTL_DIST_PORT_MIN}
+[ "x" = "x$RABBITMQ_CTL_DIST_PORT_MAX" ] && RABBITMQ_CTL_DIST_PORT_MAX=${CTL_DIST_PORT_MAX}
+[ "x" = "x$RABBITMQ_CTL_DIST_PORT_MIN" ] && RABBITMQ_CTL_DIST_PORT_MIN=$((${RABBITMQ_DIST_PORT} + 10000))
+[ "x" = "x$RABBITMQ_CTL_DIST_PORT_MAX" ] && RABBITMQ_CTL_DIST_PORT_MAX=$((${RABBITMQ_DIST_PORT} + 10010))
+
 [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
 [ "x" = "x$RABBITMQ_IO_THREAD_POOL_SIZE" ] && RABBITMQ_IO_THREAD_POOL_SIZE=${IO_THREAD_POOL_SIZE}
 [ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS=${SERVER_ERL_ARGS}
@@ -242,8 +249,6 @@ rmq_normalize_path_var RABBITMQ_LOGS
 
 rmq_normalize_path_var RABBITMQ_UPGRADE_LOG
 
-[ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS}
-
 # Check if files and directories non-related to Mnesia are configured
 # to be in $RABBITMQ_MNESIA_DIR. If this is the case, issue a warning
 # because it will prevent auto-clustering from working (the node will be
@@ -344,6 +349,8 @@ run_escript()
         -boot "${CLEAN_BOOT_FILE}" \
         -noinput -noshell -hidden -smp enable \
         ${RABBITMQ_CTL_ERL_ARGS} \
+        -kernel inet_dist_listen_min $RABBITMQ_CTL_DIST_PORT_MIN \
+        -kernel inet_dist_listen_max $RABBITMQ_CTL_DIST_PORT_MAX \
         -sasl errlog_type error \
         -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \
         -nodename "$RABBITMQ_NODENAME" \
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
index 4e23cdcd0e..58aa5a2ce7 100644
--- a/scripts/rabbitmq-env.bat
+++ b/scripts/rabbitmq-env.bat
@@ -333,11 +333,27 @@ if "!ERL_CRASH_DUMP!"=="" (
 )
 
 REM [ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS}
-if "!$RABBITMQ_CTL_ERL_ARGS!"=="" (
+if "!RABBITMQ_CTL_ERL_ARGS!"=="" (
     if not "!CTL_ERL_ARGS!"=="" (
         set RABBITMQ_CTL_ERL_ARGS=!CTL_ERL_ARGS!
     )
 )
+if "!RABBITMQ_CTL_DIST_PORT_MIN!"=="" (
+    if not "!CTL_DIST_PORT_MIN!"=="" (
+        set RABBITMQ_CTL_DIST_PORT_MIN=!CTL_DIST_PORT_MIN!
+    )
+)
+if "!RABBITMQ_CTL_DIST_PORT_MAX!"=="" (
+    if not "!CTL_DIST_PORT_MAX!"=="" (
+        set RABBITMQ_CTL_DIST_PORT_MAX=!CTL_DIST_PORT_MAX!
+    )
+)
+if "!RABBITMQ_CTL_DIST_PORT_MIN!"=="" (
+    set /a RABBITMQ_CTL_DIST_PORT_MIN=10000+!RABBITMQ_DIST_PORT!
+)
+if "!RABBITMQ_CTL_DIST_PORT_MAX!"=="" (
+    set /a RABBITMQ_CTL_DIST_PORT_MAX=10010+!RABBITMQ_DIST_PORT!
+)
 
 REM ADDITIONAL WINDOWS ONLY CONFIG ITEMS
 REM rabbitmq-plugins.bat
diff --git a/scripts/rabbitmq-plugins.bat b/scripts/rabbitmq-plugins.bat
index 443201e2f0..17471291cb 100644
--- a/scripts/rabbitmq-plugins.bat
+++ b/scripts/rabbitmq-plugins.bat
@@ -49,6 +49,8 @@ if not defined ERL_CRASH_DUMP_SECONDS (
 -boot !CLEAN_BOOT_FILE! ^
 -noinput -noshell -hidden -smp enable ^
 !RABBITMQ_CTL_ERL_ARGS! ^
+-kernel inet_dist_listen_min !RABBITMQ_CTL_DIST_PORT_MIN! ^
+-kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^
 -sasl errlog_type error ^
 -mnesia dir \""!RABBITMQ_MNESIA_DIR:\=/!"\" ^
 -nodename !RABBITMQ_NODENAME! ^
diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat
index 4980900f72..de94df6d57 100644
--- a/scripts/rabbitmqctl.bat
+++ b/scripts/rabbitmqctl.bat
@@ -49,6 +49,8 @@ if not defined ERL_CRASH_DUMP_SECONDS (
 -boot !CLEAN_BOOT_FILE! ^
 -noinput -noshell -hidden -smp enable ^
 !RABBITMQ_CTL_ERL_ARGS! ^
+-kernel inet_dist_listen_min !RABBITMQ_CTL_DIST_PORT_MIN! ^
+-kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^
 -sasl errlog_type error ^
 -mnesia dir \""!RABBITMQ_MNESIA_DIR:\=/!"\" ^
 -nodename !RABBITMQ_NODENAME! ^