/*
net_setup.c -- Setup.
Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-2015 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2016 Guus Sliepen <guus@tinc-vpn.org>
2006 Scott Lamb <slamb@slamb.org>
2010 Brandon Black <blblack@gmail.com>
#include "utils.h"
#include "xalloc.h"
+#ifdef HAVE_MINIUPNPC
+#include "upnp.h"
+#endif
+
char *myport;
static char *myname;
static io_t device_io;
#if !defined(SOL_IP) || !defined(IP_TOS)
if(priorityinheritance)
- logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform", "PriorityInheritance");
+ logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform for IPv4 connections", "PriorityInheritance");
+#endif
+
+#if !defined(IPPROTO_IPV6) || !defined(IPV6_TCLASS)
+ if(priorityinheritance)
+ logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform for IPv6 connections", "PriorityInheritance");
#endif
if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
else if(!strcasecmp(type, "vde"))
devops = vde_devops;
#endif
- }
- if (type)
free(type);
+ }
get_config_bool(lookup_config(config_tree, "DeviceStandby"), &device_standby);
xasprintf(&myself->hostname, "MYSELF port %s", myport);
myself->connection->hostname = xstrdup(myself->hostname);
+ char *upnp = NULL;
+ get_config_string(lookup_config(config_tree, "UPnP"), &upnp);
+ bool upnp_tcp = false;
+ bool upnp_udp = false;
+ if (upnp) {
+ if (!strcasecmp(upnp, "yes"))
+ upnp_tcp = upnp_udp = true;
+ else if (!strcasecmp(upnp, "udponly"))
+ upnp_udp = true;
+ free(upnp);
+ }
+ if (upnp_tcp || upnp_udp) {
+#ifdef HAVE_MINIUPNPC
+ upnp_init(upnp_tcp, upnp_udp);
+#else
+ logger(DEBUG_ALWAYS, LOG_WARNING, "UPnP was requested, but tinc isn't built with miniupnpc support!");
+#endif
+ }
+
/* Done. */
last_config_check = now.tv_sec;