sys.path.append("/usr/share/secnet")
import ipaddr
-VERSION="0.1.9"
+VERSION="0.1.13"
class vpn:
def __init__(self,name):
i=sc.intersection(self.set)
return i.is_empty()
def out(self):
- rn=''
- if (self.w[0]=='restrict-nets'): rn='# '
- return '%s%s %s;'%(rn,self.w[0],
- string.join(map(lambda x:'"%s/%s"'%(x.ip_str(),
+ if (self.w[0]=='restrict-nets'): pattern="# restrict-nets %s;"
+ else:
+ pattern="link netlink { routes %s; };"
+ return pattern%string.join(map(lambda x:'"%s/%s"'%(x.ip_str(),
x.mask.netmask_bits_str),
- self.set.as_list_of_networks()),","))
+ self.set.as_list_of_networks()),",")
class dhgroup:
def __init__(self,w):
f.close()
os.rename(groupfiledir+"/T"+group,groupfiledir+"/R"+group)
f=open(sitesfile+"-tmp",'w')
- f.write("# sites file autogenerated by make-secnet-sites.py\n")
+ f.write("# sites file autogenerated by make-secnet-sites\n")
f.write("# generated %s, invoked by %s\n"%
(time.asctime(time.localtime(time.time())),user))
- f.write("# use make-secnet-sites.py to turn this file into a\n")
+ f.write("# use make-secnet-sites to turn this file into a\n")
f.write("# valid /etc/secnet/sites.conf file\n\n")
for i in headerinput: f.write(i)
files=os.listdir(groupfiledir)