This is an automated email from the ASF dual-hosted git repository.
astitcher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/main by this push:
new bad6d9c64 PROTON-2871: Give generated protocol constants better names
bad6d9c64 is described below
commit bad6d9c649798199c4449943979d518dc28d84fb
Author: Andrew Stitcher <astitc...@apache.org>
AuthorDate: Wed Aug 7 11:11:59 2024 -0400
PROTON-2871: Give generated protocol constants better names
* These names are purely internal so this doesn't change any API.
* Adding an AMQP_xxx prefix makes these constants easier to search.
* Also makes them stand out more clearly as generated.
---
c/src/core/dispatcher.c | 34 +++++++++++++--------------
c/src/core/emitters.h | 2 +-
c/src/core/message.c | 62 ++++++++++++++++++++++++-------------------------
c/src/core/transport.c | 48 +++++++++++++++++++-------------------
c/src/protocol.h.py | 17 ++++++++++----
c/src/sasl/sasl.c | 10 ++++----
6 files changed, 90 insertions(+), 83 deletions(-)
diff --git a/c/src/core/dispatcher.c b/c/src/core/dispatcher.c
index d96422e89..b9d577c81 100644
--- a/c/src/core/dispatcher.c
+++ b/c/src/core/dispatcher.c
@@ -48,30 +48,30 @@ static inline int pni_dispatch_action(pn_transport_t*
transport, uint64_t lcode,
case AMQP_FRAME_TYPE:
/* Regular AMQP frames */
switch (lcode) {
- case OPEN: action = pn_do_open; break;
- case BEGIN: action = pn_do_begin; break;
- case ATTACH: action = pn_do_attach; break;
- case FLOW: action = pn_do_flow; break;
- case TRANSFER: action = pn_do_transfer; break;
- case DISPOSITION: action = pn_do_disposition; break;
- case DETACH: action = pn_do_detach; break;
- case END: action = pn_do_end; break;
- case CLOSE: action = pn_do_close; break;
- default: action = pni_bad_frame; break;
+ case AMQP_DESC_OPEN: action = pn_do_open; break;
+ case AMQP_DESC_BEGIN: action = pn_do_begin; break;
+ case AMQP_DESC_ATTACH: action = pn_do_attach; break;
+ case AMQP_DESC_FLOW: action = pn_do_flow; break;
+ case AMQP_DESC_TRANSFER: action = pn_do_transfer; break;
+ case AMQP_DESC_DISPOSITION: action = pn_do_disposition; break;
+ case AMQP_DESC_DETACH: action = pn_do_detach; break;
+ case AMQP_DESC_END: action = pn_do_end; break;
+ case AMQP_DESC_CLOSE: action = pn_do_close; break;
+ default: action = pni_bad_frame; break;
};
break;
case SASL_FRAME_TYPE:
/* SASL frames */
switch (lcode) {
- case SASL_MECHANISMS: action = pn_do_mechanisms; break;
- case SASL_INIT: action = pn_do_init; break;
- case SASL_CHALLENGE: action = pn_do_challenge; break;
- case SASL_RESPONSE: action = pn_do_response; break;
- case SASL_OUTCOME: action = pn_do_outcome; break;
- default: action = pni_bad_frame; break;
+ case AMQP_DESC_SASL_MECHANISMS: action = pn_do_mechanisms; break;
+ case AMQP_DESC_SASL_INIT: action = pn_do_init; break;
+ case AMQP_DESC_SASL_CHALLENGE: action = pn_do_challenge; break;
+ case AMQP_DESC_SASL_RESPONSE: action = pn_do_response; break;
+ case AMQP_DESC_SASL_OUTCOME: action = pn_do_outcome; break;
+ default: action = pni_bad_frame; break;
};
break;
- default: action = pni_bad_frame_type; break;
+ default: action = pni_bad_frame_type; break;
};
return action(transport, frame_type, channel, frame_payload);
}
diff --git a/c/src/core/emitters.h b/c/src/core/emitters.h
index 0483fc3e4..f92425b62 100644
--- a/c/src/core/emitters.h
+++ b/c/src/core/emitters.h
@@ -592,7 +592,7 @@ static inline void emit_condition(pni_emitter_t* emitter,
pni_compound_context*
return;
}
- emit_descriptor(emitter, compound0, ERROR);
+ emit_descriptor(emitter, compound0, AMQP_DESC_ERROR);
for (bool small_encoding = true; ; small_encoding = false) {
pni_compound_context c = emit_list(emitter, compound0, small_encoding,
true);
pni_compound_context compound = c;
diff --git a/c/src/core/message.c b/c/src/core/message.c
index 4242087b3..787a5ba09 100644
--- a/c/src/core/message.c
+++ b/c/src/core/message.c
@@ -188,7 +188,7 @@ void pn_message_inspect(void *obj, pn_fixed_string_t *dst)
comma = true;
}
- if (msg->priority != HEADER_PRIORITY_DEFAULT) {
+ if (msg->priority != AMQP_HEADER_PRIORITY_DEFAULT) {
pn_fixed_string_addf(dst, "priority=%u, ", msg->priority);
comma = true;
}
@@ -338,7 +338,7 @@ static pn_message_t *pni_message_new(size_t size)
static const pn_class_t clazz = PN_CLASS(pn_message);
pn_message_t *msg = (pn_message_t *) pn_class_new(&clazz, size);
msg->durable = false;
- msg->priority = HEADER_PRIORITY_DEFAULT;
+ msg->priority = AMQP_HEADER_PRIORITY_DEFAULT;
msg->ttl = 0;
msg->first_acquirer = false;
msg->delivery_count = 0;
@@ -398,7 +398,7 @@ void pn_message_free(pn_message_t *msg)
void pn_message_clear(pn_message_t *msg)
{
msg->durable = false;
- msg->priority = HEADER_PRIORITY_DEFAULT;
+ msg->priority = AMQP_HEADER_PRIORITY_DEFAULT;
msg->ttl = 0;
msg->first_acquirer = false;
msg->delivery_count = 0;
@@ -748,7 +748,7 @@ int pn_message_decode(pn_message_t *msg, const char *bytes,
size_t size)
}
switch (desc) {
- case HEADER: {
+ case AMQP_DESC_HEADER: {
bool priority_q;
uint8_t priority;
pn_amqp_decode_DqEoQBIoIe(msg_bytes,
@@ -757,10 +757,10 @@ int pn_message_decode(pn_message_t *msg, const char
*bytes, size_t size)
&msg->ttl,
&msg->first_acquirer,
&msg->delivery_count);
- msg->priority = priority_q ? priority : HEADER_PRIORITY_DEFAULT;
+ msg->priority = priority_q ? priority : AMQP_HEADER_PRIORITY_DEFAULT;
break;
}
- case PROPERTIES: {
+ case AMQP_DESC_PROPERTIES: {
pn_bytes_t user_id, address, subject, reply_to, ctype, cencoding,
group_id, reply_to_group_id;
pn_atom_t id;
@@ -794,30 +794,30 @@ int pn_message_decode(pn_message_t *msg, const char
*bytes, size_t size)
if (err) return pn_error_format(msg->error, err, "error setting
reply_to_group_id");
break;
}
- case DELIVERY_ANNOTATIONS: {
+ case AMQP_DESC_DELIVERY_ANNOTATIONS: {
pn_amqp_decode_DqR(msg_bytes, &instructions_bytes);
break;
}
- case MESSAGE_ANNOTATIONS: {
+ case AMQP_DESC_MESSAGE_ANNOTATIONS: {
pn_amqp_decode_DqR(msg_bytes, &annotations_bytes);
break;
}
- case APPLICATION_PROPERTIES: {
+ case AMQP_DESC_APPLICATION_PROPERTIES: {
pn_amqp_decode_DqR(msg_bytes, &properties_bytes);
break;
}
- case DATA:
- case AMQP_SEQUENCE: {
+ case AMQP_DESC_DATA:
+ case AMQP_DESC_AMQP_SEQUENCE: {
msg->inferred = true;
pn_amqp_decode_DqR(msg_bytes, &body_bytes);
break;
}
- case AMQP_VALUE: {
+ case AMQP_DESC_AMQP_VALUE: {
msg->inferred = false;
pn_amqp_decode_DqR(msg_bytes, &body_bytes);
break;
}
- case FOOTER:
+ case AMQP_DESC_FOOTER:
break;
default: {
pn_amqp_decode_R(msg_bytes, &unknown_section_bytes);
@@ -856,9 +856,9 @@ int pn_message_encode(pn_message_t *msg, char *bytes,
size_t *isize)
size_t total = 0;
/* "DL[?o?B?I?o?I]" */
- size_t last_size = pn_amqp_encode_bytes_DLEQoQBQIQoQIe(bytes, remaining,
HEADER,
+ size_t last_size = pn_amqp_encode_bytes_DLEQoQBQIQoQIe(bytes, remaining,
AMQP_DESC_HEADER,
msg->durable, msg->durable,
- msg->priority!=HEADER_PRIORITY_DEFAULT, msg->priority,
+ msg->priority!=AMQP_HEADER_PRIORITY_DEFAULT,
msg->priority,
(bool)msg->ttl, msg->ttl,
msg->first_acquirer, msg->first_acquirer,
(bool)msg->delivery_count, msg->delivery_count);
@@ -870,7 +870,7 @@ int pn_message_encode(pn_message_t *msg, char *bytes,
size_t *isize)
if (msg->instructions_raw.size>0) {
- last_size = pn_amqp_encode_bytes_DLR(bytes, remaining,
DELIVERY_ANNOTATIONS, msg->instructions_raw);
+ last_size = pn_amqp_encode_bytes_DLR(bytes, remaining,
AMQP_DESC_DELIVERY_ANNOTATIONS, msg->instructions_raw);
if (last_size > remaining) return PN_OVERFLOW;
remaining -= last_size;
@@ -879,7 +879,7 @@ int pn_message_encode(pn_message_t *msg, char *bytes,
size_t *isize)
}
if (msg->annotations_raw.size>0) {
- last_size = pn_amqp_encode_bytes_DLR(bytes, remaining,
MESSAGE_ANNOTATIONS, msg->annotations_raw);
+ last_size = pn_amqp_encode_bytes_DLR(bytes, remaining,
AMQP_DESC_MESSAGE_ANNOTATIONS, msg->annotations_raw);
if (last_size > remaining) return PN_OVERFLOW;
remaining -= last_size;
@@ -890,7 +890,7 @@ int pn_message_encode(pn_message_t *msg, char *bytes,
size_t *isize)
/* "DL[CzSSSCss?t?tS?IS]" */
pn_atom_t id = pn_message_get_id(msg);
pn_atom_t correlation_id = pn_message_get_correlation_id(msg);
- last_size = pn_amqp_encode_bytes_DLEazSSSassQtQtSQISe(bytes, remaining,
PROPERTIES,
+ last_size = pn_amqp_encode_bytes_DLEazSSSassQtQtSQISe(bytes, remaining,
AMQP_DESC_PROPERTIES,
&id,
pn_string_size(msg->user_id), pn_string_get(msg->user_id),
pn_string_bytes(msg->address),
@@ -916,7 +916,7 @@ int pn_message_encode(pn_message_t *msg, char *bytes,
size_t *isize)
total += last_size;
if (msg->properties_raw.size>0) {
- last_size = pn_amqp_encode_bytes_DLR(bytes, remaining,
APPLICATION_PROPERTIES, msg->properties_raw);
+ last_size = pn_amqp_encode_bytes_DLR(bytes, remaining,
AMQP_DESC_APPLICATION_PROPERTIES, msg->properties_raw);
if (last_size > remaining) return PN_OVERFLOW;
remaining -= last_size;
@@ -925,17 +925,17 @@ int pn_message_encode(pn_message_t *msg, char *bytes,
size_t *isize)
}
if (msg->body_raw.size>0) {
- uint64_t descriptor = AMQP_VALUE;
+ uint64_t descriptor = AMQP_DESC_AMQP_VALUE;
if (msg->inferred) {
switch ((uint8_t)msg->body_raw.start[0]) {
case PNE_VBIN8:
case PNE_VBIN32:
- descriptor = DATA;
+ descriptor = AMQP_DESC_DATA;
break;
case PNE_LIST0:
case PNE_LIST8:
case PNE_LIST32:
- descriptor = AMQP_SEQUENCE;
+ descriptor = AMQP_DESC_AMQP_SEQUENCE;
break;
}
}
@@ -954,9 +954,9 @@ int pn_message_encode(pn_message_t *msg, char *bytes,
size_t *isize)
int pn_message_data(pn_message_t *msg, pn_data_t *data)
{
pn_data_clear(data);
- int err = pn_data_fill(data, "DL[?o?B?I?o?I]", HEADER,
+ int err = pn_data_fill(data, "DL[?o?B?I?o?I]", AMQP_DESC_HEADER,
msg->durable, msg->durable,
- msg->priority!=HEADER_PRIORITY_DEFAULT, msg->priority,
+ msg->priority!=AMQP_HEADER_PRIORITY_DEFAULT,
msg->priority,
(bool)msg->ttl, msg->ttl,
msg->first_acquirer, msg->first_acquirer,
(bool)msg->delivery_count, msg->delivery_count);
@@ -966,7 +966,7 @@ int pn_message_data(pn_message_t *msg, pn_data_t *data)
if (pn_data_size(msg->instructions_deprecated)) {
pn_data_rewind(msg->instructions_deprecated);
- err = pn_data_fill(data, "DLC", DELIVERY_ANNOTATIONS,
msg->instructions_deprecated);
+ err = pn_data_fill(data, "DLC", AMQP_DESC_DELIVERY_ANNOTATIONS,
msg->instructions_deprecated);
if (err)
return pn_error_format(msg->error, err, "data error: %s",
pn_error_text(pn_data_error(data)));
@@ -974,7 +974,7 @@ int pn_message_data(pn_message_t *msg, pn_data_t *data)
if (pn_data_size(msg->annotations_deprecated)) {
pn_data_rewind(msg->annotations_deprecated);
- err = pn_data_fill(data, "DLC", MESSAGE_ANNOTATIONS,
msg->annotations_deprecated);
+ err = pn_data_fill(data, "DLC", AMQP_DESC_MESSAGE_ANNOTATIONS,
msg->annotations_deprecated);
if (err)
return pn_error_format(msg->error, err, "data error: %s",
pn_error_text(pn_data_error(data)));
@@ -982,7 +982,7 @@ int pn_message_data(pn_message_t *msg, pn_data_t *data)
pn_atom_t id = pn_message_get_id(msg);
pn_atom_t correlation_id = pn_message_get_correlation_id(msg);
- err = pn_data_fill(data, "DL[azSSSass?t?tS?IS]", PROPERTIES,
+ err = pn_data_fill(data, "DL[azSSSass?t?tS?IS]", AMQP_DESC_PROPERTIES,
&id,
pn_string_size(msg->user_id), pn_string_get(msg->user_id),
pn_string_get(msg->address),
@@ -1007,7 +1007,7 @@ int pn_message_data(pn_message_t *msg, pn_data_t *data)
if (pn_data_size(msg->properties_deprecated)) {
pn_data_rewind(msg->properties_deprecated);
- err = pn_data_fill(data, "DLC", APPLICATION_PROPERTIES,
msg->properties_deprecated);
+ err = pn_data_fill(data, "DLC", AMQP_DESC_APPLICATION_PROPERTIES,
msg->properties_deprecated);
if (err)
return pn_error_format(msg->error, err, "data error: %s",
pn_error_text(pn_data_error(data)));
@@ -1018,14 +1018,14 @@ int pn_message_data(pn_message_t *msg, pn_data_t *data)
pn_data_next(msg->body_deprecated);
pn_type_t body_type = pn_data_type(msg->body_deprecated);
- uint64_t descriptor = AMQP_VALUE;
+ uint64_t descriptor = AMQP_DESC_AMQP_VALUE;
if (msg->inferred) {
switch (body_type) {
case PN_BINARY:
- descriptor = DATA;
+ descriptor = AMQP_DESC_DATA;
break;
case PN_LIST:
- descriptor = AMQP_SEQUENCE;
+ descriptor = AMQP_DESC_AMQP_SEQUENCE;
break;
default:
break;
diff --git a/c/src/core/transport.c b/c/src/core/transport.c
index d89625797..1fced2f84 100644
--- a/c/src/core/transport.c
+++ b/c/src/core/transport.c
@@ -437,7 +437,7 @@ static void pn_transport_initialize(void *object)
transport->remote_container = NULL;
transport->remote_hostname = NULL;
transport->local_max_frame = PN_DEFAULT_MAX_FRAME_SIZE;
- transport->remote_max_frame = OPEN_MAX_FRAME_SIZE_DEFAULT;
+ transport->remote_max_frame = AMQP_OPEN_MAX_FRAME_SIZE_DEFAULT;
/*
* We set the local limit on channels to 2^15, because
@@ -451,7 +451,7 @@ static void pn_transport_initialize(void *object)
*/
// There is no constraint yet from remote peer,
// so set to max possible.
- transport->remote_channel_max = OPEN_CHANNEL_MAX_DEFAULT;
+ transport->remote_channel_max = AMQP_OPEN_CHANNEL_MAX_DEFAULT;
transport->local_channel_max = PN_IMPL_CHANNEL_MAX;
transport->channel_max = transport->local_channel_max;
@@ -870,7 +870,7 @@ static int pni_post_amqp_transfer_frame(pn_transport_t
*transport, uint16_t ch,
compute_performatives:;
/* "DL[IIzI?o?on?DLC?o?o?o]" */
pn_bytes_t performative =
- pn_amqp_encode_DLEIIzIQoQondQoQoQoe(&transport->scratch_space, TRANSFER,
+ pn_amqp_encode_DLEIIzIQoQondQoQoQoe(&transport->scratch_space,
AMQP_DESC_TRANSFER,
handle,
id,
tag.size, tag.start,
@@ -920,7 +920,7 @@ static int pni_post_close(pn_transport_t *transport,
pn_condition_t *cond)
if (!cond && transport->connection) {
cond = pn_connection_condition(transport->connection);
}
- pn_bytes_t buf = pn_amqp_encode_DLEce(&transport->scratch_space, CLOSE,
cond);
+ pn_bytes_t buf = pn_amqp_encode_DLEce(&transport->scratch_space,
AMQP_DESC_CLOSE, cond);
return pn_framing_send_amqp(transport, 0, buf);
}
@@ -1028,8 +1028,8 @@ int pn_do_open(pn_transport_t *transport, uint8_t
frame_type, uint16_t channel,
* find them in the args, so don't give the variable
* directly to the scanner.
*/
- transport->remote_channel_max = remote_channel_max_q ? remote_channel_max :
OPEN_CHANNEL_MAX_DEFAULT;
- transport->remote_max_frame = remote_max_frame_q ? remote_max_frame :
OPEN_MAX_FRAME_SIZE_DEFAULT;
+ transport->remote_channel_max = remote_channel_max_q ? remote_channel_max :
AMQP_OPEN_CHANNEL_MAX_DEFAULT;
+ transport->remote_max_frame = remote_max_frame_q ? remote_max_frame :
AMQP_OPEN_MAX_FRAME_SIZE_DEFAULT;
if (transport->remote_max_frame > 0) {
if (transport->remote_max_frame < AMQP_MIN_MAX_FRAME_SIZE) {
@@ -1257,9 +1257,9 @@ int pn_do_attach(pn_transport_t *transport, uint8_t
frame_type, uint16_t channel
} else {
uint64_t code = 0;
pn_amqp_decode_DqEqqqqqDqqDLqqqqe(payload, &code);
- if (code == COORDINATOR) {
+ if (code == AMQP_DESC_COORDINATOR) {
pn_terminus_set_type(rtgt, PN_COORDINATOR);
- } else if (code == TARGET) {
+ } else if (code == AMQP_DESC_TARGET) {
pn_terminus_set_type(rtgt, PN_TARGET);
} else {
pn_terminus_set_type(rtgt, PN_UNSPECIFIED);
@@ -1837,14 +1837,14 @@ static int pni_process_conn_setup(pn_transport_t
*transport, pn_endpoint_t *endp
pni_switch_to_raw_multiple(&transport->scratch_space,
&connection->offered_capabilities, &connection->offered_capabilities_raw);
pni_switch_to_raw_multiple(&transport->scratch_space,
&connection->desired_capabilities, &connection->desired_capabilities_raw);
pni_switch_to_raw(&transport->scratch_space, &connection->properties,
&connection->properties_raw);
- pn_bytes_t buf =
pn_amqp_encode_DLESSQIQHQInnMMRe(&transport->scratch_space, OPEN,
+ pn_bytes_t buf =
pn_amqp_encode_DLESSQIQHQInnMMRe(&transport->scratch_space, AMQP_DESC_OPEN,
cid,
pn_string_bytes(connection->hostname),
// TODO: This is messy, because we also have to
allow local_max_frame_ to be 0 to mean unlimited
// otherwise flow control goes wrong
- transport->local_max_frame!=0 &&
transport->local_max_frame!=OPEN_MAX_FRAME_SIZE_DEFAULT,
+ transport->local_max_frame!=0 &&
transport->local_max_frame!=AMQP_OPEN_MAX_FRAME_SIZE_DEFAULT,
transport->local_max_frame,
-
transport->channel_max!=OPEN_CHANNEL_MAX_DEFAULT, transport->channel_max,
+
transport->channel_max!=AMQP_OPEN_CHANNEL_MAX_DEFAULT, transport->channel_max,
(bool)idle_timeout, idle_timeout,
connection->offered_capabilities_raw,
connection->desired_capabilities_raw,
@@ -1940,7 +1940,7 @@ static int pni_process_ssn_setup(pn_transport_t
*transport, pn_endpoint_t *endpo
state->incoming_window = pni_session_incoming_window(ssn);
state->outgoing_window = pni_session_outgoing_window(ssn);
/* "DL[?HIIII]" */
- pn_bytes_t buf = pn_amqp_encode_DLEQHIIIIe(&transport->scratch_space,
BEGIN,
+ pn_bytes_t buf = pn_amqp_encode_DLEQHIIIIe(&transport->scratch_space,
AMQP_DESC_BEGIN,
((int16_t) state->remote_channel >= 0),
state->remote_channel,
state->outgoing_transfer_count,
state->incoming_window,
@@ -2006,13 +2006,13 @@ static int pni_process_link_setup(pn_transport_t
*transport, pn_endpoint_t *endp
pni_switch_to_raw_multiple(&transport->scratch_space,
&link->source.capabilities, &link->source.capabilities_raw);
pni_switch_to_raw_multiple(&transport->scratch_space,
&link->target.capabilities, &link->target.capabilities_raw);
if (link->target.type == PN_COORDINATOR) {
- pn_bytes_t buf =
pn_amqp_encode_DLESIoBBQDLESIsIoRQsRnRReDLERennIe(&transport->scratch_space,
ATTACH,
+ pn_bytes_t buf =
pn_amqp_encode_DLESIoBBQDLESIsIoRQsRnRReDLERennIe(&transport->scratch_space,
AMQP_DESC_ATTACH,
pn_string_bytes(link->name),
state->local_handle,
endpoint->type == RECEIVER,
link->snd_settle_mode,
link->rcv_settle_mode,
- (bool) link->source.type, SOURCE,
+ (bool) link->source.type, AMQP_DESC_SOURCE,
pn_string_bytes(link->source.address),
link->source.durability,
expiry_symbol(&link->source),
@@ -2023,21 +2023,21 @@ static int pni_process_link_setup(pn_transport_t
*transport, pn_endpoint_t *endp
link->source.filter_raw,
link->source.outcomes_raw,
link->source.capabilities_raw,
- COORDINATOR, link->target.capabilities_raw,
+ AMQP_DESC_COORDINATOR,
link->target.capabilities_raw,
0);
int err = pn_framing_send_amqp(transport, ssn_state->local_channel,
buf);
if (err) return err;
} else {
pni_switch_to_raw(&transport->scratch_space, &link->properties,
&link->properties_raw);
pni_switch_to_raw(&transport->scratch_space, &link->target.properties,
&link->target.properties_raw);
- pn_bytes_t buf =
pn_amqp_encode_DLESIoBBQDLESIsIoRQsRnMMeQDLESIsIoRMennILnnRe(&transport->scratch_space,
ATTACH,
+ pn_bytes_t buf =
pn_amqp_encode_DLESIoBBQDLESIsIoRQsRnMMeQDLESIsIoRMennILnnRe(&transport->scratch_space,
AMQP_DESC_ATTACH,
pn_string_bytes(link->name),
state->local_handle,
endpoint->type == RECEIVER,
link->snd_settle_mode,
link->rcv_settle_mode,
- (bool) link->source.type, SOURCE,
+ (bool) link->source.type, AMQP_DESC_SOURCE,
pn_string_bytes(link->source.address),
link->source.durability,
expiry_symbol(&link->source),
@@ -2049,7 +2049,7 @@ static int pni_process_link_setup(pn_transport_t
*transport, pn_endpoint_t *endp
link->source.outcomes_raw,
link->source.capabilities_raw,
- (bool) link->target.type, TARGET,
+ (bool) link->target.type, AMQP_DESC_TARGET,
pn_string_bytes(link->target.address),
link->target.durability,
expiry_symbol(&link->target),
@@ -2079,7 +2079,7 @@ static int pni_post_flow(pn_transport_t *transport,
pn_session_t *ssn, pn_link_t
bool linkq = (bool) link;
pn_link_state_t *state = linkq ? &link->state : NULL;
/* "DL[?IIII?I?I?In?o]" */
- pn_bytes_t buf =
pn_amqp_encode_DLEQIIIIQIQIQInQoe(&transport->scratch_space, FLOW,
+ pn_bytes_t buf =
pn_amqp_encode_DLEQIIIIQIQIQInQoe(&transport->scratch_space, AMQP_DESC_FLOW,
(int16_t) ssn->state.remote_channel >= 0,
ssn->state.incoming_transfer_count,
ssn->state.incoming_window,
ssn->state.outgoing_transfer_count,
@@ -2126,7 +2126,7 @@ static int pni_flush_disp(pn_transport_t *transport,
pn_session_t *ssn)
bool settled = ssn->state.disp_settled;
if (ssn->state.disp) {
/* "DL[oI?I?o?DL[]]" */
- pn_bytes_t buf = pn_amqp_encode_DLEoIQIQoQDLEee(&transport->scratch_space,
DISPOSITION,
+ pn_bytes_t buf = pn_amqp_encode_DLEoIQIQoQDLEee(&transport->scratch_space,
AMQP_DESC_DISPOSITION,
ssn->state.disp_type,
ssn->state.disp_first,
ssn->state.disp_last!=ssn->state.disp_first,
ssn->state.disp_last,
@@ -2160,7 +2160,7 @@ static int pni_post_disp(pn_transport_t *transport,
pn_delivery_t *delivery)
}
if (!pni_disposition_batchable(&delivery->local)) {
- pn_bytes_t buf = pn_amqp_encode_DLEoInQode(&transport->scratch_space,
DISPOSITION,
+ pn_bytes_t buf = pn_amqp_encode_DLEoInQode(&transport->scratch_space,
AMQP_DESC_DISPOSITION,
role, state->id,
delivery->local.settled, delivery->local.settled,
&delivery->local);
@@ -2387,7 +2387,7 @@ static int pni_process_link_teardown(pn_transport_t
*transport, pn_endpoint_t *e
(int16_t) ssn_state->remote_channel != -2 &&
!transport->close_rcvd) return 0;
- pn_bytes_t buf = pn_amqp_encode_DLEIQoce(&transport->scratch_space,
DETACH,
+ pn_bytes_t buf = pn_amqp_encode_DLEIQoce(&transport->scratch_space,
AMQP_DESC_DETACH,
state->local_handle,
!link->detached,
!link->detached,
&endpoint->condition);
@@ -2453,7 +2453,7 @@ static int pni_process_ssn_teardown(pn_transport_t
*transport, pn_endpoint_t *en
return 0;
}
- pn_bytes_t buf = pn_amqp_encode_DLEce(&transport->scratch_space, END,
&endpoint->condition);
+ pn_bytes_t buf = pn_amqp_encode_DLEce(&transport->scratch_space,
AMQP_DESC_END, &endpoint->condition);
int err = pn_framing_send_amqp(transport, state->local_channel, buf);
if (err) return err;
pni_unmap_local_channel(session);
@@ -2529,7 +2529,7 @@ static void pn_error_amqp(pn_transport_t* transport,
unsigned int layer)
if (!transport->close_sent) {
if (!transport->open_sent) {
/* "DL[S]" */
- pn_bytes_t buf = pn_amqp_encode_DLESe(&transport->scratch_space, OPEN,
(pn_bytes_t){.size=0, .start=""});
+ pn_bytes_t buf = pn_amqp_encode_DLESe(&transport->scratch_space,
AMQP_DESC_OPEN, (pn_bytes_t){.size=0, .start=""});
pn_framing_send_amqp(transport, 0, buf);
}
diff --git a/c/src/protocol.h.py b/c/src/protocol.h.py
index 620d72917..3118679e1 100644
--- a/c/src/protocol.h.py
+++ b/c/src/protocol.h.py
@@ -28,10 +28,13 @@ print("#include \"proton/type_compat.h\"")
fields = {}
+print()
+print("/* Field constants */")
+
for type in TYPES:
fidx = 0
for f in type.findall("amqp:field", ns):
- print("#define %s_%s (%s)" % (field_kw(type), field_kw(f), fidx))
+ print("#define AMQP_FIELD_%s_%s (%s)" % (field_kw(type), field_kw(f),
fidx))
fidx += 1
d = f.attrib.get("default")
if d:
@@ -46,21 +49,25 @@ for type in TYPES:
d = '"' + d + '"'
elif d[0] not in '0123456789':
continue
- print("#define %s_%s_DEFAULT (%s) /* %s */" % (field_kw(type),
field_kw(f), d, ft))
+ print("#define AMQP_%s_%s_DEFAULT (%s) /* %s */" %
(field_kw(type), field_kw(f), d, ft))
-idx = 0
+print()
+print("/* Descriptors */")
+
+idx = 0
for type in TYPES:
desc = type.find("./amqp:descriptor", ns)
name = type.attrib["name"].upper().replace("-", "_")
- print("#define %s_SYM (\"%s\")" % (name, desc.attrib["name"]))
+ print("#define AMQP_DESC_%s_SYM (\"%s\")" % (name, desc.attrib["name"]))
hi, lo = [int(x, 0) for x in desc.attrib["code"].split(":")]
code = (hi << 32) + lo
- print("#define %s ((uint64_t) %s)" % (name, code))
+ print("#define AMQP_DESC_%s ((uint64_t) %s)" % (name, code))
fields[code] = (type.attrib["name"], [f.attrib["name"] for f in
type.findall("amqp:field", ns)])
idx += 1
print("""
+/* Described type field descriptions */
#include <stddef.h>
typedef struct {
diff --git a/c/src/sasl/sasl.c b/c/src/sasl/sasl.c
index 6469ae672..4e84bfb25 100644
--- a/c/src/sasl/sasl.c
+++ b/c/src/sasl/sasl.c
@@ -492,7 +492,7 @@ static void pni_post_sasl_frame(pn_transport_t *transport)
switch (desired_state) {
case SASL_POSTED_INIT: {
/* GENERATE_CODEC_CODE: "DL[szS]" */
- pn_bytes_t buf = pn_amqp_encode_DLEszSe(&transport->scratch_space,
SASL_INIT, pn_string_bytes(sasl->selected_mechanism), out.size, out.start,
pn_string_bytes(sasl->local_fqdn));
+ pn_bytes_t buf = pn_amqp_encode_DLEszSe(&transport->scratch_space,
AMQP_DESC_SASL_INIT, pn_string_bytes(sasl->selected_mechanism), out.size,
out.start, pn_string_bytes(sasl->local_fqdn));
pn_framing_send_sasl(transport, buf);
pni_emit(transport);
break;
@@ -507,7 +507,7 @@ static void pni_post_sasl_frame(pn_transport_t *transport)
pni_split_mechs(mechlist, sasl->included_mechanisms, mechs, &count);
}
/* GENERATE_CODEC_CODE: "DL[@T[*s]]" */
- pn_bytes_t buf = pn_amqp_encode_DLEATEjsee(&transport->scratch_space,
SASL_MECHANISMS, PN_SYMBOL, count, mechs);
+ pn_bytes_t buf = pn_amqp_encode_DLEATEjsee(&transport->scratch_space,
AMQP_DESC_SASL_MECHANISMS, PN_SYMBOL, count, mechs);
free(mechlist);
pn_framing_send_sasl(transport, buf);
pni_emit(transport);
@@ -516,7 +516,7 @@ static void pni_post_sasl_frame(pn_transport_t *transport)
case SASL_POSTED_RESPONSE:
if (sasl->last_state != SASL_POSTED_RESPONSE) {
/* "DL[Z]" */
- pn_bytes_t buf = pn_amqp_encode_DLEZe(&transport->scratch_space,
SASL_RESPONSE, out.size, out.start);
+ pn_bytes_t buf = pn_amqp_encode_DLEZe(&transport->scratch_space,
AMQP_DESC_SASL_RESPONSE, out.size, out.start);
pn_framing_send_sasl(transport, buf);
pni_emit(transport);
}
@@ -527,7 +527,7 @@ static void pni_post_sasl_frame(pn_transport_t *transport)
continue;
} else if (sasl->last_state != SASL_POSTED_CHALLENGE) {
/* "DL[Z]" */
- pn_bytes_t buf = pn_amqp_encode_DLEZe(&transport->scratch_space,
SASL_CHALLENGE, out.size, out.start);
+ pn_bytes_t buf = pn_amqp_encode_DLEZe(&transport->scratch_space,
AMQP_DESC_SASL_CHALLENGE, out.size, out.start);
pn_framing_send_sasl(transport, buf);
pni_emit(transport);
}
@@ -538,7 +538,7 @@ static void pni_post_sasl_frame(pn_transport_t *transport)
continue;
}
/* "DL[Bz]" */
- pn_bytes_t buf = pn_amqp_encode_DLEBze(&transport->scratch_space,
SASL_OUTCOME, sasl->outcome, out.size, out.start);
+ pn_bytes_t buf = pn_amqp_encode_DLEBze(&transport->scratch_space,
AMQP_DESC_SASL_OUTCOME, sasl->outcome, out.size, out.start);
pn_framing_send_sasl(transport, buf);
pni_emit(transport);
if (sasl->outcome!=PN_SASL_OK) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
