make-secnet-sites: Provide `serial' property class

[secnet.git] / make-secnet-sites

diff --git a/make-secnet-sites b/make-secnet-sites
index 6cb131e126689130a755ac67421a4f4f875fd1e9..0f1e8bab8b7d99fc58788e833841a6d0f33a1286 100755 (executable)
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -76,6 +76,8 @@ from argparseactionnoyes import ActionNoYes
 
 VERSION="0.1.18"
 
+max_version = 1
+
 from sys import version_info
 if version_info.major == 2:  # for python2
     import codecs
@@ -230,6 +232,13 @@ class Tainted:
                ok=self._re_ok(Tainted.bad_base91,what,4096)
                return self._rtn(ok)
 
+class ArgActionLambda(argparse.Action):
+       def __init__(self, fn, **kwargs):
+               self.fn=fn
+               argparse.Action.__init__(self,**kwargs)
+       def __call__(self,ap,ns,values,option_string):
+               self.fn(values,ns,ap,option_string)
+
 def parse_args():
        global service
        global inputfile
@@ -243,6 +252,7 @@ def parse_args():
        global prefix
        global key_prefix
        global debug_level
+       global output_version
 
        ap = argparse.ArgumentParser(description='process secnet sites files')
        ap.add_argument('--userv', '-u', action='store_true',
@@ -250,6 +260,9 @@ def parse_args():
        ap.add_argument('--conf-key-prefix', action=ActionNoYes,
                        default=True,
                 help='prefix conf file key names derived from sites data')
+       ap.add_argument('--output-version', nargs=1, type=int,
+                       help='sites file output version',
+                       default=[max_version])
        ap.add_argument('--prefix', '-P', nargs=1,
                        help='set prefix')
        ap.add_argument('--debug', '-D', action='count', default=0)
@@ -260,6 +273,7 @@ def parse_args():
        service = 1 if av.userv else 0
        prefix = '' if av.prefix is None else av.prefix[0]
        key_prefix = av.conf_key_prefix
+       output_version = av.output_version[0]
        if service:
                if len(av.arg)!=4:
                        print("Wrong number of arguments")
@@ -297,6 +311,8 @@ class basetype:
        def add(self,obj,w):
                complain("%s %s already has property %s defined"%
                        (obj.type,obj.name,w[0].raw()))
+       def forsites(self,version,copy,fs):
+               return copy
 
 class conflist:
        "A list of some kind of configuration type."
@@ -307,6 +323,9 @@ class conflist:
                self.list.append(self.subtype(w))
        def __str__(self):
                return ', '.join(map(str, self.list))
+       def forsites(self,version,copy,fs):
+               most_recent=self.list[len(self.list)-1]
+               return most_recent.forsites(version,copy,fs)
 def listof(subtype):
        return lambda w: conflist(subtype, w)
 
@@ -377,6 +396,15 @@ class num (basetype):
        def __str__(self):
                return '%d'%(self.n)
 
+class serial (basetype):
+       def __init__(self,w):
+               self.i=w[1].hexid(4,'serial')
+       def __str__(self):
+               return self.i
+       def forsites(self,version,copy,fs):
+               if version < 2: return []
+               return copy
+
 class address (basetype):
        "A DNS name and UDP port number"
        def __init__(self,w):
@@ -595,6 +623,7 @@ def set_property(obj,w):
                obj.properties[propname].add(obj,w)
        else:
                obj.properties[propname]=kw[0](w)
+       return obj.properties[propname]
 
 class FilterState:
        def __init__(self):
@@ -672,8 +701,11 @@ def pline(il,filterstate,allow_include=False):
                complain("Not allowed to set VPN properties here")
                return []
        else:
-               set_property(current,w)
-               return copyout()
+               prop=set_property(current,w)
+               out=[copyout_core()]
+               out=prop.forsites(output_version,out,filterstate)
+               if len(out)==0: return [indent + '#', copyout_core(), '\n']
+               return [indent + ' '.join(out) + '\n']
 
        complain("unknown keyword '%s'"%(keyword.raw()))