proxy multi listen

proxy/main.go

@@ -62,7 +62,7 @@ func accessHandler(next http.Handler) http.Handler {
 
 type settingType struct {
 	birdSocket  string
-	listen      string
+	listen      []string
 	allowedNets []*net.IPNet
 	tr_bin      string
 	tr_flags    []string
@@ -76,32 +76,40 @@ func main() {
 	parseSettings()
 	tracerouteAutodetect()
 
-	fmt.Printf("Listening on %s...\n", setting.listen)
+	mux := http.NewServeMux()
+
+	// Prepare HTTP server
+	mux.HandleFunc("/", invalidHandler)
+	mux.HandleFunc("/bird", birdHandler)
+	mux.HandleFunc("/bird6", birdHandler)
+	mux.HandleFunc("/traceroute", tracerouteHandler)
+	mux.HandleFunc("/traceroute6", tracerouteHandler)
+
+	for _, listenAddr := range setting.listen {
+		go func(addr string) {
+			fmt.Printf("Listening on %s...\n", addr)
 
 			var l net.Listener
 			var err error
 
-	if strings.HasPrefix(setting.listen, "/") {
+			if strings.HasPrefix(addr, "/") {
 				// Delete existing socket file, ignore errors (will fail later anyway)
-		os.Remove(setting.listen)
-		l, err = net.Listen("unix", setting.listen)
+				os.Remove(addr)
+				l, err = net.Listen("unix", addr)
 			} else {
-		listenAddr := setting.listen
-		if !strings.Contains(listenAddr, ":") {
-			listenAddr = ":" + listenAddr
+				if !strings.Contains(addr, ":") {
+					addr = ":" + addr
 				}
-		l, err = net.Listen("tcp", listenAddr)
+				l, err = net.Listen("tcp", addr)
 			}
 
 			if err != nil {
 				panic(err)
 			}
 
-	// Start HTTP server
-	http.HandleFunc("/", invalidHandler)
-	http.HandleFunc("/bird", birdHandler)
-	http.HandleFunc("/bird6", birdHandler)
-	http.HandleFunc("/traceroute", tracerouteHandler)
-	http.HandleFunc("/traceroute6", tracerouteHandler)
-	http.Serve(l, handlers.LoggingHandler(os.Stdout, accessHandler(http.DefaultServeMux)))
+			http.Serve(l, handlers.LoggingHandler(os.Stdout, accessHandler(mux)))
+		}(listenAddr)
+	}
+
+	select {}
 }

proxy/settings.go

@@ -12,7 +12,7 @@ import (
 
 type viperSettingType struct {
 	BirdSocket      string   `mapstructure:"bird_socket"`
-	Listen          string `mapstructure:"listen"`
+	Listen          []string `mapstructure:"listen"`
 	AllowedNets     string   `mapstructure:"allowed_ips"`
 	TracerouteBin   string   `mapstructure:"traceroute_bin"`
 	TracerouteFlags string   `mapstructure:"traceroute_flags"`
@@ -37,7 +37,7 @@ func parseSettings() {
 	pflag.String("bird", "/var/run/bird/bird.ctl", "socket file for bird, set either in parameter or environment variable BIRD_SOCKET")
 	viper.BindPFlag("bird_socket", pflag.Lookup("bird"))
 
-	pflag.String("listen", "8000", "listen address, set either in parameter or environment variable BIRDLG_PROXY_PORT")
+	pflag.StringSlice("listen", []string{"8000"}, "listen address, set either in parameter or environment variable BIRDLG_PROXY_PORT")
 	viper.BindPFlag("listen", pflag.Lookup("listen"))
 
 	pflag.String("allowed", "", "IPs or networks allowed to access this proxy, separated by commas. Don't set to allow all IPs.")