[src/bouyer-socketcan]: src/tests/net/can Factor out creation of socket with ...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/bouyer-socketcan]: src/tests/net/can Factor out creation of socket with ...
From: bouyer <bouyer%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 07:29:09 +0000
details:   https://anonhg.NetBSD.org/src/rev/3bef589ec415
branches:  bouyer-socketcan
changeset: 820825:3bef589ec415
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun Feb 05 12:18:20 2017 +0000

description:
Factor out creation of socket with CAN_RAW_RECV_OWN_MSGS

diffstat:

 tests/net/can/h_canutils.c  |   21 +++++++-
 tests/net/can/t_can.c       |  107 ++++---------------------------------------
 tests/net/can/t_canfilter.c |   46 +++---------------
 3 files changed, 40 insertions(+), 134 deletions(-)

diffs (truncated from 349 to 300 lines):

diff -r aad0f5c42ea7 -r 3bef589ec415 tests/net/can/h_canutils.c
--- a/tests/net/can/h_canutils.c        Sun Feb 05 12:03:23 2017 +0000
+++ b/tests/net/can/h_canutils.c        Sun Feb 05 12:18:20 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: h_canutils.c,v 1.1.2.3 2017/02/05 12:03:23 bouyer Exp $        */
+/*     $NetBSD: h_canutils.c,v 1.1.2.4 2017/02/05 12:18:20 bouyer Exp $        */
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: h_canutils.c,v 1.1.2.3 2017/02/05 12:03:23 bouyer Exp $");
+__RCSID("$NetBSD: h_canutils.c,v 1.1.2.4 2017/02/05 12:18:20 bouyer Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -181,3 +181,20 @@
        }
        return ifr.ifr_ifindex;
 }
+
+int
+can_socket_with_own(void)
+{
+       int s;
+       int v;
+
+       if ((s = rump_sys_socket(AF_CAN, SOCK_RAW, CAN_RAW)) < 0) {
+               atf_tc_fail_errno("CAN socket");
+       }
+       v = 1;
+       if (rump_sys_setsockopt(s, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS,
+           &v, sizeof(v)) < 0) {
+               atf_tc_fail_errno("setsockopt(CAN_RAW_RECV_OWN_MSGS)");
+       }
+       return s;
+}
diff -r aad0f5c42ea7 -r 3bef589ec415 tests/net/can/t_can.c
--- a/tests/net/can/t_can.c     Sun Feb 05 12:03:23 2017 +0000
+++ b/tests/net/can/t_can.c     Sun Feb 05 12:18:20 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: t_can.c,v 1.1.2.5 2017/02/05 12:03:23 bouyer Exp $     */
+/*     $NetBSD: t_can.c,v 1.1.2.6 2017/02/05 12:18:20 bouyer Exp $     */
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: t_can.c,v 1.1.2.5 2017/02/05 12:03:23 bouyer Exp $");
+__RCSID("$NetBSD: t_can.c,v 1.1.2.6 2017/02/05 12:18:20 bouyer Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -181,10 +181,7 @@
        rump_init();
        cancfg_rump_createif(ifname);
 
-       s = -1;
-       if ((s = rump_sys_socket(AF_CAN, SOCK_RAW, CAN_RAW)) < 0) {
-               atf_tc_fail_errno("CAN socket");
-       }
+       s = can_socket_with_own();
 
        can_bind(s, ifname);
 
@@ -197,20 +194,7 @@
        ATF_CHECK_MSG(vlen == sizeof(v), "getsockopt(CAN_RAW_LOOPBACK) returns wrong len %d", vlen);
        ATF_CHECK_MSG(v == 1, "CAN_RAW_LOOPBACK is not on by default");
 
-       /* check sockopt CAN_RAW_RECV_OWN_MSGS, and set it */
-       vlen = sizeof(v);
-       if (rump_sys_getsockopt(s, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS,
-           &v, &vlen) < 0) {
-               atf_tc_fail_errno("getsockopt(CAN_RAW_RECV_OWN_MSGS)");
-       }
-       ATF_CHECK_MSG(vlen == sizeof(v), "getsockopt(CAN_RAW_RECV_OWN_MSGS) returns wrong len %d", vlen);
-       ATF_CHECK_MSG(v == 0, "CAN_RAW_RECV_OWN_MSGS is not off by default");
-       v = 1;
-       if (rump_sys_setsockopt(s, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS,
-           &v, sizeof(v)) < 0) {
-               atf_tc_fail_errno("setsockopt(CAN_RAW_RECV_OWN_MSGS)");
-       }
-       /* check sockopt CAN_RAW_RECV_OWN_MSGS again */
+       /* check that sockopt CAN_RAW_RECV_OWN_MSGS is on */
        vlen = sizeof(v);
        if (rump_sys_getsockopt(s, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS,
            &v, &vlen) < 0) {
@@ -306,16 +290,7 @@
        rump_init();
        cancfg_rump_createif(ifname);
 
-       s = -1;
-       if ((s = rump_sys_socket(AF_CAN, SOCK_RAW, CAN_RAW)) < 0) {
-               atf_tc_fail_errno("CAN socket");
-       }
-
-       v = 1;
-       if (rump_sys_setsockopt(s, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS,
-           &v, sizeof(v)) < 0) {
-               atf_tc_fail_errno("setsockopt(CAN_RAW_RECV_OWN_MSGS)");
-       }
+       s = can_socket_with_own();
 
        strcpy(ifr.ifr_name, ifname );
        if ((rv = rump_sys_ioctl(s, SIOCGIFINDEX, &ifr)) < 0) {
@@ -378,15 +353,7 @@
        rump_init();
        cancfg_rump_createif(ifname);
 
-       s = -1;
-       if ((s = rump_sys_socket(AF_CAN, SOCK_RAW, CAN_RAW)) < 0) {
-               atf_tc_fail_errno("CAN socket");
-       }
-       v = 1;
-       if (rump_sys_setsockopt(s, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS,
-           &v, sizeof(v)) < 0) {
-               atf_tc_fail_errno("setsockopt(CAN_RAW_RECV_OWN_MSGS)");
-       }
+       s = can_socket_with_own();
 
        strcpy(ifr.ifr_name, ifname );
        if ((rv = rump_sys_ioctl(s, SIOCGIFINDEX, &ifr)) < 0) {
@@ -459,22 +426,13 @@
        cf_send.data[3] = 0xef;
 
 
-       s1 = -1;
        if ((s1 = rump_sys_socket(AF_CAN, SOCK_RAW, CAN_RAW)) < 0) {
                atf_tc_fail_errno("CAN socket");
        }
 
        /* create a second socket */
 
-       s2 = -1;
-       if ((s2 = rump_sys_socket(AF_CAN, SOCK_RAW, CAN_RAW)) < 0) {
-               atf_tc_fail_errno("CAN socket");
-       }
-       v = 1;
-       if (rump_sys_setsockopt(s2, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS,
-           &v, sizeof(v)) < 0) {
-               atf_tc_fail_errno("setsockopt(CAN_RAW_RECV_OWN_MSGS)");
-       }
+       s2 = can_socket_with_own();
 
        can_bind(s2, ifname);
 
@@ -541,15 +499,7 @@
 
        /* create a second socket */
 
-       s2 = -1;
-       if ((s2 = rump_sys_socket(AF_CAN, SOCK_RAW, CAN_RAW)) < 0) {
-               atf_tc_fail_errno("CAN socket");
-       }
-       v = 1;
-       if (rump_sys_setsockopt(s2, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS,
-           &v, sizeof(v)) < 0) {
-               atf_tc_fail_errno("setsockopt(CAN_RAW_RECV_OWN_MSGS)");
-       }
+       s2 = can_socket_with_own();
 
        ifindex = can_bind(s2, ifname);
 
@@ -613,29 +563,13 @@
        cf_send.data[3] = 0xef;
 
 
-       s1 = -1;
-       if ((s1 = rump_sys_socket(AF_CAN, SOCK_RAW, CAN_RAW)) < 0) {
-               atf_tc_fail_errno("CAN socket");
-       }
-       v = 1;
-       if (rump_sys_setsockopt(s1, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS,
-           &v, sizeof(v)) < 0) {
-               atf_tc_fail_errno("setsockopt(CAN_RAW_RECV_OWN_MSGS)");
-       }
+       s1 = can_socket_with_own();
 
        can_bind(s1, ifname);
 
        /* create a second socket */
 
-       s2 = -1;
-       if ((s2 = rump_sys_socket(AF_CAN, SOCK_RAW, CAN_RAW)) < 0) {
-               atf_tc_fail_errno("CAN socket");
-       }
-       v = 1;
-       if (rump_sys_setsockopt(s2, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS,
-           &v, sizeof(v)) < 0) {
-               atf_tc_fail_errno("setsockopt(CAN_RAW_RECV_OWN_MSGS)");
-       }
+       s2 = can_socket_with_own();
 
        ifindex2 = can_bind(s2, ifname2);
 
@@ -700,15 +634,7 @@
        cf_send.data[3] = 0xef;
 
 
-       s1 = -1;
-       if ((s1 = rump_sys_socket(AF_CAN, SOCK_RAW, CAN_RAW)) < 0) {
-               atf_tc_fail_errno("CAN socket");
-       }
-       v = 1;
-       if (rump_sys_setsockopt(s1, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS,
-           &v, sizeof(v)) < 0) {
-               atf_tc_fail_errno("setsockopt(CAN_RAW_RECV_OWN_MSGS)");
-       }
+       s1 = can_socket_with_own();
        v = 0;
        if (rump_sys_setsockopt(s1, SOL_CAN_RAW, CAN_RAW_LOOPBACK,
            &v, sizeof(v)) < 0) {
@@ -726,16 +652,7 @@
        ifindex = can_bind(s1, ifname);
 
        /* create a second socket */
-
-       s2 = -1;
-       if ((s2 = rump_sys_socket(AF_CAN, SOCK_RAW, CAN_RAW)) < 0) {
-               atf_tc_fail_errno("CAN socket");
-       }
-       v = 1;
-       if (rump_sys_setsockopt(s2, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS,
-           &v, sizeof(v)) < 0) {
-               atf_tc_fail_errno("setsockopt(CAN_RAW_RECV_OWN_MSGS)");
-       }
+       s2 = can_socket_with_own();
 
        if (rump_sys_write(s1, &cf_send, sizeof(cf_send)) < 0) {
                atf_tc_fail_errno("write");
diff -r aad0f5c42ea7 -r 3bef589ec415 tests/net/can/t_canfilter.c
--- a/tests/net/can/t_canfilter.c       Sun Feb 05 12:03:23 2017 +0000
+++ b/tests/net/can/t_canfilter.c       Sun Feb 05 12:18:20 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: t_canfilter.c,v 1.1.2.2 2017/02/05 12:03:23 bouyer Exp $       */
+/*     $NetBSD: t_canfilter.c,v 1.1.2.3 2017/02/05 12:18:20 bouyer Exp $       */
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: t_canfilter.c,v 1.1.2.2 2017/02/05 12:03:23 bouyer Exp $");
+__RCSID("$NetBSD: t_canfilter.c,v 1.1.2.3 2017/02/05 12:18:20 bouyer Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -69,26 +69,17 @@
 ATF_TC_BODY(canfilter_basic, tc)
 {
        const char ifname[] = "canlo0";
-       int s, rv, v, vlen;
+       int s, rv;
        struct can_frame cf_send, cf_receive;
        struct can_filter cfi;
 
        rump_init();
        cancfg_rump_createif(ifname);
 
-       s = -1;
-       if ((s = rump_sys_socket(AF_CAN, SOCK_RAW, CAN_RAW)) < 0) {
-               atf_tc_fail_errno("CAN socket");
-       }
+       s = can_socket_with_own();
 
        can_bind(s, ifname);
 
-       v = 1;
-       if (rump_sys_setsockopt(s, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS,
-           &v, sizeof(v)) < 0) {
-               atf_tc_fail_errno("setsockopt(CAN_RAW_RECV_OWN_MSGS)");
-       }
-
        /* set filter */
 #define MY_ID  1
        cfi.can_id = MY_ID;
@@ -204,7 +195,7 @@
 ATF_TC_BODY(canfilter_null, tc)
 {
        const char ifname[] = "canlo0";
-       int s, rv, v, vlen;
+       int s, rv;
        struct can_frame cf_send, cf_receive;
        struct can_filter cfi[2];
        int cfilen;
@@ -212,19 +203,9 @@
        rump_init();
        cancfg_rump_createif(ifname);
 
-       s = -1;
-       if ((s = rump_sys_socket(AF_CAN, SOCK_RAW, CAN_RAW)) < 0) {
-               atf_tc_fail_errno("CAN socket");
-       }
-
+       s = can_socket_with_own();
Prev by Date: [src/bouyer-socketcan]: src/sys/netcan Introduce can_ifattach(), for common s...
Next by Date: [src/bouyer-socketcan]: src/usr.bin/nc 727210
Previous by Thread: [src/bouyer-socketcan]: src/sys/netcan Introduce can_ifattach(), for common s...
Next by Thread: [src/bouyer-socketcan]: src/usr.bin/nc 727210
Indexes:
Home | Main Index | Thread Index | Old Index