Skip to content

Commit

Permalink
*: zebra.h should not have fcntl.h
Browse files Browse the repository at this point in the history
Signed-off-by: Donald Sharp <[email protected]>
  • Loading branch information
donaldsharp committed Jan 9, 2024
1 parent 33744ae commit c6d94a7
Show file tree
Hide file tree
Showing 26 changed files with 32 additions and 1 deletion.
2 changes: 2 additions & 0 deletions babeld/babel_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Copyright 2011 by Matthieu Boutier and Juliusz Chroboczek

/* include zebra library */
#include <zebra.h>
#include <fcntl.h>

#include "getopt.h"
#include "if.h"
#include "log.h"
Expand Down
1 change: 1 addition & 0 deletions babeld/kernel.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Copyright 2011, 2012 by Matthieu Boutier and Juliusz Chroboczek
#include <sys/time.h>
#include <sys/param.h>
#include <time.h>
#include <fcntl.h>

#include "babeld.h"

Expand Down
2 changes: 2 additions & 0 deletions bfdd/control.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
*/

#include <zebra.h>

#include <fcntl.h>
#include <sys/stat.h>

#include <sys/un.h>
Expand Down
1 change: 1 addition & 0 deletions bgpd/bgp_btoa.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*/

#include <zebra.h>
#include <fcntl.h>

#include "zebra.h"
#include "stream.h"
Expand Down
3 changes: 3 additions & 0 deletions isisd/isis_bpf.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
*/

#include <zebra.h>

#include <fcntl.h>

#if ISIS_METHOD == ISIS_METHOD_BPF
#include <net/if.h>
#include <netinet/if_ether.h>
Expand Down
2 changes: 2 additions & 0 deletions ldpd/ldpd.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
*/

#include <zebra.h>

#include <fcntl.h>
#include <sys/wait.h>

#include "ldpd.h"
Expand Down
1 change: 1 addition & 0 deletions ldpd/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*/

#include <zebra.h>
#include <fcntl.h>

#include "ldpd.h"
#include "ldpe.h"
Expand Down
1 change: 1 addition & 0 deletions lib/agentx.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*/

#include <zebra.h>
#include <fcntl.h>

#ifdef SNMP_AGENTX
#include <net-snmp/net-snmp-config.h>
Expand Down
2 changes: 2 additions & 0 deletions lib/command.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#include <zebra.h>
#include <sys/utsname.h>
#include <sys/stat.h>
#include <fcntl.h>

#include <lib/version.h>

#include "command.h"
Expand Down
1 change: 1 addition & 0 deletions lib/libfrr.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <zebra.h>
#include <sys/stat.h>
#include <sys/un.h>
#include <fcntl.h>

#include <sys/types.h>
#include <sys/wait.h>
Expand Down
1 change: 1 addition & 0 deletions lib/netns_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/

#include <zebra.h>
#include <fcntl.h>

#ifdef HAVE_NETNS
#undef _GNU_SOURCE
Expand Down
1 change: 1 addition & 0 deletions lib/network.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/

#include <zebra.h>
#include <fcntl.h>
#include "log.h"
#include "network.h"
#include "lib_errors.h"
Expand Down
2 changes: 2 additions & 0 deletions lib/vty.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
*/

#include <zebra.h>

#include <fcntl.h>
#include <sys/stat.h>
#include <lib/version.h>
#include <sys/types.h>
Expand Down
1 change: 0 additions & 1 deletion lib/zebra.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <stddef.h>
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <signal.h>
#include <string.h>
#include <pwd.h>
Expand Down
1 change: 1 addition & 0 deletions lib/zlog.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#include "zebra.h"
#include <sys/stat.h>
#include <fcntl.h>

#ifdef HAVE_GLIBC_BACKTRACE
#include <execinfo.h>
Expand Down
1 change: 1 addition & 0 deletions lib/zlog_5424.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*/

#include "zebra.h"
#include <fcntl.h>

#include "frrsendmmsg.h"

Expand Down
1 change: 1 addition & 0 deletions lib/zlog_targets.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#include "zebra.h"

#include <fcntl.h>
#include <sys/un.h>
#include <syslog.h>

Expand Down
1 change: 1 addition & 0 deletions nhrpd/linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#include "zebra.h"

#include <fcntl.h>
#include <errno.h>
#include <linux/if_packet.h>
#include <sys/ioctl.h>
Expand Down
1 change: 1 addition & 0 deletions nhrpd/vici.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <string.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <fcntl.h>

#include "frrevent.h"
#include "zbuf.h"
Expand Down
1 change: 1 addition & 0 deletions pimd/pim_sock.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/

#include <zebra.h>
#include <fcntl.h>

#include <sys/types.h>
#include <sys/socket.h>
Expand Down
1 change: 1 addition & 0 deletions tests/bgpd/test_packet.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/

#include <zebra.h>
#include <fcntl.h>

#include "qobj.h"
#include "vty.h"
Expand Down
1 change: 1 addition & 0 deletions watchfrr/watchfrr.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include <zebra.h>
#include <sys/stat.h>
#include <fcntl.h>

#include "frrevent.h"
#include <log.h>
Expand Down
1 change: 1 addition & 0 deletions zebra/kernel_netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*/

#include <zebra.h>
#include <fcntl.h>

#ifdef HAVE_NETLINK
#include <linux/netlink.h>
Expand Down
1 change: 1 addition & 0 deletions zebra/netconf_netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* Donald Sharp
*/
#include <zebra.h>
#include <fcntl.h>

#ifdef HAVE_NETLINK /* Netlink OSes only */

Expand Down
1 change: 1 addition & 0 deletions zebra/zebra_netns_id.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#include <zebra.h>
#include <sys/stat.h>
#include <fcntl.h>

#ifdef GNU_LINUX
#include <linux/if_link.h>
Expand Down
1 change: 1 addition & 0 deletions zebra/zebra_netns_notify.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/

#include <zebra.h>
#include <fcntl.h>

#ifdef HAVE_NETLINK
#ifdef HAVE_NETNS
Expand Down

0 comments on commit c6d94a7

Please sign in to comment.