j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

More missing IPv6 definitions and autoconf checks to make sure it compiles

Browse source 
under Solaris 2.6.
This commit is contained in:
Guus Sliepen 2003-07-11 16:13:00 +00:00
parent 71f8124ea4
commit 2a7f11c0e9
7 changed files with 265 additions and 260 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.in
View file

@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl $Id: configure.in,v 1.13.2.65 2003/07/07 11:11:33 guus Exp $ dnl $Id: configure.in,v 1.13.2.66 2003/07/11 16:12:58 guus Exp $
AC_PREREQ(2.53) AC_PREREQ(2.53)
AC_INIT(src/tincd.c) AC_INIT(src/tincd.c)
@ -127,7 +127,7 @@ AC_CHECK_FUNC(gethostbyname, [], [
AC_CHECK_LIB(nsl, gethostbyname) AC_CHECK_LIB(nsl, gethostbyname)
]) ])
AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo]) AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo inet_aton])
AC_CACHE_SAVE AC_CACHE_SAVE

5
lib/fake-getaddrinfo.c
View file

@ -13,8 +13,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#include <netinet/in.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h> #include <netdb.h>
#include <string.h> #include <string.h>
@ -97,12 +98,14 @@ int getaddrinfo(const char *hostname, const char *servname,
return EAI_MEMORY; return EAI_MEMORY;
} }
#ifdef HAVE_INET_ATON
if (inet_aton(hostname, &in)) { if (inet_aton(hostname, &in)) {
if (NULL != (*res = malloc_ai(port, in.s_addr))) if (NULL != (*res = malloc_ai(port, in.s_addr)))
return 0; return 0;
else else
return EAI_MEMORY; return EAI_MEMORY;
} }
#endif
hp = gethostbyname(hostname); hp = gethostbyname(hostname);
if (hp && hp->h_name && hp->h_name[0] && hp->h_addr_list[0]) { if (hp && hp->h_name && hp->h_name[0] && hp->h_addr_list[0]) {

9
lib/ipv6.h
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: ipv6.h,v 1.1.2.2 2003/07/07 11:50:52 guus Exp $ $Id: ipv6.h,v 1.1.2.3 2003/07/11 16:12:59 guus Exp $
*/ */
#ifndef __TINC_IPV6_H__ #ifndef __TINC_IPV6_H__
@ -60,6 +60,13 @@ struct sockaddr_in6 {
}; };
#endif #endif
#ifndef IN6_IS_ADDR_V4MAPPED
#define IN6_IS_ADDR_V4MAPPED(a) \
((((__const uint32_t *) (a))[0] == 0) \
&& (((__const uint32_t *) (a))[1] == 0) \
&& (((__const uint32_t *) (a))[2] == htonl (0xffff)))
#endif
#ifndef HAVE_NETINET_IP6_H #ifndef HAVE_NETINET_IP6_H
struct ip6_hdr { struct ip6_hdr {
union { union {

484
po/nl.po
View file

File diff suppressed because it is too large Load diff

12
src/conf.c
View file

@ -19,7 +19,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: conf.c,v 1.9.4.63 2003/07/06 23:16:28 guus Exp $ $Id: conf.c,v 1.9.4.64 2003/07/11 16:12:59 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -429,16 +429,6 @@ int read_server_config()
return x; return x;
} }
static int isadir(const char *f)
{
struct stat s;
if(stat(f, &s) < 0)
return 0;
else
return S_ISDIR(s.st_mode);
}
int is_safe_path(const char *file) int is_safe_path(const char *file)
{ {
char *p; char *p;

4
src/net.h
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net.h,v 1.9.4.61 2003/07/07 11:11:33 guus Exp $ $Id: net.h,v 1.9.4.62 2003/07/11 16:13:00 guus Exp $
*/ */
#ifndef __TINC_NET_H__ #ifndef __TINC_NET_H__
@ -35,6 +35,8 @@
#include <inttypes.h> #include <inttypes.h>
#endif #endif
#include "utils.h"
#ifdef ENABLE_JUMBOGRAMS #ifdef ENABLE_JUMBOGRAMS
#define MTU 9014 /* 9000 bytes payload + 14 bytes ethernet header */ #define MTU 9014 /* 9000 bytes payload + 14 bytes ethernet header */
#else #else

7
src/process.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: process.c,v 1.1.2.52 2003/07/06 23:16:28 guus Exp $ $Id: process.c,v 1.1.2.53 2003/07/11 16:13:00 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -287,11 +287,14 @@ int execute_script(const char *name, char **envp)
name); name);
return -1; return -1;
} }
} else { } else if (errno != EINTR) {
logger(DEBUG_ALWAYS, LOG_ERR, _("System call `%s' failed: %s"), "waitpid", logger(DEBUG_ALWAYS, LOG_ERR, _("System call `%s' failed: %s"), "waitpid",
strerror(errno)); strerror(errno));
return -1; return -1;
} }
/* Why do we get EINTR? */
return 0;
} }
/* Child here */ /* Child here */