From dcbe230a40f223d1e651cbd5d5626dee8d5c71b7 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 18 Jun 2013 21:09:19 +0000 Subject: QPID-4745: Alternative port allocation for tests, instead of 'qpidd --port=0' qpidd-p0 script binds a new port to a socket using bind(0), and then execs qpidd using the --socket-fd option to pass the socket to qpidd. It is intended to replace /path/to/qpidd --port 0 with qpidd-p0 /path/to/qpidd Most tests do not yet use qpidd-p0, they will be updated in a future commit. Changes: - Added qpidd-p0 - Fixed qpidd port printing logic: print port only if --port=0, regardless of --transport. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1494306 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/posix/QpiddBroker.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'qpid/cpp/src/posix') diff --git a/qpid/cpp/src/posix/QpiddBroker.cpp b/qpid/cpp/src/posix/QpiddBroker.cpp index 1968cbb588..831b2e0641 100644 --- a/qpid/cpp/src/posix/QpiddBroker.cpp +++ b/qpid/cpp/src/posix/QpiddBroker.cpp @@ -132,8 +132,8 @@ struct QpiddDaemon : public Daemon { /** Code for parent process */ void parent() { uint16_t port = wait(options->daemon.wait); - if (options->parent->broker.port == 0 || options->daemon.transport != TCP) - cout << port << endl; + if (options->parent->broker.port == 0 + ) cout << port << endl; } /** Code for forked child process */ @@ -196,7 +196,7 @@ int QpiddBroker::execute (QpiddOptions *options) { boost::intrusive_ptr brokerPtr(new Broker(options->broker)); ScopedSetBroker ssb(brokerPtr); brokerPtr->accept(); - if (options->broker.port == 0 || myOptions->daemon.transport != TCP) { + if (options->broker.port == 0) { uint16_t port = brokerPtr->getPort(myOptions->daemon.transport); cout << port << endl; if (options->broker.enableMgmt) { -- cgit v1.2.1