* 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 $"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include <limits.h>
#include <stdio.h>
#include <sys/dlpi.h>
#include <sys/stat.h>
#include <sys/mkdev.h>
+#include <sys/time.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/route.h>
#include <sys/ethernet.h>
#endif
+#ifdef PPP_FILTER
+#include <pcap.h>
+#endif
+
#include "pppd.h"
#include "fsm.h"
#include "lcp.h"
#define UDP6_DEV_NAME "/dev/udp6"
#endif /* !defined(UDP6_DEV_NAME) && defined(SOL2) */
-static const char rcsid[] = RCSID;
#if defined(SOL2)
/*
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]); \
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)
-static char first_ether_name[LIFNAMSIZ]; /* Solaris 8 and above */
-#else
-static char first_ether_name[IFNAMSIZ]; /* Before Solaris 8 */
+#if !defined(INET6) || !defined(SOL2)
#define MAXIFS 256 /* Max # of interfaces */
#endif /* defined(INET6) && defined(SOL2) */
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, size_t);
+static int strioctl(int, int, void *, int, int);
#ifdef SOL2
/*
#if defined(SOL2) && defined(INET6)
/*
- * get_first_ethernet - returns the first Ethernet interface name found in
- * the system, or NULL if none is found
+ * get_first_ether_hwaddr - get the hardware address for the first
+ * ethernet-style interface on this system.
*
* NOTE: This is the lifreq version (Solaris 8 and above)
*/
-char *
-get_first_ethernet()
+int
+get_first_ether_hwaddr(u_char *addr)
{
struct lifnum lifn;
struct lifconf lifc;
fd = socket(AF_INET, SOCK_DGRAM, 0);
if (fd < 0) {
- return 0;
+ return -1;
}
/*
if (ioctl(fd, SIOCGLIFNUM, &lifn) < 0) {
close(fd);
error("could not determine number of interfaces: %m");
- return 0;
+ return -1;
}
num_ifs = lifn.lifn_count;
if (req == NULL) {
close(fd);
error("out of memory");
- return 0;
+ return -1;
}
/*
close(fd);
free(req);
error("SIOCGLIFCONF: %m");
- return 0;
+ return -1;
}
/*
memset(&lifr, 0, sizeof(lifr));
strncpy(lifr.lifr_name, plifreq->lifr_name, sizeof(lifr.lifr_name));
if (ioctl(fd, SIOCGLIFFLAGS, &lifr) < 0) {
- close(fd);
- free(req);
error("SIOCGLIFFLAGS: %m");
- return 0;
+ break;
}
fl = lifr.lifr_flags;
!= (IFF_UP | IFF_BROADCAST))
continue;
+ if (get_if_hwaddr(addr, lifr.lifr_name) < 0)
+ continue;
+
found = 1;
break;
}
free(req);
close(fd);
- if (found) {
- strncpy(first_ether_name, lifr.lifr_name, sizeof(first_ether_name));
- return (char *)first_ether_name;
- } else
- return NULL;
+ if (found)
+ return 0;
+ else
+ return -1;
}
#else
/*
- * get_first_ethernet - returns the first Ethernet interface name found in
- * the system, or NULL if none is found
+ * get_first_ether_hwaddr - get the hardware address for the first
+ * ethernet-style interface on this system.
*
* NOTE: This is the ifreq version (before Solaris 8).
*/
-char *
-get_first_ethernet()
+int
+get_first_ether_hwaddr(u_char *addr)
{
struct ifconf ifc;
struct ifreq *pifreq;
fd = socket(AF_INET, SOCK_DGRAM, 0);
if (fd < 0) {
- return 0;
+ return -1;
}
/*
if (req == NULL) {
close(fd);
error("out of memory");
- return 0;
+ return -1;
}
/*
close(fd);
free(req);
error("SIOCGIFCONF: %m");
- return 0;
+ return -1;
}
/*
memset(&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_name, pifreq->ifr_name, sizeof(ifr.ifr_name));
if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) {
- close(fd);
- free(req);
error("SIOCGIFFLAGS: %m");
- return 0;
+ break;
}
fl = ifr.ifr_flags;
!= (IFF_UP | IFF_BROADCAST))
continue;
+ if (get_if_hwaddr(addr, ifr.ifr_name) < 0)
+ continue;
+
found = 1;
break;
}
free(req);
close(fd);
- if (found) {
- strncpy(first_ether_name, ifr.ifr_name, sizeof(first_ether_name));
- return (char *)first_ether_name;
- } else
- return NULL;
+ if (found)
+ return 0;
+ else
+ return -1;
}
#endif /* defined(SOL2) && defined(INET6) */
* 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;
}
-
-
-/*
- * ether_to_eui64 - Convert 48-bit Ethernet address into 64-bit EUI
- *
- * walks the list of valid ethernet interfaces, and convert the first
- * found 48-bit MAC address into EUI 64. caller also assumes that
- * the system has a properly configured Ethernet interface for this
- * function to return non-zero.
- */
-int
-ether_to_eui64(eui64_t *p_eui64)
-{
- struct sockaddr s_eth_addr;
- struct ether_addr *eth_addr = (struct ether_addr *)&s_eth_addr.sa_data;
- char *if_name;
-
- if ((if_name = get_first_ethernet()) == NULL) {
- error("no persistent id can be found");
- return 0;
- }
-
- /*
- * Send DL_INFO_REQ to the driver to solicit its MAC address
- */
- if (!get_hw_addr_dlpi(if_name, &s_eth_addr)) {
- error("could not obtain hardware address for %s", if_name);
- return 0;
- }
-
- /*
- * And convert the EUI-48 into EUI-64, per RFC 2472 [sec 4.1]
- */
- p_eui64->e8[0] = (eth_addr->ether_addr_octet[0] & 0xFF) | 0x02;
- p_eui64->e8[1] = (eth_addr->ether_addr_octet[1] & 0xFF);
- p_eui64->e8[2] = (eth_addr->ether_addr_octet[2] & 0xFF);
- p_eui64->e8[3] = 0xFF;
- p_eui64->e8[4] = 0xFE;
- p_eui64->e8[5] = (eth_addr->ether_addr_octet[3] & 0xFF);
- p_eui64->e8[6] = (eth_addr->ether_addr_octet[4] & 0xFF);
- p_eui64->e8[7] = (eth_addr->ether_addr_octet[5] & 0xFF);
-
- return 1;
-}
#endif /* defined(SOL2) && defined(INET6) */
/*
* sys_init - System-dependent initialization.
*/
void
-sys_init()
+sys_init(void)
{
int ifd, x;
struct ifreq ifr;
* This should call die() because it's called from die().
*/
void
-sys_cleanup()
+sys_cleanup(void)
{
#if defined(SOL2)
struct ifreq ifr;
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)
* sys_close - Clean up in a child process before execing.
*/
void
-sys_close()
+sys_close(void)
{
close(ipfd);
#if defined(INET6) && defined(SOL2)
* sys_check_options - check the options that the user specified
*/
int
-sys_check_options()
+sys_check_options(void)
{
return 1;
}
* daemon - Detach us from controlling terminal session.
*/
int
-daemon(nochdir, noclose)
- int nochdir, noclose;
+daemon(int nochdir, int noclose)
{
int pid;
* ppp_available - check whether the system has any ppp interfaces
*/
int
-ppp_available()
+ppp_available(void)
{
struct stat buf;
* 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) &&
* 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;
* 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;
* Check whether the link seems not to be 8-bit clean.
*/
void
-clean_check()
+clean_check(void)
{
int x;
char *s;
* Translate from bits/second to a speed_t.
*/
static int
-translate_speed(bps)
- int bps;
+translate_speed(int bps)
{
struct speed *speedp;
* Translate from a speed_t to bits/second.
*/
static int
-baud_rate_of(speed)
- int speed;
+baud_rate_of(int speed)
{
struct speed *speedp;
* 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;
}
#endif
+ if (stop_bits >= 2)
+ tios.c_cflag |= CSTOPB;
+
tios.c_cflag |= CS8 | CREAD | HUPCL;
if (local || !modem)
tios.c_cflag |= CLOCAL;
* 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) {
* 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;
* to the ppp driver.
*/
int
-open_ppp_loopback()
+open_ppp_loopback(void)
{
return pppfd;
}
* 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;
* if timo is NULL).
*/
void
-wait_input(timo)
- struct timeval *timo;
+wait_input(struct timeval *timo)
{
int t;
/*
* 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;
/*
* 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;
* if timo is NULL).
*/
void
-wait_loop_output(timo)
- struct timeval *timo;
+wait_loop_output(struct timeval *timo)
{
wait_input(timo);
}
* signal is received.
*/
void
-wait_time(timo)
- struct timeval *timo;
+wait_time(struct timeval *timo)
{
int n;
* 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;
* 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;
* 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)
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);
}
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);
#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_metric;
+}
+
/*
* 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];
* 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;
* 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];
* 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)
* 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];
* 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;
}
* 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;
return 1;
}
-#if 0
+#ifdef PPP_FILTER
/*
* 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;
* 0 otherwise. This is necessary because of patent nonsense.
*/
int
-ccp_fatal_error(unit)
- int unit;
+ccp_fatal_error(int unit)
{
int cf[2];
* 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];
* sifup - Config the interface up and enable IP packets to pass.
*/
int
-sifup(u)
- int u;
+sifup(int u)
{
struct ifreq ifr;
* sifdown - Config the interface down and disable IP.
*/
int
-sifdown(u)
- int u;
+sifdown(int u)
{
struct ifreq ifr;
* 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];
* 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;
* sifdown - Config the IPv6 interface down and disable IPv6.
*/
int
-sif6down(u)
- int u;
+sif6down(int u)
{
struct lifreq lifr;
int fd;
* 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;
* 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;
}
* 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;
* 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);
* 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, bool replace)
{
struct rtentry rt;
+ if (replace) {
+ error("Replacing the default route is not implemented on Solaris yet");
+ return 0;
+ }
+
#if defined(__USLC__)
g = l; /* use the local address as gateway */
#endif
* 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;
* 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;
* 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;
#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;
* 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;
* 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;
}
static int
-dlpi_attach(fd, ppa)
- int fd, ppa;
+dlpi_attach(int fd, int ppa)
{
dl_attach_req_t req;
struct strbuf buf;
}
static int
-dlpi_info_req(fd)
- int fd;
+dlpi_info_req(int fd)
{
dl_info_req_t req;
struct strbuf buf;
}
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, size_t maxlen)
{
struct strbuf buf;
int flags, n;
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;
* 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;
* 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;
* get_host_seed - return the serial number of this machine.
*/
int
-get_host_seed()
+get_host_seed(void)
{
char buf[32];
}
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;
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;
* unlock - remove our lockfile
*/
void
-unlock()
+unlock(void)
{
if (lock_file[0]) {
unlink(lock_file);
* 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;
#endif
int
-have_route_to(addr)
- u_int32_t addr;
+have_route_to(u_int32_t addr)
{
#ifdef SOL2
int fd, r, flags, i;
* 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;
return 1;
}
+
+/********************************************************************
+ *
+ * get_time - Get current time, monotonic if possible.
+ */
+int
+get_time(struct timeval *tv)
+{
+ return gettimeofday(tv, NULL);
+}
projects / ppp.git / blobdiff