move sms_next_rp_msg_ref() to libxsc, for gsm0408test

Also change the signature to avoid using gsm_subscriber_connection, which
has different members in libbsc and libmsc.

3 files changed, 20 insertions, 38 deletions

diff --git a/openbsc/src/libmsc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c
index d751b470e..6e48c1576 100644
--- a/openbsc/src/libmsc/gsm_04_11.c
+++ b/openbsc/src/libmsc/gsm_04_11.c
@@ -862,7 +862,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 7cf502689..d9c2c8328 100644
--- a/openbsc/src/libxsc/xsc.c
+++ b/openbsc/src/libxsc/xsc.c
@@ -2,6 +2,7 @@
  *
  * (C) 2016 by sysmocom s.m.f.c. <info@sysmocom.de>
  * (C) 2008-2010 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2014 by Holger Hans Peter Freyther
  * All Rights Reserved
  *
  * This program is free software; you can redistribute it and/or modify
@@ -200,3 +201,21 @@ int gsm48_paging_extract_mi(struct gsm48_pag_resp *resp, int length,
 				mi_string, mi_type);
 }
 
+
+/* Helpers for SMS/GSM 04.11 */
+#include <openbsc/gsm_data.h>
+#include <openbsc/gsm_04_11.h>
+
+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;
+}
+