Re: [Wireshark-dev] [Fwd: H.223 over rtp]
Anders Broman wrote: > Of course > Committed revision 20975. > Best regards > Anders Thanks Anders! Richard ___ Wireshark-dev mailing list Wireshark-dev@wireshark.org http://www.wireshark.org/mailman/listinfo/wireshark-dev
Re: [Wireshark-dev] [Fwd: H.223 over rtp]
Of course
Committed revision 20975.
Best regards
Anders
-Ursprungligt meddelande-
Från: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] För Richard van der Hoff
Skickat: den 5 mars 2007 13:47
Till: Developer support list for Wireshark
Ämne: Re: [Wireshark-dev] [Fwd: H.223 over rtp]
Anders Broman wrote:
> Committed revision 20935.
Thanks for all that, Anders.
Would it be possible for my colleague Dave Butt (who did much of the
work for this) to get a credit in the AUTHORS file?
I've attached a patch.
> -Ursprungligt meddelande-
> Från: [EMAIL PROTECTED]
> [mailto:[EMAIL PROTECTED] För Richard van der Hoff
> Skickat: den 26 februari 2007 18:28
> Till: Developer support list for Wireshark
> Ämne: [Wireshark-dev] [Fwd: H.223 over rtp]
>
> Now that the predependent patches for this have been applied (thanks for
> all that, Anders), please could this one be applied?
>
>
>
>
> Original Message
> Subject: [Wireshark-dev] H.223 over rtp
> Date: Tue, 20 Feb 2007 12:29:45 +
> From: Richard van der Hoff <[EMAIL PROTECTED]>
> Reply-To: Developer support list for Wireshark
> To: Developer support list for Wireshark
>
> This patch registers H.223 as a dissector for RTP CLEARMODE payloads -
> and makes some other modifications to the H.223 dissector to make this
> work correctly.
>
> It assumes that both my earlier patches to the H.223 dissector ('H.223
> dissector - separate "bitswapping" into separate dissector' and 'h.223
> robustness fixes') have been applied; it also depends on my
> 'defragmentation over RTP' patch (submitted on 16/2/2007) for correct
> operation.
>
> I've added some sample captures to the wiki.
>
>
> ___
> Wireshark-dev mailing list
> Wireshark-dev@wireshark.org
> http://www.wireshark.org/mailman/listinfo/wireshark-dev
--
Richard van der Hoff <[EMAIL PROTECTED]>
Telephony Gateways Project Manager
Tel: +44 (0) 845 666 7778
http://www.mxtelecom.com
___
Wireshark-dev mailing list
Wireshark-dev@wireshark.org
http://www.wireshark.org/mailman/listinfo/wireshark-dev
Re: [Wireshark-dev] [Fwd: H.223 over rtp]
Anders Broman wrote:
Committed revision 20935.
Thanks for all that, Anders.
Would it be possible for my colleague Dave Butt (who did much of the
work for this) to get a credit in the AUTHORS file?
I've attached a patch.
-Ursprungligt meddelande-
Från: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] För Richard van der Hoff
Skickat: den 26 februari 2007 18:28
Till: Developer support list for Wireshark
Ämne: [Wireshark-dev] [Fwd: H.223 over rtp]
Now that the predependent patches for this have been applied (thanks for
all that, Anders), please could this one be applied?
Original Message
Subject: [Wireshark-dev] H.223 over rtp
Date: Tue, 20 Feb 2007 12:29:45 +
From: Richard van der Hoff <[EMAIL PROTECTED]>
Reply-To: Developer support list for Wireshark
To: Developer support list for Wireshark
This patch registers H.223 as a dissector for RTP CLEARMODE payloads -
and makes some other modifications to the H.223 dissector to make this
work correctly.
It assumes that both my earlier patches to the H.223 dissector ('H.223
dissector - separate "bitswapping" into separate dissector' and 'h.223
robustness fixes') have been applied; it also depends on my
'defragmentation over RTP' patch (submitted on 16/2/2007) for correct
operation.
I've added some sample captures to the wiki.
___
Wireshark-dev mailing list
Wireshark-dev@wireshark.org
http://www.wireshark.org/mailman/listinfo/wireshark-dev
--
Richard van der Hoff <[EMAIL PROTECTED]>
Telephony Gateways Project Manager
Tel: +44 (0) 845 666 7778
http://www.mxtelecom.com
Index: AUTHORS
===
--- AUTHORS (revision 12112)
+++ AUTHORS (working copy)
@@ -2593,6 +2593,11 @@
Connection Configuration Object support in EtherNet/IP
}
+Dave Butt {
+ RTP payload reassembly support
+ H.223-over-RTP support
+}
+
and by:
Pavel Roskin
___
Wireshark-dev mailing list
Wireshark-dev@wireshark.org
http://www.wireshark.org/mailman/listinfo/wireshark-dev
Re: [Wireshark-dev] [Fwd: H.223 over rtp]
Committed revision 20935.
Best regards
Anders
-Ursprungligt meddelande-
Från: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] För Richard van der Hoff
Skickat: den 26 februari 2007 18:28
Till: Developer support list for Wireshark
Ämne: [Wireshark-dev] [Fwd: H.223 over rtp]
Now that the predependent patches for this have been applied (thanks for
all that, Anders), please could this one be applied?
Original Message
Subject: [Wireshark-dev] H.223 over rtp
Date: Tue, 20 Feb 2007 12:29:45 +
From: Richard van der Hoff <[EMAIL PROTECTED]>
Reply-To: Developer support list for Wireshark
To: Developer support list for Wireshark
This patch registers H.223 as a dissector for RTP CLEARMODE payloads -
and makes some other modifications to the H.223 dissector to make this
work correctly.
It assumes that both my earlier patches to the H.223 dissector ('H.223
dissector - separate "bitswapping" into separate dissector' and 'h.223
robustness fixes') have been applied; it also depends on my
'defragmentation over RTP' patch (submitted on 16/2/2007) for correct
operation.
I've added some sample captures to the wiki.
___
Wireshark-dev mailing list
Wireshark-dev@wireshark.org
http://www.wireshark.org/mailman/listinfo/wireshark-dev
[Wireshark-dev] [Fwd: H.223 over rtp]
Now that the predependent patches for this have been applied (thanks for
all that, Anders), please could this one be applied?
Original Message
Subject: [Wireshark-dev] H.223 over rtp
Date: Tue, 20 Feb 2007 12:29:45 +
From: Richard van der Hoff <[EMAIL PROTECTED]>
Reply-To: Developer support list for Wireshark
To: Developer support list for Wireshark
This patch registers H.223 as a dissector for RTP CLEARMODE payloads -
and makes some other modifications to the H.223 dissector to make this
work correctly.
It assumes that both my earlier patches to the H.223 dissector ('H.223
dissector - separate "bitswapping" into separate dissector' and 'h.223
robustness fixes') have been applied; it also depends on my
'defragmentation over RTP' patch (submitted on 16/2/2007) for correct
operation.
I've added some sample captures to the wiki.
Index: plugins/h223/packet-h223.c
===
--- plugins/h223/packet-h223.c (revision 11941)
+++ plugins/h223/packet-h223.c (working copy)
@@ -388,103 +388,168 @@
return vc_info;
}
-static void init_logical_channel( packet_info* pinfo, h223_call_info* call_info, int vc, int direction, h223_lc_params* params )
+static void init_logical_channel( guint32 start_frame, h223_call_info* call_info, int vc, int direction, h223_lc_params* params )
{
guint32 circuit_id = circuit_chain_lookup(call_info, vc);
circuit_t *subcircuit;
h223_vc_info *vc_info;
-subcircuit = find_circuit( CT_H223, circuit_id, pinfo->fd->num );
+subcircuit = find_circuit( CT_H223, circuit_id, start_frame );
if( subcircuit == NULL ) {
-subcircuit = circuit_new( CT_H223, circuit_id, pinfo->fd->num );
+subcircuit = circuit_new( CT_H223, circuit_id, start_frame );
#ifdef DEBUG_H223
-g_debug("%d: Created new circuit %d for call %p VC %d", pinfo->fd->num, circuit_id, call_info, vc);
+g_debug("%d: Created new circuit %d for call %p VC %d", start_frame, circuit_id, call_info, vc);
#endif
vc_info = h223_vc_info_new( call_info );
circuit_add_proto_data( subcircuit, proto_h223, vc_info );
} else {
vc_info = circuit_get_proto_data( subcircuit, proto_h223 );
}
-add_h223_lc_params( vc_info, direction, params, pinfo->fd->num );
+add_h223_lc_params( vc_info, direction, params, start_frame );
}
-static void init_control_channels( packet_info* pinfo, h223_call_info* call_info )
+/* create a brand-new h223_call_info structure */
+static h223_call_info *create_call_info( guint32 start_frame )
{
-h223_lc_params *vc0_params = se_alloc(sizeof(h223_lc_params));
+h223_call_info *data;
+h223_lc_params *vc0_params;
+
+data = se_alloc(sizeof(h223_call_info));
+
+/* initialise the call info */
+init_direction_data(&data -> direction_data[0]);
+init_direction_data(&data -> direction_data[1]);
+
+/* FIXME shouldn't this be figured out dynamically? */
+data -> h223_level = 2;
+
+vc0_params = se_alloc(sizeof(h223_lc_params));
vc0_params->al_type = al1Framed;
vc0_params->al_params = NULL;
vc0_params->segmentable = TRUE;
vc0_params->subdissector = srp_handle;
-init_logical_channel( pinfo, call_info, 0, P2P_DIR_SENT, vc0_params );
-init_logical_channel( pinfo, call_info, 0, P2P_DIR_RECV, vc0_params );
+init_logical_channel( start_frame, data, 0, P2P_DIR_SENT, vc0_params );
+init_logical_channel( start_frame, data, 0, P2P_DIR_RECV, vc0_params );
+return data;
}
-static h223_call_info *find_or_create_call_info ( packet_info * pinfo )
+/* find or create call_info struct for calls over circuits (eg, IAX) */
+static h223_call_info *find_or_create_call_info_circ(packet_info * pinfo)
{
-circuit_t *circ;
-conversation_t *conv = NULL;
h223_call_info *data;
+circuit_t *circ = NULL;
-/* look for a circuit (eg, IAX call) first */
-circ = find_circuit( pinfo->ctype, pinfo->circuit_id, pinfo->fd->num );
-if( circ == NULL ) {
- /* assume we're running atop TCP; use the converstion support */
- conv = find_conversation( pinfo->fd->num,
- &pinfo->src,&pinfo->dst,
- pinfo->ptype,
- pinfo->srcport,pinfo->destport, 0 );
- if( conv == NULL ) {
- conv = conversation_new( pinfo->fd->num,
- &pinfo->src,&pinfo->dst,
- pinfo->ptype,
- pinfo->srcport,pinfo->destport, 0 );
- }
-
+if(pinfo->ctype != CT_NONE)
+circ = find_circuit( pinfo->ctype, pinfo->circuit_id, pinfo->fd->num );
+if(circ == NULL)
+return NULL;
+
+data = (h223_call_info *)circuit_get_proto_data(circ, proto_h223);
+
+if( data == NULL ) {
+data = create_call_info(pinfo->fd->num);
+
+#ifdef DEBUG_H223
+g_debug("%u: Created new call %p for circuit %p ctype %d, id %u",
+pinfo->fd->num, data, circ, pinfo->ctype, pinfo->circuit_id)
