http://defect.opensolaris.org/bz/show_bug.cgi?id=8649
Anurag S. Maskey <Anurag.Maskey at Sun.COM> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|ACCEPTED |FIXINPROGRESS
--- Comment #3 from Anurag S. Maskey <Anurag.Maskey at Sun.COM> 2009-05-05
14:45:42 ---
I am posting the diffs for the #defines in libnwam.h and libnwam_impl.h here as
a heads-up to prepare other developers for the upcoming changes.
= = = = = usr/src/lib/libnwam/common/libnwam.h = = = =
am223141 at zhadum:nwam1-fixes$ hg diff usr/src/lib/libnwam/common/libnwam.h
diff -r b09599b3c553 usr/src/lib/libnwam/common/libnwam.h
--- a/usr/src/lib/libnwam/common/libnwam.h Tue May 05 16:36:37 2009 -0400
+++ b/usr/src/lib/libnwam/common/libnwam.h Tue May 05 17:42:01 2009 -0400
@@ -58,21 +58,21 @@
/* nwam flags used for selecting ncu type for walk */
#define NWAM_FLAG_NCU_TYPE_LINK 0x00000001ULL << 32
-#define NWAM_FLAG_NCU_TYPE_IP 0x00000002ULL << 32
+#define NWAM_FLAG_NCU_TYPE_INTERFACE 0x00000002ULL << 32
#define NWAM_FLAG_NCU_TYPE_ALL (NWAM_FLAG_NCU_TYPE_LINK | \
- NWAM_FLAG_NCU_TYPE_IP)
+ 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_IP NWAM_FLAG_NCU_CLASS_IP
-#define NWAM_FLAG_NCU_CLASS_ALL (NWAM_FLAG_NCU_CLASS_ALL_IP | \
+#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_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)
+#define NWAM_FLAG_NCU_TYPE_CLASS_ALL
(NWAM_FLAG_NCU_CLASS_ALL | \
+ NWAM_FLAG_NCU_TYPE_ALL)
/* flags used for selecting activation for walk */
#define NWAM_FLAG_ACTIVATION_MODE_MANUAL 0x000000001ULL
<< 32
@@ -420,12 +420,12 @@
typedef enum {
NWAM_NCU_TYPE_LINK,
- NWAM_NCU_TYPE_IP,
+ NWAM_NCU_TYPE_INTERFACE,
NWAM_NCU_TYPE_ANY
} nwam_ncu_type_t;
#define NWAM_NCU_TYPE_LINK_STRING "link"
-#define NWAM_NCU_TYPE_IP_STRING "ip"
+#define NWAM_NCU_TYPE_INTERFACE_STRING "interface"
typedef enum {
NWAM_NCU_CLASS_PHYS,
= = = = = usr/src/lib/libnwam/common/libnwam_impl.h = = = =
am223141 at zhadum:nwam1-fixes$ hg diff
usr/src/lib/libnwam/common/libnwam_impl.h
diff -r b09599b3c553 usr/src/lib/libnwam/common/libnwam_impl.h
--- a/usr/src/lib/libnwam/common/libnwam_impl.h Tue May 05 16:36:37 2009 -0400
+++ b/usr/src/lib/libnwam/common/libnwam_impl.h Tue May 05 17:44:37 2009 -0400
@@ -47,11 +47,11 @@
void *data;
};
-#define NWAM_NCP_OBJECT_STRING "ncp"
-#define NWAM_NCP_CONF_FILE_PRE "ncp-"
-#define NWAM_NCP_CONF_FILE_SUF ".conf"
-#define NWAM_NCU_LINK_NAME_PRE "datalink:"
-#define NWAM_NCU_IP_NAME_PRE "ip:"
+#define NWAM_NCP_OBJECT_STRING "ncp"
+#define NWAM_NCP_CONF_FILE_PRE "ncp-"
+#define NWAM_NCP_CONF_FILE_SUF ".conf"
+#define NWAM_NCU_LINK_NAME_PRE "link:"
+#define NWAM_NCU_INTERFACE_NAME_PRE "interface:"
struct nwam_value
{
--
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.
