projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Old gcc compilers don't like declarations in the middle of a function.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
d43aede
..
a8d7cc6
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
1 2003/07/17 15:06:26
guus Exp $
+ $Id: net.c,v 1.35.4.19
6 2003/08/02 20:50:38
guus Exp $
*/
#include "system.h"
*/
#include "system.h"
@@
-39,10
+39,10
@@
#include "protocol.h"
#include "route.h"
#include "subnet.h"
#include "protocol.h"
#include "route.h"
#include "subnet.h"
+#include "xalloc.h"
-int do_purge = 0;
-int sighup = 0;
-int sigalrm = 0;
+bool do_purge = false;
+volatile bool running;
time_t now = 0;
time_t now = 0;
@@
-134,11
+134,11
@@
static int build_fdset(fd_set * fs)
/*
Terminate a connection:
- Close the socket
/*
Terminate a connection:
- Close the socket
- - Remove associated edge and tell other connections about it if report =
1
+ - Remove associated edge and tell other connections about it if report =
true
- Check if we need to retry making an outgoing connection
- Deactivate the host
*/
- Check if we need to retry making an outgoing connection
- Deactivate the host
*/
-void terminate_connection(connection_t *c,
int
report)
+void terminate_connection(connection_t *c,
bool
report)
{
cp();
{
cp();
@@
-148,14
+148,14
@@
void terminate_connection(connection_t *c, int report)
ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Closing connection with %s (%s)"),
c->name, c->hostname);
ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Closing connection with %s (%s)"),
c->name, c->hostname);
- c->status.remove =
1
;
- c->status.active =
0
;
+ c->status.remove =
true
;
+ c->status.active =
false
;
if(c->node)
c->node->connection = NULL;
if(c->socket)
if(c->node)
c->node->connection = NULL;
if(c->socket)
- close(c->socket);
+ close
socket
(c->socket);
if(c->edge) {
if(report)
if(c->edge) {
if(report)
@@
-200,21
+200,21
@@
static void check_dead_connections(void)
if(c->status.pinged) {
ifdebug(CONNECTIONS) logger(LOG_INFO, _("%s (%s) didn't respond to PING"),
c->name, c->hostname);
if(c->status.pinged) {
ifdebug(CONNECTIONS) logger(LOG_INFO, _("%s (%s) didn't respond to PING"),
c->name, c->hostname);
- c->status.timeout =
1
;
- terminate_connection(c,
1
);
+ c->status.timeout =
true
;
+ terminate_connection(c,
true
);
} else {
send_ping(c);
}
} else {
if(c->status.remove) {
logger(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."),
} else {
send_ping(c);
}
} 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;
}
ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
c->name, c->hostname);
connection_del(c);
continue;
}
ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
c->name, c->hostname);
- terminate_connection(c,
0
);
+ terminate_connection(c,
false
);
}
}
}
}
}
}
@@
-235,7
+235,7
@@
static void check_network_activity(fd_set * f)
cp();
if(FD_ISSET(device_fd, f)) {
cp();
if(FD_ISSET(device_fd, f)) {
- if(
!
read_packet(&packet))
+ if(read_packet(&packet))
route_outgoing(&packet);
}
route_outgoing(&packet);
}
@@
-247,7
+247,7
@@
static void check_network_activity(fd_set * f)
if(FD_ISSET(c->socket, f)) {
if(c->status.connecting) {
if(FD_ISSET(c->socket, f)) {
if(c->status.connecting) {
- c->status.connecting =
0
;
+ c->status.connecting =
false
;
getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
if(!result)
getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
if(!result)
@@
-256,13
+256,13
@@
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;
}
}
- if(
receive_meta(c) < 0
) {
+ if(
!receive_meta(c)
) {
terminate_connection(c, c->status.active);
continue;
}
terminate_connection(c, c->status.active);
continue;
}
@@
-281,7
+281,7
@@
static void check_network_activity(fd_set * f)
/*
this is where it all happens...
*/
/*
this is where it all happens...
*/
-
void
main_loop(void)
+
int
main_loop(void)
{
fd_set fset;
struct timeval tv;
{
fd_set fset;
struct timeval tv;
@@
-295,7
+295,9
@@
void main_loop(void)
last_config_check = now;
srand(now);
last_config_check = now;
srand(now);
- for(;;) {
+ running = true;
+
+ while(running) {
now = time(NULL);
tv.tv_sec = 1 + (rand() & 7); /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
now = time(NULL);
tv.tv_sec = 1 + (rand() & 7); /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
@@
-311,7
+313,7
@@
void main_loop(void)
strerror(errno));
cp_trace();
dump_connections();
strerror(errno));
cp_trace();
dump_connections();
- return;
+ return
1
;
}
continue;
}
continue;
@@
-321,7
+323,7
@@
void main_loop(void)
if(do_purge) {
purge();
if(do_purge) {
purge();
- do_purge =
0
;
+ do_purge =
false
;
}
/* Let's check if everybody is still alive */
}
/* Let's check if everybody is still alive */
@@
-341,7
+343,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;
}
@@
-361,7
+364,7
@@
void main_loop(void)
event->handler(event->data);
event_del(event);
}
event->handler(event->data);
event_del(event);
}
- sigalrm =
0
;
+ sigalrm =
false
;
}
if(sighup) {
}
if(sighup) {
@@
-370,16
+373,16
@@
void main_loop(void)
char *fname;
struct stat s;
char *fname;
struct stat s;
- sighup =
0
;
+ sighup =
false
;
/* Reread our own configuration file */
exit_configuration(&config_tree);
init_configuration(&config_tree);
/* Reread our own configuration file */
exit_configuration(&config_tree);
init_configuration(&config_tree);
- if(read_server_config()) {
+ if(
!
read_server_config()) {
logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
-
exit(1)
;
+
return 1
;
}
/* Close connections to hosts that have a changed or deleted host config file */
}
/* Close connections to hosts that have a changed or deleted host config file */
@@
-405,8
+408,8
@@
void main_loop(void)
/* Try to make outgoing connections */
try_outgoing_connections();
/* Try to make outgoing connections */
try_outgoing_connections();
-
- continue;
}
}
}
}
+
+ return 0;
}
}