lagertonne/tinc
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Wiki Activity

Import Upstream version 1.0.8

Browse source
This commit is contained in:
Guus Sliepen 2019-08-26 13:44:38 +02:00
parent 77e8278660
commit 6276954b04
21 changed files with 390 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/connection.c
View file

@ -1,6 +1,6 @@
/*
connection.c -- connection list management
Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
Copyright (C) 2000-2007 Guus Sliepen <guus@tinc-vpn.org>,
2000-2005 Ivo Timmermans
This program is free software; you can redistribute it and/or modify
@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: connection.c 1456 2006-08-08 13:21:08Z guus $
$Id: connection.c 1508 2007-05-16 14:42:08Z guus $
*/
#include "system.h"
@ -78,6 +78,9 @@ void free_connection(connection_t *c)
{
cp();
if(c->name)
free(c->name);
if(c->hostname)
free(c->hostname);

24
src/event.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: event.c 1469 2006-11-11 22:44:15Z guus $
$Id: event.c 1498 2007-02-14 09:20:20Z guus $
*/
#include "system.h"
@ -57,6 +57,28 @@ void exit_events(void)
avl_delete_tree(event_tree);
}
void flush_events(void)
{
avl_tree_t *to_flush;
event_t *event;
/*
* Events can be inserted from event handlers, so only flush events
* already in the priority queue.
*/
cp();
to_flush = event_tree;
init_events();
while (to_flush->head) {
event = to_flush->head->data;
event->handler(event->data);
avl_delete(to_flush, event);
}
avl_delete_tree(to_flush);
}
event_t *new_event(void)
{
cp();

3
src/event.h
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: event.h 1452 2006-04-26 13:52:58Z guus $
$Id: event.h 1498 2007-02-14 09:20:20Z guus $
*/
#ifndef __TINC_EVENT_H__
@ -38,6 +38,7 @@ typedef struct {
extern void init_events(void);
extern void exit_events(void);
extern void flush_events(void);
extern event_t *new_event(void) __attribute__ ((__malloc__));
extern void free_event(event_t *);
extern void event_add(event_t *);

8
src/mingw/device.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: device.c 1496 2007-01-05 13:18:36Z guus $
$Id: device.c 1510 2007-05-16 14:46:25Z guus $
*/
#include "system.h"
@ -76,18 +76,20 @@ DWORD WINAPI tapreader(void *bla) {
sock = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
freeaddrinfo(ai);
if(sock < 0) {
logger(LOG_ERR, _("System call `%s' failed: %s"), "socket", strerror(errno));
freeaddrinfo(ai);
return -1;
}
if(connect(sock, ai->ai_addr, ai->ai_addrlen)) {
logger(LOG_ERR, _("System call `%s' failed: %s"), "connect", strerror(errno));
freeaddrinfo(ai);
return -1;
}
freeaddrinfo(ai);
logger(LOG_DEBUG, _("Tap reader running"));
/* Read from tap device and send to parent */

9
src/net.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net.c 1473 2006-11-29 16:57:46Z guus $
$Id: net.c 1498 2007-02-14 09:20:20Z guus $
*/
#include "system.h"
@ -429,12 +429,7 @@ int main_loop(void)
if(sigalrm) {
logger(LOG_INFO, _("Flushing event queue"));
while(event_tree->head) {
event = event_tree->head->data;
event->handler(event->data);
event_del(event);
}
flush_events();
sigalrm = false;
}

28
src/net_socket.c
View file

@ -1,7 +1,7 @@
/*
net_socket.c -- Handle various kinds of sockets.
Copyright (C) 1998-2005 Ivo Timmermans,
2000-2006 Guus Sliepen <guus@tinc-vpn.org>
2000-2007 Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net_socket.c 1460 2006-08-08 13:50:58Z guus $
$Id: net_socket.c 1508 2007-05-16 14:42:08Z guus $
*/
#include "system.h"
@ -62,6 +62,12 @@ static void configure_tcp(connection_t *c)
if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) {
logger(LOG_ERR, _("fcntl for %s: %s"), c->hostname, strerror(errno));
}
#elif defined(WIN32)
unsigned long arg = 1;
if(ioctlsocket(c->socket, FIONBIO, &arg) != 0) {
logger(LOG_ERR, _("ioctlsocket for %s: WSA error %d"), c->hostname, WSAGetLastError());
}
#endif
#if defined(SOL_TCP) && defined(TCP_NODELAY)
@ -160,6 +166,16 @@ int setup_vpn_in_socket(const sockaddr_t *sa)
return -1;
}
}
#elif defined(WIN32)
{
unsigned long arg = 1;
if(ioctlsocket(nfd, FIONBIO, &arg) != 0) {
closesocket(nfd);
logger(LOG_ERR, _("Call to `%s' failed: WSA error %d"), "ioctlsocket",
WSAGetLastError());
return -1;
}
}
#endif
option = 1;
@ -318,7 +334,11 @@ begin:
result = connect(c->socket, &c->address.sa, SALEN(c->address.sa));
if(result == -1) {
if(errno == EINPROGRESS) {
if(errno == EINPROGRESS
#if defined(WIN32) && !defined(O_NONBLOCK)
|| WSAGetLastError() == WSAEWOULDBLOCK
#endif
) {
c->status.connecting = true;
return;
}
@ -404,7 +424,7 @@ bool handle_new_meta_connection(int sock)
sockaddrunmap(&sa);
c = new_connection();
c->name = NULL;
c->name = xstrdup("<unknown>");
c->outcipher = myself->connection->outcipher;
c->outdigest = myself->connection->outdigest;
c->outmaclength = myself->connection->outmaclength;

6
src/process.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: process.c 1452 2006-04-26 13:52:58Z guus $
$Id: process.c 1499 2007-02-14 09:21:34Z guus $
*/
#include "system.h"
@ -379,8 +379,10 @@ bool execute_script(const char *name, char **envp)
/* First check if there is a script */
if(stat(scriptname + 1, &s))
if(stat(scriptname + 1, &s)) {
free(scriptname);
return true;
}
ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);

8
src/protocol_auth.c
View file

@ -1,7 +1,7 @@
/*
protocol_auth.c -- handle the meta-protocol, authentication
Copyright (C) 1999-2005 Ivo Timmermans,
2000-2006 Guus Sliepen <guus@tinc-vpn.org>
2000-2007 Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: protocol_auth.c 1452 2006-04-26 13:52:58Z guus $
$Id: protocol_auth.c 1508 2007-05-16 14:42:08Z guus $
*/
#include "system.h"
@ -68,9 +68,9 @@ bool id_h(connection_t *c)
return false;
}
/* If we set c->name in advance, make sure we are connected to the right host */
/* If this is an outgoing connection, make sure we are connected to the right host */
if(c->name) {
if(c->outgoing) {
if(strcmp(c->name, name)) {
logger(LOG_ERR, _("Peer %s is %s instead of %s"), c->hostname, name,
c->name);