Commits on Jun 11, 2016
  1. 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. @enh

    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

    * changes:
      Add #ifndef checks for macros
      Clean up version test
    Aurimas Liutikas committed with Gerrit Code Review Apr 29, 2016
  2. 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
  3. 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. @enh

    Merge "Restore the MODULE_LICENSE_BSD and NOTICE files."

    enh committed with Gerrit Code Review Oct 22, 2015
  2. @enh

    Restore the MODULE_LICENSE_BSD and NOTICE files.

    Accidentally removed during the last upgrade.
    
    Change-Id: I00b7eddbbf1eb094383a151e4a29717019141e46
    enh committed Oct 22, 2015
  3. @enh

    Merge "Upgrade to libpcap 1.7.4."

    enh committed with Gerrit Code Review Oct 22, 2015
Commits on Oct 20, 2015
  1. @enh

    Upgrade to libpcap 1.7.4.

    Bug: http://b/24902618
    Change-Id: I1bb6c1163b573eb01b4bed7c494a6d447e8d45cf
    enh committed Oct 19, 2015
Commits on Apr 2, 2015
  1. @enh

    Merge "Android has strlcpy(3)."

    enh committed with Gerrit Code Review Apr 2, 2015
  2. @enh

    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 12, 2015
Commits on Jan 16, 2015
  1. @jsharkey

    Merge "Expose nflog_send_config_cmd() for netd."

    jsharkey committed with Gerrit Code Review Jan 16, 2015
Commits on Jan 14, 2015
  1. @jsharkey

    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 26, 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 10, 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 8, 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 25, 2009
Commits on May 27, 2009
  1. am f341270: remove a *.orig file left over from a merge

    Merge commit 'f341270e30dd82bf004f2b87cacae1482ca4d50e'
    
    * commit 'f341270e30dd82bf004f2b87cacae1482ca4d50e':
      remove a *.orig file left over from a merge
    Iliyan Malchev committed with The Android Open Source Project May 26, 2009
Commits on Apr 28, 2009
  1. remove a *.orig file left over from a merge

    Signed-off-by: Iliyan Malchev <malchev@google.com>
    Iliyan Malchev committed Apr 28, 2009
Commits on Apr 23, 2009
  1. Merge donut into master

    Jean-Baptiste Queru committed Apr 22, 2009
Commits on Mar 29, 2009
  1. Merge branch 'open_source_no_contributions' into google_internal

    The Android Open Source Project committed Mar 29, 2009
Commits on Mar 18, 2009
  1. Merge commit 'remotes/korg/cupcake' into cupcake_to_master

    Jean-Baptiste Queru committed Mar 18, 2009
Commits on Mar 4, 2009
  1. auto import from //depot/cupcake/@135843

    The Android Open Source Project committed Mar 3, 2009
  2. auto import from //depot/cupcake/@135843

    The Android Open Source Project committed Mar 3, 2009
Commits on Jan 10, 2009
  1. Merge branch 'cupcake'

    The Android Open Source Project committed Jan 9, 2009
  2. auto import from //branches/cupcake/...@125939

    The Android Open Source Project committed Jan 9, 2009
Commits on Dec 18, 2008
  1. Code drop from //branches/cupcake/...@124589

    The Android Open Source Project committed Dec 17, 2008
Commits on Oct 21, 2008
  1. Initial Contribution

    The Android Open Source Project committed Oct 21, 2008