From 49652b9e2882a1c3cd5203ea91f90cdd32a090e9 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 27 Jul 2013 14:21:46 +0200 Subject: Some changes in memory management --- mmss/gmrf.cpp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'mmss/gmrf.cpp') diff --git a/mmss/gmrf.cpp b/mmss/gmrf.cpp index 08db8e6..3a8a224 100644 --- a/mmss/gmrf.cpp +++ b/mmss/gmrf.cpp @@ -41,22 +41,14 @@ const char* gmrf_iface_get_name(gmrf_t *gmrf, gmrf_iface_t *iface) { } size_t gmrf_iface_get_mtu(gmrf_t *gmrf, gmrf_iface_t *iface) { - auto net = iface->net.lock(); - if (!net) - return 0; - - return net->mtu; + return iface->net->mtu; } bool gmrf_iface_send(gmrf_t *gmrf, gmrf_iface_t *iface, const void *data, size_t len, const gmrf_addr_t *dest) { auto src_iface = iface->iface.lock(); assert(src_iface); - auto net = src_iface->net.lock(); - if (!net) - return false; - - for (auto dest_iface : net->interfaces) { + for (auto dest_iface : src_iface->net->interfaces) { if (gmrf_addr_equal(&dest_iface->address, dest)) { MMSS::enqueue(gmrf->mmss, src_iface, dest_iface, data, len); break; @@ -70,11 +62,7 @@ bool gmrf_iface_send_bc(gmrf_t *gmrf, gmrf_iface_t *iface, const void *data, siz auto src_iface = iface->iface.lock(); assert(src_iface); - auto net = src_iface->net.lock(); - if (!net) - return false; - - for (auto dest_iface : net->interfaces) { + for (auto dest_iface : src_iface->net->interfaces) { if (dest_iface != src_iface) MMSS::enqueue(gmrf->mmss, src_iface, dest_iface, data, len); } -- cgit v1.2.3