Sensible defaults for $INTERFACE.
This commit is contained in:
parent
24cc2a9065
commit
1c34ba7fb8
4 changed files with 13 additions and 6 deletions
|
@ -17,7 +17,7 @@
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
$Id: device.c,v 1.1.2.2 2002/02/10 21:57:54 guus Exp $
|
||||
$Id: device.c,v 1.1.2.3 2002/02/11 12:33:01 guus Exp $
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
@ -62,7 +62,7 @@ cp
|
|||
device = DEFAULT_DEVICE;
|
||||
|
||||
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
|
||||
interface = netname;
|
||||
interface = rindex(device, '/')?rindex(device, '/')+1:device;
|
||||
cp
|
||||
if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0)
|
||||
{
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
$Id: device.c,v 1.1.2.5 2002/02/10 21:57:54 guus Exp $
|
||||
$Id: device.c,v 1.1.2.6 2002/02/11 12:33:01 guus Exp $
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
@ -77,7 +77,11 @@ cp
|
|||
device = DEFAULT_DEVICE;
|
||||
|
||||
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
|
||||
#ifdef HAVE_TUNTAP
|
||||
interface = netname;
|
||||
#else
|
||||
interface = rindex(device, '/')?rindex(device, '/')+1:device;
|
||||
#endif
|
||||
cp
|
||||
if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0)
|
||||
{
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
$Id: device.c,v 1.1.2.3 2002/02/10 21:57:54 guus Exp $
|
||||
$Id: device.c,v 1.1.2.4 2002/02/11 12:33:01 guus Exp $
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
@ -66,7 +66,7 @@ int setup_device(void)
|
|||
device = DEFAULT_DEVICE;
|
||||
|
||||
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
|
||||
interface = netname;
|
||||
interface = rindex(device, '/')?rindex(device, '/')+1:device;
|
||||
cp
|
||||
if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0)
|
||||
{
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
$Id: device.c,v 1.1.2.4 2002/02/10 21:57:54 guus Exp $
|
||||
$Id: device.c,v 1.1.2.5 2002/02/11 12:33:01 guus Exp $
|
||||
*/
|
||||
|
||||
|
||||
|
@ -113,6 +113,9 @@ cp
|
|||
return -1;
|
||||
}
|
||||
|
||||
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
|
||||
asprintf(interface, "tun%d", ppa);
|
||||
|
||||
device_info = _("Solaris tun device");
|
||||
|
||||
/* Set default MAC address for ethertap devices */
|
||||
|
|
Loading…
Reference in a new issue