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
j1939: Following kernel updates
[apps/agl-service-can-low-level.git]
/
low-can-binding
/
utils
/
socketcan-j1939
/
socketcan-j1939.cpp
diff --git
a/low-can-binding/utils/socketcan-j1939/socketcan-j1939.cpp
b/low-can-binding/utils/socketcan-j1939/socketcan-j1939.cpp
index
bb74c76
..
88bca56
100644
(file)
--- a/
low-can-binding/utils/socketcan-j1939/socketcan-j1939.cpp
+++ b/
low-can-binding/utils/socketcan-j1939/socketcan-j1939.cpp
@@
-107,7
+107,6
@@
namespace utils
if(broadcast) broadcast_i = 1;
setopt(SOL_CAN_J1939, SO_J1939_PROMISC, &promisc_i, sizeof(promisc_i));
if(broadcast) broadcast_i = 1;
setopt(SOL_CAN_J1939, SO_J1939_PROMISC, &promisc_i, sizeof(promisc_i));
- setopt(SOL_CAN_J1939, SO_J1939_RECV_OWN, &recv_own_msgs_i, sizeof(recv_own_msgs_i));
setopt(SOL_SOCKET, SO_BROADCAST, &broadcast_i, sizeof(broadcast_i));
}
setopt(SOL_SOCKET, SO_BROADCAST, &broadcast_i, sizeof(broadcast_i));
}
@@
-256,7
+255,7
@@
namespace utils
*/
int socketcan_j1939_t::write_j1939_message(pgn_t pgn, std::vector<uint8_t> &data, uint32_t len_data)
{
*/
int socketcan_j1939_t::write_j1939_message(pgn_t pgn, std::vector<uint8_t> &data, uint32_t len_data)
{
- j1939_message_t msg = j1939_message_t(
J1939_MAX_DLEN, len_data, message_format_t::J1939
, data, 0, 0, pgn, 0);
+ j1939_message_t msg = j1939_message_t(
len_data
, data, 0, 0, pgn, 0);
msg.set_sockname(pgn,J1939_NO_NAME,J1939_NO_ADDR);
return write_message(msg);
}
msg.set_sockname(pgn,J1939_NO_NAME,J1939_NO_ADDR);
return write_message(msg);
}
@@
-285,4
+284,4
@@
namespace utils
}
return 0;
}
}
return 0;
}
-}
\ No newline at end of file
+}