diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-01-24 04:34:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:44:18 -0500 |
| commit | e7d0d22806e249e315c0cb6ebed4caa93b80e8e5 (patch) | |
| tree | a354978ea502c01da67b4b6d02e7dd61fa65734d /source4/cluster/ctdb/tcp | |
| parent | 8ffc4c430cf4942a1eaedec6fc60e9d538817a07 (diff) | |
| download | samba-e7d0d22806e249e315c0cb6ebed4caa93b80e8e5.tar.gz samba-e7d0d22806e249e315c0cb6ebed4caa93b80e8e5.tar.bz2 samba-e7d0d22806e249e315c0cb6ebed4caa93b80e8e5.zip | |
r20991: use relative includes for ctdb headers. This works with both
standalone and built-in ctdb
(This used to be commit 3e5f29bddfd83914eeec706367b2b1bd30aba31e)
Diffstat (limited to 'source4/cluster/ctdb/tcp')
| -rw-r--r-- | source4/cluster/ctdb/tcp/tcp_connect.c | 2 | ||||
| -rw-r--r-- | source4/cluster/ctdb/tcp/tcp_init.c | 2 | ||||
| -rw-r--r-- | source4/cluster/ctdb/tcp/tcp_io.c | 9 |
3 files changed, 3 insertions, 10 deletions
diff --git a/source4/cluster/ctdb/tcp/tcp_connect.c b/source4/cluster/ctdb/tcp/tcp_connect.c index 2404144ac1..e828bb7cbb 100644 --- a/source4/cluster/ctdb/tcp/tcp_connect.c +++ b/source4/cluster/ctdb/tcp/tcp_connect.c @@ -23,7 +23,7 @@ #include "lib/tdb/include/tdb.h" #include "system/network.h" #include "system/filesys.h" -#include "cluster/ctdb/include/ctdb_private.h" +#include "../include/ctdb_private.h" #include "ctdb_tcp.h" static void set_nonblocking(int fd) diff --git a/source4/cluster/ctdb/tcp/tcp_init.c b/source4/cluster/ctdb/tcp/tcp_init.c index b8ee8cb30e..0058e7ad85 100644 --- a/source4/cluster/ctdb/tcp/tcp_init.c +++ b/source4/cluster/ctdb/tcp/tcp_init.c @@ -23,7 +23,7 @@ #include "lib/events/events.h" #include "system/network.h" #include "system/filesys.h" -#include "cluster/ctdb/include/ctdb_private.h" +#include "../include/ctdb_private.h" #include "ctdb_tcp.h" /* diff --git a/source4/cluster/ctdb/tcp/tcp_io.c b/source4/cluster/ctdb/tcp/tcp_io.c index 82e24f7260..5385ad7f46 100644 --- a/source4/cluster/ctdb/tcp/tcp_io.c +++ b/source4/cluster/ctdb/tcp/tcp_io.c @@ -24,7 +24,7 @@ #include "lib/tdb/include/tdb.h" #include "system/network.h" #include "system/filesys.h" -#include "cluster/ctdb/include/ctdb_private.h" +#include "../include/ctdb_private.h" #include "ctdb_tcp.h" @@ -210,13 +210,6 @@ int ctdb_tcp_queue_pkt(struct ctdb_node *node, uint8_t *data, uint32_t length) if (length2 != length) { memset(data+length, 0, length2-length); } - { - int i, fd = open("/dev/null", O_WRONLY); - for (i=0;i<length2;i++) { - write(fd, &data[i], 1); - } - close(fd); - } /* if the queue is empty then try an immediate write, avoiding queue overhead. This relies on non-blocking sockets */ |