Prefix routines declared in pcap-int.h with pcap_.

This avoids potential and, in one case (SIMH), actual collisions with
names in other libraries or in applications using libpcap.

diff --git a/fad-getad.c b/fad-getad.c
index ba8f97538a5895126d13a46ef5a2b88842e53062..e4135de1a4ef871b1e506651ed3b331188c7779c 100644 (file)
--- a/fad-getad.c
+++ b/fad-getad.c
@@ -263,7 +263,7 @@ pcap_findalldevs_interfaces(pcap_if_list_t *devlistp, char *errbuf,
                /*
                 * Add information for this address to the list.
                 */
-               if (add_addr_to_if(devlistp, ifa->ifa_name, ifa->ifa_flags,
+               if (pcap_add_addr_to_if(devlistp, ifa->ifa_name, ifa->ifa_flags,
                    get_flags_func,
                    addr, addr_size, netmask, addr_size,
                    broadaddr, broadaddr_size, dstaddr, dstaddr_size,

diff --git a/fad-gifc.c b/fad-gifc.c
index 8940876a579e730162145db88de0cb997e4217ee..4acb6d69a42c37c86573b7ce3970185ba09a92b7 100644 (file)
--- a/fad-gifc.c
+++ b/fad-gifc.c
@@ -409,7 +409,7 @@ pcap_findalldevs_interfaces(pcap_if_list_t *devlistp, char *errbuf,
                /*
                 * Add information for this address to the list.
                 */
-               if (add_addr_to_if(devlistp, ifrp->ifr_name,
+               if (pcap_add_addr_to_if(devlistp, ifrp->ifr_name,
                    ifrflags.ifr_flags, get_flags_func,
                    &ifrp->ifr_addr, SA_LEN(&ifrp->ifr_addr),
                    netmask, netmask_size, broadaddr, broadaddr_size,

diff --git a/fad-glifc.c b/fad-glifc.c
index 6b275eb3c840a8f46c4e5fc86ae3cb966453a2e6..d7f65d2720e78cd6dfc0395774dc137b1cc6701d 100644 (file)
--- a/fad-glifc.c
+++ b/fad-glifc.c
@@ -326,7 +326,7 @@ pcap_findalldevs_interfaces(pcap_if_list_t *devlistp, char *errbuf,
                /*
                 * Add information for this address to the list.
                 */
-               if (add_addr_to_if(devlistp, ifrp->lifr_name,
+               if (pcap_add_addr_to_if(devlistp, ifrp->lifr_name,
                    ifrflags.lifr_flags, get_flags_func,
                    (struct sockaddr *)&ifrp->lifr_addr,
                    sizeof (struct sockaddr_storage),

diff --git a/optimize.c b/optimize.c
index 94ecfc15f5edbc7f0895a5d0a85324b7072f5999..eb4048a1e94f57e84fc110b2e977d915c8388c5a 100644 (file)
--- a/optimize.c
+++ b/optimize.c
@@ -2944,7 +2944,7 @@ conv_error(conv_state_t *conv_state, const char *fmt, ...)
  * otherwise, return 0.
  */
 int
-install_bpf_program(pcap_t *p, struct bpf_program *fp)
+pcap_install_bpf_program(pcap_t *p, struct bpf_program *fp)
 {
        size_t prog_size;
 

diff --git a/pcap-airpcap.c b/pcap-airpcap.c
index bbe88720111275036da4f3ae125e4cc20d5e5f60..d480c8293b135ba591010212adb7e92eaf0b4378 100644 (file)
--- a/pcap-airpcap.c
+++ b/pcap-airpcap.c
@@ -275,11 +275,11 @@ airpcap_setfilter(pcap_t *p, struct bpf_program *fp)
                 */
 
                /*
-                * install_bpf_program() validates the program.
+                * pcap_install_bpf_program() validates the program.
                 *
                 * XXX - what if we already have a filter in the kernel?
                 */
-               if (install_bpf_program(p, fp) < 0)
+               if (pcap_install_bpf_program(p, fp) < 0)
                        return (-1);
                pa->filtering_in_kernel = 0;    /* filtering in userland */
                return (0);
@@ -1040,7 +1040,7 @@ airpcap_findalldevs(pcap_if_list_t *devlistp, char *errbuf)
 
        for (airpcap_device = airpcap_devices; airpcap_device != NULL;
            airpcap_device = airpcap_device->next) {
-               if (add_dev(devlistp, airpcap_device->Name, 0,
+               if (pcap_add_dev(devlistp, airpcap_device->Name, 0,
                    airpcap_device->Description, errbuf) == NULL) {
                        /*
                         * Failure.

diff --git a/pcap-bpf.c b/pcap-bpf.c
index 27b3d2878cc7fd63e7422f568acc0c1f6a43be87..14f07acbde4343a7cb06ece27cea02b82a7a1190 100644 (file)
--- a/pcap-bpf.c
+++ b/pcap-bpf.c
@@ -2872,7 +2872,7 @@ finddevs_usb(pcap_if_list_t *devlistp, char *errbuf)
                 * so we need to avoid adding multiple capture devices
                 * for each bus.
                 */
-               if (find_or_add_dev(devlistp, name, PCAP_IF_UP,
+               if (pcap_find_or_add_dev(devlistp, name, PCAP_IF_UP,
                    get_usb_if_flags, NULL, errbuf) == NULL) {
                        free(name);
                        closedir(usbdir);
@@ -3407,11 +3407,11 @@ pcap_setfilter_bpf(pcap_t *p, struct bpf_program *fp)
        }
 
        /*
-        * install_bpf_program() validates the program.
+        * pcap_install_bpf_program() validates the program.
         *
         * XXX - what if we already have a filter in the kernel?
         */
-       if (install_bpf_program(p, fp) < 0)
+       if (pcap_install_bpf_program(p, fp) < 0)
                return (-1);
        pb->filtering_in_kernel = 0;    /* filtering in userland */
        return (0);

diff --git a/pcap-bt-linux.c b/pcap-bt-linux.c
index fbac7e97a4dbdbb0149dd842e764ecccec798a53..cba6e8d90c687552e2ed1eb8b46d8b50dec59e9c 100644 (file)
--- a/pcap-bt-linux.c
+++ b/pcap-bt-linux.c
@@ -131,7 +131,7 @@ bt_findalldevs(pcap_if_list_t *devlistp, char *err_str)
                 * the status to PCAP_IF_CONNECTION_STATUS_CONNECTED
                 * or PCAP_IF_CONNECTION_STATUS_DISCONNECTED.
                 */
-               if (add_dev(devlistp, dev_name, PCAP_IF_WIRELESS, dev_descr, err_str)  == NULL)
+               if (pcap_add_dev(devlistp, dev_name, PCAP_IF_WIRELESS, dev_descr, err_str)  == NULL)
                {
                        ret = -1;
                        break;
@@ -225,7 +225,7 @@ bt_activate(pcap_t* handle)
 
        handle->read_op = bt_read_linux;
        handle->inject_op = bt_inject_linux;
-       handle->setfilter_op = install_bpf_program; /* no kernel filtering */
+       handle->setfilter_op = pcap_install_bpf_program; /* no kernel filtering */
        handle->setdirection_op = bt_setdirection_linux;
        handle->set_datalink_op = NULL; /* can't change data link type */
        handle->getnonblock_op = pcap_getnonblock_fd;

diff --git a/pcap-bt-monitor-linux.c b/pcap-bt-monitor-linux.c
index 3d4f0b08235808bcb1d1e92b22183fc8dbda0c9c..0a0dab18736b34c75da83123a6ba24781a208121 100644 (file)
--- a/pcap-bt-monitor-linux.c
+++ b/pcap-bt-monitor-linux.c
@@ -80,7 +80,7 @@ bt_monitor_findalldevs(pcap_if_list_t *devlistp, char *err_str)
      * more than there's a notion of "connected" or "disconnected"
      * for the "any" device.
      */
-    if (add_dev(devlistp, INTERFACE_NAME,
+    if (pcap_add_dev(devlistp, INTERFACE_NAME,
                 PCAP_IF_WIRELESS|PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE,
                 "Bluetooth Linux Monitor", err_str) == NULL)
     {
@@ -204,7 +204,7 @@ bt_monitor_activate(pcap_t* handle)
 
     handle->read_op = bt_monitor_read;
     handle->inject_op = bt_monitor_inject;
-    handle->setfilter_op = install_bpf_program; /* no kernel filtering */
+    handle->setfilter_op = pcap_install_bpf_program; /* no kernel filtering */
     handle->setdirection_op = NULL; /* Not implemented */
     handle->set_datalink_op = NULL; /* can't change data link type */
     handle->getnonblock_op = pcap_getnonblock_fd;

diff --git a/pcap-dag.c b/pcap-dag.c
index f261ead00df8a0c3bdcbe47206d03b180b883f94..b2d55c6585f1099e2898c32fcaf0c0f917652f94 100644 (file)
--- a/pcap-dag.c
+++ b/pcap-dag.c
@@ -996,7 +996,7 @@ static int dag_activate(pcap_t* p)
 
        p->read_op = dag_read;
        p->inject_op = dag_inject;
-       p->setfilter_op = install_bpf_program;
+       p->setfilter_op = pcap_install_bpf_program;
        p->setdirection_op = NULL; /* Not implemented.*/
        p->set_datalink_op = dag_set_datalink;
        p->getnonblock_op = pcap_getnonblock_fd;
@@ -1179,7 +1179,7 @@ dag_findalldevs(pcap_if_list_t *devlistp, char *errbuf)
                         *
                         * Also, are there notions of "up" and "running"?
                         */
-                       if (add_dev(devlistp, name, 0, description, errbuf) == NULL) {
+                       if (pcap_add_dev(devlistp, name, 0, description, errbuf) == NULL) {
                                /*
                                 * Failure.
                                 */
@@ -1191,7 +1191,7 @@ dag_findalldevs(pcap_if_list_t *devlistp, char *errbuf)
                                        dag_detach_stream(dagfd, stream);
 
                                        snprintf(name,  10, "dag%d:%d", c, stream);
-                                       if (add_dev(devlistp, name, 0, description, errbuf) == NULL) {
+                                       if (pcap_add_dev(devlistp, name, 0, description, errbuf) == NULL) {
                                                /*
                                                 * Failure.
                                                 */

diff --git a/pcap-dbus.c b/pcap-dbus.c
index 506f150fa5c597d741902bc03984b0e8c42bac16..7af89b91e84cc37b98fc706f49db7ce3eb6cbdbd 100644 (file)
--- a/pcap-dbus.c
+++ b/pcap-dbus.c
@@ -227,7 +227,7 @@ dbus_activate(pcap_t *handle)
        handle->linktype = DLT_DBUS;
        handle->read_op = dbus_read;
        handle->inject_op = dbus_write;
-       handle->setfilter_op = install_bpf_program; /* XXX, later add support for dbus_bus_add_match() */
+       handle->setfilter_op = pcap_install_bpf_program; /* XXX, later add support for dbus_bus_add_match() */
        handle->setdirection_op = NULL;
        handle->set_datalink_op = NULL;      /* can't change data link type */
        handle->getnonblock_op = dbus_getnonblock;
@@ -338,11 +338,11 @@ dbus_findalldevs(pcap_if_list_t *devlistp, char *err_str)
         * The notion of "connected" vs. "disconnected" doesn't apply.
         * XXX - what about the notions of "up" and "running"?
         */
-       if (add_dev(devlistp, "dbus-system",
+       if (pcap_add_dev(devlistp, "dbus-system",
            PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE, "D-Bus system bus",
            err_str) == NULL)
                return -1;
-       if (add_dev(devlistp, "dbus-session",
+       if (pcap_add_dev(devlistp, "dbus-session",
            PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE, "D-Bus session bus",
            err_str) == NULL)
                return -1;

diff --git a/pcap-dlpi.c b/pcap-dlpi.c
index 4eeb610876b32f401679c8acaf150f097ee87fed..decd67dc3a39a5cbe460f88c2a330d1716b70df8 100644 (file)
--- a/pcap-dlpi.c
+++ b/pcap-dlpi.c
@@ -865,7 +865,7 @@ pcap_activate_dlpi(pcap_t *p)
 
        p->read_op = pcap_read_dlpi;
        p->inject_op = pcap_inject_dlpi;
-       p->setfilter_op = install_bpf_program;  /* no kernel filtering */
+       p->setfilter_op = pcap_install_bpf_program;     /* no kernel filtering */
        p->setdirection_op = NULL;      /* Not implemented.*/
        p->set_datalink_op = NULL;      /* can't change data link type */
        p->getnonblock_op = pcap_getnonblock_fd;
@@ -1148,7 +1148,7 @@ pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)
                 * And is there a way to determine whether the
                 * interface is plugged into a network?
                 */
-               if (add_dev(devlistp, baname, 0, NULL, errbuf) == NULL)
+               if (pcap_add_dev(devlistp, baname, 0, NULL, errbuf) == NULL)
                        return (-1);
        }
 #endif

diff --git a/pcap-dos.c b/pcap-dos.c
index 897118b1af536f8abf16b09407b83f5e74cade32..de4feb58f7fad2953b6788dfeb8777dfa1dae753 100644 (file)
--- a/pcap-dos.c
+++ b/pcap-dos.c
@@ -599,7 +599,7 @@ int pcap_platform_finddevs  (pcap_if_list_t *devlistp, char *errbuf)
      * a wired device, and set PCAP_IF_CONNECTION_STATUS_CONNECTED
      * or PCAP_IF_CONNECTION_STATUS_DISCONNECTED?
      */
-    if ((curdev = add_dev(devlistp, dev->name, 0,
+    if ((curdev = pcap_add_dev(devlistp, dev->name, 0,
                 dev->long_name, errbuf)) == NULL)
     {
       ret = -1;
@@ -618,7 +618,7 @@ int pcap_platform_finddevs  (pcap_if_list_t *devlistp, char *errbuf)
     broadaddr = (struct sockaddr*) &sa_ll_2;
     memset (&sa_ll_2.sin_addr, 0xFF, sizeof(sa_ll_2.sin_addr));
 
-    if (add_addr_to_dev(curdev, addr, sizeof(*addr),
+    if (pcap_add_addr_to_dev(curdev, addr, sizeof(*addr),
                         netmask, sizeof(*netmask),
                         broadaddr, sizeof(*broadaddr),
                         dstaddr, sizeof(*dstaddr), errbuf) < 0)

diff --git a/pcap-dpdk.c b/pcap-dpdk.c
index 844db652499a1e55d62c792f773cff99d6b57fc0..085753e0d5b45f95c10c0226eadd3cbee23374d9 100644 (file)
--- a/pcap-dpdk.c
+++ b/pcap-dpdk.c
@@ -949,7 +949,7 @@ static int pcap_dpdk_activate(pcap_t *p)
                p->read_op = pcap_dpdk_dispatch;
                p->inject_op = pcap_dpdk_inject;
                // using pcap_filter currently, though DPDK provides their own BPF function. Because DPDK BPF needs load a ELF file as a filter.
-               p->setfilter_op = install_bpf_program;
+               p->setfilter_op = pcap_install_bpf_program;
                p->setdirection_op = NULL;
                p->set_datalink_op = NULL;
                p->getnonblock_op = pcap_dpdk_getnonblock;
@@ -1041,7 +1041,7 @@ int pcap_dpdk_findalldevs(pcap_if_list_t *devlistp, char *ebuf)
                        // PCI addr
                        rte_eth_dev_get_name_by_port(i,pci_addr);
                        snprintf(dpdk_desc,DPDK_DEV_DESC_MAX-1,"%s %s, MAC:%s, PCI:%s", DPDK_DESC, dpdk_name, mac_addr, pci_addr);
-                       if (add_dev(devlistp, dpdk_name, 0, dpdk_desc, ebuf)==NULL){
+                       if (pcap_add_dev(devlistp, dpdk_name, 0, dpdk_desc, ebuf)==NULL){
                                ret = PCAP_ERROR;
                                break;
                        }

diff --git a/pcap-haiku.c b/pcap-haiku.c
index 2a496e121da277e7cf6e26747284223036d88803..9655644d0e68e5178f5533413190b00c9749468d 100644 (file)
--- a/pcap-haiku.c
+++ b/pcap-haiku.c
@@ -151,7 +151,7 @@ pcap_activate_haiku(pcap_t *handle)
        const char* device = handle->opt.device;
 
        handle->read_op = pcap_read_haiku;
-       handle->setfilter_op = install_bpf_program; /* no kernel filtering */
+       handle->setfilter_op = pcap_install_bpf_program; /* no kernel filtering */
        handle->inject_op = pcap_inject_haiku;
        handle->stats_op = pcap_stats_haiku;
 

diff --git a/pcap-hurd.c b/pcap-hurd.c
index 36e04eac8944aaee70ece26242c734cda688d746..e7dc756a1b082cb50dbb0552824b15ff8c759abd 100644 (file)
--- a/pcap-hurd.c
+++ b/pcap-hurd.c
@@ -220,7 +220,7 @@ pcap_activate_hurd(pcap_t *p)
 
        p->read_op = pcap_read_hurd;
        p->inject_op = pcap_inject_hurd;
-       p->setfilter_op = install_bpf_program;
+       p->setfilter_op = pcap_install_bpf_program;
        p->stats_op = pcap_stats_hurd;
 
        return 0;

diff --git a/pcap-int.h b/pcap-int.h
index 22537173cfe78768c135db2b9ba4fb462b00f69e..df4ab74f6bd393b358fcd3da3e29822f98a9a358 100644 (file)
--- a/pcap-int.h
+++ b/pcap-int.h
@@ -520,12 +520,12 @@ void      pcap_breakloop_common(pcap_t *);
  * "pcap_findalldevs_interfaces()" is a helper to find those interfaces
  * using the "standard" mechanisms (SIOCGIFCONF, "getifaddrs()", etc.).
  *
- * "add_dev()" adds an entry to a pcap_if_list_t.
+ * "pcap_add_dev()" adds an entry to a pcap_if_list_t.
  *
- * "find_dev()" tries to find a device, by name, in a pcap_if_list_t.
+ * "pcap_find_dev()" tries to find a device, by name, in a pcap_if_list_t.
  *
- * "find_or_add_dev()" checks whether a device is already in a pcap_if_list_t
- * and, if not, adds an entry for it.
+ * "pcap_find_or_add_dev()" checks whether a device is already in a
+ * pcap_if_list_t and, if not, adds an entry for it.
  */
 struct pcap_if_list;
 typedef struct pcap_if_list pcap_if_list_t;
@@ -535,18 +535,18 @@ int       pcap_platform_finddevs(pcap_if_list_t *, char *);
 int    pcap_findalldevs_interfaces(pcap_if_list_t *, char *,
            int (*)(const char *), get_if_flags_func);
 #endif
-pcap_if_t *find_or_add_dev(pcap_if_list_t *, const char *, bpf_u_int32,
+pcap_if_t *pcap_find_or_add_dev(pcap_if_list_t *, const char *, bpf_u_int32,
            get_if_flags_func, const char *, char *);
-pcap_if_t *find_dev(pcap_if_list_t *, const char *);
-pcap_if_t *add_dev(pcap_if_list_t *, const char *, bpf_u_int32, const char *,
-           char *);
-int    add_addr_to_dev(pcap_if_t *, struct sockaddr *, size_t,
+pcap_if_t *pcap_find_dev(pcap_if_list_t *, const char *);
+pcap_if_t *pcap_add_dev(pcap_if_list_t *, const char *, bpf_u_int32,
+           const char *, char *);
+int    pcap_add_addr_to_dev(pcap_if_t *, struct sockaddr *, size_t,
            struct sockaddr *, size_t, struct sockaddr *, size_t,
            struct sockaddr *dstaddr, size_t, char *errbuf);
 #ifndef _WIN32
-pcap_if_t *find_or_add_if(pcap_if_list_t *, const char *, bpf_u_int32,
+pcap_if_t *pcap_find_or_add_if(pcap_if_list_t *, const char *, bpf_u_int32,
            get_if_flags_func, char *);
-int    add_addr_to_if(pcap_if_list_t *, const char *, bpf_u_int32,
+int    pcap_add_addr_to_if(pcap_if_list_t *, const char *, bpf_u_int32,
            get_if_flags_func,
            struct sockaddr *, size_t, struct sockaddr *, size_t,
            struct sockaddr *, size_t, struct sockaddr *, size_t, char *);
@@ -562,11 +562,11 @@ int       add_addr_to_if(pcap_if_list_t *, const char *, bpf_u_int32,
  * "pcap_adjust_snapshot()" adjusts the snapshot to be non-zero and
  * fit within an int.
  *
- * "sf_cleanup()" closes the file handle associated with a pcap_t, if
+ * "pcap_sf_cleanup()" closes the file handle associated with a pcap_t, if
  * appropriate, and frees all data common to all modules for handling
  * savefile types.
  *
- * "charset_fopen()", in UTF-8 mode on Windows, does an fopen() that
+ * "pcap_charset_fopen()", in UTF-8 mode on Windows, does an fopen() that
  * treats the pathname as being in UTF-8, rather than the local
  * code page, on Windows.
  */
@@ -585,14 +585,14 @@ int       add_addr_to_if(pcap_if_list_t *, const char *, bpf_u_int32,
 pcap_t *pcap_open_offline_common(char *ebuf, size_t total_size,
     size_t private_data);
 bpf_u_int32 pcap_adjust_snapshot(bpf_u_int32 linktype, bpf_u_int32 snaplen);
-void   sf_cleanup(pcap_t *p);
+void   pcap_sf_cleanup(pcap_t *p);
 #ifdef _WIN32
-FILE   *charset_fopen(const char *path, const char *mode);
+FILE   *pcap_charset_fopen(const char *path, const char *mode);
 #else
 /*
  * On other OSes, just use Boring Old fopen().
  */
-#define charset_fopen(path, mode)      fopen((path), (mode))
+#define pcap_charset_fopen(path, mode) fopen((path), (mode))
 #endif
 
 /*
@@ -646,7 +646,7 @@ int pcap_validate_filter(const struct bpf_insn *, int);
  */
 void   pcap_oneshot(u_char *, const struct pcap_pkthdr *, const u_char *);
 
-int    install_bpf_program(pcap_t *, struct bpf_program *);
+int    pcap_install_bpf_program(pcap_t *, struct bpf_program *);
 
 int    pcap_strcasecmp(const char *, const char *);
 

diff --git a/pcap-libdlpi.c b/pcap-libdlpi.c
index 82962975017490f63636439fbc1d11f3227e87d6..3bc350a7817afa3a8969f0252385148925e1690e 100644 (file)
--- a/pcap-libdlpi.c
+++ b/pcap-libdlpi.c
@@ -248,7 +248,7 @@ pcap_activate_libdlpi(pcap_t *p)
 
        p->read_op = pcap_read_libdlpi;
        p->inject_op = pcap_inject_libdlpi;
-       p->setfilter_op = install_bpf_program;  /* No kernel filtering */
+       p->setfilter_op = pcap_install_bpf_program;     /* No kernel filtering */
        p->setdirection_op = NULL;      /* Not implemented */
        p->set_datalink_op = NULL;      /* Can't change data link type */
        p->getnonblock_op = pcap_getnonblock_fd;
@@ -377,7 +377,7 @@ pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)
                 * If it isn't already in the list of devices, try to
                 * add it.
                 */
-               if (find_or_add_dev(devlistp, entry->linkname, 0, get_if_flags,
+               if (pcap_find_or_add_dev(devlistp, entry->linkname, 0, get_if_flags,
                    NULL, errbuf) == NULL)
                        retv = -1;
        }

diff --git a/pcap-linux.c b/pcap-linux.c
index 4cf99a921a50f75eb6798e1345794bb135fd79e3..be5c30a8036a53d92911498be633885631c679ad 100644 (file)
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -1760,7 +1760,7 @@ pcap_platform_finddevs(pcap_if_list_t *devlistp, char *errbuf)
         * network device, the notion of "connected" vs. "disconnected"
         * doesn't apply.
         */
-       if (add_dev(devlistp, "any",
+       if (pcap_add_dev(devlistp, "any",
            PCAP_IF_UP|PCAP_IF_RUNNING|PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE,
            any_descr, errbuf) == NULL)
                return (-1);
@@ -4339,8 +4339,8 @@ pcap_setfilter_linux(pcap_t *handle, struct bpf_program *filter)
 
        /* Make our private copy of the filter */
 
-       if (install_bpf_program(handle, filter) < 0)
-               /* install_bpf_program() filled in errbuf */
+       if (pcap_install_bpf_program(handle, filter) < 0)
+               /* pcap_install_bpf_program() filled in errbuf */
                return -1;
 
        /*

diff --git a/pcap-netfilter-linux.c b/pcap-netfilter-linux.c
index 2eb0fc8c02aebd42a223f6f26367a2e1464c21f7..23475aed5ba3b07623b41ba83b198acdab84ae46 100644 (file)
--- a/pcap-netfilter-linux.c
+++ b/pcap-netfilter-linux.c
@@ -595,7 +595,7 @@ netfilter_activate(pcap_t* handle)
        handle->offset = 0;
        handle->read_op = netfilter_read_linux;
        handle->inject_op = netfilter_inject_linux;
-       handle->setfilter_op = install_bpf_program; /* no kernel filtering */
+       handle->setfilter_op = pcap_install_bpf_program; /* no kernel filtering */
        handle->setdirection_op = NULL;
        handle->set_datalink_op = netfilter_set_datalink;
        handle->getnonblock_op = pcap_getnonblock_fd;
@@ -781,11 +781,11 @@ netfilter_findalldevs(pcap_if_list_t *devlistp, char *err_str)
         * The notion of "connected" vs. "disconnected" doesn't apply.
         * XXX - what about "up" and "running"?
         */
-       if (add_dev(devlistp, NFLOG_IFACE,
+       if (pcap_add_dev(devlistp, NFLOG_IFACE,
            PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE,
            "Linux netfilter log (NFLOG) interface", err_str) == NULL)
                return -1;
-       if (add_dev(devlistp, NFQUEUE_IFACE,
+       if (pcap_add_dev(devlistp, NFQUEUE_IFACE,
            PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE,
            "Linux netfilter queue (NFQUEUE) interface", err_str) == NULL)
                return -1;

diff --git a/pcap-netmap.c b/pcap-netmap.c
index 27d36e5bb6d31b678e875887a5e9941f5540090c..c6d023754c418d12c512e4c06f4160a043d7adf9 100644 (file)
--- a/pcap-netmap.c
+++ b/pcap-netmap.c
@@ -266,7 +266,7 @@ pcap_netmap_activate(pcap_t *p)
        p->selectable_fd = p->fd;
        p->read_op = pcap_netmap_dispatch;
        p->inject_op = pcap_netmap_inject;
-       p->setfilter_op = install_bpf_program;
+       p->setfilter_op = pcap_install_bpf_program;
        p->setdirection_op = NULL;
        p->set_datalink_op = NULL;
        p->getnonblock_op = pcap_getnonblock_fd;

diff --git a/pcap-nit.c b/pcap-nit.c
index 2e0a679b5b54c515d4d9df593e6da8dc7b0706c3..c85c5c8c8c297559ee5f054eae85f5a6a0784a69 100644 (file)
--- a/pcap-nit.c
+++ b/pcap-nit.c
@@ -355,7 +355,7 @@ pcap_activate_nit(pcap_t *p)
 
        p->read_op = pcap_read_nit;
        p->inject_op = pcap_inject_nit;
-       p->setfilter_op = install_bpf_program;  /* no kernel filtering */
+       p->setfilter_op = pcap_install_bpf_program;     /* no kernel filtering */
        p->setdirection_op = NULL;      /* Not implemented. */
        p->set_datalink_op = NULL;      /* can't change data link type */
        p->getnonblock_op = pcap_getnonblock_fd;

diff --git a/pcap-npf.c b/pcap-npf.c
index 736ecbf2301e1141281635723d812b0e1563df07..95d0c6f6172b018185eb9faba618d8c2de1917e9 100644 (file)
--- a/pcap-npf.c
+++ b/pcap-npf.c
@@ -1944,11 +1944,11 @@ pcap_setfilter_npf(pcap_t *p, struct bpf_program *fp)
                 */
 
                /*
-                * install_bpf_program() validates the program.
+                * pcap_install_bpf_program() validates the program.
                 *
                 * XXX - what if we already have a filter in the kernel?
                 */
-               if (install_bpf_program(p, fp) < 0)
+               if (pcap_install_bpf_program(p, fp) < 0)
                        return (-1);
                pw->filtering_in_kernel = 0;    /* filtering in userland */
                return (0);
@@ -1982,7 +1982,7 @@ pcap_setfilter_win32_dag(pcap_t *p, struct bpf_program *fp) {
        }
 
        /* Install a user level filter */
-       if (install_bpf_program(p, fp) < 0)
+       if (pcap_install_bpf_program(p, fp) < 0)
                return (-1);
 
        return (0);
@@ -2047,7 +2047,7 @@ pcap_add_if_npf(pcap_if_list_t *devlistp, char *name, bpf_u_int32 flags,
        /*
         * Add an entry for this interface, with no addresses.
         */
-       curdev = add_dev(devlistp, name, flags, description, errbuf);
+       curdev = pcap_add_dev(devlistp, name, flags, description, errbuf);
        if (curdev == NULL) {
                /*
                 * Failure.
@@ -2079,7 +2079,7 @@ pcap_add_if_npf(pcap_if_list_t *devlistp, char *name, bpf_u_int32 flags,
                 * "curdev" is an entry for this interface; add an entry for
                 * this address to its list of addresses.
                 */
-               res = add_addr_to_dev(curdev,
+               res = pcap_add_addr_to_dev(curdev,
                    (struct sockaddr *)&if_addrs[if_addr_size].IPAddress,
                    sizeof (struct sockaddr_storage),
                    (struct sockaddr *)&if_addrs[if_addr_size].SubnetMask,

diff --git a/pcap-pf.c b/pcap-pf.c
index 17863844fd9c40e3bcb49d0299b6d5eaded6fe8d..da08510d9c052f7e353097f4d6860cf5f3c0a549 100644 (file)
--- a/pcap-pf.c
+++ b/pcap-pf.c
@@ -659,7 +659,7 @@ pcap_setfilter_pf(pcap_t *p, struct bpf_program *fp)
        /*
         * We couldn't do filtering in the kernel; do it in userland.
         */
-       if (install_bpf_program(p, fp) < 0)
+       if (pcap_install_bpf_program(p, fp) < 0)
                return (-1);
 
        /*

diff --git a/pcap-rdmasniff.c b/pcap-rdmasniff.c
index 624828c007a9ed0aa54510acc101a84e9a6eaff0..a0053d981b4c6941617ac9a8844d0b503a36475c 100644 (file)
--- a/pcap-rdmasniff.c
+++ b/pcap-rdmasniff.c
@@ -323,7 +323,7 @@ rdmasniff_activate(pcap_t *handle)
        handle->read_op = rdmasniff_read;
        handle->stats_op = rdmasniff_stats;
        handle->cleanup_op = rdmasniff_cleanup;
-       handle->setfilter_op = install_bpf_program;
+       handle->setfilter_op = pcap_install_bpf_program;
        handle->setdirection_op = NULL;
        handle->set_datalink_op = NULL;
        handle->getnonblock_op = pcap_getnonblock_fd;
@@ -444,7 +444,7 @@ rdmasniff_findalldevs(pcap_if_list_t *devlistp, char *err_str)
                 * XXX - do the notions of "up", "running", or
                 * "connected" apply here?
                 */
-               if (!add_dev(devlistp, dev_list[i]->name, 0, "RDMA sniffer", err_str)) {
+               if (!pcap_add_dev(devlistp, dev_list[i]->name, 0, "RDMA sniffer", err_str)) {
                        ret = -1;
                        break;
                }

diff --git a/pcap-rpcap.c b/pcap-rpcap.c
index 304a39e56994d4b8628413f81530313972802eb5..71a20c72d976cc5a4520284ba4761dc3920c1bf5 100644 (file)
--- a/pcap-rpcap.c
+++ b/pcap-rpcap.c
@@ -1704,7 +1704,7 @@ static int pcap_setfilter_rpcap(pcap_t *fp, struct bpf_program *prog)
        if (!pr->rmt_capstarted)
        {
                /* copy filter into the pcap_t structure */
-               if (install_bpf_program(fp, prog) == -1)
+               if (pcap_install_bpf_program(fp, prog) == -1)
                        return -1;
                return 0;
        }

diff --git a/pcap-septel.c b/pcap-septel.c
index 6d1d904742ccedb0008ad44eb1d08baa69b32a6a..74a1e63c59a4274c3c132bc7911509082efc3c2f 100644 (file)
--- a/pcap-septel.c
+++ b/pcap-septel.c
@@ -207,7 +207,7 @@ static pcap_t *septel_activate(pcap_t* handle) {
 
   handle->read_op = septel_read;
   handle->inject_op = septel_inject;
-  handle->setfilter_op = install_bpf_program;
+  handle->setfilter_op = pcap_install_bpf_program;
   handle->set_datalink_op = NULL; /* can't change data link type */
   handle->getnonblock_op = septel_getnonblock;
   handle->setnonblock_op = septel_setnonblock;
@@ -267,7 +267,7 @@ septel_findalldevs(pcap_if_list_t *devlistp, char *errbuf)
   /*
    * XXX - do the notions of "up", "running", or "connected" apply here?
    */
-  if (add_dev(devlistp,"septel",0,"Intel/Septel device",errbuf) == NULL)
+  if (pcap_add_dev(devlistp,"septel",0,"Intel/Septel device",errbuf) == NULL)
     return -1;
   return 0;
 }

diff --git a/pcap-snf.c b/pcap-snf.c
index 14e7f98558981a786032311567a8cf0d8c042cb8..84bb4a9e6d088bb9a17de84e9ebb2eb65258d625 100644 (file)
--- a/pcap-snf.c
+++ b/pcap-snf.c
@@ -320,7 +320,7 @@ snf_activate(pcap_t* p)
        p->linktype = DLT_EN10MB;
        p->read_op = snf_read;
        p->inject_op = snf_inject;
-       p->setfilter_op = install_bpf_program;
+       p->setfilter_op = pcap_install_bpf_program;
        p->setdirection_op = NULL; /* Not implemented.*/
        p->set_datalink_op = snf_set_datalink;
        p->getnonblock_op = snf_getnonblock;
@@ -413,7 +413,7 @@ snf_findalldevs(pcap_if_list_t *devlistp, char *errbuf)
                 * See if there's already an entry for the device
                 * with the name ifa->snf_ifa_name.
                 */
-               dev = find_dev(devlistp, ifa->snf_ifa_name);
+               dev = pcap_find_dev(devlistp, ifa->snf_ifa_name);
                if (dev != NULL) {
                        /*
                         * Yes.  Update its description.
@@ -439,7 +439,7 @@ snf_findalldevs(pcap_if_list_t *devlistp, char *errbuf)
                         * PCAP_IF_CONNECTION_STATUS_CONNECTED or
                         * PCAP_IF_CONNECTION_STATUS_DISCONNECTED?
                         */
-                       dev = add_dev(devlistp, ifa->snf_ifa_name, 0, desc,
+                       dev = pcap_add_dev(devlistp, ifa->snf_ifa_name, 0, desc,
                            errbuf);
                        if (dev == NULL)
                                return -1;
@@ -454,7 +454,7 @@ snf_findalldevs(pcap_if_list_t *devlistp, char *errbuf)
                                 * to IPv4 address.
                                 */
                                addr.sin_family = AF_INET;
-                               if (add_addr_to_dev(dev, &addr, sizeof(addr),
+                               if (pcap_add_addr_to_dev(dev, &addr, sizeof(addr),
                                    NULL, 0, NULL, 0, NULL, 0, errbuf) == -1)
                                        return -1;
                         } else if (ret == -1) {
@@ -489,7 +489,7 @@ snf_findalldevs(pcap_if_list_t *devlistp, char *errbuf)
                 * "disconnected", as "is this plugged into a network?"
                 * would be a per-port property.
                 */
-               if (add_dev(devlistp, name,
+               if (pcap_add_dev(devlistp, name,
                    PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE, desc,
                    errbuf) == NULL)
                        return (-1);

diff --git a/pcap-snit.c b/pcap-snit.c
index 0bd4dabe9aedc714b6906447dd488b57f83da9ed..0700b34c1117474f73a6e37571fdb7ddfc08e47f 100644 (file)
--- a/pcap-snit.c
+++ b/pcap-snit.c
@@ -448,7 +448,7 @@ pcap_activate_snit(pcap_t *p)
 
        p->read_op = pcap_read_snit;
        p->inject_op = pcap_inject_snit;
-       p->setfilter_op = install_bpf_program;  /* no kernel filtering */
+       p->setfilter_op = pcap_install_bpf_program;     /* no kernel filtering */
        p->setdirection_op = NULL;      /* Not implemented. */
        p->set_datalink_op = NULL;      /* can't change data link type */
        p->getnonblock_op = pcap_getnonblock_fd;

diff --git a/pcap-snoop.c b/pcap-snoop.c
index 2f44b1dd91bb53c650c7c9525636f290689ec567..92e9c67f8fc7fed6419b79f75240b520969a0de5 100644 (file)
--- a/pcap-snoop.c
+++ b/pcap-snoop.c
@@ -403,7 +403,7 @@ pcap_activate_snoop(pcap_t *p)
 
        p->read_op = pcap_read_snoop;
        p->inject_op = pcap_inject_snoop;
-       p->setfilter_op = install_bpf_program;  /* no kernel filtering */
+       p->setfilter_op = pcap_install_bpf_program;     /* no kernel filtering */
        p->setdirection_op = NULL;      /* Not implemented. */
        p->set_datalink_op = NULL;      /* can't change data link type */
        p->getnonblock_op = pcap_getnonblock_fd;

diff --git a/pcap-tc.c b/pcap-tc.c
index 1d753b5477adcc46358b8ae61212a1b02ad51543..f1f671d97e98edd9a665a5b104676824e611fdbc 100644 (file)
--- a/pcap-tc.c
+++ b/pcap-tc.c
@@ -419,7 +419,7 @@ TcFindAllDevs(pcap_if_list_t *devlist, char *errbuf)
                        dev = TcCreatePcapIfFromPort(pPorts[i]);
 
                        if (dev != NULL)
-                               add_dev(devlist, dev->name, dev->flags, dev->description, errbuf);
+                               pcap_add_dev(devlist, dev->name, dev->flags, dev->description, errbuf);
                }
 
                if (numPorts > 0)
@@ -610,7 +610,7 @@ TcActivate(pcap_t *p)
        }
 
        p->read_op = TcRead;
-       p->setfilter_op = install_bpf_program;
+       p->setfilter_op = pcap_install_bpf_program;
        p->setdirection_op = NULL;      /* Not implemented. */
        p->set_datalink_op = TcSetDatalink;
        p->getnonblock_op = TcGetNonBlock;

diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c
index 1164f4722182123b4d4f10050f7fd3a5404a8556..6d48b289ad403f25db6abfc83e1158c9f6367271 100644 (file)
--- a/pcap-usb-linux.c
+++ b/pcap-usb-linux.c
@@ -157,7 +157,7 @@ usb_dev_add(pcap_if_list_t *devlistp, int n, char *err_str)
                 * "connected" vs. "disconnected", as that's a property
                 * that would apply to a particular USB interface.
                 */
-               if (add_dev(devlistp, dev_name,
+               if (pcap_add_dev(devlistp, dev_name,
                    PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE,
                    "Raw USB traffic, all USB buses", err_str) == NULL)
                        return -1;
@@ -169,7 +169,7 @@ usb_dev_add(pcap_if_list_t *devlistp, int n, char *err_str)
                 * PCAP_IF_CONNECTION_STATUS_DISCONNECTED?
                 */
                snprintf(dev_descr, 30, "Raw USB traffic, bus number %d", n);
-               if (add_dev(devlistp, dev_name, 0, dev_descr, err_str) == NULL)
+               if (pcap_add_dev(devlistp, dev_name, 0, dev_descr, err_str) == NULL)
                        return -1;
        }
 
@@ -482,7 +482,7 @@ usb_activate(pcap_t* handle)
        handle->linktype = DLT_USB_LINUX;
 
        handle->inject_op = usb_inject_linux;
-       handle->setfilter_op = install_bpf_program; /* no kernel filtering */
+       handle->setfilter_op = pcap_install_bpf_program; /* no kernel filtering */
        handle->setdirection_op = usb_setdirection_linux;
        handle->set_datalink_op = NULL; /* can't change data link type */
        handle->getnonblock_op = pcap_getnonblock_fd;

diff --git a/pcap.c b/pcap.c
index 04aa7441ed1cadc61e5051c3739c64d4bdb25f97..471515831b81df1f21f32c8f702c90c7b67973cc 100644 (file)
--- a/pcap.c
+++ b/pcap.c
@@ -1014,7 +1014,7 @@ get_if_description(const char *name _U_)
  * the new entry, otherwise return NULL and set errbuf to an error message.
  */
 pcap_if_t *
-find_or_add_if(pcap_if_list_t *devlistp, const char *name,
+pcap_find_or_add_if(pcap_if_list_t *devlistp, const char *name,
     bpf_u_int32 if_flags, get_if_flags_func get_flags_func, char *errbuf)
 {
        bpf_u_int32 pcap_flags;
@@ -1048,7 +1048,7 @@ find_or_add_if(pcap_if_list_t *devlistp, const char *name,
         * Attempt to find an entry for this device; if we don't find one,
         * attempt to add one.
         */
-       return (find_or_add_dev(devlistp, name, pcap_flags,
+       return (pcap_find_or_add_dev(devlistp, name, pcap_flags,
            get_flags_func, get_if_description(name), errbuf));
 }
 
@@ -1071,7 +1071,7 @@ find_or_add_if(pcap_if_list_t *devlistp, const char *name,
  * add interfaces even if they have no addresses.)
  */
 int
-add_addr_to_if(pcap_if_list_t *devlistp, const char *name,
+pcap_add_addr_to_if(pcap_if_list_t *devlistp, const char *name,
     bpf_u_int32 if_flags, get_if_flags_func get_flags_func,
     struct sockaddr *addr, size_t addr_size,
     struct sockaddr *netmask, size_t netmask_size,
@@ -1084,7 +1084,7 @@ add_addr_to_if(pcap_if_list_t *devlistp, const char *name,
        /*
         * Check whether the device exists and, if not, add it.
         */
-       curdev = find_or_add_if(devlistp, name, if_flags, get_flags_func,
+       curdev = pcap_find_or_add_if(devlistp, name, if_flags, get_flags_func,
            errbuf);
        if (curdev == NULL) {
                /*
@@ -1106,7 +1106,7 @@ add_addr_to_if(pcap_if_list_t *devlistp, const char *name,
         * address for it; add an entry for that address to the
         * interface's list of addresses.
         */
-       return (add_addr_to_dev(curdev, addr, addr_size, netmask,
+       return (pcap_add_addr_to_dev(curdev, addr, addr_size, netmask,
            netmask_size, broadaddr, broadaddr_size, dstaddr,
            dstaddr_size, errbuf));
 }
@@ -1117,7 +1117,7 @@ add_addr_to_if(pcap_if_list_t *devlistp, const char *name,
  * "curdev" is the entry for that interface.
  */
 int
-add_addr_to_dev(pcap_if_t *curdev,
+pcap_add_addr_to_dev(pcap_if_t *curdev,
     struct sockaddr *addr, size_t addr_size,
     struct sockaddr *netmask, size_t netmask_size,
     struct sockaddr *broadaddr, size_t broadaddr_size,
@@ -1232,7 +1232,7 @@ add_addr_to_dev(pcap_if_t *curdev,
  * return -1 and set errbuf to an error message.
  */
 pcap_if_t *
-find_or_add_dev(pcap_if_list_t *devlistp, const char *name, bpf_u_int32 flags,
+pcap_find_or_add_dev(pcap_if_list_t *devlistp, const char *name, bpf_u_int32 flags,
     get_if_flags_func get_flags_func, const char *description, char *errbuf)
 {
        pcap_if_t *curdev;
@@ -1240,7 +1240,7 @@ find_or_add_dev(pcap_if_list_t *devlistp, const char *name, bpf_u_int32 flags,
        /*
         * Is there already an entry in the list for this device?
         */
-       curdev = find_dev(devlistp, name);
+       curdev = pcap_find_dev(devlistp, name);
        if (curdev != NULL) {
                /*
                 * Yes, return it.
@@ -1265,7 +1265,7 @@ find_or_add_dev(pcap_if_list_t *devlistp, const char *name, bpf_u_int32 flags,
        /*
         * Now, try to add it to the list of devices.
         */
-       return (add_dev(devlistp, name, flags, description, errbuf));
+       return (pcap_add_dev(devlistp, name, flags, description, errbuf));
 }
 
 /*
@@ -1273,7 +1273,7 @@ find_or_add_dev(pcap_if_list_t *devlistp, const char *name, bpf_u_int32 flags,
  * the entry for it if we find it or NULL if we don't.
  */
 pcap_if_t *
-find_dev(pcap_if_list_t *devlistp, const char *name)
+pcap_find_dev(pcap_if_list_t *devlistp, const char *name)
 {
        pcap_if_t *curdev;
 
@@ -1307,7 +1307,7 @@ find_dev(pcap_if_list_t *devlistp, const char *name)
  * If we weren't given a description, try to get one.
  */
 pcap_if_t *
-add_dev(pcap_if_list_t *devlistp, const char *name, bpf_u_int32 flags,
+pcap_add_dev(pcap_if_list_t *devlistp, const char *name, bpf_u_int32 flags,
     const char *description, char *errbuf)
 {
        pcap_if_t *curdev, *prevdev, *nextdev;

diff --git a/savefile.c b/savefile.c
index db8a3aa0597206f894cd1a8cca00156ad4c475b8..3bf2e77ba11f69be8cdf8f0be71aa27c6b3b81b2 100644 (file)
--- a/savefile.c
+++ b/savefile.c
@@ -248,7 +248,7 @@ sf_setdirection(pcap_t *p, pcap_direction_t d _U_)
 }
 
 void
-sf_cleanup(pcap_t *p)
+pcap_sf_cleanup(pcap_t *p)
 {
        if (p->rfile != stdin)
                (void)fclose(p->rfile);
@@ -268,7 +268,7 @@ sf_cleanup(pcap_t *p)
  * local code page.
  */
 FILE *
-charset_fopen(const char *path, const char *mode)
+pcap_charset_fopen(const char *path, const char *mode)
 {
        wchar_t *utf16_path;
 #define MAX_MODE_LEN   16
@@ -375,7 +375,7 @@ pcap_open_offline_with_tstamp_precision(const char *fname, u_int precision,
        }
        else {
                /*
-                * Use charset_fopen(); on Windows, it tests whether we're
+                * Use pcap_charset_fopen(); on Windows, it tests whether we're
                 * in "local code page" or "UTF-8" mode, and treats the
                 * pathname appropriately, and on other platforms, it just
                 * wraps fopen().
@@ -384,7 +384,7 @@ pcap_open_offline_with_tstamp_precision(const char *fname, u_int precision,
                 * support it, even though it does nothing.  For MS-DOS,
                 * we again need it.
                 */
-               fp = charset_fopen(fname, "rb");
+               fp = pcap_charset_fopen(fname, "rb");
                if (fp == NULL) {
                        pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
                            errno, "%s", fname);
@@ -564,7 +564,7 @@ found:
        p->can_set_rfmon_op = sf_cant_set_rfmon;
        p->read_op = pcap_offline_read;
        p->inject_op = sf_inject;
-       p->setfilter_op = install_bpf_program;
+       p->setfilter_op = pcap_install_bpf_program;
        p->setdirection_op = sf_setdirection;
        p->set_datalink_op = NULL;      /* we don't support munging link-layer headers */
        p->getnonblock_op = sf_getnonblock;

diff --git a/sf-pcap.c b/sf-pcap.c
index 6f34dc76d8c16e4b810e5de2c461feb91e9afa81..8ac1c6adb8e99dbc6c0fba25f73b375c5279cd90 100644 (file)
--- a/sf-pcap.c
+++ b/sf-pcap.c
@@ -418,7 +418,7 @@ pcap_check_header(const uint8_t *magic, FILE *fp, u_int precision, char *errbuf,
                return (NULL);
        }
 
-       p->cleanup_op = sf_cleanup;
+       p->cleanup_op = pcap_sf_cleanup;
 
        return (p);
 }
@@ -864,7 +864,7 @@ pcap_dump_open(pcap_t *p, const char *fname)
                 * required on Windows, as the file is a binary file
                 * and must be written in binary mode.
                 */
-               f = charset_fopen(fname, "wb");
+               f = pcap_charset_fopen(fname, "wb");
                if (f == NULL) {
                        pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
                            errno, "%s", fname);
@@ -964,7 +964,7 @@ pcap_dump_open_append(pcap_t *p, const char *fname)
         * even though it does nothing.  It's required on Windows, as the
         * file is a binary file and must be read in binary mode.
         */
-       f = charset_fopen(fname, "ab+");
+       f = pcap_charset_fopen(fname, "ab+");
        if (f == NULL) {
                pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
                    errno, "%s", fname);

diff --git a/sf-pcapng.c b/sf-pcapng.c
index cf87ac66e8542c5d78ae45d3eb005920e2a5c552..3a9fa23a05ab09fde8ad5464cd5dcbd90f0711f2 100644 (file)
--- a/sf-pcapng.c
+++ b/sf-pcapng.c
@@ -1090,7 +1090,7 @@ pcap_ng_cleanup(pcap_t *p)
        struct pcap_ng_sf *ps = p->priv;
 
        free(ps->ifaces);
-       sf_cleanup(p);
+       pcap_sf_cleanup(p);
 }
 
 /*