Cleanup include redundancy
PATCH 1/1 Cleanup include redundancy
Signed-off-by donkeysnore <[email protected]>
--- src/allowedips.c | 1 - src/cookie.c | 6 ------ src/crypto/zinc/blake2s/blake2s.c | 3 --- src/crypto/zinc/chacha20/chacha20.c | 1 - src/crypto/zinc/poly1305/poly1305.c | 1 - src/device.c | 3 --- src/device.h | 3 --- src/hashtables.c | 2 -- src/main.c | 2 -- src/messages.h | 1 - src/netlink.c | 2 -- src/noise.c | 5 ----- src/noise.h | 3 --- src/peer.c | 5 ----- src/peer.h | 5 ----- src/queueing.h | 4 ---- src/receive.c | 7 ------- src/send.c | 4 ---- src/socket.c | 5 ----- src/timers.c | 2 -- src/tools/config.c | 3 --- src/tools/curve25519.c | 1 - src/tools/encoding.h | 1 - src/tools/genkey.c | 1 - src/tools/ipc.c | 10 ---------- src/tools/set.c | 1 - src/tools/setconf.c | 1 - src/tools/show.c | 8 -------- src/tools/showconf.c | 5 ----- 29 files changed, 96 deletions(-)
src/allowedips.c +0 -1
@@ -3,7 +3,6 @@* Copyright (C) 2015-2019 Jason A. Donenfeld <[email protected]>. All Rights Reserved. */ -#include "allowedips.h" #include "peer.h" struct allowedips_node {
src/cookie.c +0 -6
@@ -3,16 +3,10 @@* Copyright (C) 2015-2019 Jason A. Donenfeld <[email protected]>. All Rights Reserved. */ -#include "cookie.h" #include "peer.h" -#include "device.h" -#include "messages.h" #include "ratelimiter.h" #include "timers.h" -#include <zinc/blake2s.h> -#include <zinc/chacha20poly1305.h> -#include <net/ipv6.h> #include <crypto/algapi.h>
src/crypto/zinc/blake2s/blake2s.c +0 -3
@@ -12,12 +12,9 @@#include <zinc/blake2s.h> #include "../selftest/run.h" -#include <linux/types.h> #include <linux/string.h> -#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> -#include <linux/bug.h> #include <asm/unaligned.h> typedef union {
src/crypto/zinc/chacha20/chacha20.c +0 -1
@@ -10,7 +10,6 @@#include <zinc/chacha20.h> #include "../selftest/run.h" -#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> #include <linux/vmalloc.h>
src/crypto/zinc/poly1305/poly1305.c +0 -1
@@ -11,7 +11,6 @@#include "../selftest/run.h" #include <asm/unaligned.h> -#include <linux/kernel.h> #include <linux/string.h> #include <linux/module.h> #include <linux/init.h>
src/device.c +0 -3
@@ -6,15 +6,12 @@#include "queueing.h" #include "socket.h" #include "timers.h" -#include "device.h" #include "ratelimiter.h" -#include "peer.h" #include "messages.h" #include <linux/module.h> #include <linux/rtnetlink.h> #include <linux/inet.h> -#include <linux/netdevice.h> #include <linux/inetdevice.h> #include <linux/if_arp.h> #include <linux/icmp.h>
src/device.h +0 -3
@@ -8,13 +8,10 @@#include "noise.h" #include "allowedips.h" -#include "hashtables.h" #include "cookie.h" -#include <linux/types.h> #include <linux/netdevice.h> #include <linux/workqueue.h> -#include <linux/mutex.h> #include <linux/net.h> #include <linux/ptr_ring.h>
src/hashtables.c +0 -2
@@ -3,9 +3,7 @@* Copyright (C) 2015-2019 Jason A. Donenfeld <[email protected]>. All Rights Reserved. */ -#include "hashtables.h" #include "peer.h" -#include "noise.h" static struct hlist_head *pubkey_bucket (struct pubkey_hashtable *table,const u8 pubkey[NOISE_PUBLIC_KEY_LEN ])
src/main.c +0 -2
@@ -4,8 +4,6 @@*/ #include "version.h" -#include "device.h" -#include "noise.h" #include "queueing.h" #include "ratelimiter.h" #include "netlink.h"
src/messages.h +0 -1
@@ -10,7 +10,6 @@#include <zinc/chacha20poly1305.h> #include <zinc/blake2s.h> -#include <linux/kernel.h> #include <linux/param.h> #include <linux/skbuff.h>
src/netlink.c +0 -2
@@ -4,11 +4,9 @@*/ #include "netlink.h" -#include "device.h" #include "peer.h" #include "socket.h" #include "queueing.h" -#include "messages.h" #include "uapi/wireguard.h" #include <linux/if.h> #include <net/genetlink.h>
src/noise.c +0 -5
@@ -3,12 +3,7 @@* Copyright (C) 2015-2019 Jason A. Donenfeld <[email protected]>. All Rights Reserved. */ -#include "noise.h" -#include "device.h" -#include "peer.h" -#include "messages.h" #include "queueing.h" -#include "hashtables.h" #include <linux/rcupdate.h> #include <linux/slab.h>
src/noise.h +0 -3
@@ -5,14 +5,11 @@#ifndef _WG_NOISE_H#define _WG_NOISE_H -#include "messages.h" #include "hashtables.h" -#include <linux/types.h> #include <linux/spinlock.h> #include <linux/atomic.h> #include <linux/rwsem.h> -#include <linux/mutex.h> #include <linux/ktime.h> #include <linux/kref.h>
src/peer.c +0 -5
@@ -3,14 +3,9 @@* Copyright (C) 2015-2019 Jason A. Donenfeld <[email protected]>. All Rights Reserved. */ -#include "peer.h" -#include "device.h" #include "queueing.h" #include "timers.h" -#include "hashtables.h" -#include "noise.h" -#include <linux/kref.h> #include <linux/lockdep.h> #include <linux/rcupdate.h> #include <linux/list.h>
src/peer.h +0 -5
@@ -7,13 +7,8 @@#define _WG_PEER_H#include "device.h" -#include "noise.h" -#include "cookie.h" -#include <linux/types.h> #include <linux/netfilter.h> -#include <linux/spinlock.h> -#include <linux/kref.h> #include <net/dst_cache.h> struct wg_device ;
src/queueing.h +0 -4
@@ -7,10 +7,6 @@#define _WG_QUEUEING_H#include "peer.h" -#include <linux/types.h> -#include <linux/skbuff.h> -#include <linux/ip.h> -#include <linux/ipv6.h> struct wg_device ;struct wg_peer ;
src/receive.c +0 -7
@@ -4,17 +4,10 @@*/ #include "queueing.h" -#include "device.h" -#include "peer.h" #include "timers.h" -#include "messages.h" -#include "cookie.h" #include "socket.h" #include <linux/simd.h> -#include <linux/ip.h> -#include <linux/ipv6.h> -#include <linux/udp.h> #include <net/ip_tunnels.h> /* Must be called with bh disabled. */
src/send.c +0 -4
@@ -5,11 +5,7 @@#include "queueing.h" #include "timers.h" -#include "device.h" -#include "peer.h" #include "socket.h" -#include "messages.h" -#include "cookie.h" #include <linux/simd.h> #include <linux/uio.h>
src/socket.c +0 -5
@@ -3,16 +3,11 @@* Copyright (C) 2015-2019 Jason A. Donenfeld <[email protected]>. All Rights Reserved. */ -#include "device.h" #include "peer.h" #include "socket.h" #include "queueing.h" -#include "messages.h" #include <linux/ctype.h> -#include <linux/net.h> -#include <linux/if_vlan.h> -#include <linux/if_ether.h> #include <linux/inetdevice.h> #include <net/udp_tunnel.h> #include <net/ipv6.h>
src/timers.c +0 -2
@@ -4,8 +4,6 @@*/ #include "timers.h" -#include "device.h" -#include "peer.h" #include "queueing.h" #include "socket.h"
src/tools/config.c +0 -3
@@ -8,15 +8,12 @@#include <ctype.h> #include <netdb.h> #include <stdio.h> -#include <stdlib.h> #include <string.h> #include <unistd.h> -#include <sys/socket.h> #include <sys/stat.h> #include <errno.h> #include "config.h" -#include "containers.h" #include "ipc.h" #include "encoding.h"
src/tools/curve25519.c +0 -1
@@ -5,7 +5,6 @@#include "curve25519.h" -#include <stdint.h> #include <string.h> #ifndef __BYTE_ORDER__
src/tools/encoding.h +0 -1
@@ -7,7 +7,6 @@#define ENCODING_H #include <stdbool.h> -#include <stdint.h> #include "containers.h" #define WG_KEY_LEN_BASE64 ((((WG_KEY_LEN) + 2) / 3) * 4 + 1)
src/tools/genkey.c +0 -1
@@ -6,7 +6,6 @@#include <errno.h> #include <stdio.h> #include <unistd.h> -#include <sys/types.h> #include <sys/stat.h> #include <string.h> #include <fcntl.h>
src/tools/ipc.c +0 -10
@@ -11,34 +11,24 @@#include <linux/genetlink.h> #include "mnlg.h" #endif -#include <netinet/in.h> -#include <sys/socket.h> -#include <net/if.h> #include <errno.h> -#include <stdbool.h> #include <stddef.h> #include <stdio.h> -#include <stdlib.h> #include <string.h> #include <ctype.h> #include <unistd.h> -#include <time.h> #include <dirent.h> #include <signal.h> #include <netdb.h> #include <limits.h> -#include <sys/types.h> #include <sys/ioctl.h> -#include <sys/types.h> #include <sys/stat.h> #include <sys/un.h> #include <arpa/inet.h> #include "ipc.h" -#include "containers.h" #include "encoding.h" #include "curve25519.h" -#include "../uapi/wireguard.h" #define SOCK_PATH RUNSTATEDIR "/wireguard/"#define SOCK_SUFFIX ".sock"
src/tools/set.c +0 -1
@@ -4,7 +4,6 @@*/ #include <stdio.h> -#include <stdlib.h> #include <string.h> #include "containers.h"
src/tools/setconf.c +0 -1
@@ -5,7 +5,6 @@#include <stddef.h> #include <stdio.h> -#include <stdlib.h> #include <string.h> #include "containers.h"
src/tools/show.c +0 -8
@@ -5,20 +5,12 @@#include <arpa/inet.h> #include <inttypes.h> -#include <netinet/in.h> -#include <sys/socket.h> -#include <net/if.h> -#include <stdbool.h> #include <stddef.h> -#include <stdint.h> -#include <stdlib.h> #include <stdio.h> #include <string.h> #include <errno.h> -#include <time.h> #include <netdb.h> -#include "containers.h" #include "ipc.h" #include "terminal.h" #include "encoding.h"
src/tools/showconf.c +0 -5
@@ -4,16 +4,11 @@*/ #include <arpa/inet.h> -#include <netinet/in.h> -#include <sys/socket.h> -#include <net/if.h> #include <stddef.h> #include <stdio.h> #include <string.h> -#include <stdlib.h> #include <netdb.h> -#include "containers.h" #include "encoding.h" #include "ipc.h" #include "subcommands.h"
Signature · 6 lines
2.17.1 _______________________________________________ WireGuard mailing list [email protected] https://lists.zx2c4.com/mailman/listinfo/wireguard
This commit refers to todo list in
https://www.wireguard.com/todo/#fixup-includes. There are include redundancy in wireguard and this commit consist of cleanup. Finding redundancy is analyzed by using dependencies graph that doxygen produced. And fix it until there are no redundancy. I'm not sure if it is the right approach for this issue. Let me know what you think :)
Quoted 536 lines · donkeysnore
Signed-off-by donkeysnore <[email protected]>--- src/allowedips.c | 1 - src/cookie.c | 6 ------ src/crypto/zinc/blake2s/blake2s.c | 3 --- src/crypto/zinc/chacha20/chacha20.c | 1 - src/crypto/zinc/poly1305/poly1305.c | 1 - src/device.c | 3 --- src/device.h | 3 --- src/hashtables.c | 2 -- src/main.c | 2 -- src/messages.h | 1 - src/netlink.c | 2 -- src/noise.c | 5 ----- src/noise.h | 3 --- src/peer.c | 5 ----- src/peer.h | 5 ----- src/queueing.h | 4 ---- src/receive.c | 7 ------- src/send.c | 4 ---- src/socket.c | 5 ----- src/timers.c | 2 -- src/tools/config.c | 3 --- src/tools/curve25519.c | 1 - src/tools/encoding.h | 1 - src/tools/genkey.c | 1 - src/tools/ipc.c | 10 ---------- src/tools/set.c | 1 - src/tools/setconf.c | 1 - src/tools/show.c | 8 -------- src/tools/showconf.c | 5 ----- 29 files changed, 96 deletions(-)src/allowedips.c +0
-0@@ -3,7 +3,6 @@* Copyright (C) 2015-2019 Jason A. Donenfeld <[email protected]>. All Rights Reserved.
*/src/allowedips.c +0
-1-#include "allowedips.h" #include "peer.h" struct allowedips_node {src/cookie.c +0
-0@@ -3,16 +3,10 @@* Copyright (C) 2015-2019 Jason A. Donenfeld <[email protected]>. All Rights Reserved.
*/src/cookie.c +0
-6-#include "cookie.h" #include "peer.h" -#include "device.h" -#include "messages.h" #include "ratelimiter.h" #include "timers.h" -#include <zinc/blake2s.h> -#include <zinc/chacha20poly1305.h> -#include <net/ipv6.h> #include <crypto/algapi.h> src/crypto/zinc/blake2s/blake2s.c +0
-3@@ -12,12 +12,9 @@#include <zinc/blake2s.h> #include "../selftest/run.h" -#include <linux/types.h> #include <linux/string.h> -#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> -#include <linux/bug.h> #include <asm/unaligned.h> typedef union {src/crypto/zinc/chacha20/chacha20.c +0
-1@@ -10,7 +10,6 @@#include <zinc/chacha20.h> #include "../selftest/run.h" -#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> #include <linux/vmalloc.h> src/crypto/zinc/poly1305/poly1305.c +0
-1@@ -11,7 +11,6 @@#include "../selftest/run.h" #include <asm/unaligned.h> -#include <linux/kernel.h> #include <linux/string.h> #include <linux/module.h> #include <linux/init.h> src/device.c +0
-3@@ -6,15 +6,12 @@#include "queueing.h" #include "socket.h" #include "timers.h" -#include "device.h" #include "ratelimiter.h" -#include "peer.h" #include "messages.h" #include <linux/module.h> #include <linux/rtnetlink.h> #include <linux/inet.h> -#include <linux/netdevice.h> #include <linux/inetdevice.h> #include <linux/if_arp.h> #include <linux/icmp.h> src/device.h +0
-3@@ -8,13 +8,10 @@#include "noise.h" #include "allowedips.h" -#include "hashtables.h" #include "cookie.h" -#include <linux/types.h> #include <linux/netdevice.h> #include <linux/workqueue.h> -#include <linux/mutex.h> #include <linux/net.h> #include <linux/ptr_ring.h> src/hashtables.c +0
-0@@ -3,9 +3,7 @@* Copyright (C) 2015-2019 Jason A. Donenfeld <[email protected]>. All Rights Reserved.
*/src/hashtables.c +0
-2-#include "hashtables.h" #include "peer.h" -#include "noise.h" static struct hlist_head *pubkey_bucket (struct pubkey_hashtable *table, const u8pubkey[NOISE_PUBLIC_KEY_LEN])
src/main.c +0
-2@@ -4,8 +4,6 @@*/ #include "version.h" -#include "device.h" -#include "noise.h" #include "queueing.h" #include "ratelimiter.h" #include "netlink.h" src/messages.h +0
-1@@ -10,7 +10,6 @@#include <zinc/chacha20poly1305.h> #include <zinc/blake2s.h> -#include <linux/kernel.h> #include <linux/param.h> #include <linux/skbuff.h> src/netlink.c +0
-2@@ -4,11 +4,9 @@*/ #include "netlink.h" -#include "device.h" #include "peer.h" #include "socket.h" #include "queueing.h" -#include "messages.h" #include "uapi/wireguard.h" #include <linux/if.h> #include <net/genetlink.h> src/noise.c +0
-0@@ -3,12 +3,7 @@* Copyright (C) 2015-2019 Jason A. Donenfeld <[email protected]>. All Rights Reserved.
*/src/noise.c +0
-5-#include "noise.h" -#include "device.h" -#include "peer.h" -#include "messages.h" #include "queueing.h" -#include "hashtables.h" #include <linux/rcupdate.h> #include <linux/slab.h> src/noise.h +0
-3@@ -5,14 +5,11 @@#ifndef _WG_NOISE_H#define _WG_NOISE_H -#include "messages.h" #include "hashtables.h" -#include <linux/types.h> #include <linux/spinlock.h> #include <linux/atomic.h> #include <linux/rwsem.h> -#include <linux/mutex.h> #include <linux/ktime.h> #include <linux/kref.h> src/peer.c +0
-0@@ -3,14 +3,9 @@* Copyright (C) 2015-2019 Jason A. Donenfeld <[email protected]>. All Rights Reserved.
*/src/peer.c +0
-5-#include "peer.h" -#include "device.h" #include "queueing.h" #include "timers.h" -#include "hashtables.h" -#include "noise.h" -#include <linux/kref.h> #include <linux/lockdep.h> #include <linux/rcupdate.h> #include <linux/list.h> src/peer.h +0
-5@@ -7,13 +7,8 @@#define _WG_PEER_H#include "device.h" -#include "noise.h" -#include "cookie.h" -#include <linux/types.h> #include <linux/netfilter.h> -#include <linux/spinlock.h> -#include <linux/kref.h> #include <net/dst_cache.h> struct wg_device ;src/queueing.h +0
-4@@ -7,10 +7,6 @@#define _WG_QUEUEING_H#include "peer.h" -#include <linux/types.h> -#include <linux/skbuff.h> -#include <linux/ip.h> -#include <linux/ipv6.h> struct wg_device ;struct wg_peer ;src/receive.c +0
-7@@ -4,17 +4,10 @@*/ #include "queueing.h" -#include "device.h" -#include "peer.h" #include "timers.h" -#include "messages.h" -#include "cookie.h" #include "socket.h" #include <linux/simd.h> -#include <linux/ip.h> -#include <linux/ipv6.h> -#include <linux/udp.h> #include <net/ip_tunnels.h> /* Must be called with bh disabled. */ src/send.c +0
-4@@ -5,11 +5,7 @@#include "queueing.h" #include "timers.h" -#include "device.h" -#include "peer.h" #include "socket.h" -#include "messages.h" -#include "cookie.h" #include <linux/simd.h> #include <linux/uio.h> src/socket.c +0
-0@@ -3,16 +3,11 @@* Copyright (C) 2015-2019 Jason A. Donenfeld <[email protected]>. All Rights Reserved.
*/src/socket.c +0
-5-#include "device.h" #include "peer.h" #include "socket.h" #include "queueing.h" -#include "messages.h" #include <linux/ctype.h> -#include <linux/net.h> -#include <linux/if_vlan.h> -#include <linux/if_ether.h> #include <linux/inetdevice.h> #include <net/udp_tunnel.h> #include <net/ipv6.h> src/timers.c +0
-2@@ -4,8 +4,6 @@*/ #include "timers.h" -#include "device.h" -#include "peer.h" #include "queueing.h" #include "socket.h" src/tools/config.c +0
-3@@ -8,15 +8,12 @@#include <ctype.h> #include <netdb.h> #include <stdio.h> -#include <stdlib.h> #include <string.h> #include <unistd.h> -#include <sys/socket.h> #include <sys/stat.h> #include <errno.h> #include "config.h" -#include "containers.h" #include "ipc.h" #include "encoding.h" src/tools/curve25519.c +0
-1@@ -5,7 +5,6 @@#include "curve25519.h" -#include <stdint.h> #include <string.h> #ifndef __BYTE_ORDER__src/tools/encoding.h +0
-1@@ -7,7 +7,6 @@#define ENCODING_H #include <stdbool.h> -#include <stdint.h> #include "containers.h" #define WG_KEY_LEN_BASE64 ((((WG_KEY_LEN) + 2) / 3) * 4 + 1)src/tools/genkey.c +0
-1@@ -6,7 +6,6 @@#include <errno.h> #include <stdio.h> #include <unistd.h> -#include <sys/types.h> #include <sys/stat.h> #include <string.h> #include <fcntl.h> src/tools/ipc.c +0
-10@@ -11,34 +11,24 @@#include <linux/genetlink.h> #include "mnlg.h" #endif -#include <netinet/in.h> -#include <sys/socket.h> -#include <net/if.h> #include <errno.h> -#include <stdbool.h> #include <stddef.h> #include <stdio.h> -#include <stdlib.h> #include <string.h> #include <ctype.h> #include <unistd.h> -#include <time.h> #include <dirent.h> #include <signal.h> #include <netdb.h> #include <limits.h> -#include <sys/types.h> #include <sys/ioctl.h> -#include <sys/types.h> #include <sys/stat.h> #include <sys/un.h> #include <arpa/inet.h> #include "ipc.h" -#include "containers.h" #include "encoding.h" #include "curve25519.h" -#include "../uapi/wireguard.h" #define SOCK_PATH RUNSTATEDIR "/wireguard/"#define SOCK_SUFFIX ".sock"src/tools/set.c +0
-1@@ -4,7 +4,6 @@*/ #include <stdio.h> -#include <stdlib.h> #include <string.h> #include "containers.h" src/tools/setconf.c +0
-1@@ -5,7 +5,6 @@#include <stddef.h> #include <stdio.h> -#include <stdlib.h> #include <string.h> #include "containers.h" src/tools/show.c +0
-8@@ -5,20 +5,12 @@#include <arpa/inet.h> #include <inttypes.h> -#include <netinet/in.h> -#include <sys/socket.h> -#include <net/if.h> -#include <stdbool.h> #include <stddef.h> -#include <stdint.h> -#include <stdlib.h> #include <stdio.h> #include <string.h> #include <errno.h> -#include <time.h> #include <netdb.h> -#include "containers.h" #include "ipc.h" #include "terminal.h" #include "encoding.h" src/tools/showconf.c +0
-6@@ -4,16 +4,11 @@*/ #include <arpa/inet.h> -#include <netinet/in.h> -#include <sys/socket.h> -#include <net/if.h> #include <stddef.h> #include <stdio.h> #include <string.h> -#include <stdlib.h> #include <netdb.h> -#include "containers.h" #include "encoding.h" #include "ipc.h" #include "subcommands.h" --
Quoted 3 lines
2.17.1
_______________________________________________
WireGuard mailing list
[email protected]
https://lists.zx2c4.com/mailman/listinfo/wireguard