Browse Source

Use names for struct initializtion

Kyle Conroy 12 years ago
parent
commit
2b355b2f8d
3 changed files with 5 additions and 5 deletions
  1. 1 1
      Makefile
  2. 3 3
      src/ngrok/server/main.go
  3. 1 1
      src/ngrok/server/tunnel.go

+ 1 - 1
Makefile

@@ -34,7 +34,7 @@ bindata:
 	./bin/go-bindata -b release -i assets/jquery-1.9.1.min.js -o src/ngrok/client/views/web/static/jquery-1.9.1.js.go -m -p static -f JqueryJs
 	./bin/go-bindata -b release -i assets/vkbeautify.js -o src/ngrok/client/views/web/static/vkbeautify.js.go -m -p static -f VkBeautifyJs
 
-all: client server
+all: fmt client server
 
 clean:
 	go clean ngrok/...

+ 3 - 3
src/ngrok/server/main.go

@@ -116,9 +116,9 @@ func Main() {
 
 	tunnels = NewTunnelManager(opts.domain)
 
-	go proxyListener(&net.TCPAddr{net.ParseIP("0.0.0.0"), opts.proxyPort}, opts.domain)
-	go controlListener(&net.TCPAddr{net.ParseIP("0.0.0.0"), opts.tunnelPort}, opts.domain)
-	go httpListener(&net.TCPAddr{net.ParseIP("0.0.0.0"), opts.publicPort})
+	go proxyListener(&net.TCPAddr{IP: net.ParseIP("0.0.0.0"), Port: opts.proxyPort}, opts.domain)
+	go controlListener(&net.TCPAddr{IP: net.ParseIP("0.0.0.0"), Port: opts.tunnelPort}, opts.domain)
+	go httpListener(&net.TCPAddr{IP: net.ParseIP("0.0.0.0"), Port: opts.publicPort})
 
 	// wait forever
 	done := make(chan int)

+ 1 - 1
src/ngrok/server/tunnel.go

@@ -44,7 +44,7 @@ func newTunnel(m *msg.RegMsg, ctl *Control) (t *Tunnel) {
 	switch t.regMsg.Protocol {
 	case "tcp":
 		var err error
-		t.listener, err = net.ListenTCP("tcp", &net.TCPAddr{net.ParseIP("0.0.0.0"), 0})
+		t.listener, err = net.ListenTCP("tcp", &net.TCPAddr{IP: net.ParseIP("0.0.0.0"), Port: 0})
 
 		if err != nil {
 			panic(err)