Commit f84a749a authored by Ximin Luo's avatar Ximin Luo
Browse files

- fix websocket-server program name, somehow omitted from last commit

parent f9c3c67c

obfs-flash-server.go

+1 −1
Original line number Original line Diff line number Diff line
@@ -444,7 +444,7 @@ func getConfiguration() (conf *Configuration) { 
	conf.Aliases = make(map[string]string)

	conf.Aliases = make(map[string]string)

	conf.Options = make(map[string]pt.Args)

	conf.Options = make(map[string]pt.Args)

	conf.Transports["obfs3"] = []string{"obfsproxy", "managed"}

	conf.Transports["obfs3"] = []string{"obfsproxy", "managed"}

	conf.Transports["websocket"] = []string{"websocket-server"}

	conf.Transports["websocket"] = []string{"pt-websocket-server"}

	// conf.Options["obfs3"] = make(pt.Args)

	// conf.Options["obfs3"] = make(pt.Args)

	// conf.Options["obfs3"]["secret"] = []string{"foo"}

	// conf.Options["obfs3"]["secret"] = []string{"foo"}

	conf.Aliases["obfs3_websocket"] = "obfs3|websocket"

	conf.Aliases["obfs3_websocket"] = "obfs3|websocket"