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

OSX support

Browse source
This commit is contained in:
Ivo Timmermans 2002-06-09 15:26:10 +00:00
parent 78e8852184
commit 9d769e0bf2
3 changed files with 63 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
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.47 2002/06/08 14:08:56 guus Exp $ dnl $Id: configure.in,v 1.13.2.48 2002/06/09 15:26:10 zarq Exp $
AC_INIT(src/tincd.c) AC_INIT(src/tincd.c)
AM_INIT_AUTOMAKE(tinc, 1.0-cvs) AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
@ -83,7 +83,8 @@ AC_STRUCT_TM
AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t, AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t,
[ [
AC_TRY_COMPILE( AC_TRY_COMPILE(
[#include <sys/socket.h>], [#include <sys/types.h>
#include <sys/socket.h>],
[socklen_t len = 42; return len;], [socklen_t len = 42; return len;],
ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=yes,
ac_cv_type_socklen_t=no) ac_cv_type_socklen_t=no)
@ -97,7 +98,7 @@ AC_FUNC_MEMCMP
AC_FUNC_ALLOCA AC_FUNC_ALLOCA
AC_TYPE_SIGNAL AC_TYPE_SIGNAL
AC_CHECK_FUNCS([asprintf daemon fcloseall flock ftime get_current_dir_name \ AC_CHECK_FUNCS([asprintf daemon fcloseall flock ftime get_current_dir_name \
putenv select strdup strerror strsignal strtol unsetenv]) putenv select strdup strerror strsignal strtol unsetenv getnameinfo])
jm_FUNC_MALLOC jm_FUNC_MALLOC
jm_FUNC_REALLOC jm_FUNC_REALLOC

4
lib/dropin.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: dropin.c,v 1.1.2.8 2002/02/10 21:57:51 guus Exp $ $Id: dropin.c,v 1.1.2.9 2002/06/09 15:26:10 zarq Exp $
*/ */
#include "config.h" #include "config.h"
@ -35,6 +35,8 @@
#include <system.h> #include <system.h>
#include <errno.h> #include <errno.h>
#include "fake-getnameinfo.c"
#ifndef HAVE_DAEMON #ifndef HAVE_DAEMON
/* /*
Replacement for the daemon() function. Replacement for the daemon() function.

56
lib/fake-getnameinfo.c Normal file
View file

@ -0,0 +1,56 @@
/*
* fake library for ssh
*
* This file includes getnameinfo().
* These funtions are defined in rfc2133.
*
* But these functions are not implemented correctly. The minimum subset
* is implemented for ssh use only. For exapmle, this routine assumes
* that ai_family is AF_INET. Don't use it for another purpose.
*/
#include "config.h"
#include <system.h>
RCSID("$Id: fake-getnameinfo.c,v 1.1.2.1 2002/06/09 15:26:10 zarq Exp $");
#ifndef HAVE_GETNAMEINFO
int getnameinfo(const struct sockaddr *sa, size_t salen, char *host,
size_t hostlen, char *serv, size_t servlen, int flags)
{
struct sockaddr_in *sin = (struct sockaddr_in *)sa;
struct hostent *hp;
char tmpserv[16];
if (serv) {
snprintf(tmpserv, sizeof(tmpserv), "%d", ntohs(sin->sin_port));
if (strlen(tmpserv) >= servlen)
return EAI_MEMORY;
else
strcpy(serv, tmpserv);
}
if (host) {
if (flags & NI_NUMERICHOST) {
if (strlen(inet_ntoa(sin->sin_addr)) >= hostlen)
return EAI_MEMORY;
strcpy(host, inet_ntoa(sin->sin_addr));
return 0;
} else {
hp = gethostbyaddr((char *)&sin->sin_addr,
sizeof(struct in_addr), AF_INET);
if (hp == NULL)
return EAI_NODATA;
if (strlen(hp->h_name) >= hostlen)
return EAI_MEMORY;
strcpy(host, hp->h_name);
return 0;
}
}
return 0;
}
#endif /* !HAVE_GETNAMEINFO */