From 88a6f0cf5d8dd42424c4eec4281883d2975e4bf7 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Mon, 23 Nov 2015 16:34:42 +0100 Subject: [PATCH] removed node_{read,write}_single() --- server/include/node.h | 3 --- server/src/hooks.c | 2 +- server/src/test.c | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/server/include/node.h b/server/include/node.h index 3d324fa2b..4abc81e50 100644 --- a/server/include/node.h +++ b/server/include/node.h @@ -36,9 +36,6 @@ #define node_open(n) ((n)->_vt->open(n)) #define node_close(n) ((n)->_vt->close(n)) -#define node_read_single(n, m) ((n)->_vt->read(n, m, 1, 0, 1)) -#define node_write_single(n, m) ((n)->_vt->write(n, m, 1, 0, 1)) - #define REGISTER_NODE_TYPE(type, name, fnc) \ __attribute__((constructor)) void __register_node_ ## fnc () { \ diff --git a/server/src/hooks.c b/server/src/hooks.c index aadede0b4..40b21115b 100644 --- a/server/src/hooks.c +++ b/server/src/hooks.c @@ -447,7 +447,7 @@ int hook_stats_send(struct path *p, struct hook *h, int when) m.data[m.length++].f = p->hist_gap_recv.last; /* Send single message with statistics to destination node */ - node_write_single(private->dest, &m); + node_write(private->dest, &m, 1, 0, 1); break; } diff --git a/server/src/test.c b/server/src/test.c index d70d3a2b0..11cc7dbe4 100644 --- a/server/src/test.c +++ b/server/src/test.c @@ -164,8 +164,8 @@ void test_rtt() { m.ts.sec = sent.tv_sec; m.ts.nsec = sent.tv_nsec; - node_write_single(node, &m); /* Ping */ - node_read_single(node, &m); /* Pong */ + node_write(node, &m, 1, 0, 1); /* Ping */ + node_read(node, &m, 1, 0, 1); /* Pong */ clock_gettime(CLOCK_ID, &recv);