Commit 195126b9 authored Oct 03, 2018 by Boris Mühmer

servername will be supplied from caller

parent 4e7ce87c

cmd/perplex-server/main.go

+3 −2

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@ func main() {
		defer log.Printf("Terminating %s...", server.Name())

		// get rolling...
		//channel.TCPServer(server.Handle)
		channel.TLSServer(server.Handle)
		servername := "localhost"
		//channel.TCPServer(servername, server.Handle)
		channel.TLSServer(servername, server.Handle)
		}

internal/app/server/channel/tcp.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -8,8 +8,8 @@ import (
		)

		// TCPServer prepares an unsecured listener.
		func TCPServer(handler func(net.Conn)) {
		ln, err := net.Listen("tcp", perplex.ServernameTCP(""))
		func TCPServer(servername string, handler func(net.Conn)) {
		ln, err := net.Listen("tcp", perplex.ServernameTCP(servername))
		if err != nil {
		log.Fatal(err)
		}

internal/app/server/channel/tls.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ import (
		)

		// TLSServer prepares a TLS secured listener.
		func TLSServer(handler func(net.Conn)) {
		func TLSServer(servername string, handler func(net.Conn)) {
		cert, err := tls.LoadX509KeyPair("../../scripts/certs/server.pem", "../../scripts/certs/server.key")
		if err != nil {
		log.Fatal(err)
		@@ -20,7 +20,7 @@ func TLSServer(handler func(net.Conn)) {
		config.Rand = rand.Reader
		//config.InsecureSkipVerify = true

		ln, err := tls.Listen("tcp", perplex.ServernameTLS(""), &config)
		ln, err := tls.Listen("tcp", perplex.ServernameTLS(servername), &config)
		if err != nil {
		log.Fatal(err)
		}