projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New function: xmalloc_and_zero, which initialises the allocated memory
[tinc]
/
src
/
meta.c
diff --git
a/src/meta.c
b/src/meta.c
index
6b2a8e2
..
a4cfc83
100644
(file)
--- a/
src/meta.c
+++ b/
src/meta.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.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: meta.c,v 1.1.2.
8 2000/10/29 22:55:14
guus Exp $
+ $Id: meta.c,v 1.1.2.
11 2000/11/15 13:33:25
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-26,10
+26,16
@@
#include <errno.h>
#include <syslog.h>
#include <sys/signal.h>
#include <errno.h>
#include <syslog.h>
#include <sys/signal.h>
-#include <sys/socket.h>
-#include <openssl/evp.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
#include <string.h>
+/* This line must be below the rest for FreeBSD */
+#include <sys/socket.h>
+
+#ifdef HAVE_OPENSSL_EVP_H
+# include <openssl/evp.h>
+#else
+# include <evp.h>
+#endif
#include "net.h"
#include "system.h"
#include "net.h"
#include "system.h"
@@
-169,7
+175,6
@@
cp
}
cl->last_ping_time = time(NULL);
}
cl->last_ping_time = time(NULL);
- cl->want_ping = 0;
cp
return 0;
}
cp
return 0;
}