From 7ad69e645000fc66951a79104b0ce5ac3478b9f3 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Fri, 18 May 2012 00:06:49 +0200 Subject: - Make Ipv6 support complete (minus tun-ipv6 warning) - Implement byte counter support in the log window - Fix spelling of secret (closes issue #22) - Replace "quot; with ", no idea what went wrong there (closes issue #21) --- openvpn/src/compat/#compat-basename.c# | 50 ---------------------- openvpn/src/compat/#compat-inet_ntop.c# | 76 --------------------------------- openvpn/src/compat/#compat.h# | 68 ----------------------------- 3 files changed, 194 deletions(-) delete mode 100644 openvpn/src/compat/#compat-basename.c# delete mode 100644 openvpn/src/compat/#compat-inet_ntop.c# delete mode 100644 openvpn/src/compat/#compat.h# (limited to 'openvpn/src/compat') diff --git a/openvpn/src/compat/#compat-basename.c# b/openvpn/src/compat/#compat-basename.c# deleted file mode 100644 index a0576919..00000000 --- a/openvpn/src/compat/#compat-basename.c# +++ /dev/null @@ -1,50 +0,0 @@ -/* - * OpenVPN -- An application to securely tunnel IP networks - * over a single UDP port, with support for SSL/TLS-based - * session authentication and key exchange, - * packet encryption, packet authentication, and - * packet compression. - * - * Copyright (C) 2011 - David Sommerseth - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program (see the file COPYING included with this - * distribution); if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#elif defined(_MSC_VER) -#include "config-msvc.h" -#endif - -#ifndef HAVE_BASENAME - -#include "compat.h" -#include - -/* Modified version based on glibc-2.14.1 by Roland McGrath - * This version is extended to handle both / and \ in path names - */ -char * -basename (char *filename) -{ - char *p = strrchr (filename, '/'); - if (!p) { - /* If NULL, check for \ instead ... might be Windows a path */ - p = strrchr (filename, '\\'); - } - return p ? p + 1 : (char *) filename; -} - -#endif /* HAVE_BASENAME */ diff --git a/openvpn/src/compat/#compat-inet_ntop.c# b/openvpn/src/compat/#compat-inet_ntop.c# deleted file mode 100644 index 0d521425..00000000 --- a/openvpn/src/compat/#compat-inet_ntop.c# +++ /dev/null @@ -1,76 +0,0 @@ -/* - * OpenVPN -- An application to securely tunnel IP networks - * over a single UDP port, with support for SSL/TLS-based - * session authentication and key exchange, - * packet encryption, packet authentication, and - * packet compression. - * - * Copyright (C) 2011 - David Sommerseth - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program (see the file COPYING included with this - * distribution); if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#elif defined(_MSC_VER) -#include "config-msvc.h" -#endif - -#ifndef HAVE_INET_NTOP - -#include "compat.h" - -#ifdef WIN32 - -#include - -/* - * inet_ntop() and inet_pton() wrap-implementations using - * WSAAddressToString() and WSAStringToAddress() functions - * - * this is needed as long as we support running OpenVPN on WinXP - */ - -const char * -inet_ntop(int af, const void *src, char *dst, socklen_t size) -{ - struct sockaddr_storage ss; - unsigned long s = size; - - ZeroMemory(&ss, sizeof(ss)); - ss.ss_family = af; - - switch(af) { - case AF_INET: - ((struct sockaddr_in *)&ss)->sin_addr = *(struct in_addr *)src; - break; - case AF_INET6: - ((struct sockaddr_in6 *)&ss)->sin6_addr = *(struct in6_addr *)src; - break; - default: - return NULL; - } - /* cannot direclty use &size because of strict aliasing rules */ - return (WSAAddressToString((struct sockaddr *)&ss, sizeof(ss), NULL, dst, &s) == 0)? - dst : NULL; -} - -#else - -#error no emulation for inet_ntop - -#endif - -#endif diff --git a/openvpn/src/compat/#compat.h# b/openvpn/src/compat/#compat.h# deleted file mode 100644 index 021573eb..00000000 --- a/openvpn/src/compat/#compat.h# +++ /dev/null @@ -1,68 +0,0 @@ -/* - * OpenVPN -- An application to securely tunnel IP networks - * over a single UDP port, with support for SSL/TLS-based - * session authentication and key exchange, - * packet encryption, packet authentication, and - * packet compression. - * - * Copyright (C) 2011 - David Sommerseth - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program (see the file COPYING included with this - * distribution); if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef COMPAT_H -#define COMPAT_H - -#ifdef HAVE_WINSOCK2_H -#include -#endif - -#ifdef HAVE_WS2TCPIP_H -#include -#endif - -#ifdef HAVE_SYS_TIME_H -#include -#endif - -#ifdef HAVE_SYS_SOCKET_H -#include -#endif - -#ifndef HAVE_DIRNAME -char * dirname(char *str); -#endif /* HAVE_DIRNAME */ - -#ifndef HAVE_BASENAME -char * basename(char *str); -#endif /* HAVE_BASENAME */ - -#ifndef HAVE_GETTIMEOFDAY -int gettimeofday (struct timeval *tv, void *tz); -#endif - -#ifndef HAVE_DAEMON -int daemon(int nochdir, int noclose); -#endif - -#ifndef HAVE_INET_NTOP -const char * inet_ntop(int af, const void *src, char *dst, socklen_t size); -#endif - -#ifndef HAVE_INET_PTON -int inet_pton(int af, const char *src, void *dst); -#endif - -#endif /* COMPAT_H */ -- cgit v1.2.3