From d5034ccc19f8c5e4b48c0d8c2c03eb64caf662fd Mon Sep 17 00:00:00 2001
From: Jan Grashoefer <jan.grashoefer@gmail.com>
Date: Thu, 17 Mar 2016 19:56:25 +0100
Subject: [PATCH] Fixed &read_expire for subnet-indexed tables

---
 src/Val.cc | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Val.cc b/src/Val.cc
index 35233e9056..ce15cb9179 100644
--- a/src/Val.cc
+++ b/src/Val.cc
@@ -1787,7 +1787,18 @@ Val* TableVal::Lookup(Val* index, bool use_default_val)
 		{
 		TableEntryVal* v = (TableEntryVal*) subnets->Lookup(index);
 		if ( v )
+			{
+			if ( attrs &&
+				     ! (attrs->FindAttr(ATTR_EXPIRE_WRITE) ||
+					attrs->FindAttr(ATTR_EXPIRE_CREATE)) )
+					{
+					v->SetExpireAccess(network_time);
+					if ( LoggingAccess() && expire_time )
+						ReadOperation(index, v);
+					}
+
 			return v->Value() ? v->Value() : this;
+			}
 
 		if ( ! use_default_val )
 			return 0;