From f325f314b56a6d748881d4d14390d4236312fc81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= Date: Thu, 7 Jun 2012 16:19:05 +0200 Subject: [PATCH] Fix libc_noux's Plugin::getpeername() method The argument's order was wrong in the memcpy() call. In addition the wrong sysio struct was used for the addrlen argument. Fixes #238. --- ports/src/lib/libc_noux/plugin.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ports/src/lib/libc_noux/plugin.cc b/ports/src/lib/libc_noux/plugin.cc index 08b9bb794..ac564b1e3 100644 --- a/ports/src/lib/libc_noux/plugin.cc +++ b/ports/src/lib/libc_noux/plugin.cc @@ -1278,14 +1278,16 @@ namespace { socklen_t *addrlen) { sysio()->getpeername_in.fd = noux_fd(fd->context); + sysio()->getpeername_in.addrlen = *addrlen; if (!noux()->syscall(Noux::Session::SYSCALL_GETPEERNAME)) { /* errno */ return -1; } - Genode::memcpy(&sysio()->getpeername_in.addr, addr, - sizeof (struct sockaddr)); - sysio()->bind_in.addrlen = *addrlen; + + Genode::memcpy(addr, &sysio()->getpeername_in.addr, + sizeof (struct sockaddr)); + *addrlen = sysio()->getpeername_in.addrlen; return 0; }