diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamInput.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamInput.cs index 5930160..3d1ab52 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamInput.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamInput.cs @@ -15,9 +15,9 @@ namespace Steamworks SetupInterface( IsGameServer ); } - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamInput_v005", CallingConvention = Platform.CC)] - internal static extern IntPtr SteamAPI_SteamInput_v005(); - public override IntPtr GetUserInterfacePointer() => SteamAPI_SteamInput_v005(); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamInput_v006", CallingConvention = Platform.CC)] + internal static extern IntPtr SteamAPI_SteamInput_v006(); + public override IntPtr GetUserInterfacePointer() => SteamAPI_SteamInput_v006(); #region FunctionMeta diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs index 704d3ed..6a0e858 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs @@ -56,39 +56,6 @@ namespace Steamworks return returnValue; } - #region FunctionMeta - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_GetFakeIP", CallingConvention = Platform.CC)] - private static extern void _GetFakeIP( IntPtr self, int idxFirstPort, ref SteamNetworkingFakeIPResult_t pInfo ); - - #endregion - internal void GetFakeIP( int idxFirstPort, ref SteamNetworkingFakeIPResult_t pInfo ) - { - _GetFakeIP( Self, idxFirstPort, ref pInfo ); - } - - #region FunctionMeta - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_BeginAsyncRequestFakeIP", CallingConvention = Platform.CC)] - [return: MarshalAs( UnmanagedType.I1 )] - private static extern bool _BeginAsyncRequestFakeIP( IntPtr self, int nNumPorts ); - - #endregion - internal bool BeginAsyncRequestFakeIP( int nNumPorts ) - { - var returnValue = _BeginAsyncRequestFakeIP( Self, nNumPorts ); - return returnValue; - } - - #region FunctionMeta - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_CreateListenSocketP2PFakeIP", CallingConvention = Platform.CC)] - private static extern Socket _CreateListenSocketP2PFakeIP( IntPtr self, int idxFakePort, int nOptions, [In,Out] NetKeyValue[] pOptions ); - - #endregion - internal Socket CreateListenSocketP2PFakeIP( int idxFakePort, int nOptions, [In,Out] NetKeyValue[] pOptions ) - { - var returnValue = _CreateListenSocketP2PFakeIP( Self, idxFakePort, nOptions, pOptions ); - return returnValue; - } - #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_ConnectP2P", CallingConvention = Platform.CC)] private static extern Connection _ConnectP2P( IntPtr self, ref NetIdentity identityRemote, int nRemoteVirtualPort, int nOptions, [In,Out] NetKeyValue[] pOptions ); @@ -532,6 +499,50 @@ namespace Steamworks _RunCallbacks( Self ); } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_BeginAsyncRequestFakeIP", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _BeginAsyncRequestFakeIP( IntPtr self, int nNumPorts ); + + #endregion + internal bool BeginAsyncRequestFakeIP( int nNumPorts ) + { + var returnValue = _BeginAsyncRequestFakeIP( Self, nNumPorts ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_GetFakeIP", CallingConvention = Platform.CC)] + private static extern void _GetFakeIP( IntPtr self, int idxFirstPort, ref SteamNetworkingFakeIPResult_t pInfo ); + + #endregion + internal void GetFakeIP( int idxFirstPort, ref SteamNetworkingFakeIPResult_t pInfo ) + { + _GetFakeIP( Self, idxFirstPort, ref pInfo ); + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_CreateListenSocketP2PFakeIP", CallingConvention = Platform.CC)] + private static extern Socket _CreateListenSocketP2PFakeIP( IntPtr self, int idxFakePort, int nOptions, [In,Out] NetKeyValue[] pOptions ); + + #endregion + internal Socket CreateListenSocketP2PFakeIP( int idxFakePort, int nOptions, [In,Out] NetKeyValue[] pOptions ) + { + var returnValue = _CreateListenSocketP2PFakeIP( Self, idxFakePort, nOptions, pOptions ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_GetRemoteFakeIPForConnection", CallingConvention = Platform.CC)] + private static extern Result _GetRemoteFakeIPForConnection( IntPtr self, Connection hConn, [In,Out] NetAddress[] pOutAddr ); + + #endregion + internal Result GetRemoteFakeIPForConnection( Connection hConn, [In,Out] NetAddress[] pOutAddr ) + { + var returnValue = _GetRemoteFakeIPForConnection( Self, hConn, pOutAddr ); + return returnValue; + } + #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_CreateFakeUDPPort", CallingConvention = Platform.CC)] private static extern IntPtr _CreateFakeUDPPort( IntPtr self, int idxFakeServerPort ); diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs index 8bffae4..50d6d7d 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs @@ -186,6 +186,40 @@ namespace Steamworks _SetDebugOutputFunction( Self, eDetailLevel, pfnFunc ); } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_IsFakeIPv4", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _IsFakeIPv4( IntPtr self, uint nIPv4 ); + + #endregion + internal bool IsFakeIPv4( uint nIPv4 ) + { + var returnValue = _IsFakeIPv4( Self, nIPv4 ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_GetIPv4FakeIPType", CallingConvention = Platform.CC)] + private static extern SteamNetworkingFakeIPType _GetIPv4FakeIPType( IntPtr self, uint nIPv4 ); + + #endregion + internal SteamNetworkingFakeIPType GetIPv4FakeIPType( uint nIPv4 ) + { + var returnValue = _GetIPv4FakeIPType( Self, nIPv4 ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_GetRealIdentityForFakeIP", CallingConvention = Platform.CC)] + private static extern Result _GetRealIdentityForFakeIP( IntPtr self, ref NetAddress fakeIP, [In,Out] NetIdentity[] pOutRealIdentity ); + + #endregion + internal Result GetRealIdentityForFakeIP( ref NetAddress fakeIP, [In,Out] NetIdentity[] pOutRealIdentity ) + { + var returnValue = _GetRealIdentityForFakeIP( Self, ref fakeIP, pOutRealIdentity ); + return returnValue; + } + #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SetGlobalConfigValueInt32", CallingConvention = Platform.CC)] [return: MarshalAs( UnmanagedType.I1 )] @@ -306,6 +340,18 @@ namespace Steamworks return returnValue; } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SetGlobalCallback_FakeIPResult", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _SetGlobalCallback_FakeIPResult( IntPtr self, FnSteamNetworkingFakeIPResult fnCallback ); + + #endregion + internal bool SetGlobalCallback_FakeIPResult( FnSteamNetworkingFakeIPResult fnCallback ) + { + var returnValue = _SetGlobalCallback_FakeIPResult( Self, fnCallback ); + return returnValue; + } + #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SetGlobalCallback_MessagesSessionRequest", CallingConvention = Platform.CC)] [return: MarshalAs( UnmanagedType.I1 )] @@ -411,6 +457,17 @@ namespace Steamworks return returnValue; } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SteamNetworkingIPAddr_GetFakeIPType", CallingConvention = Platform.CC)] + private static extern SteamNetworkingFakeIPType _SteamNetworkingIPAddr_GetFakeIPType( IntPtr self, ref NetAddress addr ); + + #endregion + internal SteamNetworkingFakeIPType SteamNetworkingIPAddr_GetFakeIPType( ref NetAddress addr ) + { + var returnValue = _SteamNetworkingIPAddr_GetFakeIPType( Self, ref addr ); + return returnValue; + } + #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SteamNetworkingIdentity_ToString", CallingConvention = Platform.CC)] private static extern void _SteamNetworkingIdentity_ToString( IntPtr self, ref NetIdentity identity, IntPtr buf, uint cbBuf ); diff --git a/Facepunch.Steamworks/Generated/SteamCallbacks.cs b/Facepunch.Steamworks/Generated/SteamCallbacks.cs index 1065d28..63bc765 100644 --- a/Facepunch.Steamworks/Generated/SteamCallbacks.cs +++ b/Facepunch.Steamworks/Generated/SteamCallbacks.cs @@ -1849,10 +1849,6 @@ namespace Steamworks.Data internal ulong ContextValue; // m_ulContextValue uint64 [MarshalAs(UnmanagedType.I1)] internal bool RequestSuccessful; // m_bRequestSuccessful bool - [MarshalAs(UnmanagedType.I1)] - internal bool TMP_bSuccessfulA; // m_TMP_bSuccessfulA bool - [MarshalAs(UnmanagedType.I1)] - internal bool TMP_bSuccessfulB; // m_TMP_bSuccessfulB bool internal HTTPStatusCode StatusCode; // m_eStatusCode EHTTPStatusCode internal uint BodySize; // m_unBodySize uint32 diff --git a/Facepunch.Steamworks/Generated/SteamEnums.cs b/Facepunch.Steamworks/Generated/SteamEnums.cs index abf3f9b..4c3246b 100644 --- a/Facepunch.Steamworks/Generated/SteamEnums.cs +++ b/Facepunch.Steamworks/Generated/SteamEnums.cs @@ -1518,7 +1518,8 @@ namespace Steamworks MobileTouch = 11, PS3Controller = 12, PS5Controller = 13, - Count = 14, + SteamDeckController = 14, + Count = 15, MaximumPossibleValue = 255, } @@ -1559,11 +1560,11 @@ namespace Steamworks // internal enum SteamInputGlyphStyle : int { - Standard = 0, + Knockout = 0, Light = 1, Dark = 2, NeutralColorABXY = 16, - OutlineOnlyABXY = 32, + SolidABXY = 32, } // @@ -2187,6 +2188,17 @@ namespace Steamworks Force32bit = 2147483647, } + // + // ESteamNetworkingFakeIPType + // + internal enum SteamNetworkingFakeIPType : int + { + Invalid = 0, + NotFake = 1, + GlobalIPv4 = 2, + LocalIPv4 = 3, + } + // // ESteamNetworkingConnectionState // @@ -2307,6 +2319,7 @@ namespace Steamworks Callback_MessagesSessionRequest = 204, Callback_MessagesSessionFailed = 205, Callback_CreateConnectionSignaling = 206, + Callback_FakeIPResult = 207, P2P_STUN_ServerList = 103, P2P_Transport_ICE_Enable = 104, P2P_Transport_ICE_Penalty = 105, diff --git a/Facepunch.Steamworks/Generated/SteamStructFunctions.cs b/Facepunch.Steamworks/Generated/SteamStructFunctions.cs index 8803701..0ce8301 100644 --- a/Facepunch.Steamworks/Generated/SteamStructFunctions.cs +++ b/Facepunch.Steamworks/Generated/SteamStructFunctions.cs @@ -159,6 +159,13 @@ namespace Steamworks.Data [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingIdentity_GetIPv4", CallingConvention = Platform.CC)] internal static extern uint InternalGetIPv4( ref NetIdentity self ); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingIdentity_GetFakeIPType", CallingConvention = Platform.CC)] + internal static extern SteamNetworkingFakeIPType InternalGetFakeIPType( ref NetIdentity self ); + + [return: MarshalAs( UnmanagedType.I1 )] + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingIdentity_IsFakeIP", CallingConvention = Platform.CC)] + internal static extern bool InternalIsFakeIP( ref NetIdentity self ); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingIdentity_SetLocalHost", CallingConvention = Platform.CC)] internal static extern void InternalSetLocalHost( ref NetIdentity self ); @@ -233,6 +240,13 @@ namespace Steamworks.Data [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingIPAddr_IsEqualTo", CallingConvention = Platform.CC)] internal static extern bool InternalIsEqualTo( ref NetAddress self, ref NetAddress x ); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingIPAddr_GetFakeIPType", CallingConvention = Platform.CC)] + internal static extern SteamNetworkingFakeIPType InternalGetFakeIPType( ref NetAddress self ); + + [return: MarshalAs( UnmanagedType.I1 )] + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingIPAddr_IsFakeIP", CallingConvention = Platform.CC)] + internal static extern bool InternalIsFakeIP( ref NetAddress self ); + } internal partial struct NetMsg diff --git a/Facepunch.Steamworks/Networking/Delegates.cs b/Facepunch.Steamworks/Networking/Delegates.cs index d376a0b..2ab13e1 100644 --- a/Facepunch.Steamworks/Networking/Delegates.cs +++ b/Facepunch.Steamworks/Networking/Delegates.cs @@ -22,4 +22,7 @@ namespace Steamworks [UnmanagedFunctionPointer( Platform.CC )] internal delegate void FnSteamNetworkingMessagesSessionFailed( ref SteamNetworkingMessagesSessionFailed_t arg ); + + [UnmanagedFunctionPointer( Platform.CC )] + internal delegate void FnSteamNetworkingFakeIPResult( ref SteamNetworkingFakeIPResult_t arg ); }