Merge pull request #569 from xPaw/xpaw/emsg

Update EMsg and some enums
SteamRE · Jul 8, 2018 · 730482b · 730482b
2 parents 497e84e + f67fc73
commit 730482b
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 28 deletions.
diff --git a/Resources/Misc/emsg_list_detailed.txt b/Resources/Misc/emsg_list_detailed.txt
@@ -1,7 +1,9 @@
 	k_EMsgDestJobFailed = 113, // flags: 59, server type: -1
 	k_EMsgHubConnect = 124, // flags: 59, server type: -1
 	k_EMsgServiceMethod = 146, // flags: 59, server type: -1
-	k_EMsgServiceMethodResponse = 147, // flags: 59, server type: -1
+	k_EMsgServiceMethodResponse = 147, // flags: 63, server type: 41
+	k_EMsgServiceMethodCallFromClient = 151, // flags: 6, server type: 41
+	k_EMsgServiceMethodSendToClient = 152, // flags: 6, server type: 41
 	k_EMsgClientChatAction = 597, // flags: 2, server type: -1
 	k_EMsgClientLogOn_Deprecated = 701, // flags: 2, server type: -1
 	k_EMsgClientAnonLogOn_Deprecated = 702, // flags: 2, server type: -1
@@ -16,7 +18,7 @@
 	k_EMsgClientGamesPlayedNoDataBlob = 715, // flags: 6, server type: 47
 	k_EMsgClientChangeStatus = 716, // flags: 2, server type: -1
 	k_EMsgClientVacStatusResponse = 717, // flags: 2, server type: -1
-	k_EMsgClientFriendMsg = 718, // flags: 2, server type: -1
+	k_EMsgClientFriendMsg = 718, // flags: 6, server type: 102
 	k_EMsgClientSystemIM = 726, // flags: 2, server type: -1
 	k_EMsgClientSystemIMAck = 727, // flags: 2, server type: -1
 	k_EMsgClientGetLicenses = 728, // flags: 2, server type: -1
@@ -129,7 +131,7 @@
 	k_EMsgClientDPSendSpecialSurveyResponse = 1622, // flags: 6, server type: 17
 	k_EMsgClientDPSendSpecialSurveyResponseReply = 1623, // flags: 6, server type: 17
 	k_EMsgClientDPUpdateAppJobReport = 1625, // flags: 6, server type: 17
-	k_EMsgClientDPContentStatsReport = 1630, // flags: 6, server type: 17
+	k_EMsgClientDPContentStatsReport = 1630, // flags: 6, server type: 16
 	k_EMsgClientChatRoomInfo = 4026, // flags: 2, server type: -1
 	k_EMsgAMGameServerUpdate = 4331, // flags: 2, server type: -1
 	k_EMsgAMGameServerRemove = 4332, // flags: 2, server type: -1
@@ -280,7 +282,7 @@
 	k_EMsgClientEmailChangeResponse4 = 5545, // flags: 2, server type: -1
 	k_EMsgClientGetCDNAuthToken = 5546, // flags: 2, server type: -1
 	k_EMsgClientGetCDNAuthTokenResponse = 5547, // flags: 2, server type: -1
-	k_EMsgClientDownloadRateStatistics = 5548, // flags: 63, server type: 17
+	k_EMsgClientDownloadRateStatistics = 5548, // flags: 63, server type: 16
 	k_EMsgClientRequestAccountData = 5549, // flags: 2, server type: -1
 	k_EMsgClientRequestAccountDataResponse = 5550, // flags: 2, server type: -1
 	k_EMsgClientResetForgottenPassword4 = 5551, // flags: 2, server type: -1
@@ -334,6 +336,8 @@
 	k_EMsgClientDFSAuthenticateResponse = 5606, // flags: 2, server type: -1
 	k_EMsgClientDFSEndSession = 5607, // flags: 2, server type: -1
 	k_EMsgClientDFSDownloadStatus = 5617, // flags: 2, server type: -1
+	k_EMsgClientNetworkingCertRequest = 5621, // flags: 2, server type: -1
+	k_EMsgClientNetworkingCertRequestResponse = 5622, // flags: 2, server type: -1
 	k_EMsgClientGMSServerQuery = 6403, // flags: 63, server type: 43
 	k_EMsgGMSClientServerQueryResponse = 6404, // flags: 59, server type: -1
 	k_EMsgGameServerOutOfDate = 6407, // flags: 59, server type: -1
@@ -365,7 +369,7 @@
 	k_EMsgClientMMSLobbyGameServerSet = 6618, // flags: 6, server type: 42
 	k_EMsgClientMMSUserJoinedLobby = 6619, // flags: 6, server type: 42
 	k_EMsgClientMMSUserLeftLobby = 6620, // flags: 6, server type: 42
-	k_EMsgClientMMSInviteToLobby = 6621, // flags: 6, server type: 42
+	k_EMsgClientMMSInviteToLobby = 6621, // flags: 63, server type: 42
 	k_EMsgClientMMSSetLobbyLinked = 6624, // flags: 6, server type: 42
 	k_EMsgNonStdMsgMemcached = 6801, // flags: 0, server type: -1
 	k_EMsgNonStdMsgHTTPServer = 6802, // flags: 0, server type: -1
@@ -420,11 +424,11 @@
 	k_EMsgClientFSGetIsFollowingResponse = 7518, // flags: 6, server type: 47
 	k_EMsgClientFSEnumerateFollowingList = 7519, // flags: 6, server type: 47
 	k_EMsgClientFSEnumerateFollowingListResponse = 7520, // flags: 6, server type: 47
-	k_EMsgClientFSOfflineMessageNotification = 7523, // flags: 2, server type: -1
-	k_EMsgClientFSRequestOfflineMessageCount = 7524, // flags: 6, server type: 47
-	k_EMsgClientFSGetFriendMessageHistory = 7525, // flags: 6, server type: 47
-	k_EMsgClientFSGetFriendMessageHistoryResponse = 7526, // flags: 6, server type: 47
-	k_EMsgClientFSGetFriendMessageHistoryForOfflineMessages = 7527, // flags: 6, server type: 47
+	k_EMsgClientChatOfflineMessageNotification = 7523, // flags: 2, server type: -1
+	k_EMsgClientChatRequestOfflineMessageCount = 7524, // flags: 6, server type: 102
+	k_EMsgClientChatGetFriendMessageHistory = 7525, // flags: 6, server type: 102
+	k_EMsgClientChatGetFriendMessageHistoryResponse = 7526, // flags: 6, server type: 102
+	k_EMsgClientChatGetFriendMessageHistoryForOfflineMessages = 7527, // flags: 6, server type: 102
 	k_EMsgClientFSGetFriendsSteamLevels = 7528, // flags: 6, server type: 47
 	k_EMsgClientFSGetFriendsSteamLevelsResponse = 7529, // flags: 6, server type: 47
 	k_EMsgEconTrading_InitiateTradeRequest = 7701, // flags: 6, server type: 59
@@ -455,6 +459,8 @@
 	k_EMsgClientSharedLibraryStopPlaying = 9406, // flags: 2, server type: -1
 	k_EMsgClientUnlockStreaming = 9507, // flags: 59, server type: -1
 	k_EMsgClientUnlockStreamingResponse = 9508, // flags: 59, server type: -1
+	k_EMsgClientUnlockHEVC = 9513, // flags: 59, server type: -1
+	k_EMsgClientUnlockHEVCResponse = 9514, // flags: 59, server type: -1
 	k_EMsgClientPlayingSessionState = 9600, // flags: 2, server type: -1
 	k_EMsgClientKickPlayingSession = 9601, // flags: 2, server type: -1
 	k_EMsgClientBroadcastInit = 9700, // flags: 2, server type: -1
@@ -464,3 +470,4 @@
 	k_EMsgClientBroadcastUploadConfig = 9704, // flags: 2, server type: -1
 	k_EMsgClientVoiceCallPreAuthorize = 9800, // flags: 59, server type: -1
 	k_EMsgClientVoiceCallPreAuthorizeResponse = 9801, // flags: 59, server type: -1
+	k_EMsgClientServerTimestampRequest = 9802, // flags: 2, server type: -1
diff --git a/Resources/SteamLanguage/emsg.steamd b/Resources/SteamLanguage/emsg.steamd
@@ -38,6 +38,8 @@ enum EMsg
 	ClientPackageVersions = 148;
 	TimestampRequest = 149;
 	TimestampResponse = 150;
+	ServiceMethodCallFromClient = 151;
+	ServiceMethodSendToClient = 152;
 
 	BaseShell = 200;
 	AssignSysID = 200;
@@ -1444,6 +1446,8 @@ enum EMsg
 	DFSStartTransfer = 5618;
 	DFSTransferComplete = 5619;
 	DFSRouteFileResponse = 5620;
+	ClientNetworkingCertRequest = 5621;
+	ClientNetworkingCertRequestResponse = 5622;
 
 	BaseMDS = 5800;
 	ClientMDSLoginRequest = 5801; removed
@@ -1691,11 +1695,16 @@ enum EMsg
 	ClientFSEnumerateFollowingListResponse = 7520;
 	FSGetPendingNotificationCount = 7521;
 	FSGetPendingNotificationCountResponse = 7522;
-	ClientFSOfflineMessageNotification = 7523;
-	ClientFSRequestOfflineMessageCount = 7524;
-	ClientFSGetFriendMessageHistory = 7525;
-	ClientFSGetFriendMessageHistoryResponse = 7526;
-	ClientFSGetFriendMessageHistoryForOfflineMessages = 7527;
+	ClientFSOfflineMessageNotification = 7523; obsolete "Renamed to ClientChatOfflineMessageNotification"
+	ClientFSRequestOfflineMessageCount = 7524; obsolete "Renamed to ClientChatRequestOfflineMessageCount"
+	ClientFSGetFriendMessageHistory = 7525; obsolete "Renamed to ClientChatGetFriendMessageHistory"
+	ClientFSGetFriendMessageHistoryResponse = 7526; obsolete "Renamed to ClientChatGetFriendMessageHistoryResponse"
+	ClientFSGetFriendMessageHistoryForOfflineMessages = 7527; obsolete "Renamed to ClientChatGetFriendMessageHistoryForOfflineMessages"
+	ClientChatOfflineMessageNotification = 7523;
+	ClientChatRequestOfflineMessageCount = 7524;
+	ClientChatGetFriendMessageHistory = 7525;
+	ClientChatGetFriendMessageHistoryResponse = 7526;
+	ClientChatGetFriendMessageHistoryForOfflineMessages = 7527;
 	ClientFSGetFriendsSteamLevels = 7528;
 	ClientFSGetFriendsSteamLevelsResponse = 7529;
 	FSRequestFriendData = 7530;
@@ -1887,6 +1896,8 @@ enum EMsg
 	RemoteClientGetControllerConfig = 9510;
 	RemoteClientGetControllerConfigResposne = 9511;
 	RemoteClientStreamingEnabled = 9512;
+	ClientUnlockHEVC = 9513;
+	ClientUnlockHEVCResponse = 9514;
 
 	ClientConcurrentSessionsBase = 9600;
 	ClientPlayingSessionState = 9600;
@@ -1902,5 +1913,6 @@ enum EMsg
 	BaseClient3 = 9800;
 	ClientVoiceCallPreAuthorize = 9800;
 	ClientVoiceCallPreAuthorizeResponse = 9801;
+	ClientServerTimestampRequest = 9802;
 
 };
diff --git a/Resources/SteamLanguage/enums.steamd b/Resources/SteamLanguage/enums.steamd
@@ -584,8 +584,9 @@ enum EAppInfoSection
 	SysReqs = 14;
 	Community = 15;
 	Store = 16;
+	Localization = 17;
 
-	Max = 17;
+	Max = 18;
 };
 
 enum EContentDownloadSourceType
@@ -597,8 +598,11 @@ enum EContentDownloadSourceType
 	LCS = 3;
 	ProxyCache = 4;
 	LANPeer = 5;
+	SLS = 6;
+	SteamCache = 7;
+	OpenCache = 8;
 
-	Max = 5;
+	Max = 9;
 };
 
 enum EPlatformType
@@ -613,13 +617,15 @@ enum EPlatformType
 	PS3 = 5;
 	Linux32 = 6;
 
-	Max = 6;
+	Max = 7;
 };
 
 enum EOSType
 {
 	Unknown = -1;
 
+	Web = -700;
+
 	IOSUnknown = -600;
 
 	AndroidUnknown = -500;
@@ -642,6 +648,8 @@ enum EOSType
 	MacOS1010 = -87;
 	MacOS1011 = -86;
 	MacOS1012 = -85;
+	Macos1013 = -84;
+	Macos1014 = -83;
 	MacOSMax = -1;
 
 	LinuxUnknown = -203;
@@ -652,7 +660,14 @@ enum EOSType
 	Linux35 = -198;
 	Linux36 = -197;
 	Linux310 = -196;
-	LinuxMax = -103;
+	Linux316 = -195;
+	Linux318 = -194;
+	Linux3x = -193;
+	Linux4x = -192;
+	Linux41 = -191;
+	Linux44 = -190;
+	Linux49 = -189;
+	LinuxMax = -101;
 
 	WinUnknown = 0;
 	Win311 = 1;
@@ -676,8 +691,9 @@ enum EOSType
 	Win2012R2 = 15;
 	Win10 = 16; removed "renamed to Windows10"
 	Windows10 = 16;
+	Win2016 = 17;
 
-	WinMAX = 15;
+	WinMAX = 18;
 
 	Max = 26;
 };

diff --git a/SteamKit2/SteamKit2/Base/Generated/SteamLanguage.cs b/SteamKit2/SteamKit2/Base/Generated/SteamLanguage.cs
@@ -41,6 +41,8 @@ public enum EMsg
 		ClientPackageVersions = 148,
 		TimestampRequest = 149,
 		TimestampResponse = 150,
+		ServiceMethodCallFromClient = 151,
+		ServiceMethodSendToClient = 152,
 		BaseShell = 200,
 		AssignSysID = 200,
 		Exit = 201,
@@ -1179,6 +1181,8 @@ public enum EMsg
 		DFSStartTransfer = 5618,
 		DFSTransferComplete = 5619,
 		DFSRouteFileResponse = 5620,
+		ClientNetworkingCertRequest = 5621,
+		ClientNetworkingCertRequestResponse = 5622,
 		BaseMDS = 5800,
 		AMToMDSGetDepotDecryptionKey = 5812,
 		MDSToAMGetDepotDecryptionKeyResponse = 5813,
@@ -1348,11 +1352,21 @@ public enum EMsg
 		ClientFSEnumerateFollowingListResponse = 7520,
 		FSGetPendingNotificationCount = 7521,
 		FSGetPendingNotificationCountResponse = 7522,
+		[Obsolete( "Renamed to ClientChatOfflineMessageNotification" )]
 		ClientFSOfflineMessageNotification = 7523,
+		[Obsolete( "Renamed to ClientChatRequestOfflineMessageCount" )]
 		ClientFSRequestOfflineMessageCount = 7524,
+		[Obsolete( "Renamed to ClientChatGetFriendMessageHistory" )]
 		ClientFSGetFriendMessageHistory = 7525,
+		[Obsolete( "Renamed to ClientChatGetFriendMessageHistoryResponse" )]
 		ClientFSGetFriendMessageHistoryResponse = 7526,
+		[Obsolete( "Renamed to ClientChatGetFriendMessageHistoryForOfflineMessages" )]
 		ClientFSGetFriendMessageHistoryForOfflineMessages = 7527,
+		ClientChatOfflineMessageNotification = 7523,
+		ClientChatRequestOfflineMessageCount = 7524,
+		ClientChatGetFriendMessageHistory = 7525,
+		ClientChatGetFriendMessageHistoryResponse = 7526,
+		ClientChatGetFriendMessageHistoryForOfflineMessages = 7527,
 		ClientFSGetFriendsSteamLevels = 7528,
 		ClientFSGetFriendsSteamLevelsResponse = 7529,
 		FSRequestFriendData = 7530,
@@ -1505,6 +1519,8 @@ public enum EMsg
 		RemoteClientGetControllerConfig = 9510,
 		RemoteClientGetControllerConfigResposne = 9511,
 		RemoteClientStreamingEnabled = 9512,
+		ClientUnlockHEVC = 9513,
+		ClientUnlockHEVCResponse = 9514,
 		ClientConcurrentSessionsBase = 9600,
 		ClientPlayingSessionState = 9600,
 		ClientKickPlayingSession = 9601,
@@ -1517,6 +1533,7 @@ public enum EMsg
 		BaseClient3 = 9800,
 		ClientVoiceCallPreAuthorize = 9800,
 		ClientVoiceCallPreAuthorizeResponse = 9801,
+		ClientServerTimestampRequest = 9802,
 	}
 	public enum EResult
 	{
@@ -2152,7 +2169,8 @@ public enum EAppInfoSection
 		SysReqs = 14,
 		Community = 15,
 		Store = 16,
-		Max = 17,
+		Localization = 17,
+		Max = 18,
 	}
 	public enum EContentDownloadSourceType
 	{
@@ -2162,7 +2180,10 @@ public enum EContentDownloadSourceType
 		LCS = 3,
 		ProxyCache = 4,
 		LANPeer = 5,
-		Max = 5,
+		SLS = 6,
+		SteamCache = 7,
+		OpenCache = 8,
+		Max = 9,
 	}
 	public enum EPlatformType
 	{
@@ -2173,11 +2194,12 @@ public enum EPlatformType
 		OSX = 4,
 		PS3 = 5,
 		Linux32 = 6,
-		Max = 6,
+		Max = 7,
 	}
 	public enum EOSType
 	{
 		Unknown = -1,
+		Web = -700,
 		IOSUnknown = -600,
 		AndroidUnknown = -500,
 		UMQ = -400,
@@ -2196,6 +2218,8 @@ public enum EOSType
 		MacOS1010 = -87,
 		MacOS1011 = -86,
 		MacOS1012 = -85,
+		Macos1013 = -84,
+		Macos1014 = -83,
 		MacOSMax = -1,
 		LinuxUnknown = -203,
 		Linux22 = -202,
@@ -2205,7 +2229,14 @@ public enum EOSType
 		Linux35 = -198,
 		Linux36 = -197,
 		Linux310 = -196,
-		LinuxMax = -103,
+		Linux316 = -195,
+		Linux318 = -194,
+		Linux3x = -193,
+		Linux4x = -192,
+		Linux41 = -191,
+		Linux44 = -190,
+		Linux49 = -189,
+		LinuxMax = -101,
 		WinUnknown = 0,
 		Win311 = 1,
 		Win95 = 2,
@@ -2223,7 +2254,8 @@ public enum EOSType
 		Windows81 = 14,
 		Win2012R2 = 15,
 		Windows10 = 16,
-		WinMAX = 15,
+		Win2016 = 17,
+		WinMAX = 18,
 		Max = 26,
 	}
 	public enum EServerType

diff --git a/SteamKit2/SteamKit2/Steam/Handlers/SteamFriends/SteamFriends.cs b/SteamKit2/SteamKit2/Steam/Handlers/SteamFriends/SteamFriends.cs
@@ -40,7 +40,7 @@ internal SteamFriends()
                 { EMsg.ClientFriendsList, HandleFriendsList },
                 { EMsg.ClientFriendMsgIncoming, HandleFriendMsg },
                 { EMsg.ClientFriendMsgEchoToSender, HandleFriendEchoMsg },
-                { EMsg.ClientFSGetFriendMessageHistoryResponse, HandleFriendMessageHistoryResponse },
+                { EMsg.ClientChatGetFriendMessageHistoryResponse, HandleFriendMessageHistoryResponse },
                 { EMsg.ClientAccountInfo, HandleAccountInfo },
                 { EMsg.ClientAddFriendResponse, HandleFriendResponse },
                 { EMsg.ClientChatEnter, HandleChatEnter },
@@ -712,7 +712,7 @@ public void RequestMessageHistory( SteamID steamId )
                 throw new ArgumentNullException( nameof(steamId) );
             }
 
-            var request = new ClientMsgProtobuf<CMsgClientChatGetFriendMessageHistory>( EMsg.ClientFSGetFriendMessageHistory );
+            var request = new ClientMsgProtobuf<CMsgClientChatGetFriendMessageHistory>( EMsg.ClientChatGetFriendMessageHistory );
 
             request.Body.steamid = steamId;
 
@@ -726,7 +726,7 @@ public void RequestMessageHistory( SteamID steamId )
         /// </summary>
         public void RequestOfflineMessages()
         {
-            var request = new ClientMsgProtobuf<CMsgClientChatGetFriendMessageHistoryForOfflineMessages>( EMsg.ClientFSGetFriendMessageHistoryForOfflineMessages );
+            var request = new ClientMsgProtobuf<CMsgClientChatGetFriendMessageHistoryForOfflineMessages>( EMsg.ClientChatGetFriendMessageHistoryForOfflineMessages );
 
             this.Client.Send( request );
         }