undersys/frankenrouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add mask to ipadd command

Browse source
This commit is contained in:
deflax 2018-04-09 06:53:25 -04:00
parent 43cb0d5743
commit 79bec43a2f
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
frankenrouter.py
View file

@ -288,7 +288,7 @@ def allipsetup(iplist):
conffile.close() conffile.close()
for ip, vlan in cache.items(): for ip, vlan in cache.items():
bashexec('ipadd-{}-{}'.format(ip, vlan), assignip(ip, ip_mask, vlan)) bashexec('ipadd-{}-{}-{}'.format(ip, ip_mask, vlan), assignip(ip, ip_mask, vlan))
def assignip(ip, ip_mask, vlan): def assignip(ip, ip_mask, vlan):
data = """ data = """
@ -314,8 +314,11 @@ if __name__ == "__main__":
python3 frankenrouter.py init --- setup the default firewall python3 frankenrouter.py init --- setup the default firewall
python3 frankenrouter.py allipsetup --- read the contents of /root/pubip.cache and setup all assigments. for startup. python3 frankenrouter.py allipsetup --- read the contents of /root/pubip.cache and setup all assigments. for startup.
python3 ipadd VLAN IP --- add IP to VLAN python3 frankenrouter.py ipadd IP MASK VLAN --- add IP to VLAN
python3 ipdel VLAN IP --- del IP from VLAN example: ipadd 87.120.110.120 24 142
python3 frankenrouter,py ipdel IP VLAN --- del IP from VLAN
example: ipdel 87.120.110.120 142
""" """
try: try:
if sys.argv[1] == 'init': if sys.argv[1] == 'init':
@ -326,7 +329,7 @@ python3 ipdel VLAN IP --- del IP from VLAN
allipsetup('/root/pubip.cache') allipsetup('/root/pubip.cache')
if sys.argv[1] == 'ipadd': if sys.argv[1] == 'ipadd':
bashexec('ipadd-{}-{}'.format(sys.argv[2], sys.argv[3]), assignip(sys.argv[2], sys.argv[3])) bashexec('ipadd-{}-{}-{}'.format(sys.argv[2], sys.argv[3], sys.argv[4]), assignip(sys.argv[2], sys.argv[3], sys.argv[4]))
if sys.argv[1] == 'ipdel': if sys.argv[1] == 'ipdel':
bashexec('ipdel-{}-{}'.format(sys.argv[2], sys.argv[3]), removeip(sys.argv[2], sys.argv[3])) bashexec('ipdel-{}-{}'.format(sys.argv[2], sys.argv[3]), removeip(sys.argv[2], sys.argv[3]))

1
updateipcache.py
View file

@ -31,6 +31,7 @@ except:
if result['status'] == 'ok': if result['status'] == 'ok':
del result['status'] del result['status']
wr = open('/root/pubip.cache', 'w') wr = open('/root/pubip.cache', 'w')
#TODO: Sort cache and compare.
wr.write(json.dumps(result)) wr.write(json.dumps(result))
wr.close() wr.close()
print('public ip cache updated') print('public ip cache updated')