Fix default path for sciond socket in SIG
@@ -37,7 +37,7 @@ const (
var (
CtrlPort = flag.Int("ctrlport", DefaultCtrlPort, "control data port (e.g., keepalives)")
EncapPort = flag.Int("encapport", DefaultEncapPort, "encapsulation data port")
- sciondPath = flag.String("sciond", "", "SCIOND socket path")
+ sciondPath = flag.String("sciond", sciond.GetDefaultSCIONDPath(nil), "SCIOND socket path")
dispatcherPath = flag.String("dispatcher", "/run/shm/dispatcher/default.sock",
"SCION Dispatcher path")
SigTun = flag.String("tun", "sig", "Name of TUN device to create")
@@ -67,9 +67,7 @@ func Init(ia addr.IA, ip net.IP) error {
return err
}
MgmtAddr = mgmt.NewAddr(Host, uint16(*CtrlPort), uint16(*EncapPort))
- if *sciondPath == "" {
- *sciondPath = sciond.GetDefaultSCIONDPath(&ia)
- }
+
// Initialize SCION local networking module
err = snet.Init(ia, *sciondPath, *dispatcherPath)
if err != nil {
