From 37c21678743c752cbbc2297871c47a3117303309 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 28 Jul 2013 22:12:35 +0200 Subject: Implement config parser --- mmss/context.cpp | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) (limited to 'mmss/context.cpp') diff --git a/mmss/context.cpp b/mmss/context.cpp index 349c6cf..d1e01c0 100644 --- a/mmss/context.cpp +++ b/mmss/context.cpp @@ -88,34 +88,15 @@ void context_t::logf(int priority, const char *format, ...) { void context_t::run(int argc, char *argv[]) { if (argc != 2) { - std::fprintf(stderr, "usage: %s protocol_module\n", argv[0]); + std::fprintf(stderr, "usage: %s config\n", argv[0]); std::exit(1); } - std::shared_ptr proto = protocol_t::load(this, argv[1]); - if (!proto) - std::exit(1); - - std::shared_ptr conf = config_t::read(this, "babel_test.mmss"); - - std::shared_ptr net0 = std::make_shared("net0"); - std::shared_ptr net1 = std::make_shared("net1"); - std::shared_ptr node1 = node_t::create(this, "node1", 1, proto); - std::shared_ptr node2 = node_t::create(this, "node2", 2, proto); - std::shared_ptr node3 = node_t::create(this, "node3", 3, proto); + std::shared_ptr conf = config_t::read(this, argv[1]); - std::list> nodes; - - nodes.push_back(node1); - nodes.push_back(node2); - nodes.push_back(node3); - - gmrf_addr_t addr1 = {{1}}, addr2 = {{2}}, addr3 = {{3}}, addr4 = {{4}}; - iface_t::add(node1, net0, "mmss0", &addr1); - iface_t::add(node2, net0, "mmss0", &addr2); - iface_t::add(node2, net1, "mmss1", &addr3); - iface_t::add(node3, net1, "mmss1", &addr4); + if (!conf) + std::exit(1); while (true) { if (now() > 10000000) -- cgit v1.2.3