Permalink
Browse files

OS-2800 Project Bardiche

OS-2784 want sdev plugin interface
OS-2783 want generalized squeues
OS-2785 ipf should be able to hook kvm nics
OS-2782 want /dev/net/zone/%zonename/%datalink
OS-610 snoop and libdlpi should be able to consume /dev/net/zone/%zonename
OS-2786 .gitignore should include debug object directories
OS-2781 dlpi promisc modes should be able to be RX-only
OS-2780 Want dlpi primitive DL_EXCLUSIVE_REQ
OS-2779 Makefile.man should take care of directory creation
OS-2778 dls_promisc doesn't properly handle all transitions
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
  • Loading branch information...
rmustacc committed Mar 19, 2014
1 parent fcf3046 commit ad740f5f23aca9052a27984d4912ec9379c611bf
Showing with 18,908 additions and 351 deletions.
  1. +2 −0 .gitignore
  2. +1 −0 exception_lists/cstyle
  3. +40 −0 manifest
  4. +3 −1 usr/src/cmd/Makefile
  5. +1 −0 usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile
  6. +7 −3 usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop.c
  7. +1 −1 usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop.h
  8. +6 −2 usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_capture.c
  9. +65 −0 usr/src/cmd/vndadm/Makefile
  10. +19 −0 usr/src/cmd/vndadm/test/Makefile
  11. +43 −0 usr/src/cmd/vndadm/test/Makefile.com
  12. +29 −0 usr/src/cmd/vndadm/test/Makefile.subdirs
  13. +59 −0 usr/src/cmd/vndadm/test/Makefile.targ
  14. +28 −0 usr/src/cmd/vndadm/test/scripts/Makefile
  15. +300 −0 usr/src/cmd/vndadm/test/scripts/vndtest.ksh
  16. +18 −0 usr/src/cmd/vndadm/test/tst/Makefile
  17. +34 −0 usr/src/cmd/vndadm/test/tst/cmd/Makefile
  18. +33 −0 usr/src/cmd/vndadm/test/tst/cmd/cmd.common.ksh
  19. +30 −0 usr/src/cmd/vndadm/test/tst/cmd/create.list.ksh
  20. +2 −0 usr/src/cmd/vndadm/test/tst/cmd/create.list.ksh.out
  21. +25 −0 usr/src/cmd/vndadm/test/tst/cmd/create.sdev.ksh
  22. +34 −0 usr/src/cmd/vndadm/test/tst/cmd/create.setbuf.ksh
  23. +25 −0 usr/src/cmd/vndadm/test/tst/cmd/ecreate.destroy.ksh
  24. +24 −0 usr/src/cmd/vndadm/test/tst/cmd/ecreate.setbadprop.ksh
  25. +24 −0 usr/src/cmd/vndadm/test/tst/cmd/ecreate.setbadvalue.ksh
  26. +24 −0 usr/src/cmd/vndadm/test/tst/cmd/ecreate.setbuftoobig.ksh
  27. +24 −0 usr/src/cmd/vndadm/test/tst/cmd/ecreate.setrdonlyprop.ksh
  28. +27 −0 usr/src/cmd/vndadm/test/tst/dld/Makefile
  29. +31 −0 usr/src/cmd/vndadm/test/tst/dld/create.reuse.ksh
  30. +29 −0 usr/src/cmd/vndadm/test/tst/dld/dld.common.ksh
  31. +27 −0 usr/src/cmd/vndadm/test/tst/dld/ecreate.ipfirst.ksh
  32. +27 −0 usr/src/cmd/vndadm/test/tst/dld/ecreate.vndfirst.ksh
  33. +49 −0 usr/src/cmd/vndadm/test/tst/ioctl/Makefile
  34. +63 −0 usr/src/cmd/vndadm/test/tst/ioctl/create.attach.c
  35. +67 −0 usr/src/cmd/vndadm/test/tst/ioctl/create.attachnolink.c
  36. +119 −0 usr/src/cmd/vndadm/test/tst/ioctl/create.badlinkname.c
  37. +82 −0 usr/src/cmd/vndadm/test/tst/ioctl/create.doublelink.c
  38. +69 −0 usr/src/cmd/vndadm/test/tst/ioctl/create.gioctlattach.c
  39. +76 −0 usr/src/cmd/vndadm/test/tst/ioctl/create.link.c
  40. +90 −0 usr/src/cmd/vndadm/test/tst/ioctl/create.linkexists.c
  41. +96 −0 usr/src/cmd/vndadm/test/tst/ioctl/create.ngioctlfault.c
  42. +69 −0 usr/src/cmd/vndadm/test/tst/ioctl/create.nopriv1.c
  43. +69 −0 usr/src/cmd/vndadm/test/tst/ioctl/create.nopriv2.c
  44. +70 −0 usr/src/cmd/vndadm/test/tst/ioctl/create.nopriv3.c
  45. +75 −0 usr/src/cmd/vndadm/test/tst/ioctl/create.nopriv4.c
  46. +77 −0 usr/src/cmd/vndadm/test/tst/ioctl/create.nopriv5.c
  47. +77 −0 usr/src/cmd/vndadm/test/tst/ioctl/create.olink.c
  48. +83 −0 usr/src/cmd/vndadm/test/tst/ioctl/create.olinknopriv.c
  49. +69 −0 usr/src/cmd/vndadm/test/tst/ioctl/create.rmenolink.c
  50. +63 −0 usr/src/cmd/vndadm/test/tst/ioctl/tst.attachrdonly.c
  51. +79 −0 usr/src/cmd/vndadm/test/tst/ioctl/tst.badioctl.c
  52. +76 −0 usr/src/cmd/vndadm/test/tst/ioctl/tst.basicopenctl.c
  53. +78 −0 usr/src/cmd/vndadm/test/tst/ioctl/tst.gioctlfault.c
  54. +100 −0 usr/src/cmd/vndadm/test/tst/ioctl/tst.gioctlnattach.c
  55. +54 −0 usr/src/cmd/vndadm/test/tst/ioctl/tst.iocsize.ksh
  56. +88 −0 usr/src/cmd/vndadm/test/tst/ioctl/tst.openctlbadflags.c
  57. +44 −0 usr/src/cmd/vndadm/test/tst/lib/Makefile
  58. +39 −0 usr/src/cmd/vndadm/test/tst/lib/create.badlink.c
  59. +76 −0 usr/src/cmd/vndadm/test/tst/lib/create.badpropid.c
  60. +63 −0 usr/src/cmd/vndadm/test/tst/lib/create.badpropsize.c
  61. +43 −0 usr/src/cmd/vndadm/test/tst/lib/create.badzone.c
  62. +49 −0 usr/src/cmd/vndadm/test/tst/lib/create.basic.c
  63. +91 −0 usr/src/cmd/vndadm/test/tst/lib/create.enomem.c
  64. +80 −0 usr/src/cmd/vndadm/test/tst/lib/create.frameioeagain.c
  65. +56 −0 usr/src/cmd/vndadm/test/tst/lib/create.open.c
  66. +79 −0 usr/src/cmd/vndadm/test/tst/lib/create.propiter.c
  67. +63 −0 usr/src/cmd/vndadm/test/tst/lib/create.proprdonly.c
  68. +33 −0 usr/src/cmd/vndadm/test/tst/lib/err.badclose.c
  69. +49 −0 usr/src/cmd/vndadm/test/tst/lib/tst.badopen.c
  70. +30 −0 usr/src/cmd/vndadm/test/tst/lib/tst.strerror.c
  71. +37 −0 usr/src/cmd/vndadm/test/tst/lib/tst.strerror.exe.out
  72. +50 −0 usr/src/cmd/vndadm/test/tst/lib/tst.strsyserror.c
  73. +872 −0 usr/src/cmd/vndadm/vndadm.c
  74. +33 −0 usr/src/cmd/vndstat/Makefile
  75. +542 −0 usr/src/cmd/vndstat/vndstat.c
  76. +3 −1 usr/src/lib/Makefile
  77. +53 −8 usr/src/lib/libdlpi/common/libdlpi.c
  78. +2 −0 usr/src/lib/libdlpi/common/libdlpi.h
  79. +3 −0 usr/src/lib/libdlpi/common/libdlpi_impl.h
  80. +5 −0 usr/src/lib/libdlpi/common/mapfile-vers
  81. +7 −1 usr/src/lib/libdtrace/Makefile.com
  82. +66 −0 usr/src/lib/libdtrace/common/mac.d.in
  83. +45 −0 usr/src/lib/libdtrace/common/mac.sed.in
  84. +28 −0 usr/src/lib/libdtrace/common/vnd.d
  85. +42 −0 usr/src/lib/libvnd/Makefile
  86. +39 −0 usr/src/lib/libvnd/Makefile.com
  87. +19 −0 usr/src/lib/libvnd/amd64/Makefile
  88. +550 −0 usr/src/lib/libvnd/common/libvnd.c
  89. +84 −0 usr/src/lib/libvnd/common/libvnd.h
  90. +19 −0 usr/src/lib/libvnd/common/llib-lvnd
  91. +55 −0 usr/src/lib/libvnd/common/mapfile-vers
  92. +18 −0 usr/src/lib/libvnd/i386/Makefile
  93. +1 −0 usr/src/man/Makefile
  94. +4 −1 usr/src/man/Makefile.man
  95. +3 −1 usr/src/man/man1m/Makefile
  96. +20 −2 usr/src/man/man1m/snoop.1m
  97. +652 −0 usr/src/man/man1m/vndadm.1m
  98. +163 −0 usr/src/man/man1m/vndstat.1m
  99. +2 −0 usr/src/man/man3dlpi/Makefile
  100. +29 −2 usr/src/man/man3dlpi/dlpi_open.3dlpi
  101. +1 −0 usr/src/man/man3lib/Makefile
  102. +690 −0 usr/src/man/man3lib/libvnd.3lib
  103. +70 −0 usr/src/man/man3vnd/Makefile
  104. +280 −0 usr/src/man/man3vnd/vnd_create.3vnd
  105. +170 −0 usr/src/man/man3vnd/vnd_errno.3vnd
  106. +705 −0 usr/src/man/man3vnd/vnd_frameio_read.3vnd
  107. +155 −0 usr/src/man/man3vnd/vnd_pollfd.3vnd
  108. +243 −0 usr/src/man/man3vnd/vnd_prop_get.3vnd
  109. +148 −0 usr/src/man/man3vnd/vnd_prop_iter.3vnd
  110. +101 −0 usr/src/man/man3vnd/vnd_prop_writeable.3vnd
  111. +155 −0 usr/src/man/man3vnd/vnd_walk.3vnd
  112. +1 −0 usr/src/man/man7d/Makefile
  113. +119 −0 usr/src/man/man7d/vnd.7d
  114. +6 −3 usr/src/uts/common/Makefile.files
  115. +9 −1 usr/src/uts/common/Makefile.rules
  116. +33 −0 usr/src/uts/common/dtrace/sdt_subr.c
  117. +235 −22 usr/src/uts/common/fs/dev/sdev_netops.c
  118. +913 −0 usr/src/uts/common/fs/dev/sdev_plugin.c
  119. +18 −192 usr/src/uts/common/fs/dev/sdev_subr.c
  120. +22 −1 usr/src/uts/common/fs/dev/sdev_vfsops.c
  121. +1 −1 usr/src/uts/common/inet/ip/ip_squeue.c
  122. +118 −1 usr/src/uts/common/inet/ipf/ip_fil_solaris.c
  123. +10 −0 usr/src/uts/common/inet/ipf/netinet/ipf_stack.h
  124. +80 −20 usr/src/uts/common/inet/squeue.c
  125. +72 −7 usr/src/uts/common/io/dld/dld_proto.c
  126. +72 −32 usr/src/uts/common/io/dld/dld_str.c
  127. +67 −17 usr/src/uts/common/io/dls/dls.c
  128. +1 −0 usr/src/uts/common/io/dls/dls_link.c
  129. +36 −5 usr/src/uts/common/io/dls/dls_mgmt.c
  130. +607 −0 usr/src/uts/common/io/gsqueue/gsqueue.c
  131. +464 −0 usr/src/uts/common/io/vnd/frameio.c
  132. +5,469 −0 usr/src/uts/common/io/vnd/vnd.c
  133. +16 −0 usr/src/uts/common/io/vnd/vnd.conf
  134. +5 −1 usr/src/uts/common/sys/Makefile
  135. +4 −0 usr/src/uts/common/sys/dld.h
  136. +4 −1 usr/src/uts/common/sys/dld_impl.h
  137. +11 −0 usr/src/uts/common/sys/dlpi.h
  138. +5 −0 usr/src/uts/common/sys/dls.h
  139. +2 −0 usr/src/uts/common/sys/dls_impl.h
  140. +107 −0 usr/src/uts/common/sys/frameio.h
  141. +41 −20 usr/src/uts/common/sys/fs/sdev_impl.h
  142. +106 −0 usr/src/uts/common/sys/fs/sdev_plugin.h
  143. +65 −0 usr/src/uts/common/sys/gsqueue.h
  144. +2 −0 usr/src/uts/common/sys/neti.h
  145. +2 −1 usr/src/uts/common/sys/netstack.h
  146. +13 −1 usr/src/uts/common/sys/squeue.h
  147. +2 −0 usr/src/uts/common/sys/squeue_impl.h
  148. +141 −0 usr/src/uts/common/sys/vnd.h
  149. +72 −0 usr/src/uts/common/sys/vnd_errno.h
  150. +3 −1 usr/src/uts/intel/Makefile.intel
  151. +1 −0 usr/src/uts/intel/dev/Makefile
  152. +49 −0 usr/src/uts/intel/gsqueue/Makefile
  153. +1 −1 usr/src/uts/intel/ipf/Makefile
  154. +4 −0 usr/src/uts/intel/ipf/ipf.global-objs.debug64
  155. +56 −0 usr/src/uts/intel/vnd/Makefile
  156. +4 −0 usr/src/uts/sparc/ipf/ipf.global-objs.debug64
View
@@ -88,6 +88,8 @@ usr/src/cmd/allocate/sr0
usr/src/cmd/allocate/st0
obj32
obj64
debug32
debug64
usr/src/cmd/allocate/st1
usr/src/cmd/allocate/st_clean
usr/src/cmd/amt/amd64/amt
View
@@ -655,6 +655,7 @@ usr/src/uts/common/gssapi/mechs/krb5/mech/util_validate.c
usr/src/uts/common/gssapi/mechs/krb5/mech/val_cred.c
usr/src/uts/common/gssapi/mechs/krb5/mech/verify.c
usr/src/uts/common/gssapi/mechs/krb5/mech/wrap_size_limit.c
usr/src/uts/common/inet/ipf/ip_fil_solaris.c
usr/src/uts/common/io/e1000api/e1000_80003es2lan.c
usr/src/uts/common/io/e1000api/e1000_80003es2lan.h
usr/src/uts/common/io/e1000api/e1000_82540.c
View
@@ -714,6 +714,7 @@ f kernel/drv/amd64/urf 0755 root sys
f kernel/drv/amd64/vgatext 0755 root sys
f kernel/drv/amd64/vioblk 0755 root sys
f kernel/drv/amd64/vmxnet 0755 root sys
f kernel/drv/amd64/vnd 0755 root sys
f kernel/drv/amd64/vnic 0755 root sys
f kernel/drv/amd64/vr 0755 root sys
f kernel/drv/amd64/vscan 0755 root sys
@@ -835,6 +836,7 @@ f kernel/drv/usbftdi.conf 0644 root sys
f kernel/drv/usbser_edge.conf 0644 root sys
f kernel/drv/usbskel.conf 0644 root sys
f kernel/drv/vmxnet.conf 0644 root sys
f kernel/drv/vnd.conf 0644 root sys
f kernel/drv/vnic.conf 0644 root sys
f kernel/drv/vscan.conf 0644 root sys
f kernel/drv/wc.conf 0644 root sys
@@ -967,6 +969,7 @@ f kernel/misc/amd64/fctl 0755 root sys
f kernel/misc/amd64/fssnap_if 0755 root sys
f kernel/misc/amd64/gda 0755 root sys
f kernel/misc/amd64/gld 0755 root sys
f kernel/misc/amd64/gsqueue 0755 root sys
f kernel/misc/amd64/hidparser 0755 root sys
f kernel/misc/amd64/hook 0755 root sys
f kernel/misc/amd64/hpcsvc 0755 root sys
@@ -2341,6 +2344,7 @@ h usr/bin/vedit=usr/bin/edit
f usr/bin/vfsstat 0555 root bin
f usr/bin/vgrind 0555 root bin
f usr/bin/vmstat 0555 root bin
f usr/bin/vndstat 0555 root bin
h usr/bin/w=usr/lib/isaexec
h usr/bin/wait=usr/bin/alias
h usr/bin/wc=usr/bin/alias
@@ -2880,6 +2884,7 @@ f usr/include/libsysevent_impl.h 0644 root bin
f usr/include/libtecla.h 0644 root bin
f usr/include/libuutil.h 0644 root bin
f usr/include/libuutil_impl.h 0644 root bin
f usr/include/libvnd.h 0644 root bin
f usr/include/libvrrpadm.h 0644 root bin
f usr/include/libvscan.h 0644 root bin
f usr/include/libw.h 0644 root bin
@@ -3618,6 +3623,7 @@ f usr/include/sys/fm/util.h 0644 root bin
f usr/include/sys/fork.h 0644 root bin
f usr/include/sys/fp.h 0644 root bin
f usr/include/sys/frame.h 0644 root bin
f usr/include/sys/frameio.h 0644 root bin
d usr/include/sys/fs 0755 root bin
f usr/include/sys/fs/autofs.h 0644 root bin
f usr/include/sys/fs/cachefs_dir.h 0644 root bin
@@ -4404,6 +4410,7 @@ f usr/include/sys/vmem_impl.h 0644 root bin
f usr/include/sys/vmem_impl_user.h 0644 root bin
f usr/include/sys/vmparam.h 0644 root bin
f usr/include/sys/vmsystm.h 0644 root bin
f usr/include/sys/vnd.h 0644 root bin
f usr/include/sys/vnic.h 0644 root bin
f usr/include/sys/vnic_impl.h 0644 root bin
f usr/include/sys/vnode.h 0644 root bin
@@ -4951,6 +4958,8 @@ s usr/lib/amd64/libuuid.so.1=../../../lib/amd64/libuuid.so.1
s usr/lib/amd64/libuuid.so=../../../lib/amd64/libuuid.so.1
s usr/lib/amd64/libuutil.so.1=../../../lib/amd64/libuutil.so.1
s usr/lib/amd64/libuutil.so=../../../lib/amd64/libuutil.so.1
f usr/lib/amd64/libvnd.so.1 0755 root bin
s usr/lib/amd64/libvnd.so=libvnd.so.1
f usr/lib/amd64/libvolmgt.so.1 0755 root bin
s usr/lib/amd64/libvolmgt.so=libvolmgt.so.1
f usr/lib/amd64/libvrrpadm.so.1 0755 root bin
@@ -5112,6 +5121,7 @@ f usr/lib/dtrace/io.d 0644 root bin
f usr/lib/dtrace/ip.d 0644 root bin
f usr/lib/dtrace/iscsit.d 0644 root bin
f usr/lib/dtrace/libdtrace_forceload.so 0644 root bin
f usr/lib/dtrace/mac.d 0644 root bin
f usr/lib/dtrace/net.d 0644 root bin
f usr/lib/dtrace/nfs.d 0644 root bin
f usr/lib/dtrace/procfs.d 0644 root bin
@@ -5124,6 +5134,7 @@ f usr/lib/dtrace/sysevent.d 0644 root bin
f usr/lib/dtrace/tcp.d 0644 root bin
f usr/lib/dtrace/udp.d 0644 root bin
f usr/lib/dtrace/unistd.d 0644 root bin
f usr/lib/dtrace/vnd.d 0644 root bin
d usr/lib/elfedit 0755 root bin
s usr/lib/elfedit/32=.
s usr/lib/elfedit/64=amd64
@@ -6386,6 +6397,8 @@ s usr/lib/libuuid.so.1=../../lib/libuuid.so.1
s usr/lib/libuuid.so=../../lib/libuuid.so.1
s usr/lib/libuutil.so.1=../../lib/libuutil.so.1
s usr/lib/libuutil.so=../../lib/libuutil.so.1
f usr/lib/libvnd.so.1 0755 root bin
s usr/lib/libvnd.so=libvnd.so.1
f usr/lib/libvolmgt.so.1 0755 root bin
s usr/lib/libvolmgt.so=libvolmgt.so.1
f usr/lib/libvrrpadm.so.1 0755 root bin
@@ -10500,6 +10513,7 @@ h usr/sbin/update_drv=usr/lib/isaexec
h usr/sbin/useradd=usr/sbin/roleadd
h usr/sbin/userdel=usr/sbin/roledel
h usr/sbin/usermod=usr/sbin/rolemod
f usr/sbin/vndadm 0555 root bin
f usr/sbin/volcopy 0555 root bin
f usr/sbin/vrrpadm 0555 root bin
f usr/sbin/wall 2555 root tty
@@ -12166,6 +12180,8 @@ f usr/share/man/man1m/userdel.1m 0444 root bin
f usr/share/man/man1m/usermod.1m 0444 root bin
f usr/share/man/man1m/utmpd.1m 0444 root bin
f usr/share/man/man1m/vmstat.1m 0444 root bin
f usr/share/man/man1m/vndadm.1m 0444 root bin
f usr/share/man/man1m/vndstat.1m 0444 root bin
f usr/share/man/man1m/volcopy.1m 0444 root bin
f usr/share/man/man1m/volcopy_ufs.1m 0444 root bin
f usr/share/man/man1m/wall.1m 0444 root bin
@@ -14664,6 +14680,7 @@ f usr/share/man/man3dlpi/dlpi_info.3dlpi 0444 root bin
f usr/share/man/man3dlpi/dlpi_linkname.3dlpi 0444 root bin
f usr/share/man/man3dlpi/dlpi_mactype.3dlpi 0444 root bin
f usr/share/man/man3dlpi/dlpi_open.3dlpi 0444 root bin
s usr/share/man/man3dlpi/dlpi_open_zone.3dlpi=dlpi_open.3dlpi
s usr/share/man/man3dlpi/dlpi_promiscoff.3dlpi=dlpi_promiscon.3dlpi
f usr/share/man/man3dlpi/dlpi_promiscon.3dlpi 0444 root bin
f usr/share/man/man3dlpi/dlpi_recv.3dlpi 0444 root bin
@@ -15535,6 +15552,7 @@ f usr/share/man/man3lib/libtnfctl.3lib 0444 root bin
f usr/share/man/man3lib/libtsalarm.3lib 0444 root bin
f usr/share/man/man3lib/libumem.3lib 0444 root bin
f usr/share/man/man3lib/libuuid.3lib 0444 root bin
f usr/share/man/man3lib/libvnd.3lib 0444 root bin
f usr/share/man/man3lib/libvolmgt.3lib 0444 root bin
f usr/share/man/man3lib/libw.3lib 0444 root bin
f usr/share/man/man3lib/libxnet.3lib 0444 root bin
@@ -17164,6 +17182,27 @@ s usr/share/man/man3uuid/uuid_is_null.3uuid=uuid_clear.3uuid
s usr/share/man/man3uuid/uuid_parse.3uuid=uuid_clear.3uuid
s usr/share/man/man3uuid/uuid_time.3uuid=uuid_clear.3uuid
s usr/share/man/man3uuid/uuid_unparse.3uuid=uuid_clear.3uuid
d usr/share/man/man3vnd 0755 root bin
s usr/share/man/man3vnd/frameio_t.3vnd=vnd_frameio_read.3vnd
s usr/share/man/man3vnd/framevec_t.3vnd=vnd_frameio_read.3vnd
s usr/share/man/man3vnd/vnd_close.3vnd=vnd_create.3vnd
f usr/share/man/man3vnd/vnd_create.3vnd 0444 root bin
f usr/share/man/man3vnd/vnd_errno.3vnd 0444 root bin
f usr/share/man/man3vnd/vnd_frameio_read.3vnd 0444 root bin
s usr/share/man/man3vnd/vnd_frameio_write.3vnd=vnd_frameio_read.3vnd
s usr/share/man/man3vnd/vnd_open.3vnd=vnd_create.3vnd
f usr/share/man/man3vnd/vnd_pollfd.3vnd 0444 root bin
f usr/share/man/man3vnd/vnd_prop_get.3vnd 0444 root bin
f usr/share/man/man3vnd/vnd_prop_iter.3vnd 0444 root bin
s usr/share/man/man3vnd/vnd_prop_iter_f.3vnd=vnd_prop_iter.3vnd
s usr/share/man/man3vnd/vnd_prop_set.3vnd=vnd_prop_get.3vnd
f usr/share/man/man3vnd/vnd_prop_writeable.3vnd 0444 root bin
s usr/share/man/man3vnd/vnd_strerror.3vnd=vnd_errno.3vnd
s usr/share/man/man3vnd/vnd_strsyserror.3vnd=vnd_errno.3vnd
s usr/share/man/man3vnd/vnd_syserrno.3vnd=vnd_errno.3vnd
s usr/share/man/man3vnd/vnd_unlink.3vnd=vnd_create.3vnd
f usr/share/man/man3vnd/vnd_walk.3vnd 0444 root bin
s usr/share/man/man3vnd/vnd_walk_cb_f.3vnd=vnd_walk.3vnd
d usr/share/man/man3volmgt 0755 root bin
f usr/share/man/man3volmgt/media_findname.3volmgt 0444 root bin
f usr/share/man/man3volmgt/media_getattr.3volmgt 0444 root bin
@@ -18111,6 +18150,7 @@ f usr/share/man/man7d/uwba.7d 0444 root bin
f usr/share/man/man7d/virtualkm.7d 0444 root bin
f usr/share/man/man7d/vni.7d 0444 root bin
f usr/share/man/man7d/vr.7d 0444 root bin
f usr/share/man/man7d/vnd.7d 0444 root bin
f usr/share/man/man7d/wscons.7d 0444 root bin
f usr/share/man/man7d/wusb_ca.7d 0444 root bin
f usr/share/man/man7d/wusb_df.7d 0444 root bin
View
@@ -21,7 +21,7 @@
# Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright 2010 Nexenta Systems, Inc. All rights reserved.
# Copyright (c) 2013 Joyent, Inc. All rights reserved.
# Copyright (c) 2014 Joyent, Inc. All rights reserved.
# Copyright (c) 2012 by Delphix. All rights reserved.
# Copyright (c) 2013 DEY Storage Systems, Inc. All rights reserved.
@@ -431,6 +431,8 @@ COMMON_SUBDIRS= \
valtools \
vgrind \
vi \
vndadm \
vndstat \
volcheck \
volrmmount \
vrrpadm \
@@ -45,6 +45,7 @@ SRCS= $(OBJS:.o=.c)
HDRS= snoop.h snoop_mip.h at.h snoop_ospf.h snoop_ospf6.h
include ../../../Makefile.cmd
include ../../../Makefile.ctf
CPPFLAGS += -I. -I$(SRC)/common/net/dhcp \
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
@@ -121,6 +121,7 @@ main(int argc, char **argv)
char *output_area;
int nbytes;
char *datalink = NULL;
char *zonename = NULL;
dlpi_handle_t dh;
names[0] = '\0';
@@ -227,7 +228,7 @@ main(int argc, char **argv)
}
(void) setvbuf(stdout, NULL, _IOLBF, BUFSIZ);
while ((c = getopt(argc, argv, "at:CPDSi:o:Nn:s:d:I:vVp:f:c:x:U?rqz"))
while ((c = getopt(argc, argv, "at:CPDSi:o:Nn:s:d:I:vVp:f:c:x:U?rqz:Z"))
!= EOF) {
switch (c) {
case 'a':
@@ -348,8 +349,11 @@ main(int argc, char **argv)
case 'U':
Uflg = B_TRUE;
break;
#ifdef DEBUG
case 'z':
zonename = optarg;
break;
#ifdef DEBUG
case 'Z':
zflg = B_TRUE;
break;
#endif /* DEBUG */
@@ -371,7 +375,7 @@ main(int argc, char **argv)
* requested was chosen, but that's too hard.
*/
if (!icapfile) {
use_kern_pf = open_datalink(&dh, datalink);
use_kern_pf = open_datalink(&dh, datalink, zonename);
} else {
use_kern_pf = B_FALSE;
cap_open_read(icapfile);
@@ -182,7 +182,7 @@ extern void cap_open_read(const char *);
extern void cap_open_write(const char *);
extern void cap_read(int, int, int, void (*)(), int);
extern void cap_close(void);
extern boolean_t open_datalink(dlpi_handle_t *, const char *);
extern boolean_t open_datalink(dlpi_handle_t *, const char *, const char *);
extern void init_datalink(dlpi_handle_t, ulong_t, ulong_t, struct timeval *,
struct Pf_ext_packetfilt *);
extern void net_read(dlpi_handle_t, size_t, int, void (*)(), int);
@@ -114,14 +114,17 @@ select_datalink(const char *linkname, void *arg)
* about the datalink useful for building the proper packet filters.
*/
boolean_t
open_datalink(dlpi_handle_t *dhp, const char *linkname)
open_datalink(dlpi_handle_t *dhp, const char *linkname, const char *zonename)
{
int retval;
int flags = DLPI_PASSIVE | DLPI_RAW;
dlpi_walk_arg_t dwa;
dlpi_info_t dlinfo;
if (linkname == NULL) {
if (zonename != NULL)
pr_err("a datalink must be specified with a zone name");
/*
* Select a datalink to use by default. Prefer datalinks that
* are plumbed by IP.
@@ -145,7 +148,8 @@ open_datalink(dlpi_handle_t *dhp, const char *linkname)
flags |= DLPI_DEVIPNET;
if (Iflg || strcmp(linkname, "lo0") == 0)
flags |= DLPI_IPNETINFO;
if ((retval = dlpi_open(linkname, dhp, flags)) != DLPI_SUCCESS) {
if ((retval = dlpi_open_zone(linkname, zonename, dhp,
flags)) != DLPI_SUCCESS) {
pr_err("cannot open \"%s\": %s", linkname,
dlpi_strerror(retval));
}
@@ -0,0 +1,65 @@
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
#
#
# Copyright (c) 2014 Joyent, Inc. All rights reserved.
#
PROG= vndadm
OBJS = vndadm.o
SRCS = $(OBJS:%.o=../%.c)
include ../Makefile.cmd
include ../Makefile.ctf
CLEANFILES += $(OBJS)
CFLAGS += $(CCVERBOSE)
LDLIBS += -lvnd
LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2
C99MODE= -xc99=%all
C99LMODE= -Xc99=%all
all := TARGET += all
clean := TARGET += clean
clobber := TARGET += clobber
install := TARGET += install
lint := TARGET += lint
SUBDIRS = test
.KEEP_STATE:
$(PROG): $(OBJS)
$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
$(POST_PROCESS)
clean: $(SUBDIRS)
-$(RM) $(CLEANFILES)
lint: lint_PROG $(SUBDIRS)
%.o: ../%.c
$(COMPILE.c) $<
$(POST_PROCESS_O)
clobber: clean $(SUBDIRS)
$(RM) $(PROG)
install: $(PROG) $(ROOTUSRSBINPROG) $(SUBDIRS)
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
FRC:
include ../Makefile.targ
@@ -0,0 +1,19 @@
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
#
#
# Copyright (c) 2014 Joyent, Inc. All rights reserved.
#
SUBDIRS = scripts tst
include Makefile.subdirs
include Makefile.com
Oops, something went wrong.

0 comments on commit ad740f5

Please sign in to comment.