[qpid-dispatch/el6] Backported DISPATCH-51 and added openstack config

[Ted Ross]

commit 770a405243c6a080a2d9fce45acac17ec4007000
Author: Ted Ross <tross at redhat.com>
Date:   Mon Jul 28 16:31:48 2014 -0400

    Backported DISPATCH-51 and added openstack config

 0004-dispatch-51-address_semantics.patch |   31 +++++++++++++++++++
 0005-Add-OS-Config.patch                 |   48 ++++++++++++++++++++++++++++++
 qpid-dispatch.spec                       |    5 +++
 3 files changed, 84 insertions(+), 0 deletions(-)
---
diff --git a/0004-dispatch-51-address_semantics.patch b/0004-dispatch-51-address_semantics.patch
new file mode 100644
index 0000000..d1475a7
--- /dev/null
+++ b/0004-dispatch-51-address_semantics.patch
@@ -0,0 +1,31 @@
+diff -up ./src/router_private.h.orig ./src/router_private.h
+--- ./src/router_private.h.orig	2014-04-24 16:18:19.118407920 +0100
++++ ./src/router_private.h	2014-04-24 16:23:43.747417206 +0100
+@@ -203,4 +203,6 @@ void qd_router_mobile_added(qd_router_t
+ void qd_router_mobile_removed(qd_router_t *router, const char *addr);
+ void qd_router_link_lost(qd_router_t *router, int link_mask_bit);
+ 
++qd_address_semantics_t router_semantics_for_addr(qd_router_t *router, qd_field_iterator_t *iter);
++
+ #endif
+diff -up ./src/router_pynode.c.orig ./src/router_pynode.c
+--- ./src/router_pynode.c.orig	2014-04-24 16:17:58.128407319 +0100
++++ ./src/router_pynode.c	2014-04-24 16:20:41.028411979 +0100
+@@ -27,7 +27,6 @@
+ #include "router_private.h"
+ 
+ static qd_address_semantics_t router_addr_semantics = QD_FANOUT_SINGLE | QD_BIAS_CLOSEST | QD_CONGESTION_DROP | QD_DROP_FOR_SLOW_CONSUMERS | QD_BYPASS_VALID_ORIGINS;
+-static qd_address_semantics_t default_semantics     = QD_FANOUT_SINGLE | QD_BIAS_CLOSEST | QD_CONGESTION_DROP | QD_DROP_FOR_SLOW_CONSUMERS;
+ 
+ static qd_log_source_t *log_source = 0;
+ static PyObject        *pyRouter   = 0;
+@@ -388,7 +387,8 @@ static PyObject* qd_map_destination(PyOb
+         DEQ_ITEM_INIT(addr);
+         DEQ_INIT(addr->rlinks);
+         DEQ_INIT(addr->rnodes);
+-        addr->semantics = default_semantics; // FIXME - Add provisioned semantics here.
++        addr->semantics = router_semantics_for_addr(router, iter);
++        qd_field_iterator_reset_view(iter, ITER_VIEW_ADDRESS_HASH);
+         qd_hash_insert(router->addr_hash, iter, addr, &addr->hash_handle);
+         DEQ_ITEM_INIT(addr);
+         DEQ_INSERT_TAIL(router->addrs, addr);
diff --git a/0005-Add-OS-Config.patch b/0005-Add-OS-Config.patch
new file mode 100644
index 0000000..582efd2
--- /dev/null
+++ b/0005-Add-OS-Config.patch
@@ -0,0 +1,48 @@
+commit fc7dce0e7fcb075d50bac48ee2e2eb158172e19a
+Author: Ted Ross <tross at redhat.com>
+Date:   Mon Jul 28 16:29:07 2014 -0400
+
+    Added OpenStack config
+
+diff --git a/etc/qdrouterd.conf b/etc/qdrouterd.conf
+index cb77d80..43989a0 100644
+--- a/etc/qdrouterd.conf
++++ b/etc/qdrouterd.conf
+@@ -41,18 +41,34 @@ router {
+ }
+ 
+ fixed-address {
+-    prefix: /closest/
++    prefix: /closest
+     fanout: single
+     bias: closest
+ }
+ 
+ fixed-address {
+-    prefix: /multicast/
++    prefix: /unicast
++    fanout: single
++    bias: closest
++}
++
++fixed-address {
++    prefix: /exclusive
++    fanout: single
++    bias: closest
++}
++
++fixed-address {
++    prefix: /multicast
+     fanout: multiple
+ }
+ 
+ fixed-address {
+-    prefix: /
++    prefix: /broadcast
+     fanout: multiple
+ }
+ 
++fixed-address {
++    prefix: /
++    fanout: multiple
++}
diff --git a/qpid-dispatch.spec b/qpid-dispatch.spec
index 43412a0..0498ffc 100644
--- a/qpid-dispatch.spec
+++ b/qpid-dispatch.spec
@@ -14,6 +14,8 @@ Source0:       http://www.apache.org/dist/qpid/dispatch/%{version}/qpid-dispatch
 Patch01: 0001-NO-JIRA-Systemd-control-file-for-qdrouterd.patch
 Patch02: 0002-NO-JIRA-SysVInit-script-for-qdrouterd.patch
 Patch03: 0003-Back-ported-daemon-changes-from-DISPATCH-63.patch
+Patch04: 0004-dispatch-51-address_semantics.patch
+Patch05: 0005-Add-OS-Config.patch
 
 BuildRequires: qpid-proton-c-devel >= %{proton_minimum_version}
 BuildRequires: python-devel
@@ -199,6 +201,9 @@ Requires: libqpid-dispatch%{?_isa} = %{version}
 %patch03 -p1
 %endif
 
+%patch04 -p1
+%patch05 -p1
+
 %build
 %cmake -DDOC_INSTALL_DIR=%{?_pkgdocdir} \
        -DCMAKE_BUILD_TYPE=RelWithDebInfo \