paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-10-23 08:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

move sms_next_rp_msg_ref() to libxsc, for gsm0408test

Browse Source 
Also change the signature to avoid using gsm_subscriber_connection, which
has different members in libbsc and libmsc.
This commit is contained in:
Neels Hofmeyr
2016-03-04 14:15:12 +01:00
parent 15b1fce69c
commit 33a343858d
5 changed files with 24 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openbsc/include/openbsc/gsm_04_11.h
View File

@@ -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

2
openbsc/src/libmsc/gsm_04_11.c
View File

@@ -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;

37
openbsc/src/libmsc/gsm_04_11_helper.c
View File

@@ -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;
}

19
openbsc/src/libxsc/xsc.c
View File

@@ -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;
}

6
openbsc/tests/gsm0408/gsm0408_test.c
View File

@@ -459,15 +459,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);
}