Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated marshallers. 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358058 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2005-12-20 18:07:04 +00:00
parent ac8739860f
commit b18559dc40
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openwire-c/src/libopenwire/ow_commands_v1.c
View File

@ -553,6 +553,7 @@ apr_status_t ow_marshal1_Message(ow_bit_buffer *buffer, ow_Message *object)
SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->brokerPath)); SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->brokerPath));
ow_marshal1_long(buffer, object->arrival); ow_marshal1_long(buffer, object->arrival);
ow_marshal1_string(buffer, object->userID); ow_marshal1_string(buffer, object->userID);
ow_bit_buffer_append(buffer, object->recievedByDFBridge);
return APR_SUCCESS; return APR_SUCCESS;
} }
@ -583,6 +584,7 @@ apr_status_t ow_marshal2_Message(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffe
SUCCESS_CHECK(ow_marshal2_DataStructure_array(buffer, bitbuffer, object->brokerPath)); SUCCESS_CHECK(ow_marshal2_DataStructure_array(buffer, bitbuffer, object->brokerPath));
SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->arrival)); SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->arrival));
SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->userID)); SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->userID));
ow_bit_buffer_read(bitbuffer);
return APR_SUCCESS; return APR_SUCCESS;
} }
@ -614,6 +616,7 @@ apr_status_t ow_unmarshal_Message(ow_byte_array *buffer, ow_bit_buffer *bitbuffe
SUCCESS_CHECK(ow_unmarshal_DataStructure_array(buffer, bitbuffer, &object->brokerPath, pool)); SUCCESS_CHECK(ow_unmarshal_DataStructure_array(buffer, bitbuffer, &object->brokerPath, pool));
SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->arrival, pool)); SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->arrival, pool));
SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->userID, pool)); SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->userID, pool));
object->recievedByDFBridge = ow_bit_buffer_read(bitbuffer);
return APR_SUCCESS; return APR_SUCCESS;
} }
@ -913,6 +916,7 @@ apr_status_t ow_marshal1_ConsumerInfo(ow_bit_buffer *buffer, ow_ConsumerInfo *ob
ow_bit_buffer_append(buffer, object->retroactive); ow_bit_buffer_append(buffer, object->retroactive);
SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->brokerPath)); SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->brokerPath));
ow_bit_buffer_append(buffer, object->networkSubscription);
return APR_SUCCESS; return APR_SUCCESS;
} }
@ -931,6 +935,7 @@ apr_status_t ow_marshal2_ConsumerInfo(ow_byte_buffer *buffer, ow_bit_buffer *bit
ow_bit_buffer_read(bitbuffer); ow_bit_buffer_read(bitbuffer);
SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->priority)); SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->priority));
SUCCESS_CHECK(ow_marshal2_DataStructure_array(buffer, bitbuffer, object->brokerPath)); SUCCESS_CHECK(ow_marshal2_DataStructure_array(buffer, bitbuffer, object->brokerPath));
ow_bit_buffer_read(bitbuffer);
return APR_SUCCESS; return APR_SUCCESS;
} }
@ -950,6 +955,7 @@ apr_status_t ow_unmarshal_ConsumerInfo(ow_byte_array *buffer, ow_bit_buffer *bit
object->retroactive = ow_bit_buffer_read(bitbuffer); object->retroactive = ow_bit_buffer_read(bitbuffer);
SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->priority)); SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->priority));
SUCCESS_CHECK(ow_unmarshal_DataStructure_array(buffer, bitbuffer, &object->brokerPath, pool)); SUCCESS_CHECK(ow_unmarshal_DataStructure_array(buffer, bitbuffer, &object->brokerPath, pool));
object->networkSubscription = ow_bit_buffer_read(bitbuffer);
return APR_SUCCESS; return APR_SUCCESS;
} }

8
openwire-c/src/libopenwire/ow_commands_v1.h
View File

@ -166,6 +166,7 @@ typedef struct ow_Message {
ow_DataStructure_array *brokerPath; ow_DataStructure_array *brokerPath;
ow_long arrival; ow_long arrival;
ow_string *userID; ow_string *userID;
ow_boolean recievedByDFBridge;
} ow_Message; } ow_Message;
ow_Message *ow_Message_create(apr_pool_t *pool); ow_Message *ow_Message_create(apr_pool_t *pool);
@ -248,6 +249,7 @@ typedef struct ow_ConsumerInfo {
ow_boolean retroactive; ow_boolean retroactive;
ow_byte priority; ow_byte priority;
ow_DataStructure_array *brokerPath; ow_DataStructure_array *brokerPath;
ow_boolean networkSubscription;
} ow_ConsumerInfo; } ow_ConsumerInfo;
ow_ConsumerInfo *ow_ConsumerInfo_create(apr_pool_t *pool); ow_ConsumerInfo *ow_ConsumerInfo_create(apr_pool_t *pool);
@ -403,6 +405,7 @@ typedef struct ow_ActiveMQMessage {
ow_DataStructure_array *brokerPath; ow_DataStructure_array *brokerPath;
ow_long arrival; ow_long arrival;
ow_string *userID; ow_string *userID;
ow_boolean recievedByDFBridge;
} ow_ActiveMQMessage; } ow_ActiveMQMessage;
ow_ActiveMQMessage *ow_ActiveMQMessage_create(apr_pool_t *pool); ow_ActiveMQMessage *ow_ActiveMQMessage_create(apr_pool_t *pool);
@ -533,6 +536,7 @@ typedef struct ow_ActiveMQStreamMessage {
ow_DataStructure_array *brokerPath; ow_DataStructure_array *brokerPath;
ow_long arrival; ow_long arrival;
ow_string *userID; ow_string *userID;
ow_boolean recievedByDFBridge;
} ow_ActiveMQStreamMessage; } ow_ActiveMQStreamMessage;
ow_ActiveMQStreamMessage *ow_ActiveMQStreamMessage_create(apr_pool_t *pool); ow_ActiveMQStreamMessage *ow_ActiveMQStreamMessage_create(apr_pool_t *pool);
@ -606,6 +610,7 @@ typedef struct ow_ActiveMQBytesMessage {
ow_DataStructure_array *brokerPath; ow_DataStructure_array *brokerPath;
ow_long arrival; ow_long arrival;
ow_string *userID; ow_string *userID;
ow_boolean recievedByDFBridge;
} ow_ActiveMQBytesMessage; } ow_ActiveMQBytesMessage;
ow_ActiveMQBytesMessage *ow_ActiveMQBytesMessage_create(apr_pool_t *pool); ow_ActiveMQBytesMessage *ow_ActiveMQBytesMessage_create(apr_pool_t *pool);
@ -640,6 +645,7 @@ typedef struct ow_ActiveMQTextMessage {
ow_DataStructure_array *brokerPath; ow_DataStructure_array *brokerPath;
ow_long arrival; ow_long arrival;
ow_string *userID; ow_string *userID;
ow_boolean recievedByDFBridge;
} ow_ActiveMQTextMessage; } ow_ActiveMQTextMessage;
ow_ActiveMQTextMessage *ow_ActiveMQTextMessage_create(apr_pool_t *pool); ow_ActiveMQTextMessage *ow_ActiveMQTextMessage_create(apr_pool_t *pool);
@ -674,6 +680,7 @@ typedef struct ow_ActiveMQMapMessage {
ow_DataStructure_array *brokerPath; ow_DataStructure_array *brokerPath;
ow_long arrival; ow_long arrival;
ow_string *userID; ow_string *userID;
ow_boolean recievedByDFBridge;
} ow_ActiveMQMapMessage; } ow_ActiveMQMapMessage;
ow_ActiveMQMapMessage *ow_ActiveMQMapMessage_create(apr_pool_t *pool); ow_ActiveMQMapMessage *ow_ActiveMQMapMessage_create(apr_pool_t *pool);
@ -731,6 +738,7 @@ typedef struct ow_ActiveMQObjectMessage {
ow_DataStructure_array *brokerPath; ow_DataStructure_array *brokerPath;
ow_long arrival; ow_long arrival;
ow_string *userID; ow_string *userID;
ow_boolean recievedByDFBridge;
} ow_ActiveMQObjectMessage; } ow_ActiveMQObjectMessage;
ow_ActiveMQObjectMessage *ow_ActiveMQObjectMessage_create(apr_pool_t *pool); ow_ActiveMQObjectMessage *ow_ActiveMQObjectMessage_create(apr_pool_t *pool);