Resolve conflict

Change-Id: Ie0b140dacc19f5ae4d0a96ecb3dea7aeae35d141
Signed-off-by: Cheoleun Moon <chleun.moon@samsung.com>

diff --cc fad-gifc.c
index 1af801a,6b16127..7dd6c55
--- 1/fad-gifc.c
--- 2/fad-gifc.c
+++ b/fad-gifc.c
@@@ -152,10 -158,10 +158,10 @@@ pcap_findalldevs_interfaces(pcap_if_lis
        /*
         * Create a socket from which to fetch the list of interfaces.
         */
 -      fd = socket(AF_INET, SOCK_DGRAM, 0);
 +      fd = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC, 0);
        if (fd < 0) {
-               (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
-                   "socket: %s", pcap_strerror(errno));
+               pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "socket");
                return (-1);
        }
  

diff --cc fad-glifc.c
index 045808a,f22f56d..cdaae73
--- 1/fad-glifc.c
--- 2/fad-glifc.c
+++ b/fad-glifc.c
@@@ -95,20 -95,20 +95,20 @@@ pcap_findalldevs_interfaces(pcap_if_lis
         * Create a socket from which to fetch the list of interfaces,
         * and from which to fetch IPv4 information.
         */
 -      fd4 = socket(AF_INET, SOCK_DGRAM, 0);
 +      fd4 = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC, 0);
        if (fd4 < 0) {
-               (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
-                   "socket: %s", pcap_strerror(errno));
+               pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "socket: AF_INET");
                return (-1);
        }
  
        /*
         * Create a socket from which to fetch IPv6 information.
         */
 -      fd6 = socket(AF_INET6, SOCK_DGRAM, 0);
 +      fd6 = socket(AF_INET6, SOCK_DGRAM|SOCK_CLOEXEC, 0);
        if (fd6 < 0) {
-               (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
-                   "socket: %s", pcap_strerror(errno));
+               pcap_fmt_errmsg_for_errno(errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "socket: AF_INET6");
                (void)close(fd4);
                return (-1);
        }

diff --cc nametoaddr.c
Simple merge

diff --cc packaging/libpcap.spec
index accb68b,0000000..5f171c1
mode 100644,000000..100644
--- 1/packaging/libpcap.spec
--- /dev/null
+++ b/packaging/libpcap.spec
@@@ -1,67 -1,0 +1,68 @@@
- Version:        1.6.1
 +%define keepstatic 1
 +Name:           libpcap
++Version:        1.9.1
 +Release:        1
 +License:        BSD-3-Clause
 +Summary:        A Library for Network Sniffers
 +Url:            http://www.tcpdump.org/
 +Group:          System/Libraries
 +Source:         %{name}-%{version}.tar.gz
 +Source2:        baselibs.conf
 +Source1001:   libpcap.manifest
 +BuildRequires:  automake
 +BuildRequires:  bison
 +BuildRequires:  flex
 +BuildRequires:  libusb-devel
 +
 +%description
 +libpcap is a library used by packet sniffer programs. It provides an
 +interface for them to capture and analyze packets from network devices.
 +This package is only needed if you plan to compile or write such a
 +program yourself.
 +
 +%package devel
 +Summary:        A Library for Network Sniffers
 +Group:          Development/Libraries/C and C++
 +Requires:       libpcap = %{version}
 +
 +%description devel
 +libpcap is a library used by packet sniffer programs. It provides an
 +interface for them to capture and analyze packets from network devices.
 +This package is only needed if you plan to compile or write such a
 +program yourself.
 +
 +%prep
 +%setup -q
 +cp %{SOURCE1001} .
 +
 +%build
 +pic="pic"
 +autoreconf -fiv
 +export CFLAGS="%{optflags} -f$pic" CXXFLAGS="%{optflags} -f$pic"
 +%configure \
 +  --enable-ipv6
 +make %{?_smp_mflags} all shared
 +
 +%install
 +%make_install
 +
 +%docs_package
 +
 +%post  -p /sbin/ldconfig
 +
 +%postun -p /sbin/ldconfig
 +
 +%files
 +%manifest %{name}.manifest
 +%defattr(-, root, root)
 +%doc LICENSE
 +%{_libdir}/*.so.*
 +
 +%files devel
 +%manifest %{name}.manifest
 +%defattr(-, root, root)
 +%{_includedir}/*
 +%{_bindir}/pcap-config
 +%{_libdir}/*.so
 +%{_libdir}/*.*a
++%{_libdir}/pkgconfig/*.pc

diff --cc pcap-bt-linux.c
index ea70f17,9c8712e..3021cea
--- 1/pcap-bt-linux.c
--- 2/pcap-bt-linux.c
+++ b/pcap-bt-linux.c
@@@ -78,17 -74,18 +74,18 @@@ bt_findalldevs(pcap_if_list_t *devlistp
  {
        struct hci_dev_list_req *dev_list;
        struct hci_dev_req *dev_req;
-       int i, sock;
+       int sock;
+       unsigned i;
        int ret = 0;
 -
 -      sock  = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
 +      
 +      sock  = socket(AF_BLUETOOTH, SOCK_RAW|SOCK_CLOEXEC, BTPROTO_HCI);
        if (sock < 0)
        {
-               /* if bluetooth is not supported this this is not fatal*/ 
+               /* if bluetooth is not supported this is not fatal*/
                if (errno == EAFNOSUPPORT)
                        return 0;
-               snprintf(err_str, PCAP_ERRBUF_SIZE,
-                   "Can't open raw Bluetooth socket: %s", strerror(errno));
+               pcap_fmt_errmsg_for_errno(err_str, PCAP_ERRBUF_SIZE,
+                   errno, "Can't open raw Bluetooth socket");
                return -1;
        }
  
@@@ -212,12 -224,12 +224,12 @@@ bt_activate(pcap_t* handle
        handle->setnonblock_op = pcap_setnonblock_fd;
        handle->stats_op = bt_stats_linux;
        handlep->dev_id = dev_id;
-       
+ 
        /* Create HCI socket */
 -      handle->fd = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
 +      handle->fd = socket(AF_BLUETOOTH, SOCK_RAW|SOCK_CLOEXEC, BTPROTO_HCI);
        if (handle->fd < 0) {
-               snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-                   "Can't create raw socket: %s", strerror(errno));
+               pcap_fmt_errmsg_for_errno(handle->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "Can't create raw socket");
                return PCAP_ERROR;
        }
  

diff --cc pcap-nit.c
index c106861,6a1a77c..2ac4d71
--- 1/pcap-nit.c
--- 2/pcap-nit.c
+++ b/pcap-nit.c
@@@ -278,10 -289,10 +289,10 @@@ pcap_activate_nit(pcap_t *p
                p->snapshot = 96;
  
        memset(p, 0, sizeof(*p));
 -      p->fd = fd = socket(AF_NIT, SOCK_RAW, NITPROTO_RAW);
 +      p->fd = fd = socket(AF_NIT, SOCK_RAW|SOCK_CLOEXEC, NITPROTO_RAW);
        if (fd < 0) {
-               snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
-                   "socket: %s", pcap_strerror(errno));
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "socket");
                goto bad;
        }
        snit.snit_family = AF_NIT;

diff --cc pcap-sita.c
Simple merge

diff --cc pcap-snit.c
index 0992af9,9c6fbd4..b633d30
--- 1/pcap-snit.c
--- 2/pcap-snit.c
+++ b/pcap-snit.c
@@@ -316,12 -328,16 +328,16 @@@ pcap_activate_snit(pcap_t *p
         * the device in question) can be indicated at open
         * time.
         */
 -      p->fd = fd = open(dev, O_RDWR);
 +      p->fd = fd = open(dev, O_RDWR|O_CLOEXEC);
        if (fd < 0 && errno == EACCES)
 -              p->fd = fd = open(dev, O_RDONLY);
 +              p->fd = fd = open(dev, O_RDONLY|O_CLOEXEC);
        if (fd < 0) {
-               snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "%s: %s", dev,
-                   pcap_strerror(errno));
+               if (errno == EACCES)
+                       err = PCAP_ERROR_PERM_DENIED;
+               else
+                       err = PCAP_ERROR;
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "%s", dev);
                goto bad;
        }
  

diff --cc pcap-snoop.c
index fcd37d0,a598bae..c6c8f22
--- 1/pcap-snoop.c
--- 2/pcap-snoop.c
+++ b/pcap-snoop.c
@@@ -210,10 -210,10 +210,10 @@@ pcap_activate_snoop(pcap_t *p
        int snooplen;
        struct ifreq ifr;
  
 -      fd = socket(PF_RAW, SOCK_RAW, RAWPROTO_SNOOP);
 +      fd = socket(PF_RAW, SOCK_RAW|SOCK_CLOEXEC, RAWPROTO_SNOOP);
        if (fd < 0) {
-               snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "snoop socket: %s",
-                   pcap_strerror(errno));
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "snoop socket");
                goto bad;
        }
        p->fd = fd;

diff --cc pcap/bpf.h
Simple merge