Update config.{guess,sub}, timestamps 2023-01-01,2023-01-21

[libpcap] / pcap-pf.c

diff --git a/pcap-pf.c b/pcap-pf.c
index 0a7f45881dec5c8cd0eafa407b8e18bf8bef275d..bd27933eff69e312717d908b9202e1ed7fdb2c20 100644 (file)
--- a/pcap-pf.c
+++ b/pcap-pf.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
  */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #include <sys/types.h>
 #endif
 
 #include <sys/types.h>


@@ -48,7 +48,6 @@ struct rtentry;
 #include <netinet/tcp.h>
 #include <netinet/tcpip.h>
 
 #include <netinet/tcp.h>
 #include <netinet/tcpip.h>
 

-#include <ctype.h>

 #include <errno.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <errno.h>
 #include <netdb.h>
 #include <stdio.h>


@@ -104,10 +103,8 @@ pcap_read_pf(pcap_t *pc, int cnt, pcap_handler callback, u_char *user)
        register u_char *p, *bp;
        register int cc, n, buflen, inc;
        register struct enstamp *sp;
        register u_char *p, *bp;
        register int cc, n, buflen, inc;
        register struct enstamp *sp;

-#ifdef LBL_ALIGN

        struct enstamp stamp;
        struct enstamp stamp;

-#endif
-       register int pad;
+       register u_int pad;

 
  again:
        cc = pc->cc;
 
  again:
        cc = pc->cc;


@@ -127,8 +124,8 @@ pcap_read_pf(pcap_t *pc, int cnt, pcap_handler callback, u_char *user)
                                (void)lseek(pc->fd, 0L, SEEK_SET);
                                goto again;
                        }
                                (void)lseek(pc->fd, 0L, SEEK_SET);
                                goto again;
                        }

-                       pcap_snprintf(pc->errbuf, sizeof(pc->errbuf), "pf read: %s",
-                               pcap_strerror(errno));
+                       pcap_fmt_errmsg_for_errno(pc->errbuf,
+                           sizeof(pc->errbuf), errno, "pf read");

                        return (-1);
                }
                bp = (u_char *)pc->buffer + pc->offset;
                        return (-1);
                }
                bp = (u_char *)pc->buffer + pc->offset;


@@ -136,6 +133,9 @@ pcap_read_pf(pcap_t *pc, int cnt, pcap_handler callback, u_char *user)
                bp = pc->bp;
        /*
         * Loop through each packet.
                bp = pc->bp;
        /*
         * Loop through each packet.

+        *
+        * This assumes that a single buffer of packets will have
+        * <= INT_MAX packets, so the packet count doesn't overflow.

         */
        n = 0;
        pad = pc->fddipad;
         */
        n = 0;
        pad = pc->fddipad;


@@ -160,19 +160,17 @@ pcap_read_pf(pcap_t *pc, int cnt, pcap_handler callback, u_char *user)
                        }
                }
                if (cc < sizeof(*sp)) {
                        }
                }
                if (cc < sizeof(*sp)) {

-                       pcap_snprintf(pc->errbuf, sizeof(pc->errbuf),
+                       snprintf(pc->errbuf, sizeof(pc->errbuf),

                            "pf short read (%d)", cc);
                        return (-1);
                }
                            "pf short read (%d)", cc);
                        return (-1);
                }

-#ifdef LBL_ALIGN

                if ((long)bp & 3) {
                        sp = &stamp;
                        memcpy((char *)sp, (char *)bp, sizeof(*sp));
                } else
                if ((long)bp & 3) {
                        sp = &stamp;
                        memcpy((char *)sp, (char *)bp, sizeof(*sp));
                } else

-#endif

                        sp = (struct enstamp *)bp;
                if (sp->ens_stamplen != sizeof(*sp)) {
                        sp = (struct enstamp *)bp;
                if (sp->ens_stamplen != sizeof(*sp)) {

-                       pcap_snprintf(pc->errbuf, sizeof(pc->errbuf),
+                       snprintf(pc->errbuf, sizeof(pc->errbuf),

                            "pf short stamplen (%d)",
                            sp->ens_stamplen);
                        return (-1);
                            "pf short stamplen (%d)",
                            sp->ens_stamplen);
                        return (-1);


@@ -205,7 +203,7 @@ pcap_read_pf(pcap_t *pc, int cnt, pcap_handler callback, u_char *user)
                 * skipping that padding.
                 */
                if (pf->filtering_in_kernel ||
                 * skipping that padding.
                 */
                if (pf->filtering_in_kernel ||

-                   bpf_filter(pc->fcode.bf_insns, p, sp->ens_count, buflen)) {
+                   pcap_filter(pc->fcode.bf_insns, p, sp->ens_count, buflen)) {

                        struct pcap_pkthdr h;
                        pf->TotAccepted++;
                        h.ts = sp->ens_tstamp;
                        struct pcap_pkthdr h;
                        pf->TotAccepted++;
                        h.ts = sp->ens_tstamp;


@@ -226,14 +224,14 @@ pcap_read_pf(pcap_t *pc, int cnt, pcap_handler callback, u_char *user)
 }
 
 static int
 }
 
 static int

-pcap_inject_pf(pcap_t *p, const void *buf, size_t size)
+pcap_inject_pf(pcap_t *p, const void *buf, int size)

 {
        int ret;
 
        ret = write(p->fd, buf, size);
        if (ret == -1) {
 {
        int ret;
 
        ret = write(p->fd, buf, size);
        if (ret == -1) {

-               pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "send: %s",
-                   pcap_strerror(errno));
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "send");

                return (-1);
        }
        return (ret);
                return (-1);
        }
        return (ret);


@@ -261,7 +259,7 @@ pcap_stats_pf(pcap_t *p, struct pcap_stat *ps)
         *      full.
         *
         *      "ps_ifdrop" counts packets dropped by the network
         *      full.
         *
         *      "ps_ifdrop" counts packets dropped by the network

-        *      inteface (regardless of whether they would have passed
+        *      interface (regardless of whether they would have passed

         *      the input filter, of course).
         *
         * If packet filtering is not being done in the kernel:
         *      the input filter, of course).
         *
         * If packet filtering is not being done in the kernel:


@@ -273,7 +271,7 @@ pcap_stats_pf(pcap_t *p, struct pcap_stat *ps)
         *      the userland filter.
         *
         *      "ps_ifdrop" counts packets dropped by the network
         *      the userland filter.
         *
         *      "ps_ifdrop" counts packets dropped by the network

-        *      inteface (regardless of whether they would have passed
+        *      interface (regardless of whether they would have passed

         *      the input filter, of course).
         *
         * These statistics don't include packets not yet read from
         *      the input filter, of course).
         *
         * These statistics don't include packets not yet read from


@@ -302,6 +300,7 @@ pcap_activate_pf(pcap_t *p)
        int backlog = -1;       /* request the most */
        struct enfilter Filter;
        struct endevp devparams;
        int backlog = -1;       /* request the most */
        struct enfilter Filter;
        struct endevp devparams;

+       int err;

 
        /*
         * Initially try a read/write open (to allow the inject
 
        /*
         * Initially try a read/write open (to allow the inject


@@ -329,11 +328,31 @@ pcap_activate_pf(pcap_t *p)
        if (p->fd == -1 && errno == EACCES)
                p->fd = pfopen(p->opt.device, O_RDONLY);
        if (p->fd < 0) {
        if (p->fd == -1 && errno == EACCES)
                p->fd = pfopen(p->opt.device, O_RDONLY);
        if (p->fd < 0) {

-               pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "pf open: %s: %s\n\
-your system may not be properly configured; see the packetfilter(4) man page\n",
-                       p->opt.device, pcap_strerror(errno));
+               if (errno == EACCES) {
+                       snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+                           "pf open: %s: Permission denied\n"
+"your system may not be properly configured; see the packetfilter(4) man page",
+                           p->opt.device);
+                       err = PCAP_ERROR_PERM_DENIED;
+               } else {
+                       pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                           errno, "pf open: %s", p->opt.device);
+                       err = PCAP_ERROR;
+               }

                goto bad;
        }
                goto bad;
        }

+
+       /*
+        * Turn a negative snapshot value (invalid), a snapshot value of
+        * 0 (unspecified), or a value bigger than the normal maximum
+        * value, into the maximum allowed value.
+        *
+        * If some application really *needs* a bigger snapshot
+        * length, we should just increase MAXIMUM_SNAPLEN.
+        */
+       if (p->snapshot <= 0 || p->snapshot > MAXIMUM_SNAPLEN)
+               p->snapshot = MAXIMUM_SNAPLEN;
+

        pf->OrigMissed = -1;
        enmode = ENTSTAMP|ENNONEXCL;
        if (!p->opt.immediate)
        pf->OrigMissed = -1;
        enmode = ENTSTAMP|ENNONEXCL;
        if (!p->opt.immediate)


@@ -341,8 +360,9 @@ your system may not be properly configured; see the packetfilter(4) man page\n",
        if (p->opt.promisc)
                enmode |= ENPROMISC;
        if (ioctl(p->fd, EIOCMBIS, (caddr_t)&enmode) < 0) {
        if (p->opt.promisc)
                enmode |= ENPROMISC;
        if (ioctl(p->fd, EIOCMBIS, (caddr_t)&enmode) < 0) {

-               pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "EIOCMBIS: %s",
-                   pcap_strerror(errno));
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "EIOCMBIS");
+               err = PCAP_ERROR;

                goto bad;
        }
 #ifdef ENCOPYALL
                goto bad;
        }
 #ifdef ENCOPYALL


@@ -352,14 +372,16 @@ your system may not be properly configured; see the packetfilter(4) man page\n",
 #endif
        /* set the backlog */
        if (ioctl(p->fd, EIOCSETW, (caddr_t)&backlog) < 0) {
 #endif
        /* set the backlog */
        if (ioctl(p->fd, EIOCSETW, (caddr_t)&backlog) < 0) {

-               pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "EIOCSETW: %s",
-                   pcap_strerror(errno));
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "EIOCSETW");
+               err = PCAP_ERROR;

                goto bad;
        }
        /* discover interface type */
        if (ioctl(p->fd, EIOCDEVP, (caddr_t)&devparams) < 0) {
                goto bad;
        }
        /* discover interface type */
        if (ioctl(p->fd, EIOCDEVP, (caddr_t)&devparams) < 0) {

-               pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "EIOCDEVP: %s",
-                   pcap_strerror(errno));
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "EIOCDEVP");
+               err = PCAP_ERROR;

                goto bad;
        }
        /* HACK: to compile prior to Ultrix 4.2 */
                goto bad;
        }
        /* HACK: to compile prior to Ultrix 4.2 */


@@ -440,8 +462,9 @@ your system may not be properly configured; see the packetfilter(4) man page\n",
                 * framing", there's not much we can do, as that
                 * doesn't specify a particular type of header.
                 */
                 * framing", there's not much we can do, as that
                 * doesn't specify a particular type of header.
                 */

-               pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+               snprintf(p->errbuf, PCAP_ERRBUF_SIZE,

                    "unknown data-link type %u", devparams.end_dev_type);
                    "unknown data-link type %u", devparams.end_dev_type);

+               err = PCAP_ERROR;

                goto bad;
        }
        /* set truncation */
                goto bad;
        }
        /* set truncation */


@@ -453,8 +476,9 @@ your system may not be properly configured; see the packetfilter(4) man page\n",
        } else
                p->fddipad = 0;
        if (ioctl(p->fd, EIOCTRUNCATE, (caddr_t)&p->snapshot) < 0) {
        } else
                p->fddipad = 0;
        if (ioctl(p->fd, EIOCTRUNCATE, (caddr_t)&p->snapshot) < 0) {

-               pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "EIOCTRUNCATE: %s",
-                   pcap_strerror(errno));
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "EIOCTRUNCATE");
+               err = PCAP_ERROR;

                goto bad;
        }
        /* accept all packets */
                goto bad;
        }
        /* accept all packets */


@@ -462,8 +486,9 @@ your system may not be properly configured; see the packetfilter(4) man page\n",
        Filter.enf_Priority = 37;       /* anything > 2 */
        Filter.enf_FilterLen = 0;       /* means "always true" */
        if (ioctl(p->fd, EIOCSETF, (caddr_t)&Filter) < 0) {
        Filter.enf_Priority = 37;       /* anything > 2 */
        Filter.enf_FilterLen = 0;       /* means "always true" */
        if (ioctl(p->fd, EIOCSETF, (caddr_t)&Filter) < 0) {

-               pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "EIOCSETF: %s",
-                   pcap_strerror(errno));
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "EIOCSETF");
+               err = PCAP_ERROR;

                goto bad;
        }
 
                goto bad;
        }
 


@@ -472,8 +497,9 @@ your system may not be properly configured; see the packetfilter(4) man page\n",
                timeout.tv_sec = p->opt.timeout / 1000;
                timeout.tv_usec = (p->opt.timeout * 1000) % 1000000;
                if (ioctl(p->fd, EIOCSRTIMEOUT, (caddr_t)&timeout) < 0) {
                timeout.tv_sec = p->opt.timeout / 1000;
                timeout.tv_usec = (p->opt.timeout * 1000) % 1000000;
                if (ioctl(p->fd, EIOCSRTIMEOUT, (caddr_t)&timeout) < 0) {

-                       pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "EIOCSRTIMEOUT: %s",
-                               pcap_strerror(errno));
+                       pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                           errno, "EIOCSRTIMEOUT");
+                       err = PCAP_ERROR;

                        goto bad;
                }
        }
                        goto bad;
                }
        }


@@ -481,7 +507,9 @@ your system may not be properly configured; see the packetfilter(4) man page\n",
        p->bufsize = BUFSPACE;
        p->buffer = malloc(p->bufsize + p->offset);
        if (p->buffer == NULL) {
        p->bufsize = BUFSPACE;
        p->buffer = malloc(p->bufsize + p->offset);
        if (p->buffer == NULL) {

-               strlcpy(p->errbuf, pcap_strerror(errno), PCAP_ERRBUF_SIZE);
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "malloc");
+               err = PCAP_ERROR;

                goto bad;
        }
 
                goto bad;
        }
 


@@ -502,7 +530,7 @@ your system may not be properly configured; see the packetfilter(4) man page\n",
        return (0);
  bad:
        pcap_cleanup_live_common(p);
        return (0);
  bad:
        pcap_cleanup_live_common(p);

-       return (PCAP_ERROR);
+       return (err);

 }
 
 pcap_t *
 }
 
 pcap_t *


@@ -510,7 +538,7 @@ pcap_create_interface(const char *device _U_, char *ebuf)
 {
        pcap_t *p;
 
 {
        pcap_t *p;
 

-       p = pcap_create_common(ebuf, sizeof (struct pcap_pf));
+       p = PCAP_CREATE_COMMON(ebuf, struct pcap_pf);

        if (p == NULL)
                return (NULL);
 
        if (p == NULL)
                return (NULL);
 


@@ -528,10 +556,32 @@ can_be_bound(const char *name _U_)
        return (1);
 }
 
        return (1);
 }
 

+static int
+get_if_flags(const char *name _U_, bpf_u_int32 *flags _U_, char *errbuf _U_)
+{
+       /*
+        * Nothing we can do other than mark loopback devices as "the
+        * connected/disconnected status doesn't apply".
+        *
+        * XXX - is there a way to find out whether an adapter has
+        * something plugged into it?
+        */
+       if (*flags & PCAP_IF_LOOPBACK) {
+               /*
+                * Loopback devices aren't wireless, and "connected"/
+                * "disconnected" doesn't apply to them.
+                */
+               *flags |= PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE;
+               return (0);
+       }
+       return (0);
+}
+

 int
 int

-pcap_platform_finddevs(pcap_if_t **alldevsp, char *errbuf)
+pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)

 {
 {

-       return (pcap_findalldevs_interfaces(alldevsp, errbuf, can_be_bound));
+       return (pcap_findalldevs_interfaces(devlistp, errbuf, can_be_bound,
+           get_if_flags));

 }
 
 static int
 }
 
 static int


@@ -560,8 +610,8 @@ pcap_setfilter_pf(pcap_t *p, struct bpf_program *fp)
                         * Yes.  Try to install the filter.
                         */
                        if (ioctl(p->fd, BIOCSETF, (caddr_t)fp) < 0) {
                         * Yes.  Try to install the filter.
                         */
                        if (ioctl(p->fd, BIOCSETF, (caddr_t)fp) < 0) {

-                               pcap_snprintf(p->errbuf, sizeof(p->errbuf),
-                                   "BIOCSETF: %s", pcap_strerror(errno));
+                               pcap_fmt_errmsg_for_errno(p->errbuf,
+                                   sizeof(p->errbuf), errno, "BIOCSETF");

                                return (-1);
                        }
 
                                return (-1);
                        }
 


@@ -620,3 +670,12 @@ pcap_setfilter_pf(pcap_t *p, struct bpf_program *fp)
        pf->filtering_in_kernel = 0;
        return (0);
 }
        pf->filtering_in_kernel = 0;
        return (0);
 }

+
+/*
+ * Libpcap version string.
+ */
+const char *
+pcap_lib_version(void)
+{
+       return (PCAP_VERSION_STRING);
+}