mirror of
				https://github.com/2dust/v2rayN.git
				synced 2025-11-04 14:32:53 +00:00 
			
		
		
		
	add xtls Flows
This commit is contained in:
		
							parent
							
								
									2b00490dd6
								
							
						
					
					
						commit
						f220825b80
					
				
					 8 changed files with 5 additions and 44 deletions
				
			
		
							
								
								
									
										6
									
								
								v2rayN/v2rayN/Forms/AddServer5Form.Designer.cs
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										6
									
								
								v2rayN/v2rayN/Forms/AddServer5Form.Designer.cs
									
									
									
										generated
									
									
									
								
							| 
						 | 
					@ -88,12 +88,6 @@
 | 
				
			||||||
            // cmbFlow
 | 
					            // cmbFlow
 | 
				
			||||||
            // 
 | 
					            // 
 | 
				
			||||||
            this.cmbFlow.FormattingEnabled = true;
 | 
					            this.cmbFlow.FormattingEnabled = true;
 | 
				
			||||||
            this.cmbFlow.Items.AddRange(new object[] {
 | 
					 | 
				
			||||||
            resources.GetString("cmbFlow.Items"),
 | 
					 | 
				
			||||||
            resources.GetString("cmbFlow.Items1"),
 | 
					 | 
				
			||||||
            resources.GetString("cmbFlow.Items2"),
 | 
					 | 
				
			||||||
            resources.GetString("cmbFlow.Items3"),
 | 
					 | 
				
			||||||
            resources.GetString("cmbFlow.Items4")});
 | 
					 | 
				
			||||||
            resources.ApplyResources(this.cmbFlow, "cmbFlow");
 | 
					            resources.ApplyResources(this.cmbFlow, "cmbFlow");
 | 
				
			||||||
            this.cmbFlow.Name = "cmbFlow";
 | 
					            this.cmbFlow.Name = "cmbFlow";
 | 
				
			||||||
            // 
 | 
					            // 
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -15,6 +15,7 @@ namespace v2rayN.Forms
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        private void AddServer5Form_Load(object sender, EventArgs e)
 | 
					        private void AddServer5Form_Load(object sender, EventArgs e)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
 | 
					            cmbFlow.Items.AddRange(Global.xtlsFlows.ToArray());
 | 
				
			||||||
            transportControl.AllowXtls = true;
 | 
					            transportControl.AllowXtls = true;
 | 
				
			||||||
            if (EditIndex >= 0)
 | 
					            if (EditIndex >= 0)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -143,21 +143,6 @@
 | 
				
			||||||
  <data name=">>btnClose.ZOrder" xml:space="preserve">
 | 
					  <data name=">>btnClose.ZOrder" xml:space="preserve">
 | 
				
			||||||
    <value>0</value>
 | 
					    <value>0</value>
 | 
				
			||||||
  </data>
 | 
					  </data>
 | 
				
			||||||
  <data name="cmbFlow.Items" xml:space="preserve">
 | 
					 | 
				
			||||||
    <value />
 | 
					 | 
				
			||||||
  </data>
 | 
					 | 
				
			||||||
  <data name="cmbFlow.Items1" xml:space="preserve">
 | 
					 | 
				
			||||||
    <value>xtls-rprx-origin</value>
 | 
					 | 
				
			||||||
  </data>
 | 
					 | 
				
			||||||
  <data name="cmbFlow.Items2" xml:space="preserve">
 | 
					 | 
				
			||||||
    <value>xtls-rprx-origin-udp443</value>
 | 
					 | 
				
			||||||
  </data>
 | 
					 | 
				
			||||||
  <data name="cmbFlow.Items3" xml:space="preserve">
 | 
					 | 
				
			||||||
    <value>xtls-rprx-direct</value>
 | 
					 | 
				
			||||||
  </data>
 | 
					 | 
				
			||||||
  <data name="cmbFlow.Items4" xml:space="preserve">
 | 
					 | 
				
			||||||
    <value>xtls-rprx-direct-udp443</value>
 | 
					 | 
				
			||||||
  </data>
 | 
					 | 
				
			||||||
  <data name="cmbFlow.Location" type="System.Drawing.Point, System.Drawing">
 | 
					  <data name="cmbFlow.Location" type="System.Drawing.Point, System.Drawing">
 | 
				
			||||||
    <value>127, 123</value>
 | 
					    <value>127, 123</value>
 | 
				
			||||||
  </data>
 | 
					  </data>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										6
									
								
								v2rayN/v2rayN/Forms/AddServer6Form.Designer.cs
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										6
									
								
								v2rayN/v2rayN/Forms/AddServer6Form.Designer.cs
									
									
									
										generated
									
									
									
								
							| 
						 | 
					@ -80,12 +80,6 @@
 | 
				
			||||||
            // cmbFlow
 | 
					            // cmbFlow
 | 
				
			||||||
            // 
 | 
					            // 
 | 
				
			||||||
            this.cmbFlow.FormattingEnabled = true;
 | 
					            this.cmbFlow.FormattingEnabled = true;
 | 
				
			||||||
            this.cmbFlow.Items.AddRange(new object[] {
 | 
					 | 
				
			||||||
            resources.GetString("cmbFlow.Items"),
 | 
					 | 
				
			||||||
            resources.GetString("cmbFlow.Items1"),
 | 
					 | 
				
			||||||
            resources.GetString("cmbFlow.Items2"),
 | 
					 | 
				
			||||||
            resources.GetString("cmbFlow.Items3"),
 | 
					 | 
				
			||||||
            resources.GetString("cmbFlow.Items4")});
 | 
					 | 
				
			||||||
            resources.ApplyResources(this.cmbFlow, "cmbFlow");
 | 
					            resources.ApplyResources(this.cmbFlow, "cmbFlow");
 | 
				
			||||||
            this.cmbFlow.Name = "cmbFlow";
 | 
					            this.cmbFlow.Name = "cmbFlow";
 | 
				
			||||||
            // 
 | 
					            // 
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -14,6 +14,7 @@ namespace v2rayN.Forms
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        private void AddServer6Form_Load(object sender, EventArgs e)
 | 
					        private void AddServer6Form_Load(object sender, EventArgs e)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
 | 
					            cmbFlow.Items.AddRange(Global.xtlsFlows.ToArray());
 | 
				
			||||||
            transportControl.AllowXtls = true;
 | 
					            transportControl.AllowXtls = true;
 | 
				
			||||||
            if (EditIndex >= 0)
 | 
					            if (EditIndex >= 0)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -147,21 +147,6 @@
 | 
				
			||||||
  <data name=">>btnClose.ZOrder" xml:space="preserve">
 | 
					  <data name=">>btnClose.ZOrder" xml:space="preserve">
 | 
				
			||||||
    <value>0</value>
 | 
					    <value>0</value>
 | 
				
			||||||
  </data>
 | 
					  </data>
 | 
				
			||||||
  <data name="cmbFlow.Items" xml:space="preserve">
 | 
					 | 
				
			||||||
    <value />
 | 
					 | 
				
			||||||
  </data>
 | 
					 | 
				
			||||||
  <data name="cmbFlow.Items1" xml:space="preserve">
 | 
					 | 
				
			||||||
    <value>xtls-rprx-origin</value>
 | 
					 | 
				
			||||||
  </data>
 | 
					 | 
				
			||||||
  <data name="cmbFlow.Items2" xml:space="preserve">
 | 
					 | 
				
			||||||
    <value>xtls-rprx-origin-udp443</value>
 | 
					 | 
				
			||||||
  </data>
 | 
					 | 
				
			||||||
  <data name="cmbFlow.Items3" xml:space="preserve">
 | 
					 | 
				
			||||||
    <value>xtls-rprx-direct</value>
 | 
					 | 
				
			||||||
  </data>
 | 
					 | 
				
			||||||
  <data name="cmbFlow.Items4" xml:space="preserve">
 | 
					 | 
				
			||||||
    <value>xtls-rprx-direct-udp443</value>
 | 
					 | 
				
			||||||
  </data>
 | 
					 | 
				
			||||||
  <data name="cmbFlow.Location" type="System.Drawing.Point, System.Drawing">
 | 
					  <data name="cmbFlow.Location" type="System.Drawing.Point, System.Drawing">
 | 
				
			||||||
    <value>127, 123</value>
 | 
					    <value>127, 123</value>
 | 
				
			||||||
  </data>
 | 
					  </data>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -198,6 +198,7 @@ namespace v2rayN
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public static readonly List<string> vmessSecuritys = new List<string> { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
 | 
					        public static readonly List<string> vmessSecuritys = new List<string> { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
 | 
				
			||||||
        public static readonly List<string> ssSecuritys = new List<string> { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
 | 
					        public static readonly List<string> ssSecuritys = new List<string> { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
 | 
				
			||||||
 | 
					        public static readonly List<string> xtlsFlows = new List<string> { "", "xtls-rprx-origin", "xtls-rprx-origin-udp443", "xtls-rprx-direct", "xtls-rprx-direct-udp443" };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public const string GrpcgunMode = "gun";
 | 
					        public const string GrpcgunMode = "gun";
 | 
				
			||||||
        public const string GrpcmultiMode = "multi";
 | 
					        public const string GrpcmultiMode = "multi";
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -503,7 +503,7 @@ namespace v2rayN.Handler
 | 
				
			||||||
                    {
 | 
					                    {
 | 
				
			||||||
                        if (Utils.IsNullOrEmpty(config.flow()))
 | 
					                        if (Utils.IsNullOrEmpty(config.flow()))
 | 
				
			||||||
                        {
 | 
					                        {
 | 
				
			||||||
                            usersItem.flow = "xtls-rprx-origin";
 | 
					                            usersItem.flow = Global.xtlsFlows[1];
 | 
				
			||||||
                        }
 | 
					                        }
 | 
				
			||||||
                        else
 | 
					                        else
 | 
				
			||||||
                        {
 | 
					                        {
 | 
				
			||||||
| 
						 | 
					@ -543,7 +543,7 @@ namespace v2rayN.Handler
 | 
				
			||||||
                    {
 | 
					                    {
 | 
				
			||||||
                        if (Utils.IsNullOrEmpty(config.flow()))
 | 
					                        if (Utils.IsNullOrEmpty(config.flow()))
 | 
				
			||||||
                        {
 | 
					                        {
 | 
				
			||||||
                            serversItem.flow = "xtls-rprx-origin";
 | 
					                            serversItem.flow = Global.xtlsFlows[1];
 | 
				
			||||||
                        }
 | 
					                        }
 | 
				
			||||||
                        else
 | 
					                        else
 | 
				
			||||||
                        {
 | 
					                        {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue