Fix the ATT bit definitions.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9037 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/packet-isis-lsp.c b/packet-isis-lsp.c
index 8ae25302dca4b9bc35c06d134ea86a376cbdb334..2654a7b43a21b6096936801dae1e7c04e718a012 100644 (file)
--- a/packet-isis-lsp.c
+++ b/packet-isis-lsp.c
@@ -1,7 +1,7 @@
 /* packet-isis-lsp.c
  * Routines for decoding isis lsp packets and their CLVs
  *
- * $Id: packet-isis-lsp.c,v 1.44 2003/05/28 22:39:14 guy Exp $
+ * $Id: packet-isis-lsp.c,v 1.45 2003/11/19 09:58:37 guy Exp $
  * Stuart Stanley <stuarts@mxmail.net>
  *
  * Ethereal - Network traffic analyzer
@@ -1867,13 +1867,13 @@ isis_dissect_isis_lsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int o
                att_tree = proto_item_add_subtree(ta, ett_isis_lsp_att);
                lsp_att = ISIS_LSP_ATT(lsp_info);
                proto_tree_add_text(att_tree, tvb, offset, 1,
-                         "%d... = Default metric: %s", ISIS_LSP_ATT_DEFAULT(lsp_att), ISIS_LSP_ATT_DEFAULT(lsp_att) ? "Set" : "Unset");
+                         "%d... = Error metric: %s", ISIS_LSP_ATT_ERROR(lsp_att), ISIS_LSP_ATT_ERROR(lsp_att) ? "Set" : "Unset");
                proto_tree_add_text(att_tree, tvb, offset, 1,
-                         ".%d.. = Delay metric: %s", ISIS_LSP_ATT_DELAY(lsp_att), ISIS_LSP_ATT_DELAY(lsp_att) ? "Set" : "Unset");
+                         ".%d.. = Expense metric: %s", ISIS_LSP_ATT_EXPENSE(lsp_att), ISIS_LSP_ATT_EXPENSE(lsp_att) ? "Set" : "Unset");
                proto_tree_add_text(att_tree, tvb, offset, 1,
-                         "..%d. = Expense metric: %s", ISIS_LSP_ATT_EXPENSE(lsp_att), ISIS_LSP_ATT_EXPENSE(lsp_att) ? "Set" : "Unset");
+                         "..%d. = Delay metric: %s", ISIS_LSP_ATT_DELAY(lsp_att), ISIS_LSP_ATT_DELAY(lsp_att) ? "Set" : "Unset");
                proto_tree_add_text(att_tree, tvb, offset, 1,
-                         "...%d = Error metric: %s", ISIS_LSP_ATT_ERROR(lsp_att), ISIS_LSP_ATT_ERROR(lsp_att) ? "Set" : "Unset");
+                         "...%d = Default metric: %s", ISIS_LSP_ATT_DEFAULT(lsp_att), ISIS_LSP_ATT_DEFAULT(lsp_att) ? "Set" : "Unset");
                proto_tree_add_boolean(info_tree, hf_isis_lsp_hippity, tvb, offset, 1, lsp_info);
                proto_tree_add_uint(info_tree, hf_isis_lsp_is_type, tvb, offset, 1, lsp_info);
        }

diff --git a/packet-isis-lsp.h b/packet-isis-lsp.h
index 597c490842bb2bbf5b9a2847a56e99b0ab28d07b..ab65962f50c163cf3a35fd7a0e16359d48be75fb 100644 (file)
--- a/packet-isis-lsp.h
+++ b/packet-isis-lsp.h
@@ -1,7 +1,7 @@
 /* packet-isis-lsp.h
  * Defines and such for LSP and their CLV decodes
  *
- * $Id: packet-isis-lsp.h,v 1.17 2003/04/03 05:22:11 guy Exp $
+ * $Id: packet-isis-lsp.h,v 1.18 2003/11/19 09:58:37 guy Exp $
  * Stuart Stanley <stuarts@mxmail.net>
  *
  * Ethereal - Network traffic analyzer
@@ -39,10 +39,10 @@
 #define ISIS_LSP_ATT_SHIFT    3
 #define ISIS_LSP_ATT(info)    (((info) & ISIS_LSP_ATT_MASK) >> ISIS_LSP_ATT_SHIFT)
 
-#define ISIS_LSP_ATT_DEFAULT(info)    ((info) >> 3)
-#define ISIS_LSP_ATT_DELAY(info)      (((info) >> 2) & 1)
-#define ISIS_LSP_ATT_EXPENSE(info)    (((info) >> 1) & 1)
-#define ISIS_LSP_ATT_ERROR(info)      ((info) & 1)
+#define ISIS_LSP_ATT_ERROR(info)   ((info) >> 3)
+#define ISIS_LSP_ATT_EXPENSE(info) (((info) >> 2) & 1)
+#define ISIS_LSP_ATT_DELAY(info)   (((info) >> 1) & 1)
+#define ISIS_LSP_ATT_DEFAULT(info) ((info) & 1)
 
 #define ISIS_LSP_HIPPITY_MASK     0x04
 #define ISIS_LSP_HIPPITY_SHIFT    2