projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated the manual:
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
cd433d0
..
7d78060
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.2
4 2000/08/08 17:07:47
guus Exp $
+ $Id: net.c,v 1.35.4.2
6 2000/08/09 14:02:16
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-157,7
+157,7
@@
cp
rp->from = ntohl(rp->from);
total_socket_in += rp->len;
rp->from = ntohl(rp->from);
total_socket_in += rp->len;
-
+
if(rp->len >= 0)
{
f = lookup_conn(rp->from);
if(rp->len >= 0)
{
f = lookup_conn(rp->from);
@@
-184,7
+184,7
@@
cp
}
else
{
}
else
{
- /* Can we add to queue? */
+ add_queue(&(cl->sq), rp, rp->len + 2);
if(!cl->status.waitingforkey)
send_key_request(rp->from);
}
if(!cl->status.waitingforkey)
send_key_request(rp->from);
}
@@
-460,6
+460,7
@@
int setup_listen_meta_socket(int port)
int nfd, flags;
struct sockaddr_in a;
const int one = 1;
int nfd, flags;
struct sockaddr_in a;
const int one = 1;
+ config_t const *cfg;
cp
if((nfd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
{
cp
if((nfd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
{
@@
-473,6
+474,12
@@
cp
return -1;
}
return -1;
}
+ if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one)))
+ {
+ syslog(LOG_ERR, _("setsockopt: %m"));
+ return -1;
+ }
+
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
{
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
{
@@
-480,10
+487,23
@@
cp
return -1;
}
return -1;
}
+ if((cfg = get_config_val(interface)))
+ {
+ if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, cfg->data.ptr, strlen(cfg->data.ptr)))
+ {
+ syslog(LOG_ERR, _("Unable to bind listen socket to interface %s: %m"), cfg->data.ptr);
+ return -1;
+ }
+ }
+
memset(&a, 0, sizeof(a));
a.sin_family = AF_INET;
a.sin_port = htons(port);
memset(&a, 0, sizeof(a));
a.sin_family = AF_INET;
a.sin_port = htons(port);
- a.sin_addr.s_addr = htonl(INADDR_ANY);
+
+ if((cfg = get_config_val(interfaceip)))
+ a.sin_addr.s_addr = htonl(cfg->data.ip->ip);
+ else
+ a.sin_addr.s_addr = htonl(INADDR_ANY);
if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
{
if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
{
@@
-579,13
+599,13
@@
cp
}
flags = fcntl(cl->meta_socket, F_GETFL);
}
flags = fcntl(cl->meta_socket, F_GETFL);
-
/*
if(fcntl(cl->meta_socket, F_SETFL, flags | O_NONBLOCK) < 0)
+ if(fcntl(cl->meta_socket, F_SETFL, flags | O_NONBLOCK) < 0)
{
syslog(LOG_ERR, _("fcntl for %s port %d: %m"),
cl->real_hostname, cl->port);
return -1;
}
{
syslog(LOG_ERR, _("fcntl for %s port %d: %m"),
cl->real_hostname, cl->port);
return -1;
}
-*/
+
if(debug_lvl > 0)
syslog(LOG_INFO, _("Connected to %s port %hd"),
cl->real_hostname, cl->port);
if(debug_lvl > 0)
syslog(LOG_INFO, _("Connected to %s port %hd"),
cl->real_hostname, cl->port);
@@
-1122,7
+1142,7
@@
cp
return -1;
}
return -1;
}
- lenin = read(cl->meta_socket, cl->buffer, MAXBUFSIZE
-
cl->buflen);
+ lenin = read(cl->meta_socket, cl->buffer, MAXBUFSIZE
-
cl->buflen);
if(lenin<=0)
{
if(lenin<=0)
{