From 4ca95097142fc3ccd28b6ca824b820b4e8b975bd Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Mon, 14 Jul 2014 10:47:41 +0000 Subject: [PATCH] some cosmetic changes on the message format git-svn-id: https://zerberus.eonerc.rwth-aachen.de:8443/svn/s2ss/trunk@147 8ec27952-4edc-4aab-86aa-e87bb2611832 --- server/include/msg_format.h | 9 +++++---- server/src/node.c | 1 + server/src/test.c | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/server/include/msg_format.h b/server/include/msg_format.h index f827d297c..f5fd509be 100644 --- a/server/include/msg_format.h +++ b/server/include/msg_format.h @@ -10,8 +10,9 @@ #include -#include "config.h" - +/** Maximum number of dword values in a message */ +#define MSG_VALUES 16 +/** The current version number for the message format */ #define MSG_VERSION 0 /** @todo Implement more message types */ @@ -31,12 +32,12 @@ struct msg unsigned type : 2; /** These bits are reserved for future extensions */ unsigned __padding : 2; - /** Length in dwords of the whole message */ + /** Number of valid dword values in msg::data[] */ uint8_t length; /** The sequence number gets incremented by one for consecutive messages */ uint16_t sequence; /** The message payload */ - float data[MAX_VALUES]; + float data[MSG_VALUES]; } __attribute__((packed)); #endif /* _MSG_FORMAT_H_ */ diff --git a/server/src/node.c b/server/src/node.c index 4c638a6e4..b3dfde8c3 100644 --- a/server/src/node.c +++ b/server/src/node.c @@ -8,6 +8,7 @@ #include #include +#include "config.h" #include "cfg.h" #include "utils.h" #include "msg.h" diff --git a/server/src/test.c b/server/src/test.c index ed5a9f520..87efb8aa2 100644 --- a/server/src/test.c +++ b/server/src/test.c @@ -13,6 +13,7 @@ #include #include +#include "config.h" #include "msg.h" #include "node.h" #include "utils.h"