From a6e3054436b5cc7f8c4acbce9841ecb17f699fb1 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 14 Nov 2019 18:44:30 +0100 Subject: executor: rename some macros Rename some macros in preparation for subsequent changes which will align names across the code base. --- executor/common_bsd.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'executor/common_bsd.h') diff --git a/executor/common_bsd.h b/executor/common_bsd.h index 7cc55820d..c818d802e 100644 --- a/executor/common_bsd.h +++ b/executor/common_bsd.h @@ -37,7 +37,7 @@ static uintptr_t syz_open_pts(void) #endif // GOOS_openbsd -#if SYZ_EXECUTOR || SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || SYZ_NET_INJECTION #include #include @@ -194,9 +194,9 @@ static void initialize_tun(int tun_id) execute_command(0, "ndp -s %s%%%s %s", remote_ipv6, tun_iface, remote_mac); } -#endif // SYZ_EXECUTOR || SYZ_TUN_ENABLE +#endif // SYZ_EXECUTOR || SYZ_NET_INJECTION -#if SYZ_EXECUTOR || __NR_syz_emit_ethernet && SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || __NR_syz_emit_ethernet && SYZ_NET_INJECTION #include #include @@ -214,7 +214,7 @@ static long syz_emit_ethernet(volatile long a0, volatile long a1) } #endif -#if SYZ_EXECUTOR || SYZ_TUN_ENABLE && (__NR_syz_extract_tcp_res || SYZ_REPEAT) +#if SYZ_EXECUTOR || SYZ_NET_INJECTION && (__NR_syz_extract_tcp_res || SYZ_REPEAT) #include static int read_tun(char* data, int size) @@ -232,7 +232,7 @@ static int read_tun(char* data, int size) } #endif -#if SYZ_EXECUTOR || __NR_syz_extract_tcp_res && SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || __NR_syz_extract_tcp_res && SYZ_NET_INJECTION struct tcp_resources { uint32 seq; @@ -349,7 +349,7 @@ static void loop(); static int do_sandbox_none(void) { sandbox_common(); -#if SYZ_EXECUTOR || SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || SYZ_NET_INJECTION initialize_tun(procid); #endif loop(); @@ -384,7 +384,7 @@ static int do_sandbox_setuid(void) return wait_for_loop(pid); sandbox_common(); -#if SYZ_EXECUTOR || SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || SYZ_NET_INJECTION initialize_tun(procid); #endif -- cgit mrf-deployment