[MERGED] openbsc[master]: libmsc: Use actual delivery time in delivery reports.

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Fri Aug 18 18:07:53 UTC 2017


Harald Welte has submitted this change and it was merged.

Change subject: libmsc: Use actual delivery time in delivery reports.
......................................................................


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
---
M openbsc/include/openbsc/gsm_data.h
M openbsc/src/libmsc/db.c
M openbsc/src/libmsc/gsm_04_11.c
3 files changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified
  Pablo Neira Ayuso: Looks good to me, but someone else must approve



diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h
index 6829d22..4035b39 100644
--- a/openbsc/include/openbsc/gsm_data.h
+++ b/openbsc/include/openbsc/gsm_data.h
@@ -456,6 +456,7 @@
 	} smpp;
 
 	unsigned long validity_minutes;
+	time_t created;
 	bool is_report;
 	uint8_t reply_path_req;
 	uint8_t status_rep_req;
diff --git a/openbsc/src/libmsc/db.c b/openbsc/src/libmsc/db.c
index 631e05f..4ba12ca 100644
--- a/openbsc/src/libmsc/db.c
+++ b/openbsc/src/libmsc/db.c
@@ -1641,6 +1641,7 @@
 
 	/* 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 5e736b3..ddef444 100644
--- a/openbsc/src/libmsc/gsm_04_11.c
+++ b/openbsc/src/libmsc/gsm_04_11.c
@@ -310,11 +310,11 @@
 
 	/* 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);

-- 
To view, visit https://gerrit.osmocom.org/3540
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9056429d40bf02731f004b7833f1de45a0d1add8
Gerrit-PatchSet: 4
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Keith Whyte <keith at rhizomatica.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Holger Freyther <holger at freyther.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Keith Whyte <keith at rhizomatica.org>
Gerrit-Reviewer: Pablo Neira Ayuso <pablo at gnumonks.org>



More information about the gerrit-log mailing list