share over LAN

Author: Cenmrev

V2RayX/AppDelegate.m

@@ -93,6 +93,7 @@ - (void) writeDefaultSettings {
       @"selectedServerIndex": [NSNumber numberWithInteger:0],
       @"localPort": [NSNumber numberWithInteger:1081],
       @"udpSupport": [NSNumber numberWithBool:NO],
+      @"shareOverLan": [NSNumber numberWithBool:NO],
       @"dns": @"localhost",
       @"useTLS": [NSNumber numberWithBool:NO],
       @"tlsSettings": @{
@@ -254,6 +255,7 @@ - (NSDictionary*)readDefaultsAsDictionary {
     NSNumber *dMode = nilCoalescing([defaults objectForKey:@"proxyMode"], @0); // use v2ray rules as defualt mode
     NSNumber* dLocalPort = nilCoalescing([defaults objectForKey:@"localPort"], @1081);//use 1081 as default local port
     NSNumber* dUdpSupport = nilCoalescing([defaults objectForKey:@"udpSupport"], [NSNumber numberWithBool:NO]);// do not support udp as default
+    NSNumber* dShareOverLan = nilCoalescing([defaults objectForKey:@"shareOverLan"], [NSNumber numberWithBool:NO]); //do not share over lan as default
     NSString *dDnsString = nilCoalescing([defaults objectForKey:@"dns"], @"");
     NSMutableArray *dProfilesInPlist = [defaults objectForKey:@"profiles"];
     NSMutableArray *dProfiles = [[NSMutableArray alloc] init];
@@ -285,6 +287,7 @@ - (NSDictionary*)readDefaultsAsDictionary {
              @"proxyMode": dMode,
              @"localPort": dLocalPort,
              @"udpSupport": dUdpSupport,
+             @"shareOverLan": dShareOverLan,
              @"profiles": dProfiles,
              @"selectedServerIndex": dServerIndex,
              @"dns":dDnsString};
@@ -301,7 +304,7 @@ -(void)unloadV2ray {
 -(BOOL)loadV2ray {
     NSString *configPath = [NSString stringWithFormat:@"%@/Library/Application Support/V2RayX/config.json",NSHomeDirectory()];
     printf("proxy mode is %ld\n", (long)proxyMode);
-    NSDictionary *configDic = [[profiles objectAtIndex:selectedServerIndex] v2rayConfigWithLocalPort:localPort udpSupport:udpSupport v2rayRules:proxyMode == 0];
+    NSDictionary *configDic = [[profiles objectAtIndex:selectedServerIndex] v2rayConfigWithRules:proxyMode == 0];
     NSData* v2rayJSONconfig = [NSJSONSerialization dataWithJSONObject:configDic options:NSJSONWritingPrettyPrinted error:nil];
     [v2rayJSONconfig writeToFile:configPath atomically:NO];
     [self generateLaunchdPlist:plistPath];

V2RayX/ConfigWindow.xib

@@ -441,10 +441,22 @@ Gw
                             <action selector="cancel:" target="-2" id="blN-np-Jtr"/>
                         </connections>
                     </button>
+                    <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HGo-i2-l4d">
+                        <rect key="frame" x="325" y="378" width="119" height="18"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="check" title="Share Over LAN" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="TXX-VD-4P4">
+                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <binding destination="-2" name="value" keyPath="self.shareOverLan" id="eeF-vl-cmx"/>
+                        </connections>
+                    </button>
                 </subviews>
             </view>
             <point key="canvasLocation" x="162.5" y="312"/>
         </window>
+        <userDefaultsController representsSharedInstance="YES" id="I7n-bF-Cph"/>
     </objects>
     <resources>
         <image name="NSAddTemplate" width="11" height="11"/>

V2RayX/ConfigWindowController.h

@@ -53,6 +53,7 @@
 @property NSInteger selectedServerIndex;
 @property NSInteger localPort;
 @property BOOL udpSupport;
+@property BOOL shareOverLan;
 @property (nonatomic, weak) NSString* dnsString;
 @property (nonatomic, weak) id<ConfigWindowControllerDelegate> delegate;
 @end

V2RayX/ConfigWindowController.m

@@ -29,6 +29,7 @@ - (void)windowDidLoad {
     NSDictionary *defaultsDic = [[self delegate] readDefaultsAsDictionary];
     [self setLocalPort:[defaultsDic[@"localPort"] integerValue]];
     [self setUdpSupport:[defaultsDic[@"udpSupport"] boolValue]];
+    [self setShareOverLan:[defaultsDic[@"shareOverLan"] boolValue]];
     if ([defaultsDic[@"dns"] length] > 0) {
         [self setDnsString:defaultsDic[@"dns"]];
     } else {
@@ -101,6 +102,7 @@ - (IBAction)okSave:(id)sender {
     // save settings to file
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     [defaults setObject:[NSNumber numberWithBool:udpSupport]  forKey:@"udpSupport"];
+    [defaults setObject:[NSNumber numberWithBool:shareOverLan]  forKey:@"shareOverLan"];
     [defaults setObject:[NSNumber numberWithInteger:localPort] forKey:@"localPort"];
     NSMutableArray* profileDicArray = [[NSMutableArray alloc] init];
     for (ServerProfile *p in profiles) {
@@ -235,5 +237,6 @@ - (IBAction)transportHelp:(id)sender {
 @synthesize selectedProfile;
 @synthesize localPort;
 @synthesize udpSupport;
+@synthesize shareOverLan;
 @synthesize dnsString;
 @end

V2RayX/ServerProfile.h

@@ -9,9 +9,7 @@
 
 @interface ServerProfile : NSObject
 - (NSDictionary*)dictionaryForm;
-- (NSDictionary*)v2rayConfigWithLocalPort:(NSInteger)localPort
-                               udpSupport:(BOOL)udp
-                               v2rayRules:(BOOL)rules;
+- (NSDictionary*)v2rayConfigWithRules:(BOOL)rules;
 @property (nonatomic) NSString* address;
 @property (nonatomic) NSNumber* port;
 @property (nonatomic) NSString* userId;

V2RayX/ServerProfile.m

@@ -40,21 +40,20 @@ - (NSDictionary*)dictionaryForm {
              @"network": network != nil ? network : @0};
 }
 
-- (NSDictionary*)v2rayConfigWithLocalPort:(NSInteger)localPort
-                               udpSupport:(BOOL)udp
-                               v2rayRules:(BOOL)rules
+- (NSDictionary*)v2rayConfigWithRules:(BOOL)rules
 {
+    NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
     //generate config template
     NSMutableDictionary *config = [NSMutableDictionary dictionaryWithContentsOfFile:[[NSBundle mainBundle] pathForResource:rules?@"config-sample-rules":@"config-sample" ofType:@"plist"]];
-    config[@"inbound"][@"port"] = [NSNumber numberWithInteger:localPort];
-    config[@"inbound"][@"settings"][@"udp"] = [NSNumber numberWithBool:udp];
+    config[@"inbound"][@"port"] = [userDefaults objectForKey:@"localPort"];
+    config[@"inbound"][@"listen"] = [[userDefaults objectForKey:@"shareOverLan"] boolValue] ? @"0.0.0.0" : @"127.0.0.1";
+    config[@"inbound"][@"settings"][@"udp"] = config[@"udpSupport"];
     config[@"inbound"][@"allowPassive"] = [self allowPassive];
     config[@"outbound"][@"settings"][@"vnext"][0][@"address"] = self.address;
     config[@"outbound"][@"settings"][@"vnext"][0][@"port"] = self.port;
     config[@"outbound"][@"settings"][@"vnext"][0][@"users"][0][@"id"] = self.userId;
     config[@"outbound"][@"settings"][@"vnext"][0][@"users"][0][@"alterId"] = self.alterId;
     config[@"outbound"][@"settings"][@"vnext"][0][@"users"][0][@"security"] = @[@"aes-128-cfb", @"aes-128-gcm", @"chacha20-poly1305"][self.security.integerValue % 3];
-    NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
     NSMutableDictionary* streamSettings = [[userDefaults objectForKey:@"transportSettings"] mutableCopy];
     streamSettings[@"network"] = @[@"tcp", @"kcp", @"ws"][self.network.integerValue % 3];
     streamSettings[@"security"] = [[userDefaults objectForKey:@"useTLS"] boolValue] ? @"tls" : @"none";