#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 ipaddrs[2]; /* Local and remote addrs we've set */
+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.
{
int flags;
- if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &flags) < 0)
+ if (ioctl(ttyfd, PPPIOCGFLAGS, (caddr_t) &flags) < 0)
{
syslog(LOG_ERR, "ioctl(PPPIOCGFLAGS): %m");
quit();
{
MAINDEBUG ((LOG_DEBUG, "set flags = %x\n", flags));
- if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &flags) < 0)
+ if (ioctl(ttyfd, PPPIOCSFLAGS, (caddr_t) &flags) < 0)
{
syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS, %x): %m", flags);
quit();
void sys_init(void)
{
- openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP);
- setlogmask(LOG_UPTO(LOG_INFO));
- if (debug)
- {
- setlogmask(LOG_UPTO(LOG_DEBUG));
- }
-
/* Get an internet socket for doing socket ioctls. */
sockfd = socket(AF_INET, SOCK_DGRAM, 0);
if (sockfd < 0)
}
/*
- * note_debug_level - note a change in the debug level.
+ * 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;
-void note_debug_level (void)
- {
- if (debug)
- {
- MAINDEBUG ((LOG_INFO, "Debug turned ON, Level %d", debug));
- setlogmask(LOG_UPTO(LOG_DEBUG));
- }
- else
- {
- setlogmask(LOG_UPTO(LOG_WARNING));
- }
- }
+ if (if_is_up)
+ sifdown(0);
+ if (ipaddrs[0])
+ cifaddr(0, ipaddrs[0], ipaddrs[1]);
+ /* 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);
+}
/*
* set_kdebugflag - Define the debugging level for the kernel
int set_kdebugflag (int requested_level)
{
- if (ioctl(fd, PPPIOCGDEBUG, &prev_kdebugflag) < 0)
+ if (ioctl(ttyfd, PPPIOCGDEBUG, &prev_kdebugflag) < 0)
{
syslog(LOG_ERR, "ioctl(PPPIOCGDEBUG): %m");
return (0);
if (prev_kdebugflag != requested_level)
{
- if (ioctl(fd, PPPIOCSDEBUG, &requested_level) < 0)
+ if (ioctl(ttyfd, PPPIOCSDEBUG, &requested_level) < 0)
{
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);
}
* establish_ppp - Turn the serial port into a ppp interface.
*/
-void establish_ppp (void)
+void establish_ppp (int fd)
{
int pppdisc = N_PPP;
int sig = SIGIO;
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");
+ }
}
/*
* This shouldn't call die() because it's called from die().
*/
-void disestablish_ppp(void)
+void disestablish_ppp(int fd)
{
int x;
char *s;
-/*
- * If this is no longer PPP mode then there is nothing that can be done
- * about restoring the previous mode.
- */
- if (!still_ppp())
+
+ /* 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 (still_ppp() && initdisc >= 0)
{
- initdisc = -1;
- return;
+ set_kdebugflag (prev_kdebugflag);
+
+ if (ioctl(fd, TIOCSETD, &initdisc) < 0)
+ {
+ syslog(LOG_WARNING, "ioctl(TIOCSETD): %m");
+ }
+
+ if (ioctl(fd, TIOCNXCL, 0) < 0)
+ {
+ syslog (LOG_WARNING, "ioctl(TIOCNXCL): %m");
+ }
}
+ initdisc = -1;
+ }
+
/*
- * Check whether the link seems not to be 8-bit clean.
+ * clean_check - Fetch the flags for the device and generate
+ * appropriate error messages.
*/
- if (initdisc >= 0)
+void clean_check(void)
+ {
+ if (still_ppp() && initdisc >= 0)
{
- if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) == 0)
+ if (ioctl(ttyfd, 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);
-
- if (ioctl(fd, TIOCSETD, &initdisc) < 0)
- {
- syslog(LOG_ERR, "ioctl(TIOCSETD): %m");
- }
-
- if (ioctl(fd, TIOCNXCL, 0) < 0)
- {
- syslog (LOG_WARNING, "ioctl(TIOCNXCL): %m");
- }
-
- initdisc = -1;
}
}
+
/*
* List of valid speeds.
* 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;
* restore_tty - restore the terminal to the saved settings.
*/
-void restore_tty (void)
+void restore_tty (int fd)
{
if (restore_term)
{
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)
+ if (write(ttyfd, 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);
+ }
}
}
/*
- * wait_input - wait until there is data available on fd,
+ * wait_input - wait until there is data available on ttyfd,
* for the length of time specified by *timo (indefinite
* if timo is NULL).
*/
int n;
FD_ZERO(&ready);
- FD_SET(fd, &ready);
+ FD_SET(ttyfd, &ready);
- n = select(fd+1, &ready, NULL, &ready, timo);
+ n = select(ttyfd+1, &ready, NULL, &ready, timo);
if (n < 0 && errno != EINTR)
{
syslog(LOG_ERR, "select: %m");
{
int len;
- len = read(fd, buf, PPP_MTU + PPP_HDRLEN);
+ len = read(ttyfd, buf, PPP_MTU + PPP_HDRLEN);
if (len < 0)
{
if (errno == EWOULDBLOCK)
{
return -1;
}
- syslog(LOG_ERR, "read(fd): %m");
+ syslog(LOG_ERR, "read: %m");
die(1);
}
return len;
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
*/
- 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(ttyfd, 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);
}
/*
MAINDEBUG ((LOG_DEBUG, "set_xaccm: %08lx %08lx %08lx %08lx\n",
accm[0], accm[1], accm[2], accm[3]));
- if (ioctl(fd, PPPIOCSXASYNCMAP, accm) < 0 && errno != ENOTTY)
+ if (ioctl(ttyfd, PPPIOCSXASYNCMAP, accm) < 0 && errno != ENOTTY)
{
syslog(LOG_WARNING, "ioctl(set extended ACCM): %m");
}
/*
* Set the receiver parameters
*/
- if (ioctl(fd, PPPIOCSMRU, (caddr_t) &mru) < 0)
+ if (ioctl(ttyfd, PPPIOCSMRU, (caddr_t) &mru) < 0)
{
syslog(LOG_ERR, "ioctl(PPPIOCSMRU): %m");
}
MAINDEBUG ((LOG_DEBUG, "recv_config: asyncmap = %lx\n", asyncmap));
- if (ioctl(fd, PPPIOCSRASYNCMAP, (caddr_t) &asyncmap) < 0)
+ if (ioctl(ttyfd, PPPIOCSRASYNCMAP, (caddr_t) &asyncmap) < 0)
{
syslog(LOG_ERR, "ioctl(PPPIOCSRASYNCMAP): %m");
quit();
{
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(ttyfd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0)
+ {
+ return 1;
+ }
+
+ return (errno == ENOBUFS)? 0: -1;
}
/*
if (vjcomp)
{
- if (ioctl (fd, PPPIOCSMAXCID, (caddr_t) &maxcid) < 0)
+ if (ioctl (ttyfd, PPPIOCSMAXCID, (caddr_t) &maxcid) < 0)
{
syslog (LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
vjcomp = 0;
{
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;
syslog (LOG_ERR, "ioctl(SIOCADDRT) device route: %m");
return (0);
}
+
+ ipaddrs[0] = our_adr;
+ ipaddrs[1] = his_adr;
return 1;
}
int cifaddr (int unit, int our_adr, int his_adr)
{
struct rtentry rt;
+
+ ipaddrs[0] = 0;
/*
* Delete the route through the device
*/
((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);
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)
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;
}
-/*
- * 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
*/
{
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);
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;
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;
/*
* 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);
projects / ppp.git / blobdiff