X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=interface.c;h=f9445cb8aba1a01948dc50beb25aed0445146ae3;hb=f16d8d23439b5569f0c2e1af22494708b507f277;hp=d1295f51a4307f011984eda489ca61562b082628;hpb=79739caa154403260496d3b0c33f47ef0cf21447;p=~andy%2Ffetchmail diff --git a/interface.c b/interface.c index d1295f51..f9445cb8 100644 --- a/interface.c +++ b/interface.c @@ -9,40 +9,42 @@ * FreeBSD specific portions written by and Copyright (c) 1999 * Andy Doran . * - * This is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free - * Software Foundation; version 2, or (at your option) any later version. + * For license terms, see the file COPYING in this directory. */ + +#include "fetchmail.h" +#ifdef CAN_MONITOR + #include #include -#if (defined(linux) && !defined(INET6)) || defined(__FreeBSD__) +#if defined(linux) +#include +#endif -#include "config.h" #include #include -#if defined(STDC_HEADERS) #include -#endif -#if defined(HAVE_UNISTD_H) #include -#endif #include #include #include #include #include #if defined(__FreeBSD__) -#if __FreeBSD_version >= 300001 +#if defined __FreeBSD_USE_KVM #include -#endif #include #include #include -#endif -#include "config.h" -#include "fetchmail.h" -#include "i18n.h" +#else /* !defined __FreeBSD_USE_KVM */ +#include +#include +#include +#endif /* defined __FreeBSD_USE_KVM */ +#endif /* defined __FreeBSD__ */ +#include "socket.h" +#include "gettext.h" #include "tunable.h" typedef struct { @@ -55,41 +57,41 @@ struct interface_pair_s { struct in_addr interface_mask; } *interface_pair; -static char *netdevfmt; - -#if defined(linux) - /* * Count of packets to see on an interface before monitor considers it up. * Needed because when pppd shuts down the link, the packet counts go up - * by two (one rx and one tx?, maybe). A value of 2 seems to do the trick. + * by two (one rx and one tx?, maybe). A value of 2 seems to do the trick, + * but we'll give it some extra. */ -#define MONITOR_SLOP 2 +#define MONITOR_SLOP 5 + +#ifdef linux +#define have_interface_init + +static const char *netdevfmt; void interface_init(void) -/* figure out which /proc/dev/net format to use */ +/* figure out which /proc/net/dev format to use */ { - FILE *fp = popen("uname -r", "r"); /* still wins if /proc is out */ + struct utsname utsname; - /* pre-linux-2.2 format -- transmit packet count in 8th field */ - netdevfmt = "%d %d %*d %*d %*d %d %*d %d %*d %*d %*d %*d %d"; + /* Linux 2.2 -- transmit packet count in 10th field */ + netdevfmt = "%d %d %*d %*d %*d %d %*d %*d %*d %d %*d %*d %d"; - if (!fp) - return; + if (uname(&utsname) < 0) + return; else { int major, minor; - if (fscanf(fp, "%d.%d.%*d", &major, &minor) != 2) - return; - - if (major >= 2 && minor >= 2) - /* Linux 2.2 -- transmit packet count in 10th field */ - netdevfmt = "%d %d %*d %*d %*d %d %*d %*d %*d %d %*d %*d %d"; + if (sscanf(utsname.release, "%d.%d.%*d", &major, &minor) >= 2 + && (major < 2 || (major == 2 && minor < 2))) + /* pre-linux-2.2 format -- transmit packet count in 8th field */ + netdevfmt = "%d %d %*d %*d %*d %d %*d %d %*d %*d %*d %*d %d"; } } -static int _get_ifinfo_(int socket_fd, FILE *stats_file, const char *ifname, +static int _get_ifinfoGT_(int socket_fd, FILE *stats_file, const char *ifname, ifinfo_t *ifinfo) /* get active network interface information - return non-zero upon success */ { @@ -131,13 +133,14 @@ static int _get_ifinfo_(int socket_fd, FILE *stats_file, const char *ifname, if (!(request.ifr_flags & IFF_RUNNING)) return(FALSE); - /* get the IP address */ + /* get the (local) IP address */ strcpy(request.ifr_name, ifname); if (ioctl(socket_fd, SIOCGIFADDR, &request) < 0) return(FALSE); ifinfo->addr = ((struct sockaddr_in *) (&request.ifr_addr))->sin_addr; - /* get the PPP destination IP address */ + /* get the PPP destination (remote) IP address */ + ifinfo->dstaddr.s_addr = 0; strcpy(request.ifr_name, ifname); if (ioctl(socket_fd, SIOCGIFDSTADDR, &request) >= 0) ifinfo->dstaddr = ((struct sockaddr_in *) @@ -164,23 +167,25 @@ static int get_ifinfo(const char *ifname, ifinfo_t *ifinfo) result = FALSE; else { - char *sp = strchr(ifname, '/'); - + char *tmp = xstrdup(ifname); + char *sp = strchr(tmp, '/'); + /* hide slash and trailing info from ifname */ if (sp) *sp = '\0'; - result = _get_ifinfo_(socket_fd, stats_file, ifname, ifinfo); - if (sp) - *sp = '/'; + result = _get_ifinfoGT_(socket_fd, stats_file, tmp, ifinfo); + free(tmp); } if (socket_fd >= 0) - close(socket_fd); + SockClose(socket_fd); if (stats_file) - fclose(stats_file); + fclose(stats_file); /* not checking should be safe, mode was "r" */ return(result); } #elif defined __FreeBSD__ +#if defined __FreeBSD_USE_KVM + static kvm_t *kvmfd; static struct nlist symbols[] = { @@ -216,24 +221,21 @@ openkvm(void) static int get_ifinfo(const char *ifname, ifinfo_t *ifinfo) { - char tname[16]; + char tname[16]; char iname[16]; - struct ifnet ifnet; + struct ifnet ifnet; unsigned long ifnet_addr = ifnet_savedaddr; -#if __FreeBSD_version >= 300001 struct ifnethead ifnethead; struct ifaddrhead ifaddrhead; -#endif struct ifaddr ifaddr; unsigned long ifaddr_addr; struct sockaddr sa; - unsigned long sa_addr; uint i; if (if_egid) setegid(if_egid); - for (i = 0; ifname[i] && ifname[i] != '/'; i++) + for (i = 0; ifname[i] && ifname[i] != '/' && i < sizeof(iname) - 1; i++) iname[i] = ifname[i]; iname[i] = '\0'; @@ -242,25 +244,21 @@ get_ifinfo(const char *ifname, ifinfo_t *ifinfo) { if (!openkvm()) { - report(stderr, 0, _("Unable to open kvm interface. Make sure fetchmail is SGID kmem.")); + report(stderr, 0, GT_("Unable to open kvm interface. Make sure fetchmail is SGID kmem.")); if (if_egid) setegid(if_rgid); exit(1); } } -#if __FreeBSD_version >= 300001 kvm_read(kvmfd, ifnet_savedaddr, (char *) &ifnethead, sizeof ifnethead); ifnet_addr = (u_long) ifnethead.tqh_first; -#else - ifnet_addr = ifnet_savedaddr; -#endif while (ifnet_addr) { kvm_read(kvmfd, ifnet_addr, &ifnet, sizeof(ifnet)); kvm_read(kvmfd, (unsigned long) ifnet.if_name, tname, sizeof tname); - snprintf(tname, sizeof tname - 1, "%s%d", tname, ifnet.if_unit); + snprintf(tname + strlen(tname), sizeof(tname) - strlen(tname), "%d", ifnet.if_unit); if (!strcmp(tname, iname)) { @@ -274,11 +272,7 @@ get_ifinfo(const char *ifname, ifinfo_t *ifinfo) ifinfo->rx_packets = ifnet.if_ipackets; ifinfo->tx_packets = ifnet.if_opackets; -#if __FreeBSD_version >= 300001 ifaddr_addr = (u_long) ifnet.if_addrhead.tqh_first; -#else - ifaddr_addr = (u_long) ifnet.if_addrlist; -#endif while(ifaddr_addr) { @@ -287,11 +281,7 @@ get_ifinfo(const char *ifname, ifinfo_t *ifinfo) if (sa.sa_family != AF_INET) { -#if __FreeBSD_version >= 300001 ifaddr_addr = (u_long) ifaddr.ifa_link.tqe_next; -#else - ifaddr_addr = (u_long) ifaddr.ifa_next; -#endif continue; } @@ -313,11 +303,7 @@ get_ifinfo(const char *ifname, ifinfo_t *ifinfo) return 0; } -#if __FreeBSD_version >= 300001 ifnet_addr = (u_long) ifnet.if_link.tqe_next; -#else - ifnet_addr = (unsigned long) ifnet.if_next; -#endif } if (if_egid) @@ -325,8 +311,216 @@ get_ifinfo(const char *ifname, ifinfo_t *ifinfo) return 0; } -#endif /* defined __FreeBSD__ */ +#else /* Do not use KVM on FreeBSD */ + +/* + * Expand the compacted form of addresses as returned via the + * configuration read via sysctl(). + */ + +static void +rt_xaddrs(caddr_t cp, caddr_t cplim, struct rt_addrinfo *rtinfo) +{ + struct sockaddr *sa; + int i; + +#define ROUNDUP(a) \ + ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) +#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len)) + + memset(rtinfo->rti_info, 0, sizeof(rtinfo->rti_info)); + for (i = 0; (i < RTAX_MAX) && (cp < cplim); i++) { + if ((rtinfo->rti_addrs & (1 << i)) == 0) + continue; + rtinfo->rti_info[i] = sa = (struct sockaddr *)cp; + ADVANCE(cp, sa); + } + +#undef ROUNDUP +#undef ADVANCE +} + +static int +get_ifinfo(const char *ifname, ifinfo_t *ifinfo) +{ + uint i; + int rc = 0; + int ifindex = -1; + size_t needed; + char *buf = NULL; + char *lim = NULL; + char *next = NULL; + struct if_msghdr *ifm; + struct ifa_msghdr *ifam; + struct sockaddr_in *sin; + struct sockaddr_dl *sdl; + struct rt_addrinfo info; + char iname[16]; + int mib[6]; + + memset(ifinfo, 0, sizeof(*ifinfo)); + + /* trim interface name */ + + for (i = 0; i < sizeof(iname) && ifname[i] && ifname[i] != '/'; i++) + iname[i] = ifname[i]; + + if (i == 0 || i == sizeof(iname)) + { + report(stderr, GT_("Unable to parse interface name from %s"), ifname); + return 0; + } + + iname[i] = 0; + + + /* get list of existing interfaces */ + + mib[0] = CTL_NET; + mib[1] = PF_ROUTE; + mib[2] = 0; + mib[3] = AF_INET; /* Only IP addresses please. */ + mib[4] = NET_RT_IFLIST; + mib[5] = 0; /* List all interfaces. */ + + + /* Get interface data. */ + + if (sysctl(mib, 6, NULL, &needed, NULL, 0) == -1) + { + report(stderr, + GT_("get_ifinfo: sysctl (iflist estimate) failed")); + exit(1); + } + if ((buf = (char *)malloc(needed)) == NULL) + { + report(stderr, + GT_("get_ifinfo: malloc failed")); + exit(1); + } + if (sysctl(mib, 6, buf, &needed, NULL, 0) == -1) + { + report(stderr, + GT_("get_ifinfo: sysctl (iflist) failed")); + exit(1); + } + + lim = buf+needed; + + + /* first look for the interface information */ + + next = buf; + while (next < lim) + { + ifm = (struct if_msghdr *)next; + next += ifm->ifm_msglen; + + if (ifm->ifm_version != RTM_VERSION) + { + report(stderr, + GT_("Routing message version %d not understood."), + ifm->ifm_version); + exit(1); + } + + if (ifm->ifm_type == RTM_IFINFO) + { + sdl = (struct sockaddr_dl *)(ifm + 1); + + if (!(strlen(iname) == sdl->sdl_nlen + && strncmp(iname, sdl->sdl_data, sdl->sdl_nlen) == 0)) + { + continue; + } + + if ( !(ifm->ifm_flags & IFF_UP) ) + { + /* the interface is down */ + goto get_ifinfo_end; + } + + ifindex = ifm->ifm_index; + ifinfo->rx_packets = ifm->ifm_data.ifi_ipackets; + ifinfo->tx_packets = ifm->ifm_data.ifi_opackets; + + break; + } + } + + if (ifindex < 0) + { + /* we did not find an interface with a matching name */ + report(stderr, GT_("No interface found with name %s"), iname); + goto get_ifinfo_end; + } + + /* now look for the interface's IP address */ + + next = buf; + while (next < lim) + { + ifam = (struct ifa_msghdr *)next; + next += ifam->ifam_msglen; + + if (ifindex > 0 + && ifam->ifam_type == RTM_NEWADDR + && ifam->ifam_index == ifindex) + { + /* Expand the compacted addresses */ + info.rti_addrs = ifam->ifam_addrs; + rt_xaddrs((char *)(ifam + 1), + ifam->ifam_msglen + (char *)ifam, + &info); + + /* Check for IPv4 address information only */ + if (info.rti_info[RTAX_IFA]->sa_family != AF_INET) + { + continue; + } + + rc = 1; + + sin = (struct sockaddr_in *)info.rti_info[RTAX_IFA]; + if (sin) + { + ifinfo->addr = sin->sin_addr; + } + + sin = (struct sockaddr_in *)info.rti_info[RTAX_NETMASK]; + if (sin) + { + ifinfo->netmask = sin->sin_addr; + } + + /* note: RTAX_BRD contains the address at the other + * end of a point-to-point link or the broadcast address + * of non point-to-point link + */ + sin = (struct sockaddr_in *)info.rti_info[RTAX_BRD]; + if (sin) + { + ifinfo->dstaddr = sin->sin_addr; + } + + break; + } + } + + if (rc == 0) + { + report(stderr, GT_("No IP address found for %s"), iname); + } + +get_ifinfo_end: + free(buf); + return rc; +} + +#endif /* __FREEBSD_USE_SYSCTL_GET_IFFINFO */ + +#endif #ifndef HAVE_INET_ATON /* @@ -360,6 +554,7 @@ void interface_parse(char *buf, struct hostdata *hp) /* parse 'interface' specification */ { char *cp1, *cp2; + char mask1[] = "255.255.255.255"; hp->interface = xstrdup(buf); @@ -367,14 +562,14 @@ void interface_parse(char *buf, struct hostdata *hp) if (!(cp1 = strchr(buf, '/'))) { (void) report(stderr, - _("missing IP interface address\n")); + GT_("missing IP interface address\n")); exit(PS_SYNTAX); } *cp1++ = '\000'; /* find and isolate just the netmask */ if (!(cp2 = strchr(cp1, '/'))) - cp2 = "255.255.255.255"; + cp2 = mask1; else *cp2++ = '\000'; @@ -383,13 +578,13 @@ void interface_parse(char *buf, struct hostdata *hp) if (!inet_aton(cp1, &hp->interface_pair->interface_address)) { (void) report(stderr, - _("invalid IP interface address\n")); + GT_("invalid IP interface address\n")); exit(PS_SYNTAX); } if (!inet_aton(cp2, &hp->interface_pair->interface_mask)) { (void) report(stderr, - _("invalid IP interface mask\n")); + GT_("invalid IP interface mask\n")); exit(PS_SYNTAX); } /* apply the mask now to the IP address (range) required */ @@ -428,12 +623,12 @@ void interface_note_activity(struct hostdata *hp) #ifdef ACTIVITY_DEBUG (void) report(stdout, - _("activity on %s -noted- as %d\n"), + GT_("activity on %s -noted- as %d\n"), hp->monitor, hp->monitor_io); #endif } -int interface_approve(struct hostdata *hp) +int interface_approve(struct hostdata *hp, flag domonitor) /* return TRUE if OK to poll, FALSE otherwise */ { ifinfo_t ifinfo; @@ -443,46 +638,79 @@ int interface_approve(struct hostdata *hp) /* get interface info */ if (!get_ifinfo(hp->interface, &ifinfo)) { (void) report(stdout, - _("skipping poll of %s, %s down\n"), + GT_("skipping poll of %s, %s down\n"), hp->pollname, hp->interface); return(FALSE); } - /* check the IP address (range) */ - if ((ifinfo.addr.s_addr & - hp->interface_pair->interface_mask.s_addr) != - hp->interface_pair->interface_address.s_addr) { + /* check the IP addresses (range) */ + if (!( + /* check remote IP address */ + ((ifinfo.dstaddr.s_addr != 0) && + (ifinfo.dstaddr.s_addr & + hp->interface_pair->interface_mask.s_addr) == + hp->interface_pair->interface_address.s_addr) + || + /* check local IP address */ + ((ifinfo.addr.s_addr & + hp->interface_pair->interface_mask.s_addr) == + hp->interface_pair->interface_address.s_addr) + ) ) + { (void) report(stdout, - _("skipping poll of %s, %s IP address excluded\n"), + GT_("skipping poll of %s, %s IP address excluded\n"), hp->pollname, hp->interface); return(FALSE); } } /* if not monitoring link, all done */ - if (!hp->monitor) + if (!domonitor || !hp->monitor) return(TRUE); #ifdef ACTIVITY_DEBUG (void) report(stdout, - _("activity on %s checked as %d\n"), + GT_("activity on %s checked as %d\n"), hp->monitor, hp->monitor_io); #endif /* if monitoring, check link for activity if it is up */ - if (get_ifinfo(hp->monitor, &ifinfo) && - hp->monitor_io - (ifinfo.rx_packets + - ifinfo.tx_packets) >= -MONITOR_SLOP) { + if (get_ifinfo(hp->monitor, &ifinfo)) + { + int diff = (ifinfo.rx_packets + ifinfo.tx_packets) + - hp->monitor_io; + + /* + * There are three cases here: + * + * (a) If the new packet count is less than the recorded one, + * probably pppd was restarted while fetchmail was running. + * Don't skip. + * + * (b) newpacket count is greater than the old packet count, + * but the difference is small and may just reflect the overhead + * of a link shutdown. Skip. + * + * (c) newpacket count is greater than the old packet count, + * and the difference is large. Connection is live. Don't skip. + */ + if (diff >= 0 && diff <= MONITOR_SLOP) + { (void) report(stdout, - _("skipping poll of %s, %s inactive\n"), + GT_("skipping poll of %s, %s inactive\n"), hp->pollname, hp->monitor); return(FALSE); + } } #ifdef ACTIVITY_DEBUG - report(stdout _("activity on %s was %d, is %d"), + report(stdout, GT_("activity on %s was %d, is %d\n"), hp->monitor, hp->monitor_io, ifinfo.rx_packets + ifinfo.tx_packets); #endif return(TRUE); } -#endif /* (defined(linux) && !defined(INET6)) || defined(__FreeBSD__) */ +#endif /* CAN_MONITOR */ + +#ifndef have_interface_init +void interface_init(void) {} +#endif