Changes of Revision 141

View file
libosmocore.spec Changed
​x
 
1
@@ -14,13 +14,13 @@
2
3
 Name:           libosmocore
4
 Requires: osmocom-master
5
-Version: 1.8.0.118.fa3a
6
+Version: 1.8.0.119.8f026
7
 Release:        0
8
 Summary:        The Open Source Mobile Communications Core Library
9
 License:        GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND AGPL-3.0-or-later
10
 Group:          Productivity/Telephony/Utilities
11
 Url:            https://osmocom.org/projects/libosmocore/wiki/Libosmocore
12
-Source: libosmocore_1.8.0.118.fa3a.tar.xz
13
+Source: libosmocore_1.8.0.119.8f026.tar.xz
14
 Source1: rpmlintrc
15
 BuildRequires:  automake >= 1.6
16
 BuildRequires:  libtool >= 2
17
​
View file
commit_8f026bf3b74293a9ed108937d1950b7453d6c5ef.txt Added
View file
commit_fa3a9ce9fd98c170c84b64f6518febd322c81907.txt Deleted
View file
libosmocore_1.8.0.118.fa3a.dsc -> libosmocore_1.8.0.119.8f026.dsc Changed
22
 
1
@@ -2,7 +2,7 @@
2
 Source: libosmocore
3
 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
4
 Architecture: any all
5
-Version: 1.8.0.118.fa3a
6
+Version: 1.8.0.119.8f026
7
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
8
 Homepage: https://projects.osmocom.org/projects/libosmocore
9
 Standards-Version: 3.9.8
10
@@ -35,8 +35,8 @@
11
  libosmovty-doc deb doc optional arch=all
12
  libosmovty9 deb libs optional arch=any
13
 Checksums-Sha1:
14
- 981b3d7bbd3346ea1461313bd451dc979bffe0a3 1040268 libosmocore_1.8.0.118.fa3a.tar.xz
15
+ e18782f591f1b55824b3006a7a592ec7e450895f 1040516 libosmocore_1.8.0.119.8f026.tar.xz
16
 Checksums-Sha256:
17
- 6ae32b576c963625031a5fa294e7ca7b797949234c4586596f41e8f92e32b516 1040268 libosmocore_1.8.0.118.fa3a.tar.xz
18
+ 315575a82181a3e16bf991282541bd85b01b2d55640885545be7bd57030f0085 1040516 libosmocore_1.8.0.119.8f026.tar.xz
19
 Files:
20
- 9f87e5e545b315c6e5c4fc6dad0df28f 1040268 libosmocore_1.8.0.118.fa3a.tar.xz
21
+ dcb4176a237516d4af723a80d210f863 1040516 libosmocore_1.8.0.119.8f026.tar.xz
22
​
View file
libosmocore_1.8.0.118.fa3a.tar.xz/.tarball-version -> libosmocore_1.8.0.119.8f026.tar.xz/.tarball-version Changed
4
 
1
@@ -1 +1 @@
2
-1.8.0.118-fa3a
3
+1.8.0.119-8f026
4
​
View file
libosmocore_1.8.0.118.fa3a.tar.xz/debian/changelog -> libosmocore_1.8.0.119.8f026.tar.xz/debian/changelog Changed
12
 
1
@@ -1,8 +1,8 @@
2
-libosmocore (1.8.0.118.fa3a) unstable; urgency=medium
3
+libosmocore (1.8.0.119.8f026) unstable; urgency=medium
4
5
   * Automatically generated changelog entry for building the Osmocom master feed
6
7
- -- Osmocom OBS scripts <info@osmocom.org>  Tue, 16 May 2023 08:17:21 +0000
8
+ -- Osmocom OBS scripts <info@osmocom.org>  Tue, 16 May 2023 08:26:12 +0000
9
10
 libosmocore (1.8.0) unstable; urgency=medium
11
12
​
View file
libosmocore_1.8.0.118.fa3a.tar.xz/src/gb/gprs_ns2_fr.c -> libosmocore_1.8.0.119.8f026.tar.xz/src/gb/gprs_ns2_fr.c Changed
22
 
1
@@ -332,9 +332,19 @@
2
 static int fr_vc_sendmsg(struct gprs_ns2_vc *nsvc, struct msgb *msg)
3
 {
4
    struct priv_vc *vcpriv = nsvc->priv;
5
+   unsigned int vc_len = msgb_length(msg);
6
+   int rc;
7
8
    msg->dst = vcpriv->dlc;
9
-   return osmo_fr_tx_dlc(msg);
10
+   rc = osmo_fr_tx_dlc(msg);
11
+   if (OSMO_LIKELY(rc >= 0)) {
12
+       RATE_CTR_INC_NS(nsvc, NS_CTR_PKTS_OUT);
13
+       RATE_CTR_ADD_NS(nsvc, NS_CTR_BYTES_OUT, vc_len);
14
+   } else {
15
+       RATE_CTR_INC_NS(nsvc, NS_CTR_PKTS_OUT_DROP);
16
+       RATE_CTR_ADD_NS(nsvc, NS_CTR_BYTES_OUT_DROP, vc_len);
17
+   }
18
+   return rc;
19
 }
20
21
 static void enqueue_at_head(struct gprs_ns2_vc_bind *bind, struct msgb *msg)
22
​
View file
libosmocore_1.8.0.118.fa3a.tar.xz/src/gb/gprs_ns2_frgre.c -> libosmocore_1.8.0.119.8f026.tar.xz/src/gb/gprs_ns2_frgre.c Changed
27
 
1
@@ -503,6 +503,8 @@
2
    uint16_t dlci = osmo_htons(bindpriv->dlci);
3
    uint8_t *frh;
4
    struct gre_hdr *greh;
5
+   unsigned int vc_len = msgb_length(msg);
6
+   int rc;
7
8
    /* Prepend the FR header */
9
    frh = msgb_push(msg, 2);
10
@@ -514,7 +516,15 @@
11
    greh->flags = 0;
12
    greh->ptype = osmo_htons(GRE_PTYPE_FR);
13
14
-   return frgre_sendmsg(bind, msg, &vcpriv->remote);
15
+   rc = frgre_sendmsg(bind, msg, &vcpriv->remote);
16
+   if (OSMO_LIKELY(rc >= 0)) {
17
+       RATE_CTR_INC_NS(nsvc, NS_CTR_PKTS_OUT);
18
+       RATE_CTR_ADD_NS(nsvc, NS_CTR_BYTES_OUT, rc);
19
+   } else {
20
+       RATE_CTR_INC_NS(nsvc, NS_CTR_PKTS_OUT_DROP);
21
+       RATE_CTR_ADD_NS(nsvc, NS_CTR_BYTES_OUT_DROP, vc_len);
22
+   }
23
+   return rc;
24
 }
25
26
 static int frgre_fd_cb(struct osmo_fd *bfd, unsigned int what)
27
​
View file
libosmocore_1.8.0.118.fa3a.tar.xz/src/gb/gprs_ns2_message.c -> libosmocore_1.8.0.119.8f026.tar.xz/src/gb/gprs_ns2_message.c Changed
26
 
1
@@ -169,23 +169,9 @@
2
    return 0;
3
 }
4
5
-
6
 static int ns_vc_tx(struct gprs_ns2_vc *nsvc, struct msgb *msg)
7
 {
8
-   unsigned int bytes = msgb_length(msg);
9
-   int rc;
10
-
11
-
12
-   rc = nsvc->bind->send_vc(nsvc, msg);
13
-   if (rc < 0) {
14
-       RATE_CTR_INC_NS(nsvc, NS_CTR_PKTS_OUT_DROP);
15
-       RATE_CTR_ADD_NS(nsvc, NS_CTR_BYTES_OUT_DROP, bytes);
16
-   } else {
17
-       RATE_CTR_INC_NS(nsvc, NS_CTR_PKTS_OUT);
18
-       RATE_CTR_ADD_NS(nsvc, NS_CTR_BYTES_OUT, bytes);
19
-   }
20
-
21
-   return rc;
22
+   return nsvc->bind->send_vc(nsvc, msg);
23
 }
24
25
 /* transmit functions */
26
​
Locations
Help
Contact