conf+security: accommodate certificate name in KeyLocator
refs #5195
Change-Id: I88709f891fe78fc9f2699bc021d35ca72ebc6850
diff --git a/nlsr.conf b/nlsr.conf
index fd2ad23..bfed00b 100644
--- a/nlsr.conf
+++ b/nlsr.conf
@@ -4,7 +4,7 @@
{
; mandatory configuration command section network, site and router
- network /ndn/ ; name of the network the router belongs to in ndn URI format
+ network /ndn ; name of the network the router belongs to in ndn URI format
site /edu/memphis ; name of the site the router belongs to in ndn URI format
router /%C1.Router/cs/pollux ; name of the router in ndn URI format
@@ -150,7 +150,7 @@
type name
hyper-relation
{
- k-regex ^([^<KEY><nlsr>]*)<nlsr><KEY><>$
+ k-regex ^([^<KEY><nlsr>]*)<nlsr><KEY><>{1,3}$
k-expand \\1
h-relation equal
p-regex ^([^<nlsr><INFO>]*)<nlsr><INFO><><>$
@@ -178,7 +178,7 @@
type name
hyper-relation
{
- k-regex ^([^<KEY><nlsr>]*)<nlsr><KEY><>$
+ k-regex ^([^<KEY><nlsr>]*)<nlsr><KEY><>{1,3}$
k-expand \\1
h-relation equal
; the last four components in the prefix should be <lsaType><seqNo><version><segmentNo>
@@ -235,7 +235,7 @@
type name
hyper-relation
{
- k-regex ^([^<KEY><%C1.Operator>]*)<%C1.Operator>[^<KEY>]*<KEY><>$
+ k-regex ^([^<KEY><%C1.Operator>]*)<%C1.Operator>[^<KEY>]*<KEY><>{1,3}$
k-expand \\1
h-relation equal
p-regex ^([^<KEY><%C1.Router>]*)<%C1.Router>[^<KEY>]*<KEY><><><>$
@@ -288,7 +288,7 @@
key-locator
{
type name
- regex ^([^<KEY><%C1.Operator>]*)<%C1.Operator>[^<KEY>]*<KEY><>$
+ regex ^([^<KEY><%C1.Operator>]*)<%C1.Operator>[^<KEY>]*<KEY><>{1,3}$
}
}
}