aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cmd/console/main.go3
-rw-r--r--cmd/geth/main.go4
-rw-r--r--cmd/utils/flags.go21
-rw-r--r--common/path.go3
4 files changed, 26 insertions, 5 deletions
diff --git a/cmd/console/main.go b/cmd/console/main.go
index 9020a12fe..e8dd412ba 100644
--- a/cmd/console/main.go
+++ b/cmd/console/main.go
@@ -52,7 +52,6 @@ func init() {
app.Action = run
app.Flags = []cli.Flag{
- utils.IPCDisabledFlag,
utils.IPCPathFlag,
utils.VerbosityFlag,
utils.JSpathFlag,
@@ -93,7 +92,7 @@ func main() {
func run(ctx *cli.Context) {
jspath := ctx.GlobalString(utils.JSpathFlag.Name)
- ipcpath := ctx.GlobalString(utils.IPCPathFlag.Name)
+ ipcpath := utils.IpcSocketPath(ctx)
repl := newJSRE(jspath, ipcpath)
repl.welcome(ipcpath)
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 8e55b310c..0f2438cfd 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -308,7 +308,7 @@ func console(ctx *cli.Context) {
ethereum,
ctx.String(utils.JSpathFlag.Name),
ctx.GlobalString(utils.RPCCORSDomainFlag.Name),
- ctx.GlobalString(utils.IPCPathFlag.Name),
+ utils.IpcSocketPath(ctx),
true,
nil,
)
@@ -330,7 +330,7 @@ func execJSFiles(ctx *cli.Context) {
ethereum,
ctx.String(utils.JSpathFlag.Name),
ctx.GlobalString(utils.RPCCORSDomainFlag.Name),
- ctx.GlobalString(utils.IPCPathFlag.Name),
+ utils.IpcSocketPath(ctx),
false,
nil,
)
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 4c3690d49..ec29598fb 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -385,9 +385,28 @@ func MakeAccountManager(ctx *cli.Context) *accounts.Manager {
return accounts.NewManager(ks)
}
+func IpcSocketPath(ctx *cli.Context) (ipcpath string) {
+ if common.IsWindows() {
+ ipcpath = common.DefaultIpcPath()
+ if ipcpath != ctx.GlobalString(IPCPathFlag.Name) {
+ ipcpath = ctx.GlobalString(IPCPathFlag.Name)
+ }
+ } else {
+ ipcpath = common.DefaultIpcPath()
+ if ctx.GlobalString(IPCPathFlag.Name) != common.DefaultIpcPath() {
+ ipcpath = ctx.GlobalString(IPCPathFlag.Name)
+ } else if ctx.GlobalString(DataDirFlag.Name) != "" &&
+ ctx.GlobalString(DataDirFlag.Name) != common.DefaultDataDir() {
+ ipcpath = filepath.Join(ctx.GlobalString(DataDirFlag.Name), "geth.ipc")
+ }
+ }
+
+ return
+}
+
func StartIPC(eth *eth.Ethereum, ctx *cli.Context) error {
config := comms.IpcConfig{
- Endpoint: ctx.GlobalString(IPCPathFlag.Name),
+ Endpoint: IpcSocketPath(ctx),
}
xeth := xeth.New(eth, nil)
diff --git a/common/path.go b/common/path.go
index 63a23abcd..6e3259656 100644
--- a/common/path.go
+++ b/common/path.go
@@ -95,6 +95,9 @@ func DefaultDataDir() string {
}
func DefaultIpcPath() string {
+ if runtime.GOOS == "windows" {
+ return `\\.\pipe\geth.ipc`
+ }
return filepath.Join(DefaultDataDir(), "geth.ipc")
}