github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-16 10:03:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

completed lint driven refactoring

Browse source
This commit is contained in:
evilsocket 2018-04-26 12:41:18 +02:00
parent e383e4d9b1
commit 557d7dbe17
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
8 changed files with 27 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

17
session/module_param.go
View file

@ -58,7 +58,7 @@ func NewIntParameter(name string, def_value string, desc string) *ModuleParam {
func (p ModuleParam) Validate(value string) (error, interface{}) {
if p.Validator != nil {
if p.Validator.MatchString(value) == false {
if !p.Validator.MatchString(value) {
return fmt.Errorf("Parameter %s not valid: '%s' does not match rule '%s'.", core.Bold(p.Name), value, p.Validator.String()), nil
}
}
@ -88,15 +88,7 @@ const ParamSubnet = "<entire subnet>"
const ParamRandomMAC = "<random mac>"
func (p ModuleParam) Get(s *Session) (error, interface{}) {
var v string
var found bool
var obj interface{}
var err error
if found, v = s.Env.Get(p.Name); found == false {
v = ""
}
_, v := s.Env.Get(p.Name)
if v == ParamIfaceName {
v = s.Interface.Name()
} else if v == ParamIfaceAddress {
@ -108,10 +100,7 @@ func (p ModuleParam) Get(s *Session) (error, interface{}) {
rand.Read(hw)
v = net.HardwareAddr(hw).String()
}
err, obj = p.Validate(v)
return err, obj
return p.Validate(v)
}
func (p ModuleParam) Dump(padding int) string {