From: Roy Marples Date: Tue, 24 Feb 2009 12:38:02 +0000 (+0000) Subject: Finally fix compile on vanilla kernel headers. X-Git-Tag: v5.0.0~65 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82ba93a1de061e9eb577907cf102628a45de51e8;p=thirdparty%2Fdhcpcd.git Finally fix compile on vanilla kernel headers. This is done by moving the wireless calls to a separate file that just includes linux/wireless.h. This is needed because linux/wireless.h includes linux/if.h which may or may not have been fixed to co-exist with net/if.h. Maybe one day this won't be needed .... --- diff --git a/if-linux-wireless.c b/if-linux-wireless.c new file mode 100644 index 00000000..54b6ddd9 --- /dev/null +++ b/if-linux-wireless.c @@ -0,0 +1,87 @@ +/* + * dhcpcd - DHCP client daemon + * Copyright 2009 Roy Marples + * All rights reserved + + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * THIS IS A NASTY HACK THAT SHOULD NEVER HAVE HAPPENED + * Basically we cannot include linux/if.h and net/if.h because + * they have conflicting structures. + * Sadly, linux/wireless.h includes linux/if.h all the time. + * Some kernel-header installs fix this and some do not. + * This file solely exists for those who do not. + * + * We *could* include wireless.h as that is designed for userspace, + * but that then depends on the correct version of wireless-tools being + * installed which isn't always the case. + */ + +#include +#include + +#include +/* Support older kernels */ +#ifdef IFLA_WIRELESS +# include +#else +# define IFLA_WIRELESS (IFLA_MASTER + 1) +#endif + +#include +#include + +#include "common.h" + +/* We can't include net.h or dhcpcd.h because + * they would pull in net/if.h, which defeats the purpose of this hack. */ +#define IF_SSIDSIZE 33 +int getifssid(const char *ifname, char *ssid); + +int +getifssid(const char *ifname, char *ssid) +{ +#ifdef SIOCGIWESSID + int s, retval; + struct iwreq iwr; + + if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) + return -1; + memset(&iwr, 0, sizeof(iwr)); + strlcpy(iwr.ifr_name, ifname, sizeof(iwr.ifr_name)); + iwr.u.essid.pointer = ssid; + iwr.u.essid.length = IF_SSIDSIZE - 1; + + if (ioctl(s, SIOCGIWESSID, &iwr) == 0) + retval = iwr.u.essid.length; + else + retval = -1; + close(s); + return retval; +#else + /* Stop gcc warning about unused paramters */ + ifname = ssid; + return -1; +#endif +} diff --git a/if-linux.c b/if-linux.c index 80dc1c1c..2bb1854d 100644 --- a/if-linux.c +++ b/if-linux.c @@ -33,14 +33,19 @@ #include #include +#include +#include + +/* Support older kernels */ +#ifndef IFLA_WIRELESS +# define IFLA_WIRELESS (IFLA_MASTER + 1) +#endif + #include #include #include #include -#include -#include - #include #include #include @@ -50,14 +55,6 @@ #include #include -/* Support older kernels */ -#ifdef IFLA_WIRELESS -# include -# include -#else -# define IFLA_WIRELESS (IFLA_MASTER + 1) -#endif - #include "config.h" #include "common.h" #include "configure.h" @@ -73,33 +70,6 @@ static void (*nl_remove)(const char *); static int sock_fd; static struct sockaddr_nl sock_nl; -int -getifssid(const char *ifname, char *ssid) -{ -#ifdef SIOCGIWESSID - int s, retval; - struct iwreq iwr; - - if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) - return -1; - memset(&iwr, 0, sizeof(iwr)); - strlcpy(iwr.ifr_name, ifname, sizeof(iwr.ifr_name)); - iwr.u.essid.pointer = ssid; - iwr.u.essid.length = IF_SSIDSIZE - 1; - - if (ioctl(s, SIOCGIWESSID, &iwr) == 0) - retval = iwr.u.essid.length; - else - retval = -1; - close(s); - return retval; -#else - /* Stop gcc warning about unused paramters */ - ifname = ssid; - return -1; -#endif -} - static int _open_link_socket(struct sockaddr_nl *nl) { diff --git a/mk/os-Linux.mk b/mk/os-Linux.mk index 2d316b12..7b6e460b 100644 --- a/mk/os-Linux.mk +++ b/mk/os-Linux.mk @@ -6,3 +6,6 @@ SRC_IF= if-linux.c CPPFLAGS+= -D_BSD_SOURCE -D_XOPEN_SOURCE=600 LIBRT= -lrt + +# Nasty hack - see source for why +SRC_IF+= if-linux-wireless.c