github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-21 05:53:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
evilsocket 2019-02-13 15:24:28 +01:00
commit 4cfcaf1c59
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
2 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
network/net.go
View file

@ -271,3 +271,18 @@ func ActivateInterface(name string) error {
}
return nil
}
func GatewayProvidedByUser(iface *Endpoint, gateway string) (*Endpoint, error) {
Debug("GatewayProvidedByUser(%s) [cmd=%v opts=%v parser=%v]", gateway, IPv4RouteCmd, IPv4RouteCmdOpts, IPv4RouteParser)
if IPv4Validator.MatchString(gateway) {
Debug("valid gateway ip %s", gateway)
// we have the address, now we need its mac
if mac, err := ArpLookup(iface.Name(), gateway, false); err != nil {
return nil, err
} else {
Debug("gateway is %s[%s]", gateway, mac)
return NewEndpoint(gateway, mac), nil
}
}
return nil, fmt.Errorf("Provided gateway %s not a valid IPv4 address! Revert to find default gateway.", gateway)
}

16
network/net_gateway.go
View file

@ -3,7 +3,6 @@
package network
import (
"fmt"
"strings"
"github.com/bettercap/bettercap/core"
@ -49,18 +48,3 @@ func FindGateway(iface *Endpoint) (*Endpoint, error) {
Debug("FindGateway(%s): nothing found :/", iface.Name())
return nil, ErrNoGateway
}
func GatewayProvidedByUser(iface *Endpoint, gateway string) (*Endpoint, error) {
Debug("GatewayProvidedByUser(%s) [cmd=%v opts=%v parser=%v]", gateway, IPv4RouteCmd, IPv4RouteCmdOpts, IPv4RouteParser)
if IPv4Validator.MatchString(gateway) {
Debug("valid gateway ip %s", gateway)
// we have the address, now we need its mac
if mac, err := ArpLookup(iface.Name(), gateway, false); err != nil {
return nil, err
} else {
Debug("gateway is %s[%s]", gateway, mac)
return NewEndpoint(gateway, mac), nil
}
}
return nil, fmt.Errorf("Provided gateway %s not a valid IPv4 address! Revert to find default gateway.", gateway)
}