#define MAX_ADDR_LEN 7
#endif
+#include <linux/version.h>
#include <net/if.h>
#include <linux/ppp_defs.h>
#include <net/if_arp.h>
#include "fsm.h"
#include "ipcp.h"
+#ifndef RTF_DEFAULT /* Normally in <linux/route.h> from <net/route.h> */
+#define RTF_DEFAULT 0
+#endif
+
#ifdef IPX_CHANGE
#include "ipxcp.h"
#endif
+#ifdef LOCKLIB
+#include <sys/locks.h>
+#endif
+
#define ok_error(num) ((num)==EIO)
static int tty_disc = N_TTY; /* The TTY discipline */
*/
if (default_route_gateway != 0)
{
- cifdefaultroute(0, default_route_gateway);
+ cifdefaultroute(0, 0, default_route_gateway);
}
if (has_proxy_arp)
* sifdefaultroute - assign a default route through the address given.
*/
-int sifdefaultroute (int unit, u_int32_t gateway)
+int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway)
{
struct rtentry rt;
memset (&rt, '\0', sizeof (rt));
SET_SA_FAMILY (rt.rt_dst, AF_INET);
SET_SA_FAMILY (rt.rt_gateway, AF_INET);
+
+#if LINUX_VERSION_CODE > 0x020100
+ SET_SA_FAMILY (rt.rt_genmask, AF_INET);
+ ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = 0L;
+#endif
+
((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway;
- rt.rt_flags = RTF_UP | RTF_GATEWAY;
+ rt.rt_flags = RTF_UP | RTF_GATEWAY | RTF_DEFAULT;
if (ioctl(sock_fd, SIOCADDRT, &rt) < 0)
{
if ( ! ok_error ( errno ))
* cifdefaultroute - delete a default route through the address given.
*/
-int cifdefaultroute (int unit, u_int32_t gateway)
+int cifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway)
{
struct rtentry rt;
memset (&rt, '\0', sizeof (rt));
SET_SA_FAMILY (rt.rt_dst, AF_INET);
SET_SA_FAMILY (rt.rt_gateway, AF_INET);
+
+#if LINUX_VERSION_CODE > 0x020100
+ SET_SA_FAMILY (rt.rt_genmask, AF_INET);
+ ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = 0L;
+#endif
+
((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway;
- rt.rt_flags = RTF_UP | RTF_GATEWAY;
+ rt.rt_flags = RTF_UP | RTF_GATEWAY | RTF_DEFAULT;
if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH)
{
if (still_ppp())
{
memset (&arpreq, '\0', sizeof(arpreq));
SET_SA_FAMILY(arpreq.arp_pa, AF_INET);
-
((struct sockaddr_in *) &arpreq.arp_pa)->sin_addr.s_addr = his_adr;
+ arpreq.arp_flags = ATF_PERM | ATF_PUBL;
+
if (ioctl(sock_fd, SIOCDARP, (caddr_t)&arpreq) < 0)
{
if ( ! ok_error ( errno ))
struct ifreq *ifr, *ifend, *ifp;
int i;
u_int32_t ina, mask;
- struct sockaddr_dl *dla;
struct ifreq ifreq;
struct ifconf ifc;
struct ifreq ifs[MAX_IFS];
* Update the wtmp file with the appropriate user name and tty device.
*/
-int logwtmp (char *line, char *name, char *host)
+void logwtmp (const char *line, const char *name, const char *host)
{
int wtmp;
struct utmp ut, *utp;
int lock (char *dev)
{
+#ifdef LOCKLIB
+ int result;
+ lock_file = malloc(strlen(dev) + 1);
+ if (lock_file == NULL)
+ {
+ novm("lock file name");
+ }
+ strcpy (lock_file, dev);
+ result = mklock (dev, (void *) 0);
+
+ if (result > 0)
+ {
+ syslog (LOG_NOTICE, "Device %s is locked by pid %d", dev, result);
+ free (lock_file);
+ lock_file = NULL;
+ result = -1;
+ }
+ else
+ {
+ if (result < 0)
+ {
+ syslog (LOG_ERR, "Can't create lock file %s", lock_file);
+ free (lock_file);
+ lock_file = NULL;
+ result = -1;
+ }
+ }
+ return (result);
+#else
char hdb_lock_buffer[12];
int fd, n;
int pid = getpid();
#else
pid = ((int *) hdb_lock_buffer)[0];
#endif
- if (pid == 0 || (kill(pid, 0) == -1 && errno == ESRCH))
+ if (pid == 0 || pid == getpid()
+ || (kill(pid, 0) == -1 && errno == ESRCH))
{
n = 0;
}
free(lock_file);
lock_file = NULL;
return -1;
+#endif
}
{
if (lock_file)
{
+#ifdef LOCKLIB
+ (void) rmlock (lock_file, (void *) 0);
+#else
unlink(lock_file);
+#endif
free(lock_file);
lock_file = NULL;
}
/*
* Add the device route
*/
+#if LINUX_VERSION_CODE < 0x020100+16 /* 2.1.16 */
SET_SA_FAMILY (rt.rt_dst, AF_INET);
SET_SA_FAMILY (rt.rt_gateway, AF_INET);
- rt.rt_dev = ifname; /* MJC */
+ rt.rt_dev = ifname;
((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = 0L;
((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr = his_adr;
rt.rt_flags = RTF_UP | RTF_HOST;
+#if LINUX_VERSION_CODE > 0x020100
+ SET_SA_FAMILY (rt.rt_genmask, AF_INET);
+ ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = -1L;
+#endif
+
if (ioctl(sock_fd, SIOCADDRT, &rt) < 0)
{
if (! ok_error (errno))
}
return (0);
}
+#endif
return 1;
}
int cifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr)
{
+#if LINUX_VERSION_CODE < 0x020100+16 /* 2.1.16 */
struct rtentry rt;
/*
* Delete the route through the device
SET_SA_FAMILY (rt.rt_dst, AF_INET);
SET_SA_FAMILY (rt.rt_gateway, AF_INET);
- rt.rt_dev = ifname; /* MJC */
+ rt.rt_dev = ifname;
((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = 0;
((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr = his_adr;
rt.rt_flags = RTF_UP | RTF_HOST;
+#if LINUX_VERSION_CODE > 0x020100
+ SET_SA_FAMILY (rt.rt_genmask, AF_INET);
+ ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = -1L;
+#endif
+
if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH)
{
if (still_ppp() && ! ok_error (errno))
}
return (0);
}
+#endif
return 1;
}
int sipxfaddr (int unit, unsigned long int network, unsigned char * node )
{
- int skfd;
int result = 1;
+
+#ifdef IPX_CHANGE
+ int skfd;
struct sockaddr_ipx ipx_addr;
struct ifreq ifr;
struct sockaddr_ipx *sipx = (struct sockaddr_ipx *) &ifr.ifr_addr;
-#ifdef IPX_CHANGE
skfd = socket (AF_IPX, SOCK_DGRAM, 0);
if (skfd < 0)
{
int cipxfaddr (int unit)
{
- int skfd;
int result = 1;
+
+#ifdef IPX_CHANGE
+ int skfd;
struct sockaddr_ipx ipx_addr;
struct ifreq ifr;
struct sockaddr_ipx *sipx = (struct sockaddr_ipx *) &ifr.ifr_addr;
-#ifdef IPX_CHANGE
skfd = socket (AF_IPX, SOCK_DGRAM, 0);
if (skfd < 0)
{