summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-05-10 13:27:32 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-11-12 15:50:36 +0100
commite224a81f92ebc02dd5bcbba8069801ca1d2b7196 (patch)
tree70ec2fc181c896141c9f05bc64c8976e89d660f8
parent2ac47f62ae395902e03f5d7f60598ce937639a8d (diff)
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
-rw-r--r--openbsc/include/openbsc/gsm_04_11.h2
-rw-r--r--openbsc/src/libmsc/Makefile.am1
-rw-r--r--openbsc/src/libmsc/gsm_04_11.c2
-rw-r--r--openbsc/src/libmsc/gsm_04_11_helper.c37
-rw-r--r--openbsc/src/libxsc/xsc.c15
-rw-r--r--openbsc/tests/gsm0408/gsm0408_test.c6
6 files changed, 20 insertions, 43 deletions
diff --git a/openbsc/include/openbsc/gsm_04_11.h b/openbsc/include/openbsc/gsm_04_11.h
index 00c3a19fa..149de9083 100644
--- a/openbsc/include/openbsc/gsm_04_11.h
+++ b/openbsc/include/openbsc/gsm_04_11.h
@@ -38,5 +38,5 @@ int gsm411_send_sms(struct gsm_subscriber_connection *conn,
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 d236d3a79..9d966dbc1 100644
--- a/openbsc/src/libmsc/Makefile.am
+++ b/openbsc/src/libmsc/Makefile.am
@@ -27,7 +27,6 @@ libmsc_a_SOURCES = \
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 3a2effe0b..48a87e055 100644
--- a/openbsc/src/libmsc/gsm_04_11.c
+++ b/openbsc/src/libmsc/gsm_04_11.c
@@ -873,7 +873,7 @@ int gsm411_send_sms(struct gsm_subscriber_connection *conn, struct gsm_sms *sms)
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 f48c6de0b..000000000
--- 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 04bc53e1b..3692a3a3b 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 @@ struct msgb *gsm0480_gen_releaseComplete(void)
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 b63205b98..a44c04a69 100644
--- a/openbsc/tests/gsm0408/gsm0408_test.c
+++ b/openbsc/tests/gsm0408/gsm0408_test.c
@@ -563,15 +563,15 @@ static void test_gsm411_rp_ref_wrap(void)
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);
}