Extract some header-munging functions into rabbit_basic (not sure that's the best place, but rabbit_misc is already overflowing and rabbit_headers did not seem justified).

1 files changed, 30 insertions, 2 deletions

diff --git a/src/rabbit_basic.erl b/src/rabbit_basic.erl
index 8fbb3983..a7b13511 100644
--- a/src/rabbit_basic.erl
+++ b/src/rabbit_basic.erl
@@ -19,8 +19,8 @@
 -include("rabbit_framing.hrl").
 
 -export([publish/4, publish/6, publish/1,
-         message/3, message/4, properties/1, delivery/4,
-         header_routes/1]).
+         message/3, message/4, properties/1, append_table_header/3,
+         extract_headers/1, replace_headers/2, delivery/4, header_routes/1]).
 -export([build_content/2, from_content/1]).
 
 %%----------------------------------------------------------------------------
@@ -32,6 +32,7 @@
 -type(publish_result() ::
         ({ok, rabbit_amqqueue:routing_result(), [pid()]}
          | rabbit_types:error('not_found'))).
+-type(headers() :: rabbit_framing:amqp_table() | 'undefined').
 
 -type(exchange_input() :: (rabbit_types:exchange() | rabbit_exchange:name())).
 -type(body_input() :: (binary() | [binary()])).
@@ -56,6 +57,15 @@
                         rabbit_types:ok_or_error2(rabbit_types:message(), any())).
 -spec(properties/1 ::
         (properties_input()) -> rabbit_framing:amqp_property_record()).
+
+-spec(append_table_header/3 ::
+        (binary(), rabbit_framing:amqp_table(), headers()) -> headers()).
+
+-spec(extract_headers/1 :: (rabbit_types:content()) -> headers()).
+
+-spec(replace_headers/2 :: (headers(), rabbit_types:content())
+                           -> rabbit_types:content()).
+
 -spec(header_routes/1 ::
         (undefined | rabbit_framing:amqp_table()) ->
                               [string()] | rabbit_types:error(any())).
@@ -170,6 +180,24 @@ properties(P) when is_list(P) ->
                         end
                 end, #'P_basic'{}, P).
 
+append_table_header(Name, Info, undefined) ->
+    append_table_header(Name, Info, []);
+append_table_header(Name, Info, Headers) ->
+    Prior = case rabbit_misc:table_lookup(Headers, Name) of
+                undefined          -> [];
+                {array, Existing}  -> Existing
+            end,
+    rabbit_misc:set_table_value(Headers, Name, array, [{table, Info} | Prior]).
+
+extract_headers(Content) ->
+    #content{properties = #'P_basic'{headers = Headers}} =
+        rabbit_binary_parser:ensure_content_decoded(Content),
+    Headers.
+
+replace_headers(Headers, Content = #content{properties = Props}) ->
+    rabbit_binary_generator:clear_encoded_content(
+      Content#content{properties = Props#'P_basic'{headers = Headers}}).
+
 indexof(L, Element) -> indexof(L, Element, 1).
 
 indexof([], _Element, _N)              -> 0;