Changes of Revision 809

libosmo-netif_1.5.1.1.4a05.202409032026.dsc -> libosmo-netif_1.5.1.2.84500.202409042026.dsc Changed
x
 
1
@@ -2,7 +2,7 @@
2
 Source: libosmo-netif
3
 Binary: libosmonetif11, libosmo-netif-dev, libosmo-netif-doc, libosmo-netif-dbg
4
 Architecture: any all
5
-Version: 1.5.1.1.4a05.202409032026
6
+Version: 1.5.1.2.84500.202409042026
7
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
8
 Homepage: https://projects.osmocom.org/projects/libosmo-netif
9
 Standards-Version: 3.9.6
10
@@ -15,8 +15,8 @@
11
  libosmo-netif-doc deb doc optional arch=all
12
  libosmonetif11 deb libs optional arch=any
13
 Checksums-Sha1:
14
- 991efee3e896c9d3f1cc9f00b7b8bbdd52306b9f 193884 libosmo-netif_1.5.1.1.4a05.202409032026.tar.xz
15
+ 8d279ae24da2776956c98deed390372cb1b6a348 196900 libosmo-netif_1.5.1.2.84500.202409042026.tar.xz
16
 Checksums-Sha256:
17
- 8abdc957357667034b0f3b6cd0419ad8c5b75887f732ee1278021728ed79ab98 193884 libosmo-netif_1.5.1.1.4a05.202409032026.tar.xz
18
+ 966954598918b40245e2285ded4033903698912c0f09b6b3aa521351ccee1333 196900 libosmo-netif_1.5.1.2.84500.202409042026.tar.xz
19
 Files:
20
- ae984844d41e431a45223ea4769829d5 193884 libosmo-netif_1.5.1.1.4a05.202409032026.tar.xz
21
+ 0df7357ebf341fc055fddef84e6c5267 196900 libosmo-netif_1.5.1.2.84500.202409042026.tar.xz
22
libosmo-netif_1.5.1.1.4a05.202409032026.tar.xz/.tarball-version -> libosmo-netif_1.5.1.2.84500.202409042026.tar.xz/.tarball-version Changed
4
 
1
@@ -1 +1 @@
2
-1.5.1.1-4a05.202409032026
3
+1.5.1.2-84500.202409042026
4
libosmo-netif_1.5.1.1.4a05.202409032026.tar.xz/debian/changelog -> libosmo-netif_1.5.1.2.84500.202409042026.tar.xz/debian/changelog Changed
12
 
1
@@ -1,8 +1,8 @@
2
-libosmo-netif (1.5.1.1.4a05.202409032026) unstable; urgency=medium
3
+libosmo-netif (1.5.1.2.84500.202409042026) unstable; urgency=medium
4
 
5
   * Automatically generated changelog entry for building the Osmocom nightly feed
6
 
7
- -- Osmocom OBS scripts <info@osmocom.org>  Tue, 03 Sep 2024 20:26:36 +0000
8
+ -- Osmocom OBS scripts <info@osmocom.org>  Wed, 04 Sep 2024 20:26:36 +0000
9
 
10
 libosmo-netif (1.5.1) unstable; urgency=medium
11
 
12
libosmo-netif_1.5.1.1.4a05.202409032026.tar.xz/debian/control -> libosmo-netif_1.5.1.2.84500.202409042026.tar.xz/debian/control Changed
37
 
1
@@ -23,7 +23,7 @@
2
 Package: libosmonetif11
3
 Section: libs
4
 Architecture: any
5
-Depends: osmocom-nightly (= 202409032026), ${shlibs:Depends}, ${misc:Depends}
6
+Depends: osmocom-nightly (= 202409042026), ${shlibs:Depends}, ${misc:Depends}
7
 Conflicts: libosmonetif2
8
 Multi-Arch: same
9
 Description: Common/shared code regarding network interface for OpenBSC
10
@@ -34,7 +34,7 @@
11
 Package: libosmo-netif-dev
12
 Section: libdevel
13
 Architecture: any
14
-Depends: osmocom-nightly (= 202409032026), ${misc:Depends},
15
+Depends: osmocom-nightly (= 202409042026), ${misc:Depends},
16
          libosmocore-dev,
17
          libosmocore,
18
          libosmonetif11 (= ${binary:Version})
19
@@ -50,7 +50,7 @@
20
 Package: libosmo-netif-doc
21
 Architecture: all
22
 Section: doc
23
-Depends: osmocom-nightly (= 202409032026), ${misc:Depends},
24
+Depends: osmocom-nightly (= 202409042026), ${misc:Depends},
25
          libosmonetif11,
26
          libjs-jquery
27
 Description: Documentation for the Osmo network interface library
28
@@ -64,7 +64,7 @@
29
 Section: debug
30
 Architecture: any
31
 Priority: extra
32
-Depends: osmocom-nightly (= 202409032026), libosmonetif11 (= ${binary:Version}), ${misc:Depends}
33
+Depends: osmocom-nightly (= 202409042026), libosmonetif11 (= ${binary:Version}), ${misc:Depends}
34
 Multi-Arch: same
35
 Description: Debug symbols for Osmocom network interface library
36
  The libosmo-netif library is one of the libraries needed by the
37
libosmo-netif_1.5.1.1.4a05.202409032026.tar.xz/src/stream.c -> libosmo-netif_1.5.1.2.84500.202409042026.tar.xz/src/stream.c Changed
17
 
1
@@ -279,8 +279,14 @@
2
    int flags = 0;
3
    int ret;
4
 
5
+   /* Canary to detect if kernel returns sinfo; see https://github.com/sctp/lksctp-tools/issues/37 */
6
+   sinfo.sinfo_assoc_id = 0;
7
+
8
    ret = sctp_recvmsg(fd, msg->tail, msgb_tailroom(msg), NULL, NULL, &sinfo, &flags);
9
-   return stream_sctp_recvmsg_trailer(log_pfx, msg, ret, &sinfo, flags);
10
+   if (sinfo.sinfo_assoc_id)
11
+       return stream_sctp_recvmsg_trailer(log_pfx, msg, ret, &sinfo, flags);
12
+   else
13
+       return stream_sctp_recvmsg_trailer(log_pfx, msg, ret, NULL, flags);
14
 }
15
 
16
 /*! wrapper for osmo_io asynchronous recvmsg response */
17