From b9eb1fefceb69028c0809c23c95dd1a3a3d60549 Mon Sep 17 00:00:00 2001
From: Pierre LALET <pierre.lalet@cea.fr>
Date: Thu, 28 Apr 2016 08:22:57 +0200
Subject: [PATCH] Fix TimeStampField.any2i() used with a string
---
scapy/layers/ntp.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scapy/layers/ntp.py b/scapy/layers/ntp.py
index 6d11966c..566eb987 100644
--- a/scapy/layers/ntp.py
+++ b/scapy/layers/ntp.py
@@ -30,8 +30,8 @@ class TimeStampField(FixedPointField):
def any2i(self, pkt, val):
if type(val) is str:
- return int(time.mktime(time.strptime(val))) + _NTP_BASETIME + 3600 # XXX
- return FixedPointField.any2i(self,pkt,val)
+ val = int(time.mktime(time.strptime(val))) + _NTP_BASETIME
+ return FixedPointField.any2i(self, pkt, val)
def i2m(self, pkt, val):
if val is None:
--
GitLab