diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-02-28 12:53:38 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-02-28 12:53:38 +0000 |
| commit | ffaa1deb9e3313dc3a9c7ac223d49e7db521d210 (patch) | |
| tree | 59110196d97620c65d7ea8d06d53f982663dd79d /include | |
| parent | 0b06530a5532549f7de8d57d624fac546961fb97 (diff) | |
| parent | 438c93a18a874cbf888aeb0e7766f336caccac15 (diff) | |
| download | rabbitmq-server-git-ffaa1deb9e3313dc3a9c7ac223d49e7db521d210.tar.gz | |
Merging default into bug23554
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit.hrl | 11 | ||||
| -rw-r--r-- | include/rabbit_auth_mechanism_spec.hrl | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 327867c75e..086ac115cf 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -54,9 +54,15 @@ -record(binding, {source, key, destination, args = []}). -record(reverse_binding, {destination, key, source, args = []}). +-record(topic_trie_edge, {trie_edge, node_id}). +-record(topic_trie_binding, {trie_binding, value = const}). + +-record(trie_edge, {exchange_name, node_id, word}). +-record(trie_binding, {exchange_name, node_id, destination}). + -record(listener, {node, protocol, host, ip_address, port}). --record(basic_message, {exchange_name, routing_key, content, guid, +-record(basic_message, {exchange_name, routing_keys = [], content, guid, is_persistent}). -record(ssl_socket, {tcp, ssl}). @@ -81,6 +87,9 @@ -define(DESIRED_HIBERNATE, 10000). -define(STATS_INTERVAL, 5000). +-define(ROUTING_HEADERS, [<<"CC">>, <<"BCC">>]). +-define(DELETED_HEADER, <<"BCC">>). + -ifdef(debug). -define(LOGDEBUG0(F), rabbit_log:debug(F)). -define(LOGDEBUG(F,A), rabbit_log:debug(F,A)). diff --git a/include/rabbit_auth_mechanism_spec.hrl b/include/rabbit_auth_mechanism_spec.hrl index 49614d5f9c..614a3eed07 100644 --- a/include/rabbit_auth_mechanism_spec.hrl +++ b/include/rabbit_auth_mechanism_spec.hrl @@ -17,6 +17,7 @@ -ifdef(use_specs). -spec(description/0 :: () -> [{atom(), any()}]). +-spec(should_offer/1 :: (rabbit_net:socket()) -> boolean()). -spec(init/1 :: (rabbit_net:socket()) -> any()). -spec(handle_response/2 :: (binary(), any()) -> {'ok', rabbit_types:user()} | |