#include "ipcp.h"
static int initdisc = -1; /* Initial TTY discipline */
+static int initfdflags = -1; /* Initial file descriptor flags for fd */
static int prev_kdebugflag = 0;
static int has_default_route = 0;
static int has_proxy_arp = 0;
static int restore_term = 0; /* 1 => we've munged the terminal */
static struct termios inittermios; /* Initial TTY termios */
-int sockfd; /* socket for doing interface ioctls */
+static int sockfd; /* socket for doing interface ioctls */
+
+static int if_is_up; /* Interface has been marked up */
+static u_int32_t default_route_gateway; /* Gateway for default route added */
+static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */
static char *lock_file;
#define FLAGS_MASK (IFF_UP | IFF_BROADCAST | \
IFF_POINTOPOINT | IFF_LOOPBACK | IFF_NOARP)
+/* Prototypes for procedures local to this file. */
+static int get_flags (void);
+static void set_flags (int flags);
+static int translate_speed (int bps);
+static int baud_rate_of (int speed);
+static char *path_to_route (void);
+static void close_route_table (void);
+static int open_route_table (void);
+static int read_route_table (struct rtentry *rt);
+static int defaultroute_exists (void);
+static int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr);
+static void decode_version (char *buf, int *version, int *mod, int *patch);
+
+
/*
* SET_SA_FAMILY - set the sa_family field of a struct sockaddr,
* if it exists.
}
}
+/*
+ * sys_cleanup - restore any system state we modified before exiting:
+ * mark the interface down, delete default route and/or proxy arp entry.
+ * This should call die() because it's called from die().
+ */
+void sys_cleanup()
+{
+ struct ifreq ifr;
+
+ if (if_is_up)
+ sifdown(0);
+ /* XXX maybe we need to delete the route through the interface */
+ if (has_default_route)
+ cifdefaultroute(0, default_route_gateway);
+ if (has_proxy_arp)
+ cifproxyarp(0, proxy_arp_addr);
+}
+
/*
* note_debug_level - note a change in the debug level.
*/
MAINDEBUG ((LOG_NOTICE, "Using version %d.%d.%d of PPP driver",
driver_version, driver_modification, driver_patch));
+
+ /*
+ * Set device for non-blocking reads.
+ */
+ if ((initfdflags = fcntl(fd, F_GETFL)) == -1
+ || fcntl(fd, F_SETFL, initfdflags | O_NONBLOCK) == -1) {
+ {
+ syslog(LOG_WARNING, "Couldn't set device to non-blocking mode: %m");
+ }
}
/*
{
int x;
char *s;
+
+ /* Reset non-blocking mode on the file descriptor. */
+ if (initfdflags != -1 && fcntl(fd, F_SETFL, initfdflags) < 0)
+ syslog(LOG_WARNING, "Couldn't restore device fd flags: %m");
+ initfdflags = -1;
+
/*
* If this is no longer PPP mode then there is nothing that can be done
* about restoring the previous mode.
* Translate from bits/second to a speed_t.
*/
-int translate_speed (int bps)
+static int translate_speed (int bps)
{
struct speed *speedp;
* Translate from a speed_t to bits/second.
*/
-int baud_rate_of (int speed)
+static int baud_rate_of (int speed)
{
struct speed *speedp;
tios.c_cflag |= CRTSCTS;
break;
- case 2:
- tios.c_iflag |= IXOFF;
+ case -2:
+ tios.c_iflag |= IXON | IXOFF;
tios.c_cc[VSTOP] = 0x13; /* DC3 = XOFF = ^S */
tios.c_cc[VSTART] = 0x11; /* DC1 = XON = ^Q */
break;
void output (int unit, unsigned char *p, int len)
{
- if (unit != 0)
- {
- MAINDEBUG((LOG_WARNING, "output: unit != 0!"));
- }
-
if (debug)
{
log_packet(p, len, "sent ");
if (write(fd, p, len) < 0)
{
- syslog(LOG_ERR, "write: %m");
- die(1);
+ if (errno == EWOULDBLOCK || errno == ENOBUFS
+ || errno == ENXIO || errno == EIO)
+ {
+ syslog(LOG_WARNING, "write: warning: %m");
+ }
+ else
+ {
+ syslog(LOG_ERR, "write: %m");
+ die(1);
+ }
}
}
/*
* Set the MTU and other parameters for the ppp device
*/
+ memset (&ifr, '\0', sizeof (ifr));
strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
ifr.ifr_mtu = mtu;
{
struct ppp_option_data data;
+ memset (&data, '\0', sizeof (data));
data.ptr = opt_ptr;
data.length = opt_len;
data.transmit = for_transmit;
- return ioctl(fd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0;
+ if (ioctl(fd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0)
+ return 1;
+
+ return (errno == ENOBUFS)? 0: -1;
}
/*
{
struct ifreq ifr;
+ memset (&ifr, '\0', sizeof (ifr));
strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0)
{
syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
return 0;
}
+ if_is_up = 1;
return 1;
}
{
struct ifreq ifr;
+ memset (&ifr, '\0', sizeof (ifr));
strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0)
{
syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
return 0;
}
+ if_is_up = 0;
return 1;
}
struct ifreq ifr;
struct rtentry rt;
+ memset (&ifr, '\0', sizeof (ifr));
+ memset (&rt, '\0', sizeof (rt));
+
SET_SA_FAMILY (ifr.ifr_addr, AF_INET);
SET_SA_FAMILY (ifr.ifr_dstaddr, AF_INET);
SET_SA_FAMILY (ifr.ifr_netmask, AF_INET);
/*
* Add the device route
*/
- memset (&rt, '\0', sizeof (rt));
-
SET_SA_FAMILY (rt.rt_dst, AF_INET);
SET_SA_FAMILY (rt.rt_gateway, AF_INET);
rt.rt_dev = ifname; /* MJC */
- ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = 0;
+ ((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;
return 0;
}
+/*
+ * close_route_table - close the interface to the route table
+ */
+
+static void close_route_table (void)
+ {
+ if (route_fd != (FILE *) 0)
+ {
+ fclose (route_fd);
+ route_fd = (FILE *) 0;
+ }
+ }
+
/*
* open_route_table - open the interface to the route table
*/
{
char *path;
- if (route_fd != (FILE *) 0)
- {
- close_route_table();
- }
+ close_route_table();
path = path_to_route();
if (path == NULL)
return 1;
}
-/*
- * close_route_table - close the interface to the route table
- */
-
-static void close_route_table (void)
- {
- if (route_fd != (FILE *) 0)
- {
- fclose (route_fd);
- route_fd = (FILE *) 0;
- }
- }
-
/*
* read_route_table - read the next entry from the route table
*/
while (read_route_table(&rt) != 0)
{
- if (rt.rt_flags & RTF_UP == 0)
+ if ((rt.rt_flags & RTF_UP) == 0)
{
continue;
}
}
}
has_default_route = 1;
+ default_route_gateway = g;
return 1;
}
if (has_default_route)
{
+ memset (&rt, '\0', sizeof (rt));
SET_SA_FAMILY (rt.rt_dst, AF_INET);
SET_SA_FAMILY (rt.rt_gateway, AF_INET);
((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway;
}
}
+ proxy_arp_addr = hisaddr;
has_proxy_arp = 1;
return 1;
}
* the same subnet as ipaddr.
*/
-int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr)
+static int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr)
{
struct ifreq *ifr, *ifend, *ifp;
int i;
/*
* Now get the hardware address.
*/
-#if 0 /* old code */
- if (ioctl (sockfd, SIOCGIFHWADDR, &ifreq) < 0)
- {
- syslog(LOG_ERR, "SIOCGIFHWADDR(%s): %m", ifreq.ifr_name);
- return 0;
- }
-
- hwaddr->sa_family = ARPHRD_ETHER;
- memcpy (&hwaddr->sa_data, &ifreq.ifr_hwaddr.sa_data, ETH_ALEN);
-
- MAINDEBUG ((LOG_DEBUG,
- "proxy arp: found hwaddr %02x:%02x:%02x:%02x:%02x:%02x",
- (int) ((unsigned char *) &hwaddr->sa_data)[0],
- (int) ((unsigned char *) &hwaddr->sa_data)[1],
- (int) ((unsigned char *) &hwaddr->sa_data)[2],
- (int) ((unsigned char *) &hwaddr->sa_data)[3],
- (int) ((unsigned char *) &hwaddr->sa_data)[4],
- (int) ((unsigned char *) &hwaddr->sa_data)[5]));
-#else /* the 'proper' code */
memset (&ifreq.ifr_hwaddr, 0, sizeof (struct sockaddr));
if (ioctl (sockfd, SIOCGIFHWADDR, &ifreq) < 0)
{
(int) ((unsigned char *) &hwaddr->sa_data)[5],
(int) ((unsigned char *) &hwaddr->sa_data)[6],
(int) ((unsigned char *) &hwaddr->sa_data)[7]));
-#endif
return 1;
}
ok = ioctl (s, SIOCGIFHWADDR, (caddr_t) &ifr) >= 0;
}
- if (ok && ifr.ifr_hwaddr.sa_family != ARPHRD_PPP)
+ if (ok && ((ifr.ifr_hwaddr.sa_family & ~0xFF) != ARPHRD_PPP))
{
ok = 0;
}
break;
}
- if (n == 0)
+ /* See the process still exists. */
+ if (n > 0)
{
- unlink (lock_file);
- syslog (LOG_NOTICE, "Removed stale lock on %s", lock_file);
- continue;
+ hdb_lock_buffer[n] = '\0';
+ sscanf (hdb_lock_buffer, " %d", &pid);
+ if (kill(pid, 0) == -1 && errno == ESRCH)
+ {
+ n = 0;
+ }
}
- hdb_lock_buffer[n] = '\0';
- sscanf (hdb_lock_buffer, " %d", &pid);
-
- if (kill(pid, 0) == -1 && errno == ESRCH)
+ /* If the process does not exist then try to remove the lock */
+ if (n == 0 && unlink (lock_file) == 0)
{
- /* pid no longer exists - remove the lock file */
- if (unlink (lock_file) == 0)
- {
- syslog (LOG_NOTICE, "Removed stale lock on %s (pid %d)",
- dev, pid);
- continue;
- }
+ syslog (LOG_NOTICE, "Removed stale lock on %s (pid %d)",
+ dev, pid);
+ continue;
}
syslog (LOG_NOTICE, "Device %s is locked by pid %d", dev, pid);