Permalink
Commits on Dec 14, 2016
  1. Merge "Support shared lib for libpcap."

    Treehugger Robot committed with Gerrit Code Review Dec 14, 2016
  2. Support shared lib for libpcap.

    libpcap is linked by netd (system/netd/server/Android.mk), tcpdump
    (/external/tcpdump/Android.mk) and some verdors' components.
    
    So using it as shared lib will be good for easy update and size
    reduction.
    
    Test: building succeeded, and the image was tested on angler.
    Bug: 33056637
    Change-Id: I1f346970ab69839155550bbc46fc89461679de1e
    Jaekyun Seok committed Dec 12, 2016
Commits on Jun 11, 2016
  1. Merge \\\"libpcap should admit that it uses BSD extensions.\\\" am: 7…

    …7fb6b5 am: 6006c93
    
    am: 7972587
    
    Change-Id: If60dd70b551ca4af1ad6036d9936c8b59b0eb16f
    enh committed with android-build-merger Jun 11, 2016
  2. Merge \\"libpcap should admit that it uses BSD extensions.\\" am: 77f…

    …b6b5
    
    am: 6006c93
    
    Change-Id: I9173d3a53b108d2eb66e99d9ed5f027237184440
    enh committed with android-build-merger Jun 11, 2016
  3. Merge \"libpcap should admit that it uses BSD extensions.\"

    am: 77fb6b5
    
    Change-Id: Ib2877ef2fda77a54ab5b70ebabb21fd6d1bd8ec5
    enh committed with android-build-merger Jun 11, 2016
  4. Merge "libpcap should admit that it uses BSD extensions."

    Treehugger Robot committed with Gerrit Code Review Jun 11, 2016
Commits on Jun 10, 2016
  1. libpcap should admit that it uses BSD extensions.

    Change-Id: If063637a0152f5b4fe25740e1c6d859041d18ea7
    enh committed Jun 10, 2016
Commits on Apr 29, 2016
  1. Merge changes I02a085bf,Id5433d1d am: 9643d9c am: de73502

    am: c7958c1
    
    * commit 'c7958c10f7c77bd2acd81bd3eb4997d5cd5a3047':
      Add #ifndef checks for macros
      Clean up version test
    
    Change-Id: If4210b1941f5986b88313920399f99e5805d2cc9
    Aurimas Liutikas committed with android-build-merger Apr 29, 2016
  2. Merge changes I02a085bf,Id5433d1d am: 9643d9c

    am: de73502
    
    * commit 'de735023f2b745640c553774decf9d5faeb4719c':
      Add #ifndef checks for macros
      Clean up version test
    
    Change-Id: Ie07c5857c5dc18363cac5bcc8b22db3c538df75b
    Aurimas Liutikas committed with android-build-merger Apr 29, 2016
  3. Merge changes I02a085bf,Id5433d1d

    am: 9643d9c
    
    * commit '9643d9ce738f0d2c820f6e6b468f9a803363c5d0':
      Add #ifndef checks for macros
      Clean up version test
    
    Change-Id: I9334a2818f8351269127316fd2c0e401cf88e74c
    Aurimas Liutikas committed with android-build-merger Apr 29, 2016
  4. Merge changes I02a085bf,Id5433d1d

    * changes:
      Add #ifndef checks for macros
      Clean up version test
    Aurimas Liutikas committed with Gerrit Code Review Apr 29, 2016
  5. Add #ifndef checks for macros

    Add #ifndef checks for BPF_STMT and BPF_JUMP macros.
    
    Bug: 26936282
    Change-Id: I02a085bf8eccb5c3ba236b07c66b64afa02bb2a5
    Aurimas Liutikas committed Apr 29, 2016
  6. Clean up version test

    !(nfhdr->nflog_version) is equivalent to (nfhdr->nflog_version == 0).
    
    That will evaluate to 1 if nfhdr->nflog_version is 0 and to 0 otherwise.
    
    So !(nfhdr->nflog_version) == 0 is equivalent to nfhdr->nflog_version != 0,
    but 1) it's more obvious what it means and 2) compilers don't point out
    that it may not mean what you intended.
    
    This is a cherry-pick of upstream commit:
    the-tcpdump-group/libpcap@f94cd1e
    
    Bug: 26936282
    Change-Id: Id5433d1dcb8b866f7b358174962add447801c9d8
    Aurimas Liutikas committed Apr 29, 2016
Commits on Oct 22, 2015
  1. Merge "Restore the MODULE_LICENSE_BSD and NOTICE files."

    am: a512e16
    
    * commit 'a512e16c8cb9509697a5f983b71987e7e0c91ba3':
      Restore the MODULE_LICENSE_BSD and NOTICE files.
    enh committed with android-build-merger Oct 22, 2015
  2. Merge "Restore the MODULE_LICENSE_BSD and NOTICE files."

    enh committed with Gerrit Code Review Oct 22, 2015
  3. Restore the MODULE_LICENSE_BSD and NOTICE files.

    Accidentally removed during the last upgrade.
    
    Change-Id: I00b7eddbbf1eb094383a151e4a29717019141e46
    enh committed Oct 22, 2015
  4. Merge "Upgrade to libpcap 1.7.4."

    am: e76baba
    
    * commit 'e76baba7599e88b3fac3ffee0614996640c8bd86':
      Upgrade to libpcap 1.7.4.
    enh committed with android-build-merger Oct 22, 2015
  5. Merge "Upgrade to libpcap 1.7.4."

    enh committed with Gerrit Code Review Oct 22, 2015
Commits on Oct 20, 2015
  1. Upgrade to libpcap 1.7.4.

    Bug: http://b/24902618
    Change-Id: I1bb6c1163b573eb01b4bed7c494a6d447e8d45cf
    enh committed Oct 20, 2015
Commits on Jun 3, 2015
  1. package version metadata for external/

    This will be used for automated notification of external vulnerability
    reports.
    
    Change-Id: Id9f6dc034ae6482f4271e5d2612964239322bf79
    Damien Miller committed Jun 3, 2015
Commits on Apr 2, 2015
  1. Merge "Android has strlcpy(3)."

    enh committed with Gerrit Code Review Apr 2, 2015
  2. Android has strlcpy(3).

    Change-Id: I0bd6e0638d1909e6fa989e7c4af08aa3acda50a7
    enh committed Apr 2, 2015
Commits on Mar 18, 2015
  1. Merge "Add NOTICE and MODULE_LICENSE files"

    Conley Owens committed with Gerrit Code Review Mar 18, 2015
Commits on Mar 13, 2015
  1. Add NOTICE and MODULE_LICENSE files

    Change-Id: I20621df5ca49dd514c7a3794ccfe1ce35dc5f16d
    Conley Owens committed Mar 13, 2015
Commits on Jan 16, 2015
  1. Merge "Expose nflog_send_config_cmd() for netd."

    jsharkey committed with Gerrit Code Review Jan 16, 2015
Commits on Jan 14, 2015
  1. Expose nflog_send_config_cmd() for netd.

    Bug: 18335678
    Change-Id: I9c35ef71f64e59bea5e70669e08e28a42f4b5d7e
    jsharkey committed Dec 17, 2014
Commits on Feb 27, 2014
  1. Merge remote-tracking branch 'goog/master' into update_tcpdump

    * goog/master:
      Get libpcap 1.5.2+ to compile on Android.
      Merge remote-tracking branch 'goog/tcpdump'
    JP Abgrall committed Feb 27, 2014
Commits on Feb 12, 2014
  1. Get libpcap 1.5.2+ to compile on Android.

    Fix an incorrect mempcopy().
    Pre-generate: scanner.c scanner.h grammar.c
      bpf_filter.c (symlink) version.c version.h
    
    Change-Id: I8d86864c2b4eabd96ce9b0013bd9f31807fb6efd
    JP Abgrall committed Feb 11, 2014
  2. Merge remote-tracking branch 'goog/tcpdump'

    * goog/tcpdump: (1872 commits)
      Remove old version. Getting ready for new libpcap 1.5
      Remove commas from clauses in a comma-separated list.
      Fix typo.
      Describe all NFLOG TLV types and define structures for some of them.
      Check caplen in the NFLOG TLV loop.
      Have nflog_tlv_t include only the TLV header.
      Byte-swap the T and L in TLVs as necessary when reading an NFLOG file.
      Don't support D-Bus sniffing on OS X.
      Add post-1.5.2 bug fixes.
      Tag some changes with a bug identifier.
      Add items for 1.5.1 and 1.5.2.
      Formatting tweak.
      Count *ring buffer blocks*, not *packets* to be filtered in userland.
      Add a PACKET_COUNT_IS_UNLIMITED() to test for a packet count <= 0.
      Use HAVE_TPACKET3 rather than TPACKET_V3 to test for TPACKET_V3 support.
      Fix builds on systems without TPACKET_V3.
      tweak manpages formatting
      Fix pcap_loop() with a count of 0 and TPACKET_V3.
      Discourage the use of a zero timeout.
      We can't use TPACKET_V3 in immediate mode, so fall back on TPACKET_V2.
      ...
    
    Change-Id: I2aa9bd87673c56aee439e1154b96a14026ca7985
    JP Abgrall committed Feb 12, 2014
Commits on Mar 9, 2010
  1. Add an empty CleanSpec.mk

    Change-Id: I5587777658a5b2148289aeb8c1c996a4014ce85e
    Jean-Baptiste Queru committed Mar 9, 2010
Commits on Feb 5, 2010
  1. reconcile main tree with open-source eclair

    The Android Open Source Project committed Feb 5, 2010
Commits on Jan 29, 2010
  1. reconcile android-2.1_r1 snapshot

    The Android Open Source Project committed Jan 29, 2010
Commits on Jan 12, 2010
  1. android-2.1_r1 snapshot

    The Android Open Source Project committed Jan 12, 2010
Commits on Jul 26, 2009
  1. reconcile korg/master into goog/master

    Jean-Baptiste Queru committed Jul 26, 2009
  2. Merge korg/donut into korg/master

    Jean-Baptiste Queru committed Jul 26, 2009