From 8d6102132b7e8bd36510ef7446845125fc3aa6cb Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Tue, 15 Sep 2015 02:46:53 -0700 Subject: [PATCH] build/solaris: create ioctl_solaris.h Signed-off-by: David Lamparter (cherry picked from commit 285ed0c62af4f57902d5deacc621f290fdeec276) --- zebra/Makefile.am | 2 +- zebra/if_ioctl_solaris.c | 3 +-- zebra/ioctl_solaris.c | 1 + zebra/ioctl_solaris.h | 29 +++++++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 zebra/ioctl_solaris.h diff --git a/zebra/Makefile.am b/zebra/Makefile.am index f03a3b375e..4492f9e6d4 100644 --- a/zebra/Makefile.am +++ b/zebra/Makefile.am @@ -43,7 +43,7 @@ noinst_HEADERS = \ interface.h ipforward.h irdp.h router-id.h kernel_socket.h \ rt_netlink.h zebra_fpm.h zebra_fpm_private.h zebra_rnh.h \ zebra_ptm_redistribute.h zebra_ptm.h zebra_routemap.h \ - zebra_ns.h zebra_vrf.h + zebra_ns.h zebra_vrf.h ioctl_solaris.h zebra_LDADD = $(otherobj) ../lib/libzebra.la $(LIBCAP) diff --git a/zebra/if_ioctl_solaris.c b/zebra/if_ioctl_solaris.c index 02494bc07d..55e2f203ca 100644 --- a/zebra/if_ioctl_solaris.c +++ b/zebra/if_ioctl_solaris.c @@ -33,10 +33,9 @@ #include "vrf.h" #include "zebra/interface.h" +#include "zebra/ioctl_solaris.h" #include "zebra/rib.h" -void lifreq_set_name (struct lifreq *, const char *); -int if_get_flags_direct (const char *, uint64_t *, unsigned int af); static int if_get_addr (struct interface *, struct sockaddr *, const char *); static void interface_info_ioctl (struct interface *); extern struct zebra_privs_t zserv_privs; diff --git a/zebra/ioctl_solaris.c b/zebra/ioctl_solaris.c index 19be21ded8..aa2b9a4e0a 100644 --- a/zebra/ioctl_solaris.c +++ b/zebra/ioctl_solaris.c @@ -32,6 +32,7 @@ #include "zebra/rib.h" #include "zebra/rt.h" #include "zebra/interface.h" +#include "zebra/ioctl_solaris.h" extern struct zebra_privs_t zserv_privs; diff --git a/zebra/ioctl_solaris.h b/zebra/ioctl_solaris.h new file mode 100644 index 0000000000..188986be16 --- /dev/null +++ b/zebra/ioctl_solaris.h @@ -0,0 +1,29 @@ +/* + * Interface looking up by ioctl () on Solaris. + * Copyright (C) 1999 Kunihiro Ishiguro + * + * This file is part of Quagga. + * + * Quagga is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2, or (at your option) any + * later version. + * + * Quagga is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Quagga; see the file COPYING. If not, write to the Free + * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef _ZEBRA_IF_IOCTL_SOLARIS_H +#define _ZEBRA_IF_IOCTL_SOLARIS_H + +void lifreq_set_name (struct lifreq *, const char *); +int if_get_flags_direct (const char *, uint64_t *, unsigned int af); + +#endif /* _ZEBRA_IF_IOCTL_SOLARIS_H */ -- 2.39.5