misc: small fix or general refactoring i did not bother commenting

This commit is contained in:
evilsocket 2018-02-23 05:34:43 +01:00
commit 0f8be49beb

View file

@ -30,7 +30,6 @@ type DHCP6Spoofer struct {
DUIDRaw []byte DUIDRaw []byte
Domains []string Domains []string
RawDomains []byte RawDomains []byte
Address net.IP
} }
func NewDHCP6Spoofer(s *session.Session) *DHCP6Spoofer { func NewDHCP6Spoofer(s *session.Session) *DHCP6Spoofer {
@ -44,11 +43,6 @@ func NewDHCP6Spoofer(s *session.Session) *DHCP6Spoofer {
``, ``,
"Comma separated values of domain names to spoof.")) "Comma separated values of domain names to spoof."))
spoof.AddParam(session.NewStringParameter("dhcp6.spoof.address",
session.ParamIfaceAddress,
session.IPv4Validator,
"IP address to map the domains to."))
spoof.AddHandler(session.NewModuleHandler("dhcp6.spoof on", "", spoof.AddHandler(session.NewModuleHandler("dhcp6.spoof on", "",
"Start the DHCPv6 spoofer in the background.", "Start the DHCPv6 spoofer in the background.",
func(args []string) error { func(args []string) error {
@ -78,7 +72,6 @@ func (s DHCP6Spoofer) Author() string {
func (s *DHCP6Spoofer) Configure() error { func (s *DHCP6Spoofer) Configure() error {
var err error var err error
var addr string
if s.Handle, err = pcap.OpenLive(s.Session.Interface.Name(), 65536, true, pcap.BlockForever); err != nil { if s.Handle, err = pcap.OpenLive(s.Session.Interface.Name(), 65536, true, pcap.BlockForever); err != nil {
return err return err
@ -95,12 +88,6 @@ func (s *DHCP6Spoofer) Configure() error {
s.RawDomains = packets.DHCP6EncodeList(s.Domains) s.RawDomains = packets.DHCP6EncodeList(s.Domains)
if err, addr = s.StringParam("dhcp6.spoof.address"); err != nil {
return err
}
s.Address = net.ParseIP(addr)
if s.DUID, err = dhcp6opts.NewDUIDLLT(1, time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC), s.Session.Interface.HW); err != nil { if s.DUID, err = dhcp6opts.NewDUIDLLT(1, time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC), s.Session.Interface.HW); err != nil {
return err return err
} else if s.DUIDRaw, err = s.DUID.MarshalBinary(); err != nil { } else if s.DUIDRaw, err = s.DUID.MarshalBinary(); err != nil {