projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent system headers from including our own headers.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
475ea0c
..
e1580e6
100644
(file)
--- a/
src/net.c
+++ b/
src/net.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: net.c,v 1.35.4.19
2 2003/07/22 20:55:19
guus Exp $
+ $Id: net.c,v 1.35.4.19
5 2003/07/29 22:59:00
guus Exp $
*/
#include "system.h"
*/
#include "system.h"
@@
-39,6
+39,7
@@
#include "protocol.h"
#include "route.h"
#include "subnet.h"
#include "protocol.h"
#include "route.h"
#include "subnet.h"
+#include "xalloc.h"
bool do_purge = false;
bool do_purge = false;
@@
-153,7
+154,7
@@
void terminate_connection(connection_t *c, bool report)
c->node->connection = NULL;
if(c->socket)
c->node->connection = NULL;
if(c->socket)
- close(c->socket);
+ close
socket
(c->socket);
if(c->edge) {
if(report)
if(c->edge) {
if(report)
@@
-206,7
+207,7
@@
static void check_dead_connections(void)
} else {
if(c->status.remove) {
logger(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."),
} else {
if(c->status.remove) {
logger(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."),
- c->name, c->hostname, c->status);
+ c->name, c->hostname,
*(uint32_t *)&
c->status);
connection_del(c);
continue;
}
connection_del(c);
continue;
}
@@
-254,7
+255,7
@@
static void check_network_activity(fd_set * f)
ifdebug(CONNECTIONS) logger(LOG_DEBUG,
_("Error while connecting to %s (%s): %s"),
c->name, c->hostname, strerror(result));
ifdebug(CONNECTIONS) logger(LOG_DEBUG,
_("Error while connecting to %s (%s): %s"),
c->name, c->hostname, strerror(result));
- close(c->socket);
+ close
socket
(c->socket);
do_outgoing_connection(c);
continue;
}
do_outgoing_connection(c);
continue;
}
@@
-339,7
+340,8
@@
void main_loop(void)
ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
RAND_pseudo_bytes(myself->key, myself->keylength);
ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
RAND_pseudo_bytes(myself->key, myself->keylength);
- EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
+ if(myself->cipher)
+ EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
send_key_changed(broadcast, myself);
keyexpires = now + keylifetime;
}
send_key_changed(broadcast, myself);
keyexpires = now + keylifetime;
}