Merge pull request #309 from spouliot/networkextensions-b1
[networkextension] Small update for iOS 10 beta 1
This commit is contained in:
Коммит
ce9843de12
|
@ -3,6 +3,7 @@ using XamCore.ObjCRuntime;
|
||||||
namespace XamCore.NetworkExtension {
|
namespace XamCore.NetworkExtension {
|
||||||
|
|
||||||
[iOS (8,0)][Mac (10,10)]
|
[iOS (8,0)][Mac (10,10)]
|
||||||
|
[ErrorDomain ("NEVPNErrorDomain")]
|
||||||
[Native]
|
[Native]
|
||||||
public enum NEVpnError : nint {
|
public enum NEVpnError : nint {
|
||||||
ConfigurationInvalid = 1,
|
ConfigurationInvalid = 1,
|
||||||
|
@ -67,7 +68,8 @@ namespace XamCore.NetworkExtension {
|
||||||
[iOS (8,0)][Mac (10,10)]
|
[iOS (8,0)][Mac (10,10)]
|
||||||
[Native]
|
[Native]
|
||||||
public enum NEVpnIke2DiffieHellman : nint {
|
public enum NEVpnIke2DiffieHellman : nint {
|
||||||
Group0 = 0,
|
Invalid = 0,
|
||||||
|
Group0 = Invalid,
|
||||||
Group1 = 1,
|
Group1 = 1,
|
||||||
Group2 = 2,
|
Group2 = 2,
|
||||||
Group5 = 5,
|
Group5 = 5,
|
||||||
|
@ -118,6 +120,7 @@ namespace XamCore.NetworkExtension {
|
||||||
|
|
||||||
// in Xcode7 SDK but marked as 8.0
|
// in Xcode7 SDK but marked as 8.0
|
||||||
[iOS (8,0)]
|
[iOS (8,0)]
|
||||||
|
[ErrorDomain ("NEFilterErrorDomain")]
|
||||||
[Native]
|
[Native]
|
||||||
public enum NEFilterManagerError : nint {
|
public enum NEFilterManagerError : nint {
|
||||||
None = 0,
|
None = 0,
|
||||||
|
@ -128,6 +131,7 @@ namespace XamCore.NetworkExtension {
|
||||||
}
|
}
|
||||||
|
|
||||||
[iOS (9,0)]
|
[iOS (9,0)]
|
||||||
|
[ErrorDomain ("NETunnelProviderErrorDomain")]
|
||||||
[Native]
|
[Native]
|
||||||
public enum NETunnelProviderError : nint {
|
public enum NETunnelProviderError : nint {
|
||||||
None = 0,
|
None = 0,
|
||||||
|
@ -137,6 +141,7 @@ namespace XamCore.NetworkExtension {
|
||||||
}
|
}
|
||||||
|
|
||||||
[iOS (9,0)]
|
[iOS (9,0)]
|
||||||
|
[ErrorDomain ("NEAppProxyErrorDomain")]
|
||||||
[Native]
|
[Native]
|
||||||
public enum NEAppProxyFlowError : nint {
|
public enum NEAppProxyFlowError : nint {
|
||||||
None = 0,
|
None = 0,
|
||||||
|
|
|
@ -931,8 +931,10 @@ MULTIPEERCONNECTIVITY_SOURCES = \
|
||||||
|
|
||||||
# NetworkExtension
|
# NetworkExtension
|
||||||
|
|
||||||
NETWORKEXTENSION_CORE_SOURCES = \
|
NETWORKEXTENSION_API_SOURCES = \
|
||||||
NetworkExtension/NEEnums.cs \
|
NetworkExtension/NEEnums.cs \
|
||||||
|
|
||||||
|
NETWORKEXTENSION_CORE_SOURCES = \
|
||||||
NetworkExtension/NEHotspotHelperOptions.cs \
|
NetworkExtension/NEHotspotHelperOptions.cs \
|
||||||
NetworkExtension/NEVpnConnectionStartOptions.cs \
|
NetworkExtension/NEVpnConnectionStartOptions.cs \
|
||||||
|
|
||||||
|
|
|
@ -26,8 +26,10 @@ namespace XamCore.NetworkExtension {
|
||||||
[Export ("metaData")]
|
[Export ("metaData")]
|
||||||
NEFlowMetaData MetaData { get; }
|
NEFlowMetaData MetaData { get; }
|
||||||
|
|
||||||
|
#if !XAMCORE_4_0
|
||||||
[Field ("NEAppProxyErrorDomain")]
|
[Field ("NEAppProxyErrorDomain")]
|
||||||
NSString ErrorDomain { get; }
|
NSString ErrorDomain { get; }
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
[iOS (9,0)][Mac (10,11, onlyOn64 : true)]
|
[iOS (9,0)][Mac (10,11, onlyOn64 : true)]
|
||||||
|
@ -285,8 +287,10 @@ namespace XamCore.NetworkExtension {
|
||||||
[Notification]
|
[Notification]
|
||||||
NSString ConfigurationDidChangeNotification { get; }
|
NSString ConfigurationDidChangeNotification { get; }
|
||||||
|
|
||||||
|
#if !XAMCORE_4_0
|
||||||
[Field ("NEFilterErrorDomain")]
|
[Field ("NEFilterErrorDomain")]
|
||||||
NSString ErrorDomain { get; }
|
NSString ErrorDomain { get; }
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !MONOMAC
|
#if !MONOMAC
|
||||||
|
@ -620,6 +624,10 @@ namespace XamCore.NetworkExtension {
|
||||||
|
|
||||||
[NullAllowed, Export ("defaultPath")]
|
[NullAllowed, Export ("defaultPath")]
|
||||||
NWPath DefaultPath { get; }
|
NWPath DefaultPath { get; }
|
||||||
|
|
||||||
|
[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
|
||||||
|
[Export ("displayMessage:completionHandler:")]
|
||||||
|
void DisplayMessage (string message, Action<bool> completionHandler);
|
||||||
}
|
}
|
||||||
|
|
||||||
[iOS (9,0)][Mac (10,11, onlyOn64 : true)]
|
[iOS (9,0)][Mac (10,11, onlyOn64 : true)]
|
||||||
|
@ -741,8 +749,10 @@ namespace XamCore.NetworkExtension {
|
||||||
[Export ("routingMethod")]
|
[Export ("routingMethod")]
|
||||||
NETunnelProviderRoutingMethod RoutingMethod { get; }
|
NETunnelProviderRoutingMethod RoutingMethod { get; }
|
||||||
|
|
||||||
|
#if !XAMCORE_4_0
|
||||||
[Field ("NETunnelProviderErrorDomain")]
|
[Field ("NETunnelProviderErrorDomain")]
|
||||||
NSString ErrorDomain { get; }
|
NSString ErrorDomain { get; }
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -796,8 +806,10 @@ namespace XamCore.NetworkExtension {
|
||||||
// - (void)setAuthorization:(AuthorizationRef)authorization NS_AVAILABLE(10_10, NA);
|
// - (void)setAuthorization:(AuthorizationRef)authorization NS_AVAILABLE(10_10, NA);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if !XAMCORE_4_0
|
||||||
[Field ("NEVPNErrorDomain")]
|
[Field ("NEVPNErrorDomain")]
|
||||||
NSString ErrorDomain { get; }
|
NSString ErrorDomain { get; }
|
||||||
|
#endif
|
||||||
|
|
||||||
[Notification]
|
[Notification]
|
||||||
[Field ("NEVPNConfigurationChangeNotification")]
|
[Field ("NEVPNConfigurationChangeNotification")]
|
||||||
|
@ -830,6 +842,10 @@ namespace XamCore.NetworkExtension {
|
||||||
[Export ("stopVPNTunnel")]
|
[Export ("stopVPNTunnel")]
|
||||||
void StopVpnTunnel ();
|
void StopVpnTunnel ();
|
||||||
|
|
||||||
|
[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
|
||||||
|
[Export ("manager")]
|
||||||
|
NEVpnManager Manager { get; }
|
||||||
|
|
||||||
[Notification]
|
[Notification]
|
||||||
[Field ("NEVPNStatusDidChangeNotification")]
|
[Field ("NEVPNStatusDidChangeNotification")]
|
||||||
NSString StatusDidChangeNotification { get; }
|
NSString StatusDidChangeNotification { get; }
|
||||||
|
|
Загрузка…
Ссылка в новой задаче