MT#62735 pull up SRTP decryption

Decrypt SRTP (and possibly discard packet) first, before doing source
address checking/learning.

Change-Id: I2a2cdd94768e93d58e0cdd4614b8ac53ea680724
(cherry picked from commit 88cb8abf51)
(cherry picked from commit 1f195b739f)

daemon/media_socket.c

@@ -2816,6 +2816,17 @@ static int stream_packet(struct packet_handler_ctx *phc) {
 	// this sets rtcp, in_srtp, and sinks
 	media_packet_rtcp_demux(phc);
 
+	// this set payload_type, ssrc_in, and mp payloads
+	media_packet_rtp_in(phc);
+
+	// decrypt in place
+	// XXX check handler_ret along the paths
+	handler_ret = media_packet_decrypt(phc);
+	if (handler_ret < 0)
+		goto out; // receive error
+
+	rtp_padding(phc->mp.rtp, &phc->mp.payload);
+
 	if (media_packet_address_check(phc))
 		goto drop;
 
@@ -2826,9 +2837,6 @@ static int stream_packet(struct packet_handler_ctx *phc) {
 	if (!is_blackhole)
 		is_blackhole = !phc->rtcp && !MEDIA_ISSET(phc->mp.media, RECV);
 
-	// this set payload_type, ssrc_in, and mp payloads
-	media_packet_rtp_in(phc);
-
 	if (phc->mp.rtp)
 		ilog(LOG_DEBUG, "Handling packet: remote %s%s%s (expected: %s%s%s) -> local %s "
 				"(RTP seq %u TS %u SSRC %s%x%s)",
@@ -2863,14 +2871,6 @@ static int stream_packet(struct packet_handler_ctx *phc) {
 		}
 	}
 
-	// decrypt in place
-	// XXX check handler_ret along the paths
-	handler_ret = media_packet_decrypt(phc);
-	if (handler_ret < 0)
-		goto out; // receive error
-
-	rtp_padding(phc->mp.rtp, &phc->mp.payload);
-
 	// If recording pcap dumper is set, then we record the call.
 	if (phc->mp.call->recording && !rtpe_config.rec_egress)
 		dump_packet(&phc->mp, &phc->s);