static int cegw_udp2can(void *data);
static int cegw_udp_send(struct socket *udp_sock, struct can_frame *cf,
- struct sockaddr_in* addr);
+ struct sockaddr* addr, int addrlen);
static int cegw_can2udp(void *data);
static int cegw_can_send(struct socket *can_sock, struct can_frame *cf);
static int cegw_thread_start(void *data);
static int cegw_thread_stop(struct cegw_job *job);
static void cegw_job_release(struct kref *ref);
-static int cegw_udp_send(struct socket *udp_sock, struct can_frame *cf, struct sockaddr_in* addr)
+static int cegw_udp_send(struct socket *udp_sock, struct can_frame *cf, struct sockaddr *addr,
+ int addrlen)
{
struct msghdr mh;
struct kvec vec;
int err;
mh.msg_name = addr;
- mh.msg_namelen = sizeof(*addr);
+ mh.msg_namelen = addrlen;
mh.msg_control = NULL;
mh.msg_controllen = 0;
mh.msg_flags = 0;
{
struct msghdr mh;
struct kvec vec;
+ struct sockaddr *udst;
struct can_frame cf;
struct cegw_job* job = (struct cegw_job*)data;
struct socket* udp_sock = job->udp_sock;
cf.can_id = cpu_to_be32(cf.can_id);
for (i=0; i<job->udp_dstcnt; i++) {
- cegw_udp_send(udp_sock, &cf, &job->udp_dst[i]);
+ udst = (struct sockaddr *)(job->udp_dst + i*job->udp_addrlen);
+ cegw_udp_send(udp_sock, &cf, udst, job->udp_addrlen);
}
}
static long cegw_ioctl_start(struct file *file, unsigned long arg)
{
int i;
+ int chckfam;
int err = 0;
__u32 dstcnt = 0;
__u32 addrlen = 0;
+ struct sockaddr *sa;
struct cegw_ioctl gwctl;
struct cegw_job *job = NULL;
dstcnt = gwctl.udp_dstcnt;
addrlen = gwctl.udp_addrlen;
- if (addrlen != sizeof(struct sockaddr_in))
+ if (addrlen != sizeof(struct sockaddr_in) && addrlen != sizeof(struct sockaddr_in6))
return -EAFNOSUPPORT;
- /* */
- job = kmalloc(GFP_KERNEL, sizeof(*job) + dstcnt*addrlen );
+ /* ToDo: consider dstcnt maximum */
+ job = kmalloc(GFP_KERNEL, sizeof(*job) + dstcnt*addrlen);
if (job == NULL)
return -ENOMEM;
return -EFAULT;
}
- for (i=0; i<dstcnt; i++) {
- if (job->udp_dst[i].sin_family != AF_INET) {
+ /* */
+ if (dstcnt > 0)
+ sa = (struct sockaddr *)job->udp_dst;
+ chckfam = sa->sa_family;
+
+ for (i=1; i<dstcnt; i++) {
+ sa = (struct sockaddr *)(job->udp_dst + i*addrlen);
+ if (sa->sa_family != chckfam) {
kfree(job);
return -EAFNOSUPPORT;
}
}
job->udp_dstcnt = dstcnt;
+ job->udp_addrlen = addrlen;
err = cegw_thread_start(job);
if (err != 0)