Osmocom Open Build Service

libosmo-netif.spec Changed

commit_5c44ba98c69ed3d21f2abcbc395a07b0ea6cf6f6.txt Deleted

commit_71a8f69f1e5889039c8f304196b217844dbb0b81.txt Added

libosmo-netif_1.7.0.3.5c44.dsc Deleted

@@ -1,22 +0,0 @@
-Format: 3.0 (native)
-Source: libosmo-netif
-Binary: libosmonetif11, libosmo-netif-dev, libosmo-netif-doc, libosmo-netif-dbg
-Architecture: any all
-Version: 1.7.0.3.5c44
-Maintainer: Osmocom team <openbsc@lists.osmocom.org>
-Homepage: https://projects.osmocom.org/projects/libosmo-netif
-Standards-Version: 3.9.6
-Vcs-Browser: https://gitea.osmocom.org/osmocom/libosmo-netif
-Vcs-Git: https://gitea.osmocom.org/osmocom/libosmo-netif
-Build-Depends: debhelper (>= 10), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, doxygen, libosmocore-dev (>= 1.12.0), pkg-config, libpcap0.8-dev, libsctp-dev
-Package-List:
- libosmo-netif-dbg deb debug extra arch=any
- libosmo-netif-dev deb libdevel optional arch=any
- libosmo-netif-doc deb doc optional arch=all
- libosmonetif11 deb libs optional arch=any
-Checksums-Sha1:
- efeb6be726fde4f935bc479b414f9bb63b3fc9f0 248260 libosmo-netif_1.7.0.3.5c44.tar.xz
-Checksums-Sha256:
- 66da2de674997b56c70db5024c62a2cafff6b93d81117f7ba90601000b5268f3 248260 libosmo-netif_1.7.0.3.5c44.tar.xz
-Files:
- fd6f20cf59cbacb23623d30a9200bc9c 248260 libosmo-netif_1.7.0.3.5c44.tar.xz

libosmo-netif_1.7.0.6.71a8.dsc Added

@@ -0,0 +1,22 @@
+Format: 3.0 (native)
+Source: libosmo-netif
+Binary: libosmonetif11, libosmo-netif-dev, libosmo-netif-doc, libosmo-netif-dbg
+Architecture: any all
+Version: 1.7.0.6.71a8
+Maintainer: Osmocom team <openbsc@lists.osmocom.org>
+Homepage: https://projects.osmocom.org/projects/libosmo-netif
+Standards-Version: 3.9.6
+Vcs-Browser: https://gitea.osmocom.org/osmocom/libosmo-netif
+Vcs-Git: https://gitea.osmocom.org/osmocom/libosmo-netif
+Build-Depends: debhelper (>= 10), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, doxygen, libosmocore-dev (>= 1.12.0), pkg-config, libpcap0.8-dev, libsctp-dev
+Package-List:
+ libosmo-netif-dbg deb debug extra arch=any
+ libosmo-netif-dev deb libdevel optional arch=any
+ libosmo-netif-doc deb doc optional arch=all
+ libosmonetif11 deb libs optional arch=any
+Checksums-Sha1:
+ a679842e653f071b5391967a8a0dfe8106296590 249100 libosmo-netif_1.7.0.6.71a8.tar.xz
+Checksums-Sha256:
+ 38ff01e606116cb564edb9adfd7481d55a5dd3c3c593c3fdfcbd662cd80583c3 249100 libosmo-netif_1.7.0.6.71a8.tar.xz
+Files:
+ 24bc8094feb01a154ff35c20efc0bb99 249100 libosmo-netif_1.7.0.6.71a8.tar.xz

libosmo-netif_1.7.0.3.5c44.tar.xz/.tarball-version -> libosmo-netif_1.7.0.6.71a8.tar.xz/.tarball-version Changed

libosmo-netif_1.7.0.3.5c44.tar.xz/debian/changelog -> libosmo-netif_1.7.0.6.71a8.tar.xz/debian/changelog Changed

libosmo-netif_1.7.0.3.5c44.tar.xz/src/stream_cli.c -> libosmo-netif_1.7.0.6.71a8.tar.xz/src/stream_cli.c Changed

@@ -411,6 +411,26 @@
 #endif
 }
 
+/* Update cli->sockname based on socket info: */
+static void stream_cli_update_iofd_name(struct osmo_stream_cli *cli)
+{
+	if (!(cli->mode == OSMO_STREAM_MODE_OSMO_IO && cli->iofd))
+		return;
+
+	char *tmp = talloc_asprintf(cli, "%s,%s", cli->name, cli->sockname);
+	osmo_iofd_set_name(cli->iofd, tmp);
+	talloc_free(tmp);
+}
+
+/* Update cli->sockname based on socket info: */
+static void stream_cli_update_sockname(struct osmo_stream_cli *cli)
+{
+	osmo_sock_get_name_buf(cli->sockname, sizeof(cli->sockname), osmo_stream_cli_get_fd(cli));
+	/* Update stream iofd with the new cli->sockname too: */
+	stream_cli_update_iofd_name(cli);
+
+}
+
 /* returns true if cli is freed */
 static bool stream_cli_handle_connecting(struct osmo_stream_cli *cli, int res)
 {
@@ -435,8 +455,7 @@
 	if (cli->mode == OSMO_STREAM_MODE_OSMO_FD && llist_empty(&cli->tx_queue))
 		osmo_fd_write_disable(&cli->ofd);
 
-	/* Update sockname based on socket info: */
-	osmo_sock_get_name_buf(cli->sockname, sizeof(cli->sockname), osmo_stream_cli_get_fd(cli));
+	stream_cli_update_sockname(cli);
 
 	LOGSCLI(cli, LOGL_INFO, "connection established\n");
 	cli->state = STREAM_CLI_STATE_CONNECTED;
@@ -691,8 +710,8 @@
 		talloc_free((void *)cli->name);
 	cli->name = name;
 
-	if (cli->mode == OSMO_STREAM_MODE_OSMO_IO && cli->iofd)
-		osmo_iofd_set_name(cli->iofd, cli->name);
+	/* Update stream iofd with the new cli->name too: */
+	stream_cli_update_iofd_name(cli);
 }
 
 /*! Retrieve name previously set on the cli object (see osmo_stream_cli_set_name()).
@@ -1433,7 +1452,9 @@
 		case IPPROTO_SCTP:
 		{
 			char log_pfx128;
-			snprintf(log_pfx, sizeof(log_pfx), "CLICONN(%s,%s)", cli->name ? : "", cli->sockname);
+			snprintf(log_pfx, sizeof(log_pfx), "CLICONN(%s,%s){%s}",
+				 cli->name ? : "", cli->sockname,
+				 get_value_string(stream_cli_state_names, cli->state));
 			ret = stream_sctp_recvmsg_wrapper(cli->ofd.fd, msg, log_pfx);
 			break;
 		}

libosmo-netif_1.7.0.3.5c44.tar.xz/src/stream_srv.c -> libosmo-netif_1.7.0.6.71a8.tar.xz/src/stream_srv.c Changed

Changes of Revision 146