diff options
| author | Tony Garnock-Jones <tonygarnockjones@gmail.com> | 2010-02-16 10:12:09 +1300 |
|---|---|---|
| committer | Tony Garnock-Jones <tonygarnockjones@gmail.com> | 2010-02-16 10:12:09 +1300 |
| commit | 896df535ac9d877ca239c95003d55c8fee5ef047 (patch) | |
| tree | 886e95a0be88b28bc29ed3110d7392abc07f47c9 /librabbitmq | |
| parent | 70a8af23ff8a5b2219d6655ae223248f1e0c0826 (diff) | |
| parent | 26642b7d1d2cc1ac337f06d5a0765079386975bb (diff) | |
| download | rabbitmq-c-github-ask-896df535ac9d877ca239c95003d55c8fee5ef047.tar.gz | |
Merge default into amqp_0_9_1
Diffstat (limited to 'librabbitmq')
| -rw-r--r-- | librabbitmq/amqp.h | 3 | ||||
| -rw-r--r-- | librabbitmq/amqp_api.c | 5 | ||||
| -rw-r--r-- | librabbitmq/amqp_socket.c | 11 | ||||
| -rw-r--r-- | librabbitmq/codegen.py | 1 |
4 files changed, 15 insertions, 5 deletions
diff --git a/librabbitmq/amqp.h b/librabbitmq/amqp.h index a2b062c..749671d 100644 --- a/librabbitmq/amqp.h +++ b/librabbitmq/amqp.h @@ -396,7 +396,8 @@ extern struct amqp_basic_consume_ok_t_ *amqp_basic_consume(amqp_connection_state amqp_bytes_t consumer_tag, amqp_boolean_t no_local, amqp_boolean_t no_ack, - amqp_boolean_t exclusive); + amqp_boolean_t exclusive, + amqp_table_t filter); extern int amqp_basic_ack(amqp_connection_state_t state, amqp_channel_t channel, diff --git a/librabbitmq/amqp_api.c b/librabbitmq/amqp_api.c index 4bd035d..8adf3f0 100644 --- a/librabbitmq/amqp_api.c +++ b/librabbitmq/amqp_api.c @@ -175,12 +175,13 @@ amqp_basic_consume_ok_t *amqp_basic_consume(amqp_connection_state_t state, amqp_bytes_t consumer_tag, amqp_boolean_t no_local, amqp_boolean_t no_ack, - amqp_boolean_t exclusive) + amqp_boolean_t exclusive, + amqp_table_t filter) { amqp_rpc_reply = AMQP_SIMPLE_RPC(state, channel, BASIC, CONSUME, CONSUME_OK, amqp_basic_consume_t, - 0, queue, consumer_tag, no_local, no_ack, exclusive, 0); + 0, queue, consumer_tag, no_local, no_ack, exclusive, 0, filter); return RPC_REPLY(amqp_basic_consume_ok_t); } diff --git a/librabbitmq/amqp_socket.c b/librabbitmq/amqp_socket.c index 0149e7c..c6412a9 100644 --- a/librabbitmq/amqp_socket.c +++ b/librabbitmq/amqp_socket.c @@ -50,10 +50,17 @@ static char *header() { header[1] = 'M'; header[2] = 'Q'; header[3] = 'P'; +#ifndef USE_MODERN_AMQP_PROTOCOL_HEADER header[4] = 1; header[5] = 1; header[6] = AMQP_PROTOCOL_VERSION_MAJOR; header[7] = AMQP_PROTOCOL_VERSION_MINOR; +#else + header[4] = 0; + header[5] = AMQP_PROTOCOL_VERSION_MAJOR; + header[6] = AMQP_PROTOCOL_VERSION_MINOR; + header[7] = AMQP_PROTOCOL_VERSION_REVISION; +#endif return header; } @@ -388,8 +395,8 @@ amqp_rpc_reply_t amqp_login(amqp_connection_state_t state, amqp_connection_open_t s = (amqp_connection_open_t) { .virtual_host = amqp_cstring_bytes(vhost), - .capabilities = {.len = 0, .bytes = NULL}, - .insist = 1 + .deprecated_capabilities = {.len = 0, .bytes = NULL}, + .deprecated_insist = 1 }; amqp_method_number_t replies[] = { AMQP_CONNECTION_OPEN_OK_METHOD, 0 }; result = amqp_simple_rpc(state, diff --git a/librabbitmq/codegen.py b/librabbitmq/codegen.py index ef6ad42..b5250be 100644 --- a/librabbitmq/codegen.py +++ b/librabbitmq/codegen.py @@ -395,6 +395,7 @@ extern "C" { """ print "#define AMQP_PROTOCOL_VERSION_MAJOR %d" % (spec.major) print "#define AMQP_PROTOCOL_VERSION_MINOR %d" % (spec.minor) + print "#define AMQP_PROTOCOL_VERSION_REVISION %d" % (spec.revision) print "#define AMQP_PROTOCOL_PORT %d" % (spec.port) for (c,v,cls) in spec.constants: |