xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[NetworkExtension] Updates for Catalyst

This commit is contained in:
Rachel Kang 2021-10-14 12:11:10 -04:00
Родитель 3c2c3d062d
Коммит 72dc7f5d01
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: C222091D01159D1C
2 изменённых файлов: 19 добавлений и 32 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

38
src/networkextension.cs
Просмотреть файл

@ -97,7 +97,7 @@ namespace NetworkExtension {
} }
[NoiOS] [NoiOS]
[Mac (10,15), MacCatalyst (15,0)] [Mac (10,15), NoMacCatalyst]
[Native] [Native]
enum NEFilterManagerGrade : long { enum NEFilterManagerGrade : long {
Firewall = 1, Firewall = 1,
@ -113,7 +113,7 @@ namespace NetworkExtension {
} }
[NoiOS] [NoiOS]
[Mac (10,15), MacCatalyst (15,0)] [Mac (10,15), NoMacCatalyst]
[Native] [Native]
enum NENetworkRuleProtocol : long { enum NENetworkRuleProtocol : long {
Any = 0, Any = 0,
@ -122,7 +122,7 @@ namespace NetworkExtension {
} }
[NoiOS] [NoiOS]
[Mac (10,15), MacCatalyst (15,0)] [Mac (10,15), NoMacCatalyst]
[Native] [Native]
enum NEFilterPacketProviderVerdict : long { enum NEFilterPacketProviderVerdict : long {
Allow = 0, Allow = 0,
@ -140,7 +140,7 @@ namespace NetworkExtension {
Statistics = 4, Statistics = 4,
} }
[NoWatch, NoTV, NoiOS, Mac (10,15,4), MacCatalyst (15,0)] [NoWatch, NoTV, NoiOS, Mac (10,15,4), NoMacCatalyst]
[Native] [Native]
enum NEFilterReportFrequency : long { enum NEFilterReportFrequency : long {
None, None,
@ -149,7 +149,7 @@ namespace NetworkExtension {
High, High,
} }
[NoWatch, NoTV, NoiOS, Mac (10,15,5), MacCatalyst (15,0)] [NoWatch, NoTV, NoiOS, Mac (10,15,5), NoMacCatalyst]
[Native] [Native]
public enum NEFilterDataAttribute : long { public enum NEFilterDataAttribute : long {
HasIpHeader = 1, HasIpHeader = 1,
@ -435,16 +435,16 @@ namespace NetworkExtension {
[Export ("handleRulesChanged")] [Export ("handleRulesChanged")]
void HandleRulesChanged (); void HandleRulesChanged ();
[NoiOS, MacCatalyst (15,0)] [NoiOS, NoMacCatalyst]
[Export ("applySettings:completionHandler:")] [Export ("applySettings:completionHandler:")]
[Async] [Async]
void ApplySettings ([NullAllowed] NEFilterSettings settings, Action<NSError> completionHandler); void ApplySettings ([NullAllowed] NEFilterSettings settings, Action<NSError> completionHandler);
[NoiOS, MacCatalyst (15,0)] [NoiOS, NoMacCatalyst]
[Export ("resumeFlow:withVerdict:")] [Export ("resumeFlow:withVerdict:")]
void ResumeFlow (NEFilterFlow flow, NEFilterVerdict verdict); void ResumeFlow (NEFilterFlow flow, NEFilterVerdict verdict);
[NoWatch, NoTV, NoiOS, Mac (10,15,4), MacCatalyst (15,0)] [NoWatch, NoTV, NoiOS, Mac (10,15,4), NoMacCatalyst]
[Export ("updateFlow:usingVerdict:forDirection:")] [Export ("updateFlow:usingVerdict:forDirection:")]
void UpdateFlow (NEFilterSocketFlow flow, NEFilterDataVerdict verdict, NETrafficDirection direction); void UpdateFlow (NEFilterSocketFlow flow, NEFilterDataVerdict verdict, NETrafficDirection direction);
} }
@ -454,7 +454,7 @@ namespace NetworkExtension {
[BaseType (typeof(NEFilterVerdict))] [BaseType (typeof(NEFilterVerdict))]
interface NEFilterDataVerdict : NSSecureCoding, NSCopying interface NEFilterDataVerdict : NSSecureCoding, NSCopying
{ {
[NoWatch, NoTV, NoiOS, Mac (10,15,4), MacCatalyst (15,0)] [NoWatch, NoTV, NoiOS, Mac (10,15,4), NoMacCatalyst]
[Export ("statisticsReportFrequency", ArgumentSemantic.Assign)] [Export ("statisticsReportFrequency", ArgumentSemantic.Assign)]
NEFilterReportFrequency StatisticsReportFrequency { get; set; } NEFilterReportFrequency StatisticsReportFrequency { get; set; }
@ -553,7 +553,7 @@ namespace NetworkExtension {
NSString ConfigurationDidChangeNotification { get; } NSString ConfigurationDidChangeNotification { get; }
[NoiOS] [NoiOS]
[Mac (10,15), MacCatalyst (15,0)] [Mac (10,15), NoMacCatalyst]
[Export ("grade", ArgumentSemantic.Assign)] [Export ("grade", ArgumentSemantic.Assign)]
NEFilterManagerGrade Grade { get; set; } NEFilterManagerGrade Grade { get; set; }
@ -568,7 +568,7 @@ namespace NetworkExtension {
[BaseType (typeof(NEFilterVerdict))] [BaseType (typeof(NEFilterVerdict))]
interface NEFilterNewFlowVerdict : NSSecureCoding, NSCopying interface NEFilterNewFlowVerdict : NSSecureCoding, NSCopying
{ {
[NoWatch, NoTV, NoiOS, Mac (10, 15, 4), MacCatalyst (15,0)] [NoWatch, NoTV, NoiOS, Mac (10, 15, 4), NoMacCatalyst]
[Export ("statisticsReportFrequency", ArgumentSemantic.Assign)] [Export ("statisticsReportFrequency", ArgumentSemantic.Assign)]
NEFilterReportFrequency StatisticsReportFrequency { get; set; } NEFilterReportFrequency StatisticsReportFrequency { get; set; }
@ -2072,7 +2072,7 @@ namespace NetworkExtension {
} }
[NoiOS] [NoiOS]
[Mac (10,15), MacCatalyst (15,0)] [Mac (10,15), NoMacCatalyst]
[BaseType (typeof (NSObject))] [BaseType (typeof (NSObject))]
[DisableDefaultCtor] [DisableDefaultCtor]
interface NENetworkRule : NSSecureCoding, NSCopying { interface NENetworkRule : NSSecureCoding, NSCopying {
@ -2106,7 +2106,7 @@ namespace NetworkExtension {
} }
[NoiOS] [NoiOS]
[Mac (10,15), MacCatalyst (15,0)] [Mac (10,15), NoMacCatalyst]
[BaseType (typeof (NSObject))] [BaseType (typeof (NSObject))]
[DisableDefaultCtor] [DisableDefaultCtor]
interface NEFilterRule : NSSecureCoding, NSCopying { interface NEFilterRule : NSSecureCoding, NSCopying {
@ -2122,7 +2122,7 @@ namespace NetworkExtension {
} }
[NoiOS] [NoiOS]
[Mac (10,15), MacCatalyst (15,0)] [Mac (10,15), NoMacCatalyst]
[BaseType (typeof (NSObject))] [BaseType (typeof (NSObject))]
[DisableDefaultCtor] [DisableDefaultCtor]
interface NEFilterSettings : NSSecureCoding, NSCopying { interface NEFilterSettings : NSSecureCoding, NSCopying {
@ -2138,7 +2138,7 @@ namespace NetworkExtension {
} }
[NoiOS] [NoiOS]
[Mac (10,15), MacCatalyst (15,0)] [Mac (10,15), NoMacCatalyst]
[BaseType (typeof (NSObject))] [BaseType (typeof (NSObject))]
interface NEFilterPacketContext { interface NEFilterPacketContext {
} }
@ -2148,7 +2148,7 @@ namespace NetworkExtension {
delegate NEFilterPacketProviderVerdict NEFilterPacketHandler (NEFilterPacketContext context, IntPtr @interface, NETrafficDirection directiom, IntPtr packetBytes, nuint packetLength); delegate NEFilterPacketProviderVerdict NEFilterPacketHandler (NEFilterPacketContext context, IntPtr @interface, NETrafficDirection directiom, IntPtr packetBytes, nuint packetLength);
[NoiOS] [NoiOS]
[Mac (10,15), MacCatalyst (15,0)] [Mac (10,15), NoMacCatalyst]
[BaseType (typeof (NEFilterProvider))] [BaseType (typeof (NEFilterProvider))]
[DisableDefaultCtor] // returns `nil` [DisableDefaultCtor] // returns `nil`
interface NEFilterPacketProvider { interface NEFilterPacketProvider {
@ -2163,7 +2163,7 @@ namespace NetworkExtension {
} }
[NoiOS] [NoiOS]
[Mac (10,15), MacCatalyst (15,0)] [Mac (10,15), NoMacCatalyst]
[BaseType (typeof (NEVpnManager))] [BaseType (typeof (NEVpnManager))]
[DisableDefaultCtor] [DisableDefaultCtor]
interface NETransparentProxyManager { interface NETransparentProxyManager {
@ -2175,7 +2175,7 @@ namespace NetworkExtension {
} }
[NoiOS] [NoiOS]
[Mac (10,15), MacCatalyst (15,0)] [Mac (10,15), NoMacCatalyst]
[BaseType (typeof (NETunnelNetworkSettings))] [BaseType (typeof (NETunnelNetworkSettings))]
interface NETransparentProxyNetworkSettings { interface NETransparentProxyNetworkSettings {
@ -2337,7 +2337,7 @@ namespace NetworkExtension {
void DidReceiveIncomingCall (NEAppPushManager manager, NSDictionary userInfo); void DidReceiveIncomingCall (NEAppPushManager manager, NSDictionary userInfo);
} }
[Mac (11,0), MacCatalyst (15,0)] [Mac (11,0), NoMacCatalyst]
[NoiOS][NoTV][NoWatch] [NoiOS][NoTV][NoWatch]
[BaseType (typeof (NEAppProxyProvider))] [BaseType (typeof (NEAppProxyProvider))]
[DisableDefaultCtor] // `init` returns `nil` [DisableDefaultCtor] // `init` returns `nil`

13
tests/xtro-sharpie/MacCatalyst-NetworkExtension.todo
Просмотреть файл

@ -1,13 +0,0 @@
!unknown-native-enum! NEFilterDataAttribute bound
!unknown-native-enum! NEFilterManagerGrade bound
!unknown-native-enum! NEFilterPacketProviderVerdict bound
!unknown-native-enum! NEFilterReportFrequency bound
!unknown-native-enum! NENetworkRuleProtocol bound
!unknown-type! NEFilterPacketContext bound
!unknown-type! NEFilterPacketProvider bound
!unknown-type! NEFilterRule bound
!unknown-type! NEFilterSettings bound
!unknown-type! NENetworkRule bound
!unknown-type! NETransparentProxyManager bound
!unknown-type! NETransparentProxyNetworkSettings bound
!unknown-type! NETransparentProxyProvider bound