From b4962dcf115148834478744e35fe1a888eda915f Mon Sep 17 00:00:00 2001 From: Keith Date: Wed, 16 Aug 2017 22:45:07 +0200 Subject: libmsc: Use actual delivery time in delivery reports. Set the time on the status report to the time the message was delivered, as this may not be the same as the time when we are delivering the report to the originating MS. Change-Id: I9056429d40bf02731f004b7833f1de45a0d1add8 --- openbsc/src/libmsc/db.c | 1 + openbsc/src/libmsc/gsm_04_11.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'openbsc/src/libmsc') diff --git a/openbsc/src/libmsc/db.c b/openbsc/src/libmsc/db.c index 631e05f5d..4ba12ca69 100644 --- a/openbsc/src/libmsc/db.c +++ b/openbsc/src/libmsc/db.c @@ -1641,6 +1641,7 @@ static struct gsm_sms *sms_from_result(struct gsm_network *net, dbi_result resul /* FIXME: validity */ /* FIXME: those should all be get_uchar, but sqlite3 is braindead */ + sms->created = dbi_result_get_datetime(result, "created"); sms->reply_path_req = dbi_result_get_ulonglong(result, "reply_path_req"); sms->status_rep_req = dbi_result_get_ulonglong(result, "status_rep_req"); sms->is_report = dbi_result_get_ulonglong(result, "is_report"); diff --git a/openbsc/src/libmsc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c index 5e736b3d5..ddef444c5 100644 --- a/openbsc/src/libmsc/gsm_04_11.c +++ b/openbsc/src/libmsc/gsm_04_11.c @@ -310,11 +310,11 @@ static int gsm340_gen_sms_status_report_tpdu(struct msgb *msg, /* generate TP-SCTS (Service centre timestamp) */ smsp = msgb_put(msg, 7); - gsm340_gen_scts(smsp, time(NULL)); + gsm340_gen_scts(smsp, sms->created); /* generate TP-DT (Discharge time, in TP-SCTS format). */ smsp = msgb_put(msg, 7); - gsm340_gen_scts(smsp, time(NULL)); + gsm340_gen_scts(smsp, sms->created); /* TP-ST (status) */ smsp = msgb_put(msg, 1); -- cgit v1.2.3