This is an automated email from the ASF dual-hosted git repository. rbulter pushed a commit to branch feature/add_msg_segemenation_to_tcp_admin_with_wire_v2 in repository https://gitbox.apache.org/repos/asf/celix.git
commit 075ead4374f678580f0d2ce66dcb6524493257e9 Merge: cfc7373 9910215 Author: Roy Bulter <[email protected]> AuthorDate: Wed Apr 29 21:08:03 2020 +0200 Merge remote-tracking branch 'remotes/origin/feature/fix_tcp_endpoint_handling' into feature/add_msg_segemenation_to_tcp_admin_with_wire_v2 # Conflicts: # bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_handler.c .../pubsub_admin_tcp/src/pubsub_tcp_handler.c | 527 ++++++++++----------- .../src/pubsub_tcp_topic_receiver.c | 10 +- 2 files changed, 263 insertions(+), 274 deletions(-) diff --cc bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_handler.c index 31d9d7f,9c469ce..6e2072e --- a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_handler.c +++ b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_handler.c @@@ -70,57 -70,56 +70,58 @@@ // Entry administration // typedef struct psa_tcp_connection_entry { - char *interface_url; - char *url; - int fd; - struct sockaddr_in addr; - socklen_t len; - bool connected; - pubsub_protocol_message_t header; - unsigned int maxMsgSize; - unsigned int syncSize; - unsigned int headerSize; - unsigned int headerBufferSize; // Size of headerBuffer, size = 0, no headerBuffer -> included in payload - void *headerBuffer; - unsigned int bufferSize; - void *buffer; - unsigned int metaBufferSize; - void *metaBuffer; - struct msghdr msg; - size_t msg_iovlen; /* Number of elements in the vector. */ - unsigned int retryCount; + char *interface_url; + char *url; + int fd; + struct sockaddr_in addr; + socklen_t len; + bool connected; + pubsub_protocol_message_t header; ++ unsigned int maxMsgSize; + unsigned int syncSize; + unsigned int headerSize; + unsigned int headerBufferSize; // Size of headerBuffer, size = 0, no headerBuffer -> included in payload + void *headerBuffer; + unsigned int bufferSize; + void *buffer; + unsigned int metaBufferSize; + void *metaBuffer; + struct msghdr msg; + size_t msg_iovlen; /* Number of elements in the vector. */ + unsigned int retryCount; } psa_tcp_connection_entry_t; // // Handle administration // struct pubsub_tcpHandler { - celix_thread_rwlock_t dbLock; - unsigned int timeout; - hash_map_t *connection_url_map; - hash_map_t *connection_fd_map; - hash_map_t *interface_url_map; - hash_map_t *interface_fd_map; - int efd; - pubsub_tcpHandler_receiverConnectMessage_callback_t receiverConnectMessageCallback; - pubsub_tcpHandler_receiverConnectMessage_callback_t receiverDisconnectMessageCallback; - void *receiverConnectPayload; - pubsub_tcpHandler_acceptConnectMessage_callback_t acceptConnectMessageCallback; - pubsub_tcpHandler_acceptConnectMessage_callback_t acceptDisconnectMessageCallback; - void *acceptConnectPayload; - pubsub_tcpHandler_processMessage_callback_t processMessageCallback; - void *processMessagePayload; - log_helper_t *logHelper; - pubsub_protocol_service_t *protocol; - unsigned int bufferSize; - unsigned int maxNofBuffer; - unsigned int maxMsgSize; - unsigned int maxSendRetryCount; - unsigned int maxRcvRetryCount; - double sendTimeout; - double rcvTimeout; - celix_thread_t thread; - bool running; + unsigned int readSeqNr; + celix_thread_rwlock_t dbLock; + unsigned int timeout; + hash_map_t *connection_url_map; + hash_map_t *connection_fd_map; + hash_map_t *interface_url_map; + hash_map_t *interface_fd_map; + int efd; + pubsub_tcpHandler_receiverConnectMessage_callback_t receiverConnectMessageCallback; + pubsub_tcpHandler_receiverConnectMessage_callback_t receiverDisconnectMessageCallback; + void *receiverConnectPayload; + pubsub_tcpHandler_acceptConnectMessage_callback_t acceptConnectMessageCallback; + pubsub_tcpHandler_acceptConnectMessage_callback_t acceptDisconnectMessageCallback; + void *acceptConnectPayload; + pubsub_tcpHandler_processMessage_callback_t processMessageCallback; + void *processMessagePayload; + log_helper_t *logHelper; + pubsub_protocol_service_t *protocol; + unsigned int bufferSize; + unsigned int maxNofBuffer; ++ unsigned int maxMsgSize; + unsigned int maxSendRetryCount; + unsigned int maxRcvRetryCount; + double sendTimeout; + double rcvTimeout; + celix_thread_t thread; + bool running; }; static inline int
