upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-06-11 01:40:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Fixed ifconfig command for "topology subnet" on FreeBSD (Stefan Bethke).

Browse source 
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@4837 e7ae566f-a301-0410-adde-c780ea21d3b5
This commit is contained in:
james 2009-08-19 15:55:14 +00:00
parent 7d0f3877f6
commit b69d5cc8f5
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tun.c
View file

@ -863,11 +863,10 @@ do_ifconfig (struct tuntap *tt,
else {
if (tt->topology == TOP_SUBNET)
argv_printf (&argv,
"%s %s %s %s netmask %s mtu %d up",
"%s %s %s netmask %s mtu %d up",
IFCONFIG_PATH,
actual,
ifconfig_local,
ifconfig_local,
ifconfig_remote_netmask,
tun_mtu
);
@ -1745,14 +1744,19 @@ open_tun (const char *dev, const char *dev_type, const char *dev_node, bool ipv6
{
open_tun_generic (dev, dev_type, dev_node, ipv6, true, true, tt);
if (tt->fd >= 0)
if (tt->fd >= 0 && tt->type == DEV_TYPE_TUN)
{
int i = 0;
/* Disable extended modes */
ioctl (tt->fd, TUNSLMODE, &i);
i = tt->topology == TOP_SUBNET ? IFF_BROADCAST : IFF_POINTOPOINT;
i |= IFF_MULTICAST;
if (ioctl (tt->fd, TUNSIFMODE, &i) < 0) {
msg (M_WARN | M_ERRNO, "ioctl(TUNSIFMODE): %s", strerror(errno));
}
i = 1;
ioctl (tt->fd, TUNSIFHEAD, &i);
if (ioctl (tt->fd, TUNSIFHEAD, &i) < 0) {
msg (M_WARN | M_ERRNO, "ioctl(TUNSIFHEAD): %s", strerror(errno));
}
}
}