Osmocom Open Build Service

libosmocore.spec Changed

commit_aea78a248324e2e52218132ba25377ac437d7cc9.txt Deleted

commit_e83227f735e214d269e6d009436601e812cba59a.txt Added

libosmocore_1.8.0.226.aea7.dsc -> libosmocore_1.8.0.227.e8322.dsc Changed

@@ -2,7 +2,7 @@
 Source: libosmocore
 Binary: libosmocore, libosmocodec0, libosmocodec-doc, libosmocoding0, libosmocoding-doc, libosmocore20, libosmocore-doc, libosmogb14, libosmogb-doc, libosmogsm18, libosmogsm-doc, libosmoisdn0, libosmoisdn-doc, libosmovty9, libosmovty-doc, libosmoctrl0, libosmoctrl-doc, libosmosim2, libosmosim-doc, libosmousb0, libosmousb-doc, libosmocore-dev, libosmocore-utils, libosmocore-dbg
 Architecture: any all
-Version: 1.8.0.226.aea7
+Version: 1.8.0.227.e8322
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/libosmocore
 Standards-Version: 3.9.8
@@ -35,8 +35,8 @@
  libosmovty-doc deb doc optional arch=all
  libosmovty9 deb libs optional arch=any
 Checksums-Sha1:
- 3af66c591d2a704ae08556e5f36a3e0691a0f606 1064744 libosmocore_1.8.0.226.aea7.tar.xz
+ d70a5d7339d8dfa7a16cbfe688d2202c9091a326 1064652 libosmocore_1.8.0.227.e8322.tar.xz
 Checksums-Sha256:
- 901ee9743ad8ae6407b976624e3684944e0fbfcf8b1b91918739b4b754aba9d5 1064744 libosmocore_1.8.0.226.aea7.tar.xz
+ 31a36889e6792018868704977233975af083174df2659b68ab02b0116f7d4046 1064652 libosmocore_1.8.0.227.e8322.tar.xz
 Files:
- f6ec460eccdba3894ddf3116cb8a56d0 1064744 libosmocore_1.8.0.226.aea7.tar.xz
+ c985b9c36cd2016d2124867a8e33a17c 1064652 libosmocore_1.8.0.227.e8322.tar.xz

libosmocore_1.8.0.226.aea7.tar.xz/.tarball-version -> libosmocore_1.8.0.227.e8322.tar.xz/.tarball-version Changed

libosmocore_1.8.0.226.aea7.tar.xz/debian/changelog -> libosmocore_1.8.0.227.e8322.tar.xz/debian/changelog Changed

libosmocore_1.8.0.226.aea7.tar.xz/include/osmocom/core/socket.h -> libosmocore_1.8.0.227.e8322.tar.xz/include/osmocom/core/socket.h Changed

libosmocore_1.8.0.226.aea7.tar.xz/src/core/socket.c -> libosmocore_1.8.0.227.e8322.tar.xz/src/core/socket.c Changed

@@ -696,6 +696,36 @@
 	return 0;
 }
 
+static int setsockopt_sctp_auth_supported(int fd)
+{
+#ifdef SCTP_AUTH_SUPPORTED
+	struct sctp_assoc_value assoc_val = {
+		.assoc_id = SCTP_FUTURE_ASSOC,
+		.assoc_value = 1,
+	};
+	return setsockopt(fd, IPPROTO_SCTP, SCTP_AUTH_SUPPORTED, &assoc_val, sizeof(assoc_val));
+#else
+#pragma message "setsockopt(SCTP_AUTH_SUPPORTED) not supported! some SCTP features may not be available!"
+	LOGP(DLGLOBAL, LOGL_NOTICE, "Built without support for setsockopt(SCTP_AUTH_SUPPORTED), skipping\n");
+	return 0;
+#endif
+}
+
+static int setsockopt_sctp_asconf_supported(int fd)
+{
+#ifdef SCTP_ASCONF_SUPPORTED
+	struct sctp_assoc_value assoc_val = {
+		.assoc_id = SCTP_FUTURE_ASSOC,
+		.assoc_value = 1,
+	};
+	return setsockopt(fd, IPPROTO_SCTP, SCTP_ASCONF_SUPPORTED, &assoc_val, sizeof(assoc_val));
+#else
+#pragma message "setsockopt(SCTP_ASCONF_SUPPORTED) not supported! some SCTP features may not be available!"
+	LOGP(DLGLOBAL, LOGL_NOTICE, "Built without support for setsockopt(SCTP_ASCONF_SUPPORTED), skipping\n");
+	return 0;
+#endif
+}
+
 /*! Initialize a socket (including bind and/or connect) with multiple local or remote addresses.
  *  \paramin family Address Family like AF_INET, AF_INET6, AF_UNSPEC
  *  \paramin type Socket type like SOCK_DGRAM, SOCK_STREAM
@@ -811,6 +841,29 @@
 			goto ret_close;
 		}
 
+		if (flags & OSMO_SOCK_F_SCTP_ASCONF_SUPPORTED) {
+			/* RFC 5061 4.2.7: ASCONF also requires AUTH feature. */
+			rc = setsockopt_sctp_auth_supported(sfd);
+			if (rc < 0) {
+				int err = errno;
+				multiaddr_snprintf(strbuf, sizeof(strbuf), local_hosts, local_hosts_cnt);
+				LOGP(DLGLOBAL, LOGL_ERROR,
+				     "cannot setsockopt(SCTP_AUTH_SUPPORTED) socket: %s:%u: %s\n",
+				     strbuf, local_port, strerror(err));
+				goto ret_close;
+			}
+
+			rc = setsockopt_sctp_asconf_supported(sfd);
+			if (rc < 0) {
+				int err = errno;
+				multiaddr_snprintf(strbuf, sizeof(strbuf), local_hosts, local_hosts_cnt);
+				LOGP(DLGLOBAL, LOGL_ERROR,
+				     "cannot setsockopt(SCTP_ASCONF_SUPPORTED) socket: %s:%u: %s\n",
+				     strbuf, local_port, strerror(err));
+				goto ret_close;
+			}
+		}
+
 		/* Build array of addresses taking first entry for each host.
 		   TODO: Ideally we should use backtracking storing last used
 		   indexes and trying next combination if connect() fails .*/

Changes of Revision 209