tidying up code paths and making detport selection a little better

examples/listener/listener.go

@@ -56,7 +56,7 @@ func main() {
 	log.Printf("Expected ID: %v", id)
 
 	cfg := &bulb.NewOnionConfig{
-		DiscardPK: true,
+		DiscardPK:  true,
 		PrivateKey: pk,
 	}
 	l, err := c.NewListener(cfg, 80)

listener.go

@@ -8,14 +8,15 @@
 package bulb
 
 import (
+	"crypto"
 	goodrand "crypto/rand"
+	"encoding/binary"
 	"fmt"
-		"net"
-	"strconv"
 	"golang.org/x/crypto/sha3"
-			"encoding/binary"
+	"log"
-			"crypto"
+	"net"
-	)
+	"strconv"
+)
 
 type onionAddr struct {
 	info *OnionInfo
@@ -86,6 +87,7 @@ func (c *Conn) RecoverListener(config *NewOnionConfig, onion string, vports ...u
 	if port < 1024 { // this is not uniformly random, but we don't need it to be
 		port += 1024
 	}
+	log.Printf("using local port: %d\n", port)
 	var loopbackAddr = "127.0.0.1:" + strconv.Itoa(port)
 
 	// Listen on the loopback interface.

status.go

@@ -9,8 +9,8 @@ package bulb
 
 import (
 	"fmt"
-	"strings"
 	"net/textproto"
+	"strings"
 )
 
 // The various control port StatusCode constants.

utils/utils.go

@@ -18,19 +18,19 @@ import (
 // SplitQuoted splits s by sep if it is found outside substring
 // quoted by quote.
 func SplitQuoted(s string, quote, sep rune) (splitted []string) {
-        quoteFlag := false
+	quoteFlag := false
 NewSubstring:
-        for i, c := range s {
+	for i, c := range s {
-                if c == quote {
+		if c == quote {
-                        quoteFlag = !quoteFlag
+			quoteFlag = !quoteFlag
-                }
+		}
-                if c == sep && !quoteFlag {
+		if c == sep && !quoteFlag {
-                        splitted = append(splitted, s[:i])
+			splitted = append(splitted, s[:i])
-                        s = s[i+1:]
+			s = s[i+1:]
-                        goto NewSubstring
+			goto NewSubstring
-                }
+		}
-        }
+	}
-        return append(splitted, s)
+	return append(splitted, s)
 }
 
 // ParseControlPortString parses a string representation of a control port