Commitc0a46aa

committed

reconnect xpc on each request

1 parent27ab4a7 commitc0a46aaCopy full SHA for c0a46aa

File tree

2 files changed

+10

-6

lines changed

Coder Desktop/Coder Desktop
- VPNService.swift
- XPCInterface.swift

2 files changed

+10

-6

lines changed

`‎Coder Desktop/Coder Desktop/VPNService.swift‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ final class CoderVPNService: NSObject, VPNService {`
`73`	`73`	`.unconfigured`
`74`	`74`	`}`
`75`	`75`	`}`
	`76`	`+ xpc.connect()`
`76`	`77`	`xpc.getPeerState()`
`77`	`78`	`NotificationCenter.default.addObserver(`
`78`	`79`	`self,`
`@@ -100,7 +101,7 @@ final class CoderVPNService: NSObject, VPNService {`
`100`	`101`	`}`
`101`	`102`
`102`	`103`	`awaitstartTunnel()`
`103`		`-// this ping is somewhat load bearing since it causesxpc to init`
	`104`	`+ xpc.connect()`
`104`	`105`	`xpc.ping()`
`105`	`106`	`logger.debug("network extension enabled")`
`106`	`107`	`}`

`‎Coder Desktop/Coder Desktop/XPCInterface.swift‎`

Lines changed: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,14 @@ import VPNLib`
`6`	`6`	`@objcfinalclassVPNXPCInterface:NSObject,VPNXPCClientCallbackProtocol,@uncheckedSendable{`
`7`	`7`	`privatevarsvc:CoderVPNService`
`8`	`8`	`privateletlogger=Logger(subsystem:Bundle.main.bundleIdentifier!, category:"VPNXPCInterface")`
`9`		`-privateletxpc:VPNXPCProtocol`
	`9`	`+privatevarxpc:VPNXPCProtocol?=nil`
`10`	`10`
`11`	`11`	`init(vpn:CoderVPNService){`
`12`	`12`	`svc= vpn`
	`13`	`+ super.init()`
	`14`	`+}`
`13`	`15`
	`16`	`+func connect(){`
`14`	`17`	`letnetworkExtDict=Bundle.main.object(forInfoDictionaryKey:"NetworkExtension")as?[String:Any]`
`15`	`18`	`letmachServiceName=networkExtDict?["NEMachServiceName"]as?String`
`16`	`19`	`letxpcConn=NSXPCConnection(machServiceName: machServiceName!)`
`@@ -21,32 +24,32 @@ import VPNLib`
`21`	`24`	`}`
`22`	`25`	`xpc= proxy`
`23`	`26`
`24`		`- super.init()`
`25`		`-`
`26`	`27`	`xpcConn.exportedObject=self`
`27`	`28`	`xpcConn.invalidationHandler={[logger]in`
`28`	`29`	`Task{@MainActorin`
`29`	`30`	`logger.error("XPC connection invalidated.")`
	`31`	`+self.xpc=nil`
`30`	`32`	`}`
`31`	`33`	`}`
`32`	`34`	`xpcConn.interruptionHandler={[logger]in`
`33`	`35`	`Task{@MainActorin`
`34`	`36`	`logger.error("XPC connection interrupted.")`
	`37`	`+self.xpc=nil`
`35`	`38`	`}`
`36`	`39`	`}`
`37`	`40`	`xpcConn.resume()`
`38`	`41`	`}`
`39`	`42`
`40`	`43`	`func ping(){`
`41`		`- xpc.ping{`
	`44`	`+ xpc?.ping{`
`42`	`45`	`Task{@MainActorin`
`43`	`46`	`self.logger.info("Connected to NE over XPC")`
`44`	`47`	`}`
`45`	`48`	`}`
`46`	`49`	`}`
`47`	`50`
`48`	`51`	`func getPeerState(){`
`49`		`- xpc.getPeerState{ datain`
	`52`	`+ xpc?.getPeerState{ datain`
`50`	`53`	`Task{@MainActorin`
`51`	`54`	`self.svc.onExtensionPeerState(data)`
`52`	`55`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitc0a46aa

File tree

2 files changed

2 files changed

`‎Coder Desktop/Coder Desktop/VPNService.swift‎`

`‎Coder Desktop/Coder Desktop/XPCInterface.swift‎`

0 commit comments