diff --git a/config.h b/config.h index 2ca343bbe..9fddb52de 100644 --- a/config.h +++ b/config.h @@ -25,7 +25,7 @@ #define DEFAULT_QUEUELEN 1024 /** Whether or not to send / receive timestamp & sequence number as first values of payload */ -#define GTNET_SKT_HEADER 1 +#define GTNET_SKT_HEADER 0 /** Width of log output in characters */ #define LOG_WIDTH 132 diff --git a/etc/gtnet_test4.conf b/etc/gtnet_test4.conf index b80cbd41d..4a56ee34d 100644 --- a/etc/gtnet_test4.conf +++ b/etc/gtnet_test4.conf @@ -32,8 +32,8 @@ nodes = { node1 = { type = "socket", layer = "udp", - local = "192.168.88.128:12002", # Local ip:port, use '*' for random port - remote = "192.168.88.129:12001", + local = "134.130.169.31:12002", # Local ip:port, use '*' for random port + remote = "134.130.169.98:12001", header = "gtnet-skt", # 'gtnet-skt' or 'villas'. If not provided, 'villas' header will be used vectorize = 1, # Number of samples to fetch per iteration from the socket netem = { diff --git a/include/villas/hooks.h b/include/villas/hooks.h index 67356df87..ad3fe07c0 100644 --- a/include/villas/hooks.h +++ b/include/villas/hooks.h @@ -22,6 +22,7 @@ #define _HOOKS_H_ #include +#include #include "queue.h" #include "list.h" diff --git a/lib/hooks/hooks-internal.c b/lib/hooks/hooks-internal.c index 26958703c..f260e0a73 100644 --- a/lib/hooks/hooks-internal.c +++ b/lib/hooks/hooks-internal.c @@ -67,6 +67,10 @@ int hook_drop(struct path *p, struct hook *h, int when, struct sample *smps[], s { int i, ok, dist; + /** Don't check the sequence number order in case of gtnet-skt without header */ + if(!strcmp(p->in->_vt->name, "socket") && !GTNET_SKT_HEADER) + return cnt; + for (i = 0, ok = 0; i < cnt; i++) { h->last = smps[i];