--
Regards,
Alexander Chemeris.
CEO, Fairwaves, Inc. / ООО УмРадио
https://fairwaves.co
From b5b9065517cfc75b49a54a669f2a35cda46899b6 Mon Sep 17 00:00:00 2001
From: Alexander Chemeris <[email protected]>
Date: Sat, 8 Mar 2014 21:27:37 +0100
Subject: [PATCH 1/2] db,sms: Rename db_sms_mark_sent() to
db_sms_mark_delivered(), as that's what it does.
---
openbsc/include/openbsc/db.h | 2 +-
openbsc/src/libmsc/db.c | 4 ++--
openbsc/src/libmsc/gsm_04_11.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/openbsc/include/openbsc/db.h b/openbsc/include/openbsc/db.h
index a89c22d..29c6b42 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 60b39df..2af39e5 100644
--- a/openbsc/src/libmsc/db.c
+++ b/openbsc/src/libmsc/db.c
@@ -1487,8 +1487,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 71dfeb9..5b61143 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);
--
1.7.9.5