/*
upnp.c -- UPnP-IGD client
- Copyright (C) 2015 Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2015-2018 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
#include "upnp.h"
+#ifndef HAVE_MINGW
#include <pthread.h>
+#endif
#include "miniupnpc/miniupnpc.h"
#include "miniupnpc/upnpcommands.h"
#else
-#if MINIUPNPC_API_VERSION > 15
+#if MINIUPNPC_API_VERSION > 17
#warning "The version of libminiupnpc you're building against seems to be too recent. Expect trouble."
#endif
// if we're running with Port=0 (dynamically assigned port).
sockaddr_t sa;
socklen_t salen = sizeof(sa);
- if (getsockname(socket, &sa.sa, &salen)) {
+
+ if(getsockname(socket, &sa.sa, &salen)) {
logger(DEBUG_PROTOCOL, LOG_ERR, "[upnp] Unable to get socket address: [%d] %s", sockerrno, sockstrerror(sockerrno));
return;
}
+
char *port;
sockaddr2str(&sa, NULL, &port);
- if (!port) {
+
+ if(!port) {
logger(DEBUG_PROTOCOL, LOG_ERR, "[upnp] Unable to get socket port");
return;
}
snprintf(lease_duration, sizeof(lease_duration), "%d", upnp_refresh_period * 2);
int error = UPNP_AddPortMapping(urls->controlURL, data->first.servicetype, port, port, myaddr, identname, proto, NULL, lease_duration);
- if (error == 0) {
+
+ if(error == 0) {
logger(DEBUG_PROTOCOL, LOG_INFO, "[upnp] Successfully set port mapping (%s:%s %s for %s seconds)", myaddr, port, proto, lease_duration);
} else {
logger(DEBUG_PROTOCOL, LOG_ERR, "[upnp] Failed to set port mapping (%s:%s %s for %s seconds): [%d] %s", myaddr, port, proto, lease_duration, error, strupnperror(error));
int error;
struct UPNPDev *devices = upnp_discover(upnp_discover_wait * 1000, &error);
- if (!devices) {
+
+ if(!devices) {
logger(DEBUG_PROTOCOL, LOG_WARNING, "[upnp] Unable to find IGD devices: [%d] %s", error, strupnperror(error));
freeUPNPDevlist(devices);
return;
}
struct UPNPUrls urls;
+
struct IGDdatas data;
+
char myaddr[64];
+
int result = UPNP_GetValidIGD(devices, &urls, &data, myaddr, sizeof(myaddr));
- if (result <= 0) {
+
+ if(result <= 0) {
logger(DEBUG_PROTOCOL, LOG_WARNING, "[upnp] No IGD found");
freeUPNPDevlist(devices);
return;
}
+
logger(DEBUG_PROTOCOL, LOG_INFO, "[upnp] IGD found: [%d] %s (local address: %s, service type: %s)", result, urls.controlURL, myaddr, data.first.servicetype);
- for (int i = 0; i < listen_sockets; i++) {
- if (upnp_tcp) upnp_add_mapping(&urls, &data, myaddr, listen_socket[i].tcp.fd, "TCP");
- if (upnp_udp) upnp_add_mapping(&urls, &data, myaddr, listen_socket[i].udp.fd, "UDP");
+ for(int i = 0; i < listen_sockets; i++) {
+ if(upnp_tcp) {
+ upnp_add_mapping(&urls, &data, myaddr, listen_socket[i].tcp.fd, "TCP");
+ }
+
+ if(upnp_udp) {
+ upnp_add_mapping(&urls, &data, myaddr, listen_socket[i].udp.fd, "UDP");
+ }
}
FreeUPNPUrls(&urls);
}
static void *upnp_thread(void *data) {
- while (true) {
+ (void)data;
+
+ while(true) {
time_t start = time(NULL);
upnp_refresh();
// Make sure we'll stick to the refresh period no matter how long upnp_refresh() takes.
time_t refresh_time = start + upnp_refresh_period;
time_t now = time(NULL);
- if (now < refresh_time) sleep(refresh_time - now);
+
+ if(now < refresh_time) {
+ nanosleep(&(struct timespec) {
+ refresh_time - now, 0
+ }, NULL);
+ }
}
// TODO: we don't have a clean thread shutdown procedure, so we can't remove the mapping.
get_config_int(lookup_config(config_tree, "UPnPDiscoverWait"), &upnp_discover_wait);
get_config_int(lookup_config(config_tree, "UPnPRefreshPeriod"), &upnp_refresh_period);
+#ifdef HAVE_MINGW
+ HANDLE handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)upnp_thread, NULL, 0, NULL);
+
+ if(!handle) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Unable to start UPnP-IGD client thread");
+ }
+
+#else
pthread_t thread;
int error = pthread_create(&thread, NULL, upnp_thread, NULL);
- if (error) {
+
+ if(error) {
logger(DEBUG_ALWAYS, LOG_ERR, "Unable to start UPnP-IGD client thread: [%d] %s", error, strerror(error));
}
+
+#endif
}