src: Changing LSA names to conform with specs
Change LSA names from /<network>/NLSR/LSA/<network>/<site>/<router-name>/<type>/<version>
to /<network>/NLSR/LSA/<site>/<router-name>/<type>/<version> to conform with the
NLSR specification document. http://redmine.named-data.net/projects/nlsr/wiki/Build_LSAs
Change-Id: I89c9aaee44cd1f3d286a29bd8eb5585bfa844b43
diff --git a/nlsr.conf b/nlsr.conf
index 6cad1f7..d6f31bc 100644
--- a/nlsr.conf
+++ b/nlsr.conf
@@ -151,7 +151,7 @@
k-regex ^([^<KEY><NLSR>]*)<NLSR><KEY><ksk-.*><ID-CERT>$
k-expand \\1
h-relation equal
- p-regex ^([^<NLSR><LSA>]*)<NLSR><LSA>(<>*)<><>$
+ p-regex ^([^<NLSR><LSA>]*)<NLSR><LSA>(<>*)<><><>$
p-expand \\1\\2
}
}
@@ -165,7 +165,7 @@
filter
{
type name
- regex ^[^<KEY><%C1.O.R.>]*<%C1.O.R.><><KEY><ksk-.*><ID-CERT><>$
+ regex ^[^<KEY><%C1.O.R.>]*<%C1.O.R.>[^<KEY><NLSR>]*<KEY><ksk-.*><ID-CERT><>$
}
checker
{
@@ -176,10 +176,10 @@
type name
hyper-relation
{
- k-regex ^([^<KEY><%C1.O.N.>]*)<%C1.O.N.><><KEY><ksk-.*><ID-CERT>$
+ k-regex ^([^<KEY><%C1.O.N.>]*)<%C1.O.N.>[^<KEY>]*<KEY><ksk-.*><ID-CERT>$
k-expand \\1
h-relation equal
- p-regex ^([^<KEY><%C1.O.R.>]*)<%C1.O.R.><><KEY><ksk-.*><ID-CERT><>$
+ p-regex ^([^<KEY><%C1.O.R.>]*)<%C1.O.R.>[^<KEY>]*<KEY><ksk-.*><ID-CERT><>$
p-expand \\1
}
}
@@ -208,12 +208,12 @@
file-name "root.cert"
}
}
- ; cert-to-publish "root.cert" //optional, a file containing the root certificate. only the router
- //that is designated to publish root cert needs to specify this
- ; cert-to-publish "site.cert" //optional, a file containing the root certificate. only the router
- //that is designated to publish site cert need to specify this
- ; cert-to-publish "operator.cert" //optional, a file containing the root certificate. only the
- //router that is designated to publish operator cert need to
- //specify this
- ; cert-to-publish "router.cert" //required, a file containing the router certificate.
+ ; cert-to-publish "root.cert" ; optional, a file containing the root certificate. only the router
+ ; that is designated to publish root cert needs to specify this
+ ; cert-to-publish "site.cert" ; optional, a file containing the root certificate. only the router
+ ; that is designated to publish site cert need to specify this
+ ; cert-to-publish "operator.cert" ; optional, a file containing the root certificate. only the
+ ; router that is designated to publish operator cert need to
+ ; specify this
+ cert-to-publish "router.cert" ; required, a file containing the router certificate.
}