Commit Graph

13 Commits

Author SHA1 Message Date
christos bb7460091b merge conflicts 2019-10-01 16:02:11 +00:00
christos 3b604290f1 merge conflicts 2018-09-03 15:26:43 +00:00
ginsbach 7ab23dde59 PR lib/51952: Brad Harder: Apply upstream ada959c9
[From upstream tcpdump]
 In pcap_compile(), first check whether the pcap_t is activated.

 Before we allocate or otherwise set up anything, check whether the
 pcap_t is activated, and set the error message string and return -1 if
 it's not.

 That way, we don't go through the cleanup code in that code path -
 there's nothing to clean up.

 Fixes the issue in GitHub pull request #552.

XXX: pullup-8
2017-08-12 00:43:25 +00:00
christos db7feebfd5 merge conflicts. 2017-01-24 22:29:28 +00:00
christos bd64c25012 merge conflicts 2015-03-31 21:39:42 +00:00
christos d91862193c merge changes 2014-11-19 19:33:30 +00:00
christos 511f4361e2 resolve conflicts. 2013-12-31 17:08:14 +00:00
christos 17e55052cd new libpcap 2013-04-06 17:29:12 +00:00
christos 7abb9aefee Don't use libpcap's bpf file, but use our own:
1. include <net/dlt.h> where needed since we have the information in a separate
   file.
2. #error in pcap/bpf.h to make sure it is not being used.
3. If we don't include <pcap/bpf.h> include <net/bpf.h> instead.
4. Install symlinks instead of copies of files.
2011-12-21 19:00:27 +00:00
joerg ce5205bcbb Use __dead 2011-09-16 16:09:03 +00:00
christos 74c505a81b - add our fixes
- make compile with WARNS=5
- add glue
2010-12-05 01:45:46 +00:00
christos 62ed3ef9cc try again fixing RCS keywords 2010-12-05 01:26:52 +00:00
christos bf1df6d193 Import libpcap-1.1.1 2010-12-05 01:20:21 +00:00