X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=src%2Fvg%2Fvg_steam_networking.h;h=6eb059909d261274abe9321572f935140b0fed68;hb=3dd767bb10e6fee9cbffeb185d1a9685810c17b5;hp=874bc9e6464e353c8c27583befad3f975c8b3799;hpb=290b48a4215fa0a0906b0d75075a1c8b90a34cc4;p=vg.git

diff --git a/src/vg/vg_steam_networking.h b/src/vg/vg_steam_networking.h
index 874bc9e..6eb0599 100644
--- a/src/vg/vg_steam_networking.h
+++ b/src/vg/vg_steam_networking.h
@@ -4,12 +4,12 @@
 #include "vg_steam.h"
 
 #ifdef VALVE_CALLBACK_PACK_SMALL
+;
  #pragma pack(push,4)
 #else
  #pragma pack(push,8)
 #endif
 
-typedef enum ESteamNetworkingConfigScope ESteamNetworkingConfigScope;
 enum ESteamNetworkingConfigScope
 {
 	k_ESteamNetworkingConfig_Global = 1,
@@ -18,8 +18,8 @@ enum ESteamNetworkingConfigScope
 	k_ESteamNetworkingConfig_Connection = 4,
 	k_ESteamNetworkingConfigScope__Force32Bit = 0x7fffffff
 };
+typedef enum ESteamNetworkingConfigScope ESteamNetworkingConfigScope;
 
-typedef enum ESteamNetworkingConfigDataType ESteamNetworkingConfigDataType;
 enum ESteamNetworkingConfigDataType
 {
 	k_ESteamNetworkingConfig_Int32 = 1,
@@ -30,8 +30,8 @@ enum ESteamNetworkingConfigDataType
 
 	k_ESteamNetworkingConfigDataType__Force32Bit = 0x7fffffff
 };
+typedef enum ESteamNetworkingConfigDataType ESteamNetworkingConfigDataType;
 
-typedef enum ESteamNetworkingConfigValue ESteamNetworkingConfigValue;
 enum ESteamNetworkingConfigValue
 {
 	k_ESteamNetworkingConfig_Invalid = 0,
@@ -93,9 +93,9 @@ enum ESteamNetworkingConfigValue
 	k_ESteamNetworkingConfig_DELETED_EnumerateDevVars = 35,
 	k_ESteamNetworkingConfigValue__Force32Bit = 0x7fffffff
 };
+typedef enum ESteamNetworkingConfigValue ESteamNetworkingConfigValue;
 
 
-typedef enum ESteamNetworkingConnectionState ESteamNetworkingConnectionState;
 enum ESteamNetworkingConnectionState
 {
 	k_ESteamNetworkingConnectionState_None = 0,
@@ -109,8 +109,8 @@ enum ESteamNetworkingConnectionState
 	k_ESteamNetworkingConnectionState_Dead = -3,
 	k_ESteamNetworkingConnectionState__Force32Bit = 0x7fffffff
 };
+typedef enum ESteamNetworkingConnectionState ESteamNetworkingConnectionState;
 
-typedef enum ESteamNetConnectionEnd ESteamNetConnectionEnd;
 enum ESteamNetConnectionEnd
 {
 	k_ESteamNetConnectionEnd_Invalid = 0,
@@ -152,8 +152,8 @@ enum ESteamNetConnectionEnd
 	k_ESteamNetConnectionEnd_Misc_Max = 5999,
 	k_ESteamNetConnectionEnd__Force32Bit = 0x7fffffff
 };
+typedef enum ESteamNetConnectionEnd ESteamNetConnectionEnd;
 
-typedef enum ESteamNetworkingIdentityType ESteamNetworkingIdentityType;
 enum ESteamNetworkingIdentityType
 {
 	k_ESteamNetworkingIdentityType_Invalid = 0,
@@ -164,8 +164,8 @@ enum ESteamNetworkingIdentityType
 	k_ESteamNetworkingIdentityType_UnknownType = 4,
 	k_ESteamNetworkingIdentityType__Force32bit = 0x7fffffff,
 };
+typedef enum ESteamNetworkingIdentityType ESteamNetworkingIdentityType;
 
-typedef enum ESteamNetworkingAvailability ESteamNetworkingAvailability;
 enum ESteamNetworkingAvailability
 {
 	k_ESteamNetworkingAvailability_CannotTry = -102,
@@ -179,6 +179,7 @@ enum ESteamNetworkingAvailability
 	k_ESteamNetworkingAvailability_Unknown = 0,
 	k_ESteamNetworkingAvailability__Force32bit = 0x7fffffff,
 };
+typedef enum ESteamNetworkingAvailability ESteamNetworkingAvailability;
 
 /* Handle used to identify a connection to a remote host. */
 typedef u32 HSteamNetConnection;
@@ -244,7 +245,6 @@ struct SteamNetworkingIdentity
  * "Fake IPs" are assigned to hosts, to make it easier to interface with
  * older code that assumed all hosts will have an IPv4 address
  */
-typedef enum ESteamNetworkingFakeIPType ESteamNetworkingFakeIPType;
 enum ESteamNetworkingFakeIPType
 {
 	k_ESteamNetworkingFakeIPType_Invalid, 
@@ -253,6 +253,7 @@ enum ESteamNetworkingFakeIPType
 	k_ESteamNetworkingFakeIPType_LocalIPv4,
 	k_ESteamNetworkingFakeIPType__Force32Bit = 0x7fffffff
 };
+typedef enum ESteamNetworkingFakeIPType ESteamNetworkingFakeIPType;
 
 /* Set everything to zero. E.g. [::]:0 */
 void SteamAPI_SteamNetworkingIPAddr_Clear( SteamNetworkingIPAddr* self );
@@ -594,6 +595,12 @@ int SteamAPI_ISteamNetworkingSockets_GetDetailedConnectionStatus(
       ISteamNetworkingSockets* self, 
       HSteamNetConnection hConn, char *pszBuf, int cbBuf );
 
+int SteamAPI_ISteamNetworkingSockets_SetConnectionUserData( 
+      ISteamNetworkingSockets* self, HSteamNetConnection hPeer, i64 nUserData );
+
+i64 SteamAPI_ISteamNetworkingSockets_GetConnectionUserData( 
+      ISteamNetworkingSockets* self, HSteamNetConnection hPeer );
+
 int SteamAPI_ISteamNetworkingSockets_GetListenSocketAddress( 
       ISteamNetworkingSockets* self, 
       HSteamListenSocket hSocket, SteamNetworkingIPAddr *address );
@@ -609,7 +616,6 @@ enum{ k_nSteamNetworkConnectionInfoFlags_Relayed = 16 };
 enum{ k_nSteamNetworkConnectionInfoFlags_DualWifi = 32 };
 
 /* Describe the state of a connection. */
-typedef struct SteamNetConnectionInfo_t SteamNetConnectionInfo_t;
 struct SteamNetConnectionInfo_t
 {
 	/*