diff options
| author | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-08-28 07:05:02 +0000 |
|---|---|---|
| committer | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-08-28 07:05:02 +0000 |
| commit | 45a47559eae4df5523e2558d0e37414a347f9f63 (patch) | |
| tree | 7df5e9621fb289d5966cd5ea0550a06eb484362e /epan/dissectors/packet-q931.c | |
| parent | 866eb5fba75f21bbed7c5c59b1106280defa8632 (diff) | |
- new function ssl_dissector_delete()
- register H.225.0 over TLS (configurable port 1300)
- register SIP over TLS (fixed port 5061)
- new function proto_tree_get_root()
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19059 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-q931.c')
| -rw-r--r-- | epan/dissectors/packet-q931.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index 715a0ccf8c..3ec47632a0 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -145,6 +145,7 @@ static dissector_table_t ie_dissector_table; static gboolean q931_desegment = TRUE; static dissector_handle_t h225_handle; +static dissector_handle_t q931_tpkt_handle; static dissector_handle_t q931_tpkt_pdu_handle; static void @@ -2998,7 +2999,7 @@ dissect_q931_IEs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root_tree, * Q.931-over-TPKT-over-TCP. */ static gboolean -dissect_q931_tpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_q931_tpkt_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { int lv_tpkt_len; @@ -3068,6 +3069,12 @@ dissect_q931_tpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } static void +dissect_q931_tpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_q931_tpkt_heur(tvb, pinfo, tree); +} + +static void dissect_q931_tpkt_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { dissect_q931_pdu(tvb, pinfo, tree, TRUE); @@ -3279,6 +3286,8 @@ proto_register_q931(void) register_init_routine(q931_init); register_dissector("q931", dissect_q931, proto_q931); + register_dissector("q931.tpkt", dissect_q931_tpkt, proto_q931); + q931_tpkt_handle = find_dissector("q931.tpkt"); q931_tpkt_pdu_handle = create_dissector_handle(dissect_q931_tpkt_pdu, proto_q931); register_dissector("q931.ie", dissect_q931_ie_cs0, proto_q931); @@ -3321,7 +3330,7 @@ proto_reg_handoff_q931(void) /* * For H.323. */ - heur_dissector_add("tcp", dissect_q931_tpkt, proto_q931); + heur_dissector_add("tcp", dissect_q931_tpkt_heur, proto_q931); } static void reset_q931_packet_info(q931_packet_info *pi) |