Răsfoiți Sursa

Fix protocol name

Rod Hynes 5 ani în urmă
părinte
comite
53fb560319
1 a modificat fișierele cu 5 adăugiri și 5 ștergeri
  1. 5 5
      psiphon/common/protocol/protocol.go

+ 5 - 5
psiphon/common/protocol/protocol.go

@@ -41,7 +41,7 @@ const (
 	TUNNEL_PROTOCOL_FRONTED_MEEK_QUIC_OBFUSCATED_SSH = "FRONTED-MEEK-QUIC-OSSH"
 	TUNNEL_PROTOCOL_FRONTED_MEEK_QUIC_OBFUSCATED_SSH = "FRONTED-MEEK-QUIC-OSSH"
 	TUNNEL_PROTOCOL_MARIONETTE_OBFUSCATED_SSH        = "MARIONETTE-OSSH"
 	TUNNEL_PROTOCOL_MARIONETTE_OBFUSCATED_SSH        = "MARIONETTE-OSSH"
 	TUNNEL_PROTOCOL_TAPDANCE_OBFUSCATED_SSH          = "TAPDANCE-OSSH"
 	TUNNEL_PROTOCOL_TAPDANCE_OBFUSCATED_SSH          = "TAPDANCE-OSSH"
-	TUNNEL_PROTOCOL_CONJOUR_OBFUSCATED_SSH           = "CONJOUR-OSSH"
+	TUNNEL_PROTOCOL_CONJURE_OBFUSCATED_SSH           = "CONJURE-OSSH"
 
 
 	TUNNEL_PROTOCOLS_ALL = "All"
 	TUNNEL_PROTOCOLS_ALL = "All"
 
 
@@ -113,14 +113,14 @@ var SupportedTunnelProtocols = TunnelProtocols{
 	TUNNEL_PROTOCOL_FRONTED_MEEK_QUIC_OBFUSCATED_SSH,
 	TUNNEL_PROTOCOL_FRONTED_MEEK_QUIC_OBFUSCATED_SSH,
 	TUNNEL_PROTOCOL_MARIONETTE_OBFUSCATED_SSH,
 	TUNNEL_PROTOCOL_MARIONETTE_OBFUSCATED_SSH,
 	TUNNEL_PROTOCOL_TAPDANCE_OBFUSCATED_SSH,
 	TUNNEL_PROTOCOL_TAPDANCE_OBFUSCATED_SSH,
-	TUNNEL_PROTOCOL_CONJOUR_OBFUSCATED_SSH,
+	TUNNEL_PROTOCOL_CONJURE_OBFUSCATED_SSH,
 }
 }
 
 
 var DefaultDisabledTunnelProtocols = TunnelProtocols{
 var DefaultDisabledTunnelProtocols = TunnelProtocols{
 	TUNNEL_PROTOCOL_FRONTED_MEEK_QUIC_OBFUSCATED_SSH,
 	TUNNEL_PROTOCOL_FRONTED_MEEK_QUIC_OBFUSCATED_SSH,
 	TUNNEL_PROTOCOL_MARIONETTE_OBFUSCATED_SSH,
 	TUNNEL_PROTOCOL_MARIONETTE_OBFUSCATED_SSH,
 	TUNNEL_PROTOCOL_TAPDANCE_OBFUSCATED_SSH,
 	TUNNEL_PROTOCOL_TAPDANCE_OBFUSCATED_SSH,
-	TUNNEL_PROTOCOL_CONJOUR_OBFUSCATED_SSH,
+	TUNNEL_PROTOCOL_CONJURE_OBFUSCATED_SSH,
 }
 }
 
 
 var SupportedServerEntrySources = TunnelProtocols{
 var SupportedServerEntrySources = TunnelProtocols{
@@ -189,11 +189,11 @@ func TunnelProtocolUsesMarionette(protocol string) bool {
 
 
 func TunnelProtocolUsesTapdance(protocol string) bool {
 func TunnelProtocolUsesTapdance(protocol string) bool {
 	return protocol == TUNNEL_PROTOCOL_TAPDANCE_OBFUSCATED_SSH ||
 	return protocol == TUNNEL_PROTOCOL_TAPDANCE_OBFUSCATED_SSH ||
-		protocol == TUNNEL_PROTOCOL_CONJOUR_OBFUSCATED_SSH
+		protocol == TUNNEL_PROTOCOL_CONJURE_OBFUSCATED_SSH
 }
 }
 
 
 func TunnelProtocolUsesDarkDecoys(protocol string) bool {
 func TunnelProtocolUsesDarkDecoys(protocol string) bool {
-	return protocol == TUNNEL_PROTOCOL_CONJOUR_OBFUSCATED_SSH
+	return protocol == TUNNEL_PROTOCOL_CONJURE_OBFUSCATED_SSH
 }
 }
 
 
 func TunnelProtocolIsResourceIntensive(protocol string) bool {
 func TunnelProtocolIsResourceIntensive(protocol string) bool {