search for: splay_tree_t

...ack and let the writable io loop above handle it. - */ + /* Just poll the next time through. */ + timeout_ms = 0; } } diff --git a/src/splay_tree.c b/src/splay_tree.c index 2b6186f..ca83022 100644 --- a/src/splay_tree.c +++ b/src/splay_tree.c @@ -581,6 +581,7 @@ void splay_unlink_node(splay_tree_t *tree, splay_node_t *node) { } tree->count--; + tree->generation++; } void splay_delete_node(splay_tree_t *tree, splay_node_t *node) { diff --git a/src/splay_tree.h b/src/splay_tree.h index 06367bf..d5ab742 100644 --- a/src/splay_tree.h +++ b/src/splay_tree.h @@ -57,7 +57,8 @@ typed...

...t changes the log level to LOG_DEBUG so syslog doesn't get filled by default. --- src/conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf.c b/src/conf.c index 2b32359..7756247 100644 --- a/src/conf.c +++ b/src/conf.c @@ -298,7 +298,7 @@ bool read_config_file(splay_tree_t *config_tree, const char *fname) { fp = fopen(fname, "r"); if(!fp) { - logger(DEBUG_ALWAYS, LOG_ERR, "Cannot open config file %s: %s", fname, strerror(errno)); + logger(DEBUG_ALWAYS, LOG_DEBUG, "Cannot open config file %s: %s", fname, strerror(errno)); retur...

(Second try to send this. I wonder if the first one gotten eaten by a spam filter; I'll link to patches instead of attaching them.) Here are the tincctl patches I've been working on. They apply to http://www.tinc-vpn.org/svn/tinc/branches/1.1@1545. I intend to commit them once the crypto stuff's fixed. Since they're basically done, I'm emailing them now for review and in case