Wireshark-dev: [Wireshark-dev] [PATCH] PMIPv6
From: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
Date: Wed, 27 Jun 2007 10:59:38 +0200
Hi, please find enclosed two patchs. First patch is only to reindent the packet-mip6 files. Second patch adds PMIPv6 options (draft-ietf-netlmm-proxymip6-01.txt) and Mobile Node Identifier Option (RFC4283). Regards, Nicolas Dichtel
--- wireshark-0.99.5/epan/dissectors/packet-mip6.h 2007-02-02 00:00:36.000000000 +0100
+++ wireshark-0.99.5-01/epan/dissectors/packet-mip6.h 2007-06-26 14:07:57.733648957 +0200
@@ -36,143 +36,143 @@
/* Mobility Header types */
typedef enum {
- BRR = 0,
- HOTI = 1,
- COTI = 2,
- HOT = 3,
- COT = 4,
- BU = 5,
- BA = 6,
- BE = 7,
- FBU = 8,
- FBACK = 9,
- FNA = 10
+ BRR = 0,
+ HOTI = 1,
+ COTI = 2,
+ HOT = 3,
+ COT = 4,
+ BU = 5,
+ BA = 6,
+ BE = 7,
+ FBU = 8,
+ FBACK = 9,
+ FNA = 10
} mhTypes;
static const value_string mip6_mh_types[] = {
- {BRR, "Binding Refresh Request"},
- {HOTI, "Home Test Init"},
- {COTI, "Care-of Test Init"},
- {HOT, "Home Test"},
- {COT, "Care-of Test"},
- {BU, "Binding Update"},
- {BA, "Binding Acknowledgement"},
- {BE, "Binding Error"},
- {FBU, "Fast Binding Update"},
- {FBACK, "Fast Binding Acknowledgment"},
- {FNA, "Fast Neighbor Advertisement"},
- {0, NULL}
+ {BRR, "Binding Refresh Request"},
+ {HOTI, "Home Test Init"},
+ {COTI, "Care-of Test Init"},
+ {HOT, "Home Test"},
+ {COT, "Care-of Test"},
+ {BU, "Binding Update"},
+ {BA, "Binding Acknowledgement"},
+ {BE, "Binding Error"},
+ {FBU, "Fast Binding Update"},
+ {FBACK, "Fast Binding Acknowledgment"},
+ {FNA, "Fast Neighbor Advertisement"},
+ {0, NULL}
};
/* Mobility Option types */
typedef enum {
- PAD1 = 0,
- PADN = 1,
- BRA = 2,
- ACOA = 3,
- NI = 4,
- BAD = 5,
- MNP = 6,
- LLA = 7
+ PAD1 = 0,
+ PADN = 1,
+ BRA = 2,
+ ACOA = 3,
+ NI = 4,
+ BAD = 5,
+ MNP = 6,
+ LLA = 7
} optTypes;
/* Binding Update flag description */
static const true_false_string mip6_bu_a_flag_value = {
- "Binding Acknowledgement requested",
- "Binding Acknowledgement not requested"
+ "Binding Acknowledgement requested",
+ "Binding Acknowledgement not requested"
};
static const true_false_string mip6_bu_h_flag_value = {
- "Home Registration",
- "No Home Registration"
+ "Home Registration",
+ "No Home Registration"
};
static const true_false_string mip6_bu_l_flag_value = {
- "Link-Local Address Compatibility",
- "No Link-Local Address Compatibility"
+ "Link-Local Address Compatibility",
+ "No Link-Local Address Compatibility"
};
static const true_false_string mip6_bu_k_flag_value = {
- "Key Management Mobility Compatibility",
- "No Key Management Mobility Compatibility"
+ "Key Management Mobility Compatibility",
+ "No Key Management Mobility Compatibility"
};
static const true_false_string mip6_bu_m_flag_value = {
- "MAP Registration Compatibility",
- "No MAP Registration Compatibility",
+ "MAP Registration Compatibility",
+ "No MAP Registration Compatibility",
};
static const true_false_string nemo_bu_r_flag_value = {
- "Mobile Router Compatibility",
- "No Mobile Router Compatibility"
+ "Mobile Router Compatibility",
+ "No Mobile Router Compatibility"
};
/* Binding Acknowledgement status values */
static const value_string mip6_ba_status_value[] = {
- { 0, "Binding Update accepted" },
- { 1, "Accepted but prefix discovery necessary" },
- { 128, "Reason unspecified" },
- { 129, "Administratively prohibited" },
- { 130, "Insufficient resources" },
- { 131, "Home registration not supported" },
- { 132, "Not home subnet" },
- { 133, "Not home agent for this mobile node" },
- { 134, "Duplicate Address Detection failed" },
- { 135, "Sequence number out of window" },
- { 136, "Expired home nonce index" },
- { 137, "Expired care-of nonce index" },
- { 138, "Expired nonces" },
- { 139, "Registration type change disallowed" },
- { 140, "Mobile Router Operation not permitted" },
- { 141, "Invalid Prefix" },
- { 142, "Not Authorized for Prefix" },
- { 143, "Forwarding Setup failed" },
- { 0, NULL }
+ { 0, "Binding Update accepted" },
+ { 1, "Accepted but prefix discovery necessary" },
+ { 128, "Reason unspecified" },
+ { 129, "Administratively prohibited" },
+ { 130, "Insufficient resources" },
+ { 131, "Home registration not supported" },
+ { 132, "Not home subnet" },
+ { 133, "Not home agent for this mobile node" },
+ { 134, "Duplicate Address Detection failed" },
+ { 135, "Sequence number out of window" },
+ { 136, "Expired home nonce index" },
+ { 137, "Expired care-of nonce index" },
+ { 138, "Expired nonces" },
+ { 139, "Registration type change disallowed" },
+ { 140, "Mobile Router Operation not permitted" },
+ { 141, "Invalid Prefix" },
+ { 142, "Not Authorized for Prefix" },
+ { 143, "Forwarding Setup failed" },
+ { 0, NULL }
};
/* Binding Error status values */
static const value_string mip6_be_status_value[] = {
- { 1, "Unknown binding for Home Address destination option" },
- { 2, "Unrecognized MH type value" },
- { 0, NULL }
+ { 1, "Unknown binding for Home Address destination option" },
+ { 2, "Unrecognized MH type value" },
+ { 0, NULL }
};
/* Fast Binding Update flag description */
static const true_false_string fmip6_fbu_a_flag_value = {
- "Fast Binding Acknowledgement requested",
- "Fast Binding Acknowledgement not requested"
+ "Fast Binding Acknowledgement requested",
+ "Fast Binding Acknowledgement not requested"
};
static const true_false_string fmip6_fbu_h_flag_value = {
- "Home Registration",
- "No Home Registration"
+ "Home Registration",
+ "No Home Registration"
};
static const true_false_string fmip6_fbu_l_flag_value = {
- "Link-Local Address Compatibility",
- "No Link-Local Address Compatibility"
+ "Link-Local Address Compatibility",
+ "No Link-Local Address Compatibility"
};
static const true_false_string fmip6_fbu_k_flag_value = {
- "Key Management Mobility Compatibility",
- "No Key Management Mobility Compatibility"
+ "Key Management Mobility Compatibility",
+ "No Key Management Mobility Compatibility"
};
/* Fast Binding Acknowledgement status values */
static const value_string fmip6_fback_status_value[] = {
- { 0, "Fast Binding Update accepted" },
- { 1, "Accepted but use supplied NCoA" },
- { 128, "Reason unspecified" },
- { 129, "Administratively prohibited" },
- { 130, "Insufficient resources" },
- { 131, "Incorrect interface identifier length" },
- { 0, NULL }
+ { 0, "Fast Binding Update accepted" },
+ { 1, "Accepted but use supplied NCoA" },
+ { 128, "Reason unspecified" },
+ { 129, "Administratively prohibited" },
+ { 130, "Insufficient resources" },
+ { 131, "Incorrect interface identifier length" },
+ { 0, NULL }
};
/* MH LLA Option code */
static const value_string fmip6_lla_optcode_value[] = {
- { 2, "Link Layer Address of the MN" },
- { 0, NULL }
+ { 2, "Link Layer Address of the MN" },
+ { 0, NULL }
};
/* Message lengths */
--- wireshark-0.99.5/epan/dissectors/packet-mip6.c 2007-02-02 00:00:36.000000000 +0100
+++ wireshark-0.99.5-01/epan/dissectors/packet-mip6.c 2007-06-26 14:05:48.022825400 +0200
@@ -119,336 +119,334 @@ static gint ett_fmip6_opt_lla = -1;
static int
dissect_mip6_brr(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo)
{
- proto_tree *data_tree = NULL;
- proto_item *ti;
+ proto_tree *data_tree = NULL;
+ proto_item *ti;
- if (check_col(pinfo->cinfo, COL_INFO))
- col_set_str(pinfo->cinfo, COL_INFO, "Binding Refresh Request");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str(pinfo->cinfo, COL_INFO, "Binding Refresh Request");
- if (mip6_tree) {
- ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
- MIP6_BRR_LEN, "Binding Refresh Request");
- data_tree = proto_item_add_subtree(ti, ett_mip6);
- }
+ if (mip6_tree) {
+ ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
+ MIP6_BRR_LEN, "Binding Refresh Request");
+ data_tree = proto_item_add_subtree(ti, ett_mip6);
+ }
- return MIP6_DATA_OFF+MIP6_BRR_LEN;
+ return MIP6_DATA_OFF + MIP6_BRR_LEN;
}
static int
dissect_mip6_hoti(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo)
{
- proto_tree *data_tree = NULL;
- proto_item *ti;
+ proto_tree *data_tree = NULL;
+ proto_item *ti;
- if (check_col(pinfo->cinfo, COL_INFO))
- col_set_str(pinfo->cinfo, COL_INFO, "Home Test Init");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str(pinfo->cinfo, COL_INFO, "Home Test Init");
- if (mip6_tree) {
- ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
- MIP6_HOTI_LEN, "Home Test Init");
- data_tree = proto_item_add_subtree(ti, ett_mip6);
-
- proto_tree_add_item(data_tree, hf_mip6_hoti_cookie, tvb,
- MIP6_HOTI_COOKIE_OFF, MIP6_HOTI_COOKIE_LEN, FALSE);
- }
+ if (mip6_tree) {
+ ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
+ MIP6_HOTI_LEN, "Home Test Init");
+ data_tree = proto_item_add_subtree(ti, ett_mip6);
+
+ proto_tree_add_item(data_tree, hf_mip6_hoti_cookie, tvb,
+ MIP6_HOTI_COOKIE_OFF, MIP6_HOTI_COOKIE_LEN, FALSE);
+ }
- return MIP6_DATA_OFF+MIP6_HOTI_LEN;
+ return MIP6_DATA_OFF + MIP6_HOTI_LEN;
}
static int
dissect_mip6_coti(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo)
{
- proto_tree *data_tree = NULL;
- proto_item *ti;
+ proto_tree *data_tree = NULL;
+ proto_item *ti;
- if (check_col(pinfo->cinfo, COL_INFO))
- col_set_str(pinfo->cinfo, COL_INFO, "Care-of Test Init");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str(pinfo->cinfo, COL_INFO, "Care-of Test Init");
+
+ if (mip6_tree) {
+ ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
+ MIP6_COTI_LEN, "Care-of Test Init");
+ data_tree = proto_item_add_subtree(ti, ett_mip6);
- if (mip6_tree) {
- ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
- MIP6_COTI_LEN, "Care-of Test Init");
- data_tree = proto_item_add_subtree(ti, ett_mip6);
-
- proto_tree_add_item(data_tree, hf_mip6_coti_cookie, tvb,
- MIP6_COTI_COOKIE_OFF, MIP6_COTI_COOKIE_LEN, FALSE);
- }
+ proto_tree_add_item(data_tree, hf_mip6_coti_cookie, tvb,
+ MIP6_COTI_COOKIE_OFF, MIP6_COTI_COOKIE_LEN, FALSE);
+ }
- return MIP6_DATA_OFF+MIP6_COTI_LEN;
+ return MIP6_DATA_OFF + MIP6_COTI_LEN;
}
static int
dissect_mip6_hot(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo)
{
- proto_tree *data_tree = NULL;
- proto_item *ti;
+ proto_tree *data_tree = NULL;
+ proto_item *ti;
- if (check_col(pinfo->cinfo, COL_INFO))
- col_set_str(pinfo->cinfo, COL_INFO, "Home Test");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str(pinfo->cinfo, COL_INFO, "Home Test");
- if (mip6_tree) {
- ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
- MIP6_HOT_LEN, "Home Test");
- data_tree = proto_item_add_subtree(ti, ett_mip6);
-
- proto_tree_add_item(data_tree, hf_mip6_hot_nindex, tvb,
- MIP6_HOT_INDEX_OFF, MIP6_HOT_INDEX_LEN, FALSE);
- proto_tree_add_item(data_tree, hf_mip6_hot_cookie, tvb,
- MIP6_HOT_COOKIE_OFF, MIP6_HOT_COOKIE_LEN, FALSE);
- proto_tree_add_item(data_tree, hf_mip6_hot_token, tvb,
- MIP6_HOT_TOKEN_OFF, MIP6_HOT_TOKEN_LEN, FALSE);
- }
+ if (mip6_tree) {
+ ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
+ MIP6_HOT_LEN, "Home Test");
+ data_tree = proto_item_add_subtree(ti, ett_mip6);
+
+ proto_tree_add_item(data_tree, hf_mip6_hot_nindex, tvb,
+ MIP6_HOT_INDEX_OFF, MIP6_HOT_INDEX_LEN, FALSE);
+ proto_tree_add_item(data_tree, hf_mip6_hot_cookie, tvb,
+ MIP6_HOT_COOKIE_OFF, MIP6_HOT_COOKIE_LEN, FALSE);
+ proto_tree_add_item(data_tree, hf_mip6_hot_token, tvb,
+ MIP6_HOT_TOKEN_OFF, MIP6_HOT_TOKEN_LEN, FALSE);
+ }
- return MIP6_DATA_OFF+MIP6_HOT_LEN;
+ return MIP6_DATA_OFF + MIP6_HOT_LEN;
}
static int
dissect_mip6_cot(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo)
{
- proto_tree *data_tree = NULL;
- proto_item *ti;
+ proto_tree *data_tree = NULL;
+ proto_item *ti;
- if (check_col(pinfo->cinfo, COL_INFO))
- col_set_str(pinfo->cinfo, COL_INFO, "Care-of Test");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str(pinfo->cinfo, COL_INFO, "Care-of Test");
- if (mip6_tree) {
- ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
- MIP6_COT_LEN, "Care-of Test");
- data_tree = proto_item_add_subtree(ti, ett_mip6);
-
- proto_tree_add_item(data_tree, hf_mip6_cot_nindex, tvb,
- MIP6_COT_INDEX_OFF, MIP6_COT_INDEX_LEN, FALSE);
- proto_tree_add_item(data_tree, hf_mip6_cot_cookie, tvb,
- MIP6_COT_COOKIE_OFF, MIP6_COT_COOKIE_LEN, FALSE);
- proto_tree_add_item(data_tree, hf_mip6_hot_token, tvb,
- MIP6_COT_TOKEN_OFF, MIP6_COT_TOKEN_LEN, FALSE);
- }
+ if (mip6_tree) {
+ ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
+ MIP6_COT_LEN, "Care-of Test");
+ data_tree = proto_item_add_subtree(ti, ett_mip6);
+
+ proto_tree_add_item(data_tree, hf_mip6_cot_nindex, tvb,
+ MIP6_COT_INDEX_OFF, MIP6_COT_INDEX_LEN, FALSE);
+ proto_tree_add_item(data_tree, hf_mip6_cot_cookie, tvb,
+ MIP6_COT_COOKIE_OFF, MIP6_COT_COOKIE_LEN, FALSE);
+ proto_tree_add_item(data_tree, hf_mip6_hot_token, tvb,
+ MIP6_COT_TOKEN_OFF, MIP6_COT_TOKEN_LEN, FALSE);
+ }
- return MIP6_DATA_OFF+MIP6_COT_LEN;
+ return MIP6_DATA_OFF + MIP6_COT_LEN;
}
static int
dissect_mip6_bu(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo)
{
- proto_tree *data_tree = NULL;
- proto_item *ti;
- int lifetime;
-
- if (check_col(pinfo->cinfo, COL_INFO))
- col_set_str(pinfo->cinfo, COL_INFO, "Binding Update");
-
- if (mip6_tree) {
- ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
- MIP6_BU_LEN, "Binding Update");
- data_tree = proto_item_add_subtree(ti, ett_mip6);
-
- proto_tree_add_item(data_tree, hf_mip6_bu_seqnr, tvb,
- MIP6_BU_SEQNR_OFF, MIP6_BU_SEQNR_LEN, FALSE);
-
- proto_tree_add_item(data_tree, hf_mip6_bu_a_flag, tvb,
- MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE);
- proto_tree_add_item(data_tree, hf_mip6_bu_h_flag, tvb,
- MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE);
- proto_tree_add_item(data_tree, hf_mip6_bu_l_flag, tvb,
- MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE);
- proto_tree_add_item(data_tree, hf_mip6_bu_k_flag, tvb,
- MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE);
- proto_tree_add_item(data_tree, hf_mip6_bu_m_flag, tvb,
- MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE);
-
- if ((tvb_get_guint8(tvb, MIP6_BU_FLAGS_OFF) & 0x0004 ) == 0x0004)
- {
- proto_nemo = 1;
- proto_tree_add_item(data_tree, hf_nemo_bu_r_flag, tvb,
+ proto_tree *data_tree = NULL;
+ proto_item *ti;
+ int lifetime;
+
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str(pinfo->cinfo, COL_INFO, "Binding Update");
+
+ if (mip6_tree) {
+ ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
+ MIP6_BU_LEN, "Binding Update");
+ data_tree = proto_item_add_subtree(ti, ett_mip6);
+
+ proto_tree_add_item(data_tree, hf_mip6_bu_seqnr, tvb,
+ MIP6_BU_SEQNR_OFF, MIP6_BU_SEQNR_LEN, FALSE);
+
+ proto_tree_add_item(data_tree, hf_mip6_bu_a_flag, tvb,
+ MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE);
+ proto_tree_add_item(data_tree, hf_mip6_bu_h_flag, tvb,
+ MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE);
+ proto_tree_add_item(data_tree, hf_mip6_bu_l_flag, tvb,
+ MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE);
+ proto_tree_add_item(data_tree, hf_mip6_bu_k_flag, tvb,
+ MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE);
+ proto_tree_add_item(data_tree, hf_mip6_bu_m_flag, tvb,
MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE);
- }
- lifetime = tvb_get_ntohs(tvb, MIP6_BU_LIFETIME_OFF);
- proto_tree_add_uint_format(data_tree, hf_mip6_bu_lifetime, tvb,
- MIP6_BU_LIFETIME_OFF,
- MIP6_BU_LIFETIME_LEN, lifetime,
- "Lifetime: %d (%ld seconds)",
- lifetime, (long)lifetime * 4);
- }
+ if ((tvb_get_guint8(tvb, MIP6_BU_FLAGS_OFF) & 0x0004 ) == 0x0004) {
+ proto_nemo = 1;
+ proto_tree_add_item(data_tree, hf_nemo_bu_r_flag, tvb,
+ MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE);
+ }
+
+ lifetime = tvb_get_ntohs(tvb, MIP6_BU_LIFETIME_OFF);
+ proto_tree_add_uint_format(data_tree, hf_mip6_bu_lifetime, tvb,
+ MIP6_BU_LIFETIME_OFF,
+ MIP6_BU_LIFETIME_LEN, lifetime,
+ "Lifetime: %d (%ld seconds)",
+ lifetime, (long)lifetime * 4);
+ }
- return MIP6_DATA_OFF+MIP6_BU_LEN;
+ return MIP6_DATA_OFF + MIP6_BU_LEN;
}
static int
dissect_mip6_ba(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo)
{
- proto_tree *data_tree = NULL;
- proto_item *ti;
- int lifetime;
-
- if (check_col(pinfo->cinfo, COL_INFO))
- col_set_str(pinfo->cinfo, COL_INFO, "Binding Acknowledgement");
-
- if (mip6_tree) {
- ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
- MIP6_BA_LEN, "Binding Acknowledgement");
- data_tree = proto_item_add_subtree(ti, ett_mip6);
-
- proto_tree_add_item(data_tree, hf_mip6_ba_status, tvb,
- MIP6_BA_STATUS_OFF, MIP6_BA_STATUS_LEN, FALSE);
- proto_tree_add_item(data_tree, hf_mip6_ba_k_flag, tvb,
- MIP6_BA_FLAGS_OFF, MIP6_BA_FLAGS_LEN, FALSE);
- if ((tvb_get_guint8(tvb, MIP6_BA_FLAGS_OFF) & 0x0040 ) == 0x0040)
- {
- proto_nemo = 1;
- proto_tree_add_item(data_tree, hf_nemo_ba_r_flag, tvb,
+ proto_tree *data_tree = NULL;
+ proto_item *ti;
+ int lifetime;
+
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str(pinfo->cinfo, COL_INFO, "Binding Acknowledgement");
+
+ if (mip6_tree) {
+ ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
+ MIP6_BA_LEN, "Binding Acknowledgement");
+ data_tree = proto_item_add_subtree(ti, ett_mip6);
+
+ proto_tree_add_item(data_tree, hf_mip6_ba_status, tvb,
+ MIP6_BA_STATUS_OFF, MIP6_BA_STATUS_LEN, FALSE);
+ proto_tree_add_item(data_tree, hf_mip6_ba_k_flag, tvb,
MIP6_BA_FLAGS_OFF, MIP6_BA_FLAGS_LEN, FALSE);
- }
- proto_tree_add_item(data_tree, hf_mip6_ba_seqnr, tvb,
- MIP6_BA_SEQNR_OFF, MIP6_BA_SEQNR_LEN, FALSE);
- lifetime = tvb_get_ntohs(tvb, MIP6_BA_LIFETIME_OFF);
- proto_tree_add_uint_format(data_tree, hf_mip6_ba_lifetime, tvb,
- MIP6_BA_LIFETIME_OFF,
- MIP6_BA_LIFETIME_LEN, lifetime,
- "Lifetime: %d (%ld seconds)",
- lifetime, (long)lifetime * 4);
- }
+ if ((tvb_get_guint8(tvb, MIP6_BA_FLAGS_OFF) & 0x0040 ) == 0x0040) {
+ proto_nemo = 1;
+ proto_tree_add_item(data_tree, hf_nemo_ba_r_flag, tvb,
+ MIP6_BA_FLAGS_OFF, MIP6_BA_FLAGS_LEN, FALSE);
+ }
+ proto_tree_add_item(data_tree, hf_mip6_ba_seqnr, tvb,
+ MIP6_BA_SEQNR_OFF, MIP6_BA_SEQNR_LEN, FALSE);
+ lifetime = tvb_get_ntohs(tvb, MIP6_BA_LIFETIME_OFF);
+ proto_tree_add_uint_format(data_tree, hf_mip6_ba_lifetime, tvb,
+ MIP6_BA_LIFETIME_OFF,
+ MIP6_BA_LIFETIME_LEN, lifetime,
+ "Lifetime: %d (%ld seconds)",
+ lifetime, (long)lifetime * 4);
+ }
- return MIP6_DATA_OFF+MIP6_BA_LEN;
+ return MIP6_DATA_OFF + MIP6_BA_LEN;
}
static int
dissect_mip6_be(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo)
{
- proto_tree *data_tree = NULL;
- proto_item *ti;
-
- if (check_col(pinfo->cinfo, COL_INFO))
- col_set_str(pinfo->cinfo, COL_INFO, "Binding Error");
-
- if (mip6_tree) {
- ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
- MIP6_BE_LEN, "Binding Error");
- data_tree = proto_item_add_subtree(ti, ett_mip6);
-
- proto_tree_add_item(data_tree, hf_mip6_be_status, tvb,
- MIP6_BE_STATUS_OFF, MIP6_BE_STATUS_LEN, FALSE);
- proto_tree_add_item(data_tree, hf_mip6_be_haddr, tvb,
- MIP6_BE_HOA_OFF, MIP6_BE_HOA_LEN, FALSE);
- }
+ proto_tree *data_tree = NULL;
+ proto_item *ti;
+
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str(pinfo->cinfo, COL_INFO, "Binding Error");
+
+ if (mip6_tree) {
+ ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
+ MIP6_BE_LEN, "Binding Error");
+ data_tree = proto_item_add_subtree(ti, ett_mip6);
+
+ proto_tree_add_item(data_tree, hf_mip6_be_status, tvb,
+ MIP6_BE_STATUS_OFF, MIP6_BE_STATUS_LEN, FALSE);
+ proto_tree_add_item(data_tree, hf_mip6_be_haddr, tvb,
+ MIP6_BE_HOA_OFF, MIP6_BE_HOA_LEN, FALSE);
+ }
- return MIP6_DATA_OFF+MIP6_BE_LEN;
+ return MIP6_DATA_OFF + MIP6_BE_LEN;
}
static int
dissect_mip6_unknown(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo)
{
- proto_tree *data_tree = NULL;
- proto_item *ti;
+ proto_tree *data_tree = NULL;
+ proto_item *ti;
- if (check_col(pinfo->cinfo, COL_INFO))
- col_set_str(pinfo->cinfo, COL_INFO, "Unknown MH Type");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str(pinfo->cinfo, COL_INFO, "Unknown MH Type");
- if (mip6_tree) {
- ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
- MIP6_DATA_OFF+1, "Unknown MH Type");
- data_tree = proto_item_add_subtree(ti, ett_mip6);
- }
+ if (mip6_tree) {
+ ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
+ MIP6_DATA_OFF + 1, "Unknown MH Type");
+ data_tree = proto_item_add_subtree(ti, ett_mip6);
+ }
- return MIP6_DATA_OFF+1;
+ return MIP6_DATA_OFF + 1;
}
static int
dissect_fmip6_fbu(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo)
{
- proto_tree *data_tree = NULL;
- proto_item *ti;
- int lifetime;
-
- if (check_col(pinfo->cinfo, COL_INFO))
- col_set_str(pinfo->cinfo, COL_INFO, "Fast Binding Update");
-
- if (mip6_tree) {
- ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
- MIP6_BU_LEN, "Fast Binding Update");
- data_tree = proto_item_add_subtree(ti, ett_mip6);
-
- proto_tree_add_item(data_tree, hf_fmip6_fbu_seqnr, tvb,
- FMIP6_FBU_SEQNR_OFF, FMIP6_FBU_SEQNR_LEN, FALSE);
-
- proto_tree_add_item(data_tree, hf_fmip6_fbu_a_flag, tvb,
- FMIP6_FBU_FLAGS_OFF, FMIP6_FBU_FLAGS_LEN, FALSE);
- proto_tree_add_item(data_tree, hf_fmip6_fbu_h_flag, tvb,
- FMIP6_FBU_FLAGS_OFF, FMIP6_FBU_FLAGS_LEN, FALSE);
- proto_tree_add_item(data_tree, hf_fmip6_fbu_l_flag, tvb,
- FMIP6_FBU_FLAGS_OFF, FMIP6_FBU_FLAGS_LEN, FALSE);
- proto_tree_add_item(data_tree, hf_fmip6_fbu_k_flag, tvb,
- FMIP6_FBU_FLAGS_OFF, FMIP6_FBU_FLAGS_LEN, FALSE);
-
- lifetime = tvb_get_ntohs(tvb, FMIP6_FBU_LIFETIME_OFF);
- proto_tree_add_uint_format(data_tree, hf_fmip6_fbu_lifetime, tvb,
- FMIP6_FBU_LIFETIME_OFF,
- FMIP6_FBU_LIFETIME_LEN, lifetime,
- "Lifetime: %d (%ld seconds)",
- lifetime, (long)lifetime * 4);
- }
+ proto_tree *data_tree = NULL;
+ proto_item *ti;
+ int lifetime;
+
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str(pinfo->cinfo, COL_INFO, "Fast Binding Update");
- return MIP6_DATA_OFF+FMIP6_FBU_LEN;
+ if (mip6_tree) {
+ ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
+ MIP6_BU_LEN, "Fast Binding Update");
+ data_tree = proto_item_add_subtree(ti, ett_mip6);
+
+ proto_tree_add_item(data_tree, hf_fmip6_fbu_seqnr, tvb,
+ FMIP6_FBU_SEQNR_OFF, FMIP6_FBU_SEQNR_LEN, FALSE);
+
+ proto_tree_add_item(data_tree, hf_fmip6_fbu_a_flag, tvb,
+ FMIP6_FBU_FLAGS_OFF, FMIP6_FBU_FLAGS_LEN, FALSE);
+ proto_tree_add_item(data_tree, hf_fmip6_fbu_h_flag, tvb,
+ FMIP6_FBU_FLAGS_OFF, FMIP6_FBU_FLAGS_LEN, FALSE);
+ proto_tree_add_item(data_tree, hf_fmip6_fbu_l_flag, tvb,
+ FMIP6_FBU_FLAGS_OFF, FMIP6_FBU_FLAGS_LEN, FALSE);
+ proto_tree_add_item(data_tree, hf_fmip6_fbu_k_flag, tvb,
+ FMIP6_FBU_FLAGS_OFF, FMIP6_FBU_FLAGS_LEN, FALSE);
+
+ lifetime = tvb_get_ntohs(tvb, FMIP6_FBU_LIFETIME_OFF);
+ proto_tree_add_uint_format(data_tree, hf_fmip6_fbu_lifetime, tvb,
+ FMIP6_FBU_LIFETIME_OFF,
+ FMIP6_FBU_LIFETIME_LEN, lifetime,
+ "Lifetime: %d (%ld seconds)",
+ lifetime, (long)lifetime * 4);
+ }
+
+ return MIP6_DATA_OFF + FMIP6_FBU_LEN;
}
static int
dissect_fmip6_fback(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo)
{
- proto_tree *data_tree = NULL;
- proto_item *ti;
- int lifetime;
-
- if (check_col(pinfo->cinfo, COL_INFO))
- col_set_str(pinfo->cinfo, COL_INFO, "Fast Binding Acknowledgement");
-
- if (mip6_tree) {
- ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
- FMIP6_FBACK_LEN, "Fast Binding Acknowledgement");
- data_tree = proto_item_add_subtree(ti, ett_mip6);
-
- proto_tree_add_item(data_tree, hf_fmip6_fback_status, tvb,
- FMIP6_FBACK_STATUS_OFF, FMIP6_FBACK_STATUS_LEN, FALSE);
- proto_tree_add_item(data_tree, hf_fmip6_fback_k_flag, tvb,
- FMIP6_FBACK_FLAGS_OFF, FMIP6_FBACK_FLAGS_LEN, FALSE);
- proto_tree_add_item(data_tree, hf_fmip6_fback_seqnr, tvb,
- FMIP6_FBACK_SEQNR_OFF, FMIP6_FBACK_SEQNR_LEN, FALSE);
- lifetime = tvb_get_ntohs(tvb, FMIP6_FBACK_LIFETIME_OFF);
- proto_tree_add_uint_format(data_tree, hf_fmip6_fback_lifetime, tvb,
- FMIP6_FBACK_LIFETIME_OFF,
- FMIP6_FBACK_LIFETIME_LEN, lifetime,
- "Lifetime: %d (%ld seconds)",
- lifetime, (long)lifetime * 4);
- }
+ proto_tree *data_tree = NULL;
+ proto_item *ti;
+ int lifetime;
- return MIP6_DATA_OFF+FMIP6_FBACK_LEN;
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str(pinfo->cinfo, COL_INFO, "Fast Binding Acknowledgement");
+
+ if (mip6_tree) {
+ ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
+ FMIP6_FBACK_LEN, "Fast Binding Acknowledgement");
+ data_tree = proto_item_add_subtree(ti, ett_mip6);
+
+ proto_tree_add_item(data_tree, hf_fmip6_fback_status, tvb,
+ FMIP6_FBACK_STATUS_OFF, FMIP6_FBACK_STATUS_LEN, FALSE);
+ proto_tree_add_item(data_tree, hf_fmip6_fback_k_flag, tvb,
+ FMIP6_FBACK_FLAGS_OFF, FMIP6_FBACK_FLAGS_LEN, FALSE);
+ proto_tree_add_item(data_tree, hf_fmip6_fback_seqnr, tvb,
+ FMIP6_FBACK_SEQNR_OFF, FMIP6_FBACK_SEQNR_LEN, FALSE);
+ lifetime = tvb_get_ntohs(tvb, FMIP6_FBACK_LIFETIME_OFF);
+ proto_tree_add_uint_format(data_tree, hf_fmip6_fback_lifetime, tvb,
+ FMIP6_FBACK_LIFETIME_OFF,
+ FMIP6_FBACK_LIFETIME_LEN, lifetime,
+ "Lifetime: %d (%ld seconds)",
+ lifetime, (long)lifetime * 4);
+ }
+
+ return MIP6_DATA_OFF + FMIP6_FBACK_LEN;
}
static int
dissect_fmip6_fna(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo)
{
- proto_tree *data_tree = NULL;
- proto_item *ti;
+ proto_tree *data_tree = NULL;
+ proto_item *ti;
- if (check_col(pinfo->cinfo, COL_INFO))
- col_set_str(pinfo->cinfo, COL_INFO, "Fast Neighbor Advertisement");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str(pinfo->cinfo, COL_INFO, "Fast Neighbor Advertisement");
- if (mip6_tree) {
- ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
- FMIP6_FNA_LEN, "Fast Neighbor Advertisement");
- data_tree = proto_item_add_subtree(ti, ett_mip6);
- }
+ if (mip6_tree) {
+ ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF,
+ FMIP6_FNA_LEN, "Fast Neighbor Advertisement");
+ data_tree = proto_item_add_subtree(ti, ett_mip6);
+ }
- return MIP6_DATA_OFF+FMIP6_FNA_LEN;
+ return MIP6_DATA_OFF + FMIP6_FNA_LEN;
}
-/* Functions to dissect the mobility options */
+/* Functions to dissect the mobility options */
static void
dissect_mip6_opt_padn(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
guint optlen, packet_info *pinfo _U_,
proto_tree *opt_tree)
{
- proto_tree_add_text(opt_tree, tvb, offset, optlen,
- "%s: %u bytes", optp->name, optlen);
+ proto_tree_add_text(opt_tree, tvb, offset, optlen,
+ "%s: %u bytes", optp->name, optlen);
}
static void
@@ -456,13 +454,13 @@ dissect_mip6_opt_bra(const ip_tcp_opt *o
guint optlen, packet_info *pinfo _U_,
proto_tree *opt_tree)
{
- int ri;
+ int ri;
- ri = tvb_get_ntohs(tvb, offset + MIP6_BRA_RI_OFF);
- proto_tree_add_uint_format(opt_tree, hf_mip6_bra_interval, tvb,
- offset, optlen,
- ri, "Refresh interval: %d (%ld seconds)",
- ri, (long)ri * 4);
+ ri = tvb_get_ntohs(tvb, offset + MIP6_BRA_RI_OFF);
+ proto_tree_add_uint_format(opt_tree, hf_mip6_bra_interval, tvb,
+ offset, optlen,
+ ri, "Refresh interval: %d (%ld seconds)",
+ ri, (long)ri * 4);
}
static void
@@ -470,9 +468,8 @@ dissect_mip6_opt_acoa(const ip_tcp_opt *
guint optlen, packet_info *pinfo _U_,
proto_tree *opt_tree)
{
- proto_tree_add_ipv6(opt_tree, hf_mip6_acoa_acoa, tvb,
- offset, optlen,
- tvb_get_ptr(tvb, offset + MIP6_ACOA_ACOA_OFF, MIP6_ACOA_ACOA_LEN));
+ proto_tree_add_ipv6(opt_tree, hf_mip6_acoa_acoa, tvb, offset, optlen,
+ tvb_get_ptr(tvb, offset + MIP6_ACOA_ACOA_OFF, MIP6_ACOA_ACOA_LEN));
}
static void
@@ -480,15 +477,15 @@ dissect_nemo_opt_mnp(const ip_tcp_opt *o
guint optlen, packet_info *pinfo _U_,
proto_tree *opt_tree)
{
- proto_tree *field_tree = NULL;
- proto_item *tf;
- tf = proto_tree_add_text(opt_tree, tvb, offset, optlen, "%s", optp->name);
- field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
- proto_tree_add_item(field_tree, hf_nemo_mnp_pfl, tvb,
- offset + NEMO_MNP_PL_OFF, 1, FALSE);
+ proto_tree *field_tree = NULL;
+ proto_item *tf;
+ tf = proto_tree_add_text(opt_tree, tvb, offset, optlen, "%s", optp->name);
+ field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
+ proto_tree_add_item(field_tree, hf_nemo_mnp_pfl, tvb,
+ offset + NEMO_MNP_PL_OFF, 1, FALSE);
- proto_tree_add_item(field_tree, hf_nemo_mnp_mnp, tvb,
- offset + NEMO_MNP_MNP_OFF, NEMO_MNP_MNP_LEN, FALSE);
+ proto_tree_add_item(field_tree, hf_nemo_mnp_mnp, tvb,
+ offset + NEMO_MNP_MNP_OFF, NEMO_MNP_MNP_LEN, FALSE);
}
static void
@@ -496,16 +493,16 @@ dissect_mip6_opt_ni(const ip_tcp_opt *op
guint optlen, packet_info *pinfo _U_,
proto_tree *opt_tree)
{
- proto_tree *field_tree = NULL;
- proto_item *tf;
+ proto_tree *field_tree = NULL;
+ proto_item *tf;
- tf = proto_tree_add_text(opt_tree, tvb, offset, optlen, "%s", optp->name);
- field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
+ tf = proto_tree_add_text(opt_tree, tvb, offset, optlen, "%s", optp->name);
+ field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
- proto_tree_add_item(field_tree, hf_mip6_ni_hni, tvb,
- offset + MIP6_NI_HNI_OFF, MIP6_NI_HNI_LEN, FALSE);
- proto_tree_add_item(field_tree, hf_mip6_ni_cni, tvb,
- offset + MIP6_NI_CNI_OFF, MIP6_NI_CNI_LEN, FALSE);
+ proto_tree_add_item(field_tree, hf_mip6_ni_hni, tvb,
+ offset + MIP6_NI_HNI_OFF, MIP6_NI_HNI_LEN, FALSE);
+ proto_tree_add_item(field_tree, hf_mip6_ni_cni, tvb,
+ offset + MIP6_NI_CNI_OFF, MIP6_NI_CNI_LEN, FALSE);
}
static void
@@ -513,15 +510,15 @@ dissect_mip6_opt_bad(const ip_tcp_opt *o
guint optlen, packet_info *pinfo _U_,
proto_tree *opt_tree)
{
- proto_tree *field_tree = NULL;
- proto_item *tf;
+ proto_tree *field_tree = NULL;
+ proto_item *tf;
- tf = proto_tree_add_text(opt_tree, tvb, offset, optlen, "%s", optp->name);
- field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
+ tf = proto_tree_add_text(opt_tree, tvb, offset, optlen, "%s", optp->name);
+ field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
- proto_tree_add_item(field_tree, hf_mip6_bad_auth, tvb,
- offset + MIP6_BAD_AUTH_OFF,
- optlen - MIP6_BAD_AUTH_OFF, FALSE);
+ proto_tree_add_item(field_tree, hf_mip6_bad_auth, tvb,
+ offset + MIP6_BAD_AUTH_OFF,
+ optlen - MIP6_BAD_AUTH_OFF, FALSE);
}
static void
@@ -529,136 +526,137 @@ dissect_fmip6_opt_lla(const ip_tcp_opt *
guint optlen, packet_info *pinfo _U_,
proto_tree *opt_tree)
{
- proto_tree *field_tree = NULL;
- proto_item *tf;
- int len, p;
-
- tf = proto_tree_add_text(opt_tree, tvb, offset, optlen, "%s", optp->name);
- field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
-
- proto_tree_add_item(field_tree, hf_fmip6_lla_optcode, tvb,
- offset + FMIP6_LLA_OPTCODE_OFF, FMIP6_LLA_OPTCODE_LEN, FALSE);
-
- p = offset + FMIP6_LLA_LLA_OFF;
- len = optlen - FMIP6_LLA_LLA_OFF;
-
- if (len > 0) {
- /*
- * I'm not sure what "The format of the option when the LLA is 6
- * bytes is shown in Figure 15. When the LLA size is different,
- * the option MUST be aligned appropriately. See Section 6.2 in
- * [3]." in RFC 4068 says should be done with an LLA size other
- * than 6 bytes; section 6.2 in RFC 3775 (reference 3 in RFC 4068)
- * says "Mobility options may have alignment requirements. Following
- * the convention in IPv6, these options are aligned in a packet so
- * that multi-octet values within the Option Data field of each
- * option fall on natural boundaries (i.e., fields of width n octets
- * are placed at an integer multiple of n octets from the start of
- * the header, for n = 1, 2, 4, or 8) [11]."
- *
- * Reference 11 in RFC 3775 is RFC 2460, the IPv6 spec; nothing
- * in there seems to talk about inserting padding *inside* the
- * data value of an option, so I'm not sure what the extra pad0
- * is doing there, unless the idea is to arrange that the LLA is
- * at least aligned on a 2-byte boundary, in which case presumably
- * it's always present. We'll assume that.
- */
- if (len > 1) {
- /* Skip padding. */
- p += 1;
- len -= 1;
- proto_tree_add_text(field_tree, tvb,
- p, len, "Link-layer address: %s",
- bytestring_to_str(tvb_get_ptr(tvb, p, len), len, ':'));
- }
- }
+ proto_tree *field_tree = NULL;
+ proto_item *tf;
+ int len, p;
+
+ tf = proto_tree_add_text(opt_tree, tvb, offset, optlen, "%s", optp->name);
+ field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
+
+ proto_tree_add_item(field_tree, hf_fmip6_lla_optcode, tvb,
+ offset + FMIP6_LLA_OPTCODE_OFF, FMIP6_LLA_OPTCODE_LEN, FALSE);
+
+ p = offset + FMIP6_LLA_LLA_OFF;
+ len = optlen - FMIP6_LLA_LLA_OFF;
+
+ if (len > 0) {
+ /*
+ * I'm not sure what "The format of the option when the LLA is 6
+ * bytes is shown in Figure 15. When the LLA size is different,
+ * the option MUST be aligned appropriately. See Section 6.2 in
+ * [3]." in RFC 4068 says should be done with an LLA size other
+ * than 6 bytes; section 6.2 in RFC 3775 (reference 3 in RFC 4068)
+ * says "Mobility options may have alignment requirements. Following
+ * the convention in IPv6, these options are aligned in a packet so
+ * that multi-octet values within the Option Data field of each
+ * option fall on natural boundaries (i.e., fields of width n octets
+ * are placed at an integer multiple of n octets from the start of
+ * the header, for n = 1, 2, 4, or 8) [11]."
+ *
+ * Reference 11 in RFC 3775 is RFC 2460, the IPv6 spec; nothing
+ * in there seems to talk about inserting padding *inside* the
+ * data value of an option, so I'm not sure what the extra pad0
+ * is doing there, unless the idea is to arrange that the LLA is
+ * at least aligned on a 2-byte boundary, in which case presumably
+ * it's always present. We'll assume that.
+ */
+ if (len > 1) {
+ /* Skip padding. */
+ p += 1;
+ len -= 1;
+ proto_tree_add_text(field_tree, tvb,
+ p, len, "Link-layer address: %s",
+ bytestring_to_str(tvb_get_ptr(tvb, p, len), len, ':'));
+ }
+ }
}
static const ip_tcp_opt mip6_opts[] = {
- {
- PAD1,
- "Pad1",
- NULL,
- NO_LENGTH,
- 0,
- NULL,
- },
- {
- PADN,
- "PadN",
- &ett_mip6_opt_padn,
- VARIABLE_LENGTH,
- 0,
- dissect_mip6_opt_padn
- },
- {
- BRA,
- "Binding Refresh Advice",
- &ett_mip6_opt_bra,
- FIXED_LENGTH,
- MIP6_BRA_LEN,
- dissect_mip6_opt_bra
- },
- {
- ACOA,
- "Alternate Care-of Address",
- &ett_mip6_opt_acoa,
- FIXED_LENGTH,
- MIP6_ACOA_LEN,
- dissect_mip6_opt_acoa
- },
- {
- MNP,
- "Mobile Network Prefix",
- &ett_nemo_opt_mnp,
- FIXED_LENGTH,
- NEMO_MNP_LEN,
- dissect_nemo_opt_mnp
- },
- {
- NI,
- "Nonce Indices",
- &ett_mip6_opt_ni,
- FIXED_LENGTH,
- MIP6_NI_LEN,
- dissect_mip6_opt_ni
- },
- {
- BAD,
- "Binding Authorization Data",
- &ett_mip6_opt_bad,
- VARIABLE_LENGTH,
- 0,
- dissect_mip6_opt_bad
- },
- {
- LLA,
- "Link-Layer Address",
- &ett_fmip6_opt_lla,
- VARIABLE_LENGTH,
- FMIP6_LLA_MINLEN,
- dissect_fmip6_opt_lla
- },
+{
+ PAD1,
+ "Pad1",
+ NULL,
+ NO_LENGTH,
+ 0,
+ NULL,
+},
+{
+ PADN,
+ "PadN",
+ &ett_mip6_opt_padn,
+ VARIABLE_LENGTH,
+ 0,
+ dissect_mip6_opt_padn
+},
+{
+ BRA,
+ "Binding Refresh Advice",
+ &ett_mip6_opt_bra,
+ FIXED_LENGTH,
+ MIP6_BRA_LEN,
+ dissect_mip6_opt_bra
+},
+{
+ ACOA,
+ "Alternate Care-of Address",
+ &ett_mip6_opt_acoa,
+ FIXED_LENGTH,
+ MIP6_ACOA_LEN,
+ dissect_mip6_opt_acoa
+},
+{
+ MNP,
+ "Mobile Network Prefix",
+ &ett_nemo_opt_mnp,
+ FIXED_LENGTH,
+ NEMO_MNP_LEN,
+ dissect_nemo_opt_mnp
+},
+{
+ NI,
+ "Nonce Indices",
+ &ett_mip6_opt_ni,
+ FIXED_LENGTH,
+ MIP6_NI_LEN,
+ dissect_mip6_opt_ni
+},
+{
+ BAD,
+ "Binding Authorization Data",
+ &ett_mip6_opt_bad,
+ VARIABLE_LENGTH,
+ 0,
+ dissect_mip6_opt_bad
+},
+{
+ LLA,
+ "Link-Layer Address",
+ &ett_fmip6_opt_lla,
+ VARIABLE_LENGTH,
+ FMIP6_LLA_MINLEN,
+ dissect_fmip6_opt_lla
+},
};
#define N_MIP6_OPTS (sizeof mip6_opts / sizeof mip6_opts[0])
/* Like "dissect_ip_tcp_options()", but assumes the length of an option
- *doesn't* include the type and length bytes. The option parsers,
- however, are passed a length that *does* include them. */
+ * *doesn't* include the type and length bytes. The option parsers,
+ * however, are passed a length that *does* include them.
+ */
static void
dissect_mipv6_options(tvbuff_t *tvb, int offset, guint length,
- const ip_tcp_opt *opttab, int nopts, int eol,
- packet_info *pinfo, proto_tree *opt_tree)
+ const ip_tcp_opt *opttab, int nopts, int eol,
+ packet_info *pinfo, proto_tree *opt_tree)
{
guchar opt;
- const ip_tcp_opt *optp;
+ const ip_tcp_opt *optp;
opt_len_type len_type;
unsigned int optlen;
const char *name;
char name_str[7+1+1+2+2+1+1]; /* "Unknown (0x%02x)" */
- void (*dissect)(const struct ip_tcp_opt *, tvbuff_t *,
- int, guint, packet_info *, proto_tree *);
+ void (*dissect)(const struct ip_tcp_opt *, tvbuff_t *,
+ int, guint, packet_info *, proto_tree *);
guint len;
while (length > 0) {
@@ -669,9 +667,10 @@ dissect_mipv6_options(tvbuff_t *tvb, int
}
if (optp == &opttab[nopts]) {
/* We assume that the only NO_LENGTH options are Pad1 options,
- so that we can treat unknown options as VARIABLE_LENGTH with a
- minimum of 0, and at least be able to move on to the next option
- by using the length in the option. */
+ * so that we can treat unknown options as VARIABLE_LENGTH with a
+ * minimum of 0, and at least be able to move on to the next option
+ * by using the length in the option.
+ */
optp = NULL; /* indicate that we don't know this option */
len_type = VARIABLE_LENGTH;
optlen = 0;
@@ -689,7 +688,8 @@ dissect_mipv6_options(tvbuff_t *tvb, int
/* Option has a length. Is it in the packet? */
if (length == 0) {
/* Bogus - packet must at least include
- option code byte and length byte! */
+ * option code byte and length byte!
+ */
proto_tree_add_text(opt_tree, tvb, offset, 1,
"%s (length byte past end of options)", name);
return;
@@ -747,7 +747,7 @@ dissect_mipv6_options(tvbuff_t *tvb, int
else
length -= len;
} else {
- proto_tree_add_text(opt_tree, tvb, offset, 1, "%s", name);
+ proto_tree_add_text(opt_tree, tvb, offset, 1, "%s", name);
offset += 1;
}
if (opt == eol)
@@ -760,364 +760,360 @@ static int
dissect_mip6_options(tvbuff_t *tvb, proto_tree *mip6_tree, int offset, int len,
packet_info *pinfo)
{
- proto_tree *opts_tree = NULL;
- proto_item *ti;
+ proto_tree *opts_tree = NULL;
+ proto_item *ti;
- if (!mip6_tree)
- return len;
+ if (!mip6_tree)
+ return len;
- ti = proto_tree_add_text(mip6_tree, tvb, offset, len,
- "Mobility Options");
- opts_tree = proto_item_add_subtree(ti, ett_mip6);
+ ti = proto_tree_add_text(mip6_tree, tvb, offset, len, "Mobility Options");
+ opts_tree = proto_item_add_subtree(ti, ett_mip6);
- dissect_mipv6_options(tvb, offset, len,
- mip6_opts, N_MIP6_OPTS, -1, pinfo, opts_tree);
+ dissect_mipv6_options(tvb, offset, len, mip6_opts, N_MIP6_OPTS, -1, pinfo, opts_tree);
- return len;
+ return len;
}
/* Function that dissects the whole MIPv6 packet */
static void
dissect_mip6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
- proto_tree *mip6_tree = NULL;
- proto_item *ti;
- guint8 type, pproto;
- guint len, offset = 0, start_offset = offset;
-
- /* Make entries in Protocol column and Info column on summary display */
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "MIPv6");
- if (check_col(pinfo->cinfo, COL_INFO))
- col_clear(pinfo->cinfo, COL_INFO);
-
- len = (tvb_get_guint8(tvb, MIP6_HLEN_OFF) + 1) * 8;
- pproto = tvb_get_guint8(tvb, MIP6_PROTO_OFF);
- if (tree) {
- ti = proto_tree_add_item(tree, proto_mip6, tvb, 0, len, FALSE);
- mip6_tree = proto_item_add_subtree(ti, ett_mip6);
-
- /* Process header fields */
- proto_tree_add_uint_format(mip6_tree, hf_mip6_proto, tvb,
- MIP6_PROTO_OFF, 1,
- tvb_get_guint8(tvb, MIP6_PROTO_OFF),
- "Payload protocol: %s (0x%02x)",
- ipprotostr(
- tvb_get_guint8(tvb, MIP6_PROTO_OFF)),
- tvb_get_guint8(tvb, MIP6_PROTO_OFF));
-
- proto_tree_add_uint_format(mip6_tree, hf_mip6_hlen, tvb,
- MIP6_HLEN_OFF, 1,
- tvb_get_guint8(tvb, MIP6_HLEN_OFF),
- "Header length: %u (%u bytes)",
- tvb_get_guint8(tvb, MIP6_HLEN_OFF),
- len);
-
- proto_tree_add_item(mip6_tree, hf_mip6_mhtype, tvb,
- MIP6_TYPE_OFF, 1, FALSE);
-
- proto_tree_add_item(mip6_tree, hf_mip6_reserved, tvb,
- MIP6_RES_OFF, 1, FALSE);
-
- proto_tree_add_item(mip6_tree, hf_mip6_csum, tvb,
- MIP6_CSUM_OFF, 2, FALSE);
- }
-
- /* Process mobility header */
- type = tvb_get_guint8(tvb, MIP6_TYPE_OFF);
- switch (type) {
- case BRR:
- offset = dissect_mip6_brr(tvb, mip6_tree, pinfo);
- break;
- case HOTI:
- offset = dissect_mip6_hoti(tvb, mip6_tree, pinfo);
- break;
- case COTI:
- offset = dissect_mip6_coti(tvb, mip6_tree, pinfo);
- break;
- case HOT:
- offset = dissect_mip6_hot(tvb, mip6_tree, pinfo);
- break;
- case COT:
- offset = dissect_mip6_cot(tvb, mip6_tree, pinfo);
- break;
- case BU:
- offset = dissect_mip6_bu(tvb, mip6_tree, pinfo);
- if (proto_nemo == 1)
- {
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "NEMO");
- }
- break;
- case BA:
- offset = dissect_mip6_ba(tvb, mip6_tree, pinfo);
- if (proto_nemo == 1)
- {
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "NEMO");
- }
- break;
- case BE:
- offset = dissect_mip6_be(tvb, mip6_tree, pinfo);
- break;
- case FBU:
- offset = dissect_fmip6_fbu(tvb, mip6_tree, pinfo);
- break;
- case FBACK:
- offset = dissect_fmip6_fback(tvb, mip6_tree, pinfo);
- break;
- case FNA:
- offset = dissect_fmip6_fna(tvb, mip6_tree, pinfo);
- break;
- default:
- dissect_mip6_unknown(tvb, mip6_tree, pinfo);
- offset = len;
- break;
- }
-
- /* Process mobility options */
- if (offset < len) {
- if (len < (offset - start_offset)) {
- proto_tree_add_text(tree, tvb, 0, 0, "Bogus header length");
- return;
- }
- len -= (offset - start_offset);
- dissect_mip6_options(tvb, mip6_tree, offset, len, pinfo);
- }
-
- if (type == FNA && pproto == IP_PROTO_IPV6) {
- dissector_table_t ip_dissector_table;
- tvbuff_t *ipv6_tvb;
+ proto_tree *mip6_tree = NULL;
+ proto_item *ti;
+ guint8 type, pproto;
+ guint len, offset = 0, start_offset = offset;
+
+ /* Make entries in Protocol column and Info column on summary display */
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "MIPv6");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_clear(pinfo->cinfo, COL_INFO);
- ip_dissector_table = find_dissector_table("ip.proto");
- ipv6_tvb = tvb_new_subset(tvb, len + 8, -1, -1);
+ len = (tvb_get_guint8(tvb, MIP6_HLEN_OFF) + 1) * 8;
+ pproto = tvb_get_guint8(tvb, MIP6_PROTO_OFF);
+ if (tree) {
+ ti = proto_tree_add_item(tree, proto_mip6, tvb, 0, len, FALSE);
+ mip6_tree = proto_item_add_subtree(ti, ett_mip6);
+
+ /* Process header fields */
+ proto_tree_add_uint_format(mip6_tree, hf_mip6_proto, tvb,
+ MIP6_PROTO_OFF, 1,
+ tvb_get_guint8(tvb, MIP6_PROTO_OFF),
+ "Payload protocol: %s (0x%02x)",
+ ipprotostr(
+ tvb_get_guint8(tvb, MIP6_PROTO_OFF)),
+ tvb_get_guint8(tvb, MIP6_PROTO_OFF));
+
+ proto_tree_add_uint_format(mip6_tree, hf_mip6_hlen, tvb,
+ MIP6_HLEN_OFF, 1,
+ tvb_get_guint8(tvb, MIP6_HLEN_OFF),
+ "Header length: %u (%u bytes)",
+ tvb_get_guint8(tvb, MIP6_HLEN_OFF),
+ len);
- /* Call the IPv6 dissector */
- dissector_try_port(ip_dissector_table, pproto, ipv6_tvb, pinfo, tree);
+ proto_tree_add_item(mip6_tree, hf_mip6_mhtype, tvb,
+ MIP6_TYPE_OFF, 1, FALSE);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_clear(pinfo->cinfo, COL_INFO);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_set_str(pinfo->cinfo, COL_INFO, "Fast Neighbor Advertisement[Fast Binding Update]");
- }
+ proto_tree_add_item(mip6_tree, hf_mip6_reserved, tvb,
+ MIP6_RES_OFF, 1, FALSE);
+
+ proto_tree_add_item(mip6_tree, hf_mip6_csum, tvb,
+ MIP6_CSUM_OFF, 2, FALSE);
+ }
+
+ /* Process mobility header */
+ type = tvb_get_guint8(tvb, MIP6_TYPE_OFF);
+ switch (type) {
+ case BRR:
+ offset = dissect_mip6_brr(tvb, mip6_tree, pinfo);
+ break;
+ case HOTI:
+ offset = dissect_mip6_hoti(tvb, mip6_tree, pinfo);
+ break;
+ case COTI:
+ offset = dissect_mip6_coti(tvb, mip6_tree, pinfo);
+ break;
+ case HOT:
+ offset = dissect_mip6_hot(tvb, mip6_tree, pinfo);
+ break;
+ case COT:
+ offset = dissect_mip6_cot(tvb, mip6_tree, pinfo);
+ break;
+ case BU:
+ offset = dissect_mip6_bu(tvb, mip6_tree, pinfo);
+ if (proto_nemo == 1) {
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "NEMO");
+ }
+ break;
+ case BA:
+ offset = dissect_mip6_ba(tvb, mip6_tree, pinfo);
+ if (proto_nemo == 1) {
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "NEMO");
+ }
+ break;
+ case BE:
+ offset = dissect_mip6_be(tvb, mip6_tree, pinfo);
+ break;
+ case FBU:
+ offset = dissect_fmip6_fbu(tvb, mip6_tree, pinfo);
+ break;
+ case FBACK:
+ offset = dissect_fmip6_fback(tvb, mip6_tree, pinfo);
+ break;
+ case FNA:
+ offset = dissect_fmip6_fna(tvb, mip6_tree, pinfo);
+ break;
+ default:
+ dissect_mip6_unknown(tvb, mip6_tree, pinfo);
+ offset = len;
+ break;
+ }
+
+ /* Process mobility options */
+ if (offset < len) {
+ if (len < (offset - start_offset)) {
+ proto_tree_add_text(tree, tvb, 0, 0, "Bogus header length");
+ return;
+ }
+ len -= (offset - start_offset);
+ dissect_mip6_options(tvb, mip6_tree, offset, len, pinfo);
+ }
+
+ if (type == FNA && pproto == IP_PROTO_IPV6) {
+ dissector_table_t ip_dissector_table;
+ tvbuff_t *ipv6_tvb;
+
+ ip_dissector_table = find_dissector_table("ip.proto");
+ ipv6_tvb = tvb_new_subset(tvb, len + 8, -1, -1);
+
+ /* Call the IPv6 dissector */
+ dissector_try_port(ip_dissector_table, pproto, ipv6_tvb, pinfo, tree);
+
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_clear(pinfo->cinfo, COL_INFO);
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str(pinfo->cinfo, COL_INFO,
+ "Fast Neighbor Advertisement[Fast Binding Update]");
+ }
}
/* Register the protocol with Wireshark */
void
proto_register_mip6(void)
-{
- /* Setup list of header fields */
- static hf_register_info hf[] = {
-
- { &hf_mip6_proto, { "Payload protocol", "mip6.proto",
- FT_UINT8, BASE_DEC, NULL, 0,
- "Payload protocol", HFILL }},
- { &hf_mip6_hlen, { "Header length", "mip6.hlen",
- FT_UINT8, BASE_DEC, NULL, 0,
- "Header length", HFILL }},
- { &hf_mip6_mhtype, { "Mobility Header Type", "mip6.mhtype",
- FT_UINT8, BASE_DEC, VALS(mip6_mh_types), 0,
- "Mobility Header Type", HFILL }},
- { &hf_mip6_reserved, { "Reserved", "mip6.reserved",
- FT_UINT8, BASE_HEX, NULL, 0,
- "Reserved", HFILL }},
- { &hf_mip6_csum, { "Checksum", "mip6.csum",
- FT_UINT16, BASE_HEX, NULL, 0,
- "Header Checksum", HFILL }},
-
- { &hf_mip6_hoti_cookie, { "Home Init Cookie", "mip6.hoti.cookie",
- FT_UINT64, BASE_HEX, NULL, 0,
- "Home Init Cookie", HFILL }},
-
- { &hf_mip6_coti_cookie, { "Care-of Init Cookie", "mip6.coti.cookie",
- FT_UINT64, BASE_HEX, NULL, 0,
- "Care-of Init Cookie", HFILL }},
-
- { &hf_mip6_hot_nindex, { "Home Nonce Index", "mip6.hot.nindex",
- FT_UINT16, BASE_DEC, NULL, 0,
- "Home Nonce Index", HFILL }},
- { &hf_mip6_hot_cookie, { "Home Init Cookie", "mip6.hot.cookie",
- FT_UINT64, BASE_HEX, NULL, 0,
- "Home Init Cookie", HFILL }},
- { &hf_mip6_hot_token, { "Home Keygen Token", "mip6.hot.token",
- FT_UINT64, BASE_HEX, NULL, 0,
- "Home Keygen Token", HFILL }},
-
- { &hf_mip6_cot_nindex, { "Care-of Nonce Index", "mip6.cot.nindex",
- FT_UINT16, BASE_DEC, NULL, 0,
- "Care-of Nonce Index", HFILL }},
- { &hf_mip6_cot_cookie, { "Care-of Init Cookie", "mip6.cot.cookie",
- FT_UINT64, BASE_HEX, NULL, 0,
- "Care-of Init Cookie", HFILL }},
- { &hf_mip6_cot_token, { "Care-of Keygen Token", "mip6.cot.token",
- FT_UINT64, BASE_HEX, NULL, 0,
- "Care-of Keygen Token", HFILL }},
-
- { &hf_mip6_bu_seqnr, { "Sequence number", "mip6.bu.seqnr",
- FT_UINT16, BASE_DEC, NULL, 0,
- "Sequence number", HFILL }},
- { &hf_mip6_bu_a_flag, { "Acknowledge (A) flag", "mip6.bu.a_flag",
- FT_BOOLEAN, 8, TFS(&mip6_bu_a_flag_value),
- 0x80, "Acknowledge (A) flag", HFILL }},
- { &hf_mip6_bu_h_flag, { "Home Registration (H) flag",
- "mip6.bu.h_flag",
- FT_BOOLEAN, 8, TFS(&mip6_bu_h_flag_value),
- 0x40, "Home Registration (H) flag", HFILL }},
- { &hf_mip6_bu_l_flag, { "Link-Local Compatibility (L) flag",
- "mip6.bu.l_flag",
- FT_BOOLEAN, 8, TFS(&mip6_bu_l_flag_value),
- 0x20, "Home Registration (H) flag", HFILL }},
- { &hf_mip6_bu_k_flag, { "Key Management Compatibility (K) flag",
- "mip6.bu.k_flag",
- FT_BOOLEAN, 8, TFS(&mip6_bu_k_flag_value),
- 0x10, "Key Management Compatibility (K) flag",
- HFILL }},
- { &hf_mip6_bu_m_flag, { "MAP Registration Compatibility (M) flag",
- "mip6.bu.m_flag",
- FT_BOOLEAN, 8, TFS(&mip6_bu_m_flag_value),
- 0x08, "MAP Registration Compatibility (M) flag",
- HFILL }},
- { &hf_nemo_bu_r_flag, { "Mobile Router (R) flag",
- "nemo.bu.r_flag",
- FT_BOOLEAN, 8, TFS(&nemo_bu_r_flag_value),
- 0x04, "Mobile Router (R) flag",
- HFILL }},
- { &hf_mip6_bu_lifetime, { "Lifetime", "mip6.bu.lifetime",
- FT_UINT16, BASE_DEC, NULL, 0,
- "Lifetime", HFILL }},
-
- { &hf_mip6_ba_status, { "Status", "mip6.ba.status",
- FT_UINT8, BASE_DEC,
- VALS(&mip6_ba_status_value), 0,
- "Binding Acknowledgement status", HFILL }},
- { &hf_mip6_ba_k_flag, { "Key Management Compatibility (K) flag",
- "mip6.ba.k_flag",
- FT_BOOLEAN, 8, TFS(&mip6_bu_k_flag_value),
- 0x80, "Key Management Compatibility (K) flag",
- HFILL }},
- { &hf_nemo_ba_r_flag, { "Mobile Router (R) flag",
- "nemo.ba.r_flag",
- FT_BOOLEAN, 8, TFS(&nemo_bu_r_flag_value),
- 0x40, "Mobile Router (R) flag",
- HFILL }},
-
- { &hf_mip6_ba_seqnr, { "Sequence number", "mip6.ba.seqnr",
- FT_UINT16, BASE_DEC, NULL, 0,
- "Sequence number", HFILL }},
- { &hf_mip6_ba_lifetime, { "Lifetime", "mip6.ba.lifetime",
- FT_UINT16, BASE_DEC, NULL, 0,
- "Lifetime", HFILL }},
-
- { &hf_mip6_be_status, { "Status", "mip6.be.status",
- FT_UINT8, BASE_DEC,
- VALS(&mip6_be_status_value), 0,
- "Binding Error status", HFILL }},
- { &hf_mip6_be_haddr, { "Home Address", "mip6.be.haddr",
- FT_IPv6, BASE_HEX, NULL, 0,
- "Home Address", HFILL }},
-
- { &hf_fmip6_fbu_seqnr, { "Sequence number", "fmip6.fbu.seqnr",
- FT_UINT16, BASE_DEC, NULL, 0,
- "Sequence number", HFILL }},
- { &hf_fmip6_fbu_a_flag, { "Acknowledge (A) flag", "fmip6.fbu.a_flag",
- FT_BOOLEAN, 8, TFS(&fmip6_fbu_a_flag_value),
- 0x80, "Acknowledge (A) flag", HFILL }},
- { &hf_fmip6_fbu_h_flag, { "Home Registration (H) flag",
- "fmip6.fbu.h_flag",
- FT_BOOLEAN, 8, TFS(&fmip6_fbu_h_flag_value),
- 0x40, "Home Registration (H) flag", HFILL }},
- { &hf_fmip6_fbu_l_flag, { "Link-Local Compatibility (L) flag",
- "fmip6.fbu.l_flag",
- FT_BOOLEAN, 8, TFS(&fmip6_fbu_l_flag_value),
- 0x20, "Home Registration (H) flag", HFILL }},
- { &hf_fmip6_fbu_k_flag, { "Key Management Compatibility (K) flag",
- "fmip6.fbu.k_flag",
- FT_BOOLEAN, 8, TFS(&fmip6_fbu_k_flag_value),
- 0x10, "Key Management Compatibility (K) flag",
- HFILL }},
- { &hf_fmip6_fbu_lifetime, { "Lifetime", "fmip6.fbu.lifetime",
- FT_UINT16, BASE_DEC, NULL, 0,
- "Lifetime", HFILL }},
-
- { &hf_fmip6_fback_status, { "Status", "fmip6.fback.status",
- FT_UINT8, BASE_DEC,
- VALS(&fmip6_fback_status_value), 0,
- "Fast Binding Acknowledgement status", HFILL }},
- { &hf_fmip6_fback_k_flag, { "Key Management Compatibility (K) flag",
- "fmip6.fback.k_flag",
- FT_BOOLEAN, 8, TFS(&fmip6_fbu_k_flag_value),
- 0x80, "Key Management Compatibility (K) flag",
- HFILL }},
- { &hf_fmip6_fback_seqnr, { "Sequence number", "fmip6.fback.seqnr",
- FT_UINT16, BASE_DEC, NULL, 0,
- "Sequence number", HFILL }},
- { &hf_fmip6_fback_lifetime, { "Lifetime", "fmip6.fback.lifetime",
- FT_UINT16, BASE_DEC, NULL, 0,
- "Lifetime", HFILL }},
-
-
- { &hf_mip6_bra_interval, { "Refresh interval", "mip6.bra.interval",
- FT_UINT16, BASE_DEC, NULL, 0,
- "Refresh interval", HFILL }},
-
- { &hf_mip6_acoa_acoa, { "Alternate care-of address", "mip6.acoa.acoa",
- FT_IPv6, BASE_HEX, NULL, 0,
- "Alternate Care-of address", HFILL }},
-
- { &hf_mip6_ni_hni, { "Home nonce index", "mip6.ni.hni",
- FT_UINT16, BASE_DEC, NULL, 0,
- "Home nonce index", HFILL }},
- { &hf_mip6_ni_cni, { "Care-of nonce index", "mip6.ni.cni",
- FT_UINT16, BASE_DEC, NULL, 0,
- "Care-of nonce index", HFILL }},
-
- { &hf_mip6_bad_auth, { "Authenticator", "mip6.bad.auth",
- FT_BYTES, BASE_HEX, NULL, 0,
- "Authenticator", HFILL }},
-
- { &hf_fmip6_lla_optcode, { "Option-Code", "mip6.lla.optcode",
- FT_UINT8, BASE_DEC, VALS(&fmip6_lla_optcode_value), 0,
- "Option-Code", HFILL }},
-
- { &hf_nemo_mnp_pfl, { "Mobile Network Prefix Length", "nemo.mnp.pfl",
- FT_UINT8, BASE_DEC, NULL, 0,
- "Mobile Network Prefix Length", HFILL }},
-
- { &hf_nemo_mnp_mnp, { "Mobile Network Prefix", "nemo.mnp.mnp",
- FT_IPv6, BASE_HEX, NULL, 0,
- "Mobile Network Prefix", HFILL }}
- };
-
- /* Setup protocol subtree array */
- static gint *ett[] = {
- &ett_mip6,
- &ett_mip6_opt_padn,
- &ett_mip6_opt_bra,
- &ett_mip6_opt_acoa,
- &ett_mip6_opt_ni,
- &ett_mip6_opt_bad,
+{
+ /* Setup list of header fields */
+ static hf_register_info hf[] = {
+
+ { &hf_mip6_proto, { "Payload protocol", "mip6.proto",
+ FT_UINT8, BASE_DEC, NULL, 0,
+ "Payload protocol", HFILL }},
+ { &hf_mip6_hlen, { "Header length", "mip6.hlen",
+ FT_UINT8, BASE_DEC, NULL, 0,
+ "Header length", HFILL }},
+ { &hf_mip6_mhtype, { "Mobility Header Type", "mip6.mhtype",
+ FT_UINT8, BASE_DEC, VALS(mip6_mh_types), 0,
+ "Mobility Header Type", HFILL }},
+ { &hf_mip6_reserved, { "Reserved", "mip6.reserved",
+ FT_UINT8, BASE_HEX, NULL, 0,
+ "Reserved", HFILL }},
+ { &hf_mip6_csum, { "Checksum", "mip6.csum",
+ FT_UINT16, BASE_HEX, NULL, 0,
+ "Header Checksum", HFILL }},
+
+ { &hf_mip6_hoti_cookie, { "Home Init Cookie", "mip6.hoti.cookie",
+ FT_UINT64, BASE_HEX, NULL, 0,
+ "Home Init Cookie", HFILL }},
+
+ { &hf_mip6_coti_cookie, { "Care-of Init Cookie", "mip6.coti.cookie",
+ FT_UINT64, BASE_HEX, NULL, 0,
+ "Care-of Init Cookie", HFILL }},
+
+ { &hf_mip6_hot_nindex, { "Home Nonce Index", "mip6.hot.nindex",
+ FT_UINT16, BASE_DEC, NULL, 0,
+ "Home Nonce Index", HFILL }},
+ { &hf_mip6_hot_cookie, { "Home Init Cookie", "mip6.hot.cookie",
+ FT_UINT64, BASE_HEX, NULL, 0,
+ "Home Init Cookie", HFILL }},
+ { &hf_mip6_hot_token, { "Home Keygen Token", "mip6.hot.token",
+ FT_UINT64, BASE_HEX, NULL, 0,
+ "Home Keygen Token", HFILL }},
+
+ { &hf_mip6_cot_nindex, { "Care-of Nonce Index", "mip6.cot.nindex",
+ FT_UINT16, BASE_DEC, NULL, 0,
+ "Care-of Nonce Index", HFILL }},
+ { &hf_mip6_cot_cookie, { "Care-of Init Cookie", "mip6.cot.cookie",
+ FT_UINT64, BASE_HEX, NULL, 0,
+ "Care-of Init Cookie", HFILL }},
+ { &hf_mip6_cot_token, { "Care-of Keygen Token", "mip6.cot.token",
+ FT_UINT64, BASE_HEX, NULL, 0,
+ "Care-of Keygen Token", HFILL }},
+
+ { &hf_mip6_bu_seqnr, { "Sequence number", "mip6.bu.seqnr",
+ FT_UINT16, BASE_DEC, NULL, 0,
+ "Sequence number", HFILL }},
+ { &hf_mip6_bu_a_flag, { "Acknowledge (A) flag", "mip6.bu.a_flag",
+ FT_BOOLEAN, 8, TFS(&mip6_bu_a_flag_value),
+ 0x80, "Acknowledge (A) flag", HFILL }},
+ { &hf_mip6_bu_h_flag, { "Home Registration (H) flag",
+ "mip6.bu.h_flag",
+ FT_BOOLEAN, 8, TFS(&mip6_bu_h_flag_value),
+ 0x40, "Home Registration (H) flag", HFILL }},
+ { &hf_mip6_bu_l_flag, { "Link-Local Compatibility (L) flag",
+ "mip6.bu.l_flag",
+ FT_BOOLEAN, 8, TFS(&mip6_bu_l_flag_value),
+ 0x20, "Home Registration (H) flag", HFILL }},
+ { &hf_mip6_bu_k_flag, { "Key Management Compatibility (K) flag",
+ "mip6.bu.k_flag",
+ FT_BOOLEAN, 8, TFS(&mip6_bu_k_flag_value),
+ 0x10, "Key Management Compatibility (K) flag",
+ HFILL }},
+ { &hf_mip6_bu_m_flag, { "MAP Registration Compatibility (M) flag",
+ "mip6.bu.m_flag",
+ FT_BOOLEAN, 8, TFS(&mip6_bu_m_flag_value),
+ 0x08, "MAP Registration Compatibility (M) flag",
+ HFILL }},
+ { &hf_nemo_bu_r_flag, { "Mobile Router (R) flag",
+ "nemo.bu.r_flag",
+ FT_BOOLEAN, 8, TFS(&nemo_bu_r_flag_value),
+ 0x04, "Mobile Router (R) flag",
+ HFILL }},
+ { &hf_mip6_bu_lifetime, { "Lifetime", "mip6.bu.lifetime",
+ FT_UINT16, BASE_DEC, NULL, 0,
+ "Lifetime", HFILL }},
+
+ { &hf_mip6_ba_status, { "Status", "mip6.ba.status",
+ FT_UINT8, BASE_DEC,
+ VALS(&mip6_ba_status_value), 0,
+ "Binding Acknowledgement status", HFILL }},
+ { &hf_mip6_ba_k_flag, { "Key Management Compatibility (K) flag",
+ "mip6.ba.k_flag",
+ FT_BOOLEAN, 8, TFS(&mip6_bu_k_flag_value),
+ 0x80, "Key Management Compatibility (K) flag",
+ HFILL }},
+ { &hf_nemo_ba_r_flag, { "Mobile Router (R) flag",
+ "nemo.ba.r_flag",
+ FT_BOOLEAN, 8, TFS(&nemo_bu_r_flag_value),
+ 0x40, "Mobile Router (R) flag",
+ HFILL }},
+
+ { &hf_mip6_ba_seqnr, { "Sequence number", "mip6.ba.seqnr",
+ FT_UINT16, BASE_DEC, NULL, 0,
+ "Sequence number", HFILL }},
+ { &hf_mip6_ba_lifetime, { "Lifetime", "mip6.ba.lifetime",
+ FT_UINT16, BASE_DEC, NULL, 0,
+ "Lifetime", HFILL }},
+
+ { &hf_mip6_be_status, { "Status", "mip6.be.status",
+ FT_UINT8, BASE_DEC,
+ VALS(&mip6_be_status_value), 0,
+ "Binding Error status", HFILL }},
+ { &hf_mip6_be_haddr, { "Home Address", "mip6.be.haddr",
+ FT_IPv6, BASE_HEX, NULL, 0,
+ "Home Address", HFILL }},
+
+ { &hf_fmip6_fbu_seqnr, { "Sequence number", "fmip6.fbu.seqnr",
+ FT_UINT16, BASE_DEC, NULL, 0,
+ "Sequence number", HFILL }},
+ { &hf_fmip6_fbu_a_flag, { "Acknowledge (A) flag", "fmip6.fbu.a_flag",
+ FT_BOOLEAN, 8, TFS(&fmip6_fbu_a_flag_value),
+ 0x80, "Acknowledge (A) flag", HFILL }},
+ { &hf_fmip6_fbu_h_flag, { "Home Registration (H) flag",
+ "fmip6.fbu.h_flag",
+ FT_BOOLEAN, 8, TFS(&fmip6_fbu_h_flag_value),
+ 0x40, "Home Registration (H) flag", HFILL }},
+ { &hf_fmip6_fbu_l_flag, { "Link-Local Compatibility (L) flag",
+ "fmip6.fbu.l_flag",
+ FT_BOOLEAN, 8, TFS(&fmip6_fbu_l_flag_value),
+ 0x20, "Home Registration (H) flag", HFILL }},
+ { &hf_fmip6_fbu_k_flag, { "Key Management Compatibility (K) flag",
+ "fmip6.fbu.k_flag",
+ FT_BOOLEAN, 8, TFS(&fmip6_fbu_k_flag_value),
+ 0x10, "Key Management Compatibility (K) flag",
+ HFILL }},
+ { &hf_fmip6_fbu_lifetime, { "Lifetime", "fmip6.fbu.lifetime",
+ FT_UINT16, BASE_DEC, NULL, 0,
+ "Lifetime", HFILL }},
+
+ { &hf_fmip6_fback_status, { "Status", "fmip6.fback.status",
+ FT_UINT8, BASE_DEC,
+ VALS(&fmip6_fback_status_value), 0,
+ "Fast Binding Acknowledgement status", HFILL }},
+ { &hf_fmip6_fback_k_flag, { "Key Management Compatibility (K) flag",
+ "fmip6.fback.k_flag",
+ FT_BOOLEAN, 8, TFS(&fmip6_fbu_k_flag_value),
+ 0x80, "Key Management Compatibility (K) flag",
+ HFILL }},
+ { &hf_fmip6_fback_seqnr, { "Sequence number", "fmip6.fback.seqnr",
+ FT_UINT16, BASE_DEC, NULL, 0,
+ "Sequence number", HFILL }},
+ { &hf_fmip6_fback_lifetime, { "Lifetime", "fmip6.fback.lifetime",
+ FT_UINT16, BASE_DEC, NULL, 0,
+ "Lifetime", HFILL }},
+
+ { &hf_mip6_bra_interval, { "Refresh interval", "mip6.bra.interval",
+ FT_UINT16, BASE_DEC, NULL, 0,
+ "Refresh interval", HFILL }},
+
+ { &hf_mip6_acoa_acoa, { "Alternate care-of address", "mip6.acoa.acoa",
+ FT_IPv6, BASE_HEX, NULL, 0,
+ "Alternate Care-of address", HFILL }},
+
+ { &hf_mip6_ni_hni, { "Home nonce index", "mip6.ni.hni",
+ FT_UINT16, BASE_DEC, NULL, 0,
+ "Home nonce index", HFILL }},
+ { &hf_mip6_ni_cni, { "Care-of nonce index", "mip6.ni.cni",
+ FT_UINT16, BASE_DEC, NULL, 0,
+ "Care-of nonce index", HFILL }},
+
+ { &hf_mip6_bad_auth, { "Authenticator", "mip6.bad.auth",
+ FT_BYTES, BASE_HEX, NULL, 0,
+ "Authenticator", HFILL }},
+
+ { &hf_fmip6_lla_optcode, { "Option-Code", "mip6.lla.optcode",
+ FT_UINT8, BASE_DEC, VALS(&fmip6_lla_optcode_value), 0,
+ "Option-Code", HFILL }},
+
+ { &hf_nemo_mnp_pfl, { "Mobile Network Prefix Length", "nemo.mnp.pfl",
+ FT_UINT8, BASE_DEC, NULL, 0,
+ "Mobile Network Prefix Length", HFILL }},
+
+ { &hf_nemo_mnp_mnp, { "Mobile Network Prefix", "nemo.mnp.mnp",
+ FT_IPv6, BASE_HEX, NULL, 0,
+ "Mobile Network Prefix", HFILL }}
+ };
+
+ /* Setup protocol subtree array */
+ static gint *ett[] = {
+ &ett_mip6,
+ &ett_mip6_opt_padn,
+ &ett_mip6_opt_bra,
+ &ett_mip6_opt_acoa,
+ &ett_mip6_opt_ni,
+ &ett_mip6_opt_bad,
&ett_fmip6_opt_lla,
&ett_nemo_opt_mnp
- };
-
- /* Register the protocol name and description */
- proto_mip6 = proto_register_protocol("Mobile IPv6 / Network Mobility", "MIPv6", "mipv6");
-
- /* Register the dissector by name */
- /* register_dissector("mipv6", dissect_nemo, proto_nemo); */
-
- /* Required function calls to register the header fields and subtrees used */
- proto_register_field_array(proto_mip6, hf, array_length(hf));
- proto_register_subtree_array(ett, array_length(ett));
+ };
+
+ /* Register the protocol name and description */
+ proto_mip6 = proto_register_protocol("Mobile IPv6 / Network Mobility", "MIPv6", "mipv6");
+
+ /* Register the dissector by name */
+ /* register_dissector("mipv6", dissect_nemo, proto_nemo); */
+
+ /* Required function calls to register the header fields and subtrees used */
+ proto_register_field_array(proto_mip6, hf, array_length(hf));
+ proto_register_subtree_array(ett, array_length(ett));
}
void
proto_reg_handoff_mip6(void)
{
- dissector_handle_t mip6_handle;
-
- /* mip6_handle = find_dissector("mipv6"); */
- mip6_handle = create_dissector_handle(dissect_mip6, proto_mip6);
- dissector_add("ip.proto", IP_PROTO_MIPV6_OLD, mip6_handle);
- dissector_add("ip.proto", IP_PROTO_MIPV6, mip6_handle);
+ dissector_handle_t mip6_handle;
+
+ /* mip6_handle = find_dissector("mipv6"); */
+ mip6_handle = create_dissector_handle(dissect_mip6, proto_mip6);
+ dissector_add("ip.proto", IP_PROTO_MIPV6_OLD, mip6_handle);
+ dissector_add("ip.proto", IP_PROTO_MIPV6, mip6_handle);
}
--- wireshark-0.99.5-01/epan/dissectors/packet-mip6.h 2007-06-26 14:07:57.733648957 +0200
+++ wireshark-0.99.5-02/epan/dissectors/packet-mip6.h 2007-06-26 15:54:56.828683262 +0200
@@ -73,7 +73,10 @@ typedef enum {
NI = 4,
BAD = 5,
MNP = 6,
- LLA = 7
+ LLA = 7,
+ MNID = 8,
+ HNP = 9, /* temporary value, not yet defined by IANA */
+ TS = 10 /* temporary value, not yet defined by IANA */
} optTypes;
/* Binding Update flag description */
@@ -107,6 +110,11 @@ static const true_false_string nemo_bu_r
"No Mobile Router Compatibility"
};
+static const true_false_string proxy_bu_p_flag_value = {
+ "Proxy Registration",
+ "No Proxy Registration"
+};
+
/* Binding Acknowledgement status values */
static const value_string mip6_ba_status_value[] = {
{ 0, "Binding Update accepted" },
@@ -175,6 +183,12 @@ static const value_string fmip6_lla_optc
{ 0, NULL }
};
+/* Mobile Node Identifier Option code */
+static const value_string mip6_mnid_subtype_value[] = {
+ { 1, "Network Access Identifier (NAI)" },
+ { 0, NULL }
+};
+
/* Message lengths */
#define MIP6_BRR_LEN 2
#define MIP6_HOTI_LEN 10
@@ -315,4 +329,11 @@ static const value_string fmip6_lla_optc
#define FMIP6_LLA_LLA_OFF 3
#define FMIP6_LLA_OPTCODE_LEN 1
+#define MIP6_MNID_MINLEN 2
+#define MIP6_MNID_SUBTYPE_OFF 2
+#define MIP6_MNID_SUBTYPE_LEN 1
+#define MIP6_MNID_MNID_OFF 3
+
+#define PMIP6_TS_LEN 8
+
#endif /* __PACKET_MIP6_H_DEFINED__ */
--- wireshark-0.99.5-01/epan/dissectors/packet-mip6.c 2007-06-26 14:05:48.022825400 +0200
+++ wireshark-0.99.5-02/epan/dissectors/packet-mip6.c 2007-06-26 16:34:57.275083445 +0200
@@ -39,6 +39,7 @@
#include <epan/ipproto.h>
#include <epan/ip_opts.h>
#include "packet-mip6.h"
+#include "packet-ntp.h"
/* Initialize the protocol and registered header fields */
static int proto_mip6 = -1;
@@ -66,13 +67,15 @@ static int hf_mip6_bu_a_flag = -1;
static int hf_mip6_bu_h_flag = -1;
static int hf_mip6_bu_l_flag = -1;
static int hf_mip6_bu_k_flag = -1;
-static int hf_nemo_bu_r_flag = -1;
static int hf_mip6_bu_m_flag = -1;
+static int hf_nemo_bu_r_flag = -1;
+static int hf_proxy_bu_p_flag = -1;
static int hf_mip6_bu_lifetime = -1;
static int hf_mip6_ba_status = -1;
static int hf_mip6_ba_k_flag = -1;
static int hf_nemo_ba_r_flag = -1;
+static int hf_proxy_ba_p_flag = -1;
static int hf_mip6_ba_seqnr = -1;
static int hf_mip6_ba_lifetime = -1;
@@ -104,6 +107,10 @@ static int hf_mip6_bad_auth = -1;
static int hf_fmip6_lla_optcode = -1;
+static int hf_mip6_mnid_subtype = -1;
+
+static int hf_pmip6_timestamp = -1;
+
/* Initialize the subtree pointers */
static gint ett_mip6 = -1;
static gint ett_mip6_opt_padn = -1;
@@ -113,6 +120,9 @@ static gint ett_mip6_opt_ni = -1;
static gint ett_mip6_opt_bad = -1;
static gint ett_nemo_opt_mnp = -1;
static gint ett_fmip6_opt_lla = -1;
+static gint ett_mip6_opt_mnid = -1;
+static gint ett_pmip6_opt_hnp = -1;
+static gint ett_pmip6_opt_ts = -1;
/* Functions to dissect the mobility headers */
@@ -254,12 +264,13 @@ dissect_mip6_bu(tvbuff_t *tvb, proto_tre
MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE);
proto_tree_add_item(data_tree, hf_mip6_bu_m_flag, tvb,
MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE);
+ proto_tree_add_item(data_tree, hf_nemo_bu_r_flag, tvb,
+ MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE);
+ proto_tree_add_item(data_tree, hf_proxy_bu_p_flag, tvb,
+ MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE);
- if ((tvb_get_guint8(tvb, MIP6_BU_FLAGS_OFF) & 0x0004 ) == 0x0004) {
+ if ((tvb_get_guint8(tvb, MIP6_BU_FLAGS_OFF) & 0x0004 ) == 0x0004)
proto_nemo = 1;
- proto_tree_add_item(data_tree, hf_nemo_bu_r_flag, tvb,
- MIP6_BU_FLAGS_OFF, MIP6_BU_FLAGS_LEN, FALSE);
- }
lifetime = tvb_get_ntohs(tvb, MIP6_BU_LIFETIME_OFF);
proto_tree_add_uint_format(data_tree, hf_mip6_bu_lifetime, tvb,
@@ -291,13 +302,17 @@ dissect_mip6_ba(tvbuff_t *tvb, proto_tre
MIP6_BA_STATUS_OFF, MIP6_BA_STATUS_LEN, FALSE);
proto_tree_add_item(data_tree, hf_mip6_ba_k_flag, tvb,
MIP6_BA_FLAGS_OFF, MIP6_BA_FLAGS_LEN, FALSE);
- if ((tvb_get_guint8(tvb, MIP6_BA_FLAGS_OFF) & 0x0040 ) == 0x0040) {
+ proto_tree_add_item(data_tree, hf_nemo_ba_r_flag, tvb,
+ MIP6_BA_FLAGS_OFF, MIP6_BA_FLAGS_LEN, FALSE);
+ proto_tree_add_item(data_tree, hf_proxy_ba_p_flag, tvb,
+ MIP6_BA_FLAGS_OFF, MIP6_BA_FLAGS_LEN, FALSE);
+
+ if ((tvb_get_guint8(tvb, MIP6_BA_FLAGS_OFF) & 0x0040 ) == 0x0040)
proto_nemo = 1;
- proto_tree_add_item(data_tree, hf_nemo_ba_r_flag, tvb,
- MIP6_BA_FLAGS_OFF, MIP6_BA_FLAGS_LEN, FALSE);
- }
+
proto_tree_add_item(data_tree, hf_mip6_ba_seqnr, tvb,
MIP6_BA_SEQNR_OFF, MIP6_BA_SEQNR_LEN, FALSE);
+
lifetime = tvb_get_ntohs(tvb, MIP6_BA_LIFETIME_OFF);
proto_tree_add_uint_format(data_tree, hf_mip6_ba_lifetime, tvb,
MIP6_BA_LIFETIME_OFF,
@@ -571,6 +586,38 @@ dissect_fmip6_opt_lla(const ip_tcp_opt *
}
}
+static void
+dissect_mip6_opt_mnid(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset,
+ guint optlen, packet_info *pinfo _U_, proto_tree *opt_tree)
+{
+ proto_tree *field_tree = NULL;
+ proto_item *tf;
+ int len, p;
+
+ tf = proto_tree_add_text(opt_tree, tvb, offset, optlen, "%s", optp->name);
+ field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
+
+ proto_tree_add_item(field_tree, hf_mip6_mnid_subtype, tvb,
+ offset + MIP6_MNID_SUBTYPE_OFF, MIP6_MNID_SUBTYPE_LEN, FALSE);
+
+ p = offset + MIP6_MNID_MNID_OFF;
+ len = optlen - MIP6_MNID_MNID_OFF;
+
+ if (len > 0)
+ proto_tree_add_text(field_tree, tvb, p, len, "Identifier: %s", tvb_get_ptr(tvb, p, len));
+}
+
+static void
+dissect_pmip6_opt_ts(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset,
+ guint optlen, packet_info *pinfo _U_, proto_tree *opt_tree)
+{
+ const guint8 *reftime;
+
+ reftime = tvb_get_ptr(tvb, offset + 2, optlen);
+ proto_tree_add_bytes_format(opt_tree, hf_pmip6_timestamp, tvb, offset , 10,
+ reftime, "Timestamp: %s", ntp_fmt_ts(reftime));
+}
+
static const ip_tcp_opt mip6_opts[] = {
{
PAD1,
@@ -636,6 +683,30 @@ static const ip_tcp_opt mip6_opts[] = {
FMIP6_LLA_MINLEN,
dissect_fmip6_opt_lla
},
+{
+ MNID,
+ "Mobile Node Identifier",
+ &ett_mip6_opt_mnid,
+ VARIABLE_LENGTH,
+ MIP6_MNID_MINLEN,
+ dissect_mip6_opt_mnid
+},
+{
+ HNP,
+ "Home Network Prefix",
+ &ett_pmip6_opt_hnp,
+ FIXED_LENGTH,
+ NEMO_MNP_LEN,
+ dissect_nemo_opt_mnp
+},
+{
+ TS,
+ "Timestamp",
+ &ett_pmip6_opt_ts,
+ FIXED_LENGTH,
+ PMIP6_TS_LEN,
+ dissect_pmip6_opt_ts
+},
};
#define N_MIP6_OPTS (sizeof mip6_opts / sizeof mip6_opts[0])
@@ -979,6 +1050,11 @@ proto_register_mip6(void)
FT_BOOLEAN, 8, TFS(&nemo_bu_r_flag_value),
0x04, "Mobile Router (R) flag",
HFILL }},
+ { &hf_proxy_bu_p_flag, { "Proxy Registration (P) flag",
+ "mip6.bu.p_flag",
+ FT_BOOLEAN, 8, TFS(&proxy_bu_p_flag_value),
+ 0x02, "Proxy Registration (P) flag",
+ HFILL }},
{ &hf_mip6_bu_lifetime, { "Lifetime", "mip6.bu.lifetime",
FT_UINT16, BASE_DEC, NULL, 0,
"Lifetime", HFILL }},
@@ -997,6 +1073,11 @@ proto_register_mip6(void)
FT_BOOLEAN, 8, TFS(&nemo_bu_r_flag_value),
0x40, "Mobile Router (R) flag",
HFILL }},
+ { &hf_proxy_ba_p_flag, { "Proxy Registration (P) flag",
+ "proxy.ba.p_flag",
+ FT_BOOLEAN, 8, TFS(&proxy_bu_p_flag_value),
+ 0x20, "Proxy Registration (P) flag",
+ HFILL }},
{ &hf_mip6_ba_seqnr, { "Sequence number", "mip6.ba.seqnr",
FT_UINT16, BASE_DEC, NULL, 0,
@@ -1081,7 +1162,14 @@ proto_register_mip6(void)
{ &hf_nemo_mnp_mnp, { "Mobile Network Prefix", "nemo.mnp.mnp",
FT_IPv6, BASE_HEX, NULL, 0,
- "Mobile Network Prefix", HFILL }}
+ "Mobile Network Prefix", HFILL }},
+
+ { &hf_mip6_mnid_subtype, { "Subtype", "mip6.mnid.subtype",
+ FT_UINT8, BASE_DEC, VALS(&mip6_mnid_subtype_value), 0,
+ "Subtype", HFILL }},
+
+ { &hf_pmip6_timestamp, { "Timestamp", "pmip6.timestamp",
+ FT_BYTES, BASE_NONE, NULL, 0, "Timestamp", HFILL }},
};
/* Setup protocol subtree array */
@@ -1093,7 +1181,10 @@ proto_register_mip6(void)
&ett_mip6_opt_ni,
&ett_mip6_opt_bad,
&ett_fmip6_opt_lla,
- &ett_nemo_opt_mnp
+ &ett_nemo_opt_mnp,
+ &ett_mip6_opt_mnid,
+ &ett_pmip6_opt_hnp,
+ &ett_pmip6_opt_ts
};
/* Register the protocol name and description */
- Prev by Date: Re: [Wireshark-dev] File size limits on Linux and building for large file support
- Next by Date: [Wireshark-dev] referring to a previous packet
- Previous by thread: [Wireshark-dev] [PATCH] HTTP Chunked Body Desegmentation Problem
- Next by thread: [Wireshark-dev] referring to a previous packet
- Index(es):