[PATCH 4/6] sms: Add missing brackets in the relative validity time calculation.
-- Regards, Alexander Chemeris. CEO, Fairwaves, Inc. / ООО УмРадио https://fairwaves.co
Looks good, thanks. On Fri, 2014-03-07 at 21:17, Alexander Chemeris wrote:
-- Regards, Alexander Chemeris. CEO, Fairwaves, Inc. / ООО УмРадио https://fairwaves.co
From c73e793eda7b0961f83956fd4ed2aac378a0869e Mon Sep 17 00:00:00 2001 From: Alexander Chemeris <Alexander.Chemeris@gmail.com> Date: Fri, 7 Mar 2014 21:00:19 +0100 Subject: [PATCH 4/6] sms: Add missing brackets in the relative validity time calculation.
--- src/gsm/gsm0411_utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gsm/gsm0411_utils.c b/src/gsm/gsm0411_utils.c index 1a6862b..6272ba3 100644 --- a/src/gsm/gsm0411_utils.c +++ b/src/gsm/gsm0411_utils.c @@ -137,13 +137,13 @@ static unsigned long gsm340_vp_relative(time_t now, uint8_t *sms_vp)
vp = *(sms_vp); if (vp <= 143) - minutes = vp + 1 * 5; + minutes = (vp + 1) * 5; else if (vp <= 167) minutes = 12*60 + (vp-143) * 30; else if (vp <= 196) - minutes = vp-166 * 60 * 24; + minutes = (vp-166) * 60 * 24; else - minutes = vp-192 * 60 * 24 * 7; + minutes = (vp-192) * 60 * 24 * 7;
/* Calculate absolute time from the relative offset */ return now + minutes * 60; -- 1.7.9.5
-- - Daniel Willmann <dwillmann@sysmocom.de> http://www.sysmocom.de/ ======================================================================= * sysmocom - systems for mobile communications GmbH * Schivelbeiner Str. 5 * 10439 Berlin, Germany * Sitz / Registered office: Berlin, HRB 134158 B * Geschaeftsfuehrer / Managing Directors: Holger Freyther, Harald Welte
Thanks. Looking forward to your review of other 4 patches :) On Tue, Mar 11, 2014 at 11:28 PM, Daniel Willmann <dwillmann@sysmocom.de> wrote:
Looks good, thanks.
On Fri, 2014-03-07 at 21:17, Alexander Chemeris wrote:
-- Regards, Alexander Chemeris. CEO, Fairwaves, Inc. / ООО УмРадио https://fairwaves.co
From c73e793eda7b0961f83956fd4ed2aac378a0869e Mon Sep 17 00:00:00 2001 From: Alexander Chemeris <Alexander.Chemeris@gmail.com> Date: Fri, 7 Mar 2014 21:00:19 +0100 Subject: [PATCH 4/6] sms: Add missing brackets in the relative validity time calculation.
--- src/gsm/gsm0411_utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gsm/gsm0411_utils.c b/src/gsm/gsm0411_utils.c index 1a6862b..6272ba3 100644 --- a/src/gsm/gsm0411_utils.c +++ b/src/gsm/gsm0411_utils.c @@ -137,13 +137,13 @@ static unsigned long gsm340_vp_relative(time_t now, uint8_t *sms_vp)
vp = *(sms_vp); if (vp <= 143) - minutes = vp + 1 * 5; + minutes = (vp + 1) * 5; else if (vp <= 167) minutes = 12*60 + (vp-143) * 30; else if (vp <= 196) - minutes = vp-166 * 60 * 24; + minutes = (vp-166) * 60 * 24; else - minutes = vp-192 * 60 * 24 * 7; + minutes = (vp-192) * 60 * 24 * 7;
/* Calculate absolute time from the relative offset */ return now + minutes * 60; -- 1.7.9.5
-- - Daniel Willmann <dwillmann@sysmocom.de> http://www.sysmocom.de/ ======================================================================= * sysmocom - systems for mobile communications GmbH * Schivelbeiner Str. 5 * 10439 Berlin, Germany * Sitz / Registered office: Berlin, HRB 134158 B * Geschaeftsfuehrer / Managing Directors: Holger Freyther, Harald Welte
-- Regards, Alexander Chemeris. CEO, Fairwaves, Inc. / ООО УмРадио https://fairwaves.co
Hi Holger, It seems there are no more comments on this code. Could you please merge it? It is independent of other changes. On Wed, Mar 12, 2014 at 12:22 AM, Alexander Chemeris <alexander.chemeris@gmail.com> wrote:
Thanks. Looking forward to your review of other 4 patches :)
On Tue, Mar 11, 2014 at 11:28 PM, Daniel Willmann <dwillmann@sysmocom.de> wrote:
Looks good, thanks.
On Fri, 2014-03-07 at 21:17, Alexander Chemeris wrote:
-- Regards, Alexander Chemeris. CEO, Fairwaves, Inc. / ООО УмРадио https://fairwaves.co
From c73e793eda7b0961f83956fd4ed2aac378a0869e Mon Sep 17 00:00:00 2001 From: Alexander Chemeris <Alexander.Chemeris@gmail.com> Date: Fri, 7 Mar 2014 21:00:19 +0100 Subject: [PATCH 4/6] sms: Add missing brackets in the relative validity time calculation.
--- src/gsm/gsm0411_utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gsm/gsm0411_utils.c b/src/gsm/gsm0411_utils.c index 1a6862b..6272ba3 100644 --- a/src/gsm/gsm0411_utils.c +++ b/src/gsm/gsm0411_utils.c @@ -137,13 +137,13 @@ static unsigned long gsm340_vp_relative(time_t now, uint8_t *sms_vp)
vp = *(sms_vp); if (vp <= 143) - minutes = vp + 1 * 5; + minutes = (vp + 1) * 5; else if (vp <= 167) minutes = 12*60 + (vp-143) * 30; else if (vp <= 196) - minutes = vp-166 * 60 * 24; + minutes = (vp-166) * 60 * 24; else - minutes = vp-192 * 60 * 24 * 7; + minutes = (vp-192) * 60 * 24 * 7;
/* Calculate absolute time from the relative offset */ return now + minutes * 60; -- 1.7.9.5
-- - Daniel Willmann <dwillmann@sysmocom.de> http://www.sysmocom.de/ ======================================================================= * sysmocom - systems for mobile communications GmbH * Schivelbeiner Str. 5 * 10439 Berlin, Germany * Sitz / Registered office: Berlin, HRB 134158 B * Geschaeftsfuehrer / Managing Directors: Holger Freyther, Harald Welte
-- Regards, Alexander Chemeris. CEO, Fairwaves, Inc. / ООО УмРадио https://fairwaves.co
-- Regards, Alexander Chemeris. CEO, Fairwaves, Inc. / ООО УмРадио https://fairwaves.co
participants (2)
-
Alexander Chemeris -
Daniel Willmann