new: wifi.min.rssi, wifi.ap.ttl and wifi.sta.ttl changes are now applied in realtime

This commit is contained in:
evilsocket 2019-09-15 15:10:56 +02:00
commit 12a11ef19d
No known key found for this signature in database
GPG key ID: 82E42E7F3B34C97E
5 changed files with 47 additions and 9 deletions

View file

@ -87,11 +87,12 @@ func (env *Environment) WithCallback(name, value string, cb EnvironmentChangedCa
func (env *Environment) Set(name, value string) string {
env.Lock()
defer env.Unlock()
old := env.Data[name]
env.Data[name] = value
env.Unlock()
if cb, hasCallback := env.cbs[name]; hasCallback {
cb(value)
}

View file

@ -233,6 +233,12 @@ func (m *SessionModule) AddParam(p *ModuleParam) *ModuleParam {
return p
}
func (m *SessionModule) AddObservableParam(p *ModuleParam, cb EnvironmentChangedCallback) *ModuleParam {
m.params[p.Name] = p
p.RegisterObserver(m.Session, cb)
return p
}
func (m *SessionModule) Running() bool {
m.StatusLock.RLock()
defer m.StatusLock.RUnlock()

View file

@ -62,7 +62,7 @@ func NewDecimalParameter(name string, def_value string, desc string) *ModulePara
return NewModuleParameter(name, def_value, FLOAT, "^[\\d]+(\\.\\d+)?$", desc)
}
func (p ModuleParam) Validate(value string) (error, interface{}) {
func (p ModuleParam) validate(value string) (error, interface{}) {
if p.Validator != nil {
if !p.Validator.MatchString(value) {
return fmt.Errorf("Parameter %s not valid: '%s' does not match rule '%s'.", tui.Bold(p.Name), value, p.Validator.String()), nil
@ -125,7 +125,7 @@ func (p ModuleParam) getUnlocked(s *Session) string {
func (p ModuleParam) Get(s *Session) (error, interface{}) {
_, v := s.Env.Get(p.Name)
v = p.parse(s, v)
return p.Validate(v)
return p.validate(v)
}
func (p ModuleParam) Help(padding int) string {
@ -138,6 +138,10 @@ func (p ModuleParam) Register(s *Session) {
s.Env.Set(p.Name, p.Value)
}
func (p ModuleParam) RegisterObserver(s *Session, cb EnvironmentChangedCallback) {
s.Env.WithCallback(p.Name, p.Value, cb)
}
type JSONModuleParam struct {
Name string `json:"name"`
Type ParamType `json:"type"`