X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=4e37bf5523b76f721b40974230777ca0a3022467;hp=dad7ccb66b04b6f6c8da0cb674b3cc0dc5b4dcee;hb=6c5f3d8b74ffea1522a727ef189a5ba65a939e07;hpb=83263b74460656ba557fd9bb84dc27258549e9cd diff --git a/src/protocol.c b/src/protocol.c index dad7ccb6..4e37bf55 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: protocol.c,v 1.28.4.143 2003/07/24 12:08:15 guus Exp $ + $Id: protocol.c,v 1.28.4.147 2003/08/28 21:05:10 guus Exp $ */ #include "system.h" @@ -207,20 +207,19 @@ void exit_requests(void) avl_delete_tree(past_request_tree); } -bool seen_request(const char *request) +bool seen_request(char *request) { - past_request_t p = { - .request = request, - }; - past_request_t *new; + past_request_t *new, p = {0}; cp(); + p.request = request; + if(avl_search(past_request_tree, &p)) { ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Already seen request")); return true; } else { - new = (past_request_t *) xmalloc(sizeof(*new)); + new = xmalloc(sizeof(*new)); new->request = xstrdup(request); new->firstseen = now; avl_insert(past_request_tree, new); @@ -238,7 +237,7 @@ void age_past_requests(void) for(node = past_request_tree->head; node; node = next) { next = node->next; - p = (past_request_t *) node->data; + p = node->data; if(p->firstseen + pingtimeout < now) avl_delete_node(past_request_tree, node), deleted++; @@ -247,6 +246,6 @@ void age_past_requests(void) } if(left || deleted) - ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Aging past requests: deleted %d, left %d\n"), + ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Aging past requests: deleted %d, left %d"), deleted, left); }