From Michal Labedzki:

Src/dst ports are stored as guint32 in packet_info, so do the same
for RTP ports. This also fix no stream after analyze when
there is used high port, for example 0xFFFFFFFF. So there is
casting to 0xFFFF and comparing to 32bit value and finally fail.

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46277

4 files changed, 22 insertions, 22 deletions

diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index 4ee4eb6a86..07c7572e90 100644
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -231,14 +231,14 @@ struct _info_direction {
 typedef struct _user_data_t {
 	/* tap associated data*/
 	address ip_src_fwd;
-	guint16 port_src_fwd;
+	guint32 port_src_fwd;
 	address ip_dst_fwd;
-	guint16 port_dst_fwd;
+	guint32 port_dst_fwd;
 	guint32 ssrc_fwd;
 	address ip_src_rev;
-	guint16 port_src_rev;
+	guint32 port_src_rev;
 	address ip_dst_rev;
-	guint16 port_dst_rev;
+	guint32 port_dst_rev;
 	guint32 ssrc_rev;
 
 	struct _info_direction forward;
@@ -3640,14 +3640,14 @@ static gboolean get_int_value_from_proto_tree(proto_tree *protocol_tree,
 /****************************************************************************/
 void rtp_analysis(
 		address *ip_src_fwd,
-		guint16 port_src_fwd,
+		guint32 port_src_fwd,
 		address *ip_dst_fwd,
-		guint16 port_dst_fwd,
+		guint32 port_dst_fwd,
 		guint32 ssrc_fwd,
 		address *ip_src_rev,
-		guint16 port_src_rev,
+		guint32 port_src_rev,
 		address *ip_dst_rev,
-		guint16 port_dst_rev,
+		guint32 port_dst_rev,
 		guint32 ssrc_rev
 		)
 {
@@ -3766,14 +3766,14 @@ void rtp_analysis(
 void rtp_analysis_cb(GtkAction *action _U_, gpointer user_data _U_)
 {
 	address ip_src_fwd;
-	guint16 port_src_fwd;
+	guint32 port_src_fwd;
 	address ip_dst_fwd;
-	guint16 port_dst_fwd;
+	guint32 port_dst_fwd;
 	guint32 ssrc_fwd = 0;
 	address ip_src_rev;
-	guint16 port_src_rev;
+	guint32 port_src_rev;
 	address ip_dst_rev;
-	guint16 port_dst_rev;
+	guint32 port_dst_rev;
 	guint32 ssrc_rev = 0;
 	unsigned int version_fwd;
 
diff --git a/ui/gtk/rtp_analysis.h b/ui/gtk/rtp_analysis.h
index ee3252c6f7..675a1382b1 100644
--- a/ui/gtk/rtp_analysis.h
+++ b/ui/gtk/rtp_analysis.h
@@ -43,14 +43,14 @@
 
 void rtp_analysis(
 		address *ip_src_fwd,
-		guint16 port_src_fwd,
+		guint32 port_src_fwd,
 		address *ip_dst_fwd,
-		guint16 port_dst_fwd,
+		guint32 port_dst_fwd,
 		guint32 ssrc_fwd,
 		address *ip_src_rev,
-		guint16 port_src_rev,
+		guint32 port_src_rev,
 		address *ip_dst_rev,
-		guint16 port_dst_rev,
+		guint32 port_dst_rev,
 		guint32 ssrc_rev
 		);
 
diff --git a/ui/gtk/rtp_stream.h b/ui/gtk/rtp_stream.h
index cbbf77ed2b..346915a37a 100644
--- a/ui/gtk/rtp_stream.h
+++ b/ui/gtk/rtp_stream.h
@@ -53,9 +53,9 @@ typedef rtp_sample_t* rtp_sample_p;
 /* defines an rtp stream */
 typedef struct _rtp_stream_info {
 	address src_addr;
-	guint16 src_port;
+	guint32 src_port;
 	address dest_addr;
-	guint16 dest_port;
+	guint32 dest_port;
 	guint32 ssrc;
 	guint8  pt;
 	gchar	*info_payload_type_str;
diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c
index 227056e176..4135afdf84 100644
--- a/ui/gtk/rtp_stream_dlg.c
+++ b/ui/gtk/rtp_stream_dlg.c
@@ -500,14 +500,14 @@ static void
 rtpstream_on_analyse(GtkButton *button _U_, gpointer user_data _U_)
 {
 	address ip_src_fwd;
-	guint16 port_src_fwd = 0;
+	guint32 port_src_fwd = 0;
 	address ip_dst_fwd;
-	guint16 port_dst_fwd = 0;
+	guint32 port_dst_fwd = 0;
 	guint32 ssrc_fwd = 0;
 	address ip_src_rev;
-	guint16 port_src_rev = 0;
+	guint32 port_src_rev = 0;
 	address ip_dst_rev;
-	guint16 port_dst_rev = 0;
+	guint32 port_dst_rev = 0;
 	guint32 ssrc_rev = 0;
 
 	if (!(selected_stream_fwd || selected_stream_rev))