Changes of Revision 312

osmo-iuh.spec Changed
x
 
1
@@ -14,14 +14,14 @@
2
 # published by the Open Source Initiative.
3
 
4
 Name:           osmo-iuh
5
-Requires: osmocom-nightly = 202304270026
6
-Version: 1.4.0.2.c61a.202304270026
7
+Requires: osmocom-nightly = 202304280026
8
+Version: 1.4.0.5.a339.202304280026
9
 Release:        0
10
 Summary:        Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
11
 License:        AGPL-3.0-or-later AND GPL-2.0-or-later
12
 Group:          Hardware/Mobile
13
 URL:            https://osmocom.org/projects/osmohnbgw
14
-Source: osmo-iuh_1.4.0.2.c61a.202304270026.tar.xz
15
+Source: osmo-iuh_1.4.0.5.a339.202304280026.tar.xz
16
 Source1: rpmlintrc
17
 BuildRequires:  automake >= 1.9
18
 BuildRequires:  libtool >= 2
19
@@ -42,7 +42,7 @@
20
 Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
21
 
22
 %package -n libosmo-hnbap0
23
-Requires: osmocom-nightly = 202304270026
24
+Requires: osmocom-nightly = 202304280026
25
 Summary:        Shared Library part of libosmo-hnbap
26
 Group:          System/Libraries
27
 
28
@@ -50,7 +50,7 @@
29
 Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
30
 
31
 %package -n libosmo-hnbap-devel
32
-Requires: osmocom-nightly = 202304270026
33
+Requires: osmocom-nightly = 202304280026
34
 Summary:        Development files for Osmocom HNBAP library
35
 Group:          Development/Libraries/C and C++
36
 Requires:       libosmo-hnbap0 = %{version}
37
@@ -59,7 +59,7 @@
38
 Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
39
 
40
 %package -n libosmo-ranap7
41
-Requires: osmocom-nightly = 202304270026
42
+Requires: osmocom-nightly = 202304280026
43
 Summary:        Shared Library part of libosmo-ranap
44
 Group:          System/Libraries
45
 
46
@@ -67,7 +67,7 @@
47
 Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
48
 
49
 %package -n libosmo-ranap-devel
50
-Requires: osmocom-nightly = 202304270026
51
+Requires: osmocom-nightly = 202304280026
52
 Summary:        Development files for Osmocom RANAP library
53
 Group:          Development/Libraries/C and C++
54
 Requires:       libosmo-ranap7 = %{version}
55
@@ -79,7 +79,7 @@
56
 applications that want to make use of libosmoranap.
57
 
58
 %package -n libosmo-rua0
59
-Requires: osmocom-nightly = 202304270026
60
+Requires: osmocom-nightly = 202304280026
61
 Summary:        Shared Library part of libosmo-rua
62
 Group:          System/Libraries
63
 
64
@@ -87,7 +87,7 @@
65
 Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
66
 
67
 %package -n libosmo-rua-devel
68
-Requires: osmocom-nightly = 202304270026
69
+Requires: osmocom-nightly = 202304280026
70
 Summary:        Development files for Osmocom RUA library
71
 Group:          Development/Libraries/C and C++
72
 Requires:       libosmo-rua0 = %{version}
73
@@ -96,7 +96,7 @@
74
 Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
75
 
76
 %package -n libosmo-sabp1
77
-Requires: osmocom-nightly = 202304270026
78
+Requires: osmocom-nightly = 202304280026
79
 Summary:        Shared Library part of libosmo-sabp
80
 Group:          System/Libraries
81
 
82
@@ -104,7 +104,7 @@
83
 Osmocom code for the SABP (service area broadcast protocol) interface
84
 
85
 %package -n libosmo-sabp-devel
86
-Requires: osmocom-nightly = 202304270026
87
+Requires: osmocom-nightly = 202304280026
88
 Summary:        Development files for Osmocom SABP library
89
 Group:          Development/Libraries/C and C++
90
 Requires:       libosmo-sabp1 = %{version}
91
osmo-iuh_1.4.0.2.c61a.202304270026.dsc -> osmo-iuh_1.4.0.5.a339.202304280026.dsc Changed
29
 
1
@@ -2,13 +2,13 @@
2
 Source: osmo-iuh
3
 Binary: libosmo-hnbap0, libosmo-hnbap-dbg, libosmo-hnbap-dev, libosmo-ranap7, libosmo-ranap-dbg, libosmo-ranap-dev, libosmo-rua0, libosmo-rua-dbg, libosmo-rua-dev, libosmo-sabp1, libosmo-sabp-dbg, libosmo-sabp-dev
4
 Architecture: any
5
-Version: 1.4.0.2.c61a.202304270026
6
+Version: 1.4.0.5.a339.202304280026
7
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
8
 Homepage: https://projects.osmocom.org/projects/osmohnbgw
9
 Standards-Version: 3.9.8
10
 Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-iuh
11
 Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-iuh
12
-Build-Depends: debhelper (>= 9), dh-autoreconf, pkg-config, autoconf, automake, libtool, git, libasn1c-dev, libsctp-dev, libosmocore-dev (>= 1.8.0), libosmo-netif-dev (>= 1.3.0), libosmo-sigtran-dev (>= 1.7.0), osmo-gsm-manuals-dev (>= 1.4.0), python3
13
+Build-Depends: debhelper (>= 10), dh-autoreconf, pkg-config, autoconf, automake, libtool, git, libasn1c-dev, libsctp-dev, libosmocore-dev (>= 1.8.0), libosmo-netif-dev (>= 1.3.0), libosmo-sigtran-dev (>= 1.7.0), osmo-gsm-manuals-dev (>= 1.4.0), python3
14
 Package-List:
15
  libosmo-hnbap-dbg deb debug extra arch=any
16
  libosmo-hnbap-dev deb libdevel extra arch=any
17
@@ -23,8 +23,8 @@
18
  libosmo-sabp-dev deb libdevel extra arch=any
19
  libosmo-sabp1 deb libs extra arch=any
20
 Checksums-Sha1:
21
- 27734881471d0c802bece10f69d49c21e6eb32ec 10069036 osmo-iuh_1.4.0.2.c61a.202304270026.tar.xz
22
+ 411c8601b277fa724d9ae30734c6e5854821e88c 10072936 osmo-iuh_1.4.0.5.a339.202304280026.tar.xz
23
 Checksums-Sha256:
24
- 7fd4be09469297371d0c9e3db76b2be05a1397616f6414602a7468dc23d99c2d 10069036 osmo-iuh_1.4.0.2.c61a.202304270026.tar.xz
25
+ e516d5b68252953939e618f0a9d06f18ace0e08d67ead8ede0e7108eb43d0d79 10072936 osmo-iuh_1.4.0.5.a339.202304280026.tar.xz
26
 Files:
27
- 4a4022f9ca15ee97634f8dbcc334a3ae 10069036 osmo-iuh_1.4.0.2.c61a.202304270026.tar.xz
28
+ d4b96a05733a339671070b233304667d 10072936 osmo-iuh_1.4.0.5.a339.202304280026.tar.xz
29
osmo-iuh_1.4.0.2.c61a.202304270026.tar.xz/.tarball-version -> osmo-iuh_1.4.0.5.a339.202304280026.tar.xz/.tarball-version Changed
4
 
1
@@ -1 +1 @@
2
-1.4.0.2-c61a.202304270026
3
+1.4.0.5-a339.202304280026
4
osmo-iuh_1.4.0.2.c61a.202304270026.tar.xz/asn1/utils/asn1tostruct.py -> osmo-iuh_1.4.0.5.a339.202304280026.tar.xz/asn1/utils/asn1tostruct.py Changed
35
 
1
@@ -328,6 +328,7 @@
2
     f.write("    int i, decoded = 0;\n")
3
     if len(iesDefskey"ies") != 0:
4
         f.write("    int tempDecoded = 0;\n")
5
+    f.write("    int rc = -1;\n")
6
 
7
     f.write("    assert(any_p != NULL);\n")
8
     if len(iesDefskey"ies") != 0:
9
@@ -364,7 +365,7 @@
10
         f.write("                tempDecoded = ANY_to_type_aper(&ie_p->value, &asn_DEF_%s, (void**)&%s_p);\n" % (ietypeunderscore, lowerFirstCamelWord(ietypesubst)))
11
         f.write("                if (tempDecoded < 0) {\n")
12
         f.write("                    %s_DEBUG(\"Decoding of IE %s failed\\n\");\n" % (fileprefix.upper(), ienameunderscore))
13
-        f.write("                    return -1;\n")
14
+        f.write("                    goto free_and_return_rc;\n")
15
         f.write("                }\n")
16
         f.write("                decoded += tempDecoded;\n")
17
         f.write("                if (asn1_xer_print)\n")
18
@@ -379,11 +380,14 @@
19
         f.write("            } break;\n")
20
     f.write("            default:\n")
21
     f.write("                %s_DEBUG(\"Unknown protocol IE id (%%d) for message %s\\n\", (int)ie_p->id);\n" % (fileprefix.upper(), re.sub('-', '_', structName.lower())))
22
-    f.write("                return -1;\n")
23
+    f.write("                goto free_and_return_rc;\n")
24
     f.write("        }\n")
25
     f.write("    }\n")
26
+    f.write("    rc = decoded;\n")
27
+    f.write("\n")
28
+    f.write("free_and_return_rc:\n")
29
     f.write("    ASN_STRUCT_FREE(asn_DEF_%s, %s_p);\n" % (asn1cStruct, asn1cStructfirstlower))
30
-    f.write("    return decoded;\n")
31
+    f.write("    return rc;\n")
32
     f.write("}\n\n")
33
 
34
 for key in iesDefs:
35
osmo-iuh_1.4.0.2.c61a.202304270026.tar.xz/contrib/osmo-iuh.spec.in -> osmo-iuh_1.4.0.5.a339.202304280026.tar.xz/contrib/osmo-iuh.spec.in Changed
82
 
1
@@ -14,7 +14,7 @@
2
 # published by the Open Source Initiative.
3
 
4
 Name:           osmo-iuh
5
-Requires: osmocom-nightly = 202304270026
6
+Requires: osmocom-nightly = 202304280026
7
 Version:        @VERSION@
8
 Release:        0
9
 Summary:        Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
10
@@ -41,7 +41,7 @@
11
 Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
12
 
13
 %package -n libosmo-hnbap0
14
-Requires: osmocom-nightly = 202304270026
15
+Requires: osmocom-nightly = 202304280026
16
 Summary:        Shared Library part of libosmo-hnbap
17
 Group:          System/Libraries
18
 
19
@@ -49,7 +49,7 @@
20
 Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
21
 
22
 %package -n libosmo-hnbap-devel
23
-Requires: osmocom-nightly = 202304270026
24
+Requires: osmocom-nightly = 202304280026
25
 Summary:        Development files for Osmocom HNBAP library
26
 Group:          Development/Libraries/C and C++
27
 Requires:       libosmo-hnbap0 = %{version}
28
@@ -58,7 +58,7 @@
29
 Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
30
 
31
 %package -n libosmo-ranap7
32
-Requires: osmocom-nightly = 202304270026
33
+Requires: osmocom-nightly = 202304280026
34
 Summary:        Shared Library part of libosmo-ranap
35
 Group:          System/Libraries
36
 
37
@@ -66,7 +66,7 @@
38
 Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
39
 
40
 %package -n libosmo-ranap-devel
41
-Requires: osmocom-nightly = 202304270026
42
+Requires: osmocom-nightly = 202304280026
43
 Summary:        Development files for Osmocom RANAP library
44
 Group:          Development/Libraries/C and C++
45
 Requires:       libosmo-ranap7 = %{version}
46
@@ -78,7 +78,7 @@
47
 applications that want to make use of libosmoranap.
48
 
49
 %package -n libosmo-rua0
50
-Requires: osmocom-nightly = 202304270026
51
+Requires: osmocom-nightly = 202304280026
52
 Summary:        Shared Library part of libosmo-rua
53
 Group:          System/Libraries
54
 
55
@@ -86,7 +86,7 @@
56
 Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
57
 
58
 %package -n libosmo-rua-devel
59
-Requires: osmocom-nightly = 202304270026
60
+Requires: osmocom-nightly = 202304280026
61
 Summary:        Development files for Osmocom RUA library
62
 Group:          Development/Libraries/C and C++
63
 Requires:       libosmo-rua0 = %{version}
64
@@ -95,7 +95,7 @@
65
 Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
66
 
67
 %package -n libosmo-sabp1
68
-Requires: osmocom-nightly = 202304270026
69
+Requires: osmocom-nightly = 202304280026
70
 Summary:        Shared Library part of libosmo-sabp
71
 Group:          System/Libraries
72
 
73
@@ -103,7 +103,7 @@
74
 Osmocom code for the SABP (service area broadcast protocol) interface
75
 
76
 %package -n libosmo-sabp-devel
77
-Requires: osmocom-nightly = 202304270026
78
+Requires: osmocom-nightly = 202304280026
79
 Summary:        Development files for Osmocom SABP library
80
 Group:          Development/Libraries/C and C++
81
 Requires:       libosmo-sabp1 = %{version}
82
osmo-iuh_1.4.0.2.c61a.202304270026.tar.xz/debian/changelog -> osmo-iuh_1.4.0.5.a339.202304280026.tar.xz/debian/changelog Changed
12
 
1
@@ -1,8 +1,8 @@
2
-osmo-iuh (1.4.0.2.c61a.202304270026) unstable; urgency=medium
3
+osmo-iuh (1.4.0.5.a339.202304280026) unstable; urgency=medium
4
 
5
   * Automatically generated changelog entry for building the Osmocom nightly feed
6
 
7
- -- Osmocom OBS scripts <info@osmocom.org>  Thu, 27 Apr 2023 00:26:46 +0000
8
+ -- Osmocom OBS scripts <info@osmocom.org>  Fri, 28 Apr 2023 00:26:43 +0000
9
 
10
 osmo-iuh (1.4.0) unstable; urgency=medium
11
 
12
osmo-iuh_1.4.0.2.c61a.202304270026.tar.xz/debian/compat -> osmo-iuh_1.4.0.5.a339.202304280026.tar.xz/debian/compat Changed
4
 
1
@@ -1 +1 @@
2
-9
3
+10
4
osmo-iuh_1.4.0.2.c61a.202304270026.tar.xz/debian/control -> osmo-iuh_1.4.0.5.a339.202304280026.tar.xz/debian/control Changed
108
 
1
@@ -2,7 +2,7 @@
2
 Section: libs
3
 Priority: extra
4
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
5
-Build-Depends: debhelper (>=9),
6
+Build-Depends: debhelper (>= 10),
7
                dh-autoreconf,
8
                pkg-config,
9
                autoconf,
10
@@ -26,21 +26,21 @@
11
 Architecture: any
12
 Multi-Arch: same
13
 Pre-Depends: ${misc:Pre-Depends}
14
-Depends: osmocom-nightly (= 202304270026), ${misc:Depends}, ${shlibs:Depends}
15
+Depends: osmocom-nightly (= 202304280026), ${misc:Depends}, ${shlibs:Depends}
16
 Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
17
 
18
 Package: libosmo-hnbap-dbg
19
 Section: debug
20
 Architecture: any
21
 Multi-Arch: same
22
-Depends: osmocom-nightly (= 202304270026), libosmo-hnbap0 (= ${binary:Version}), ${misc:Depends}
23
+Depends: osmocom-nightly (= 202304280026), libosmo-hnbap0 (= ${binary:Version}), ${misc:Depends}
24
 Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
25
 
26
 Package: libosmo-hnbap-dev
27
 Section: libdevel
28
 Architecture: any
29
 Multi-Arch: same
30
-Depends: osmocom-nightly (= 202304270026), libosmo-hnbap0 (= ${binary:Version}), ${misc:Depends}
31
+Depends: osmocom-nightly (= 202304280026), libosmo-hnbap0 (= ${binary:Version}), ${misc:Depends}
32
 Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
33
 
34
 Package: libosmo-ranap7
35
@@ -48,21 +48,21 @@
36
 Architecture: any
37
 Multi-Arch: same
38
 Pre-Depends: ${misc:Pre-Depends}
39
-Depends: osmocom-nightly (= 202304270026), ${misc:Depends}, ${shlibs:Depends}
40
+Depends: osmocom-nightly (= 202304280026), ${misc:Depends}, ${shlibs:Depends}
41
 Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
42
 
43
 Package: libosmo-ranap-dbg
44
 Section: debug
45
 Architecture: any
46
 Multi-Arch: same
47
-Depends: osmocom-nightly (= 202304270026), libosmo-ranap7 (= ${binary:Version}), ${misc:Depends}
48
+Depends: osmocom-nightly (= 202304280026), libosmo-ranap7 (= ${binary:Version}), ${misc:Depends}
49
 Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
50
 
51
 Package: libosmo-ranap-dev
52
 Section: libdevel
53
 Architecture: any
54
 Multi-Arch: same
55
-Depends: osmocom-nightly (= 202304270026), libosmo-ranap7 (= ${binary:Version}), ${misc:Depends}
56
+Depends: osmocom-nightly (= 202304280026), libosmo-ranap7 (= ${binary:Version}), ${misc:Depends}
57
 Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
58
 
59
 Package: libosmo-rua0
60
@@ -70,21 +70,21 @@
61
 Architecture: any
62
 Multi-Arch: same
63
 Pre-Depends: ${misc:Pre-Depends}
64
-Depends: osmocom-nightly (= 202304270026), ${misc:Depends}, ${shlibs:Depends}
65
+Depends: osmocom-nightly (= 202304280026), ${misc:Depends}, ${shlibs:Depends}
66
 Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
67
 
68
 Package: libosmo-rua-dbg
69
 Section: debug
70
 Architecture: any
71
 Multi-Arch: same
72
-Depends: osmocom-nightly (= 202304270026), libosmo-rua0 (= ${binary:Version}), ${misc:Depends}
73
+Depends: osmocom-nightly (= 202304280026), libosmo-rua0 (= ${binary:Version}), ${misc:Depends}
74
 Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
75
 
76
 Package: libosmo-rua-dev
77
 Section: libdevel
78
 Architecture: any
79
 Multi-Arch: same
80
-Depends: osmocom-nightly (= 202304270026), libosmo-rua0 (= ${binary:Version}), ${misc:Depends}
81
+Depends: osmocom-nightly (= 202304280026), libosmo-rua0 (= ${binary:Version}), ${misc:Depends}
82
 Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
83
 
84
 Package: libosmo-sabp1
85
@@ -92,19 +92,19 @@
86
 Architecture: any
87
 Multi-Arch: same
88
 Pre-Depends: ${misc:Pre-Depends}
89
-Depends: osmocom-nightly (= 202304270026), ${misc:Depends}, ${shlibs:Depends}
90
+Depends: osmocom-nightly (= 202304280026), ${misc:Depends}, ${shlibs:Depends}
91
 Description: Osmocom code for the Iuh interface (SABP)
92
 
93
 Package: libosmo-sabp-dbg
94
 Section: debug
95
 Architecture: any
96
 Multi-Arch: same
97
-Depends: osmocom-nightly (= 202304270026), libosmo-sabp1 (= ${binary:Version}), ${misc:Depends}
98
+Depends: osmocom-nightly (= 202304280026), libosmo-sabp1 (= ${binary:Version}), ${misc:Depends}
99
 Description: Osmocom code for the Iuh interface (SABP)
100
 
101
 Package: libosmo-sabp-dev
102
 Section: libdevel
103
 Architecture: any
104
 Multi-Arch: same
105
-Depends: osmocom-nightly (= 202304270026), libosmo-sabp1 (= ${binary:Version}), ${misc:Depends}
106
+Depends: osmocom-nightly (= 202304280026), libosmo-sabp1 (= ${binary:Version}), ${misc:Depends}
107
 Description: Osmocom code for the Iuh interface (SABP)
108
osmo-iuh_1.4.0.2.c61a.202304270026.tar.xz/src/rua_common.c -> osmo-iuh_1.4.0.5.a339.202304280026.tar.xz/src/rua_common.c Changed
58
 
1
@@ -134,6 +134,7 @@
2
 {
3
    RUA_RUA_PDU_t pdu;
4
    int rc;
5
+   struct msgb *msg;
6
 
7
    memset(&pdu, 0, sizeof(pdu));
8
 
9
@@ -146,7 +147,9 @@
10
        return NULL;
11
    }
12
 
13
-   return _rua_gen_msg(&pdu);
14
+   msg = _rua_gen_msg(&pdu);
15
+   ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RUA_RUA_PDU, &pdu);
16
+   return msg;
17
 }
18
 
19
 struct msgb *rua_generate_successful_outcome(
20
@@ -157,6 +160,7 @@
21
 {
22
    RUA_RUA_PDU_t pdu;
23
    int rc;
24
+   struct msgb *msg;
25
 
26
    memset(&pdu, 0, sizeof(pdu));
27
 
28
@@ -169,7 +173,9 @@
29
        return NULL;
30
    }
31
 
32
-   return _rua_gen_msg(&pdu);
33
+   msg = _rua_gen_msg(&pdu);
34
+   ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RUA_RUA_PDU, &pdu);
35
+   return msg;
36
 }
37
 
38
 struct msgb *rua_generate_unsuccessful_outcome(
39
@@ -180,6 +186,7 @@
40
 {
41
    RUA_RUA_PDU_t pdu;
42
    int rc;
43
+   struct msgb *msg;
44
 
45
    memset(&pdu, 0, sizeof(pdu));
46
 
47
@@ -192,7 +199,9 @@
48
        return NULL;
49
    }
50
 
51
-   return _rua_gen_msg(&pdu);
52
+   msg = _rua_gen_msg(&pdu);
53
+   ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RUA_RUA_PDU, &pdu);
54
+   return msg;
55
 }
56
 
57
 RUA_IE_t *rua_new_ie(RUA_ProtocolIE_ID_t id,
58