summaryrefslogtreecommitdiffstats
path: root/low-can-binding/binding
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2019-06-25 16:24:39 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2019-06-26 18:06:54 +0200
commitc88f115014d9e75e4d1cc0db9762f11ca8532afb (patch)
tree610b5914239d66ce0fe47186be3cc5a0cec03df8 /low-can-binding/binding
parentfdc6702732f6575f39e6cdad6db579a305dd8fe3 (diff)
Small fixes (include and pointer)
Bug-AGL: SPEC-2386 Change-Id: I3a622b9d236283aff479f187451cd86557a9aba7 Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh> Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'low-can-binding/binding')
-rw-r--r--low-can-binding/binding/low-can-cb.cpp2
-rw-r--r--low-can-binding/binding/low-can-subscription.cpp3
-rw-r--r--low-can-binding/binding/low-can-subscription.hpp3
3 files changed, 5 insertions, 3 deletions
diff --git a/low-can-binding/binding/low-can-cb.cpp b/low-can-binding/binding/low-can-cb.cpp
index ab6210bf..b6a18ebb 100644
--- a/low-can-binding/binding/low-can-cb.cpp
+++ b/low-can-binding/binding/low-can-cb.cpp
@@ -478,7 +478,7 @@ static int send_frame(struct canfd_frame& cfd, const std::string& bus_name)
if( cd.count(bus_name) == 0)
{cd[bus_name] = std::make_shared<low_can_subscription_t>(low_can_subscription_t());}
- return cd[bus_name]->tx_send(*cd[bus_name], cfd, bus_name);
+ return low_can_subscription_t::tx_send(*cd[bus_name], cfd, bus_name);
}
static void write_raw_frame(afb_req_t request, const std::string& bus_name, json_object *json_value)
diff --git a/low-can-binding/binding/low-can-subscription.cpp b/low-can-binding/binding/low-can-subscription.cpp
index eb3f6c37..54cd314c 100644
--- a/low-can-binding/binding/low-can-subscription.cpp
+++ b/low-can-binding/binding/low-can-subscription.cpp
@@ -54,7 +54,8 @@ low_can_subscription_t& low_can_subscription_t::operator=(const low_can_subscrip
low_can_subscription_t::~low_can_subscription_t()
{
- socket_->close();
+ if(socket_)
+ socket_->close();
}
low_can_subscription_t::operator bool() const
diff --git a/low-can-binding/binding/low-can-subscription.hpp b/low-can-binding/binding/low-can-subscription.hpp
index 691eb881..61c354d1 100644
--- a/low-can-binding/binding/low-can-subscription.hpp
+++ b/low-can-binding/binding/low-can-subscription.hpp
@@ -23,7 +23,8 @@
#include "../can/signals.hpp"
#include "../diagnostic/diagnostic-message.hpp"
-#include "../utils/socketcan-bcm.hpp"
+#include "../utils/socketcan.hpp"
+
#define OBDII_MAX_SIMULTANEOUS_RESPONSES 8