diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-08-14 11:14:13 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-08-14 11:14:13 +0100 |
| commit | ed8517465ea51080f87b18cd54a1341835cf9fd5 (patch) | |
| tree | aa4b0cdd1692ee901bd3db9967ce0795f849891d /src | |
| parent | 830d91423e5e83675c459bc7cea1e445a6a554ce (diff) | |
| download | rabbitmq-server-git-ed8517465ea51080f87b18cd54a1341835cf9fd5.tar.gz | |
Rename this thing for consistency and also RabbitMQ-specificness.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_channel.erl | 9 | ||||
| -rw-r--r-- | src/rabbit_exchange.erl | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 0301239a30..460818ab9b 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -143,7 +143,7 @@ send_command(Pid, Msg) -> deliver(Pid, ConsumerTag, AckRequired, Msg) -> gen_server2:cast(Pid, {deliver, ConsumerTag, AckRequired, Msg}). -deliver_fast_reply(<<"amq.consumer.", Enc/binary>>, Delivery) -> +deliver_fast_reply(<<"amq.rabbitmq.reply-to.", Enc/binary>>, Delivery) -> Pid = binary_to_term(base64:decode(Enc)), gen_server2:cast(Pid, {deliver_fast_reply, Delivery}). @@ -639,13 +639,14 @@ check_name(_Kind, NameBin) -> %% TODO this constitutes a security hole! maybe_set_fast_reply_to( - C = #content{properties = P = #'P_basic'{reply_to = <<"amq.reply-consumer">>}}, + C = #content{properties = P = #'P_basic'{reply_to = + <<"amq.rabbitmq.reply-to">>}}, #ch{reply_consumer = ReplyConsumer}) -> case ReplyConsumer of none -> rabbit_misc:protocol_error( not_allowed, "fast reply consumer does not exist", []); _ -> Self = base64:encode(term_to_binary(self())), - ReplyTo = <<"amq.consumer.", Self/binary>>, + ReplyTo = <<"amq.rabbitmq.reply-to.", Self/binary>>, rabbit_binary_generator:clear_encoded_content( C#content{properties = P#'P_basic'{reply_to = ReplyTo}}) end; @@ -806,7 +807,7 @@ handle_method(#'basic.get'{queue = QueueNameBin, no_ack = NoAck}, end; %% TODO we should support cancel! -handle_method(#'basic.consume'{queue = <<"amq.reply-to">>, +handle_method(#'basic.consume'{queue = <<"amq.rabbitmq.reply-to">>, consumer_tag = CTag0, no_ack = NoAck, nowait = NoWait}, diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index 94759cffef..c9ff0a1f60 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -357,8 +357,8 @@ route(#exchange{name = #resource{virtual_host = VHost, name = RName} = XName, lists:usort(route1(Delivery, SelectedDecorators, {[X], XName, []})) end. -fast_reply(<<"amq.consumer.", _/binary>>) -> true; -fast_reply(_) -> false. +fast_reply(<<"amq.rabbitmq.reply-to.", _/binary>>) -> true; +fast_reply(_) -> false. route1(_, _, {[], _, QNames}) -> QNames; |