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.20 2000/07/02 13:40:57 guus Exp $
+ $Id: net.c,v 1.35.4.26 2000/08/09 14:02:16 guus Exp $
*/
#include "config.h"
int xsend(conn_list_t *cl, void *packet)
{
- int r;
real_packet_t rp;
cp
do_encrypt((vpn_packet_t*)packet, &rp, cl->key);
syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
ntohs(rp.len), cl->vpn_hostname, cl->real_hostname);
- if((r = send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0)
+ total_socket_out += ntohs(rp.len);
+
+ cl->want_ping = 1;
+
+ if((cl->flags | myself->flags) & TCPONLY)
+ return send_tcppacket(cl, (void*)&rp, ntohs(rp.len));
+
+ if((send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0)
{
syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}
-
- total_socket_out += r;
-
- cl->want_ping = 1;
cp
return 0;
}
return 0;
}
+int tcprecv(conn_list_t *cl, real_packet_t *rp)
+{
+ vpn_packet_t vp;
+ int lenin;
+ conn_list_t *f;
+cp
+ rp->data.len = ntohs(rp->data.len);
+ rp->len = ntohs(rp->len);
+ rp->from = ntohl(rp->from);
+
+ total_socket_in += rp->len;
+
+ if(rp->len >= 0)
+ {
+ f = lookup_conn(rp->from);
+ if(!f)
+ {
+ syslog(LOG_ERR, _("Got packet from %s (%s) with unknown origin %d.%d.%d.%d?"),
+ cl->vpn_hostname, cl->real_hostname, IP_ADDR_V(rp->from));
+ return -1;
+ }
+
+ if(f->status.validkey)
+ {
+ do_decrypt(rp, &vp, cl->key);
+ add_mac_addresses(&vp);
+
+ if(debug_lvl > 3)
+ syslog(LOG_ERR, _("Receiving packet of %d bytes from %s (%s)"),
+ rp->len, cl->vpn_hostname, cl->real_hostname);
+
+ if((lenin = write(tap_fd, &vp, vp.len + sizeof(vp.len))) < 0)
+ syslog(LOG_ERR, _("Can't write to tap device: %m"));
+ else
+ total_tap_out += lenin;
+ }
+ else
+ {
+ add_queue(&(cl->sq), rp, rp->len + 2);
+ if(!cl->status.waitingforkey)
+ send_key_request(rp->from);
+ }
+
+ if(my_key_expiry <= time(NULL))
+ regenerate_keys();
+ }
+
+ cl->want_ping = 0;
+ cl->last_ping_time = time(NULL);
+cp
+ return 0;
+}
+
/*
add the given packet of size s to the
queue q, be it the send or receive queue
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)
{
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)
{
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);
- 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)))
{
else
myself->port = cfg->data.val;
- if(cfg = get_config_val(indirectdata))
+ if((cfg = get_config_val(indirectdata)))
if(cfg->data.val == stupid_true)
myself->flags |= EXPORTINDIRECTDATA;
+ if((cfg = get_config_val(tcponly)))
+ if(cfg->data.val == stupid_true)
+ myself->flags |= TCPONLY;
+
if((myself->meta_socket = setup_listen_meta_socket(myself->port)) < 0)
{
syslog(LOG_ERR, _("Unable to set up a listening socket"));
*/
void terminate_connection(conn_list_t *cl)
{
- conn_list_t *p, *q;
+ conn_list_t *p;
cp
if(cl->status.remove)
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(errno==EINTR)
return 0;
if(errno==0)
- if(debug_lvl>0)
- syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
+ {
+ if(debug_lvl>0)
+ syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
+ }
else
syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"),
cl->vpn_hostname, cl->real_hostname);
for(;;)
{
- cl->reqlen = 0;
-
- for(i = oldlen; i < cl->buflen; i++)
+ if(cl->tcppacket)
{
- if(cl->buffer[i] == '\n')
+ if(cl->buflen >= cl->tcppacket)
+ {
+ tcprecv(cl, (real_packet_t *)cl->buffer);
+ cl->buflen -= cl->tcppacket;
+ memmove(cl->buffer, cl->buffer + cl->tcppacket, cl->buflen);
+ oldlen = 0;
+ cl->tcppacket=0;
+ }
+ else
{
- cl->buffer[i] = 0; /* replace end-of-line by end-of-string so we can use sscanf */
- cl->reqlen = i + 1;
break;
}
}
-
- if(cl->reqlen)
+ else
{
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, _("Got request from %s (%s): %s"),
- cl->vpn_hostname, cl->real_hostname, cl->buffer);
- if(sscanf(cl->buffer, "%d", &request) == 1)
+ cl->reqlen = 0;
+
+ for(i = oldlen; i < cl->buflen; i++)
{
- if((request < 0) || (request > 255) || (request_handlers[request] == NULL))
+ if(cl->buffer[i] == '\n')
{
- syslog(LOG_ERR, _("Unknown request from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
+ cl->buffer[i] = 0; /* replace end-of-line by end-of-string so we can use sscanf */
+ cl->reqlen = i + 1;
+ break;
}
+ }
- if(request_handlers[request](cl)) /* Something went wrong. Probably scriptkiddies. Terminate. */
+ if(cl->reqlen)
+ {
+ if(debug_lvl > 2)
+ syslog(LOG_DEBUG, _("Got request from %s (%s): %s"),
+ cl->vpn_hostname, cl->real_hostname, cl->buffer);
+ if(sscanf(cl->buffer, "%d", &request) == 1)
{
- syslog(LOG_ERR, _("Error while processing request from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
+ if((request < 0) || (request > 255) || (request_handlers[request] == NULL))
+ {
+ syslog(LOG_ERR, _("Unknown request from %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
+ return -1;
+ }
+
+ if(request_handlers[request](cl)) /* Something went wrong. Probably scriptkiddies. Terminate. */
+ {
+ syslog(LOG_ERR, _("Error while processing request from %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
+ return -1;
+ }
+ }
+ else
+ {
+ syslog(LOG_ERR, _("Bogus data received from %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
return -1;
}
+
+ cl->buflen -= cl->reqlen;
+ memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen);
+ oldlen = 0;
}
else
{
- syslog(LOG_ERR, _("Bogus data received from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
+ break;
}
-
- cl->buflen -= cl->reqlen;
- memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen);
- oldlen = 0;
- }
- else
- {
- break;
}
}
projects / tinc / blobdiff