Re-enable the PacketCable RADIUS code and add a few EM updates.
Sponsored by CableLabs. svn path=/trunk/; revision=17233
This commit is contained in:
parent
243fb39067
commit
bed77708fe
|
@ -507,6 +507,7 @@ DISSECTOR_SRC = \
|
|||
packet-quake3.c \
|
||||
packet-quakeworld.c \
|
||||
packet-radius.c \
|
||||
packet-radius_packetcable.c \
|
||||
packet-radiotap.c \
|
||||
packet-ranap.c \
|
||||
packet-raw.c \
|
||||
|
|
|
@ -83,6 +83,8 @@ static int hf_packetcable_terminal_display_info_general_display = -1;
|
|||
static int hf_packetcable_terminal_display_info_calling_number = -1;
|
||||
static int hf_packetcable_terminal_display_info_calling_name = -1;
|
||||
static int hf_packetcable_terminal_display_info_message_waiting = -1;
|
||||
static int hf_packetcable_party_ccc_id_valid = -1;
|
||||
static int hf_packetcable_party_ccc_id = -1;
|
||||
|
||||
/* This is slightly ugly. */
|
||||
static int hf_packetcable_qos_desc_flags[] =
|
||||
|
@ -144,7 +146,7 @@ static guint32 packetcable_qos_desc_mask[] =
|
|||
PACKETCABLE_NOMINAL_POLLING_INTERVAL_MASK,
|
||||
PACKETCABLE_TOLERATED_POLL_JITTER_MASK,
|
||||
PACKETCABLE_IP_TYPE_OF_SERVICE_OVERRIDE_MASK,
|
||||
PACKETCABLE_MAXIMUM_DOWNSTREAM_LATENCY_MASK,
|
||||
PACKETCABLE_MAXIMUM_DOWNSTREAM_LATENCY_MASK
|
||||
};
|
||||
|
||||
static value_string radius_vendor_packetcable_event_message_vals[] =
|
||||
|
@ -307,6 +309,7 @@ static gchar* dissect_packetcable_trunk_group_id(proto_tree* tree, tvbuff_t* tvb
|
|||
tvb, 0, 2, FALSE);
|
||||
proto_tree_add_item(tree, hf_packetcable_trunk_group_id_trunk_number,
|
||||
tvb, 2, 4, FALSE);
|
||||
return "";
|
||||
}
|
||||
|
||||
static gchar* dissect_packetcable_qos_descriptor(proto_tree* tree, tvbuff_t* tvb) {
|
||||
|
@ -436,7 +439,7 @@ static gchar* dissect_packetcable_term_dsply_info(proto_tree* tree, tvbuff_t* tv
|
|||
|
||||
void proto_register_packetcable(void) {
|
||||
|
||||
hf_register_info hf[] = {
|
||||
static hf_register_info hf[] = {
|
||||
{ &hf_packetcable_em_header_version_id,
|
||||
{ "Event Message Version ID","radius.vendor.pkt.emh.vid",
|
||||
FT_UINT16, BASE_DEC, NULL, 0x0,
|
||||
|
@ -773,7 +776,7 @@ void proto_register_packetcable(void) {
|
|||
}
|
||||
};
|
||||
|
||||
gint *ett[] = {
|
||||
static gint *ett[] = {
|
||||
&ett_radius_vendor_packetcable_bcid,
|
||||
&ett_radius_vendor_packetcable_status,
|
||||
&ett_radius_vendor_packetcable_qos_status,
|
||||
|
@ -783,8 +786,7 @@ void proto_register_packetcable(void) {
|
|||
proto_packetcable = proto_register_protocol("PacketCable AVPs", "PACKETCABLE", "paketcable_avps");
|
||||
|
||||
proto_register_field_array(proto_packetcable, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett) );
|
||||
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -801,6 +803,8 @@ proto_reg_handoff_packetcable(void)
|
|||
radius_register_avp_dissector(VENDOR_CABLELABS, 44, dissect_packetcable_time_electr_surv_ind);
|
||||
radius_register_avp_dissector(VENDOR_CABLELABS, 47, dissect_packetcable_surv_df_sec);
|
||||
radius_register_avp_dissector(VENDOR_CABLELABS, 54, dissect_packetcable_term_dsply_info);
|
||||
|
||||
/* radius_register_avp_dissector(VENDOR_CABLELABS, 90, dissect_packetcable_party_info);
|
||||
radius_register_avp_dissector(VENDOR_CABLELABS, 91, dissect_packetcable_party_info);
|
||||
radius_register_avp_dissector(VENDOR_CABLELABS, 92, dissect_packetcable_party_info); */
|
||||
}
|
||||
|
||||
|
|
|
@ -33,6 +33,7 @@ $INCLUDE dictionary.altiga
|
|||
$INCLUDE dictionary.aptis
|
||||
$INCLUDE dictionary.bay
|
||||
$INCLUDE dictionary.bintec
|
||||
$INCLUDE dictionary.cablelabs
|
||||
$INCLUDE dictionary.cabletron
|
||||
$INCLUDE dictionary.cisco
|
||||
$INCLUDE dictionary.cisco.vpn3000
|
||||
|
|
|
@ -65,6 +65,22 @@ ATTRIBUTE CableLabs-Time-Usage-Limit 72 integer
|
|||
ATTRIBUTE CableLabs-Gate-Time-Info 73 integer
|
||||
ATTRIBUTE CableLabs-Account-Code 80 string
|
||||
ATTRIBUTE CableLabs-Authorization-Code 81 string
|
||||
ATTRIBUTE CableLabs-Jurisdiction-Information-Parameter 82 string
|
||||
ATTRIBUTE CableLabs-Called-Party-NP-Source 83 integer
|
||||
ATTRIBUTE CableLabs-Calling-Party-NP-Source 84 integer
|
||||
ATTRIBUTE CableLabs-Ported-In-Calling-Number 85 integer
|
||||
ATTRIBUTE CableLabs-Ported-In-Called-Number 86 integer
|
||||
ATTRIBUTE CableLabs-Billing-Type 87 integer
|
||||
ATTRIBUTE CableLabs-Signaled-To-Number 88 string
|
||||
ATTRIBUTE CableLabs-Signaled-From-Number 89 string
|
||||
ATTRIBUTE CableLabs-Communicating-Party 90 octets
|
||||
ATTRIBUTE CableLabs-Joined-Party 91 octets
|
||||
ATTRIBUTE CableLabs-Removed-Party 92 octets
|
||||
ATTRIBUTE CableLabs-RTCP-Data 93 string
|
||||
ATTRIBUTE CableLabs-Local-XR-Block 94 string
|
||||
ATTRIBUTE CableLabs-Remote-XR-Block 95 string
|
||||
ATTRIBUTE Surveillance-Stop-Type 96 integer
|
||||
ATTRIBUTE Surveillance-Stop-Destination 97 integer
|
||||
|
||||
VALUE CableLabs-Event-Message Reserved 0
|
||||
VALUE CableLabs-Event-Message Signaling-Start 1
|
||||
|
|
Loading…
Reference in New Issue