projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Use strerror() instead of sys_errlist[] for increased portability
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
3df55a7
..
72c1b5e
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
5 2000/08/09 09:34:21
guus Exp $
+ $Id: net.c,v 1.35.4.2
7 2000/09/06 11:49:03
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);
@@
-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)
{
@@
-486,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)))
{
@@
-920,7
+934,7
@@
cp
if(x)
{
syslog(LOG_ERR, _("Incoming data socket error for %s (%s): %s"),
if(x)
{
syslog(LOG_ERR, _("Incoming data socket error for %s (%s): %s"),
- cl->vpn_hostname, cl->real_hostname, s
ys_errlist[x]
);
+ cl->vpn_hostname, cl->real_hostname, s
trerror(x)
);
return -1;
}
return -1;
}
@@
-1118,17
+1132,11
@@
cp
if(x)
{
syslog(LOG_ERR, _("Metadata socket error for %s (%s): %s"),
if(x)
{
syslog(LOG_ERR, _("Metadata socket error for %s (%s): %s"),
- cl->vpn_hostname, cl->real_hostname, s
ys_errlist[x]
);
+ cl->vpn_hostname, cl->real_hostname, s
trerror(x)
);
return -1;
}
return -1;
}
- if(cl->buflen >= MAXBUFSIZE)
- {
- syslog(LOG_ERR, _("Metadata read buffer overflow!"));
- 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)
{
@@
-1219,6
+1227,12
@@
cp
}
}
}
}
+ if(cl->buflen >= MAXBUFSIZE)
+ {
+ syslog(LOG_ERR, _("Metadata read buffer overflow!"));
+ return -1;
+ }
+
cl->last_ping_time = time(NULL);
cl->want_ping = 0;
cp
cl->last_ping_time = time(NULL);
cl->want_ping = 0;
cp
@@
-1250,7
+1264,7
@@
cp
*/
getsockopt(p->socket, SOL_SOCKET, SO_ERROR, &x, &l);
syslog(LOG_ERR, _("Outgoing data socket error for %s (%s): %s"),
*/
getsockopt(p->socket, SOL_SOCKET, SO_ERROR, &x, &l);
syslog(LOG_ERR, _("Outgoing data socket error for %s (%s): %s"),
- p->vpn_hostname, p->real_hostname, s
ys_errlist[x]
);
+ p->vpn_hostname, p->real_hostname, s
trerror(x)
);
terminate_connection(p);
return;
}
terminate_connection(p);
return;
}