diff options
| author | Tony Garnock-Jones <tonyg@kcbbs.gen.nz> | 2009-08-27 12:09:18 +0100 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@kcbbs.gen.nz> | 2009-08-27 12:09:18 +0100 |
| commit | 37c4ae97ae24892ce8f9fef815bb029721ae262f (patch) | |
| tree | b620f00369a80e3f6b9179aa1a49765482bdca94 /librabbitmq | |
| parent | 62fcf89ed4e4356033b65a9a3a99f47ff2e9581a (diff) | |
| parent | 80ffcbabdb628ad4c1cd19c0b9ff398cf63f9a7f (diff) | |
| download | rabbitmq-c-github-ask-37c4ae97ae24892ce8f9fef815bb029721ae262f.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 4c135b1..51bf0ae 100644 --- a/librabbitmq/amqp.h +++ b/librabbitmq/amqp.h @@ -269,7 +269,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 a52d947..a3c8839 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 d29dcd6..78cb8ba 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; } @@ -371,8 +378,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 }; result = amqp_simple_rpc(state, 0, diff --git a/librabbitmq/codegen.py b/librabbitmq/codegen.py index 2775bb2..42eed5e 100644 --- a/librabbitmq/codegen.py +++ b/librabbitmq/codegen.py @@ -373,6 +373,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: |