author | Jon Anderson <jon.anderson@oracle.com> |
Tue, 23 Sep 2014 17:26:18 +0100 | |
branch | s11-update |
changeset 3321 | c6fc96bbb1e6 |
permissions | -rw-r--r-- |
3321
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
1 |
# |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
2 |
# This patch was devleloped in house. The changes have been fed |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
3 |
# upstream and were merged into the-tcpdump-group/libpcap. This |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
4 |
# was committed under 2f9790bd3cfe56c0f78d10953571dc4b34060e4f. |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
5 |
# |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
6 |
# libpcap-1.7.0 is the projected release which will include this |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
7 |
# change. |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
8 |
# |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
9 |
--- libpcap-1.5.1/pcap-bpf.c 2014-08-14 16:14:46.837979600 +0100 |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
10 |
+++ libpcap-1.5.1/pcap-bpf.c 2014-08-18 15:13:20.805460460 +0100 |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
11 |
@@ -1539,22 +1539,43 @@ |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
12 |
|
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
13 |
#if defined(LIFNAMSIZ) && defined(ZONENAME_MAX) && defined(lifr_zoneid) |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
14 |
/* |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
15 |
+ * Retrieve the zoneid of the zone we are currently executing in. |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
16 |
+ */ |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
17 |
+ if ((ifr.lifr_zoneid = getzoneid()) == -1) { |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
18 |
+ snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "getzoneid(): %s", |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
19 |
+ pcap_strerror(errno)); |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
20 |
+ status = PCAP_ERROR; |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
21 |
+ goto bad; |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
22 |
+ } |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
23 |
+ /* |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
24 |
* Check if the given source network device has a '/' separated |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
25 |
- * zonename prefix string. The zonename prefixed source device |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
26 |
- * can be used by libpcap consumers to capture network traffic |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
27 |
- * in non-global zones from the global zone on Solaris 11 and |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
28 |
- * above. If the zonename prefix is present then we strip the |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
29 |
- * prefix and pass the zone ID as part of lifr_zoneid. |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
30 |
+ * zonename prefix string. The zonename prefixed source device can |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
31 |
+ * be used by pcap consumers in the Solaris global zone to capture |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
32 |
+ * traffic on datalinks in non-global zones. Non-global zones |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
33 |
+ * do not have access to datalinks outside of their own namespace. |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
34 |
*/ |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
35 |
if ((zonesep = strchr(p->opt.source, '/')) != NULL) { |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
36 |
- char zonename[ZONENAME_MAX]; |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
37 |
+ char path_zname[ZONENAME_MAX]; |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
38 |
int znamelen; |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
39 |
char *lnamep; |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
40 |
|
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
41 |
+ if (ifr.lifr_zoneid != GLOBAL_ZONEID) { |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
42 |
+ snprintf(p->errbuf, PCAP_ERRBUF_SIZE, |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
43 |
+ "zonename/linkname only valid in global zone."); |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
44 |
+ status = PCAP_ERROR; |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
45 |
+ goto bad; |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
46 |
+ } |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
47 |
znamelen = zonesep - p->opt.source; |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
48 |
- (void) strlcpy(zonename, p->opt.source, znamelen + 1); |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
49 |
+ (void) strlcpy(path_zname, p->opt.source, znamelen + 1); |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
50 |
+ ifr.lifr_zoneid = getzoneidbyname(path_zname); |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
51 |
+ if (ifr.lifr_zoneid == -1) { |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
52 |
+ snprintf(p->errbuf, PCAP_ERRBUF_SIZE, |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
53 |
+ "getzoneidbyname(%s): %s", path_zname, |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
54 |
+ pcap_strerror(errno)); |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
55 |
+ status = PCAP_ERROR; |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
56 |
+ goto bad; |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
57 |
+ } |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
58 |
lnamep = strdup(zonesep + 1); |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
59 |
- ifr.lifr_zoneid = getzoneidbyname(zonename); |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
60 |
free(p->opt.source); |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
61 |
p->opt.source = lnamep; |
c6fc96bbb1e6
19352199 libpcap does not handle zoneid and zoneid/linkname correctly
Jon Anderson <jon.anderson@oracle.com>
parents:
diff
changeset
|
62 |
} |