X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=3b81d7a24be6798cde4451de0d2e32a1a5a61698;hp=b5305e8f3d9f639b265daa1c2f65d62844443203;hb=de09916eadd4c558937d1a6367f5319ca26ed07c;hpb=78532475238b23eb52ac88d905fbf966d97a79d2 diff --git a/src/protocol.c b/src/protocol.c index b5305e8f..3b81d7a2 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -1,6 +1,6 @@ /* protocol.c -- handle the meta-protocol - Copyright (C) 1999 Ivo Timmermans + Copyright (C) 1999,2000 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,6 +19,8 @@ #include "config.h" +#include + #include #include #include @@ -38,6 +40,8 @@ char buffer[MAXBUFSIZE+1]; int buflen; +/* Outgoing request routines */ + int send_ack(conn_list_t *cl) { cp @@ -66,9 +70,10 @@ cp buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", TERMREQ, myself->vpn_ip); - if((write(cl->meta_socket, buffer, buflen)) < 0) + if(write(cl->meta_socket, buffer, buflen) < 0) { - syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__); + if(debug_lvl > 1) + syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__); return -1; } cp @@ -178,7 +183,7 @@ cp return 0; } -void send_key_changed2(void) +void send_key_changed_all(void) { conn_list_t *p; cp @@ -396,7 +401,8 @@ cp int passphrase_h(conn_list_t *cl) { cp - cl->pp=xmalloc(sizeof(*(cl->pp))); + cl->pp = xmalloc(sizeof(*(cl->pp))); + if(sscanf(cl->buffer, "%*d %as", &(cl->pp->phrase)) != 1) { syslog(LOG_ERR, "got bad PASSPHRASE request: %s", cl->buffer);