| author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
| Fri, 13 May 2016 17:33:30 -0700 | |
| changeset 5983 | f10ab5ae99d7 |
| parent 5844 | ba7883e92c55 |
| permissions | -rw-r--r-- |
|
5844
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
1 |
Adding the "any" pseudo-device since Solaris supports it. |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
2 |
This is an in-house patch and will eventually be sent upstream. |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
3 |
|
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
4 |
*** libpcap-1.7.4/pcap-bpf.c Mon Mar 9 12:22:07 2015 |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
5 |
--- new/pcap-bpf.c Mon Apr 11 16:50:19 2016 |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
6 |
*************** |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
7 |
*** 2309,2314 **** |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
8 |
--- 2309,2325 ---- |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
9 |
int |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
10 |
pcap_platform_finddevs(pcap_if_t **alldevsp, char *errbuf) |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
11 |
{
|
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
12 |
+ |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
13 |
+ #ifdef DLT_IPNET |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
14 |
+ /* |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
15 |
+ * Adding the "any" pseudo-device |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
16 |
+ */ |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
17 |
+ const char any_descr[] = "Pseudo-device that captures on all interfaces"; |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
18 |
+ if (pcap_add_if(alldevsp, "any", IFF_UP|IFF_RUNNING, |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
19 |
+ any_descr, errbuf) < 0) |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
20 |
+ return (-1); |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
21 |
+ #endif |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
22 |
+ |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
23 |
return (0); |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
24 |
} |
|
ba7883e92c55
PSARC/2016/205 Support for 'any' keyword in libpcap
vardhnee.ramanujam.ravi@oracle.com <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
25 |