ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-04-15 15:07:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libc: reintegrate libc_resolv library

Browse Source 
Remove getaddrinfo and freeaddrinfo from the Libc::Plugin and get rid of
the extra libc_resolv library. Remove getaddrinfo/freeaddrinfo symbol
hiding patch for FreeBSD sources. Remove libc_resolv from Makefiles and
run scenarios.

Fix #2273
This commit is contained in:
Emery Hemingway 2017-09-14 14:00:36 -05:00 committed by Christian Helmuth
parent 170b532892
commit 8ca63d4a6e
35 changed files with 63 additions and 381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/dde_linux/lib/mk/libc_lxip.mk
View File

@ -2,4 +2,4 @@ SRC_CC = plugin.cc
vpath %.cc $(REP_DIR)/src/lib/libc_lxip
LIBS += lxip libc libc_resolv
LIBS += lxip libc

2
repos/dde_linux/run/lxip_http_srv.run
View File

@ -100,7 +100,7 @@ install_config $config
# generic modules
set boot_modules {
core ld.lib.so init timer posix.lib.so
libc.lib.so libm.lib.so lxip.lib.so test-lxip_http_srv libc_resolv.lib.so
libc.lib.so libm.lib.so lxip.lib.so test-lxip_http_srv
}
# platform-specific modules

1
repos/dde_linux/run/lxip_udp_echo.run
View File

@ -100,7 +100,6 @@ install_config $config
set boot_modules {
core ld.lib.so init timer
libc.lib.so libm.lib.so lxip.lib.so test-lxip_udp_echo
libc_resolv.lib.so
}
# platform-specific modules

2
repos/dde_linux/run/vfs_lxip.run
View File

@ -89,7 +89,7 @@ install_config $config
append boot_modules {
core init timer } [nic_drv_binary] {
ld.lib.so libc.lib.so libc_lock_pipe.lib.so posix.lib.so
ld.lib.so libc.lib.so libc_pipe.lib.so posix.lib.so
libm.lib.so
vfs_lxip.lib.so lxip.lib.so
tcp_terminal

1
repos/dde_linux/src/lib/libc_lxip/plugin.cc
View File

@ -368,7 +368,6 @@ int Plugin::fcntl(Libc::File_descriptor *sockfdo, int cmd, long val)
}
/* XXX freeaddrinfo / getaddrinfo from libc_resolv.conf */
int Plugin::getpeername(Libc::File_descriptor *sockfdo,
struct sockaddr *addr,
socklen_t *addrlen)

8
repos/libports/include/libc-plugin/plugin.h
View File

@ -53,10 +53,6 @@ namespace Libc {
virtual bool supports_execve(char const *filename, char *const argv[],
char *const envp[]);
virtual bool supports_mkdir(const char *path, mode_t mode);
virtual bool supports_freeaddrinfo(struct ::addrinfo *res);
virtual bool supports_getaddrinfo(const char *node, const char *service,
const struct ::addrinfo *hints,
struct ::addrinfo **res);
virtual bool supports_open(const char *pathname, int flags);
virtual bool supports_pipe();
virtual bool supports_readlink(const char *path, char *buf, ::size_t bufsiz);
@ -95,13 +91,9 @@ namespace Libc {
char *const envp[]);
virtual int fstatfs(File_descriptor *, struct statfs *buf);
virtual int fcntl(File_descriptor *, int cmd, long arg);
virtual void freeaddrinfo(struct ::addrinfo *res);
virtual int fstat(File_descriptor *, struct stat *buf);
virtual int fsync(File_descriptor *);
virtual int ftruncate(File_descriptor *, ::off_t length);
virtual int getaddrinfo(const char *node, const char *service,
const struct ::addrinfo *hints,
struct ::addrinfo **res);
virtual ssize_t getdirentries(File_descriptor *, char *buf,
::size_t nbytes, ::off_t *basep);
virtual int getpeername(File_descriptor *,

4
repos/libports/include/libc-plugin/plugin_registry.h
View File

@ -32,10 +32,6 @@ struct Libc::Plugin_registry : List<Plugin>
Plugin *get_plugin_for_access(char const *pathname, int amode);
Plugin *get_plugin_for_execve(char const *filename, char *const argv[],
char *const envp[]);
Plugin *get_plugin_for_freeaddrinfo(struct addrinfo *res);
Plugin *get_plugin_for_getaddrinfo(const char *node, const char *service,
const struct addrinfo *hints,
struct addrinfo **res);
Plugin *get_plugin_for_mkdir(const char *path, mode_t mode);
Plugin *get_plugin_for_open(const char *pathname, int flags);
Plugin *get_plugin_for_pipe();

5
repos/libports/lib/mk/libc.mk
View File

@ -2,7 +2,8 @@
# C Library including string, locale
#
LIBS = libc-string libc-locale libc-stdlib libc-stdio libc-gen libc-gdtoa \
libc-inet libc-stdtime libc-regex libc-compat libc-setjmp libc-mem
libc-inet libc-stdtime libc-regex libc-compat libc-setjmp libc-mem \
libc-resolv libc-isc libc-nameser libc-net libc-rpc \
LIBS += base vfs
@ -15,7 +16,7 @@ SRC_CC = atexit.cc dummies.cc rlimit.cc sysctl.cc \
plugin.cc plugin_registry.cc select.cc exit.cc environ.cc nanosleep.cc \
pread_pwrite.cc readv_writev.cc poll.cc \
libc_pdbg.cc vfs_plugin.cc rtc.cc dynamic_linker.cc signal.cc \
socket_operations.cc task.cc addrinfo.cc socket_fs_plugin.cc
socket_operations.cc task.cc socket_fs_plugin.cc
CC_OPT_sysctl += -Wno-write-strings

2
repos/libports/lib/mk/libc_lwip.mk
View File

@ -2,4 +2,4 @@ SRC_CC = init.cc plugin.cc
vpath %.cc $(REP_DIR)/src/lib/libc_lwip
LIBS += lwip libc libc-resolv libc-isc libc-nameser libc-net libc-rpc
LIBS += lwip libc

9
repos/libports/lib/mk/libc_resolv.mk
View File

@ -1,9 +0,0 @@
LIBS = libc libc-resolv libc-isc libc-nameser libc-net libc-rpc
SRC_CC = plugin.cc
vpath %.cc $(REP_DIR)/src/lib/libc_resolv
include $(REP_DIR)/lib/mk/libc-common.inc
SHARED_LIB = yes

63
repos/libports/lib/symbols/libc
View File

@ -2,10 +2,14 @@ ___runetype T
___tolower T
___toupper T
__assert T
__dn_expand T
__dn_expand T
__error T
__flt_rounds T
__fpclassifyd T
__fpclassifyf T
__h_errno T
__h_errno_set T
__inet_addr T
__inet_aton T
__inet_nsap_ntoa T
@ -14,6 +18,9 @@ __inet_ntop T
__inet_pton T
__isthreaded B 4
__mb_cur_max D 8
__res_init T
__res_query T
__res_state T
__srget T
__stderrp D 8
__stdinp D 8
@ -21,6 +28,8 @@ __stdoutp D 8
__swbuf T
__xuname T
_exit T
_getlong T
_getshort T
a64l T
abort T
abs T
@ -248,6 +257,8 @@ getgrnam T
getgrnam_r T
getgrouplist T
getgroups W
gethostbyaddr T
gethostbyaddr_r T
gethostbyname W
gethostid T
gethostname T
@ -271,6 +282,8 @@ getpid W
getppid W
getpriority W
getprogname W
getprotobyname T
getprotobyname_r T
getpwent W
getpwnam W
getpwuid W
@ -279,6 +292,8 @@ getrlimit W
getrusage W
gets T
getservbyname W
getservbyport T
getservbyport_r T
getsid W
getsockname T
getsockopt T
@ -304,6 +319,10 @@ heapsort T
hsearch T
imaxabs T
imaxdiv T
in6addr_any R 16
in6addr_linklocal_allnodes R 16
in6addr_loopback R 16
in6addr_nodelocal_allnodes R 16
index T
inet_addr W
inet_aton W
@ -741,8 +760,8 @@ swscanf T
symlink T
sync W
sys_errlist D 752
sys_nerr R
sys_nsig R
sys_nerr R 4
sys_nsig R 4
sys_siglist D 256
sys_signame D 256
sysconf T
@ -901,42 +920,6 @@ __isinff T
__isinfl T
#
# Symbols needed by libc-resolv
#
__inet_nsap_addr T
_accept T
_bind T
_close T
_connect T
_fcntl T
_fstat T
_getpeername T
_getsockname T
_getsockopt T
_listen T
_nanosleep W
_pthread_getspecific W
_pthread_key_create W
_pthread_main_np W
_pthread_mutex_trylock W
_pthread_mutex_unlock W
_pthread_once W
_pthread_rwlock_rdlock W
_pthread_rwlock_unlock W
_pthread_rwlock_wrlock W
_pthread_setspecific W
_read T
_recvfrom T
_select W
_sendto T
_setsockopt T
_sigprocmask W
_socket T
_write T
_writev T
#
# Public interface between Genode-component code and the libc runtime
#
@ -960,10 +943,8 @@ _ZN4Libc25File_descriptor_allocator5allocEPNS_6PluginEPNS_14Plugin_contextEi T
_ZN4Libc25file_descriptor_allocatorEv T
_ZN4Libc6Plugin10getsockoptEPNS_15File_descriptorEiiPvPj T
_ZN4Libc6Plugin10setsockoptEPNS_15File_descriptorEiiPKvj T
_ZN4Libc6Plugin11getaddrinfoEPKcS2_PK8addrinfoPPS3_ T
_ZN4Libc6Plugin11getpeernameEPNS_15File_descriptorEP8sockaddrPj T
_ZN4Libc6Plugin11getsocknameEPNS_15File_descriptorEP8sockaddrPj T
_ZN4Libc6Plugin12freeaddrinfoEP8addrinfo T
_ZN4Libc6Plugin13getdirentriesEPNS_15File_descriptorEPcmPx T
_ZN4Libc6Plugin13getdirentriesEPNS_15File_descriptorEPcmPl T
_ZN4Libc6Plugin13supports_mmapEv T
@ -981,8 +962,6 @@ _ZN4Libc6Plugin15supports_unlinkEPKc T
_ZN4Libc6Plugin16supports_symlinkEPKcS2_ T
_ZN4Libc6Plugin17supports_readlinkEPKcPcj T
_ZN4Libc6Plugin17supports_readlinkEPKcPcm T
_ZN4Libc6Plugin20supports_getaddrinfoEPKcS2_PK8addrinfoPPS3_ T
_ZN4Libc6Plugin21supports_freeaddrinfoEP8addrinfo T
_ZN4Libc6Plugin3dupEPNS_15File_descriptorE T
_ZN4Libc6Plugin4bindEPNS_15File_descriptorEPK8sockaddrj T
_ZN4Libc6Plugin4dup2EPNS_15File_descriptorES2_ T

2
repos/libports/ports/libc.hash
View File

@ -1 +1 @@
cefebffc6e8f129acb24de192373731461abe2f6
5871e71bb99dab10faab21931750c30e8a02d980

2
repos/libports/ports/libc.port
View File

@ -43,7 +43,7 @@ $(foreach svn_export,$(svn_exports),\
$(foreach svn_export,$(svn_exports),\
$(eval REV($(svn_export)) := HEAD))
PATCHES := src/lib/libc/patches/*.patch
PATCHES := $(sort $(wildcard $(REP_DIR)/src/lib/libc/patches/*.patch))
#

1
repos/libports/run/netty.inc
View File

@ -60,7 +60,6 @@ append config {
append boot_modules {
core init timer } [nic_drv_binary] { ram_fs vfs
ld.lib.so libc.lib.so libm.lib.so posix.lib.so
libc_resolv.lib.so stdcxx.lib.so libc_pipe.lib.so
vfs_lxip.lib.so lxip.lib.so
}

2
repos/libports/run/nic_dump.run
View File

@ -253,7 +253,7 @@ install_config $config
build_boot_image "
core init timer nic_router nic_bridge ld.lib.so libc.lib.so libm.lib.so
posix.lib.so libc_resolv.lib.so lwip.lib.so lxip.lib.so test-http_clnt
posix.lib.so lwip.lib.so lxip.lib.so test-http_clnt
test-lwip_httpsrv_static nic_dump test-lxip_udp_echo test-lxip_udp_client
[nic_drv_binary] [gpio_drv] [platform_drv_boot_modules]"

2
repos/libports/run/nic_router.run
View File

@ -276,7 +276,7 @@ install_config $config
build_boot_image "
core init timer nic_router nic_bridge ld.lib.so libc.lib.so libm.lib.so
libc_resolv.lib.so lwip.lib.so lxip.lib.so posix.lib.so test-http_clnt
lwip.lib.so lxip.lib.so posix.lib.so test-http_clnt
test-lwip_httpsrv_static test-lxip_udp_echo test-lxip_udp_client
[nic_drv_binary] [gpio_drv] [platform_drv_boot_modules]"

2
repos/libports/run/nim_netty.run
View File

@ -68,7 +68,7 @@ install_config $config
set boot_modules {
core init timer linux_nic_drv ram_fs vfs
ld.lib.so libc.lib.so libm.lib.so
libc_resolv.lib.so stdcxx.lib.so libc_pipe.lib.so
stdcxx.lib.so
vfs_lxip.lib.so lxip.lib.so
test-nim_echo_server
}

57
repos/libports/src/lib/libc/addrinfo.cc
View File

@ -1,57 +0,0 @@
/*
* \brief libc addrinfo plugin wrappers
* \author Christian Helmuth
* \date 2017-02-08
*
* Note, these functions are implemented by the libc_resolv library currently
* and can be removed when the library is merged into libc.lib.so.
*/
/*
* Copyright (C) 2017 Genode Labs GmbH
*
* This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU Affero General Public License version 3.
*/
/* Genode includes */
#include <base/log.h>
/* libc includes */
#include <libc-plugin/plugin_registry.h>
using namespace Libc;
extern "C" void freeaddrinfo(struct addrinfo *res)
{
Plugin *plugin;
plugin = plugin_registry()->get_plugin_for_freeaddrinfo(res);
if (!plugin) {
Genode::error("no plugin found for freeaddrinfo()");
return;
}
plugin->freeaddrinfo(res);
}
extern "C" int getaddrinfo(const char *node, const char *service,
const struct addrinfo *hints,
struct addrinfo **res)
{
Plugin *plugin;
plugin = plugin_registry()->get_plugin_for_getaddrinfo(node, service, hints, res);
if (!plugin) {
Genode::error("no plugin found for getaddrinfo()");
return -1;
}
return plugin->getaddrinfo(node, service, hints, res);
}

19
repos/libports/src/lib/libc/patches/getaddrinfo_c.patch
View File

@ -1,19 +0,0 @@
+++ src/lib/libc/lib/libc/net/getaddrinfo.c
@@ -329,7 +329,7 @@ do { \
((x) == (y) || (/*CONSTCOND*/(w) && ((x) == ANY || (y) == ANY)))
void
-freeaddrinfo(struct addrinfo *ai)
+libc_freeaddrinfo(struct addrinfo *ai)
{
struct addrinfo *next;
@@ -362,7 +362,7 @@ str2number(const char *p, int *portp)
}
int
-getaddrinfo(const char *hostname, const char *servname,
+libc_getaddrinfo(const char *hostname, const char *servname,
const struct addrinfo *hints, struct addrinfo **res)
{
struct addrinfo sentinel;

16
repos/libports/src/lib/libc/plugin.cc
View File

@ -55,20 +55,6 @@ bool Plugin::supports_execve(char const *filename, char *const argv[],
}
bool Plugin::supports_freeaddrinfo(struct ::addrinfo *)
{
return false;
}
bool Plugin::supports_getaddrinfo(const char *, const char *,
const struct ::addrinfo *,
struct ::addrinfo **)
{
return false;
}
bool Plugin::supports_mkdir(const char *, mode_t)
{
return false;
@ -197,8 +183,6 @@ DUMMY(ssize_t, -1, write, (File_descriptor *, const void *, ::size_t));
*/
DUMMY(int, -1, access, (char const *, int));
DUMMY(int, -1, execve, (char const *, char *const[], char *const[]));
DUMMY(void, , freeaddrinfo, (struct ::addrinfo *));
DUMMY(int, -1, getaddrinfo, (const char *, const char *, const struct ::addrinfo *, struct ::addrinfo **));
DUMMY(int, -1, mkdir, (const char*, mode_t));
DUMMY(void *, (void *)(-1), mmap, (void *addr, ::size_t length, int prot, int flags,
File_descriptor *, ::off_t offset));

10
repos/libports/src/lib/libc/plugin_registry.cc
View File

@ -45,16 +45,6 @@ Plugin *Plugin_registry::get_plugin_for_execve(char const *filename, char *const
GET_PLUGIN_FOR(execve, filename, argv, envp) }
Plugin *Plugin_registry::get_plugin_for_freeaddrinfo(struct addrinfo *res) {
GET_PLUGIN_FOR(freeaddrinfo, res) }
Plugin *Plugin_registry::get_plugin_for_getaddrinfo(const char *node, const char *service,
const struct addrinfo *hints,
struct addrinfo **res) {
GET_PLUGIN_FOR(getaddrinfo, node, service, hints, res) }
Plugin *Plugin_registry::get_plugin_for_mkdir(const char *path, mode_t mode) {
GET_PLUGIN_FOR(mkdir, path, mode) }

86
repos/libports/src/lib/libc_lwip/plugin.cc
View File

@ -162,60 +162,52 @@ struct Plugin : Libc::Plugin
*/
Plugin();
bool supports_freeaddrinfo(struct ::addrinfo *res);
bool supports_getaddrinfo(const char *node, const char *service,
const struct ::addrinfo *hints,
struct ::addrinfo **res);
bool supports_select(int nfds,
fd_set *readfds,
fd_set *writefds,
fd_set *exceptfds,
struct timeval *timeout);
bool supports_socket(int domain, int type, int protocol);
struct timeval *timeout) override;
bool supports_socket(int domain, int type, int protocol) override;
Libc::File_descriptor *accept(Libc::File_descriptor *sockfdo,
struct sockaddr *addr,
socklen_t *addrlen);
socklen_t *addrlen) override;
int bind(Libc::File_descriptor *sockfdo,
const struct sockaddr *addr,
socklen_t addrlen);
int close(Libc::File_descriptor *fdo);
socklen_t addrlen) override;
int close(Libc::File_descriptor *fdo) override;
int connect(Libc::File_descriptor *sockfdo,
const struct sockaddr *addr,
socklen_t addrlen);
int fcntl(Libc::File_descriptor *sockfdo, int cmd, long val);
void freeaddrinfo(struct ::addrinfo *res);
int getaddrinfo(const char *node, const char *service,
const struct ::addrinfo *hints,
struct ::addrinfo **res);
socklen_t addrlen) override;
int fcntl(Libc::File_descriptor *sockfdo, int cmd, long val) override;
int getpeername(Libc::File_descriptor *sockfdo,
struct sockaddr *addr,
socklen_t *addrlen);
socklen_t *addrlen) override;
int getsockname(Libc::File_descriptor *sockfdo,
struct sockaddr *addr,
socklen_t *addrlen);
socklen_t *addrlen) override;
int getsockopt(Libc::File_descriptor *sockfdo, int level,
int optname, void *optval,
socklen_t *optlen);
int ioctl(Libc::File_descriptor *sockfdo, int request, char *argp);
int listen(Libc::File_descriptor *sockfdo, int backlog);
ssize_t read(Libc::File_descriptor *fdo, void *buf, ::size_t count);
int shutdown(Libc::File_descriptor *fdo, int);
socklen_t *optlen) override;
int ioctl(Libc::File_descriptor *sockfdo, int request, char *argp) override;
int listen(Libc::File_descriptor *sockfdo, int backlog) override;
ssize_t read(Libc::File_descriptor *fdo, void *buf, ::size_t count) override;
int shutdown(Libc::File_descriptor *fdo, int) override;
int select(int nfds, fd_set *readfds, fd_set *writefds,
fd_set *exceptfds, struct timeval *timeout);
ssize_t send(Libc::File_descriptor *, const void *buf, ::size_t len, int flags);
fd_set *exceptfds, struct timeval *timeout) override;
ssize_t send(Libc::File_descriptor *, const void *buf, ::size_t len, int flags) override;
ssize_t sendto(Libc::File_descriptor *, const void *buf,
::size_t len, int flags,
const struct sockaddr *dest_addr,
socklen_t addrlen);
ssize_t recv(Libc::File_descriptor *, void *buf, ::size_t len, int flags);
socklen_t addrlen) override;
ssize_t recv(Libc::File_descriptor *, void *buf, ::size_t len, int flags) override;
ssize_t recvfrom(Libc::File_descriptor *, void *buf, ::size_t len, int flags,
struct sockaddr *src_addr, socklen_t *addrlen);
struct sockaddr *src_addr, socklen_t *addrlen) override;
int setsockopt(Libc::File_descriptor *sockfdo, int level,
int optname, const void *optval,
socklen_t optlen);
Libc::File_descriptor *socket(int domain, int type, int protocol);
ssize_t write(Libc::File_descriptor *fdo, const void *buf, ::size_t count);
socklen_t optlen) override;
Libc::File_descriptor *socket(int domain, int type, int protocol) override;
ssize_t write(Libc::File_descriptor *fdo, const void *buf, ::size_t count) override;
};
@ -227,20 +219,6 @@ Plugin::Plugin()
}
bool Plugin::supports_freeaddrinfo(struct ::addrinfo *)
{
return true;
}
bool Plugin::supports_getaddrinfo(const char *, const char *,
const struct ::addrinfo *,
struct ::addrinfo **)
{
return true;
}
bool Plugin::supports_select(int nfds,
fd_set *readfds,
fd_set *writefds,
@ -346,26 +324,6 @@ int Plugin::fcntl(Libc::File_descriptor *sockfdo, int cmd, long val)
}
extern "C" void libc_freeaddrinfo(struct ::addrinfo *);
void Plugin::freeaddrinfo(struct ::addrinfo *res)
{
return ::libc_freeaddrinfo(res);
}
extern "C" int libc_getaddrinfo(const char *, const char *,
const struct ::addrinfo *,
struct ::addrinfo **);
int Plugin::getaddrinfo(const char *node, const char *service,
const struct ::addrinfo *hints,
struct ::addrinfo **res)
{
return ::libc_getaddrinfo(node, service, hints, res);
}
int Plugin::getpeername(Libc::File_descriptor *sockfdo,
struct sockaddr *addr,
socklen_t *addrlen)

6
repos/libports/src/lib/libc_resolv/README
View File

@ -1,6 +0,0 @@
This libc plugin uses libc's own resolv facilities to do DNS resolving
etc. pp. It is much more advanced than the functions which lwip has to
offer.
Its current use is for noux-pkgs only. ``Native'' Genode programs should
use getaddrinfo() provided by lwip for now.

108
repos/libports/src/lib/libc_resolv/plugin.cc
View File

@ -1,108 +0,0 @@
/*
* \brief Libc resolv
* \author Josef Soentgen
* \date 2012-07-19
*/
/*
* Copyright (C) 2012-2017 Genode Labs GmbH
*
* This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU Affero General Public License version 3.
*/
/* Genode includes */
#include <base/printf.h>
#include <base/env.h>
/* libc plugin includes */
#include <libc-plugin/plugin.h>
#include <libc-plugin/fd_alloc.h>
/* libc includes */
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
extern "C" void libc_freeaddrinfo(struct ::addrinfo *);
extern "C" int libc_getaddrinfo(const char *, const char *,
const struct ::addrinfo *,
struct ::addrinfo **);
/************
** Plugin **
************/
namespace {
struct Plugin_context : Libc::Plugin_context { };
static inline Plugin_context *context(Libc::File_descriptor *fd)
{
return static_cast<Plugin_context *>(fd->context);
}
class Plugin : public Libc::Plugin
{
private:
Plugin_context _context;
public:
/**
* Constructor
*/
Plugin() { }
bool supports_freeaddrinfo(struct ::addrinfo *res)
{
return true;
}
bool supports_getaddrinfo(const char *node, const char *service,
const struct ::addrinfo *hints,
struct ::addrinfo **res)
{
return true;
}
int getaddrinfo(const char *node, const char *service,
const struct ::addrinfo *hints,
struct ::addrinfo **res)
{
return ::libc_getaddrinfo(node, service, hints, res);
}
void freeaddrinfo(struct ::addrinfo *res)
{
return ::libc_freeaddrinfo(res);
}
::ssize_t getdirentries(Libc::File_descriptor *fd, char *buf, ::size_t nbytes,
::off_t *basep)
{
Genode::error(__FILE__, ":", __LINE__, " ", __func__, "not implemented");
return 0UL;
}
void *mmap(void *addr, ::size_t length, int prot, int flags,
Libc::File_descriptor *, ::off_t offset)
{
Genode::error(__FILE__, ":", __LINE__, " ", __func__, "not implemented");
return nullptr;
}
int msync(void *addr, ::size_t len, int flags)
{
Genode::error(__FILE__, ":", __LINE__, " ", __func__, "not implemented");
return 0;
}
};
} /* unnamed namespace */
void __attribute__((constructor)) init_libc_resolv(void)
{
static Plugin libc_resolv;
}

11
repos/libports/src/test/libc_resolv/main.cc
View File

@ -1,11 +0,0 @@
/*
* Copyright (C) 2012-2017 Genode Labs GmbH
*
* This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU Affero General Public License version 3.
*/
int main(int argc, char **argv)
{
return 0;
}

3
repos/libports/src/test/libc_resolv/target.mk
View File

@ -1,3 +0,0 @@
TARGET = test-libc_resolv
SRC_CC = main.cc
LIBS = posix libc_resolv

2
repos/libports/src/test/netty/tcp/target.mk
View File

@ -1,6 +1,6 @@
TARGET = test-netty_tcp
SRC_CC = main.cc netty.cc
LIBS = libc libc_resolv
LIBS = libc
INC_DIR += $(PRG_DIR)/..

2
repos/libports/src/test/netty/udp/target.mk
View File

@ -1,6 +1,6 @@
TARGET = test-netty_udp
SRC_CC = main.cc netty.cc
LIBS = libc libc_resolv
LIBS = libc
INC_DIR += $(PRG_DIR)/..

2
repos/libports/src/test/nim_echo_server/target.mk
View File

@ -1,5 +1,5 @@
TARGET = test-nim_echo_server
LIBS = libc libc_resolv
LIBS = libc
SRC_NIM = main.nim
# Enable extra system assertions

2
repos/ports/run/netperf_lxip.inc
View File

@ -1,4 +1,4 @@
set netperf_target app/netperf/lxip
set netperf_app netserver_lxip
set netperf_stack { lxip.lib.so libc_resolv.lib.so }
set netperf_stack { lxip.lib.so }
set ip_match_string "ipaddr=(\[0-9\]+\.\[0-9\]+\.\[0-9\]+\.\[0-9\]+).*\n"

2
repos/ports/run/noux_net_netcat.run
View File

@ -172,7 +172,7 @@ install_config $config
set boot_modules {
core init timer tcp_terminal nic_bridge
ld.lib.so noux_net libc.lib.so libm.lib.so libc_pipe.lib.so pthread.lib.so
libc_resolv.lib.so libc_noux.lib.so lwip.lib.so netcat.tar posix.lib.so
libc_noux.lib.so lwip.lib.so netcat.tar posix.lib.so
}
# platform-specific modules

2
repos/ports/src/app/netperf/target.inc
View File

@ -1,7 +1,7 @@
NETPERF_DIR := $(call select_from_ports,netperf)/src/app/netperf
LIBS += posix libc-resolv libc-net libc-nameser libc-isc
LIBS += posix
SRC_C = netserver.c netlib.c netsh.c nettest_bsd.c dscp.c
# omni test

2
repos/ports/src/noux-pkg/lynx/target.mk
View File

@ -17,7 +17,7 @@ CFLAGS += -DUSE_OPENSSL_INCL
#
CFLAGS += -D__BSD_VISIBLE
LIBS += ncurses zlib libssl libcrypto libc_resolv
LIBS += ncurses zlib libssl libcrypto
#
# Make the zlib linking test succeed

2
repos/ports/src/noux-pkg/netcat/target.mk
View File

@ -1,5 +1,3 @@
TARGET = netcat
LIBS = libc_resolv
include $(call select_from_repositories,mk/noux.mk)

2
repos/ports/src/noux-pkg/openssh/target.mk
View File

@ -24,7 +24,7 @@ CONFIGURE_ARGS += --disable-ip6 \
INSTALL_TARGET = install
LIBS += libcrypto libssl zlib libc_resolv
LIBS += libcrypto libssl zlib
built.tag: Makefile Makefile_patch