From 37566202133915d76179e0fd0c7fad654fc4dda0 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 27 Jul 2013 21:33:37 +0200 Subject: Encapsulate protocol_t --- mmss/mmss.cpp | 5 ++-- mmss/mmss.hpp | 2 -- mmss/node.hpp | 2 +- mmss/protocol.cpp | 29 ++++++++------------- mmss/protocol.hpp | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ mmss/types.hpp | 4 +-- 6 files changed, 91 insertions(+), 26 deletions(-) create mode 100644 mmss/protocol.hpp diff --git a/mmss/mmss.cpp b/mmss/mmss.cpp index 62f818d..0358063 100644 --- a/mmss/mmss.cpp +++ b/mmss/mmss.cpp @@ -40,11 +40,12 @@ void main(int argc, char *argv[]) { std::exit(1); } - std::shared_ptr proto = load_protocol(argv[1]); + context_t mmss; + + std::shared_ptr proto = protocol_t::load(&mmss, argv[1]); if (!proto) std::exit(1); - context_t mmss; config_t conf = {}; //read_config(&mmss, &conf, "babel_test.mmss"); diff --git a/mmss/mmss.hpp b/mmss/mmss.hpp index 3931254..f9284aa 100644 --- a/mmss/mmss.hpp +++ b/mmss/mmss.hpp @@ -61,8 +61,6 @@ public: }; -std::shared_ptr load_protocol(const char *module); - bool read_config(context_t *mmss, config_t *conf, const char *filename); void add_iface(const std::shared_ptr &node, const std::shared_ptr &net, const std::string &name, const gmrf_addr_t *address); diff --git a/mmss/node.hpp b/mmss/node.hpp index 8d95384..7daf57c 100644 --- a/mmss/node.hpp +++ b/mmss/node.hpp @@ -26,8 +26,8 @@ #pragma once -#include "types.hpp" #include "iface.hpp" +#include "protocol.hpp" #include #include diff --git a/mmss/protocol.cpp b/mmss/protocol.cpp index 246b136..5688525 100644 --- a/mmss/protocol.cpp +++ b/mmss/protocol.cpp @@ -24,43 +24,36 @@ */ +#include "protocol.hpp" #include "mmss.hpp" #include -#include namespace MMSS { -class dlcloser { -private: - void *handle; - -public: - dlcloser(void *handle0) : handle(handle0) {} - void operator()(const protocol_t *ptr) const { - ::dlclose(handle); - } -}; +protocol_t::~protocol_t() { + ::dlclose(handle); +} -std::shared_ptr load_protocol(const char *module) { - void *handle = ::dlopen(module, RTLD_NOW); +std::shared_ptr protocol_t::load(context_t *mmss, const std::string &module) { + void *handle = ::dlopen(module.c_str(), RTLD_NOW); if (!handle) { - std::fprintf(stderr, "unable to load protocol from `%s': %s\n", module, dlerror()); + mmss->logf(LOG_ERR, "unable to load protocol from `%s': %s", module.c_str(), dlerror()); return std::shared_ptr(); } ::dlerror(); - const protocol_t *proto = reinterpret_cast(::dlsym(handle, "mmss_protocol_info")); + const mmss_protocol_t *proto = reinterpret_cast(::dlsym(handle, "mmss_protocol_info")); if (!proto) { - std::fprintf(stderr, "unable to load protocol from `%s': %s\n", module, dlerror()); + mmss->logf(LOG_ERR, "unable to load protocol from `%s': %s", module.c_str(), dlerror()); ::dlclose(handle); return std::shared_ptr(); } - std::fprintf(stderr, "loaded protocol `%s' version %s\n", proto->get_name(), proto->get_version()); + mmss->logf(LOG_INFO, "loaded protocol `%s' version %s", proto->get_name(), proto->get_version()); - return std::shared_ptr(proto, dlcloser(handle)); + return std::shared_ptr(new protocol_t(handle, proto)); } } diff --git a/mmss/protocol.hpp b/mmss/protocol.hpp new file mode 100644 index 0000000..551f54e --- /dev/null +++ b/mmss/protocol.hpp @@ -0,0 +1,75 @@ +/* + Copyright (c) 2013, Matthias Schiffer + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + + +#pragma once + +#include "types.hpp" + +extern "C" { + +#include + +} + +#include + + +namespace MMSS { + +class protocol_t { +private: + void *handle; + const mmss_protocol_t *proto; + + protocol_t(void *handle0, const mmss_protocol_t *proto0) : handle(handle0), proto(proto0) {} + +public: + ~protocol_t(); + + const char* get_name() const { + return proto->get_name(); + } + + const char* get_version() const { + return proto->get_version(); + } + + gmrf_context_t* init(gmrf_t *gmrf) const { + return proto->init(gmrf); + } + + void add_iface(gmrf_t *gmrf, gmrf_context_t *ctx, gmrf_iface_t *iface) const { + return proto->add_iface(gmrf, ctx, iface); + } + + void handle_packet(gmrf_t *gmrf, gmrf_context_t *ctx, gmrf_iface_t *iface, const gmrf_addr_t *source, const void *data, size_t len) const { + return proto->handle_packet(gmrf, ctx, iface, source, data, len); + } + + static std::shared_ptr load(context_t *mmss, const std::string &module); +}; + +} diff --git a/mmss/types.hpp b/mmss/types.hpp index 6c8be97..a976823 100644 --- a/mmss/types.hpp +++ b/mmss/types.hpp @@ -32,7 +32,6 @@ extern "C" { -#include #include } @@ -50,8 +49,7 @@ class network_t; class node_t; class now_t; class packet_t; +class protocol_t; class scheduled_t; -typedef ::mmss_protocol_t protocol_t; - } -- cgit v1.2.3