1 files changed, 8 insertions, 5 deletions

diff --git a/src/gnunet/util/time.go b/src/gnunet/util/time.go
index 6e98514..cf3739a 100644
--- a/src/gnunet/util/time.go
+++ b/src/gnunet/util/time.go
@@ -81,6 +81,13 @@ func (t AbsoluteTime) Add(d time.Duration) AbsoluteTime {
         }
 }
 
+// Add a relative time to an absolute time yielding a new absolute time.
+func (t AbsoluteTime) AddRelative(d RelativeTime) AbsoluteTime {
+        return AbsoluteTime{
+                Val: t.Val + d.Val,
+        }
+}
+
 // Elapsed time since 't'. Return 0 if 't' is in the future.
 func (t AbsoluteTime) Elapsed() RelativeTime {
         dt, elapsed := t.Diff(AbsoluteTimeNow())
@@ -107,11 +114,7 @@ func (t AbsoluteTime) Diff(t2 AbsoluteTime) (dt RelativeTime, elapsed bool) {
 
 // Expired returns true if the timestamp is in the past.
 func (t AbsoluteTime) Expired() bool {
-        // check for "never"
-        if t.Val == math.MaxUint64 {
-                return false
-        }
-        return t.Val < uint64(time.Now().Unix())
+        return t.Compare(AbsoluteTimeNow()) < 0
 }
 
 // Compare two times (-1 = (t < t2), 0 = (t == t2), 1 = (t > t2)