Osmocom Open Build Service

osmo-mgw.spec Changed

commit_58c0b0a6f7ceb512d433c840f79bc1cdada43adb.txt Added

commit_d266c374ee3e6b227512c9f9c7342a99d5b3a316.txt Deleted

osmo-mgw_1.10.0.99.d266c.dsc -> osmo-mgw_1.10.0.101.58c0.dsc Changed

osmo-mgw_1.10.0.99.d266c.tar.xz/.tarball-version -> osmo-mgw_1.10.0.101.58c0.tar.xz/.tarball-version Changed

osmo-mgw_1.10.0.99.d266c.tar.xz/debian/changelog -> osmo-mgw_1.10.0.101.58c0.tar.xz/debian/changelog Changed

osmo-mgw_1.10.0.99.d266c.tar.xz/include/osmocom/mgcp/mgcp_codec.h -> osmo-mgw_1.10.0.101.58c0.tar.xz/include/osmocom/mgcp/mgcp_codec.h Changed

osmo-mgw_1.10.0.99.d266c.tar.xz/src/libosmo-mgcp/mgcp_codec.c -> osmo-mgw_1.10.0.101.58c0.tar.xz/src/libosmo-mgcp/mgcp_codec.c Changed

osmo-mgw_1.10.0.99.d266c.tar.xz/src/libosmo-mgcp/mgcp_network.c -> osmo-mgw_1.10.0.101.58c0.tar.xz/src/libosmo-mgcp/mgcp_network.c Changed

@@ -769,20 +769,6 @@
 	return msgb_trim(msg, rc + sizeof(struct rtp_hdr));
 }
 
-/* Check if a conversion between octet-aligned and bandwith-efficient mode is
- * indicated. */
-static bool amr_oa_bwe_convert_indicated(struct mgcp_rtp_codec *codec)
-{
-	if (codec->param_present == false)
-		return false;
-	if (!codec->param.amr_octet_aligned_present)
-		return false;
-	if (strcmp(codec->subtype_name, "AMR") != 0)
-		return false;
-	return true;
-}
-
-
 /* Return whether an RTP packet with AMR payload is in octet-aligned mode.
  * Return 0 if in bandwidth-efficient mode, 1 for octet-aligned mode, and negative if the RTP data is invalid. */
 static int amr_oa_check(char *data, int len)
@@ -1221,7 +1207,7 @@
 
 			if (mgcp_conn_rtp_is_iuup(conn_dst) || mgcp_conn_rtp_is_iuup(conn_src)) {
 				/* the iuup code will correctly transform to the correct AMR mode */
-			} else if (amr_oa_bwe_convert_indicated(conn_dst->end.codec)) {
+			} else if (mgcp_codec_amr_align_mode_is_indicated(conn_dst->end.codec)) {
 				rc = amr_oa_bwe_convert(endp, msg,
 							conn_dst->end.codec->param.amr_octet_aligned);
 				if (rc < 0) {
@@ -1528,14 +1514,16 @@
 
 	LOG_CONN_RTP(conn_src, LOGL_DEBUG, "rx_rtp(%u bytes)\n", msgb_length(msg));
 
-	mgcp_conn_watchdog_kick(conn_src->conn);
+	/* Check if the origin of the RTP packet seems plausible */
+	if (!trunk->rtp_accept_all && check_rtp_origin(conn_src, from_addr))
+		return -1;
 
 	/* If AMR is configured for the ingress connection and conversion of the
 	 * framing mode (octet-aligned vs. bandwith-efficient) is explicitly
 	 * defined, then we check if the incoming payload matches that
 	 * expectation. */
 	if (mc->proto == MGCP_PROTO_RTP &&
-	    amr_oa_bwe_convert_indicated(conn_src->end.codec)) {
+	    mgcp_codec_amr_align_mode_is_indicated(conn_src->end.codec)) {
 		int oa = amr_oa_check((char*)msgb_data(msg), msgb_length(msg));
 		if (oa < 0)
 			return -1;
@@ -1548,9 +1536,7 @@
 		}
 	}
 
-	/* Check if the origin of the RTP packet seems plausible */
-	if (!trunk->rtp_accept_all && check_rtp_origin(conn_src, from_addr))
-		return -1;
+	mgcp_conn_watchdog_kick(conn_src->conn);
 
 	/* Execute endpoint specific implementation that handles the
 	 * dispatching of the RTP data */

Changes of Revision 23