Merge "Access to raw FIX messages" from Marat

Signed-off-by: Pekka Enberg <penberg@iki.fi>
jvirtanen · Jul 30, 2015 · 0154737 · 0154737
2 parents fe21a82 + 1254d4e
commit 0154737
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 9 deletions.
diff --git a/include/libtrading/proto/fix_message.h b/include/libtrading/proto/fix_message.h
@@ -5,6 +5,7 @@
 extern "C" {
 #endif
 
+#include <sys/uio.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -209,6 +210,8 @@ struct fix_message {
 
 	unsigned long			nr_fields;
 	struct fix_field		*fields;
+
+	struct iovec			iov[2];
 };
 
 enum fix_parse_flag {

diff --git a/lib/proto/fix_message.c b/lib/proto/fix_message.c
@@ -439,7 +439,6 @@ static int first_three_fields(struct fix_message *self, unsigned long flags)
 
 int fix_message_parse(struct fix_message *self, struct fix_dialect *dialect, struct buffer *buffer, unsigned long flags)
 {
-	unsigned long size;
 	const char *start;
 	int ret;
 
@@ -450,9 +449,8 @@ int fix_message_parse(struct fix_message *self, struct fix_dialect *dialect, str
 	ret = FIX_MSG_STATE_PARTIAL;
 
 	start	= buffer_start(buffer);
-	size	= buffer_size(buffer);
 
-	if (!size)
+	if (!buffer_size(buffer))
 		goto fail;
 
 	ret = first_three_fields(self, flags);
@@ -465,6 +463,9 @@ int fix_message_parse(struct fix_message *self, struct fix_dialect *dialect, str
 
 	rest_of_message(self, dialect, buffer);
 
+	self->iov[0].iov_base	= (void *)start;
+	self->iov[0].iov_len 	= buffer_start(buffer) - start;
+
 	TRACE(LIBTRADING_FIX_MESSAGE_PARSE_RET());
 
 	return 0;
@@ -686,18 +687,17 @@ void fix_message_unparse(struct fix_message *self)
 
 int fix_message_send(struct fix_message *self, int sockfd, int flags)
 {
-	struct iovec iov[2];
 	int ret = 0;
 
 	TRACE(LIBTRADING_FIX_MESSAGE_SEND(self, sockfd, flags));
 
 	if (!(flags & FIX_SEND_FLAG_PRESERVE_BUFFER))
 		fix_message_unparse(self);
 
-	buffer_to_iovec(self->head_buf, &iov[0]);
-	buffer_to_iovec(self->body_buf, &iov[1]);
+	buffer_to_iovec(self->head_buf, &self->iov[0]);
+	buffer_to_iovec(self->body_buf, &self->iov[1]);
 
-	if (io_sendmsg(sockfd, iov, 2, 0) < 0) {
+	if (io_sendmsg(sockfd, self->iov, 2, 0) < 0) {
 		ret = -1;
 		goto error_out;
 	}

diff --git a/tools/fix/fix_client.c b/tools/fix/fix_client.c
@@ -158,7 +158,7 @@ static int fix_client_script(struct fix_session_cfg *cfg, struct fix_client_arg
 			goto retry;
 
 		fprintf(stdout, "< ");
-		fprintmsg(stdout, msg);
+		fprintmsg_iov(stdout, msg);
 
 		if (fmsgcmp(&expected_elem->msg, msg)) {
 			fprintf(stderr, "Client: messages differ\n");

diff --git a/tools/fix/fix_server.c b/tools/fix/fix_server.c
@@ -139,7 +139,7 @@ static int fix_server_script(struct fix_session_cfg *cfg, struct fix_server_arg
 			continue;
 
 		fprintf(stdout, "> ");
-		fprintmsg(stdout, msg);
+		fprintmsg_iov(stdout, msg);
 
 		if (fmsgcmp(&expected_elem->msg, msg)) {
 			fprintf(stderr, "Server: messages differ\n");

diff --git a/tools/fix/test.c b/tools/fix/test.c
@@ -338,3 +338,28 @@ void fprintmsg(FILE *stream, struct fix_message *msg)
 
 	fprintf(stream, "%s%c\n", buf, delim);
 }
+
+void fprintmsg_iov(FILE *stream, struct fix_message *msg)
+{
+	char delim = '|';
+	int i;
+
+	if (!msg)
+		return;
+
+	for (i = 0; i < 2; ++i) {
+		const char *start = msg->iov[i].iov_base;
+		unsigned int len = msg->iov[i].iov_len;
+		const char *end = start;
+
+		while ((end = memchr(start, 0x01, len))) {
+			fprintf(stdout, "%c%.*s", delim, (int)(end - start), start);
+			len -= (end - start + 1);
+			start = end + 1;
+		}
+	}
+
+	fprintf(stdout, "%c\n", delim);
+
+	return;
+}
diff --git a/tools/fix/test.h b/tools/fix/test.h
@@ -21,4 +21,5 @@ struct fcontainer *fcontainer_new(void);
 
 int script_read(FILE *stream, struct fcontainer *server, struct fcontainer *client);
 int fmsgcmp(struct fix_message *expected, struct fix_message *actual);
+void fprintmsg_iov(FILE *stream, struct fix_message *msg);
 void fprintmsg(FILE *stream, struct fix_message *msg);