From: Paul Mackerras Date: Thu, 31 Dec 2020 01:17:27 +0000 (+1100) Subject: Merge pull request #103 from Low-power/solaris-mtu-fix X-Git-Tag: ppp-2.4.9~39 X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=b5599f6001d9b024b3a572ab62c92027d94f052f;hp=-c Merge pull request #103 from Low-power/solaris-mtu-fix Fix netif_set_mtu for Solaris --- b5599f6001d9b024b3a572ab62c92027d94f052f diff --combined pppd/sys-solaris.c index d96d23c,df9d9ac..6e925f9 --- a/pppd/sys-solaris.c +++ b/pppd/sys-solaris.c @@@ -85,6 -85,8 +85,6 @@@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: sys-solaris.c,v 1.16 2008/01/30 14:26:53 carlsonj Exp $" - #include #include #include @@@ -112,7 -114,6 +112,7 @@@ #include #include #include +#include #include #include #include @@@ -165,6 -166,7 +165,6 @@@ #define UDP6_DEV_NAME "/dev/udp6" #endif /* !defined(UDP6_DEV_NAME) && defined(SOL2) */ -static const char rcsid[] = RCSID; #if defined(SOL2) /* @@@ -187,12 -189,6 +187,12 @@@ static int ip6fd; /* IP file descripto static int ip6muxid = -1; /* Multiplexer file descriptor */ static int if6_is_up = 0; /* IPv6 interface has been marked up */ +#define IN6_SOCKADDR_FROM_EUI64(s, eui64) do { \ + (s)->sin6_family = AF_INET6; \ + (s)->sin6_addr.s6_addr32[0] = htonl(0xfe800000); \ + eui64_copy(eui64, (s)->sin6_addr.s6_addr32[2]); \ + } while(0) + #define _IN6_LLX_FROM_EUI64(l, s, eui64, as) do { \ s->sin6_addr.s6_addr32[0] = htonl(as); \ eui64_copy(eui64, s->sin6_addr.s6_addr32[2]); \ @@@ -202,20 -198,12 +202,20 @@@ l.lifr_addr = laddr; \ } while (0) +#define _IN6A_LLX_FROM_EUI64(s, eui64, as) do { \ + s->s6_addr32[0] = htonl(as); \ + eui64_copy(eui64, s->s6_addr32[2]); \ + } while (0) + #define IN6_LLADDR_FROM_EUI64(l, s, eui64) \ _IN6_LLX_FROM_EUI64(l, s, eui64, 0xfe800000) #define IN6_LLTOKEN_FROM_EUI64(l, s, eui64) \ _IN6_LLX_FROM_EUI64(l, s, eui64, 0) +#define IN6A_LLADDR_FROM_EUI64(s, eui64) \ + _IN6A_LLX_FROM_EUI64(s, eui64, 0xfe800000) + #endif /* defined(INET6) && defined(SOL2) */ #if defined(INET6) && defined(SOL2) @@@ -250,19 -238,18 +250,19 @@@ static int tty_npushed static int if_is_up; /* Interface has been marked up */ static u_int32_t remote_addr; /* IP address of peer */ static u_int32_t default_route_gateway; /* Gateway for default route added */ +static eui64_t default_route_gateway6; /* Gateway for default IPv6 route added */ static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */ /* Prototypes for procedures local to this file. */ -static int translate_speed __P((int)); -static int baud_rate_of __P((int)); -static int get_ether_addr __P((u_int32_t, struct sockaddr *)); -static int get_hw_addr __P((char *, u_int32_t, struct sockaddr *)); -static int get_hw_addr_dlpi __P((char *, struct sockaddr *)); -static int dlpi_attach __P((int, int)); -static int dlpi_info_req __P((int)); -static int dlpi_get_reply __P((int, union DL_primitives *, int, int)); -static int strioctl __P((int, int, void *, int, int)); +static int translate_speed(int); +static int baud_rate_of(int); +static int get_ether_addr(u_int32_t, struct sockaddr *); +static int get_hw_addr(char *, u_int32_t, struct sockaddr *); +static int get_hw_addr_dlpi(char *, struct sockaddr *); +static int dlpi_attach(int, int); +static int dlpi_info_req(int); +static int dlpi_get_reply(int, union DL_primitives *, int, int); +static int strioctl(int, int, void *, int, int); #ifdef SOL2 /* @@@ -300,7 -287,7 +300,7 @@@ sifppa(fd, ppa * NOTE: This is the lifreq version (Solaris 8 and above) */ char * -get_first_ethernet() +get_first_ethernet(void) { struct lifnum lifn; struct lifconf lifc; @@@ -394,7 -381,7 +394,7 @@@ * NOTE: This is the ifreq version (before Solaris 8). */ char * -get_first_ethernet() +get_first_ethernet(void) { struct ifconf ifc; struct ifreq *pifreq; @@@ -509,7 -496,9 +509,7 @@@ get_if_hwaddr(u_char *addr, char *if_na * be set in order to declare this as an IPv6 interface */ static int -slifname(fd, ppa) - int fd; - int ppa; +slifname(int fd, int ppa) { struct lifreq lifr; int ret; @@@ -581,7 -570,7 +581,7 @@@ ether_to_eui64(eui64_t *p_eui64 * sys_init - System-dependent initialization. */ void -sys_init() +sys_init(void) { int ifd, x; struct ifreq ifr; @@@ -781,7 -770,7 +781,7 @@@ * This should call die() because it's called from die(). */ void -sys_cleanup() +sys_cleanup(void) { #if defined(SOL2) struct ifreq ifr; @@@ -798,8 -787,6 +798,8 @@@ sifdown(0); if (default_route_gateway) cifdefaultroute(0, default_route_gateway, default_route_gateway); + if (default_route_gateway6.e32[0] != 0 || default_route_gateway6.e32[1] != 0) + cif6defaultroute(0, default_route_gateway6, default_route_gateway6); if (proxy_arp_addr) cifproxyarp(0, proxy_arp_addr); #if defined(SOL2) @@@ -855,7 -842,7 +855,7 @@@ * sys_close - Clean up in a child process before execing. */ void -sys_close() +sys_close(void) { close(ipfd); #if defined(INET6) && defined(SOL2) @@@ -869,7 -856,7 +869,7 @@@ * sys_check_options - check the options that the user specified */ int -sys_check_options() +sys_check_options(void) { return 1; } @@@ -879,7 -866,8 +879,7 @@@ * daemon - Detach us from controlling terminal session. */ int -daemon(nochdir, noclose) - int nochdir, noclose; +daemon(int nochdir, int noclose) { int pid; @@@ -903,7 -891,7 +903,7 @@@ * ppp_available - check whether the system has any ppp interfaces */ int -ppp_available() +ppp_available(void) { struct stat buf; @@@ -920,7 -908,7 +920,7 @@@ * no point of having the comp module be pushed on the stream. */ static int -any_compressions() +any_compressions(void) { if ((!lcp_wantoptions[0].neg_accompression) && (!lcp_wantoptions[0].neg_pcompression) && @@@ -935,7 -923,8 +935,7 @@@ * tty_establish_ppp - Turn the serial port into a ppp interface. */ int -tty_establish_ppp(fd) - int fd; +tty_establish_ppp(int fd) { int i; @@@ -994,7 -983,8 +994,7 @@@ * modules. This shouldn't call die() because it's called from die(). */ void -tty_disestablish_ppp(fd) - int fd; +tty_disestablish_ppp(int fd) { int i; @@@ -1030,7 -1020,7 +1030,7 @@@ * Check whether the link seems not to be 8-bit clean. */ void -clean_check() +clean_check(void) { int x; char *s; @@@ -1152,7 -1142,8 +1152,7 @@@ struct speed * Translate from bits/second to a speed_t. */ static int -translate_speed(bps) - int bps; +translate_speed(int bps) { struct speed *speedp; @@@ -1169,7 -1160,8 +1169,7 @@@ * Translate from a speed_t to bits/second. */ static int -baud_rate_of(speed) - int speed; +baud_rate_of(int speed) { struct speed *speedp; @@@ -1187,7 -1179,8 +1187,7 @@@ * regardless of whether the modem option was specified. */ void -set_up_tty(fd, local) - int fd, local; +set_up_tty(int fd, int local) { int speed; struct termios tios; @@@ -1282,7 -1275,8 +1282,7 @@@ * restore_tty - restore the terminal to the saved settings. */ void -restore_tty(fd) - int fd; +restore_tty(int fd) { if (restore_term) { if (!default_device) { @@@ -1314,7 -1308,8 +1314,7 @@@ * This is called from die(), so it shouldn't call die(). */ void -setdtr(fd, on) -int fd, on; +setdtr(int fd, int on) { int modembits = TIOCM_DTR; @@@ -1327,7 -1322,7 +1327,7 @@@ * to the ppp driver. */ int -open_ppp_loopback() +open_ppp_loopback(void) { return pppfd; } @@@ -1336,7 -1331,10 +1336,7 @@@ * output - Output PPP packet. */ void -output(unit, p, len) - int unit; - u_char *p; - int len; +output(int unit, u_char *p, int len) { struct strbuf data; int retries; @@@ -1367,7 -1365,8 +1367,7 @@@ * if timo is NULL). */ void -wait_input(timo) - struct timeval *timo; +wait_input(struct timeval *timo) { int t; @@@ -1379,7 -1378,8 +1379,7 @@@ /* * add_fd - add an fd to the set that wait_input waits for. */ -void add_fd(fd) - int fd; +void add_fd(int fd) { int n; @@@ -1397,7 -1397,8 +1397,7 @@@ /* * remove_fd - remove an fd from the set that wait_input waits for. */ -void remove_fd(fd) - int fd; +void remove_fd(int fd) { int n; @@@ -1418,7 -1419,8 +1418,7 @@@ * if timo is NULL). */ void -wait_loop_output(timo) - struct timeval *timo; +wait_loop_output(struct timeval *timo) { wait_input(timo); } @@@ -1428,7 -1430,8 +1428,7 @@@ * signal is received. */ void -wait_time(timo) - struct timeval *timo; +wait_time(struct timeval *timo) { int n; @@@ -1443,7 -1446,8 +1443,7 @@@ * read_packet - get a PPP packet from the serial device. */ int -read_packet(buf) - u_char *buf; +read_packet(u_char *buf) { struct strbuf ctrl, data; int flags, len; @@@ -1482,7 -1486,7 +1482,7 @@@ * Return value is 1 if we need to bring up the link, 0 otherwise. */ int -get_loop_output() +get_loop_output(void) { int len; int rv = 0; @@@ -1498,7 -1502,8 +1498,7 @@@ * netif_set_mtu - set the MTU on the PPP network interface. */ void -netif_set_mtu(unit, mtu) - int unit, mtu; +netif_set_mtu(int unit, int mtu) { struct ifreq ifr; #if defined(INET6) && defined(SOL2) @@@ -1508,7 -1513,7 +1508,7 @@@ memset(&ifr, 0, sizeof(ifr)); strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - ifr.ifr_metric = link_mtu; + ifr.ifr_metric = mtu; if (ioctl(ipfd, SIOCSIFMTU, &ifr) < 0) { error("Couldn't set IP MTU (%s): %m", ifr.ifr_name); } @@@ -1520,7 -1525,7 +1520,7 @@@ memset(&lifr, 0, sizeof(lifr)); strlcpy(lifr.lifr_name, ifname, sizeof(lifr.lifr_name)); - lifr.lifr_mtu = link_mtu; + lifr.lifr_mtu = mtu; if (ioctl(fd, SIOCSLIFMTU, &lifr) < 0) { close(fd); error("Couldn't set IPv6 MTU (%s): %m", ifr.ifr_name); @@@ -1529,32 -1534,15 +1529,32 @@@ #endif /* defined(INET6) && defined(SOL2) */ } + + +/* + * netif_get_mtu - get the MTU on the PPP network interface. + */ +int +netif_get_mtu(int unit) +{ + struct ifreq ifr; + + memset (&ifr, '\0', sizeof (ifr)); + strlcpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); + + if (ioctl(ipfd, SIOCGIFMTU, (caddr_t) &ifr) < 0) { + error("ioctl(SIOCGIFMTU): %m (line %d)", __LINE__); + return 0; + } + return ifr.ifr_mtu; +} + /* * tty_send_config - configure the transmit characteristics of * the ppp interface. */ void -tty_send_config(mtu, asyncmap, pcomp, accomp) - int mtu; - u_int32_t asyncmap; - int pcomp, accomp; +tty_send_config(int mtu, u_int32_t asyncmap, int pcomp, int accomp) { int cf[2]; @@@ -1583,7 -1571,8 +1583,7 @@@ * tty_set_xaccm - set the extended transmit ACCM for the interface. */ void -tty_set_xaccm(accm) - ext_accm accm; +tty_set_xaccm(ext_accm accm) { if (sync_serial) return; @@@ -1600,7 -1589,10 +1600,7 @@@ * the ppp interface. */ void -tty_recv_config(mru, asyncmap, pcomp, accomp) - int mru; - u_int32_t asyncmap; - int pcomp, accomp; +tty_recv_config(int mru, u_int32_t asyncmap, int pcomp, int accomp) { int cf[2]; @@@ -1630,7 -1622,9 +1630,7 @@@ * is acceptable for use. */ int -ccp_test(unit, opt_ptr, opt_len, for_transmit) - int unit, opt_len, for_transmit; - u_char *opt_ptr; +ccp_test(int unit, u_char *opt_ptr, int opt_len, int for_transmit) { if (strioctl(pppfd, (for_transmit? PPPIO_XCOMP: PPPIO_RCOMP), opt_ptr, opt_len, 0) >= 0) @@@ -1642,7 -1636,8 +1642,7 @@@ * ccp_flags_set - inform kernel about the current state of CCP. */ void -ccp_flags_set(unit, isopen, isup) - int unit, isopen, isup; +ccp_flags_set(int unit, int isopen, int isup) { int cf[2]; @@@ -1658,7 -1653,9 +1658,7 @@@ * get_idle_time - return how long the link has been idle. */ int -get_idle_time(u, ip) - int u; - struct ppp_idle *ip; +get_idle_time(int u, struct ppp_idle *ip) { return strioctl(pppfd, PPPIO_GIDLE, ip, 0, sizeof(struct ppp_idle)) >= 0; } @@@ -1667,7 -1664,9 +1667,7 @@@ * get_ppp_stats - return statistics for the link. */ int -get_ppp_stats(u, stats) - int u; - struct pppd_stats *stats; +get_ppp_stats(int u, struct pppd_stats *stats) { struct ppp_stats s; @@@ -1688,7 -1687,8 +1688,7 @@@ * set_filters - transfer the pass and active filters to the kernel. */ int -set_filters(pass, active) - struct bpf_program *pass, *active; +set_filters(struct bpf_program *pass, struct bpf_program *active) { int ret = 1; @@@ -1716,7 -1716,8 +1716,7 @@@ * 0 otherwise. This is necessary because of patent nonsense. */ int -ccp_fatal_error(unit) - int unit; +ccp_fatal_error(int unit) { int cf[2]; @@@ -1733,7 -1734,8 +1733,7 @@@ * sifvjcomp - config tcp header compression */ int -sifvjcomp(u, vjcomp, xcidcomp, xmaxcid) - int u, vjcomp, xcidcomp, xmaxcid; +sifvjcomp(int u, int vjcomp, int xcidcomp, int xmaxcid) { int cf[2]; char maxcid[2]; @@@ -1761,7 -1763,8 +1761,7 @@@ * sifup - Config the interface up and enable IP packets to pass. */ int -sifup(u) - int u; +sifup(int u) { struct ifreq ifr; @@@ -1783,7 -1786,8 +1783,7 @@@ * sifdown - Config the interface down and disable IP. */ int -sifdown(u) - int u; +sifdown(int u) { struct ifreq ifr; @@@ -1807,7 -1811,10 +1807,7 @@@ * sifnpmode - Set the mode for handling packets for a given NP. */ int -sifnpmode(u, proto, mode) - int u; - int proto; - enum NPmode mode; +sifnpmode(int u, int proto, enum NPmode mode) { int npi[2]; @@@ -1825,7 -1832,8 +1825,7 @@@ * sif6up - Config the IPv6 interface up and enable IPv6 packets to pass. */ int -sif6up(u) - int u; +sif6up(int u) { struct lifreq lifr; int fd; @@@ -1858,7 -1866,8 +1858,7 @@@ * sifdown - Config the IPv6 interface down and disable IPv6. */ int -sif6down(u) - int u; +sif6down(int u) { struct lifreq lifr; int fd; @@@ -1890,7 -1899,9 +1890,7 @@@ * sif6addr - Config the interface with an IPv6 link-local address */ int -sif6addr(u, o, h) - int u; - eui64_t o, h; +sif6addr(int u, eui64_t o, eui64_t h) { struct lifreq lifr; struct sockaddr_storage laddr; @@@ -1939,71 -1950,13 +1939,71 @@@ * cif6addr - Remove the IPv6 address from interface */ int -cif6addr(u, o, h) - int u; - eui64_t o, h; +cif6addr(int u, eui64_t o, eui64_t h) { return 1; } +/* + * sif6defaultroute - assign a default route through the address given. + */ +int +sif6defaultroute(int u, eui64_t l, eui64_t g) +{ + struct { + struct rt_msghdr rtm; + struct sockaddr_in6 dst; + struct sockaddr_in6 gw; + } rmsg; + static int seq; + int rtsock; + +#if defined(__USLC__) + g = l; /* use the local address as gateway */ +#endif + memset(&rmsg, 0, sizeof(rmsg)); + + rmsg.rtm.rtm_msglen = sizeof (rmsg); + rmsg.rtm.rtm_version = RTM_VERSION; + rmsg.rtm.rtm_type = RTM_ADD; + rmsg.rtm.rtm_flags = RTF_GATEWAY; + rmsg.rtm.rtm_addrs = RTA_DST | RTA_GATEWAY; + rmsg.rtm.rtm_pid = getpid(); + rmsg.rtm.rtm_seq = seq++; + + rmsg.dst.sin6_family = AF_INET6; + + rmsg.gw.sin6_family = AF_INET6; + IN6_SOCKADDR_FROM_EUI64(&rmsg.gw, g); + + rtsock = socket(PF_ROUTE, SOCK_RAW, 0); + + if (rtsock < 0) { + error("Can't add default route: %m"); + return 0; + } + + if (write(rtsock, &rmsg, sizeof(rmsg)) < 0) + error("Can't add default route: %m"); + + close(rtsock); + + default_route_gateway6 = g; + return 1; +} + +/* + * cif6defaultroute - delete a default route through the address given. + */ +int +cif6defaultroute(int u, eui64_t l, eui64_t g) +{ + /* No need to do this on Solaris; the kernel deletes the + route when the interface goes down. */ + memset(&default_route_gateway6, 0, sizeof(default_route_gateway6)); + return 1; +} + #endif /* defined(SOL2) && defined(INET6) */ @@@ -2013,7 -1966,9 +2013,7 @@@ * sifaddr - Config the interface IP addresses and netmask. */ int -sifaddr(u, o, h, m) - int u; - u_int32_t o, h, m; +sifaddr(int u, u_int32_t o, u_int32_t h, u_int32_t m) { struct ifreq ifr; int ret = 1; @@@ -2061,7 -2016,9 +2061,7 @@@ * through the interface if possible. */ int -cifaddr(u, o, h) - int u; - u_int32_t o, h; +cifaddr(int u, u_int32_t o, u_int32_t h) { #if defined(__USLC__) /* was: #if 0 */ cifroute(unit, ouraddr, hisaddr); @@@ -2082,7 -2039,9 +2082,7 @@@ * sifdefaultroute - assign a default route through the address given. */ int -sifdefaultroute(u, l, g) - int u; - u_int32_t l, g; +sifdefaultroute(int u, u_int32_t l, u_int32_t g) { struct rtentry rt; @@@ -2109,7 -2068,9 +2109,7 @@@ * cifdefaultroute - delete a default route through the address given. */ int -cifdefaultroute(u, l, g) - int u; - u_int32_t l, g; +cifdefaultroute(int u, u_int32_t l, u_int32_t g) { struct rtentry rt; @@@ -2136,7 -2097,9 +2136,7 @@@ * sifproxyarp - Make a proxy ARP entry for the peer. */ int -sifproxyarp(unit, hisaddr) - int unit; - u_int32_t hisaddr; +sifproxyarp(int unit, u_int32_t hisaddr) { struct arpreq arpreq; @@@ -2160,7 -2123,9 +2160,7 @@@ * cifproxyarp - Delete the proxy ARP entry for the peer. */ int -cifproxyarp(unit, hisaddr) - int unit; - u_int32_t hisaddr; +cifproxyarp(int unit, u_int32_t hisaddr) { struct arpreq arpreq; @@@ -2183,7 -2148,9 +2183,7 @@@ #define MAX_IFS 32 static int -get_ether_addr(ipaddr, hwaddr) - u_int32_t ipaddr; - struct sockaddr *hwaddr; +get_ether_addr(u_int32_t ipaddr, struct sockaddr *hwaddr) { struct ifreq *ifr, *ifend, ifreq; int nif; @@@ -2252,7 -2219,9 +2252,7 @@@ * get_hw_addr_dlpi - obtain the hardware address using DLPI */ static int -get_hw_addr_dlpi(name, hwaddr) - char *name; - struct sockaddr *hwaddr; +get_hw_addr_dlpi(char *name, struct sockaddr *hwaddr) { char *q; int unit, iffd, adrlen; @@@ -2309,7 -2278,10 +2309,7 @@@ * get_hw_addr - obtain the hardware address for a named interface. */ static int -get_hw_addr(name, ina, hwaddr) - char *name; - u_int32_t ina; - struct sockaddr *hwaddr; +get_hw_addr(char *name, u_int32_t ina, struct sockaddr *hwaddr) { /* New way - get the address by doing an arp request. */ int s; @@@ -2332,7 -2304,8 +2332,7 @@@ } static int -dlpi_attach(fd, ppa) - int fd, ppa; +dlpi_attach(int fd, int ppa) { dl_attach_req_t req; struct strbuf buf; @@@ -2345,7 -2318,8 +2345,7 @@@ } static int -dlpi_info_req(fd) - int fd; +dlpi_info_req(int fd) { dl_info_req_t req; struct strbuf buf; @@@ -2357,7 -2331,9 +2357,7 @@@ } static int -dlpi_get_reply(fd, reply, expected_prim, maxlen) - union DL_primitives *reply; - int fd, expected_prim, maxlen; +dlpi_get_reply(int fd, union DL_primitives *reply, int expected_prim, maxlen) { struct strbuf buf; int flags, n; @@@ -2370,7 -2346,7 +2370,7 @@@ pfd.events = POLLIN | POLLPRI; do { n = poll(&pfd, 1, 1000); - } while (n == -1 && errno == EINTR); + } while (n == -1 && errno == EINTR && !got_sigterm); if (n <= 0) return -1; @@@ -2415,7 -2391,8 +2415,7 @@@ * user-specified netmask. */ u_int32_t -GetMask(addr) - u_int32_t addr; +GetMask(u_int32_t addr) { u_int32_t mask, nmask, ina; struct ifreq *ifr, *ifend, ifreq; @@@ -2483,7 -2460,8 +2483,7 @@@ * logwtmp - write an accounting record to the /var/adm/wtmp file. */ void -logwtmp(line, name, host) - const char *line, *name, *host; +logwtmp(const char *line, const char *name, const char *host) { static struct utmpx utmpx; @@@ -2510,7 -2488,7 +2510,7 @@@ * get_host_seed - return the serial number of this machine. */ int -get_host_seed() +get_host_seed(void) { char buf[32]; @@@ -2522,7 -2500,9 +2522,7 @@@ } static int -strioctl(fd, cmd, ptr, ilen, olen) - int fd, cmd, ilen, olen; - void *ptr; +strioctl(int fd, int cmd, void *ptr, int ilen, int olen) { struct strioctl str; @@@ -2547,7 -2527,8 +2547,7 @@@ static char lock_file[40]; /* name of lock file created */ int -lock(dev) - char *dev; +lock(char *dev) { int n, fd, pid; struct stat sbuf; @@@ -2608,7 -2589,7 +2608,7 @@@ * unlock - remove our lockfile */ void -unlock() +unlock(void) { if (lock_file[0]) { unlink(lock_file); @@@ -2621,7 -2602,9 +2621,7 @@@ * cifroute - delete a route through the addresses given. */ int -cifroute(u, our, his) - int u; - u_int32_t our, his; +cifroute(int u, u_int32_t our, u_int32_t his) { struct rtentry rt; @@@ -2652,7 -2635,8 +2652,7 @@@ #endif int -have_route_to(addr) - u_int32_t addr; +have_route_to(u_int32_t addr) { #ifdef SOL2 int fd, r, flags, i; @@@ -2755,7 -2739,11 +2755,7 @@@ * the uid given. Assumes slave_name points to MAXPATHLEN bytes of space. */ int -get_pty(master_fdp, slave_fdp, slave_name, uid) - int *master_fdp; - int *slave_fdp; - char *slave_name; - int uid; +get_pty(int *master_fdp, int *slave_fdp, char *slave_name, int uid) { int mfd, sfd; char *pty_name; @@@ -2795,13 -2783,3 +2795,13 @@@ return 1; } + +/******************************************************************** + * + * get_time - Get current time, monotonic if possible. + */ +int +get_time(struct timeval *tv) +{ + return gettimeofday(tv, NULL); +}