wireshark/epan/dissectors/packet-rtcp.h
Guy Harris 9461951d50 Make the array for the "setup method" for RTP, RTCP, and T.38
conversations large enough to hold the maximum setup method size plus a
trailing '\0'.  Make the maximum setup method size 7, so that when the
trailing '\0' is included the total array length is a power of 2.  (The
longest string currently used is "Skinny", which fits in 7 characters).

This fixes problems in the RTP and RTCP dissectors similar to the one
found in the T.38 dissector.

Undo the previous change to packet-t38.c, as it's now safe to store in
method[MAX_T38_SETUP_METHOD_SIZE], because the array now has
MAX_T38_SETUP_METHOD_SIZE+1 characters.

(Should we use "strlcpy()", and supply our own "strlcpy()" if the system
and/or C library doesn't supply it?  Its semantics are a bit cleaner
than those of the "strncpy()"/null-terminate idiom, perhaps making it
less likely that mistakes of this sort will be made.)

svn path=/trunk/; revision=12803
2004-12-21 19:28:48 +00:00

60 lines
2 KiB
C

/* packet-rtcp.h
*
* $Id$
*
* Routines for RTCP dissection
* RTCP = Real-time Transport Control Protocol
*
* Copyright 2000, Philips Electronics N.V.
* Written by Andreas Sikkema <andreas.sikkema@philips.com>
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* Info to save in RTCP conversation / packet-info.
Note that this structure applies to the destination end of
an RTP session */
#define MAX_RTCP_SETUP_METHOD_SIZE 7
struct _rtcp_conversation_info
{
/* Setup info is relevant to traffic whose dest is the conversation address */
guchar setup_method_set;
gchar setup_method[MAX_RTCP_SETUP_METHOD_SIZE + 1];
guint32 setup_frame_number;
/* Info used for roundtrip calculations */
guchar last_received_set;
guint32 last_received_frame_number;
guint32 last_received_time_secs;
guint32 last_received_time_usecs;
guint32 last_received_ts;
/* Stored result of calculation (ms) */
guchar calculated_delay_set;
guint32 calculated_delay_used_frame;
guint32 calculated_delay;
};
/* Add an RTCP conversation with the given details */
void rtcp_add_address(packet_info *pinfo,
address *addr, int port,
int other_port,
gchar *setup_method, guint32 setup_frame_number);