along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: net_socket.c,v 1.1.2.2 2002/02/20 19:25:09 guus Exp $
+ $Id: net_socket.c,v 1.1.2.11 2002/03/27 14:02:36 guus Exp $
*/
#include "config.h"
int maxtimeout = 900;
int seconds_till_retry = 5;
-int tcp_socket = -1;
-int udp_socket = -1;
+listen_socket_t listen_socket[MAXSOCKETS];
+int listen_sockets = 0;
+
/* Setup sockets */
int setup_listen_socket(sockaddr_t *sa)
int nfd, flags;
char *addrstr;
int option;
-#ifdef HAVE_LINUX
+#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
char *interface;
+ struct ifreq ifr;
#endif
cp
if((nfd = socket(sa->sa.sa_family, SOCK_STREAM, IPPROTO_TCP)) < 0)
option = 1;
setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
-#ifdef HAVE_LINUX
+
+#if defined(SOL_TCP) && defined(TCP_NODELAY)
setsockopt(nfd, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
+#endif
+#if defined(SOL_IP) && defined(IP_TOS) && defined(IPTOS_LOWDELAY)
option = IPTOS_LOWDELAY;
setsockopt(nfd, SOL_IP, IP_TOS, &option, sizeof(option));
+#endif
if(get_config_string(lookup_config(config_tree, "BindToInterface"), &interface))
- if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, interface, strlen(interface)))
- {
- close(nfd);
- syslog(LOG_ERR, _("Can't bind to interface %s: %s"), interface, strerror(errno));
- return -1;
- }
+ {
+#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
+ memset(&ifr, 0, sizeof(ifr));
+ strncpy(ifr.ifr_ifrn.ifrn_name, interface, IFNAMSIZ);
+ if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr)))
+ {
+ close(nfd);
+ syslog(LOG_ERR, _("Can't bind to interface %s: %s"), interface, strerror(errno));
+ return -1;
+ }
+#else
+ syslog(LOG_WARNING, _("BindToDevice not supported on this platform"));
#endif
+ }
- if(bind(nfd, &sa->sa, sizeof(*sa)))
+ if(bind(nfd, &sa->sa, SALEN(sa->sa)))
{
close(nfd);
addrstr = sockaddr2hostname(sa);
int nfd, flags;
char *addrstr;
int option;
-#ifdef HAVE_LINUX
+#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
char *interface;
+ struct ifreq ifr;
#endif
cp
if((nfd = socket(sa->sa.sa_family, SOCK_DGRAM, IPPROTO_UDP)) < 0)
option = 1;
setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
-#ifdef HAVE_LINUX
+
+#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
if(get_config_string(lookup_config(config_tree, "BindToInterface"), &interface))
- if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, interface, strlen(interface)))
- {
- close(nfd);
- syslog(LOG_ERR, _("Can't bind to interface %s: %s"), interface, strerror(errno));
- return -1;
- }
+ {
+ memset(&ifr, 0, sizeof(ifr));
+ strncpy(ifr.ifr_ifrn.ifrn_name, interface, IFNAMSIZ);
+ if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr)))
+ {
+ close(nfd);
+ syslog(LOG_ERR, _("Can't bind to interface %s: %s"), interface, strerror(errno));
+ return -1;
+ }
+ }
#endif
- if(bind(nfd, &sa->sa, sizeof(*sa)))
+ if(bind(nfd, &sa->sa, SALEN(sa->sa)))
{
close(nfd);
addrstr = sockaddr2hostname(sa);
event = new_event();
event->handler = (event_handler_t)setup_outgoing_connection;
- event->time = time(NULL) + outgoing->timeout;
+ event->time = now + outgoing->timeout;
event->data = outgoing;
event_add(event);
/* Connect */
- if(connect(c->socket, &c->address.sa, sizeof(c->address)) == -1)
+ if(connect(c->socket, &c->address.sa, SALEN(c->address.sa)) == -1)
{
close(c->socket);
- syslog(LOG_ERR, _("%s: %s"), c->hostname, strerror(errno));
+ syslog(LOG_ERR, _("Error while connecting to %s (%s): %s"), c->name, c->hostname, strerror(errno));
return -1;
}
if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname);
- c->last_ping_time = time(NULL);
+ c->last_ping_time = now;
send_id(c);
cp
if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_ERR, _("Could not set up a meta connection to %s"), c->name);
c->status.remove = 1;
- do_prune = 1;
retry_outgoing(c->outgoing);
return;
}
/* Connect */
- result = connect(c->socket, &c->address.sa, sizeof(c->address));
+ result = connect(c->socket, &c->address.sa, SALEN(c->address.sa));
if(result == -1)
{
}
c->outgoing = outgoing;
- c->last_ping_time = time(NULL);
+ c->last_ping_time = now;
connection_add(c);
accept a new tcp connect and create a
new connection
*/
-int handle_new_meta_connection()
+int handle_new_meta_connection(int sock)
{
connection_t *c;
sockaddr_t sa;
int fd, len = sizeof(sa);
cp
- if((fd = accept(tcp_socket, &sa.sa, &len)) < 0)
+ if((fd = accept(sock, &sa.sa, &len)) < 0)
{
syslog(LOG_ERR, _("Accepting a new connection failed: %s"), strerror(errno));
return -1;
}
+ sockaddrunmap(&sa);
+
c = new_connection();
c->outcipher = myself->connection->outcipher;
c->outdigest = myself->connection->outdigest;
c->address = sa;
c->hostname = sockaddr2hostname(&sa);
c->socket = fd;
- c->last_ping_time = time(NULL);
+ c->last_ping_time = now;
if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Connection from %s"), c->hostname);