Allow setting DIAL to 0 to disable

master
Simon 2 years ago
parent 1797759d03
commit 763c240488

@ -64,7 +64,11 @@ class FD_API(ServiceBase):
def version(ctx, sessionid):
return(FD_API._version)
@rpc(Unicode,Unicode, _returns=Unicode())
@rpc()
def dummy(ctx):
pass
@rpc(Unicode,Unicode)
def reset(ctx,dmrid,key):
system = ctx.udc.validateKey(int(dmrid),key)
if system:
@ -72,7 +76,7 @@ class FD_API(ServiceBase):
else:
raise error.InvalidCredentialsError()
@rpc(UnsignedInteger32,Unicode,Unicode,_returns=Unicode())
@rpc(UnsignedInteger32,Unicode,Unicode)
def setoptions(ctx,dmrid,key,options):
system = ctx.udc.validateKey(int(dmrid),key)
if system:
@ -80,7 +84,7 @@ class FD_API(ServiceBase):
else:
raise error.InvalidCredentialsError()
@rpc(UnsignedInteger32,_returns=(Unicode()))
@rpc(UnsignedInteger32)
def killserver(ctx,killkey):
pass

@ -1036,7 +1036,7 @@ def options_config():
logger.debug('(OPTIONS) %s default reflector changed, updating',_system)
reset_default_reflector(CONFIG['SYSTEMS'][_system]['DEFAULT_REFLECTOR'],_tmout,_system)
make_default_reflector(int(_options['DEFAULT_REFLECTOR']),_tmout,_system)
elif int(_options['DEFAULT_REFLECTOR']) in prohibitedTGs:
elif int(_options['DEFAULT_REFLECTOR']) in prohibitedTGs and not bool(_options['DEFAULT_REFLECTOR']):
logger.debug('(OPTIONS) %s default reflector is prohibited, ignoring change',_system)
else:

Loading…
Cancel
Save

Powered by TurnKey Linux.