mirror of
https://github.com/samba-team/samba.git
synced 2025-03-27 22:50:26 +03:00
libreplace: add an inet_aton() function that calls inet_pton().
inet_aton() is even needed inside libreplace, in the implementation of rep_getaddrinfo(). Michael (cherry picked from commit bcb2f3a880f8da8f9bedb7a8e61d7d7b533f1919) (This used to be commit 83baff78ce752a9129554a456cc24d043d419cd1)
This commit is contained in:
parent
439002b1c6
commit
27517ea5bb
@ -52,6 +52,7 @@ readline (the library)
|
||||
inet_ntoa
|
||||
inet_ntop
|
||||
inet_pton
|
||||
inet_aton
|
||||
strtoll
|
||||
strtoull
|
||||
socketpair
|
||||
|
29
source3/lib/replace/inet_aton.c
Normal file
29
source3/lib/replace/inet_aton.c
Normal file
@ -0,0 +1,29 @@
|
||||
/*
|
||||
* Unix SMB/CIFS implementation.
|
||||
* replacement functions
|
||||
* Copyright (C) Michael Adam <obnox@samba.org> 2008
|
||||
*
|
||||
* 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
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* 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. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "replace.h"
|
||||
#include "system/network.h"
|
||||
|
||||
/**
|
||||
* We know that we have inet_pton from earlier libreplace checks.
|
||||
*/
|
||||
int rep_inet_aton(const char *src, struct in_addr *dst)
|
||||
{
|
||||
return (inet_pton(AF_INET, src, dst) > 0) ? 1 : 0;
|
||||
}
|
1
source3/lib/replace/inet_aton.m4
Normal file
1
source3/lib/replace/inet_aton.m4
Normal file
@ -0,0 +1 @@
|
||||
AC_CHECK_FUNCS(inet_aton,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} inet_aton.o"])
|
@ -347,6 +347,7 @@ m4_include(timegm.m4)
|
||||
m4_include(socket.m4)
|
||||
m4_include(inet_ntop.m4)
|
||||
m4_include(inet_pton.m4)
|
||||
m4_include(inet_aton.m4)
|
||||
m4_include(getaddrinfo.m4)
|
||||
m4_include(repdir.m4)
|
||||
m4_include(getifaddrs.m4)
|
||||
|
@ -340,6 +340,11 @@ ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset)
|
||||
/* prototype is in "system/network.h" */
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_INET_ATON
|
||||
#define inet_aton rep_inet_aton
|
||||
/* prototype is in "system/network.h" */
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_CONNECT
|
||||
#define connect rep_connect
|
||||
/* prototype is in "system/network.h" */
|
||||
|
@ -103,6 +103,11 @@ int rep_inet_pton(int af, const char *src, void *dst);
|
||||
const char *rep_inet_ntop(int af, const void *src, char *dst, socklen_t size);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_INET_ATON
|
||||
/* define is in "replace.h" */
|
||||
int rep_inet_aton(const char *src, struct in_addr *dst);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_CONNECT
|
||||
/* define is in "replace.h" */
|
||||
int rep_connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen);
|
||||
|
Loading…
x
Reference in New Issue
Block a user