static struct proto_ops raw_ops = {
- .family = PF_CAN,
- .release = raw_release,
- .bind = raw_bind,
- .connect = sock_no_connect,
- .socketpair = sock_no_socketpair,
- .accept = sock_no_accept,
- .getname = raw_getname,
- .poll = raw_poll,
- .ioctl = 0,
- .listen = sock_no_listen,
- .shutdown = sock_no_shutdown,
- .setsockopt = raw_setsockopt,
- .getsockopt = raw_getsockopt,
- .sendmsg = raw_sendmsg,
- .recvmsg = raw_recvmsg,
- .mmap = sock_no_mmap,
- .sendpage = sock_no_sendpage,
+ .family = PF_CAN,
+ .release = raw_release,
+ .bind = raw_bind,
+ .connect = sock_no_connect,
+ .socketpair = sock_no_socketpair,
+ .accept = sock_no_accept,
+ .getname = raw_getname,
+ .poll = raw_poll,
+ .ioctl = 0,
+ .listen = sock_no_listen,
+ .shutdown = sock_no_shutdown,
+ .setsockopt = raw_setsockopt,
+ .getsockopt = raw_getsockopt,
+ .sendmsg = raw_sendmsg,
+ .recvmsg = raw_recvmsg,
+ .mmap = sock_no_mmap,
+ .sendpage = sock_no_sendpage,
};
struct raw_opt {
- int bound;
- int ifindex;
- int count;
- struct can_filter *filter;
- can_err_mask_t err_mask;
+ int bound;
+ int ifindex;
+ int count;
+ struct can_filter *filter;
+ can_err_mask_t err_mask;
};
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
struct raw_sock {
- struct sock sk;
- struct raw_opt opt;
+ struct sock sk;
+ struct raw_opt opt;
};
#define canraw_sk(sk) (&((struct raw_sock *)(sk))->opt)
static struct proto raw_proto = {
- .name = "CAN_RAW",
- .owner = THIS_MODULE,
- .obj_size = sizeof(struct raw_sock),
+ .name = "CAN_RAW",
+ .owner = THIS_MODULE,
+ .obj_size = sizeof(struct raw_sock),
};
static struct can_proto raw_can_proto = {
- .ops = &raw_ops,
- .prot = &raw_proto,
+ .ops = &raw_ops,
+ .prot = &raw_proto,
};
#else
#define canraw_sk(sk) ((struct raw_opt *)(sk)->sk_protinfo)
static struct can_proto raw_can_proto = {
- .ops = &raw_ops,
- .owner = THIS_MODULE,
- .obj_size = sizeof(struct raw_opt),
+ .ops = &raw_ops,
+ .owner = THIS_MODULE,
+ .obj_size = sizeof(struct raw_opt),
};
#endif
static __init int raw_init(void)
{
- printk(banner);
+ printk(banner);
- can_proto_register(CAN_RAW, &raw_can_proto);
- return 0;
+ can_proto_register(CAN_RAW, &raw_can_proto);
+ return 0;
}
static __exit void raw_exit(void)
{
- can_proto_unregister(CAN_RAW);
+ can_proto_unregister(CAN_RAW);
}
static int raw_release(struct socket *sock)
{
- struct sock *sk = sock->sk;
- struct net_device *dev = NULL;
+ struct sock *sk = sock->sk;
+ struct net_device *dev = NULL;
- DBG("socket %p, sk %p, refcnt %d\n", sock, sk,
- atomic_read(&sk->sk_refcnt));
+ DBG("socket %p, sk %p, refcnt %d\n", sock, sk,
+ atomic_read(&sk->sk_refcnt));
- if (canraw_sk(sk)->bound && canraw_sk(sk)->ifindex)
- dev = dev_get_by_index(canraw_sk(sk)->ifindex);
+ if (canraw_sk(sk)->bound && canraw_sk(sk)->ifindex)
+ dev = dev_get_by_index(canraw_sk(sk)->ifindex);
- /* remove current filters & unregister */
- if (canraw_sk(sk)->count > 0) {
- if (canraw_sk(sk)->bound)
- raw_remove_filters(dev, sk);
- kfree(canraw_sk(sk)->filter);
- } else if (canraw_sk(sk)->bound)
- can_rx_unregister(dev, 0, MASK_ALL, raw_rcv, sk);
+ /* remove current filters & unregister */
+ if (canraw_sk(sk)->count > 0) {
+ if (canraw_sk(sk)->bound)
+ raw_remove_filters(dev, sk);
+ kfree(canraw_sk(sk)->filter);
+ } else if (canraw_sk(sk)->bound)
+ can_rx_unregister(dev, 0, MASK_ALL, raw_rcv, sk);
- /* remove current error mask */
- if (canraw_sk(sk)->err_mask && canraw_sk(sk)->bound)
- can_rx_unregister(dev, 0, (canid_t)(canraw_sk(sk)->err_mask | CAN_ERR_FLAG), raw_rcv, sk);
+ /* remove current error mask */
+ if (canraw_sk(sk)->err_mask && canraw_sk(sk)->bound)
+ can_rx_unregister(dev, 0, (canid_t)(canraw_sk(sk)->err_mask | CAN_ERR_FLAG), raw_rcv, sk);
- if (dev) {
- can_dev_unregister(dev, raw_notifier, sk);
- dev_put(dev);
- }
+ if (dev) {
+ can_dev_unregister(dev, raw_notifier, sk);
+ dev_put(dev);
+ }
- sock_put(sk);
+ sock_put(sk);
- return 0;
+ return 0;
}
static int raw_bind(struct socket *sock, struct sockaddr *uaddr, int len)
{
- struct sockaddr_can *addr = (struct sockaddr_can *)uaddr;
- struct sock *sk = sock->sk;
- struct net_device *dev;
+ struct sockaddr_can *addr = (struct sockaddr_can *)uaddr;
+ struct sock *sk = sock->sk;
+ struct net_device *dev;
- DBG("socket %p to device %d\n", sock, addr->can_ifindex);
+ DBG("socket %p to device %d\n", sock, addr->can_ifindex);
- if (len < sizeof(*addr))
- return -EINVAL;
+ if (len < sizeof(*addr))
+ return -EINVAL;
- if (canraw_sk(sk)->bound) {
+ if (canraw_sk(sk)->bound) {
#if 1
- return -EOPNOTSUPP;
+ return -EOPNOTSUPP;
#else
- /* remove current bindings */
- if (canraw_sk(sk)->ifindex) {
- dev = dev_get_by_index(canraw_sk(sk)->ifindex);
- ; /* remove notifier */
- } else
- dev = NULL;
- if (canraw_sk(sk)->count > 0) {
- raw_remove_filters(sk);
- } else {
- can_rx_unregister(dev, 0, MASK_ALL, raw_rcv, sk);
- }
- if (dev)
- dev_put(dev);
- canraw_sk(sk)->bound = 0;
+ /* remove current bindings */
+ if (canraw_sk(sk)->ifindex) {
+ dev = dev_get_by_index(canraw_sk(sk)->ifindex);
+ ; /* remove notifier */
+ } else
+ dev = NULL;
+ if (canraw_sk(sk)->count > 0) {
+ raw_remove_filters(sk);
+ } else {
+ can_rx_unregister(dev, 0, MASK_ALL, raw_rcv, sk);
+ }
+ if (dev)
+ dev_put(dev);
+ canraw_sk(sk)->bound = 0;
#endif
- }
-
- if (addr->can_ifindex) {
- dev = dev_get_by_index(addr->can_ifindex);
- if (!dev) {
- DBG("could not find device %d\n", addr->can_ifindex);
- return -ENODEV;
}
- if (!(dev->flags & IFF_UP)) {
- sk->sk_err = ENETDOWN;
- sk->sk_error_report(sk);
- goto out;
- }
- can_dev_register(dev, raw_notifier, sk);
- } else
- dev = NULL;
- canraw_sk(sk)->ifindex = addr->can_ifindex;
+ if (addr->can_ifindex) {
+ dev = dev_get_by_index(addr->can_ifindex);
+ if (!dev) {
+ DBG("could not find device %d\n", addr->can_ifindex);
+ return -ENODEV;
+ }
+ if (!(dev->flags & IFF_UP)) {
+ sk->sk_err = ENETDOWN;
+ sk->sk_error_report(sk);
+ goto out;
+ }
+ can_dev_register(dev, raw_notifier, sk);
+ } else
+ dev = NULL;
+
+ canraw_sk(sk)->ifindex = addr->can_ifindex;
- if (canraw_sk(sk)->count > 0) /* filters set by setsockopt */
- raw_add_filters(dev, sk);
- else
- can_rx_register(dev, 0, MASK_ALL, raw_rcv, sk, IDENT);
+ if (canraw_sk(sk)->count > 0) /* filters set by setsockopt */
+ raw_add_filters(dev, sk);
+ else
+ can_rx_register(dev, 0, MASK_ALL, raw_rcv, sk, IDENT);
- if (canraw_sk(sk)->err_mask) /* error frame filter set by setsockopt */
- can_rx_register(dev, 0, (canid_t)(canraw_sk(sk)->err_mask | CAN_ERR_FLAG), raw_rcv, sk, IDENT);
+ if (canraw_sk(sk)->err_mask) /* error frame filter set by setsockopt */
+ can_rx_register(dev, 0, (canid_t)(canraw_sk(sk)->err_mask | CAN_ERR_FLAG), raw_rcv, sk, IDENT);
- canraw_sk(sk)->bound = 1;
+ canraw_sk(sk)->bound = 1;
out:
- if (dev)
- dev_put(dev);
+ if (dev)
+ dev_put(dev);
- return 0;
+ return 0;
}
static int raw_getname(struct socket *sock, struct sockaddr *uaddr,
int *len, int peer)
{
- struct sockaddr_can *addr = (struct sockaddr_can *)uaddr;
- struct sock *sk = sock->sk;
+ struct sockaddr_can *addr = (struct sockaddr_can *)uaddr;
+ struct sock *sk = sock->sk;
- if (peer)
- return -EOPNOTSUPP;
+ if (peer)
+ return -EOPNOTSUPP;
- addr->can_family = AF_CAN;
- addr->can_ifindex = canraw_sk(sk)->ifindex;
- *len = sizeof(*addr);
+ addr->can_family = AF_CAN;
+ addr->can_ifindex = canraw_sk(sk)->ifindex;
+ *len = sizeof(*addr);
- return 0;
+ return 0;
}
static unsigned int raw_poll(struct file *file, struct socket *sock,
poll_table *wait)
{
- unsigned int mask = 0;
+ unsigned int mask = 0;
- DBG("socket %p\n", sock);
+ DBG("socket %p\n", sock);
- mask = datagram_poll(file, sock, wait);
- return mask;
+ mask = datagram_poll(file, sock, wait);
+ return mask;
}
static int raw_setsockopt(struct socket *sock, int level, int optname,
char *optval, int optlen)
{
- struct sock *sk = sock->sk;
- struct can_filter *filter = NULL;
- struct net_device *dev = NULL;
- can_err_mask_t err_mask = 0;
- int count = 0;
- int err;
-
- if (level != SOL_CAN_RAW)
- return -EINVAL;
-
- switch (optname) {
- case CAN_RAW_FILTER:
- if (optlen) {
- if (optlen % sizeof(struct can_filter) != 0)
+ struct sock *sk = sock->sk;
+ struct can_filter *filter = NULL;
+ struct net_device *dev = NULL;
+ can_err_mask_t err_mask = 0;
+ int count = 0;
+ int err;
+
+ if (level != SOL_CAN_RAW)
return -EINVAL;
- if (!(filter = kmalloc(optlen, GFP_KERNEL)))
- return -ENOMEM;
- if (err = copy_from_user(filter, optval, optlen)) {
- kfree(filter);
- return err;
- }
- count = optlen / sizeof(struct can_filter);
- }
-
- if (canraw_sk(sk)->bound && canraw_sk(sk)->ifindex)
- dev = dev_get_by_index(canraw_sk(sk)->ifindex);
-
- /* remove current filters & unregister */
- if (canraw_sk(sk)->count > 0) {
- if (canraw_sk(sk)->bound)
- raw_remove_filters(dev, sk);
+ switch (optname) {
+ case CAN_RAW_FILTER:
+ if (optlen) {
+ if (optlen % sizeof(struct can_filter) != 0)
+ return -EINVAL;
+ if (!(filter = kmalloc(optlen, GFP_KERNEL)))
+ return -ENOMEM;
+ if (err = copy_from_user(filter, optval, optlen)) {
+ kfree(filter);
+ return err;
+ }
+ count = optlen / sizeof(struct can_filter);
+ }
+
+ if (canraw_sk(sk)->bound && canraw_sk(sk)->ifindex)
+ dev = dev_get_by_index(canraw_sk(sk)->ifindex);
+
+ /* remove current filters & unregister */
+ if (canraw_sk(sk)->count > 0) {
+
+ if (canraw_sk(sk)->bound)
+ raw_remove_filters(dev, sk);
- kfree(canraw_sk(sk)->filter);
- canraw_sk(sk)->count = 0;
- canraw_sk(sk)->filter = NULL;
- } else if (canraw_sk(sk)->bound)
- can_rx_unregister(dev, 0, MASK_ALL, raw_rcv, sk);
-
- /* add new filters & register */
- if (optlen) {
- canraw_sk(sk)->filter = filter;
- canraw_sk(sk)->count = count;
- if (canraw_sk(sk)->bound)
- raw_add_filters(dev, sk);
- } else if (canraw_sk(sk)->bound)
- can_rx_register(dev, 0, MASK_ALL, raw_rcv, sk, IDENT);
-
- if (dev)
- dev_put(dev);
-
- break;
-
- case CAN_RAW_ERR_FILTER:
- if (optlen) {
- if (optlen != sizeof(err_mask))
- return -EINVAL;
- if (err = copy_from_user(&err_mask, optval, optlen)) {
- return err;
- }
+ kfree(canraw_sk(sk)->filter);
+ canraw_sk(sk)->count = 0;
+ canraw_sk(sk)->filter = NULL;
+ } else if (canraw_sk(sk)->bound)
+ can_rx_unregister(dev, 0, MASK_ALL, raw_rcv, sk);
+
+ /* add new filters & register */
+ if (optlen) {
+ canraw_sk(sk)->filter = filter;
+ canraw_sk(sk)->count = count;
+ if (canraw_sk(sk)->bound)
+ raw_add_filters(dev, sk);
+ } else if (canraw_sk(sk)->bound)
+ can_rx_register(dev, 0, MASK_ALL, raw_rcv, sk, IDENT);
+
+ if (dev)
+ dev_put(dev);
+
+ break;
+
+ case CAN_RAW_ERR_FILTER:
+ if (optlen) {
+ if (optlen != sizeof(err_mask))
+ return -EINVAL;
+ if (err = copy_from_user(&err_mask, optval, optlen)) {
+ return err;
+ }
+ }
+
+ err_mask &= CAN_ERR_MASK;
+
+ if (canraw_sk(sk)->bound && canraw_sk(sk)->ifindex)
+ dev = dev_get_by_index(canraw_sk(sk)->ifindex);
+
+ /* remove current error mask */
+ if (canraw_sk(sk)->err_mask && canraw_sk(sk)->bound)
+ can_rx_unregister(dev, 0, (canid_t)(canraw_sk(sk)->err_mask | CAN_ERR_FLAG), raw_rcv, sk);
+
+ /* add new error mask */
+ if (optlen) {
+ canraw_sk(sk)->err_mask = err_mask;
+ if (canraw_sk(sk)->err_mask & canraw_sk(sk)->bound)
+ can_rx_register(dev, 0, (canid_t)(canraw_sk(sk)->err_mask | CAN_ERR_FLAG), raw_rcv, sk, IDENT);
+ }
+
+ if (dev)
+ dev_put(dev);
+
+ break;
+
+ default:
+ return -ENOPROTOOPT;
}
-
- err_mask &= CAN_ERR_MASK;
-
- if (canraw_sk(sk)->bound && canraw_sk(sk)->ifindex)
- dev = dev_get_by_index(canraw_sk(sk)->ifindex);
-
- /* remove current error mask */
- if (canraw_sk(sk)->err_mask && canraw_sk(sk)->bound)
- can_rx_unregister(dev, 0, (canid_t)(canraw_sk(sk)->err_mask | CAN_ERR_FLAG), raw_rcv, sk);
-
- /* add new error mask */
- if (optlen) {
- canraw_sk(sk)->err_mask = err_mask;
- if (canraw_sk(sk)->err_mask & canraw_sk(sk)->bound)
- can_rx_register(dev, 0, (canid_t)(canraw_sk(sk)->err_mask | CAN_ERR_FLAG), raw_rcv, sk, IDENT);
- }
-
- if (dev)
- dev_put(dev);
-
- break;
-
- default:
- return -ENOPROTOOPT;
- }
- return 0;
+ return 0;
}
static int raw_getsockopt(struct socket *sock, int level, int optname,
char *optval, int *optlen)
{
- struct sock *sk = sock->sk;
- struct can_filter *filter = canraw_sk(sk)->filter;
- int len;
+ struct sock *sk = sock->sk;
+ struct can_filter *filter = canraw_sk(sk)->filter;
+ int len;
- if (level != SOL_CAN_RAW)
- return -EINVAL;
-
- switch (optname) {
- case CAN_RAW_FILTER:
- if (get_user(len, optlen))
- return -EFAULT;
-
- if (filter) {
- int filter_size = canraw_sk(sk)->count * sizeof(struct can_filter);
- if (len < filter_size)
+ if (level != SOL_CAN_RAW)
return -EINVAL;
- if (len > filter_size)
- len = filter_size;
- if (copy_to_user(optval, filter, len))
- return -EFAULT;
- } else
- len = 0;
- if (put_user(len, optlen))
- return -EFAULT;
- break;
-
- case CAN_RAW_ERR_FILTER:
- if (get_user(len, optlen))
- return -EFAULT;
-
- if (len < sizeof(can_err_mask_t))
- return -EINVAL;
- if (len > sizeof(can_err_mask_t))
- len = sizeof(can_err_mask_t);
-
- if (copy_to_user(optval, &canraw_sk(sk)->err_mask, len))
- return -EFAULT;
-
- if (put_user(len, optlen))
- return -EFAULT;
- break;
-
- default:
- return -ENOPROTOOPT;
- }
- return 0;
+ switch (optname) {
+ case CAN_RAW_FILTER:
+ if (get_user(len, optlen))
+ return -EFAULT;
+
+ if (filter) {
+ int filter_size = canraw_sk(sk)->count * sizeof(struct can_filter);
+ if (len < filter_size)
+ return -EINVAL;
+ if (len > filter_size)
+ len = filter_size;
+ if (copy_to_user(optval, filter, len))
+ return -EFAULT;
+ } else
+ len = 0;
+ if (put_user(len, optlen))
+ return -EFAULT;
+ break;
+
+ case CAN_RAW_ERR_FILTER:
+ if (get_user(len, optlen))
+ return -EFAULT;
+
+ if (len < sizeof(can_err_mask_t))
+ return -EINVAL;
+
+ if (len > sizeof(can_err_mask_t))
+ len = sizeof(can_err_mask_t);
+
+ if (copy_to_user(optval, &canraw_sk(sk)->err_mask, len))
+ return -EFAULT;
+
+ if (put_user(len, optlen))
+ return -EFAULT;
+ break;
+
+ default:
+ return -ENOPROTOOPT;
+ }
+ return 0;
}
static void raw_add_filters(struct net_device *dev, struct sock *sk)
{
- struct can_filter *filter = canraw_sk(sk)->filter;
- int i;
-
- for (i = 0; i < canraw_sk(sk)->count; i++) {
- can_rx_register(dev, filter[i].can_id, filter[i].can_mask,
- raw_rcv, sk, IDENT);
- DBG("filter can_id %08X, can_mask %08X%s, sk %p\n",
- filter[i].can_id, filter[i].can_mask,
- filter[i].can_id & CAN_INV_FILTER ? " (inv)" : "", sk);
- }
+ struct can_filter *filter = canraw_sk(sk)->filter;
+ int i;
+
+ for (i = 0; i < canraw_sk(sk)->count; i++) {
+ can_rx_register(dev, filter[i].can_id, filter[i].can_mask,
+ raw_rcv, sk, IDENT);
+ DBG("filter can_id %08X, can_mask %08X%s, sk %p\n",
+ filter[i].can_id, filter[i].can_mask,
+ filter[i].can_id & CAN_INV_FILTER ? " (inv)" : "", sk);
+ }
}
static void raw_remove_filters(struct net_device *dev, struct sock *sk)
{
- struct can_filter *filter = canraw_sk(sk)->filter;
- int i;
-
- for (i = 0; i < canraw_sk(sk)->count; i++) {
- can_rx_unregister(dev, filter[i].can_id, filter[i].can_mask,
- raw_rcv, sk);
- DBG("filter can_id %08X, can_mask %08X%s, sk %p\n",
- filter[i].can_id, filter[i].can_mask,
- filter[i].can_id & CAN_INV_FILTER ? " (inv)" : "", sk);
- }
+ struct can_filter *filter = canraw_sk(sk)->filter;
+ int i;
+
+ for (i = 0; i < canraw_sk(sk)->count; i++) {
+ can_rx_unregister(dev, filter[i].can_id, filter[i].can_mask,
+ raw_rcv, sk);
+ DBG("filter can_id %08X, can_mask %08X%s, sk %p\n",
+ filter[i].can_id, filter[i].can_mask,
+ filter[i].can_id & CAN_INV_FILTER ? " (inv)" : "", sk);
+ }
}
static int raw_sendmsg(struct kiocb *iocb, struct socket *sock,
struct msghdr *msg, size_t size)
{
- struct sock *sk = sock->sk;
- struct sk_buff *skb;
- struct net_device *dev;
- int ifindex;
- int err;
-
- DBG("socket %p, sk %p\n", sock, sk);
-
- if (msg->msg_name) {
- struct sockaddr_can *addr = (struct sockaddr_can *)msg->msg_name;
- if (addr->can_family != AF_CAN)
- return -EINVAL;
- ifindex = addr->can_ifindex;
- } else
- ifindex = canraw_sk(sk)->ifindex;
+ struct sock *sk = sock->sk;
+ struct sk_buff *skb;
+ struct net_device *dev;
+ int ifindex;
+ int err;
+
+ DBG("socket %p, sk %p\n", sock, sk);
+
+ if (msg->msg_name) {
+ struct sockaddr_can *addr = (struct sockaddr_can *)msg->msg_name;
+ if (addr->can_family != AF_CAN)
+ return -EINVAL;
+ ifindex = addr->can_ifindex;
+ } else
+ ifindex = canraw_sk(sk)->ifindex;
- if (!(dev = dev_get_by_index(ifindex))) {
- DBG("device %d not found\n", ifindex);
- return -ENXIO;
- }
+ if (!(dev = dev_get_by_index(ifindex))) {
+ DBG("device %d not found\n", ifindex);
+ return -ENXIO;
+ }
- skb = alloc_skb(size, GFP_KERNEL);
- if ((err = memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size)) < 0) {
- kfree_skb(skb);
- return err;
- }
- skb->dev = dev;
+ skb = alloc_skb(size, GFP_KERNEL);
+ if ((err = memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size)) < 0) {
+ kfree_skb(skb);
+ return err;
+ }
+ skb->dev = dev;
- DBG("sending skbuff to interface %d\n", ifindex);
- DBG_SKB(skb);
+ DBG("sending skbuff to interface %d\n", ifindex);
+ DBG_SKB(skb);
- err = can_send(skb);
+ err = can_send(skb);
- dev_put(dev);
+ dev_put(dev);
- if (err)
- return err;
+ if (err)
+ return err;
- return size;
+ return size;
}
static int raw_recvmsg(struct kiocb *iocb, struct socket *sock,
struct msghdr *msg, size_t size, int flags)
{
- struct sock *sk = sock->sk;
- struct sk_buff *skb;
- int error = 0;
- int noblock;
-
- DBG("socket %p, sk %p\n", sock, sk);
-
- noblock = flags & MSG_DONTWAIT;
- flags &= ~MSG_DONTWAIT;
- if (!(skb = skb_recv_datagram(sk, flags, noblock, &error))) {
- return error;
- }
-
- DBG("delivering skbuff %p\n", skb);
- DBG_SKB(skb);
-
- if (size < skb->len)
- msg->msg_flags |= MSG_TRUNC;
- else
- size = skb->len;
- if ((error = memcpy_toiovec(msg->msg_iov, skb->data, size)) < 0) {
- skb_free_datagram(sk, skb);
- return error;
- }
+ struct sock *sk = sock->sk;
+ struct sk_buff *skb;
+ int error = 0;
+ int noblock;
- sock_recv_timestamp(msg, sk, skb);
+ DBG("socket %p, sk %p\n", sock, sk);
- if (msg->msg_name) {
- msg->msg_namelen = sizeof(struct sockaddr_can);
- memcpy(msg->msg_name, skb->cb, msg->msg_namelen);
- }
+ noblock = flags & MSG_DONTWAIT;
+ flags &= ~MSG_DONTWAIT;
+ if (!(skb = skb_recv_datagram(sk, flags, noblock, &error))) {
+ return error;
+ }
+
+ DBG("delivering skbuff %p\n", skb);
+ DBG_SKB(skb);
+
+ if (size < skb->len)
+ msg->msg_flags |= MSG_TRUNC;
+ else
+ size = skb->len;
+ if ((error = memcpy_toiovec(msg->msg_iov, skb->data, size)) < 0) {
+ skb_free_datagram(sk, skb);
+ return error;
+ }
+
+ sock_recv_timestamp(msg, sk, skb);
- DBG("freeing sock %p, skbuff %p\n", sk, skb);
- skb_free_datagram(sk, skb);
+ if (msg->msg_name) {
+ msg->msg_namelen = sizeof(struct sockaddr_can);
+ memcpy(msg->msg_name, skb->cb, msg->msg_namelen);
+ }
+
+ DBG("freeing sock %p, skbuff %p\n", sk, skb);
+ skb_free_datagram(sk, skb);
- return size;
+ return size;
}
static void raw_rcv(struct sk_buff *skb, void *data)
{
- struct sock *sk = (struct sock*)data;
- struct sockaddr_can *addr;
- int error;
-
- DBG("received skbuff %p, sk %p\n", skb, sk);
- DBG_SKB(skb);
-
- addr = (struct sockaddr_can *)skb->cb;
- memset(addr, 0, sizeof(*addr));
- addr->can_family = AF_CAN;
- addr->can_ifindex = skb->dev->ifindex;
-
- if ((error = sock_queue_rcv_skb(sk, skb)) < 0) {
- DBG("sock_queue_rcv_skb failed: %d\n", error);
- DBG("freeing skbuff %p\n", skb);
- kfree_skb(skb);
- }
+ struct sock *sk = (struct sock*)data;
+ struct sockaddr_can *addr;
+ int error;
+
+ DBG("received skbuff %p, sk %p\n", skb, sk);
+ DBG_SKB(skb);
+
+ addr = (struct sockaddr_can *)skb->cb;
+ memset(addr, 0, sizeof(*addr));
+ addr->can_family = AF_CAN;
+ addr->can_ifindex = skb->dev->ifindex;
+
+ if ((error = sock_queue_rcv_skb(sk, skb)) < 0) {
+ DBG("sock_queue_rcv_skb failed: %d\n", error);
+ DBG("freeing skbuff %p\n", skb);
+ kfree_skb(skb);
+ }
}
static void raw_notifier(unsigned long msg, void *data)
{
- struct sock *sk = (struct sock *)data;
-
- DBG("called for sock %p\n", sk);
-
- switch (msg) {
- case NETDEV_UNREGISTER:
- canraw_sk(sk)->ifindex = 0;
- /* fallthrough */
- case NETDEV_DOWN:
- sk->sk_err = ENETDOWN;
- sk->sk_error_report(sk);
- break;
- }
+ struct sock *sk = (struct sock *)data;
+
+ DBG("called for sock %p\n", sk);
+
+ switch (msg) {
+ case NETDEV_UNREGISTER:
+ canraw_sk(sk)->ifindex = 0;
+ /* fallthrough */
+ case NETDEV_DOWN:
+ sk->sk_err = ENETDOWN;
+ sk->sk_error_report(sk);
+ break;
+ }
}
projects / socketcan-devel.git / blobdiff