This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Review at https://gerrit.osmocom.org/1131
sms_next_rp_msg_ref(): use direct pointer to next_rp_ref counter
libbsc and libmsc will have separate subscriber connection structs. Hence don't
rely on gsm_subscriber_connection, but work on a direct pointer to the counter
for the next RP reference.
The only very thin function in gsm_04_11_helper.c thus becomes obsolete: drop
the entire file.
Change-Id: I2a2e9ba6a981a385d1f8f07acbe03536ffed0072
---
M openbsc/include/openbsc/gsm_04_11.h
M openbsc/src/libmsc/Makefile.am
M openbsc/src/libmsc/gsm_04_11.c
D openbsc/src/libmsc/gsm_04_11_helper.c
M openbsc/src/libxsc/xsc.c
M openbsc/tests/gsm0408/gsm0408_test.c
6 files changed, 20 insertions(+), 43 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/31/1131/1
diff --git a/openbsc/include/openbsc/gsm_04_11.h b/openbsc/include/openbsc/gsm_04_11.h
index 00c3a19..149de90 100644
--- a/openbsc/include/openbsc/gsm_04_11.h
+++ b/openbsc/include/openbsc/gsm_04_11.h
@@ -38,5 +38,5 @@
struct gsm_sms *sms);
void gsm411_sapi_n_reject(struct gsm_subscriber_connection *conn);
-uint8_t sms_next_rp_msg_ref(struct gsm_subscriber_connection *conn);
+uint8_t sms_next_rp_msg_ref(uint8_t *next_rp_ref);
#endif
diff --git a/openbsc/src/libmsc/Makefile.am b/openbsc/src/libmsc/Makefile.am
index d236d3a..9d966db 100644
--- a/openbsc/src/libmsc/Makefile.am
+++ b/openbsc/src/libmsc/Makefile.am
@@ -27,7 +27,6 @@
db.c \
gsm_04_08.c \
gsm_04_11.c \
- gsm_04_11_helper.c \
gsm_04_80.c \
gsm_subscriber.c \
mncc.c \
diff --git a/openbsc/src/libmsc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c
index 3a2effe..48a87e0 100644
--- a/openbsc/src/libmsc/gsm_04_11.c
+++ b/openbsc/src/libmsc/gsm_04_11.c
@@ -873,7 +873,7 @@
struct msgb *msg = gsm411_msgb_alloc();
struct gsm_trans *trans;
uint8_t *data, *rp_ud_len;
- uint8_t msg_ref = sms_next_rp_msg_ref(conn);
+ uint8_t msg_ref = sms_next_rp_msg_ref(&conn->next_rp_ref);
int transaction_id;
int rc;
diff --git a/openbsc/src/libmsc/gsm_04_11_helper.c b/openbsc/src/libmsc/gsm_04_11_helper.c
deleted file mode 100644
index f48c6de..0000000
--- a/openbsc/src/libmsc/gsm_04_11_helper.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Helpers for SMS/GSM 04.11 */
-/*
- * (C) 2014 by Holger Hans Peter Freyther
- *
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <openbsc/gsm_data.h>
-#include <openbsc/gsm_04_11.h>
-
-uint8_t sms_next_rp_msg_ref(struct gsm_subscriber_connection *conn)
-{
- const uint8_t rp_msg_ref = conn->next_rp_ref;
- /*
- * This should wrap as the valid range is 0 to 255. We only
- * transfer one SMS at a time so we don't need to check if
- * the id has been already assigned.
- */
- conn->next_rp_ref += 1;
-
- return rp_msg_ref;
-}
-
diff --git a/openbsc/src/libxsc/xsc.c b/openbsc/src/libxsc/xsc.c
index 04bc53e..3692a3a 100644
--- a/openbsc/src/libxsc/xsc.c
+++ b/openbsc/src/libxsc/xsc.c
@@ -27,6 +27,8 @@
#include <openbsc/xsc.h>
#include <openbsc/gsm_data.h>
#include <openbsc/gsm_subscriber.h>
+#include <openbsc/gsm_data.h>
+#include <openbsc/gsm_04_11.h>
/* Warning: if bsc_network_init() is not called, some of the members of
* gsm_network are not initialized properly and must not be used! (In
@@ -149,3 +151,16 @@
return msg;
}
+
+uint8_t sms_next_rp_msg_ref(uint8_t *next_rp_ref)
+{
+ const uint8_t rp_msg_ref = *next_rp_ref;
+ /*
+ * This should wrap as the valid range is 0 to 255. We only
+ * transfer one SMS at a time so we don't need to check if
+ * the id has been already assigned.
+ */
+ *next_rp_ref += 1;
+
+ return rp_msg_ref;
+}
diff --git a/openbsc/tests/gsm0408/gsm0408_test.c b/openbsc/tests/gsm0408/gsm0408_test.c
index b63205b..a44c04a 100644
--- a/openbsc/tests/gsm0408/gsm0408_test.c
+++ b/openbsc/tests/gsm0408/gsm0408_test.c
@@ -563,15 +563,15 @@
memset(&conn, 0, sizeof(conn));
conn.next_rp_ref = 255;
- res = sms_next_rp_msg_ref(&conn);
+ res = sms_next_rp_msg_ref(&conn.next_rp_ref);
printf("Allocated reference: %d\n", res);
OSMO_ASSERT(res == 255);
- res = sms_next_rp_msg_ref(&conn);
+ res = sms_next_rp_msg_ref(&conn.next_rp_ref);
printf("Allocated reference: %d\n", res);
OSMO_ASSERT(res == 0);
- res = sms_next_rp_msg_ref(&conn);
+ res = sms_next_rp_msg_ref(&conn.next_rp_ref);
printf("Allocated reference: %d\n", res);
OSMO_ASSERT(res == 1);
}
--
To view, visit https://gerrit.osmocom.org/1131
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a2e9ba6a981a385d1f8f07acbe03536ffed0072
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>