Osmocom Open Build Service

commit_7580bff3f8ce07ca86e56c5936ed95bbfed7cd8c.txt Added

commit_b64c70d88ee7ca537585bd337a73a4ddd90d2fb9.txt Deleted

libosmo-sigtran_2.2.1.55.b64c.dsc -> libosmo-sigtran_2.2.1.56.7580.dsc Changed

@@ -2,7 +2,7 @@
 Source: libosmo-sigtran
 Binary: libosmo-sigtran12, libosmo-sigtran-dbg, libosmo-sigtran-doc, libosmo-sigtran-dev, osmo-stp, osmo-stp-dbg, osmo-stp-doc
 Architecture: any all
-Version: 2.2.1.55.b64c
+Version: 2.2.1.56.7580
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/libosmo-sccp
 Standards-Version: 3.9.7
@@ -18,8 +18,8 @@
  osmo-stp-dbg deb debug optional arch=any
  osmo-stp-doc deb doc optional arch=all
 Checksums-Sha1:
- c841b443b15ddf54e68962757b9b691403321a51 272104 libosmo-sigtran_2.2.1.55.b64c.tar.xz
+ de4eedeea47262615787e5aaee140ae5244522e1 272300 libosmo-sigtran_2.2.1.56.7580.tar.xz
 Checksums-Sha256:
- 75c5dc988897a044fe60a31de1abcd6c0497d879086a835fb0c2b0fc030119c9 272104 libosmo-sigtran_2.2.1.55.b64c.tar.xz
+ aa2ed4598659855a76f8d992c9fc934ae69e864f50ee2a12adac088a69741cb1 272300 libosmo-sigtran_2.2.1.56.7580.tar.xz
 Files:
- c8f693c96910a626b38e35ecbbb878f0 272104 libosmo-sigtran_2.2.1.55.b64c.tar.xz
+ 6b520a647c4d47782e1854f43d8b8103 272300 libosmo-sigtran_2.2.1.56.7580.tar.xz

libosmo-sigtran_2.2.1.55.b64c.tar.xz/.tarball-version -> libosmo-sigtran_2.2.1.56.7580.tar.xz/.tarball-version Changed

libosmo-sigtran_2.2.1.55.b64c.tar.xz/debian/changelog -> libosmo-sigtran_2.2.1.56.7580.tar.xz/debian/changelog Changed

libosmo-sigtran_2.2.1.55.b64c.tar.xz/src/xua_asp_fsm.c -> libosmo-sigtran_2.2.1.56.7580.tar.xz/src/xua_asp_fsm.c Changed

@@ -556,15 +556,41 @@
 	case XUA_ASP_E_ASPSM_ASPUP:
 		ENSURE_SG_OR_IPSP(fi, event);
 		/* Optional ASP Identifier */
-		if ((asp_id_ie = xua_msg_find_tag(data, SUA_IEI_ASP_ID))) {
+		asp_id_ie = xua_msg_find_tag(data, SUA_IEI_ASP_ID);
+
+		if (asp_id_ie) {
 			asp_id = xua_msg_part_get_u32(asp_id_ie);
 			if (!ss7_asp_check_remote_asp_id_unique(asp, asp_id)) {
 				peer_send_error(fi, M3UA_ERR_INVAL_ASP_ID);
 				return;
 			}
+			/* Expect specific ASP Id from ASP in SG role to match local config.
+			 * In IPSP, each side can have its own local different ASP Identifier. */
+			if (asp->cfg.role == OSMO_SS7_ASP_ROLE_SG) {
+				if (asp->cfg.local_asp_id_present &&
+				    asp->cfg.local_asp_id != asp_id) {
+					LOGPFSML(fi, LOGL_NOTICE, "ASPUP: Received asp_id %" PRIu32
+						 " doesn't match configured 'asp-identifier %" PRIu32"'\n",
+						 asp_id, asp->cfg.local_asp_id);
+					peer_send_error(fi, M3UA_ERR_INVAL_ASP_ID);
+					return;
+				}
+			}
 			/* Store for NTFY */
 			asp->remote_asp_id = asp_id;
 			asp->remote_asp_id_present = true;
+		} else if (asp->cfg.role == OSMO_SS7_ASP_ROLE_SG &&
+			   asp->cfg.local_asp_id_present) {
+			/* If configured in role SG, expect the ASP to send us an ASP Identifier.
+			 * RFC4666 3.8.1: 'The "ASP Identifier Required" error is sent by an SGP in
+			 * response to an ASP Up message that does not contain an ASP Identifier
+			 * parameter when the SGP requires one. The ASP SHOULD resend the ASP Up
+			 * message with an ASP Identifier.'*/
+			LOGPFSML(fi, LOGL_NOTICE, "ASPUP: Received no asp_id "
+				 "while expecting 'asp-identifier %" PRIu32"'\n",
+				 asp->cfg.local_asp_id);
+			peer_send_error(fi, M3UA_ERR_ASP_ID_REQD);
+			return;
 		}
 		/* send ACK */
 		peer_send(fi, XUA_ASP_E_ASPSM_ASPUP_ACK, NULL);

Changes of Revision 122