Code Review
/
apps
/
agl-service-can-low-level.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
test: Update tests with new transport
[apps/agl-service-can-low-level.git]
/
low-can-binding
/
utils
/
socketcan.hpp
diff --git
a/low-can-binding/utils/socketcan.hpp
b/low-can-binding/utils/socketcan.hpp
index
6419175
..
de8163e
100644
(file)
--- a/
low-can-binding/utils/socketcan.hpp
+++ b/
low-can-binding/utils/socketcan.hpp
@@
-1,7
+1,7
@@
#pragma once
/*
#pragma once
/*
- * Copyright (C) 2015, 2016 ,
2017 "IoT
.bzh"
+ * Copyright (C) 2015, 2016 ,
2017, 2018, 2019 "IoT\
.bzh"
* Author "Romain Forlot" <romain.forlot@iot.bzh>
* Author "Loïc Collignon" <loic.collignon@iot.bzh>
* Licensed under the Apache License, Version 2.0 (the "License");
* Author "Romain Forlot" <romain.forlot@iot.bzh>
* Author "Loïc Collignon" <loic.collignon@iot.bzh>
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-21,12
+21,25
@@
#include <sys/socket.h>
#include <linux/can/bcm.h>
#include <sys/socket.h>
#include <linux/can/bcm.h>
+#include <linux/sockios.h>
#include <string.h>
#include "../binding/low-can-hat.hpp"
#include <string.h>
#include "../binding/low-can-hat.hpp"
-#include "../can/can-message.hpp"
+#include "../can/
message/
can-message.hpp"
#define INVALID_SOCKET -1
#define INVALID_SOCKET -1
+#define NO_CAN_ID 0xFFFFFFFFU
+
+/**
+ * @enum socket_type
+ * @brief The type of socket
+ */
+enum class socket_type {
+ BCM, ///< BCM - Socket BCM
+ J1939_ADDR_CLAIM, ///< J1939 - Socket J1939
+ J1939, ///< J1939 - Socket J1939
+ INVALID
+};
namespace utils
{
namespace utils
{
@@
-47,15
+60,15
@@
namespace utils
virtual int open(std::string device_name) = 0;
int setopt(int level, int optname, const void* optval, socklen_t optlen);
virtual int close();
virtual int open(std::string device_name) = 0;
int setopt(int level, int optname, const void* optval, socklen_t optlen);
virtual int close();
- virtual std::shared_ptr<
can_
message_t> read_message() = 0;
- virtual
void write_message(std::shared_ptr<can_message_t>
obj) = 0;
- virtual
void write_message(std::vector<std::shared_ptr<can_message_t>>& vobj) = 0
;
+ virtual std::shared_ptr<message_t> read_message() = 0;
+ virtual
int write_message(message_t&
obj) = 0;
+ virtual
int write_message(std::vector<message_t>& vobj)
;
protected:
int socket_;
struct sockaddr_can tx_address_;
int open(int domain, int type, int protocol);
protected:
int socket_;
struct sockaddr_can tx_address_;
int open(int domain, int type, int protocol);
+ int bind(const struct sockaddr* addr, socklen_t len);
+ int connect(const struct sockaddr* addr, socklen_t len);
};
};
-
-
}
}