diff options
authorAlexander Chemeris <Alexander.Chemeris@gmail.com>2014-03-08 21:27:37 +0100
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2014-03-09 10:26:11 +0100
commit1e77e3dc5bb9dd0017920745514a31f0085a0970 (patch)
parent82a1858eb0e9855472a1e7ee7624f68aa68057e6 (diff)
db,sms: Rename db_sms_mark_sent() to db_sms_mark_delivered()
In MT-SMS the message is being delivered. Make the naming follow that. The schema still refers to "sent" while it should be "delivered" too.
3 files changed, 4 insertions, 4 deletions
diff --git a/openbsc/include/openbsc/db.h b/openbsc/include/openbsc/db.h
index a89c22d54..29c6b42b8 100644
--- a/openbsc/include/openbsc/db.h
+++ b/openbsc/include/openbsc/db.h
@@ -63,7 +63,7 @@ struct gsm_sms *db_sms_get(struct gsm_network *net, unsigned long long id);
struct gsm_sms *db_sms_get_unsent(struct gsm_network *net, unsigned long long min_id);
struct gsm_sms *db_sms_get_unsent_by_subscr(struct gsm_network *net, unsigned long long min_subscr_id, unsigned int failed);
struct gsm_sms *db_sms_get_unsent_for_subscr(struct gsm_subscriber *subscr);
-int db_sms_mark_sent(struct gsm_sms *sms);
+int db_sms_mark_delivered(struct gsm_sms *sms);
int db_sms_inc_deliver_attempts(struct gsm_sms *sms);
/* APDU blob storage */
diff --git a/openbsc/src/libmsc/db.c b/openbsc/src/libmsc/db.c
index e26d3c585..4e6ffc371 100644
--- a/openbsc/src/libmsc/db.c
+++ b/openbsc/src/libmsc/db.c
@@ -1303,8 +1303,8 @@ struct gsm_sms *db_sms_get_unsent_for_subscr(struct gsm_subscriber *subscr)
return sms;
-/* mark a given SMS as read */
-int db_sms_mark_sent(struct gsm_sms *sms)
+/* mark a given SMS as delivered */
+int db_sms_mark_delivered(struct gsm_sms *sms)
dbi_result result;
diff --git a/openbsc/src/libmsc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c
index 975a263ae..58b68ed3b 100644
--- a/openbsc/src/libmsc/gsm_04_11.c
+++ b/openbsc/src/libmsc/gsm_04_11.c
@@ -554,7 +554,7 @@ static int gsm411_rx_rp_ack(struct msgb *msg, struct gsm_trans *trans,
/* mark this SMS as sent in database */
- db_sms_mark_sent(sms);
+ db_sms_mark_delivered(sms);
send_signal(S_SMS_DELIVERED, trans, sms, 0);