michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: sockets: can: Close the socket cleanly

Browse source 
If the socket is closed, then do CAN detach if that is needed.
This way the CAN interrupts are not received if there are no
CAN sockets listening the data.

Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
This commit is contained in:
Jukka Rissanen 2019-06-18 15:35:45 +03:00
commit 06b500b6bd
5 changed files with 150 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

99
subsys/net/lib/sockets/sockets_can.c
View file

@ -102,7 +102,8 @@ static void zcan_received_cb(struct net_context *ctx, struct net_pkt *pkt,
(struct zcan_frame *)net_pkt_data(pkt);
struct can_frame frame;
if (receivers[i].iface != net_pkt_iface(pkt)) {
if (!receivers[i].ctx ||
receivers[i].iface != net_pkt_iface(pkt)) {
continue;
}
@ -343,8 +344,86 @@ static ssize_t can_sock_write_vmeth(void *obj, const void *buffer,
return zcan_sendto_ctx(obj, buffer, count, 0, NULL, 0);
}
static bool is_already_attached(struct can_filter *filter,
struct net_if *iface,
struct net_context *ctx)
{
int i;
for (i = 0; i < ARRAY_SIZE(receivers); i++) {
if (receivers[i].ctx != ctx && receivers[i].iface == iface &&
((receivers[i].can_id & receivers[i].can_mask) ==
(UNALIGNED_GET(&filter->can_id) &
UNALIGNED_GET(&filter->can_mask)))) {
return true;
}
}
return false;
}
static int close_socket(struct net_context *ctx)
{
const struct canbus_api *api;
struct net_if *iface;
struct device *dev;
iface = net_context_get_iface(ctx);
dev = net_if_get_device(iface);
api = dev->driver_api;
if (!api || !api->close) {
return -ENOTSUP;
}
api->close(dev, net_context_get_filter_id(ctx));
return 0;
}
static int can_close_socket(struct net_context *ctx)
{
int i, ret;
for (i = 0; i < ARRAY_SIZE(receivers); i++) {
if (receivers[i].ctx == ctx) {
struct can_filter filter;
receivers[i].ctx = NULL;
filter.can_id = receivers[i].can_id;
filter.can_mask = receivers[i].can_mask;
if (!is_already_attached(&filter,
net_context_get_iface(ctx),
ctx)) {
/* We can detach now as there are no other
* sockets that have same filter.
*/
ret = close_socket(ctx);
if (ret < 0) {
return ret;
}
}
return 0;
}
}
return 0;
}
static int can_sock_ioctl_vmeth(void *obj, unsigned int request, va_list args)
{
if (request == ZFD_IOCTL_CLOSE) {
int ret;
ret = can_close_socket(obj);
if (ret < 0) {
NET_DBG("Cannot detach net_context %p (%d)", obj, ret);
}
}
return sock_fd_op_vtable.fd_vtable.ioctl(obj, request, args);
}
@ -506,24 +585,6 @@ static void can_unregister_filters(struct net_if *iface,
}
}
static bool is_already_attached(struct can_filter *filter,
struct net_if *iface,
struct net_context *ctx)
{
int i;
for (i = 0; i < ARRAY_SIZE(receivers); i++) {
if (receivers[i].ctx != ctx && receivers[i].iface == iface &&
((receivers[i].can_id & receivers[i].can_mask) ==
(UNALIGNED_GET(&filter->can_id) &
UNALIGNED_GET(&filter->can_mask)))) {
return true;
}
}
return false;
}
static int can_sock_setsockopt_vmeth(void *obj, int level, int optname,
const void *optval, socklen_t optlen)
{