diff --git a/modules/dhcp6_spoof.go b/modules/dhcp6_spoof.go index 5b81207f..1f335c95 100644 --- a/modules/dhcp6_spoof.go +++ b/modules/dhcp6_spoof.go @@ -76,6 +76,31 @@ func (s DHCP6Spoofer) Author() string { return "Simone Margaritelli " } +func (s *DHCP6Spoofer) encodeDomains() { + totLen := 0 + for _, d := range s.Domains { + totLen += len(d) + } + + if totLen > 0 { + s.RawDomains = make([]byte, totLen+1*len(s.Domains)) + i := 0 + for _, domain := range s.Domains { + lenDomain := len(domain) + plusOne := lenDomain + 1 + + s.RawDomains[i] = byte(lenDomain & 0xff) + k := 0 + for j := i + 1; j < plusOne; j++ { + s.RawDomains[j] = domain[k] + k++ + } + + i += plusOne + } + } +} + func (s *DHCP6Spoofer) Configure() error { var err error var addr string @@ -89,38 +114,10 @@ func (s *DHCP6Spoofer) Configure() error { return err } - s.Domains = make([]string, 0) - if err, domains := s.StringParam("dhcp6.spoof.domains"); err != nil { + if err, s.Domains = s.ListParam("dhcp6.spoof.domains"); err != nil { return err - } else { - parts := strings.Split(domains, ",") - totLen := 0 - for _, part := range parts { - part = strings.Trim(part, "\t\n\r ") - if part != "" { - s.Domains = append(s.Domains, part) - totLen += len(part) - } - } - - if totLen > 0 { - s.RawDomains = make([]byte, totLen+1*len(s.Domains)) - i := 0 - for _, domain := range s.Domains { - lenDomain := len(domain) - plusOne := lenDomain + 1 - - s.RawDomains[i] = byte(lenDomain & 0xff) - k := 0 - for j := i + 1; j < plusOne; j++ { - s.RawDomains[j] = domain[k] - k++ - } - - i += plusOne - } - } } + s.encodeDomains() if err, addr = s.StringParam("dhcp6.spoof.address"); err != nil { return err diff --git a/modules/dns_spoof.go b/modules/dns_spoof.go index e7a56a65..f5b144ea 100644 --- a/modules/dns_spoof.go +++ b/modules/dns_spoof.go @@ -79,17 +79,8 @@ func (s *DNSSpoofer) Configure() error { return err } - s.Domains = make([]string, 0) - if err, domains := s.StringParam("dns.spoof.domains"); err != nil { + if err, s.Domains = s.ListParam("dns.spoof.domains"); err != nil { return err - } else { - parts := strings.Split(domains, ",") - for _, part := range parts { - part = strings.Trim(part, "\t\n\r ") - if part != "" { - s.Domains = append(s.Domains, part) - } - } } if err, addr = s.StringParam("dns.spoof.address"); err != nil { diff --git a/session/module.go b/session/module.go index e05a7e0a..871b9973 100644 --- a/session/module.go +++ b/session/module.go @@ -2,6 +2,7 @@ package session import ( "fmt" + "strings" "sync" ) @@ -53,6 +54,23 @@ func (m *SessionModule) Param(name string) *ModuleParam { return m.params[name] } +func (m SessionModule) ListParam(name string) (err error, values []string) { + values = make([]string, 0) + list := "" + if err, list = m.StringParam(name); err != nil { + return + } else { + parts := strings.Split(list, ",") + for _, part := range parts { + part = strings.Trim(part, "\t\n\r ") + if part != "" { + values = append(values, part) + } + } + } + return +} + func (m SessionModule) StringParam(name string) (error, string) { if p, found := m.params[name]; found == true { if err, v := p.Get(m.Session); err != nil {