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.20 2002/09/09 21:24:41 guus Exp $
+ $Id: net_socket.c,v 1.1.2.24 2003/06/11 19:27:35 guus Exp $
*/
#include "config.h"
#include <fcntl.h>
#include <netdb.h>
#include <netinet/in.h>
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include <netinet/in_systm.h>
-#endif
-#ifdef HAVE_NETINET_IP_H
-#include <netinet/ip.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#include <net/if.h>
+#ifdef HAVE_NETINET_IN_SYSTM_H
+#include <netinet/in_systm.h>
+#endif
+#ifdef HAVE_NETINET_IP_H
+#include <netinet/ip.h>
+#endif
+#ifdef HAVE_NETINET_TCP_H
+#include <netinet/tcp.h>
+#endif
#include <utils.h>
#include <xalloc.h>
#define RAND_pseudo_bytes RAND_bytes
#endif
-int addressfamily = AF_INET;
+int addressfamily = AF_UNSPEC;
int maxtimeout = 900;
int seconds_till_retry = 5;
/* Setup sockets */
-int setup_listen_socket(sockaddr_t * sa)
+int setup_listen_socket(sockaddr_t *sa)
{
int nfd, flags;
char *addrstr;
return -1;
}
#else
- syslog(LOG_WARNING, _("BindToDevice not supported on this platform"));
+ syslog(LOG_WARNING, _("BindToInterface not supported on this platform"));
#endif
}
return nfd;
}
-int setup_vpn_in_socket(sockaddr_t * sa)
+int setup_vpn_in_socket(sockaddr_t *sa)
{
int nfd, flags;
char *addrstr;
return nfd;
}
-void retry_outgoing(outgoing_t * outgoing)
+void retry_outgoing(outgoing_t *outgoing)
{
event_t *event;
outgoing->timeout);
}
-int setup_outgoing_socket(connection_t * c)
-{
- int option;
-
- cp();
-
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_INFO, _("Trying to connect to %s (%s)"), c->name,
- c->hostname);
-
- c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
-
- if(c->socket == -1) {
- syslog(LOG_ERR, _("Creating socket for %s failed: %s"), c->hostname,
- strerror(errno));
- return -1;
- }
-
- /* Optimize TCP settings */
-
-#if defined(SOL_TCP) && defined(TCP_NODELAY)
- option = 1;
- setsockopt(c->socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
-#endif
-
-#if defined(SOL_IP) && defined(IP_TOS)
- option = IPTOS_LOWDELAY;
- setsockopt(c->socket, SOL_IP, IP_TOS, &option, sizeof(option));
-#endif
-
- /* Connect */
-
- if(connect(c->socket, &c->address.sa, SALEN(c->address.sa)) == -1) {
- close(c->socket);
- 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);
-
- return 0;
-}
-
-
-void finish_connecting(connection_t * c)
+void finish_connecting(connection_t *c)
{
cp();
send_id(c);
}
-void do_outgoing_connection(connection_t * c)
+void do_outgoing_connection(connection_t *c)
{
char *address, *port;
int option, result, flags;
return;
}
-void setup_outgoing_connection(outgoing_t * outgoing)
+void setup_outgoing_connection(outgoing_t *outgoing)
{
connection_t *c;
node_t *n;