projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup:
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
30c73d9
..
7ebbbd0
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.17
0 2002/04/18 20:09:05 zarq
Exp $
+ $Id: net.c,v 1.35.4.17
2 2002/06/08 12:57:09 guus
Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-26,8
+26,10
@@
#include <fcntl.h>
#include <netdb.h>
#include <netinet/in.h>
#include <fcntl.h>
#include <netdb.h>
#include <netinet/in.h>
-#ifdef HAVE_
LINUX
+#ifdef HAVE_
NETINET_IP_H
#include <netinet/ip.h>
#include <netinet/ip.h>
+#endif
+#ifdef HAVE_NETINET_TCP_H
#include <netinet/tcp.h>
#endif
#include <stdio.h>
#include <netinet/tcp.h>
#endif
#include <stdio.h>
@@
-155,14
+157,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);