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

[libpcap] / pcap-snit.c

diff --git a/pcap-snit.c b/pcap-snit.c
index 234285f501eb4aa1aaa33ef9b2c2b9b8b3092eb8..3f4e69d7186329c8018d504652e667b1ee5c27e6 100644 (file)
--- a/pcap-snit.c
+++ b/pcap-snit.c
@@ -24,7 +24,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>


@@ -53,7 +53,6 @@
 #include <netinet/tcp.h>
 #include <netinet/tcpip.h>
 
 #include <netinet/tcp.h>
 #include <netinet/tcpip.h>
 

-#include <ctype.h>

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


@@ -130,8 +129,8 @@ pcap_read_snit(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
                if (cc < 0) {
                        if (errno == EWOULDBLOCK)
                                return (0);
                if (cc < 0) {
                        if (errno == EWOULDBLOCK)
                                return (0);

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

                        return (-1);
                }
                bp = (u_char *)p->buffer;
                        return (-1);
                }
                bp = (u_char *)p->buffer;


@@ -140,6 +139,9 @@ pcap_read_snit(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 
        /*
         * loop through each snapshot in the chunk
 
        /*
         * loop through each snapshot in the chunk

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

         */
        n = 0;
        ep = bp + cc;
         */
        n = 0;
        ep = bp + cc;


@@ -190,7 +192,7 @@ pcap_read_snit(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
                if (caplen > p->snapshot)
                        caplen = p->snapshot;
 
                if (caplen > p->snapshot)
                        caplen = p->snapshot;
 

-               if (bpf_filter(p->fcode.bf_insns, cp, nlp->nh_pktlen, caplen)) {
+               if (pcap_filter(p->fcode.bf_insns, cp, nlp->nh_pktlen, caplen)) {

                        struct pcap_pkthdr h;
                        h.ts = ntp->nh_timestamp;
                        h.len = nlp->nh_pktlen;
                        struct pcap_pkthdr h;
                        h.ts = ntp->nh_timestamp;
                        h.len = nlp->nh_pktlen;


@@ -208,7 +210,7 @@ pcap_read_snit(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 }
 
 static int
 }
 
 static int

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

 {
        struct strbuf ctl, data;
 
 {
        struct strbuf ctl, data;
 


@@ -223,8 +225,8 @@ pcap_inject_snit(pcap_t *p, const void *buf, size_t size)
        data.len = size;
        ret = putmsg(p->fd, &ctl, &data);
        if (ret == -1) {
        data.len = size;
        ret = putmsg(p->fd, &ctl, &data);
        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);


@@ -247,8 +249,8 @@ nit_setflags(pcap_t *p)
                si.ic_len = sizeof(zero);
                si.ic_dp = (char *)&zero;
                if (ioctl(p->fd, I_STR, (char *)&si) < 0) {
                si.ic_len = sizeof(zero);
                si.ic_dp = (char *)&zero;
                if (ioctl(p->fd, I_STR, (char *)&si) < 0) {

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

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


@@ -260,8 +262,8 @@ nit_setflags(pcap_t *p)
                si.ic_len = sizeof(timeout);
                si.ic_dp = (char *)&timeout;
                if (ioctl(p->fd, I_STR, (char *)&si) < 0) {
                si.ic_len = sizeof(timeout);
                si.ic_dp = (char *)&timeout;
                if (ioctl(p->fd, I_STR, (char *)&si) < 0) {

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

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


@@ -272,8 +274,8 @@ nit_setflags(pcap_t *p)
        si.ic_len = sizeof(flags);
        si.ic_dp = (char *)&flags;
        if (ioctl(p->fd, I_STR, (char *)&si) < 0) {
        si.ic_len = sizeof(flags);
        si.ic_dp = (char *)&flags;
        if (ioctl(p->fd, I_STR, (char *)&si) < 0) {

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

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


@@ -287,6 +289,7 @@ pcap_activate_snit(pcap_t *p)
        int chunksize = CHUNKSIZE;
        int fd;
        static const char dev[] = "/dev/nit";
        int chunksize = CHUNKSIZE;
        int fd;
        static const char dev[] = "/dev/nit";

+       int err;

 
        if (p->opt.rfmon) {
                /*
 
        if (p->opt.rfmon) {
                /*


@@ -331,20 +334,30 @@ pcap_activate_snit(pcap_t *p)
        if (fd < 0 && errno == EACCES)
                p->fd = fd = open(dev, O_RDONLY);
        if (fd < 0) {
        if (fd < 0 && errno == EACCES)
                p->fd = fd = open(dev, O_RDONLY);
        if (fd < 0) {

-               pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "%s: %s", dev,
-                   pcap_strerror(errno));
+               if (errno == EACCES) {
+                       err = PCAP_ERROR_PERM_DENIED;
+                       snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+                           "Attempt to open %s failed with EACCES - root privileges may be required",
+                           dev);
+               } else {
+                       err = PCAP_ERROR;
+                       pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                           errno, "%s", dev);
+               }

                goto bad;
        }
 
        /* arrange to get discrete messages from the STREAM and use NIT_BUF */
        if (ioctl(fd, I_SRDOPT, (char *)RMSGD) < 0) {
                goto bad;
        }
 
        /* arrange to get discrete messages from the STREAM and use NIT_BUF */
        if (ioctl(fd, I_SRDOPT, (char *)RMSGD) < 0) {

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

                goto bad;
        }
        if (ioctl(fd, I_PUSH, "nbuf") < 0) {
                goto bad;
        }
        if (ioctl(fd, I_PUSH, "nbuf") < 0) {

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

                goto bad;
        }
        /* set the chunksize */
                goto bad;
        }
        /* set the chunksize */


@@ -353,8 +366,9 @@ pcap_activate_snit(pcap_t *p)
        si.ic_len = sizeof(chunksize);
        si.ic_dp = (char *)&chunksize;
        if (ioctl(fd, I_STR, (char *)&si) < 0) {
        si.ic_len = sizeof(chunksize);
        si.ic_dp = (char *)&chunksize;
        if (ioctl(fd, I_STR, (char *)&si) < 0) {

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

                goto bad;
        }
 
                goto bad;
        }
 


@@ -370,8 +384,9 @@ pcap_activate_snit(pcap_t *p)
                 * Is there one that means "that device doesn't support
                 * STREAMS NIT"?
                 */
                 * Is there one that means "that device doesn't support
                 * STREAMS NIT"?
                 */

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

                goto bad;
        }
 
                goto bad;
        }
 


@@ -380,12 +395,15 @@ pcap_activate_snit(pcap_t *p)
        si.ic_len = sizeof(p->snapshot);
        si.ic_dp = (char *)&p->snapshot;
        if (ioctl(fd, I_STR, (char *)&si) < 0) {
        si.ic_len = sizeof(p->snapshot);
        si.ic_dp = (char *)&p->snapshot;
        if (ioctl(fd, I_STR, (char *)&si) < 0) {

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

                goto bad;
        }
                goto bad;
        }

-       if (nit_setflags(p) < 0)
+       if (nit_setflags(p) < 0) {
+               err = PCAP_ERROR;

                goto bad;
                goto bad;

+       }

 
        (void)ioctl(fd, I_FLUSH, (char *)FLUSHR);
        /*
 
        (void)ioctl(fd, I_FLUSH, (char *)FLUSHR);
        /*


@@ -396,7 +414,9 @@ pcap_activate_snit(pcap_t *p)
        p->bufsize = BUFSPACE;
        p->buffer = malloc(p->bufsize);
        if (p->buffer == NULL) {
        p->bufsize = BUFSPACE;
        p->buffer = malloc(p->bufsize);
        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;
        }
 


@@ -438,7 +458,7 @@ pcap_activate_snit(pcap_t *p)
        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 *


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

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

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


@@ -464,17 +484,29 @@ 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.
+        * XXX - is there a way to find out whether an adapter has
+        * something plugged into it?
+        */
+       return (0);
+}
+

 int
 pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)
 {
 int
 pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)
 {

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

 }
 
 /*
 }
 
 /*

- * No platform-specific information.
+ * Libpcap version string.

  */
 const char *
  */
 const char *

-pcap_platform_lib_version(void)
+pcap_lib_version(void)

 {
 {

-       return (NULL);
+       return (PCAP_VERSION_STRING);

 }
 }