ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-31 08:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

udp_client: remove os/config.h usage

Browse Source 
Issue #2310.
This commit is contained in:
Josef Söntgen 2017-03-07 17:00:51 +01:00 committed by Christian Helmuth
parent 46463562f6
commit 806e0a8029
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
repos/dde_linux/src/test/lxip/udp_client/main.cc
View File

@ -12,7 +12,10 @@
*/ */
/* Genode includes */ /* Genode includes */
#include <base/printf.h> #include <base/attached_rom_dataspace.h>
#include <base/snprintf.h>
#include <libc/component.h>
#include <timer_session/connection.h>
/* libc includes */ /* libc includes */
#include <sys/types.h> #include <sys/types.h>
@ -21,25 +24,25 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <string.h> #include <string.h>
#include <timer_session/connection.h>
#include <os/config.h>
using namespace Genode; using namespace Genode;
int main(void)
struct Failure : Genode::Exception { };
static void client_loop(Genode::Xml_node config_node, Timer::Connection &timer)
{ {
int s; int s;
static Timer::Connection _timer;
log("Start the client loop ..."); log("Start the client loop ...");
for(int j = 0; j != 5; ++j) { for(int j = 0; j != 5; ++j) {
_timer.msleep(2000); timer.msleep(2000);
if((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { if((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
error("No socket available!"); error("No socket available!");
return -1; throw Failure();
} }
enum { ADDR_STR_SZ = 16 }; enum { ADDR_STR_SZ = 16 };
char serv_addr[ADDR_STR_SZ] = { 0 }; char serv_addr[ADDR_STR_SZ] = { 0 };
Xml_node config_node = config()->xml_node();
try { config_node.attribute("server_ip").value(serv_addr, ADDR_STR_SZ); } try { config_node.attribute("server_ip").value(serv_addr, ADDR_STR_SZ); }
catch(...) { catch(...) {
error("Missing \"server_ip\" attribute."); error("Missing \"server_ip\" attribute.");
@ -72,8 +75,24 @@ int main(void)
} }
log("Received \"", String<64>(buf), " ...\""); log("Received \"", String<64>(buf), " ...\"");
} }
_timer.msleep(2000); timer.msleep(2000);
log("Test done"); log("Test done");
return 0;
} }
struct Main
{
Main(Genode::Env &env)
{
Genode::Attached_rom_dataspace config_rom { env, "config" };
Timer::Connection timer { env };
Libc::with_libc([&] () {
client_loop(config_rom.xml(), timer);
});
}
};
void Libc::Component::construct(Libc::Env &env) { static Main main(env); }

2
repos/dde_linux/src/test/lxip/udp_client/target.mk
View File

@ -1,3 +1,3 @@
TARGET = test-lxip_udp_client TARGET = test-lxip_udp_client
LIBS = posix libc_lxip config LIBS = libc libc_lxip
SRC_CC = main.cc SRC_CC = main.cc