#include <mntent.h>
#include <signal.h>
#include <fcntl.h>
+#include <ctype.h>
#include <net/if.h>
#include <net/ppp_defs.h>
#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 MAX_IFS 32
+#define MAX_IFS 100
#define FLAGS_GOOD (IFF_UP | IFF_BROADCAST)
#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.
*/
syslog (LOG_ERR, "ioctl(PPPIOCSDEBUG): %m");
return (0);
}
- MAINDEBUG ((LOG_INFO, "set kernel debugging level to %d", requested_level));
+ MAINDEBUG ((LOG_INFO, "set kernel debugging level to %d",
+ requested_level));
}
return (1);
}
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.
- */
- if (!still_ppp())
- {
- initdisc = -1;
- return;
- }
-/*
- * Check whether the link seems not to be 8-bit clean.
+ * Fetch the flags for the device and generate appropriate error
+ * messages.
*/
- if (initdisc >= 0)
+ if (still_ppp() && initdisc >= 0)
{
if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) == 0)
{
s = NULL;
switch (~x & (SC_RCV_B7_0|SC_RCV_B7_1|SC_RCV_EVNP|SC_RCV_ODDP))
{
- case SC_RCV_B7_0 | SC_RCV_B7_1 | SC_RCV_EVNP | SC_RCV_ODDP:
+ case SC_RCV_B7_0 | SC_RCV_B7_1 | SC_RCV_EVNP | SC_RCV_ODDP:
s = "nothing was received";
break;
-
- case SC_RCV_B7_0:
- case SC_RCV_B7_0 | SC_RCV_EVNP:
- case SC_RCV_B7_0 | SC_RCV_ODDP:
- case SC_RCV_B7_0 | SC_RCV_ODDP | SC_RCV_EVNP:
+
+ case SC_RCV_B7_0:
+ case SC_RCV_B7_0 | SC_RCV_EVNP:
+ case SC_RCV_B7_0 | SC_RCV_ODDP:
+ case SC_RCV_B7_0 | SC_RCV_ODDP | SC_RCV_EVNP:
s = "all had bit 7 set to 1";
break;
-
- case SC_RCV_B7_1:
- case SC_RCV_B7_1 | SC_RCV_EVNP:
- case SC_RCV_B7_1 | SC_RCV_ODDP:
- case SC_RCV_B7_1 | SC_RCV_ODDP | SC_RCV_EVNP:
+
+ case SC_RCV_B7_1:
+ case SC_RCV_B7_1 | SC_RCV_EVNP:
+ case SC_RCV_B7_1 | SC_RCV_ODDP:
+ case SC_RCV_B7_1 | SC_RCV_ODDP | SC_RCV_EVNP:
s = "all had bit 7 set to 0";
break;
-
- case SC_RCV_EVNP:
+
+ case SC_RCV_EVNP:
s = "all had odd parity";
break;
-
- case SC_RCV_ODDP:
+
+ case SC_RCV_ODDP:
s = "all had even parity";
break;
}
-
+
if (s != NULL)
{
- syslog(LOG_WARNING, "Receive serial link is not 8-bit clean:");
+ syslog(LOG_WARNING, "Receive serial link is not"
+ " 8-bit clean:");
syslog(LOG_WARNING, "Problem: %s", s);
}
}
-
- set_kdebugflag (prev_kdebugflag);
+
+ set_kdebugflag (prev_kdebugflag);
if (ioctl(fd, TIOCSETD, &initdisc) < 0)
{
- syslog(LOG_ERR, "ioctl(TIOCSETD): %m");
+ syslog(LOG_WARNING, "ioctl(TIOCSETD): %m");
}
if (ioctl(fd, TIOCNXCL, 0) < 0)
{
syslog (LOG_WARNING, "ioctl(TIOCNXCL): %m");
}
-
- initdisc = -1;
}
+ initdisc = -1;
}
/*
* 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);
+ }
}
}
MAINDEBUG ((LOG_DEBUG, "send_config: mtu = %d\n", mtu));
/*
- * If we were called because the link has gone down then there is nothing
- * which may be done. Just return without incident.
+ * Ensure that the link is still up.
*/
- if (!still_ppp())
+ if (still_ppp())
{
- return;
- }
/*
* 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;
-
- if (ioctl(sockfd, SIOCSIFMTU, (caddr_t) &ifr) < 0)
- {
- syslog(LOG_ERR, "ioctl(SIOCSIFMTU): %m");
- quit();
- }
+ memset (&ifr, '\0', sizeof (ifr));
+ strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
+ ifr.ifr_mtu = mtu;
+
+ if (ioctl(sockfd, SIOCSIFMTU, (caddr_t) &ifr) < 0)
+ {
+ syslog(LOG_ERR, "ioctl(SIOCSIFMTU): %m");
+ quit();
+ }
+
+ MAINDEBUG ((LOG_DEBUG, "send_config: asyncmap = %lx\n", asyncmap));
+ if (ioctl(fd, PPPIOCSASYNCMAP, (caddr_t) &asyncmap) < 0)
+ {
+ syslog(LOG_ERR, "ioctl(PPPIOCSASYNCMAP): %m");
+ quit();
+ }
- MAINDEBUG ((LOG_DEBUG, "send_config: asyncmap = %lx\n", asyncmap));
- if (ioctl(fd, PPPIOCSASYNCMAP, (caddr_t) &asyncmap) < 0)
- {
- syslog(LOG_ERR, "ioctl(PPPIOCSASYNCMAP): %m");
- quit();
+ x = get_flags();
+ x = pcomp ? x | SC_COMP_PROT : x & ~SC_COMP_PROT;
+ x = accomp ? x | SC_COMP_AC : x & ~SC_COMP_AC;
+ set_flags(x);
}
-
- x = get_flags();
- x = pcomp ? x | SC_COMP_PROT : x & ~SC_COMP_PROT;
- x = accomp ? x | SC_COMP_AC : x & ~SC_COMP_AC;
- set_flags(x);
}
/*
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;
}
/*
syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
return 0;
}
+ if_is_up = 1;
return 1;
}
syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
return 0;
}
+ if_is_up = 0;
return 1;
}
((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr = his_adr;
rt.rt_flags = RTF_UP | RTF_HOST;
- if (ioctl(sockfd, SIOCDELRT, &rt) < 0)
+ if (ioctl(sockfd, SIOCDELRT, &rt) < 0 && errno != ESRCH)
{
- syslog (LOG_ERR, "ioctl(SIOCDELRT) device route: %m");
- return (0);
+ if (still_ppp())
+ {
+ syslog (LOG_ERR, "ioctl(SIOCDELRT) device route: %m");
+ return (0);
+ }
}
return 1;
}
*/
FILE *route_fd = (FILE *) 0;
-static char route_buffer [100];
+static char route_buffer [512];
static char *path_to_route (void);
static int open_route_table (void);
syslog (LOG_ERR, "can not open %s: %m", path);
return 0;
}
-
- /* read and discard the header line. */
- if (fgets (route_buffer, sizeof (route_buffer), route_fd) == (char *) 0)
- {
- close_route_table();
- return 0;
- }
return 1;
}
{
static char delims[] = " \t\n";
char *dev_ptr, *ptr, *dst_ptr, *gw_ptr, *flag_ptr;
+
+ memset (rt, '\0', sizeof (struct rtentry));
- if (fgets (route_buffer, sizeof (route_buffer), route_fd) == (char *) 0)
+ for (;;)
{
- return 0;
- }
-
- memset (rt, '\0', sizeof (struct rtentry));
+ if (fgets (route_buffer, sizeof (route_buffer), route_fd) ==
+ (char *) 0)
+ {
+ return 0;
+ }
- dev_ptr = strtok (route_buffer, delims); /* interface name */
- dst_ptr = strtok (NULL, delims); /* destination address */
- gw_ptr = strtok (NULL, delims); /* gateway */
- flag_ptr = strtok (NULL, delims); /* flags */
+ dev_ptr = strtok (route_buffer, delims); /* interface name */
+ dst_ptr = strtok (NULL, delims); /* destination address */
+ gw_ptr = strtok (NULL, delims); /* gateway */
+ flag_ptr = strtok (NULL, delims); /* flags */
+
+ if (flag_ptr == (char *) 0) /* assume that we failed, somewhere. */
+ {
+ return 0;
+ }
+
+ /* Discard that stupid header line which should never
+ * have been there in the first place !! */
+ if (isxdigit (*dst_ptr) && isxdigit (*gw_ptr) && isxdigit (*flag_ptr))
+ {
+ break;
+ }
+ }
((struct sockaddr_in *) &rt->rt_dst)->sin_addr.s_addr =
strtoul (dst_ptr, NULL, 16);
}
}
has_default_route = 1;
+ default_route_gateway = g;
return 1;
}
((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway;
rt.rt_flags = RTF_UP | RTF_GATEWAY;
- if (ioctl(sockfd, SIOCDELRT, &rt) < 0)
+ if (ioctl(sockfd, SIOCDELRT, &rt) < 0 && errno != ESRCH)
{
- if (errno != ENOENT || still_ppp())
+ if (still_ppp())
{
syslog (LOG_ERR, "default route ioctl(SIOCDELRT): %m");
return 0;
}
}
+ 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;