X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fcommon.go;h=98137c1c3bc4e5e91744c1c8fb22b87c12afb613;hb=f696080a3e32ba340cc4c5c70e39eb8e8857da89;hp=dc7fbe0a08f059ddd80f0baa4ad5a8727df60ac2;hpb=28ab186439be82e88c87a43b2484d5898aba19f0;p=govpn.git diff --git a/src/cypherpunks.ru/govpn/common.go b/src/cypherpunks.ru/govpn/common.go index dc7fbe0..98137c1 100644 --- a/src/cypherpunks.ru/govpn/common.go +++ b/src/cypherpunks.ru/govpn/common.go @@ -30,6 +30,9 @@ const ( EtherSize = 14 MTUMax = 9000 + EtherSize + 1 MTUDefault = 1500 + EtherSize + 1 + + ENV_IFACE = "GOVPN_IFACE" + ENV_REMOTE = "GOVPN_REMOTE" ) var ( @@ -40,14 +43,17 @@ var ( // You have to specify path to it and (inteface name as a rule) something // that will be the first argument when calling it. Function will return // it's output and possible error. -func ScriptCall(path, ifaceName string) ([]byte, error) { +func ScriptCall(path, ifaceName, remoteAddr string) ([]byte, error) { if path == "" { return nil, nil } if _, err := os.Stat(path); err != nil && os.IsNotExist(err) { return nil, err } - out, err := exec.Command(path, ifaceName).CombinedOutput() + cmd := exec.Command(path) + cmd.Env = append(cmd.Env, ENV_IFACE+"="+ifaceName) + cmd.Env = append(cmd.Env, ENV_REMOTE+"="+remoteAddr) + out, err := cmd.CombinedOutput() if err != nil { log.Println("Script error", path, err, string(out)) }