Osmocom Open Build Service

commit_44a5f20fd0d5db44e33f21c8b84b4a47372ff127.txt Added

commit_6da14bb48f02f15d476b72e0d2113194e5979c01.txt Deleted

libosmo-sigtran_2.2.1.78.6da1.dsc -> libosmo-sigtran_2.2.1.79.44a5.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.78.6da1
+Version: 2.2.1.79.44a5
 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:
- 831121e092c12b9c4f07c788543e9eab9bb72654 273228 libosmo-sigtran_2.2.1.78.6da1.tar.xz
+ 018b6090bbcd7ad8416c9590fde5c75ca524dcea 273536 libosmo-sigtran_2.2.1.79.44a5.tar.xz
 Checksums-Sha256:
- 1cc998ea998f16fa0dfa24ddda9860f70b45e9acdf1065442a2f4622f19c6d25 273228 libosmo-sigtran_2.2.1.78.6da1.tar.xz
+ bec9742d214d4dab3a5de25601760d86c3d0f7379f9e884b7e2d5c345121adfb 273536 libosmo-sigtran_2.2.1.79.44a5.tar.xz
 Files:
- 674801514ffec386e74f49a67d4960cb 273228 libosmo-sigtran_2.2.1.78.6da1.tar.xz
+ e2736e457736ffcd5835a9e41456057e 273536 libosmo-sigtran_2.2.1.79.44a5.tar.xz

libosmo-sigtran_2.2.1.78.6da1.tar.xz/.tarball-version -> libosmo-sigtran_2.2.1.79.44a5.tar.xz/.tarball-version Changed

libosmo-sigtran_2.2.1.78.6da1.tar.xz/debian/changelog -> libosmo-sigtran_2.2.1.79.44a5.tar.xz/debian/changelog Changed

libosmo-sigtran_2.2.1.78.6da1.tar.xz/src/ss7_asp.c -> libosmo-sigtran_2.2.1.79.44a5.tar.xz/src/ss7_asp.c Changed

libosmo-sigtran_2.2.1.78.6da1.tar.xz/src/ss7_asp.h -> libosmo-sigtran_2.2.1.79.44a5.tar.xz/src/ss7_asp.h Changed

libosmo-sigtran_2.2.1.78.6da1.tar.xz/src/ss7_asp_vty.c -> libosmo-sigtran_2.2.1.79.44a5.tar.xz/src/ss7_asp_vty.c Changed

@@ -705,9 +705,33 @@
 	   "Allows a SCTP Association with ASP, but doesn't let it become active\n",
 	   CMD_ATTR_NODE_EXIT)
 {
-	/* TODO */
-	vty_out(vty, "Not supported yet%s", VTY_NEWLINE);
-	return CMD_WARNING;
+	struct osmo_ss7_asp *asp = vty->index;
+
+	if (asp->cfg.proto != OSMO_SS7_ASP_PROT_M3UA &&
+	    asp->cfg.proto != OSMO_SS7_ASP_PROT_SUA) {
+		vty_out(vty, "%% 'block' not supported for ASP protocol %s%s",
+			osmo_ss7_asp_protocol_name(asp->cfg.proto), VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	if (asp->cfg.role == OSMO_SS7_ASP_ROLE_ASP) {
+		vty_out(vty, "%% 'block' not yet implemented in 'role asp'%s", VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	ss7_asp_set_blocked(asp, true);
+	return CMD_SUCCESS;
+}
+
+DEFUN_ATTR(asp_no_block, asp_no_block_cmd,
+	   "no block",
+	   NO_STR "Allows a SCTP Association with ASP, but doesn't let it become active\n",
+	   CMD_ATTR_NODE_EXIT)
+{
+	struct osmo_ss7_asp *asp = vty->index;
+
+	ss7_asp_set_blocked(asp, false);
+	return CMD_SUCCESS;
 }
 
 DEFUN_ATTR(asp_shutdown, asp_shutdown_cmd,
@@ -1492,6 +1516,7 @@
 	gen_asp_timer_lm_cmd_strs(&asp_timer_lm_cmd);
 	install_lib_element(L_CS7_ASP_NODE, &asp_timer_lm_cmd);
 	install_lib_element(L_CS7_ASP_NODE, &asp_block_cmd);
+	install_lib_element(L_CS7_ASP_NODE, &asp_no_block_cmd);
 	install_lib_element(L_CS7_ASP_NODE, &asp_shutdown_cmd);
 	install_lib_element(L_CS7_ASP_NODE, &asp_no_shutdown_cmd);
 }

libosmo-sigtran_2.2.1.78.6da1.tar.xz/src/xua_asp_fsm.c -> libosmo-sigtran_2.2.1.79.44a5.tar.xz/src/xua_asp_fsm.c Changed

@@ -655,7 +655,7 @@
 	struct xua_msg_part *asp_id_ie;
 	struct xua_msg *xua_in;
 	uint32_t traf_mode = 0;
-	struct xua_msg_part *part;
+	struct xua_msg_part *rctx_ie;
 	uint32_t asp_id;
 	int i;
 
@@ -711,9 +711,9 @@
 				return;
 			}
 		}
-		if ((part = xua_msg_find_tag(xua_in, M3UA_IEI_ROUTE_CTX))) {
-			for (i = 0; i < part->len / sizeof(uint32_t); i++) {
-				uint8_t *rctx_raw = &part->dati * sizeof(uint32_t);
+		if ((rctx_ie = xua_msg_find_tag(xua_in, M3UA_IEI_ROUTE_CTX))) {
+			for (i = 0; i < rctx_ie->len / sizeof(uint32_t); i++) {
+				uint8_t *rctx_raw = &rctx_ie->dati * sizeof(uint32_t);
 				uint32_t rctx = osmo_load32be(rctx_raw);
 				as = ss7_asp_find_as_by_rctx(asp, rctx);
 				if (!as) {
@@ -726,6 +726,23 @@
 			}
 		}
 
+		if (asp->cfg.adm_state.blocked) {
+			/* RFC4666 (M3UA) 3.8.1: The "Refused - Management Blocking" error is sent
+			 * when an ASP Up or ASP Active message is received and the request is refused
+			 * for management reasons (e.g., management lockout).  If this error is in
+			 * response to an ASP Active message, the Routing Context(s) in the ASP Active
+			 * message SHOULD be included in the Error message."
+			 * RC4666 (M3UA) 4.3.4.3: "If for any local reason (e.g., management lockout)
+			 * the SGP responds to an ASP Active message with an Error message with reason
+			 * Refused Management Blocking".
+			 */
+			LOGPFSML(fi, LOGL_INFO, "ASPAC: Reject due to ASP in administrative state 'block'\n");
+			peer_send_error_ext(fi, SUA_ERR_REFUSED_MGMT_BLOCKING,
+					    rctx_ie ? rctx_ie->dat : NULL,
+					    rctx_ie ? rctx_ie->len : 0);
+			return;
+		}
+
 		if (traf_mode) { /* if the peer has specified a traffic mode at all */
 			/* First validate peer not trying to establish an incompatible traffic mode: */
 			llist_for_each_entry(assoc, &asp->assoc_as_list, asp_entry) {

libosmo-sigtran_2.2.1.78.6da1.tar.xz/tests/vty/osmo_stp_test.vty -> libosmo-sigtran_2.2.1.79.44a5.tar.xz/tests/vty/osmo_stp_test.vty Changed

libosmo-sigtran_2.2.1.78.6da1.tar.xz/tests/vty/ss7_asp_test.vty -> libosmo-sigtran_2.2.1.79.44a5.tar.xz/tests/vty/ss7_asp_test.vty Changed

Changes of Revision 133