Compare commits
No commits in common. "0595490c00fabe86c0f02a79c9cd9776d7b17344" and "ff6c3e994b18b2b500d8a51be4d509ce453af745" have entirely different histories.
0595490c00
...
ff6c3e994b
|
@ -812,25 +812,11 @@ ISteamHTTP *Steam_Client::GetISteamHTTP( HSteamUser hSteamuser, HSteamPipe hStea
|
||||||
{
|
{
|
||||||
PRINT_DEBUG("GetISteamHTTP %s\n", pchVersion);
|
PRINT_DEBUG("GetISteamHTTP %s\n", pchVersion);
|
||||||
if (!steam_pipes.count(hSteamPipe) || !hSteamuser) return NULL;
|
if (!steam_pipes.count(hSteamPipe) || !hSteamuser) return NULL;
|
||||||
Steam_HTTP *steam_http_temp;
|
|
||||||
|
|
||||||
if (steam_pipes[hSteamPipe] == Steam_Pipe::SERVER) {
|
if (steam_pipes[hSteamPipe] == Steam_Pipe::SERVER) {
|
||||||
steam_http_temp = steam_gameserver_http;
|
return steam_gameserver_http;
|
||||||
} else {
|
|
||||||
steam_http_temp = steam_http;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strcmp(pchVersion, "STEAMHTTP_INTERFACE_VERSION001") == 0) {
|
return steam_http;
|
||||||
return (ISteamHTTP *)(void *)(ISteamHTTP001 *)steam_http_temp;
|
|
||||||
} else if (strcmp(pchVersion, "STEAMHTTP_INTERFACE_VERSION002") == 0) {
|
|
||||||
return (ISteamHTTP *)(void *)(ISteamHTTP002 *)steam_http_temp;
|
|
||||||
} else if (strcmp(pchVersion, STEAMHTTP_INTERFACE_VERSION) == 0) {
|
|
||||||
return (ISteamHTTP *)(void *)(ISteamHTTP *)steam_http_temp;
|
|
||||||
} else {
|
|
||||||
return (ISteamHTTP *)(void *)(ISteamHTTP *)steam_http_temp;
|
|
||||||
}
|
|
||||||
|
|
||||||
return steam_http_temp;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Deprecated - the ISteamUnifiedMessages interface is no longer intended for public consumption.
|
// Deprecated - the ISteamUnifiedMessages interface is no longer intended for public consumption.
|
||||||
|
|
|
@ -25,10 +25,7 @@ struct Steam_Http_Request {
|
||||||
std::string response;
|
std::string response;
|
||||||
};
|
};
|
||||||
|
|
||||||
class Steam_HTTP :
|
class Steam_HTTP : public ISteamHTTP
|
||||||
public ISteamHTTP001,
|
|
||||||
public ISteamHTTP002,
|
|
||||||
public ISteamHTTP
|
|
||||||
{
|
{
|
||||||
class Settings *settings;
|
class Settings *settings;
|
||||||
class Networking *network;
|
class Networking *network;
|
||||||
|
|
|
@ -657,8 +657,7 @@ void Steam_Overlay::OverlayProc()
|
||||||
std::lock_guard<std::recursive_mutex> lock(overlay_mutex);
|
std::lock_guard<std::recursive_mutex> lock(overlay_mutex);
|
||||||
if (!friends.empty())
|
if (!friends.empty())
|
||||||
{
|
{
|
||||||
if (ImGui::ListBoxHeader("##label", friends.size()))
|
ImGui::ListBoxHeader("##label", friends.size());
|
||||||
{
|
|
||||||
std::for_each(friends.begin(), friends.end(), [this](std::pair<Friend const, friend_window_state> &i)
|
std::for_each(friends.begin(), friends.end(), [this](std::pair<Friend const, friend_window_state> &i)
|
||||||
{
|
{
|
||||||
ImGui::PushID(i.second.id-base_friend_window_id+base_friend_item_id);
|
ImGui::PushID(i.second.id-base_friend_window_id+base_friend_item_id);
|
||||||
|
@ -676,7 +675,6 @@ void Steam_Overlay::OverlayProc()
|
||||||
ImGui::ListBoxFooter();
|
ImGui::ListBoxFooter();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
ImGui::End();
|
ImGui::End();
|
||||||
|
|
||||||
ImGui::PopFont();
|
ImGui::PopFont();
|
||||||
|
|
|
@ -1,85 +0,0 @@
|
||||||
|
|
||||||
#ifndef ISTEAMHTTP001_H
|
|
||||||
#define ISTEAMHTTP001_H
|
|
||||||
#ifdef STEAM_WIN32
|
|
||||||
#pragma once
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class ISteamHTTP001
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
// Initializes a new HTTP request, returning a handle to use in further operations on it. Requires
|
|
||||||
// the method (GET or POST) and the absolute URL for the request. Only http requests (ie, not https) are
|
|
||||||
// currently supported, so this string must start with http:// or https:// and should look like http://store.steampowered.com/app/250/
|
|
||||||
// or such.
|
|
||||||
virtual HTTPRequestHandle CreateHTTPRequest( EHTTPMethod eHTTPRequestMethod, const char *pchAbsoluteURL ) = 0;
|
|
||||||
|
|
||||||
// Set a context value for the request, which will be returned in the HTTPRequestCompleted_t callback after
|
|
||||||
// sending the request. This is just so the caller can easily keep track of which callbacks go with which request data.
|
|
||||||
virtual bool SetHTTPRequestContextValue( HTTPRequestHandle hRequest, uint64 ulContextValue ) = 0;
|
|
||||||
|
|
||||||
// Set a timeout in seconds for the HTTP request, must be called prior to sending the request. Default
|
|
||||||
// timeout is 60 seconds if you don't call this. Returns false if the handle is invalid, or the request
|
|
||||||
// has already been sent.
|
|
||||||
virtual bool SetHTTPRequestNetworkActivityTimeout( HTTPRequestHandle hRequest, uint32 unTimeoutSeconds ) = 0;
|
|
||||||
|
|
||||||
// Set a request header value for the request, must be called prior to sending the request. Will
|
|
||||||
// return false if the handle is invalid or the request is already sent.
|
|
||||||
virtual bool SetHTTPRequestHeaderValue( HTTPRequestHandle hRequest, const char *pchHeaderName, const char *pchHeaderValue ) = 0;
|
|
||||||
|
|
||||||
// Set a GET or POST parameter value on the request, which is set will depend on the EHTTPMethod specified
|
|
||||||
// when creating the request. Must be called prior to sending the request. Will return false if the
|
|
||||||
// handle is invalid or the request is already sent.
|
|
||||||
virtual bool SetHTTPRequestGetOrPostParameter( HTTPRequestHandle hRequest, const char *pchParamName, const char *pchParamValue ) = 0;
|
|
||||||
|
|
||||||
// Sends the HTTP request, will return false on a bad handle, otherwise use SteamCallHandle to wait on
|
|
||||||
// asyncronous response via callback.
|
|
||||||
//
|
|
||||||
// Note: If the user is in offline mode in Steam, then this will add a only-if-cached cache-control
|
|
||||||
// header and only do a local cache lookup rather than sending any actual remote request.
|
|
||||||
virtual bool SendHTTPRequest( HTTPRequestHandle hRequest, SteamAPICall_t *pCallHandle ) = 0;
|
|
||||||
|
|
||||||
// Defers a request you have sent, the actual HTTP client code may have many requests queued, and this will move
|
|
||||||
// the specified request to the tail of the queue. Returns false on invalid handle, or if the request is not yet sent.
|
|
||||||
virtual bool DeferHTTPRequest( HTTPRequestHandle hRequest ) = 0;
|
|
||||||
|
|
||||||
// Prioritizes a request you have sent, the actual HTTP client code may have many requests queued, and this will move
|
|
||||||
// the specified request to the head of the queue. Returns false on invalid handle, or if the request is not yet sent.
|
|
||||||
virtual bool PrioritizeHTTPRequest( HTTPRequestHandle hRequest ) = 0;
|
|
||||||
|
|
||||||
// Checks if a response header is present in a HTTP response given a handle from HTTPRequestCompleted_t, also
|
|
||||||
// returns the size of the header value if present so the caller and allocate a correctly sized buffer for
|
|
||||||
// GetHTTPResponseHeaderValue.
|
|
||||||
virtual bool GetHTTPResponseHeaderSize( HTTPRequestHandle hRequest, const char *pchHeaderName, uint32 *unResponseHeaderSize ) = 0;
|
|
||||||
|
|
||||||
// Gets header values from a HTTP response given a handle from HTTPRequestCompleted_t, will return false if the
|
|
||||||
// header is not present or if your buffer is too small to contain it's value. You should first call
|
|
||||||
// BGetHTTPResponseHeaderSize to check for the presence of the header and to find out the size buffer needed.
|
|
||||||
virtual bool GetHTTPResponseHeaderValue( HTTPRequestHandle hRequest, const char *pchHeaderName, uint8 *pHeaderValueBuffer, uint32 unBufferSize ) = 0;
|
|
||||||
|
|
||||||
// Gets the size of the body data from a HTTP response given a handle from HTTPRequestCompleted_t, will return false if the
|
|
||||||
// handle is invalid.
|
|
||||||
virtual bool GetHTTPResponseBodySize( HTTPRequestHandle hRequest, uint32 *unBodySize ) = 0;
|
|
||||||
|
|
||||||
// Gets the body data from a HTTP response given a handle from HTTPRequestCompleted_t, will return false if the
|
|
||||||
// handle is invalid or if the provided buffer is not the correct size. Use BGetHTTPResponseBodySize first to find out
|
|
||||||
// the correct buffer size to use.
|
|
||||||
virtual bool GetHTTPResponseBodyData( HTTPRequestHandle hRequest, uint8 *pBodyDataBuffer, uint32 unBufferSize ) = 0;
|
|
||||||
|
|
||||||
// Releases an HTTP response handle, should always be called to free resources after receiving a HTTPRequestCompleted_t
|
|
||||||
// callback and finishing using the response.
|
|
||||||
virtual bool ReleaseHTTPRequest( HTTPRequestHandle hRequest ) = 0;
|
|
||||||
|
|
||||||
// Gets progress on downloading the body for the request. This will be zero unless a response header has already been
|
|
||||||
// received which included a content-length field. For responses that contain no content-length it will report
|
|
||||||
// zero for the duration of the request as the size is unknown until the connection closes.
|
|
||||||
virtual bool GetHTTPDownloadProgressPct( HTTPRequestHandle hRequest, float *pflPercentOut ) = 0;
|
|
||||||
|
|
||||||
// Sets the body for an HTTP Post request. Will fail and return false on a GET request, and will fail if POST params
|
|
||||||
// have already been set for the request. Setting this raw body makes it the only contents for the post, the pchContentType
|
|
||||||
// parameter will set the content-type header for the request so the server may know how to interpret the body.
|
|
||||||
virtual bool SetHTTPRequestRawPostBody( HTTPRequestHandle hRequest, const char *pchContentType, uint8 *pubBody, uint32 unBodyLen ) = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // ISTEAMHTTP001_H
|
|
|
@ -1,124 +0,0 @@
|
||||||
|
|
||||||
#ifndef ISTEAMHTTP002_H
|
|
||||||
#define ISTEAMHTTP002_H
|
|
||||||
#ifdef STEAM_WIN32
|
|
||||||
#pragma once
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class ISteamHTTP002
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
// Initializes a new HTTP request, returning a handle to use in further operations on it. Requires
|
|
||||||
// the method (GET or POST) and the absolute URL for the request. Both http and https are supported,
|
|
||||||
// so this string must start with http:// or https:// and should look like http://store.steampowered.com/app/250/
|
|
||||||
// or such.
|
|
||||||
virtual HTTPRequestHandle CreateHTTPRequest( EHTTPMethod eHTTPRequestMethod, const char *pchAbsoluteURL ) = 0;
|
|
||||||
|
|
||||||
// Set a context value for the request, which will be returned in the HTTPRequestCompleted_t callback after
|
|
||||||
// sending the request. This is just so the caller can easily keep track of which callbacks go with which request data.
|
|
||||||
virtual bool SetHTTPRequestContextValue( HTTPRequestHandle hRequest, uint64 ulContextValue ) = 0;
|
|
||||||
|
|
||||||
// Set a timeout in seconds for the HTTP request, must be called prior to sending the request. Default
|
|
||||||
// timeout is 60 seconds if you don't call this. Returns false if the handle is invalid, or the request
|
|
||||||
// has already been sent.
|
|
||||||
virtual bool SetHTTPRequestNetworkActivityTimeout( HTTPRequestHandle hRequest, uint32 unTimeoutSeconds ) = 0;
|
|
||||||
|
|
||||||
// Set a request header value for the request, must be called prior to sending the request. Will
|
|
||||||
// return false if the handle is invalid or the request is already sent.
|
|
||||||
virtual bool SetHTTPRequestHeaderValue( HTTPRequestHandle hRequest, const char *pchHeaderName, const char *pchHeaderValue ) = 0;
|
|
||||||
|
|
||||||
// Set a GET or POST parameter value on the request, which is set will depend on the EHTTPMethod specified
|
|
||||||
// when creating the request. Must be called prior to sending the request. Will return false if the
|
|
||||||
// handle is invalid or the request is already sent.
|
|
||||||
virtual bool SetHTTPRequestGetOrPostParameter( HTTPRequestHandle hRequest, const char *pchParamName, const char *pchParamValue ) = 0;
|
|
||||||
|
|
||||||
// Sends the HTTP request, will return false on a bad handle, otherwise use SteamCallHandle to wait on
|
|
||||||
// asynchronous response via callback.
|
|
||||||
//
|
|
||||||
// Note: If the user is in offline mode in Steam, then this will add a only-if-cached cache-control
|
|
||||||
// header and only do a local cache lookup rather than sending any actual remote request.
|
|
||||||
virtual bool SendHTTPRequest( HTTPRequestHandle hRequest, SteamAPICall_t *pCallHandle ) = 0;
|
|
||||||
|
|
||||||
// Sends the HTTP request, will return false on a bad handle, otherwise use SteamCallHandle to wait on
|
|
||||||
// asynchronous response via callback for completion, and listen for HTTPRequestHeadersReceived_t and
|
|
||||||
// HTTPRequestDataReceived_t callbacks while streaming.
|
|
||||||
virtual bool SendHTTPRequestAndStreamResponse( HTTPRequestHandle hRequest, SteamAPICall_t *pCallHandle ) = 0;
|
|
||||||
|
|
||||||
// Defers a request you have sent, the actual HTTP client code may have many requests queued, and this will move
|
|
||||||
// the specified request to the tail of the queue. Returns false on invalid handle, or if the request is not yet sent.
|
|
||||||
virtual bool DeferHTTPRequest( HTTPRequestHandle hRequest ) = 0;
|
|
||||||
|
|
||||||
// Prioritizes a request you have sent, the actual HTTP client code may have many requests queued, and this will move
|
|
||||||
// the specified request to the head of the queue. Returns false on invalid handle, or if the request is not yet sent.
|
|
||||||
virtual bool PrioritizeHTTPRequest( HTTPRequestHandle hRequest ) = 0;
|
|
||||||
|
|
||||||
// Checks if a response header is present in a HTTP response given a handle from HTTPRequestCompleted_t, also
|
|
||||||
// returns the size of the header value if present so the caller and allocate a correctly sized buffer for
|
|
||||||
// GetHTTPResponseHeaderValue.
|
|
||||||
virtual bool GetHTTPResponseHeaderSize( HTTPRequestHandle hRequest, const char *pchHeaderName, uint32 *unResponseHeaderSize ) = 0;
|
|
||||||
|
|
||||||
// Gets header values from a HTTP response given a handle from HTTPRequestCompleted_t, will return false if the
|
|
||||||
// header is not present or if your buffer is too small to contain it's value. You should first call
|
|
||||||
// BGetHTTPResponseHeaderSize to check for the presence of the header and to find out the size buffer needed.
|
|
||||||
virtual bool GetHTTPResponseHeaderValue( HTTPRequestHandle hRequest, const char *pchHeaderName, uint8 *pHeaderValueBuffer, uint32 unBufferSize ) = 0;
|
|
||||||
|
|
||||||
// Gets the size of the body data from a HTTP response given a handle from HTTPRequestCompleted_t, will return false if the
|
|
||||||
// handle is invalid.
|
|
||||||
virtual bool GetHTTPResponseBodySize( HTTPRequestHandle hRequest, uint32 *unBodySize ) = 0;
|
|
||||||
|
|
||||||
// Gets the body data from a HTTP response given a handle from HTTPRequestCompleted_t, will return false if the
|
|
||||||
// handle is invalid or is to a streaming response, or if the provided buffer is not the correct size. Use BGetHTTPResponseBodySize first to find out
|
|
||||||
// the correct buffer size to use.
|
|
||||||
virtual bool GetHTTPResponseBodyData( HTTPRequestHandle hRequest, uint8 *pBodyDataBuffer, uint32 unBufferSize ) = 0;
|
|
||||||
|
|
||||||
// Gets the body data from a streaming HTTP response given a handle from HTTPRequestDataReceived_t. Will return false if the
|
|
||||||
// handle is invalid or is to a non-streaming response (meaning it wasn't sent with SendHTTPRequestAndStreamResponse), or if the buffer size and offset
|
|
||||||
// do not match the size and offset sent in HTTPRequestDataReceived_t.
|
|
||||||
virtual bool GetHTTPStreamingResponseBodyData( HTTPRequestHandle hRequest, uint32 cOffset, uint8 *pBodyDataBuffer, uint32 unBufferSize ) = 0;
|
|
||||||
|
|
||||||
// Releases an HTTP response handle, should always be called to free resources after receiving a HTTPRequestCompleted_t
|
|
||||||
// callback and finishing using the response.
|
|
||||||
virtual bool ReleaseHTTPRequest( HTTPRequestHandle hRequest ) = 0;
|
|
||||||
|
|
||||||
// Gets progress on downloading the body for the request. This will be zero unless a response header has already been
|
|
||||||
// received which included a content-length field. For responses that contain no content-length it will report
|
|
||||||
// zero for the duration of the request as the size is unknown until the connection closes.
|
|
||||||
virtual bool GetHTTPDownloadProgressPct( HTTPRequestHandle hRequest, float *pflPercentOut ) = 0;
|
|
||||||
|
|
||||||
// Sets the body for an HTTP Post request. Will fail and return false on a GET request, and will fail if POST params
|
|
||||||
// have already been set for the request. Setting this raw body makes it the only contents for the post, the pchContentType
|
|
||||||
// parameter will set the content-type header for the request so the server may know how to interpret the body.
|
|
||||||
virtual bool SetHTTPRequestRawPostBody( HTTPRequestHandle hRequest, const char *pchContentType, uint8 *pubBody, uint32 unBodyLen ) = 0;
|
|
||||||
|
|
||||||
// Creates a cookie container handle which you must later free with ReleaseCookieContainer(). If bAllowResponsesToModify=true
|
|
||||||
// than any response to your requests using this cookie container may add new cookies which may be transmitted with
|
|
||||||
// future requests. If bAllowResponsesToModify=false than only cookies you explicitly set will be sent. This API is just for
|
|
||||||
// during process lifetime, after steam restarts no cookies are persisted and you have no way to access the cookie container across
|
|
||||||
// repeat executions of your process.
|
|
||||||
virtual HTTPCookieContainerHandle CreateCookieContainer( bool bAllowResponsesToModify ) = 0;
|
|
||||||
|
|
||||||
// Release a cookie container you are finished using, freeing it's memory
|
|
||||||
virtual bool ReleaseCookieContainer( HTTPCookieContainerHandle hCookieContainer ) = 0;
|
|
||||||
|
|
||||||
// Adds a cookie to the specified cookie container that will be used with future requests.
|
|
||||||
virtual bool SetCookie( HTTPCookieContainerHandle hCookieContainer, const char *pchHost, const char *pchUrl, const char *pchCookie ) = 0;
|
|
||||||
|
|
||||||
// Set the cookie container to use for a HTTP request
|
|
||||||
virtual bool SetHTTPRequestCookieContainer( HTTPRequestHandle hRequest, HTTPCookieContainerHandle hCookieContainer ) = 0;
|
|
||||||
|
|
||||||
// Set the extra user agent info for a request, this doesn't clobber the normal user agent, it just adds the extra info on the end
|
|
||||||
virtual bool SetHTTPRequestUserAgentInfo( HTTPRequestHandle hRequest, const char *pchUserAgentInfo ) = 0;
|
|
||||||
|
|
||||||
// Set that https request should require verified SSL certificate via machines certificate trust store
|
|
||||||
virtual bool SetHTTPRequestRequiresVerifiedCertificate( HTTPRequestHandle hRequest, bool bRequireVerifiedCertificate ) = 0;
|
|
||||||
|
|
||||||
// Set an absolute timeout on the HTTP request, this is just a total time timeout different than the network activity timeout
|
|
||||||
// which can bump everytime we get more data
|
|
||||||
virtual bool SetHTTPRequestAbsoluteTimeoutMS( HTTPRequestHandle hRequest, uint32 unMilliseconds ) = 0;
|
|
||||||
|
|
||||||
// Check if the reason the request failed was because we timed it out (rather than some harder failure)
|
|
||||||
virtual bool GetHTTPRequestWasTimedOut( HTTPRequestHandle hRequest, bool *pbWasTimedOut ) = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // ISTEAMHTTP002_H
|
|
|
@ -128,8 +128,6 @@
|
||||||
#include "isteammusic.h"
|
#include "isteammusic.h"
|
||||||
#include "isteammusicremote.h"
|
#include "isteammusicremote.h"
|
||||||
#include "isteamhttp.h"
|
#include "isteamhttp.h"
|
||||||
#include "isteamhttp001.h"
|
|
||||||
#include "isteamhttp002.h"
|
|
||||||
#include "isteamcontroller.h"
|
#include "isteamcontroller.h"
|
||||||
#include "isteamcontroller001.h"
|
#include "isteamcontroller001.h"
|
||||||
#include "isteamcontroller003.h"
|
#include "isteamcontroller003.h"
|
||||||
|
|
Loading…
Reference in New Issue