Message ID | 20190626204402.5257-3-a@juaristi.eus |
---|---|
State | Changes Requested |
Delegated to: | Pablo Neira |
Headers | show |
Series | [v2,1/7] nftables: meta: Introduce new conditions 'time', 'day' and 'hour' | expand |
Ander Juaristi <a@juaristi.eus> wrote: same remark, I think this can be squashed.
On Wed, Jun 26, 2019 at 11:07:58PM +0200, Florian Westphal wrote: > Ander Juaristi <a@juaristi.eus> wrote: > > same remark, I think this can be squashed. Agreed. Ander, please, use git rebase -i (interactive rebased to squash this patches where they belong). Thanks!
diff --git a/src/meta.c b/src/meta.c index 39e551c..bfe8aaa 100644 --- a/src/meta.c +++ b/src/meta.c @@ -408,6 +408,7 @@ static void date_type_print(const struct expr *expr, struct output_ctx *octx) static time_t parse_iso_date(const char *sym) { time_t ts = time(NULL); + long int gmtoff; struct tm tm, *cur_tm; memset(&tm, 0, sizeof(struct tm)); @@ -433,7 +434,10 @@ success: return ts; /* Substract tm_gmtoff to get the current time */ - return ts - cur_tm->tm_gmtoff; + gmtoff = cur_tm->tm_gmtoff; + if (cur_tm->tm_isdst == 1) + gmtoff -= 3600; + return ts - gmtoff; } static struct error_record *date_type_parse(const struct expr *sym,
Signed-off-by: Ander Juaristi <a@juaristi.eus> --- src/meta.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)