j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Include linux/sockios.h and net/if.h anyway, regardless of the value of HAVE_TUNTAP.

Browse source
This commit is contained in:
Ivo Timmermans 2000-10-22 13:37:15 +00:00
parent 52b842f807
commit 56d8e86240
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/net.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net.c,v 1.35.4.43 2000/10/21 11:52:06 guus Exp $ $Id: net.c,v 1.35.4.44 2000/10/22 13:37:15 zarq Exp $
*/ */
#include "config.h" #include "config.h"
@ -25,6 +25,8 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <linux/sockios.h>
#include <net/if.h>
#include <netdb.h> #include <netdb.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <stdio.h> #include <stdio.h>
@ -38,8 +40,6 @@
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_TUNTAP #ifdef HAVE_TUNTAP
#include <net/if.h>
#include <linux/sockios.h>
#include LINUX_IF_TUN_H #include LINUX_IF_TUN_H
#endif #endif
@ -335,10 +335,8 @@ int setup_tap_fd(void)
const char *tapfname; const char *tapfname;
config_t const *cfg; config_t const *cfg;
char *envvar; char *envvar;
#ifdef HAVE_TUNTAP
struct ifreq ifr; struct ifreq ifr;
#endif
cp cp
if((cfg = get_config_val(config, tapdevice))) if((cfg = get_config_val(config, tapdevice)))
tapfname = cfg->data.ptr; tapfname = cfg->data.ptr;