projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This should work much better.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
41767d8
..
358e7a9
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.1
68 2002/03/27 14:02:36
guus Exp $
+ $Id: net.c,v 1.35.4.1
71 2002/05/01 09:15:58
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-68,6
+68,10
@@
#include "system.h"
#include "system.h"
+#ifndef HAVE_RAND_PSEUDO_BYTES
+#define RAND_pseudo_bytes RAND_bytes
+#endif
+
int do_purge = 0;
int sighup = 0;
int sigalrm = 0;
int do_purge = 0;
int sighup = 0;
int sigalrm = 0;
@@
-151,14
+155,15
@@
cp
c = (connection_t *)node->data;
if(c->status.remove)
c = (connection_t *)node->data;
if(c->status.remove)
- connection_del(c);
+ {
+ connection_del(c);
+ if(!connection_tree->head)
+ purge();
+ }
else
FD_SET(c->socket, fs);
}
else
FD_SET(c->socket, fs);
}
- if(!connection_tree->head)
- purge();
-
for(i = 0; i < listen_sockets; i++)
{
FD_SET(listen_socket[i].tcp, fs);
for(i = 0; i < listen_sockets; i++)
{
FD_SET(listen_socket[i].tcp, fs);
@@
-365,6
+370,8
@@
cp
dump_connections();
return;
}
dump_connections();
return;
}
+
+ continue;
}
check_network_activity(&fset);
}
check_network_activity(&fset);