NO-JIRA: restrict broker to listen only on loopback interface (which is all that gets used by clients) in order to avoid port collisions

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1492778 13f79535-47bb-0310-9956-ffa450edef68

13 files changed, 22 insertions, 20 deletions

diff --git a/cpp/src/tests/BrokerFixture.h b/cpp/src/tests/BrokerFixture.h
index 4ce8315c15..bc23867ee1 100644
--- a/cpp/src/tests/BrokerFixture.h
+++ b/cpp/src/tests/BrokerFixture.h
@@ -56,6 +56,7 @@ struct  BrokerFixture : private boost::noncopyable {
             qpid::log::Logger::instance().configure(logOpts);
         }
         opts.port=0;
+        opts.listenInterfaces.push_back("127.0.0.1");
         // Management doesn't play well with multiple in-process brokers.
         opts.enableMgmt=enableMgmt;
         opts.workerThreads=1;
diff --git a/cpp/src/tests/dynamic_log_hires_timestamp b/cpp/src/tests/dynamic_log_hires_timestamp
index afe79cc9b3..f312b8ba9b 100755
--- a/cpp/src/tests/dynamic_log_hires_timestamp
+++ b/cpp/src/tests/dynamic_log_hires_timestamp
@@ -36,7 +36,7 @@ error() {
 }
 
 rm -rf $LOG_FILE
-PORT=$($QPIDD_EXEC --auth=no --no-module-dir --daemon --port=0 --log-to-file $LOG_FILE) || error "Could not start broker"
+PORT=$($QPIDD_EXEC --auth=no --no-module-dir --daemon --port=0  --interface 127.0.0.1 --log-to-file $LOG_FILE) || error "Could not start broker"
 
 echo Broker for log highres timestamp test started on $PORT, pid is $($QPIDD_EXEC --no-module-dir --check --port $PORT)
 
diff --git a/cpp/src/tests/dynamic_log_level_test b/cpp/src/tests/dynamic_log_level_test
index 7548e40683..a80510ad08 100755
--- a/cpp/src/tests/dynamic_log_level_test
+++ b/cpp/src/tests/dynamic_log_level_test
@@ -43,7 +43,7 @@ checklog() {
 }
 
 rm -rf $LOG_FILE
-PORT=$($QPIDD_EXEC --auth=no --no-module-dir --daemon --port=0 --log-to-file $LOG_FILE) || error "Could not start broker"
+PORT=$($QPIDD_EXEC --auth=no --no-module-dir --daemon --port=0  --interface 127.0.0.1 --log-to-file $LOG_FILE) || error "Could not start broker"
 
 echo Broker for log level test started on $PORT, pid is $($QPIDD_EXEC --no-module-dir --check --port $PORT)
 
diff --git a/cpp/src/tests/federated_topic_test b/cpp/src/tests/federated_topic_test
index 2e55ddcfaa..2d31f9af5a 100755
--- a/cpp/src/tests/federated_topic_test
+++ b/cpp/src/tests/federated_topic_test
@@ -47,7 +47,7 @@ source ./test_env.sh
 trap stop_brokers EXIT
 
 start_broker() {
-    $QPIDD_EXEC --daemon --port 0 --no-module-dir --no-data-dir --auth no > qpidd.port
+    $QPIDD_EXEC --daemon --port 0 --interface 127.0.0.1 --no-module-dir --no-data-dir --auth no > qpidd.port
 }
 
 start_brokers() {
diff --git a/cpp/src/tests/interlink_tests.py b/cpp/src/tests/interlink_tests.py
index 129283ac24..9900ef45f1 100755
--- a/cpp/src/tests/interlink_tests.py
+++ b/cpp/src/tests/interlink_tests.py
@@ -250,6 +250,7 @@ class AmqpBrokerTest(BrokerTest):
     def amqp_broker(self):
         assert BrokerTest.amqp_lib, "Cannot locate AMQP 1.0 plug-in"
         args = ["--load-module", BrokerTest.amqp_lib,
+                "--interface=127.0.0.1",
                 "--max-negotiate-time=600000",
                 "--log-enable=trace+:Protocol",
                 "--log-enable=info+"]
diff --git a/cpp/src/tests/run_acl_tests b/cpp/src/tests/run_acl_tests
index 0fff6de1b8..5985401fa4 100755
--- a/cpp/src/tests/run_acl_tests
+++ b/cpp/src/tests/run_acl_tests
@@ -29,13 +29,13 @@ DATA_DIRQ=`pwd`/data_dirq
 trap stop_brokers INT TERM QUIT
 
 start_brokers() {
-    ../qpidd --daemon --port 0 --no-module-dir --data-dir $DATA_DIR --load-module $ACL_LIB --acl-file policy.acl --auth no --log-enable trace+:acl  --log-to-file local.log > qpidd.port
+    ../qpidd --daemon --port 0 --interface 127.0.0.1 --no-module-dir --data-dir $DATA_DIR --load-module $ACL_LIB --acl-file policy.acl --auth no --log-enable trace+:acl  --log-to-file local.log > qpidd.port
     LOCAL_PORT=`cat qpidd.port`
-    ../qpidd --daemon --port 0 --no-module-dir --data-dir $DATA_DIRI --load-module $ACL_LIB --acl-file policy.acl --auth no --connection-limit-per-ip 2   --log-to-file locali.log > qpiddi.port
+    ../qpidd --daemon --port 0 --interface 127.0.0.1 --no-module-dir --data-dir $DATA_DIRI --load-module $ACL_LIB --acl-file policy.acl --auth no --connection-limit-per-ip 2   --log-to-file locali.log > qpiddi.port
     LOCAL_PORTI=`cat qpiddi.port`
-    ../qpidd --daemon --port 0 --no-module-dir --data-dir $DATA_DIRU --load-module $ACL_LIB --acl-file policy.acl --auth no --connection-limit-per-user 2 --log-to-file localu.log > qpiddu.port
+    ../qpidd --daemon --port 0 --interface 127.0.0.1 --no-module-dir --data-dir $DATA_DIRU --load-module $ACL_LIB --acl-file policy.acl --auth no --connection-limit-per-user 2 --log-to-file localu.log > qpiddu.port
     LOCAL_PORTU=`cat qpiddu.port`
-    ../qpidd --daemon --port 0 --no-module-dir --data-dir $DATA_DIRQ --load-module $ACL_LIB --acl-file policy.acl --auth no --max-queues-per-user 2      --log-to-file localq.log > qpiddq.port
+    ../qpidd --daemon --port 0 --interface 127.0.0.1 --no-module-dir --data-dir $DATA_DIRQ --load-module $ACL_LIB --acl-file policy.acl --auth no --max-queues-per-user 2      --log-to-file localq.log > qpiddq.port
     LOCAL_PORTQ=`cat qpiddq.port`
 }
 
@@ -56,13 +56,13 @@ start_noacl_auth_brokers() {
 	echo Creating sasl database
 	. $srcdir/sasl_test_setup.sh
     fi
-    ../qpidd --daemon --port 0 --no-module-dir --data-dir $DATA_DIR --auth yes --sasl-config=$sasl_config_file --log-to-file local.log > qpidd.port
+    ../qpidd --daemon --port 0 --interface 127.0.0.1 --no-module-dir --data-dir $DATA_DIR --auth yes --sasl-config=$sasl_config_file --log-to-file local.log > qpidd.port
     LOCAL_PORT=`cat qpidd.port`
-    ../qpidd --daemon --port 0 --no-module-dir --data-dir $DATA_DIRI --auth yes --sasl-config=$sasl_config_file --log-to-file locali.log > qpiddi.port
+    ../qpidd --daemon --port 0 --interface 127.0.0.1 --no-module-dir --data-dir $DATA_DIRI --auth yes --sasl-config=$sasl_config_file --log-to-file locali.log > qpiddi.port
     LOCAL_PORTI=`cat qpiddi.port`
-    ../qpidd --daemon --port 0 --no-module-dir --data-dir $DATA_DIRU --auth yes --sasl-config=$sasl_config_file --log-to-file localu.log > qpiddu.port
+    ../qpidd --daemon --port 0 --interface 127.0.0.1 --no-module-dir --data-dir $DATA_DIRU --auth yes --sasl-config=$sasl_config_file --log-to-file localu.log > qpiddu.port
     LOCAL_PORTU=`cat qpiddu.port`
-    ../qpidd --daemon --port 0 --no-module-dir --data-dir $DATA_DIRQ --auth yes --sasl-config=$sasl_config_file --log-to-file localq.log > qpiddq.port
+    ../qpidd --daemon --port 0 --interface 127.0.0.1 --no-module-dir --data-dir $DATA_DIRQ --auth yes --sasl-config=$sasl_config_file --log-to-file localq.log > qpiddq.port
     LOCAL_PORTQ=`cat qpiddq.port`
 }
 
diff --git a/cpp/src/tests/run_federation_sys_tests b/cpp/src/tests/run_federation_sys_tests
index d9a9649c37..46f7b3de59 100755
--- a/cpp/src/tests/run_federation_sys_tests
+++ b/cpp/src/tests/run_federation_sys_tests
@@ -42,7 +42,7 @@ SKIPTESTS="${SKIPTESTS} -i federation_sys.C_* -i federation_sys.D_*"
 
 start_brokers() {
     start_broker() {
-        ${QPIDD_EXEC} --daemon --port 0 --auth no --no-data-dir $1 > qpidd.port
+        ${QPIDD_EXEC} --daemon --port 0 --interface 127.0.0.1 --auth no --no-data-dir $1 > qpidd.port
         PORT=`cat qpidd.port`
         eval "$2=${PORT}"
     }
diff --git a/cpp/src/tests/run_headers_federation_tests b/cpp/src/tests/run_headers_federation_tests
index a4584e6884..afbbf144ee 100644
--- a/cpp/src/tests/run_headers_federation_tests
+++ b/cpp/src/tests/run_headers_federation_tests
@@ -26,9 +26,9 @@ source ./test_env.sh
 trap stop_brokers INT TERM QUIT
 
 start_brokers() {
-    ../qpidd --daemon --port 0 --no-data-dir --no-module-dir --auth no > qpidd.port
+    ../qpidd --daemon --port 0 --interface 127.0.0.1 --no-data-dir --no-module-dir --auth no > qpidd.port
     LOCAL_PORT=`cat qpidd.port`
-    ../qpidd --daemon --port 0 --no-data-dir --no-module-dir --auth no > qpidd.port
+    ../qpidd --daemon --port 0 --interface 127.0.0.1 --no-data-dir --no-module-dir --auth no > qpidd.port
     REMOTE_PORT=`cat qpidd.port`
 }
 
diff --git a/cpp/src/tests/run_queue_redirect b/cpp/src/tests/run_queue_redirect
index f38b5a6c50..412b5689ab 100755
--- a/cpp/src/tests/run_queue_redirect
+++ b/cpp/src/tests/run_queue_redirect
@@ -27,7 +27,7 @@ trap stop_brokers INT TERM QUIT
 
 start_brokers() {
     $QPIDD_EXEC --daemon \
-             --port 0 \
+             --port 0 --interface 127.0.0.1 \
              --no-module-dir \
              --data-dir $DATA_DIR \
              --load-module $ACL_LIB \
diff --git a/cpp/src/tests/sasl_fed b/cpp/src/tests/sasl_fed
index bd7b15f2d8..1403056e6e 100755
--- a/cpp/src/tests/sasl_fed
+++ b/cpp/src/tests/sasl_fed
@@ -54,7 +54,7 @@ echo acl allow all all > $tmp_root/sasl_fed.acl
 #echo " Starting broker 1"
 #--------------------------------------------------
 $QPIDD_EXEC                                  \
-  -p 0                                       \
+  -p 0  --interface 127.0.0.1                \
   --data-dir $tmp_root/data_1                \
   --auth=yes                                 \
   --mgmt-enable=yes                          \
@@ -73,7 +73,7 @@ broker_1_port=`cat $tmp_root/broker_1_port`
 #echo " Starting broker 2"
 #--------------------------------------------------
 $QPIDD_EXEC                                  \
-  -p 0                                       \
+  -p 0 --interface 127.0.0.1                 \
   --data-dir $tmp_root/data_2                \
   --auth=yes                                 \
   --mgmt-enable=yes                          \
diff --git a/cpp/src/tests/sasl_no_dir b/cpp/src/tests/sasl_no_dir
index 15a36014bb..5d657deb3a 100755
--- a/cpp/src/tests/sasl_no_dir
+++ b/cpp/src/tests/sasl_no_dir
@@ -64,7 +64,7 @@ mv ${sasl_config_dir} ${sasl_config_dir}-
 print " Starting broker"
 #--------------------------------------------------
 $QPIDD_EXEC                                  \
-  -p 0                                       \
+  -p 0  --interface 127.0.0.1                \
   --no-data-dir                              \
   --auth=yes                                 \
   --mgmt-enable=yes                          \
diff --git a/cpp/src/tests/ssl_test b/cpp/src/tests/ssl_test
index b99a487a06..166892eeb0 100755
--- a/cpp/src/tests/ssl_test
+++ b/cpp/src/tests/ssl_test
@@ -100,7 +100,7 @@ COMMON_OPTS="--daemon --config $CONFIG --load-module $SSL_LIB --ssl-cert-db $CER
 start_brokers() {
     local -a ports
     for (( i=0; $i<$1; i++)) do
-    ports[$i]=$($QPIDD_EXEC --port 0 $COMMON_OPTS $2) || error "Could not start broker $i"
+    ports[$i]=$($QPIDD_EXEC --port 0 --interface 127.0.0.1 $COMMON_OPTS $2) || error "Could not start broker $i"
     done
     PORTS=( ${PORTS[@]} ${ports[@]} )
 }
diff --git a/cpp/src/tests/start_broker b/cpp/src/tests/start_broker
index 352830a95c..6eea38e0f8 100755
--- a/cpp/src/tests/start_broker
+++ b/cpp/src/tests/start_broker
@@ -21,4 +21,4 @@
 
 # Start a test broker.
 srcdir=`dirname $0`
-exec $srcdir/run_test ../qpidd --auth=no --no-module-dir --daemon --port=0 --log-to-file qpidd.log "$@" > qpidd.port
+exec $srcdir/run_test ../qpidd --auth=no --no-module-dir --daemon --port=0 --interface 127.0.0.1 --log-to-file qpidd.log "$@" > qpidd.port