http://defect.opensolaris.org/bz/show_bug.cgi?id=10240
Anurag S. Maskey <Anurag.Maskey at Sun.COM> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|ACCEPTED |CLOSED
Resolution| |FIXINSOURCE
--- Comment #3 from Anurag S. Maskey <Anurag.Maskey at Sun.COM> 2009-07-30
12:15:40 ---
This fix changes the libnwam.h header file. All constants with _IPTUN_ have
been removed. Diffs are below for reference.
@@ -62,14 +62,12 @@
#define NWAM_FLAG_NCU_TYPE_ALL (NWAM_FLAG_NCU_TYPE_LINK | \
NWAM_FLAG_NCU_TYPE_INTERFACE)
/* nwam flags used for selecting ncu class for walk */
#define NWAM_FLAG_NCU_CLASS_PHYS 0x00000100ULL << 32
-#define NWAM_FLAG_NCU_CLASS_IPTUN 0x00000200ULL << 32
#define NWAM_FLAG_NCU_CLASS_IP 0x00010000ULL << 32
-#define NWAM_FLAG_NCU_CLASS_ALL_LINK (NWAM_FLAG_NCU_CLASS_PHYS | \
- NWAM_FLAG_NCU_CLASS_IPTUN)
+#define NWAM_FLAG_NCU_CLASS_ALL_LINK NWAM_FLAG_NCU_CLASS_PHYS
#define NWAM_FLAG_NCU_CLASS_ALL_INTERFACE NWAM_FLAG_NCU_CLASS_IP
#define NWAM_FLAG_NCU_CLASS_ALL (NWAM_FLAG_NCU_CLASS_ALL_INTERFACE | \
NWAM_FLAG_NCU_CLASS_ALL_LINK)
#define NWAM_FLAG_NCU_TYPE_CLASS_ALL (NWAM_FLAG_NCU_CLASS_ALL | \
NWAM_FLAG_NCU_TYPE_ALL)
@@ -493,30 +489,18 @@
#define NWAM_NCU_TYPE_LINK_STRING "link"
#define NWAM_NCU_TYPE_INTERFACE_STRING "interface"
typedef enum {
NWAM_NCU_CLASS_PHYS,
- NWAM_NCU_CLASS_IPTUN,
NWAM_NCU_CLASS_IP,
NWAM_NCU_CLASS_ANY
} nwam_ncu_class_t;
#define NWAM_NCU_CLASS_PHYS_STRING "phys"
-#define NWAM_NCU_CLASS_IPTUN_STRING "iptun"
#define NWAM_NCU_CLASS_IP_STRING "ip"
typedef enum {
- NWAM_IPTUN_TYPE_IPV4,
- NWAM_IPTUN_TYPE_IPV6,
- NWAM_IPTUN_TYPE_6TO4
-} nwam_iptun_type_t;
-
-#define NWAM_IPTUN_TYPE_IPV4_STRING "ipv4"
-#define NWAM_IPTUN_TYPE_IPV6_STRING "ipv6"
-#define NWAM_IPTUN_TYPE_6TO4_STRING "6to4"
-
-typedef enum {
NWAM_IP_VERSION_IPV4,
NWAM_IP_VERSION_IPV6
} nwam_ip_version_t;
#define NWAM_IP_VERSION_IPV4_STRING "ipv4"
@@ -554,18 +538,10 @@
/* Link NCU properties */
#define NWAM_NCU_PROP_LINK_MAC_ADDR "link-mac-addr"
#define NWAM_NCU_PROP_LINK_AUTOPUSH "link-autopush"
#define NWAM_NCU_PROP_LINK_MTU "link-mtu"
-/* IP tunnel link properties */
-#define NWAM_NCU_PROP_IPTUN_TYPE "iptun-type"
-#define NWAM_NCU_PROP_IPTUN_TSRC "iptun-tsrc"
-#define NWAM_NCU_PROP_IPTUN_TDST "iptun-tdst"
-#define NWAM_NCU_PROP_IPTUN_ENCR "iptun-encr"
-#define NWAM_NCU_PROP_IPTUN_ENCR_AUTH "iptun-encr-auth"
-#define NWAM_NCU_PROP_IPTUN_AUTH "iptun-auth"
-
/* IP NCU properties */
#define NWAM_NCU_PROP_IP_VERSION "ip-version"
#define NWAM_NCU_PROP_IPV4_ADDRSRC "ipv4-addrsrc"
#define NWAM_NCU_PROP_IPV4_ADDR "ipv4-addr"
#define NWAM_NCU_PROP_IPV6_ADDRSRC "ipv6-addrsrc"
--
Configure bugmail: http://defect.opensolaris.org/bz/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA contact for the bug.
