osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for bug 4410: 

Adding two more SSA types.

svn path=/trunk/; revision=31631
This commit is contained in:
Jaap Keuter 2010-01-23 11:58:53 +00:00
parent cc1afbef75
commit 3d84667a34
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dissectors/packet-bgp.c
View File

@ -36,6 +36,7 @@
* draft-ietf-idr-dynamic-cap-03
* draft-ietf-idr-bgp-ext-communities-05
* draft-knoll-idr-qos-attribute-03
* draft-nalawade-kapoor-tunnel-safi-05
*
* TODO:
* Destination Preference Attribute for BGP (work in progress)
@ -224,6 +225,8 @@ static const value_string bgp_ssa_type[] = {
{ BGP_SSA_mGRE , "mGRE Tunnel" },
{ BGP_SSA_IPSec , "IPSec Tunnel" },
{ BGP_SSA_MPLS , "MPLS Tunnel" },
{ BGP_SSA_L2TPv3_IN_IPSec , "L2TPv3 in IPSec Tunnel" },
{ BGP_SSA_mGRE_IN_IPSec , "mGRE in IPSec Tunnel" },
{ 0, NULL }
};
@ -2457,6 +2460,7 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree)
} else {
proto_tree_add_text(subtree3, tvb, q + 7, 1,
"Invalid Cookie Length of %u", ssa_v3_len);
q += ssa_len + 4; /* 4 from type and length */
break;
}
proto_tree_add_item(subtree3, hf_bgp_ssa_l2tpv3_session_id, tvb,
@ -2464,6 +2468,7 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree)
if (ssa_v3_len)
proto_tree_add_item(subtree3, hf_bgp_ssa_l2tpv3_cookie, tvb,
q + 12, ssa_v3_len, FALSE);
q += ssa_len + 4; /* 4 from type and length */
break;
case BGP_SSA_mGRE:
case BGP_SSA_IPSec:
@ -2471,9 +2476,14 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree)
default:
proto_tree_add_item(subtree3, hf_bgp_ssa_value, tvb,
q + 4, ssa_len, FALSE);
q += ssa_len + 4; /* 4 from type and length */
break;
case BGP_SSA_L2TPv3_IN_IPSec:
case BGP_SSA_mGRE_IN_IPSec:
/* These contain BGP_SSA_IPSec and BGP_SSA_L2TPv3/BGP_SSA_mGRE */
q += 4; /* 4 from type and length */
break;
}
q = q + ssa_len + 4; /* 4 from type and length */
}
break;

2
epan/dissectors/packet-bgp.h
View File

@ -98,6 +98,8 @@ struct bgp_attr {
#define BGP_SSA_mGRE 2
#define BGP_SSA_IPSec 3
#define BGP_SSA_MPLS 4
#define BGP_SSA_L2TPv3_IN_IPSec 5
#define BGP_SSA_mGRE_IN_IPSec 6
/* AS_PATH segment types */
#define AS_SET 1 /* RFC1771 */