X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-linux.c;h=1e52e3bddf8ab4bd53fb26855c42c0f3c8d20c62;hp=436a5f1af66eab217a846c70e7b0e04e44f8b653;hb=2c872bc67b83b91ba6390f6e5e72be08e09811a1;hpb=f35f3211790dfdd63ea1bf36af08e83f82d43c84 diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index 436a5f1..1e52e3b 100644 --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -88,10 +89,27 @@ #include #endif -#ifndef RTF_DEFAULT /* Normally in from */ -#define RTF_DEFAULT 0 +#ifdef INET6 +#ifndef _LINUX_IN6_H +/* + * This is in linux/include/net/ipv6.h. + */ + +struct in6_ifreq { + struct in6_addr ifr6_addr; + __u32 ifr6_prefixlen; + unsigned int ifr6_ifindex; +}; #endif +#define IN6_LLADDR_FROM_EUI64(sin6, eui64) do { \ + memset(&sin6.s6_addr, 0, sizeof(struct in6_addr)); \ + sin6.s6_addr16[0] = htons(0xfe80); \ + eui64_copy(eui64, sin6.s6_addr32[2]); \ + } while (0) + +#endif /* INET6 */ + /* We can get an EIO error on an ioctl if the modem has hung up */ #define ok_error(num) ((num)==EIO) @@ -102,6 +120,11 @@ static int ppp_fd = -1; /* fd which is set to PPP discipline */ static int sock_fd = -1; /* socket for doing interface ioctls */ static int slave_fd = -1; static int master_fd = -1; +#ifdef INET6 +static int sock6_fd = -1; +#endif /* INET6 */ +static int ppp_dev_fd = -1; /* fd for /dev/ppp (new style driver) */ +static int chindex; /* channel index (new style driver) */ static fd_set in_fds; /* set of fds that wait_input waits for */ static int max_in_fd; /* highest fd set in in_fds */ @@ -114,6 +137,8 @@ static int driver_is_old = 0; static int restore_term = 0; /* 1 => we've munged the terminal */ static struct termios inittermios; /* Initial TTY termios */ +static int new_style_driver = 0; + static char loop_name[20]; static unsigned char inbuf[512]; /* buffer for chars read from loopback */ @@ -121,6 +146,9 @@ 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 proxy_arp_dev[16]; /* Device for proxy arp entry */ +static u_int32_t our_old_addr; /* for detecting address changes */ +static int dynaddr_set; /* 1 if ip_dynaddr set */ +static int looped; /* 1 if using loop */ static struct utsname utsname; /* for the kernel version */ static int kernel_version; @@ -132,12 +160,13 @@ static int kernel_version; #define FLAGS_MASK (IFF_UP | IFF_BROADCAST | \ IFF_POINTOPOINT | IFF_LOOPBACK | IFF_NOARP) +#define SIN_ADDR(x) (((struct sockaddr_in *) (&(x)))->sin_addr.s_addr) + /* Prototypes for procedures local to this file. */ -static int get_flags (void); -static void set_flags (int flags); +static int get_flags (int fd); +static void set_flags (int fd, 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); @@ -165,14 +194,19 @@ extern u_char inpacket_buf[]; /* borrowed from main.c */ extern int hungup; +/* new_fd is the fd of a tty */ static void set_ppp_fd (int new_fd) { SYSDEBUG ((LOG_DEBUG, "setting ppp_fd to %d\n", new_fd)); ppp_fd = new_fd; + if (!new_style_driver) + ppp_dev_fd = new_fd; } static int still_ppp(void) { + if (new_style_driver) + return !hungup && ppp_fd >= 0; if (!hungup || ppp_fd == slave_fd) return 1; if (slave_fd >= 0) { @@ -187,11 +221,11 @@ static int still_ppp(void) * Functions to read and set the flags value in the device driver */ -static int get_flags (void) +static int get_flags (int fd) { int flags; - if (ioctl(ppp_fd, PPPIOCGFLAGS, (caddr_t) &flags) < 0) { + if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &flags) < 0) { if ( ok_error (errno) ) flags = 0; else @@ -204,13 +238,13 @@ static int get_flags (void) /********************************************************************/ -static void set_flags (int flags) +static void set_flags (int fd, int flags) { SYSDEBUG ((LOG_DEBUG, "set flags = %x\n", flags)); - if (ioctl(ppp_fd, PPPIOCSFLAGS, (caddr_t) &flags) < 0) { + if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &flags) < 0) { if (! ok_error (errno) ) - fatal("ioctl(PPPIOCSFLAGS, %x): %m(%d)", flags, errno); + fatal("ioctl(PPPIOCSFLAGS, %x): %m", flags, errno); } } @@ -221,27 +255,36 @@ static void set_flags (int flags) void sys_init(void) { - int osmaj, osmin, ospatch; + int flags; openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP); setlogmask(LOG_UPTO(LOG_INFO)); if (debug) setlogmask(LOG_UPTO(LOG_DEBUG)); - + + if (new_style_driver) { + ppp_dev_fd = open("/dev/ppp", O_RDWR); + if (ppp_dev_fd < 0) + fatal("Couldn't open /dev/ppp: %m"); + flags = fcntl(ppp_dev_fd, F_GETFL); + if (flags == -1 + || fcntl(ppp_dev_fd, F_SETFL, flags | O_NONBLOCK) == -1) + warn("Couldn't set /dev/ppp to nonblock: %m"); + } + /* Get an internet socket for doing socket ioctls. */ sock_fd = socket(AF_INET, SOCK_DGRAM, 0); - if (sock_fd < 0) { - if ( ! ok_error ( errno )) - fatal("Couldn't create IP socket: %m(%d)", errno); - } + if (sock_fd < 0) + fatal("Couldn't create IP socket: %m(%d)", errno); + +#ifdef INET6 + sock6_fd = socket(AF_INET6, SOCK_DGRAM, 0); + if (sock6_fd < 0) + fatal("Couldn't create IPv6 socket: %m(%d)", errno); +#endif FD_ZERO(&in_fds); max_in_fd = 0; - - uname(&utsname); - osmaj = osmin = ospatch = 0; - sscanf(utsname.release, "%d.%d.%d", &osmaj, &osmin, &ospatch); - kernel_version = KVERSION(osmaj, osmin, ospatch); } /******************************************************************** @@ -256,8 +299,10 @@ void sys_cleanup(void) /* * Take down the device */ - if (if_is_up) + if (if_is_up) { + if_is_up = 0; sifdown(0); + } /* * Delete any routes through the device. */ @@ -275,6 +320,8 @@ void sys_cleanup(void) void sys_close(void) { + if (new_style_driver) + close(ppp_dev_fd); if (sock_fd >= 0) close(sock_fd); if (slave_fd >= 0) @@ -291,7 +338,9 @@ sys_close(void) static int set_kdebugflag (int requested_level) { - if (ioctl(ppp_fd, PPPIOCSDEBUG, &requested_level) < 0) { + if (new_style_driver && ifunit < 0) + return 1; + if (ioctl(ppp_dev_fd, PPPIOCSDEBUG, &requested_level) < 0) { if ( ! ok_error (errno) ) error("ioctl(PPPIOCSDEBUG): %m"); return (0); @@ -309,68 +358,137 @@ static int set_kdebugflag (int requested_level) int establish_ppp (int tty_fd) { int x; -/* - * The current PPP device will be the tty file. - */ - set_ppp_fd (tty_fd); + int fd = -1; + /* * Ensure that the tty device is in exclusive mode. */ if (ioctl(tty_fd, TIOCEXCL, 0) < 0) { if ( ! ok_error ( errno )) - warn("ioctl(TIOCEXCL): %m"); + warn("Couldn't make tty exclusive: %m"); } /* * Demand mode - prime the old ppp device to relinquish the unit. */ - if (demand && ioctl(slave_fd, PPPIOCXFERUNIT, 0) < 0) - fatal("ioctl(transfer ppp unit): %m(%d)", errno); -/* - * Set the current tty to the PPP discpline - */ - if (ioctl(ppp_fd, TIOCSETD, &ppp_disc) < 0) { - if ( ! ok_error (errno) ) - fatal("ioctl(TIOCSETD): %m(%d)", errno); + if (!new_style_driver && looped + && ioctl(slave_fd, PPPIOCXFERUNIT, 0) < 0) { + error("ioctl(transfer ppp unit): %m"); + return -1; } /* - * Find out which interface we were given. + * Set the current tty to the PPP discpline */ - if (ioctl(ppp_fd, PPPIOCGUNIT, &x) < 0) { - if ( ! ok_error (errno)) - fatal("ioctl(PPPIOCGUNIT): %m(%d)", errno); + +#ifndef N_SYNC_PPP +#define N_SYNC_PPP 14 +#endif + ppp_disc = (new_style_driver && sync_serial)? N_SYNC_PPP: N_PPP; + if (ioctl(tty_fd, TIOCSETD, &ppp_disc) < 0) { + if ( ! ok_error (errno) ) { + error("Couldn't set tty to PPP discipline: %m"); + return -1; + } } -/* - * Check that we got the same unit again. - */ - if (demand) { - if (x != ifunit) + + if (new_style_driver) { + /* Open another instance of /dev/ppp and connect the channel to it */ + int flags; + + if (ioctl(tty_fd, PPPIOCGCHAN, &chindex) == -1) { + error("Couldn't get channel number: %m"); + goto err; + } + dbglog("using channel %d", chindex); + fd = open("/dev/ppp", O_RDWR); + if (fd < 0) { + error("Couldn't reopen /dev/ppp: %m"); + goto err; + } + if (ioctl(fd, PPPIOCATTCHAN, &chindex) < 0) { + error("Couldn't attach to channel %d: %m", chindex); + goto err_close; + } + flags = fcntl(fd, F_GETFL); + if (flags == -1 || fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1) + warn("Couldn't set /dev/ppp (channel) to nonblock: %m"); + set_ppp_fd(fd); + + ifunit = -1; + if (!looped && !multilink) { + /* + * Create a new PPP unit. + */ + ifunit = req_unit; + x = ioctl(ppp_dev_fd, PPPIOCNEWUNIT, &ifunit); + if (x < 0 && req_unit >= 0 && errno == EEXIST) { + warn("Couldn't allocate PPP unit %d as it is already in use"); + ifunit = -1; + x = ioctl(ppp_dev_fd, PPPIOCNEWUNIT, &ifunit); + } + if (x < 0) { + error("Couldn't create new ppp unit: %m"); + goto err_close; + } + } + + if (looped) + set_flags(ppp_dev_fd, get_flags(ppp_dev_fd) & ~SC_LOOP_TRAFFIC); + + if (!multilink) { + add_fd(ppp_dev_fd); + if (ioctl(fd, PPPIOCCONNECT, &ifunit) < 0) { + error("Couldn't attach to PPP unit %d: %m", ifunit); + goto err_close; + } + } + + } else { + /* + * Old-style driver: find out which interface we were given. + */ + set_ppp_fd (tty_fd); + if (ioctl(tty_fd, PPPIOCGUNIT, &x) < 0) { + if ( ! ok_error (errno)) + fatal("ioctl(PPPIOCGUNIT): %m(%d)", errno); + } + /* Check that we got the same unit again. */ + if (looped && x != ifunit) fatal("transfer_ppp failed: wanted unit %d, got %d", ifunit, x); + ifunit = x; + + /* + * Fetch the initial file flags and reset blocking mode on the file. + */ + initfdflags = fcntl(tty_fd, F_GETFL); + if (initfdflags == -1 || + fcntl(tty_fd, F_SETFL, initfdflags | O_NONBLOCK) == -1) { + if ( ! ok_error (errno)) + warn("Couldn't set device to non-blocking mode: %m"); + } } - ifunit = x; -/* - * Enable debug in the driver if requested. - */ - if (!demand) + looped = 0; + + /* + * Enable debug in the driver if requested. + */ + if (!looped) set_kdebugflag (kdebugflag); - set_flags (get_flags() & ~(SC_RCV_B7_0 | SC_RCV_B7_1 | - SC_RCV_EVNP | SC_RCV_ODDP)); + set_flags(ppp_fd, get_flags(ppp_fd) & ~(SC_RCV_B7_0 | SC_RCV_B7_1 | + SC_RCV_EVNP | SC_RCV_ODDP)); SYSDEBUG ((LOG_NOTICE, "Using version %d.%d.%d of PPP driver", driver_version, driver_modification, driver_patch)); -/* - * Fetch the initial file flags and reset blocking mode on the file. - */ - initfdflags = fcntl(ppp_fd, F_GETFL); - - if (initfdflags == -1 || - fcntl(ppp_fd, F_SETFL, initfdflags | O_NONBLOCK) == -1) { - if ( ! ok_error (errno)) - warn("Couldn't set device to non-blocking mode: %m"); - } return ppp_fd; + + err_close: + close(fd); + err: + if (ioctl(tty_fd, TIOCSETD, &tty_disc) < 0 && !ok_error(errno)) + warn("Couldn't reset tty to normal line discipline: %m"); + return -1; } /******************************************************************** @@ -407,6 +525,42 @@ void disestablish_ppp(int tty_fd) } } initfdflags = -1; + + if (new_style_driver) { + close(ppp_fd); + ppp_fd = -1; + if (!looped && ioctl(ppp_dev_fd, PPPIOCDETACH) < 0) + error("Couldn't release PPP unit: %m"); + if (!multilink) + remove_fd(ppp_dev_fd); + } +} + +/* + * bundle_attach - attach our link to a given PPP unit. + */ +int bundle_attach(int ifnum) +{ + int mrru = 1500; + + if (!new_style_driver) + return -1; + + if (ioctl(ppp_dev_fd, PPPIOCATTACH, &ifnum) < 0) { + error("Couldn't attach to interface unit %d: %m\n", ifnum); + return -1; + } + set_flags(ppp_dev_fd, get_flags(ppp_dev_fd) | SC_MULTILINK); + if (ioctl(ppp_dev_fd, PPPIOCSMRRU, &mrru) < 0) + error("Couldn't set interface MRRU: %m"); + + if (ioctl(ppp_fd, PPPIOCCONNECT, &ifnum) < 0) { + error("Couldn't connect to interface unit %d: %m", ifnum); + return -1; + } + + dbglog("bundle_attach succeeded"); + return 0; } /******************************************************************** @@ -424,16 +578,10 @@ void clean_check(void) s = NULL; switch (~x & (SC_RCV_B7_0|SC_RCV_B7_1|SC_RCV_EVNP|SC_RCV_ODDP)) { 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: s = "all had bit 7 set to 0"; break; @@ -695,10 +843,22 @@ void restore_tty (int tty_fd) void output (int unit, unsigned char *p, int len) { + int fd = ppp_fd; + int proto; + if (debug) dbglog("sent %P", p, len); - - if (write(ppp_fd, p, len) < 0) { + + if (len < PPP_HDRLEN) + return; + if (new_style_driver) { + p += 2; + len -= 2; + proto = (p[0] << 8) + p[1]; + if (!multilink && proto != PPP_LCP) + fd = ppp_dev_fd; + } + if (write(fd, p, len) < 0) { if (errno == EWOULDBLOCK || errno == ENOBUFS || errno == ENXIO || errno == EIO || errno == EINTR) warn("write: warning: %m (%d)", errno); @@ -716,11 +876,12 @@ void output (int unit, unsigned char *p, int len) void wait_input(struct timeval *timo) { - fd_set ready; + fd_set ready, exc; int n; ready = in_fds; - n = select(max_in_fd + 1, &ready, NULL, &ready, timo); + exc = in_fds; + n = select(max_in_fd + 1, &ready, NULL, &exc, timo); if (n < 0 && errno != EINTR) fatal("select: %m(%d)", errno); } @@ -743,42 +904,6 @@ void remove_fd(int fd) FD_CLR(fd, &in_fds); } -#if 0 -/******************************************************************** - * - * wait_loop_output - wait until there is data available on the - * loopback, for the length of time specified by *timo (indefinite - * if timo is NULL). - */ -void wait_loop_output(timo) - struct timeval *timo; -{ - fd_set ready; - int n; - - FD_ZERO(&ready); - FD_SET(master_fd, &ready); - n = select(master_fd + 1, &ready, NULL, &ready, timo); - if (n < 0 && errno != EINTR) - fatal("select: %m(%d)", errno); -} - -/******************************************************************** - * - * wait_time - wait for a given length of time or until a - * signal is received. - */ - -void wait_time(timo) - struct timeval *timo; -{ - int n; - - n = select(0, NULL, NULL, NULL, timo); - if (n < 0 && errno != EINTR) - fatal("select: %m(%d)", errno); -} -#endif /******************************************************************** * @@ -787,15 +912,27 @@ void wait_time(timo) int read_packet (unsigned char *buf) { - int len; - - len = read(ppp_fd, buf, PPP_MTU + PPP_HDRLEN); - if (len < 0) { - if (errno == EWOULDBLOCK || errno == EIO) - return -1; - fatal("read: %m(%d)", errno); + int len, nr; + + len = PPP_MRU + PPP_HDRLEN; + if (new_style_driver) { + *buf++ = PPP_ALLSTATIONS; + *buf++ = PPP_UI; + len -= 2; + } + nr = -1; + if (ppp_fd >= 0) { + nr = read(ppp_fd, buf, len); + if (nr < 0 && errno != EWOULDBLOCK && errno != EIO) + error("read: %m"); } - return len; + if (nr < 0 && new_style_driver && !multilink) { + /* N.B. we read ppp_fd first since LCP packets come in there. */ + nr = read(ppp_dev_fd, buf, len); + if (nr < 0 && errno != EWOULDBLOCK && errno != EIO) + error("read /dev/ppp: %m"); + } + return (new_style_driver && nr > 0)? nr+2: nr; } /******************************************************************** @@ -808,20 +945,25 @@ int get_loop_output(void) { int rv = 0; - int n = read(master_fd, inbuf, sizeof(inbuf)); + int n; - while (n > 0) { + if (new_style_driver) { + while ((n = read_packet(inpacket_buf)) > 0) + if (loop_frame(inpacket_buf, n)) + rv = 1; + return rv; + } + + while ((n = read(master_fd, inbuf, sizeof(inbuf))) > 0) if (loop_chars(inbuf, n)) rv = 1; - n = read(master_fd, inbuf, sizeof(inbuf)); - } if (n == 0) fatal("eof on loopback"); if (errno != EWOULDBLOCK) fatal("read from loopback: %m(%d)", errno); - + return rv; } @@ -837,11 +979,6 @@ void ppp_send_config (int unit,int mtu,u_int32_t asyncmap,int pcomp,int accomp) struct ifreq ifr; SYSDEBUG ((LOG_DEBUG, "send_config: mtu = %d\n", mtu)); -/* - * Ensure that the link is still up. - */ - if (!still_ppp()) - return; /* * Set the MTU and other parameters for the ppp device */ @@ -849,9 +986,11 @@ void ppp_send_config (int unit,int mtu,u_int32_t asyncmap,int pcomp,int accomp) strlcpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); ifr.ifr_mtu = mtu; - if (ioctl(sock_fd, SIOCSIFMTU, (caddr_t) &ifr) < 0) + if (ifunit >= 0 && ioctl(sock_fd, SIOCSIFMTU, (caddr_t) &ifr) < 0) fatal("ioctl(SIOCSIFMTU): %m(%d)", errno); + if (!still_ppp()) + return; SYSDEBUG ((LOG_DEBUG, "send_config: asyncmap = %lx\n", asyncmap)); if (ioctl(ppp_fd, PPPIOCSASYNCMAP, (caddr_t) &asyncmap) < 0) { if (!ok_error(errno)) @@ -859,11 +998,11 @@ void ppp_send_config (int unit,int mtu,u_int32_t asyncmap,int pcomp,int accomp) return; } - x = get_flags(); + x = get_flags(ppp_fd); x = pcomp ? x | SC_COMP_PROT : x & ~SC_COMP_PROT; x = accomp ? x | SC_COMP_AC : x & ~SC_COMP_AC; x = sync_serial ? x | SC_SYNC : x & ~SC_SYNC; - set_flags(x); + set_flags(ppp_fd, x); } /******************************************************************** @@ -876,6 +1015,8 @@ void ppp_set_xaccm (int unit, ext_accm accm) SYSDEBUG ((LOG_DEBUG, "set_xaccm: %08lx %08lx %08lx %08lx\n", accm[0], accm[1], accm[2], accm[3])); + if (!still_ppp()) + return; if (ioctl(ppp_fd, PPPIOCSXASYNCMAP, accm) < 0 && errno != ENOTTY) { if ( ! ok_error (errno)) warn("ioctl(set extended ACCM): %m(%d)", errno); @@ -890,8 +1031,6 @@ void ppp_set_xaccm (int unit, ext_accm accm) void ppp_recv_config (int unit,int mru,u_int32_t asyncmap,int pcomp,int accomp) { - u_int x; - SYSDEBUG ((LOG_DEBUG, "recv_config: mru = %d\n", mru)); /* * If we were called because the link has gone down then there is nothing @@ -906,16 +1045,15 @@ void ppp_recv_config (int unit,int mru,u_int32_t asyncmap,int pcomp,int accomp) if ( ! ok_error (errno)) error("ioctl(PPPIOCSMRU): %m(%d)", errno); } + if (new_style_driver && ifunit >= 0 + && ioctl(ppp_dev_fd, PPPIOCSMRU, (caddr_t) &mru) < 0) + error("Couldn't set MRU in generic PPP layer: %m"); SYSDEBUG ((LOG_DEBUG, "recv_config: asyncmap = %lx\n", asyncmap)); if (ioctl(ppp_fd, PPPIOCSRASYNCMAP, (caddr_t) &asyncmap) < 0) { if (!ok_error(errno)) error("ioctl(PPPIOCSRASYNCMAP): %m(%d)", errno); } - - x = get_flags(); - x = !accomp? x | SC_REJ_COMP_AC: x &~ SC_REJ_COMP_AC; - set_flags (x); } /******************************************************************** @@ -933,7 +1071,7 @@ int ccp_test (int unit, u_char *opt_ptr, int opt_len, int for_transmit) data.length = opt_len; data.transmit = for_transmit; - if (ioctl(ppp_fd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0) + if (ioctl(ppp_dev_fd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0) return 1; return (errno == ENOBUFS)? 0: -1; @@ -947,10 +1085,10 @@ int ccp_test (int unit, u_char *opt_ptr, int opt_len, int for_transmit) void ccp_flags_set (int unit, int isopen, int isup) { if (still_ppp()) { - int x = get_flags(); + int x = get_flags(ppp_dev_fd); x = isopen? x | SC_CCP_OPEN : x &~ SC_CCP_OPEN; x = isup? x | SC_CCP_UP : x &~ SC_CCP_UP; - set_flags (x); + set_flags (ppp_dev_fd, x); } } @@ -963,7 +1101,7 @@ get_idle_time(u, ip) int u; struct ppp_idle *ip; { - return ioctl(ppp_fd, PPPIOCGIDLE, ip) >= 0; + return ioctl(ppp_dev_fd, PPPIOCGIDLE, ip) >= 0; } /******************************************************************** @@ -999,72 +1137,60 @@ get_ppp_stats(u, stats) int ccp_fatal_error (int unit) { - int x = get_flags(); + int x = get_flags(ppp_dev_fd); return x & SC_DC_FERROR; } -/* - * path_to_route - determine the path to the proc file system data - */ -#define ROUTE_MAX_COLS 12 -FILE *route_fd = (FILE *) 0; -static char route_buffer [512]; -static int route_dev_col, route_dest_col, route_gw_col; -static int route_flags_col, route_mask_col; -static int route_num_cols; - -static char *path_to_route (void); -static int open_route_table (void); -static void close_route_table (void); -static int read_route_table (struct rtentry *rt); - /******************************************************************** * * path_to_procfs - find the path to the proc file system mount point */ +static char proc_path[MAXPATHLEN]; +static int proc_path_len; -static int path_to_procfs (const char *tail) +static char *path_to_procfs(const char *tail) { struct mntent *mntent; FILE *fp; - fp = fopen(MOUNTED, "r"); - if (fp == NULL) { + if (proc_path_len == 0) { /* Default the mount location of /proc */ - strlcpy (route_buffer, "/proc", sizeof (route_buffer)); - strlcat (route_buffer, tail, sizeof(route_buffer)); - return 1; + strlcpy (proc_path, "/proc", sizeof(proc_path)); + proc_path_len = 5; + fp = fopen(MOUNTED, "r"); + if (fp != NULL) { + while ((mntent = getmntent(fp)) != NULL) { + if (strcmp(mntent->mnt_type, MNTTYPE_IGNORE) == 0) + continue; + if (strcmp(mntent->mnt_type, "proc") == 0) { + strlcpy(proc_path, mntent->mnt_dir, sizeof(proc_path)); + proc_path_len = strlen(proc_path); + break; + } + } + fclose (fp); + } } - while ((mntent = getmntent(fp)) != NULL) { - if (strcmp(mntent->mnt_type, MNTTYPE_IGNORE) == 0) - continue; - if (strcmp(mntent->mnt_type, "proc") == 0) - break; - } - fclose (fp); - if (mntent == 0) - return 0; - - strlcpy(route_buffer, mntent->mnt_dir, sizeof (route_buffer)); - strlcat (route_buffer, tail, sizeof(route_buffer)); - return 1; + strlcpy(proc_path + proc_path_len, tail, + sizeof(proc_path) - proc_path_len); + return proc_path; } -/******************************************************************** - * - * path_to_route - find the path to the route tables in the proc file system +/* + * /proc/net/route parsing stuff. */ +#define ROUTE_MAX_COLS 12 +FILE *route_fd = (FILE *) 0; +static char route_buffer[512]; +static int route_dev_col, route_dest_col, route_gw_col; +static int route_flags_col, route_mask_col; +static int route_num_cols; -static char *path_to_route (void) -{ - if (!path_to_procfs("/net/route")) { - error("proc file system not mounted"); - return 0; - } - return (route_buffer); -} +static int open_route_table (void); +static void close_route_table (void); +static int read_route_table (struct rtentry *rt); /******************************************************************** * @@ -1091,13 +1217,10 @@ static int open_route_table (void) close_route_table(); - path = path_to_route(); - if (path == NULL) - return 0; - + path = path_to_procfs("/net/route"); route_fd = fopen (path, "r"); if (route_fd == NULL) { - error("can't open %s: %m (%d)", path, errno); + error("can't open routing table %s: %m", path); return 0; } @@ -1157,16 +1280,12 @@ static int read_route_table(struct rtentry *rt) cols[col] = strtok(p, route_delims); if (cols[col] == NULL) return 0; /* didn't get enough columns */ + p = NULL; } - ((struct sockaddr_in *) &rt->rt_dst)->sin_addr.s_addr = - strtoul(cols[route_dest_col], NULL, 16); - - ((struct sockaddr_in *) &rt->rt_gateway)->sin_addr.s_addr = - strtoul(cols[route_gw_col], NULL, 16); - - ((struct sockaddr_in *) &rt->rt_genmask)->sin_addr.s_addr = - strtoul(cols[route_mask_col], NULL, 16); + SIN_ADDR(rt->rt_dst) = strtoul(cols[route_dest_col], NULL, 16); + SIN_ADDR(rt->rt_gateway) = strtoul(cols[route_gw_col], NULL, 16); + SIN_ADDR(rt->rt_genmask) = strtoul(cols[route_mask_col], NULL, 16); rt->rt_flags = (short) strtoul(cols[route_flags_col], NULL, 16); rt->rt_dev = cols[route_dev_col]; @@ -1190,7 +1309,9 @@ static int defaultroute_exists (struct rtentry *rt) if ((rt->rt_flags & RTF_UP) == 0) continue; - if (((struct sockaddr_in *) (&rt->rt_dst))->sin_addr.s_addr == 0L) { + if (kernel_version > KVERSION(2,1,0) && SIN_ADDR(rt->rt_genmask) != 0) + continue; + if (SIN_ADDR(rt->rt_dst) == 0L) { result = 1; break; } @@ -1218,8 +1339,7 @@ int have_route_to(u_int32_t addr) while (read_route_table(&rt)) { if ((rt.rt_flags & RTF_UP) == 0 || strcmp(rt.rt_dev, ifname) == 0) continue; - if ((addr & ((struct sockaddr_in *)&rt.rt_genmask)->sin_addr.s_addr) - == ((struct sockaddr_in *)&rt.rt_dst)->sin_addr.s_addr) { + if ((addr & SIN_ADDR(rt.rt_genmask)) == SIN_ADDR(rt.rt_dst)) { result = 1; break; } @@ -1239,10 +1359,9 @@ int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway) struct rtentry rt; if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) { - struct in_addr old_gateway = - ((struct sockaddr_in *) (&rt.rt_gateway))-> sin_addr; + u_int32_t old_gateway = SIN_ADDR(rt.rt_gateway); - if (old_gateway.s_addr != gateway) + if (old_gateway != gateway) error("not replacing existing default route to %s [%I]", rt.rt_dev, old_gateway); return 0; @@ -1254,12 +1373,12 @@ int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway) if (kernel_version > KVERSION(2,1,0)) { SET_SA_FAMILY (rt.rt_genmask, AF_INET); - ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = 0L; + SIN_ADDR(rt.rt_genmask) = 0L; } - ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway; + SIN_ADDR(rt.rt_gateway) = gateway; - rt.rt_flags = RTF_UP | RTF_GATEWAY | RTF_DEFAULT; + rt.rt_flags = RTF_UP | RTF_GATEWAY; if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) { if ( ! ok_error ( errno )) error("default route ioctl(SIOCADDRT): %m(%d)", errno); @@ -1287,12 +1406,12 @@ int cifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway) if (kernel_version > KVERSION(2,1,0)) { SET_SA_FAMILY (rt.rt_genmask, AF_INET); - ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = 0L; + SIN_ADDR(rt.rt_genmask) = 0L; } - ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway; + SIN_ADDR(rt.rt_gateway) = gateway; - rt.rt_flags = RTF_UP | RTF_GATEWAY | RTF_DEFAULT; + rt.rt_flags = RTF_UP | RTF_GATEWAY; if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) { if (still_ppp()) { if ( ! ok_error ( errno )) @@ -1312,12 +1431,13 @@ int cifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway) int sifproxyarp (int unit, u_int32_t his_adr) { struct arpreq arpreq; + char *forw_path; if (has_proxy_arp == 0) { 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; + SIN_ADDR(arpreq.arp_pa) = his_adr; arpreq.arp_flags = ATF_PERM | ATF_PUBL; /* * Get the hardware address of an interface on the same subnet @@ -1337,6 +1457,18 @@ int sifproxyarp (int unit, u_int32_t his_adr) } proxy_arp_addr = his_adr; has_proxy_arp = 1; + + if (tune_kernel) { + forw_path = path_to_procfs("/sys/net/ipv4/ip_forward"); + if (forw_path != 0) { + int fd = open(forw_path, O_WRONLY); + if (fd >= 0) { + if (write(fd, "1", 1) != 1) + error("Couldn't enable IP forwarding: %m"); + close(fd); + } + } + } } return 1; @@ -1355,7 +1487,7 @@ int cifproxyarp (int unit, u_int32_t his_adr) has_proxy_arp = 0; 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; + SIN_ADDR(arpreq.arp_pa) = his_adr; arpreq.arp_flags = ATF_PERM | ATF_PUBL; strlcpy(arpreq.arp_dev, proxy_arp_dev, sizeof(arpreq.arp_dev)); @@ -1380,6 +1512,7 @@ static int get_ether_addr (u_int32_t ipaddr, { struct ifreq *ifr, *ifend; u_int32_t ina, mask; + char *aliasp; struct ifreq ifreq; struct ifconf ifc; struct ifreq ifs[MAX_IFS]; @@ -1401,7 +1534,7 @@ static int get_ether_addr (u_int32_t ipaddr, ifend = ifs + (ifc.ifc_len / sizeof(struct ifreq)); for (ifr = ifc.ifc_req; ifr < ifend; ifr++) { if (ifr->ifr_addr.sa_family == AF_INET) { - ina = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr.s_addr; + ina = SIN_ADDR(ifr->ifr_addr); strlcpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name)); SYSDEBUG ((LOG_DEBUG, "proxy arp: examining interface %s", ifreq.ifr_name)); @@ -1420,7 +1553,7 @@ static int get_ether_addr (u_int32_t ipaddr, if (ioctl(sock_fd, SIOCGIFNETMASK, &ifreq) < 0) continue; - mask = ((struct sockaddr_in *) &ifreq.ifr_addr)->sin_addr.s_addr; + mask = SIN_ADDR(ifreq.ifr_addr); SYSDEBUG ((LOG_DEBUG, "proxy arp: interface addr %s mask %lx", ip_ntoa(ina), ntohl(mask))); @@ -1434,6 +1567,12 @@ static int get_ether_addr (u_int32_t ipaddr, return 0; strlcpy(name, ifreq.ifr_name, namelen); + + /* trim off the :1 in eth0:1 */ + aliasp = strchr(name, ':'); + if (aliasp != 0) + *aliasp = 0; + info("found interface %s for proxy arp", name); /* * Now get the hardware address. @@ -1507,7 +1646,7 @@ u_int32_t GetMask (u_int32_t addr) */ if (ifr->ifr_addr.sa_family != AF_INET) continue; - ina = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr.s_addr; + ina = SIN_ADDR(ifr->ifr_addr); if (((ntohl(ina) ^ addr) & nmask) != 0) continue; /* @@ -1524,7 +1663,7 @@ u_int32_t GetMask (u_int32_t addr) */ if (ioctl(sock_fd, SIOCGIFNETMASK, &ifreq) < 0) continue; - mask |= ((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr.s_addr; + mask |= SIN_ADDR(ifreq.ifr_addr); break; } return mask; @@ -1604,10 +1743,11 @@ ppp_registered(void) int ppp_available(void) { - int s, ok; + int s, ok, fd; struct ifreq ifr; int size; int my_version, my_modification, my_patch; + int osmaj, osmin, ospatch; no_ppp_msg = "This system lacks kernel support for PPP. This could be because\n" @@ -1617,6 +1757,42 @@ int ppp_available(void) "ppp.o exists in /lib/modules/`uname -r`/net.\n" "See README.linux file in the ppp distribution for more details.\n"; + /* get the kernel version now, since we are called before sys_init */ + uname(&utsname); + osmaj = osmin = ospatch = 0; + sscanf(utsname.release, "%d.%d.%d", &osmaj, &osmin, &ospatch); + kernel_version = KVERSION(osmaj, osmin, ospatch); + + if (kernel_version >= KVERSION(2,3,13)) { + fd = open("/dev/ppp", O_RDWR); +#if 0 + if (fd < 0 && errno == ENOENT) { + /* try making it and see if that helps. */ + if (mknod("/dev/ppp", S_IFCHR | S_IRUSR | S_IWUSR, + makedev(108, 0)) >= 0) { + fd = open("/dev/ppp", O_RDWR); + if (fd >= 0) + info("Created /dev/ppp device node"); + else + unlink("/dev/ppp"); /* didn't work, undo the mknod */ + } else if (errno == EEXIST) { + fd = open("/dev/ppp", O_RDWR); + } + } +#endif /* 0 */ + if (fd >= 0) { + new_style_driver = 1; + + /* XXX should get from driver */ + driver_version = 2; + driver_modification = 4; + driver_patch = 0; + close(fd); + return 1; + } + return 0; + } + /* * Open a socket for doing the ioctl operations. */ @@ -1707,9 +1883,12 @@ int ppp_available(void) void logwtmp (const char *line, const char *name, const char *host) { - int wtmp; struct utmp ut, *utp; pid_t mypid = getpid(); +#if __GLIBC__ < 2 + int wtmp; +#endif + /* * Update the signon database for users. * Christoph Lameter: Copied from poeigl-1.36 Jan 3, 1996 @@ -1757,164 +1936,24 @@ void logwtmp (const char *line, const char *name, const char *host) /* * Update the wtmp file. */ +#if __GLIBC__ >= 2 + updwtmp(_PATH_WTMP, &ut); +#else wtmp = open(_PATH_WTMP, O_APPEND|O_WRONLY); if (wtmp >= 0) { flock(wtmp, LOCK_EX); - /* we really should check for error on the write for a full disk! */ - write (wtmp, (char *)&ut, sizeof(ut)); - close (wtmp); + if (write (wtmp, (char *)&ut, sizeof(ut)) != sizeof(ut)) + warn("error writing %s: %m", _PATH_WTMP); flock(wtmp, LOCK_UN); - } -} - -#if 0 -/******************************************************************** - * Code for locking/unlocking the serial device. - * This code is derived from chat.c. - */ -#ifndef LOCK_PREFIX -#define LOCK_PREFIX "/var/lock/LCK.." -#endif - -static char *lock_file; - -/* - * lock - create a lock file for the named device - */ - -int lock (char *dev) -{ -#ifdef LOCKLIB - int result; - lock_file = strdup(dev); - if (lock_file == NULL) - novm("lock file name"); - result = mklock (dev, (void *) 0); - - if (result > 0) { - notice("Device %s is locked by pid %d", dev, result); - free (lock_file); - lock_file = NULL; - result = -1; - } - else { - if (result < 0) { - error("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(); - char *p; - size_t l; - - p = strrchr(dev, '/'); - if (p != NULL) - dev = ++p; - - l = strlen(LOCK_PREFIX) + strlen(dev) + 1; - lock_file = malloc(l); - if (lock_file == NULL) - novm("lock file name"); - - slprintf(lock_file, l, "%s%s", LOCK_PREFIX, dev); -/* - * Attempt to create the lock file at this point. - */ - while (1) { - fd = open(lock_file, O_EXCL | O_CREAT | O_RDWR, 0644); - if (fd >= 0) { - pid = getpid(); -#ifndef PID_BINARY - slprintf(hdb_lock_buffer, sizeof(hdb_lock_buffer), "%010d\n", pid); - write (fd, hdb_lock_buffer, 11); -#else - write(fd, &pid, sizeof (pid)); -#endif - close(fd); - return 0; - } -/* - * If the file exists then check to see if the pid is stale - */ - if (errno == EEXIST) { - fd = open(lock_file, O_RDONLY, 0); - if (fd < 0) { - if (errno == ENOENT) /* This is just a timing problem. */ - continue; - break; - } - - /* Read the lock file to find out who has the device locked */ - n = read (fd, hdb_lock_buffer, 11); - close (fd); - if (n < 0) { - error("Can't read pid from lock file %s", lock_file); - break; - } - - /* See the process still exists. */ - if (n > 0) { -#ifndef PID_BINARY - hdb_lock_buffer[n] = '\0'; - sscanf (hdb_lock_buffer, " %d", &pid); -#else - pid = ((int *) hdb_lock_buffer)[0]; -#endif - if (pid == 0 || pid == getpid() - || (kill(pid, 0) == -1 && errno == ESRCH)) - n = 0; - } - - /* If the process does not exist then try to remove the lock */ - if (n == 0 && unlink (lock_file) == 0) { - notice("Removed stale lock on %s (pid %d)", - dev, pid); - continue; - } - - notice("Device %s is locked by pid %d", dev, pid); - break; - } - - error("Can't create lock file %s: %m(%d)", lock_file, errno); - break; + close (wtmp); } - - free(lock_file); - lock_file = NULL; - return -1; #endif } -/******************************************************************** - * - * unlock - remove our lockfile - */ - -void unlock(void) -{ - if (lock_file) { -#ifdef LOCKLIB - (void) rmlock (lock_file, (void *) 0); -#else - unlink(lock_file); -#endif - free(lock_file); - lock_file = NULL; - } -} -#endif - /******************************************************************** * * sifvjcomp - config tcp header compression @@ -1922,10 +1961,10 @@ void unlock(void) int sifvjcomp (int u, int vjcomp, int cidcomp, int maxcid) { - u_int x = get_flags(); + u_int x = get_flags(ppp_dev_fd); if (vjcomp) { - if (ioctl (ppp_fd, PPPIOCSMAXCID, (caddr_t) &maxcid) < 0) { + if (ioctl (ppp_dev_fd, PPPIOCSMAXCID, (caddr_t) &maxcid) < 0) { if (! ok_error (errno)) error("ioctl(PPPIOCSMAXCID): %m(%d)", errno); vjcomp = 0; @@ -1934,7 +1973,7 @@ int sifvjcomp (int u, int vjcomp, int cidcomp, int maxcid) x = vjcomp ? x | SC_COMP_TCP : x &~ SC_COMP_TCP; x = cidcomp ? x & ~SC_NO_TCP_CCID : x | SC_NO_TCP_CCID; - set_flags (x); + set_flags (ppp_dev_fd, x); return 1; } @@ -1944,7 +1983,7 @@ int sifvjcomp (int u, int vjcomp, int cidcomp, int maxcid) * sifup - Config the interface up and enable IP packets to pass. */ -int sifup (int u) +int sifup(int u) { struct ifreq ifr; @@ -1962,20 +2001,23 @@ int sifup (int u) error("ioctl(SIOCSIFFLAGS): %m(%d)", errno); return 0; } - if_is_up = 1; + if_is_up++; + return 1; } /******************************************************************** * - * sifdown - Config the interface down and disable IP. + * sifdown - Disable the indicated protocol and config the interface + * down if there are no remaining protocols. */ int sifdown (int u) { struct ifreq ifr; - if_is_up = 0; + if (if_is_up && --if_is_up > 0) + return 1; memset (&ifr, '\0', sizeof (ifr)); strlcpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); @@ -2017,7 +2059,7 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr, /* * Set our IP address */ - ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = our_adr; + SIN_ADDR(ifr.ifr_addr) = our_adr; if (ioctl(sock_fd, SIOCSIFADDR, (caddr_t) &ifr) < 0) { if (errno != EEXIST) { if (! ok_error (errno)) @@ -2031,7 +2073,7 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr, /* * Set the gateway address */ - ((struct sockaddr_in *) &ifr.ifr_dstaddr)->sin_addr.s_addr = his_adr; + SIN_ADDR(ifr.ifr_dstaddr) = his_adr; if (ioctl(sock_fd, SIOCSIFDSTADDR, (caddr_t) &ifr) < 0) { if (! ok_error (errno)) error("ioctl(SIOCSIFDSTADDR): %m(%d)", errno); @@ -2044,7 +2086,7 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr, if (kernel_version >= KVERSION(2,1,16)) net_mask = ~0L; if (net_mask != 0) { - ((struct sockaddr_in *) &ifr.ifr_netmask)->sin_addr.s_addr = net_mask; + SIN_ADDR(ifr.ifr_netmask) = net_mask; if (ioctl(sock_fd, SIOCSIFNETMASK, (caddr_t) &ifr) < 0) { if (! ok_error (errno)) error("ioctl(SIOCSIFNETMASK): %m(%d)", errno); @@ -2059,13 +2101,13 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr, SET_SA_FAMILY (rt.rt_gateway, AF_INET); 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; + SIN_ADDR(rt.rt_gateway) = 0L; + SIN_ADDR(rt.rt_dst) = his_adr; rt.rt_flags = RTF_UP | RTF_HOST; if (kernel_version > KVERSION(2,1,0)) { SET_SA_FAMILY (rt.rt_genmask, AF_INET); - ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = -1L; + SIN_ADDR(rt.rt_genmask) = -1L; } if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) { @@ -2074,6 +2116,24 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr, return (0); } } + + /* set ip_dynaddr in demand mode if address changes */ + if (demand && tune_kernel && !dynaddr_set + && our_old_addr && our_old_addr != our_adr) { + /* set ip_dynaddr if possible */ + char *path; + int fd; + + path = path_to_procfs("/sys/net/ipv4/ip_dynaddr"); + if (path != 0 && (fd = open(path, O_WRONLY)) >= 0) { + if (write(fd, "1", 1) != 1) + error("Couldn't enable dynamic IP addressing: %m"); + close(fd); + } + dynaddr_set = 1; /* only 1 attempt */ + } + our_old_addr = 0; + return 1; } @@ -2085,25 +2145,26 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr, int cifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr) { - struct rtentry rt; + struct ifreq ifr; if (kernel_version < KVERSION(2,1,16)) { /* * Delete the route through the device */ + struct rtentry rt; 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; - ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = 0; - ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr = his_adr; + SIN_ADDR(rt.rt_gateway) = 0; + SIN_ADDR(rt.rt_dst) = his_adr; rt.rt_flags = RTF_UP | RTF_HOST; if (kernel_version > KVERSION(2,1,0)) { SET_SA_FAMILY (rt.rt_genmask, AF_INET); - ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = -1L; + SIN_ADDR(rt.rt_genmask) = -1L; } if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) { @@ -2112,12 +2173,108 @@ int cifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr) return (0); } } + + /* This way it is possible to have an IPX-only or IPv6-only interface */ + memset(&ifr, 0, sizeof(ifr)); + SET_SA_FAMILY(ifr.ifr_addr, AF_INET); + strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + + if (ioctl(sock_fd, SIOCSIFADDR, (caddr_t) &ifr) < 0) { + if (! ok_error (errno)) { + error("ioctl(SIOCSIFADDR): %m(%d)", errno); + return 0; + } + } + + our_old_addr = our_adr; + + return 1; +} + +#ifdef INET6 +/******************************************************************** + * + * sif6addr - Config the interface with an IPv6 link-local address + */ +int sif6addr (int unit, eui64_t our_eui64, eui64_t his_eui64) +{ + struct in6_ifreq ifr6; + struct ifreq ifr; + struct in6_rtmsg rt6; + + memset(&ifr, 0, sizeof (ifr)); + strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + if (ioctl(sock6_fd, SIOCGIFINDEX, (caddr_t) &ifr) < 0) { + error("sif6addr: ioctl(SIOCGIFINDEX): %m (%d)", errno); + return 0; + } + + /* Local interface */ + memset(&ifr6, 0, sizeof(ifr6)); + IN6_LLADDR_FROM_EUI64(ifr6.ifr6_addr, our_eui64); + ifr6.ifr6_ifindex = ifr.ifr_ifindex; + ifr6.ifr6_prefixlen = 10; + + if (ioctl(sock6_fd, SIOCSIFADDR, &ifr6) < 0) { + error("sif6addr: ioctl(SIOCSIFADDR): %m (%d)", errno); + return 0; + } + + /* Route to remote host */ + memset(&rt6, 0, sizeof(rt6)); + IN6_LLADDR_FROM_EUI64(rt6.rtmsg_dst, his_eui64); + rt6.rtmsg_flags = RTF_UP; + rt6.rtmsg_dst_len = 10; + rt6.rtmsg_ifindex = ifr.ifr_ifindex; + rt6.rtmsg_metric = 1; + + if (ioctl(sock6_fd, SIOCADDRT, &rt6) < 0) { + error("sif6addr: ioctl(SIOCADDRT): %m (%d)", errno); + return 0; + } + + return 1; +} + + +/******************************************************************** + * + * cif6addr - Remove IPv6 address from interface + */ +int cif6addr (int unit, eui64_t our_eui64, eui64_t his_eui64) +{ + struct ifreq ifr; + struct in6_ifreq ifr6; + + memset(&ifr, 0, sizeof(ifr)); + strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + if (ioctl(sock6_fd, SIOCGIFINDEX, (caddr_t) &ifr) < 0) { + error("cif6addr: ioctl(SIOCGIFINDEX): %m (%d)", errno); + return 0; + } + + memset(&ifr6, 0, sizeof(ifr6)); + IN6_LLADDR_FROM_EUI64(ifr6.ifr6_addr, our_eui64); + ifr6.ifr6_ifindex = ifr.ifr_ifindex; + ifr6.ifr6_prefixlen = 10; + + if (ioctl(sock6_fd, SIOCDIFADDR, &ifr6) < 0) { + if (errno != EADDRNOTAVAIL) { + if (! ok_error (errno)) + error("cif6addr: ioctl(SIOCDIFADDR): %m (%d)", errno); + } + else { + warn("cif6addr: ioctl(SIOCDIFADDR): No such address"); + } + return (0); + } return 1; } +#endif /* INET6 */ /* * get_pty - get a pty master/slave pair and chown the slave side - * to the uid given. Assumes slave_name points to >= 12 bytes of space. + * to the uid given. Assumes slave_name points to >= 16 bytes of space. */ int get_pty(master_fdp, slave_fdp, slave_name, uid) @@ -2126,31 +2283,56 @@ get_pty(master_fdp, slave_fdp, slave_name, uid) char *slave_name; int uid; { - int i, mfd, sfd; - char pty_name[12]; + int i, mfd, sfd = -1; + char pty_name[16]; struct termios tios; - sfd = -1; - for (i = 0; i < 64; ++i) { - slprintf(pty_name, sizeof(pty_name), "/dev/pty%c%x", - 'p' + i / 16, i % 16); - mfd = open(pty_name, O_RDWR, 0); - if (mfd >= 0) { - pty_name[5] = 't'; - sfd = open(pty_name, O_RDWR | O_NOCTTY, 0); - if (sfd >= 0) - break; - close(mfd); +#ifdef TIOCGPTN + /* + * Try the unix98 way first. + */ + mfd = open("/dev/ptmx", O_RDWR); + if (mfd >= 0) { + int ptn; + if (ioctl(mfd, TIOCGPTN, &ptn) >= 0) { + slprintf(pty_name, sizeof(pty_name), "/dev/pts/%d", ptn); + chmod(pty_name, S_IRUSR | S_IWUSR); +#ifdef TIOCSPTLCK + ptn = 0; + if (ioctl(mfd, TIOCSPTLCK, &ptn) < 0) + warn("Couldn't unlock pty slave %s: %m", pty_name); +#endif + if ((sfd = open(pty_name, O_RDWR | O_NOCTTY)) < 0) + warn("Couldn't open pty slave %s: %m", pty_name); } } +#endif /* TIOCGPTN */ + + if (sfd < 0) { + /* the old way - scan through the pty name space */ + for (i = 0; i < 64; ++i) { + slprintf(pty_name, sizeof(pty_name), "/dev/pty%c%x", + 'p' + i / 16, i % 16); + mfd = open(pty_name, O_RDWR, 0); + if (mfd >= 0) { + pty_name[5] = 't'; + sfd = open(pty_name, O_RDWR | O_NOCTTY, 0); + if (sfd >= 0) { + fchown(sfd, uid, -1); + fchmod(sfd, S_IRUSR | S_IWUSR); + break; + } + close(mfd); + } + } + } + if (sfd < 0) return 0; - strlcpy(slave_name, pty_name, 12); + strlcpy(slave_name, pty_name, 16); *master_fdp = mfd; *slave_fdp = sfd; - fchown(sfd, uid, -1); - fchmod(sfd, S_IRUSR | S_IWUSR); if (tcgetattr(sfd, &tios) == 0) { tios.c_cflag &= ~(CSIZE | CSTOPB | PARENB); tios.c_cflag |= CS8 | CREAD; @@ -2173,7 +2355,25 @@ get_pty(master_fdp, slave_fdp, slave_name, uid) int open_ppp_loopback(void) { - int flags; + int flags, x; + + looped = 1; + if (new_style_driver) { + /* allocate ourselves a ppp unit */ + ifunit = req_unit; + x = ioctl(ppp_dev_fd, PPPIOCNEWUNIT, &ifunit); + if (x < 0 && req_unit >= 0 && errno == EEXIST) { + warn("Couldn't allocate PPP unit %d as it is already in use"); + ifunit = -1; + x = ioctl(ppp_dev_fd, PPPIOCNEWUNIT, &ifunit); + } + if (x < 0) + fatal("Couldn't create PPP unit: %m"); + set_flags(ppp_dev_fd, SC_LOOP_TRAFFIC); + set_kdebugflag(kdebugflag); + ppp_fd = -1; + return ppp_dev_fd; + } if (!get_pty(&master_fd, &slave_fd, loop_name, 0)) fatal("No free pty for loopback"); @@ -2222,6 +2422,11 @@ open_ppp_loopback(void) void restore_loop(void) { + looped = 1; + if (new_style_driver) { + set_flags(ppp_dev_fd, get_flags(ppp_dev_fd) | SC_LOOP_TRAFFIC); + return; + } if (ppp_fd != slave_fd) { (void) ioctl(ppp_fd, TIOCSETD, &tty_disc); set_ppp_fd(slave_fd); @@ -2243,12 +2448,10 @@ sifnpmode(u, proto, mode) npi.protocol = proto; npi.mode = mode; - if (ioctl(ppp_fd, PPPIOCSNPMODE, (caddr_t) &npi) < 0) { - if (! ok_error (errno)) { + if (ioctl(ppp_dev_fd, PPPIOCSNPMODE, (caddr_t) &npi) < 0) { + if (! ok_error (errno)) error("ioctl(PPPIOCSNPMODE, %d, %d): %m (%d)", proto, mode, errno); - error("ppp_fd=%d slave_fd=%d\n", ppp_fd, slave_fd); - } return 0; } return 1; @@ -2347,32 +2550,6 @@ int cipxfaddr (int unit) return result; } -#if 0 -/* - * daemon - Detach us from controlling terminal session. - */ -int -daemon(nochdir, noclose) - int nochdir, noclose; -{ - int pid; - - if ((pid = fork()) < 0) - return -1; - if (pid != 0) - exit(0); /* parent dies */ - setsid(); - if (!nochdir) - chdir("/"); - if (!noclose) { - fclose(stdin); /* don't need stdin, stdout, stderr */ - fclose(stdout); - fclose(stderr); - } - return 0; -} -#endif - /* * Use the hostname as part of the random number seed. */ @@ -2400,10 +2577,12 @@ sys_check_options(void) /* * Disable the IPX protocol if the support is not present in the kernel. */ + char *path; + if (ipxcp_protent.enabled_flag) { struct stat stat_buf; - if (!path_to_procfs("/net/ipx_interface") - || lstat (route_buffer, &stat_buf) < 0) { + if ((path = path_to_procfs("/net/ipx_interface")) == 0 + || lstat(path, &stat_buf) < 0) { error("IPX support is not present in the kernel\n"); ipxcp_protent.enabled_flag = 0; } @@ -2415,5 +2594,9 @@ sys_check_options(void) driver_patch); return 0; } + if (multilink && !new_style_driver) { + option_error("multilink is not supported by the kernel driver"); + return 0; + } return 1; }