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

This commit is contained in:
evilsocket 2018-04-30 16:21:57 +02:00
parent 9f390a722f
commit 480f0daa8d
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
4 changed files with 4 additions and 4 deletions

View file

@ -14,7 +14,7 @@ import (
) )
var ( var (
sysCtlParser = regexp.MustCompile("([^:]+):\\s*(.+)") sysCtlParser = regexp.MustCompile(`([^:]+):\s*(.+)`)
pfFilePath = fmt.Sprintf("/tmp/bcap_pf_%d.conf", os.Getpid()) pfFilePath = fmt.Sprintf("/tmp/bcap_pf_%d.conf", os.Getpid())
) )

View file

@ -65,7 +65,7 @@ func (f WindowsFirewall) generateRule(r *Redirection, enabled bool) []string {
func (f *WindowsFirewall) AllowPort(port int, address string, proto string, allow bool) error { func (f *WindowsFirewall) AllowPort(port int, address string, proto string, allow bool) error {
ruleName := fmt.Sprintf("bettercap-rule-%s-%s-%d", address, proto, port) ruleName := fmt.Sprintf("bettercap-rule-%s-%s-%d", address, proto, port)
nameField := fmt.Sprintf("name=\"%s\"", ruleName) nameField := fmt.Sprintf(`name="%s"`, ruleName)
protoField := fmt.Sprintf("protocol=%s", proto) protoField := fmt.Sprintf("protocol=%s", proto)
// ipField := fmt.Sprintf("lolcalip=%s", address) // ipField := fmt.Sprintf("lolcalip=%s", address)
portField := fmt.Sprintf("localport=%d", port) portField := fmt.Sprintf("localport=%d", port)

View file

@ -2,7 +2,7 @@ package network
import "regexp" import "regexp"
var ArpTableParser = regexp.MustCompile("^[^\\d\\.]+([\\d\\.]+).+\\s+([a-f0-9:]{11,17})\\s+on\\s+([^\\s]+)\\s+.+$") var ArpTableParser = regexp.MustCompile(`^[^\d\.]+([\d\.]+).+\s+([a-f0-9:]{11,17})\s+on\s+([^\s]+)\s+.+$`)
var ArpTableTokens = 4 var ArpTableTokens = 4
var ArpTableTokenIndex = []int{1, 2, 3} var ArpTableTokenIndex = []int{1, 2, 3}
var ArpCmd = "arp" var ArpCmd = "arp"

View file

@ -2,7 +2,7 @@ package network
import "regexp" import "regexp"
var ArpTableParser = regexp.MustCompile("^[^\\d\\.]+([\\d\\.]+).+\\s+([a-f0-9\\-]{11,17})\\s+.+$") var ArpTableParser = regexp.MustCompile(`^[^\d\.]+([\d\.]+).+\s+([a-f0-9\-]{11,17})\s+.+$`)
var ArpTableTokens = 3 var ArpTableTokens = 3
var ArpTableTokenIndex = []int{1, 2, -1} var ArpTableTokenIndex = []int{1, 2, -1}
var ArpCmd = "arp" var ArpCmd = "arp"