c4c8350284
The behavior for SIP/SDP handling of RTP conversation tracking changed in v1.10, with some unintended consequences. The bugs did not show up at the time because wireshark makes 2 passes of the packet list, and so the problems auto-corrected themselves in most cases. Unfortunately, a change in r53641 modified how UDP behaves, making it always create conversations for UDP packets, and that exposed the bugs inherent in the SIP/SDP code changes. This commit reverts the behavior of SIP/SDP to its pre-1.10 model, but creates a new preference setting for "Delay SDP changes for tracking media", which if enabled, will turn on the new (but buggy) model introduced in 1.10. This preference is *disabled* by default, since for a majority of cases the new behavior is worse than the previous behavior. The preference, and this commit's fix, is not intended to last long. I intend to re-write the SIP/SDP/RTP interaction model for release 1.11 - I think it's too big a change for 1.10, however, which is why I submitted this commit. Change-Id: Ic5601749d6c2344e952ced8206dd9296bfdc4b90 Reviewed-on: https://code.wireshark.org/review/543 Reviewed-by: Evan Huus <eapache@gmail.com>
43 lines
1.7 KiB
C
43 lines
1.7 KiB
C
/* packet-sdp.h
|
|
* Routines for SDP packet disassembly (RFC 2327)
|
|
*
|
|
* Jason Lango <jal@netapp.com>
|
|
* Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu>
|
|
* 2005 Alejandro Vaquero <alejandro.vaquero@verso.com>, add support for tap
|
|
*
|
|
* Wireshark - Network traffic analyzer
|
|
* By Gerald Combs <gerald@wireshark.org>
|
|
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
typedef struct _sdp_packet_info {
|
|
gchar summary_str[50]; /* SDP summary string for VoIP calls graph analysis */
|
|
} sdp_packet_info;
|
|
|
|
enum sdp_exchange_type
|
|
{
|
|
SDP_EXCHANGE_OFFER = 0,
|
|
SDP_EXCHANGE_ANSWER_ACCEPT,
|
|
SDP_EXCHANGE_ANSWER_REJECT
|
|
};
|
|
|
|
extern void setup_sdp_transport(tvbuff_t *tvb, packet_info *pinfo, enum sdp_exchange_type type, int request_frame, const gboolean delay);
|
|
/* Handles duplicate OFFER packets so they don't end up processed by dissect_sdp(). This can probably
|
|
* be removed when all higher layer dissectors properly handle SDP themselves with setup_sdp_transport()
|
|
*/
|
|
extern void setup_sdp_transport_resend(int current_frame, int request_frame);
|