diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-02-07 16:59:49 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-02-10 10:51:16 +0100 |
| commit | 4f86d327735efede368648e63570189966cb30c0 (patch) | |
| tree | d98388d9db9c361c133b3d2620f62342e7c3f184 /executor | |
| parent | 2c71f1a9122cc3cb0abacbbec6359c40db02be35 (diff) | |
wireguard: use wg0, wg1, wg2
This matches more closely what people are used to dealing with. We also
add one additional device for interesting multi-interface effects.
Diffstat (limited to 'executor')
| -rw-r--r-- | executor/common_linux.h | 10 | ||||
| -rw-r--r-- | executor/defs.h | 12 |
2 files changed, 12 insertions, 10 deletions
diff --git a/executor/common_linux.h b/executor/common_linux.h index a1532e438..5120bc8b9 100644 --- a/executor/common_linux.h +++ b/executor/common_linux.h @@ -793,8 +793,9 @@ static void initialize_netdevices(void) // This adds connected veth0 and veth1 devices. {"veth", 0}, {"xfrm", "xfrm0"}, - {"wireguard", "wireguard0"}, - {"wireguard", "wireguard1"}, + {"wireguard", "wg0"}, + {"wireguard", "wg1"}, + {"wireguard", "wg2"}, }; const char* devmasters[] = {"bridge", "bond", "team", "batadv"}; // If you extend this array, also update netdev_addr_id in vnet.txt @@ -859,8 +860,9 @@ static void initialize_netdevices(void) {"batadv_slave_1", ETH_ALEN}, {"geneve0", ETH_ALEN}, {"geneve1", ETH_ALEN}, - {"wireguard0", 0}, - {"wireguard1", 0}, + {"wg0", 0}, + {"wg1", 0}, + {"wg2", 0}, }; int sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); if (sock == -1) diff --git a/executor/defs.h b/executor/defs.h index 0ba2be581..bc6309526 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -70,7 +70,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "e77b05d20b6885541a2684f5ad69b28329cb3906" +#define SYZ_REVISION "d2504537da18b6b281d18ba28bbc0a5f83ff4414" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -80,7 +80,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "d0517d4c6286a3ce6583614e2df310eb5768d944" +#define SYZ_REVISION "281a88f4075fb82f6f33925bffd5dc807b03cba5" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -90,7 +90,7 @@ #if GOARCH_arm #define GOARCH "arm" -#define SYZ_REVISION "44a9223fec5bb20f1bd97139f154f91a11e9f0f9" +#define SYZ_REVISION "b46b050bffb9a4dae28f51ae1bc22b864dfb8722" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -100,7 +100,7 @@ #if GOARCH_arm64 #define GOARCH "arm64" -#define SYZ_REVISION "b033d4c669ca466570fed7e41e90b2e152a77ad3" +#define SYZ_REVISION "a5e9983359193b7ef3640d2985db4c4dbd612cfa" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -110,7 +110,7 @@ #if GOARCH_mips64le #define GOARCH "mips64le" -#define SYZ_REVISION "cc02838875446b8b8b7025f3eb8eecc51b4f4da5" +#define SYZ_REVISION "22ef1007569df159e60009bfb0f3ea12a44ab1f9" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -120,7 +120,7 @@ #if GOARCH_ppc64le #define GOARCH "ppc64le" -#define SYZ_REVISION "d00cdd6dcd8721c5cbabdea071c9c2c285520e7b" +#define SYZ_REVISION "cbaaf91a41825f27e07b539eb10deb84ac566bee" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 |