Merge pull request #159 from Chandler-Lu/master

Tcp Fast Open Supported, resolves #156

Author: Cenmrev

V2RayX/ConfigWindowController.h

@@ -58,6 +58,9 @@
 @property (weak) IBOutlet NSButton *muxEnableButton;
 @property (weak) IBOutlet NSTextField *muxConcurrencyField;
 
+//tcp fast open
+@property (weak) IBOutlet NSButton *tfoEnableButton;
+
 //proxy fields
 @property (weak) IBOutlet NSTextField *proxyAddressField;
 @property (weak) IBOutlet NSTextField *proxyPortField;

V2RayX/ConfigWindowController.m

@@ -312,6 +312,9 @@ - (IBAction)showTransportSettings:(id)sender {
     NSDictionary *muxSettings = [self.selectedProfile muxSettings];
     [_muxEnableButton setState:[nilCoalescing(muxSettings[@"enabled"], @NO) boolValue]];
     [_muxConcurrencyField setIntegerValue:[nilCoalescing(muxSettings[@"concurrency"], @8) integerValue]];
+    // tcp fast open
+    NSDictionary* tfoSettings = [transportSettings objectForKey:@"sockopt"];
+    [_tfoEnableButton setState:[tfoSettings[@"tcpFastOpen"] boolValue]];
     // proxy
     /*
     NSDictionary *proxySettings = [selectedProfile proxySettings];
@@ -347,6 +350,8 @@ - (IBAction)tReset:(id)sender {
     //mux fields
     [_muxEnableButton setState:0];
     [_muxEnableButton setIntegerValue:8];
+    //tcp fast open
+    [_tfoEnableButton setState:0];
     //outbound proxy
     [_proxyPortField setIntegerValue:0];
     [_proxyAddressField setStringValue:@""];
@@ -408,6 +413,14 @@ - (IBAction)tOK:(id)sender {
             } else {
                 httpSettings = @{ @"path": nilCoalescing([self->_httpPathField stringValue], @"") };
             }
+            NSDictionary *sockopt;
+            if ([self->_tfoEnableButton state]) {
+                sockopt = @{
+                           @"tcpFastOpen": [NSNumber numberWithBool:[self->_tfoEnableButton state] == 1]
+                           };
+            } else {
+                sockopt = @{};
+            }
             NSDictionary *streamSettings =
             @{@"kcpSettings":
                   @{@"mtu":[NSNumber numberWithInteger:[self->_kcpMtuField integerValue]],
@@ -427,9 +440,10 @@ - (IBAction)tOK:(id)sender {
               @"security": [self->_tlsUseButton state] ? @"tls" : @"none",
               @"tlsSettings": @{
                       @"serverName": nilCoalescing([self->_tlsSnField stringValue], @""),
-                      @"allowInsecure": [NSNumber numberWithBool:[self->_tlsAiButton state]==1],
+                      @"allowInsecure": [NSNumber numberWithBool:[self->_tlsAiButton state]==1]
               },
-              @"httpSettings": httpSettings
+              @"httpSettings": httpSettings,
+              @"sockopt": sockopt
               };
             NSDictionary* muxSettings = @{
                                           @"enabled":[NSNumber numberWithBool:[self->_muxEnableButton state]==1],

V2RayX/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>309</string>
+	<string>315</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>LSUIElement</key>

V2RayX/ServerProfile.m

@@ -52,8 +52,8 @@ - (ServerProfile*)init {
                                                   }
                                           },
                                   @"httpSettings": @{
-                                            @"host": @[@"server.cc"],
-                                            @"path": @""
+                                          @"host": @[@"server.cc"],
+                                          @"path": @""
                                         }
                                   }];
         [self setMuxSettings:@{