panicweb: tweaks

maruel · maruel · commit 8efd67eead64 · 2020-08-09T13:19:09.000-04:00
- Print the hostname when -allowremote is used
- Add an handler for / to help navigation
diff --git a/cmd/panicweb/main.go b/cmd/panicweb/main.go
@@ -20,6 +20,7 @@ import (
 	"net"
 	"net/http"
 	_ "net/http/pprof"
+	"os"
 	"runtime"
 	"strings"
 	"sync"
@@ -30,6 +31,15 @@ import (
 	"github.com/mattn/go-colorable"
 )
 
+var rootPage = []byte(`<!DOCTYPE html>
+<ul>
+	<li><a href="/panicparse">/panicparse</a></li>
+	<li><a href="/debug/pprof/goroutine?debug=2">/debug/pprof/goroutine?debug=2</a></li>
+	<li><a href="/url1">/url1</a></li>
+	<li><a href="/url2">/url2</a></li>
+</ul>
+`)
+
 func main() {
 	allowremote := flag.Bool("allowremote", false, "allows access from non-localhost; implies -wait")
 	sleep := flag.Bool("wait", false, "sleep instead of crashing")
@@ -91,10 +101,22 @@ func main() {
 	} else {
 		http.HandleFunc("/panicparse", webstack.SnapshotHandler)
 	}
+	http.HandleFunc("/", func(w http.ResponseWriter, req *http.Request) {
+		w.Header().Set("Content-Type", "text/html; charset=utf-8")
+		_, _ = w.Write(rootPage)
+	})
 	go http.Serve(ln, http.DefaultServeMux)
 
 	// Start many clients.
-	url := "http://" + ln.Addr().String() + "/"
+	a := ln.Addr()
+	url := fmt.Sprintf("http://%s/", a)
+	if *allowremote {
+		if h, err := os.Hostname(); err == nil {
+			if t, ok := a.(*net.TCPAddr); ok {
+				url = fmt.Sprintf("http://%s:%d/", h, t.Port)
+			}
+		}
+	}
 	for i := 0; i < 10; i++ {
 		internal.GetAsync(url + "url1")
 	}
diff --git a/stack/context_test.go b/stack/context_test.go
@@ -2205,7 +2205,7 @@ func identifyPanicwebSignature(t *testing.T, b *Bucket, pwebDir string) panicweb
 			rest := []Call{
 				newCallLocal("main.sysHang", Args{}, pathJoin(pwebDir, mainOS), 12),
 				newCallLocal(
-					"main.main.func2",
+					"main.main.func3",
 					Args{Values: []Arg{{Value: 0xc000140720, Name: "#135", IsPtr: true}}},
 					pathJoin(pwebDir, "main.go"),
 					65),
