diff options
| author | George Hazan <george.hazan@gmail.com> | 2024-01-04 11:50:17 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2024-01-04 11:50:17 +0300 |
| commit | e63471b9885d040b9e6db3255432f6cea36144e9 (patch) | |
| tree | b6df226f74aae24124dee796ecb40355da0fa075 /src/mir_app | |
| parent | 2b6d50f7fdfaca84c3ee82909800ad67d2e99bdc (diff) | |
Netlib: more old/unused stuff removed
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/chat_svc.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app.def | 5 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 5 | ||||
| -rw-r--r-- | src/mir_app/src/netlib.cpp | 10 | ||||
| -rw-r--r-- | src/mir_app/src/netlib.h | 6 | ||||
| -rw-r--r-- | src/mir_app/src/netlib_http.cpp | 38 | ||||
| -rw-r--r-- | src/mir_app/src/netlib_httpproxy.cpp | 12 |
7 files changed, 38 insertions, 40 deletions
diff --git a/src/mir_app/src/chat_svc.cpp b/src/mir_app/src/chat_svc.cpp index aacc6d7eb3..c5ec1731c2 100644 --- a/src/mir_app/src/chat_svc.cpp +++ b/src/mir_app/src/chat_svc.cpp @@ -874,7 +874,7 @@ static int OnEventDeleted(WPARAM hContact, LPARAM hDbEvent) if (Contact::IsGroupChat(hContact))
if (auto *si = SM_FindSessionByContact(hContact))
for (auto &it : si->arEvents.rev_iter())
- if (it->hEvent == hDbEvent) {
+ if (it->hEvent == MEVENT(hDbEvent)) {
si->arEvents.removeItem(&it);
break;
}
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 4152581314..68914f96b2 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -260,10 +260,7 @@ Netlib_Log @353 Netlib_LogW @354
Netlib_Logf @355
Netlib_LogfW @356
-Netlib_GetConnNlu @357
-Netlib_RecvHttpHeaders @358
Netlib_HttpTransaction @359
-Netlib_SendHttpRequest @360
Netlib_GetUserSettings @361
Netlib_SetUserSettings @362
Netlib_OpenConnection @363
@@ -276,9 +273,7 @@ Netlib_AddressToString @369 Netlib_StringToAddress @370
Netlib_Select @371
Netlib_SelectEx @372
-Netlib_SendHttpRequest @373
Netlib_SetStickyHeaders @374
-Netlib_SetPollingTimeout @375
Netlib_GetSocket @376
Netlib_StartSsl @377
Netlib_GetConnectionInfo @378
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 1adcdd89e3..b3aa1095b9 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -260,10 +260,7 @@ Netlib_Log @353 Netlib_LogW @354
Netlib_Logf @355
Netlib_LogfW @356
-Netlib_GetConnNlu @357
-Netlib_RecvHttpHeaders @358
Netlib_HttpTransaction @359
-Netlib_SendHttpRequest @360
Netlib_GetUserSettings @361
Netlib_SetUserSettings @362
Netlib_OpenConnection @363
@@ -276,9 +273,7 @@ Netlib_AddressToString @369 Netlib_StringToAddress @370
Netlib_Select @371
Netlib_SelectEx @372
-Netlib_SendHttpRequest @373
Netlib_SetStickyHeaders @374
-Netlib_SetPollingTimeout @375
Netlib_GetSocket @376
Netlib_StartSsl @377
Netlib_GetConnectionInfo @378
diff --git a/src/mir_app/src/netlib.cpp b/src/mir_app/src/netlib.cpp index 89da9164bf..e12184255c 100644 --- a/src/mir_app/src/netlib.cpp +++ b/src/mir_app/src/netlib.cpp @@ -378,16 +378,6 @@ MIR_APP_DLL(UINT_PTR) Netlib_GetSocket(HNETLIBCONN hConnection) /////////////////////////////////////////////////////////////////////////////////////////
-MIR_APP_DLL(HNETLIBUSER) Netlib_GetConnNlu(HANDLE hConn)
-{
- if (GetNetlibHandleType(hConn) != NLH_CONNECTION)
- return nullptr;
-
- return ((NetlibConnection*)hConn)->nlu;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-
MIR_APP_DLL(char*) Netlib_GetUserAgent()
{
return szUserAgent;
diff --git a/src/mir_app/src/netlib.h b/src/mir_app/src/netlib.h index 09480637bf..d5ddb6687b 100644 --- a/src/mir_app/src/netlib.h +++ b/src/mir_app/src/netlib.h @@ -105,7 +105,6 @@ struct NetlibConnection : public MZeroedObject uint16_t wProxyPort;
CMStringA szProxyBuf;
- int pollingTimeout;
unsigned lastPost;
};
@@ -165,7 +164,10 @@ bool BindSocketToPort(const char *szPorts, SOCKET s, SOCKET s6, int* portn); // netlibhttp.cpp
void NetlibHttpSetLastErrorUsingHttpResult(int result);
-NETLIBHTTPREQUEST* NetlibHttpRecv(NetlibConnection* nlc, uint32_t hflags, uint32_t dflags, bool isConnect = false);
+int Netlib_SendHttpRequest(HNETLIBCONN hConnection, NETLIBHTTPREQUEST *pRec);
+
+NETLIBHTTPREQUEST* Netlib_RecvHttpHeaders(NetlibConnection *hConnection, int flags = 0);
+NETLIBHTTPREQUEST* NetlibHttpRecv(NetlibConnection *nlc, uint32_t hflags, uint32_t dflags, bool isConnect = false);
// netliblog.cpp
void NetlibLogShowOptions(void);
diff --git a/src/mir_app/src/netlib_http.cpp b/src/mir_app/src/netlib_http.cpp index 2317329e04..6845435d34 100644 --- a/src/mir_app/src/netlib_http.cpp +++ b/src/mir_app/src/netlib_http.cpp @@ -368,7 +368,18 @@ static int SendHttpRequestAndData(NetlibConnection *nlc, CMStringA &httpRequest, return bytesSent;
}
-MIR_APP_DLL(int) Netlib_SendHttpRequest(HNETLIBCONN nlc, NETLIBHTTPREQUEST *nlhr)
+/////////////////////////////////////////////////////////////////////////////////////////
+// Sends a HTTP request over a connection
+//
+// Returns number of bytes sent on success, SOCKET_ERROR on failure
+// hConnection must have been returned by MS_NETLIB_OPENCONNECTION
+// Note that if you use NLHRF_SMARTAUTHHEADER and NTLM authentication is in use
+// then the full NTLM authentication transaction occurs, comprising sending the
+// domain, receiving the challenge, then sending the response.
+// nlhr.resultCode and nlhr.szResultDescr are ignored by this function.
+// Errors: ERROR_INVALID_PARAMETER, anything returned by MS_NETLIB_SEND
+
+int Netlib_SendHttpRequest(HNETLIBCONN nlc, NETLIBHTTPREQUEST *nlhr)
{
NETLIBHTTPREQUEST *nlhrReply = nullptr;
HttpSecurityContext httpSecurity;
@@ -544,13 +555,13 @@ MIR_APP_DLL(int) Netlib_SendHttpRequest(HNETLIBCONN nlc, NETLIBHTTPREQUEST *nlhr (nlhr->flags & NLHRF_NOPROXY ? MSG_RAW : 0) | MSG_NODUMP;
if (resultCode == 100)
- nlhrReply = (NETLIBHTTPREQUEST*)Netlib_RecvHttpHeaders(nlc, hflags);
+ nlhrReply = Netlib_RecvHttpHeaders(nlc, hflags);
else if (resultCode == 307 || ((resultCode == 301 || resultCode == 302) && (nlhr->flags & NLHRF_REDIRECT))) { // redirect
pszUrl = nullptr;
if (nlhr->requestType == REQUEST_HEAD)
- nlhrReply = (NETLIBHTTPREQUEST*)Netlib_RecvHttpHeaders(nlc, hflags);
+ nlhrReply = Netlib_RecvHttpHeaders(nlc, hflags);
else
nlhrReply = NetlibHttpRecv(nlc, hflags, dflags);
@@ -592,7 +603,7 @@ MIR_APP_DLL(int) Netlib_SendHttpRequest(HNETLIBCONN nlc, NETLIBHTTPREQUEST *nlhr }
else if (resultCode == 401 && !doneAuthHeader) { //auth required
if (nlhr->requestType == REQUEST_HEAD)
- nlhrReply = (NETLIBHTTPREQUEST*)Netlib_RecvHttpHeaders(nlc, hflags);
+ nlhrReply = Netlib_RecvHttpHeaders(nlc, hflags);
else
nlhrReply = NetlibHttpRecv(nlc, hflags, dflags);
@@ -710,9 +721,26 @@ MIR_APP_DLL(bool) Netlib_FreeHttpRequest(NETLIBHTTPREQUEST *nlhr) return true;
}
+/////////////////////////////////////////////////////////////////////////////////////////
+// Receives HTTP headers
+//
+// Returns a pointer to a NETLIBHTTPREQUEST structure on success, NULL on failure.
+// Call Netlib_FreeHttpRequest() to free this.
+// hConnection must have been returned by MS_NETLIB_OPENCONNECTION
+// nlhr->pData = NULL and nlhr->dataLength = 0 always. The requested data should
+// be retrieved using MS_NETLIB_RECV once the header has been parsed.
+// If the headers haven't finished within 60 seconds the function returns NULL
+// and ERROR_TIMEOUT.
+// Errors: ERROR_INVALID_PARAMETER, any from MS_NETLIB_RECV or select()
+// ERROR_HANDLE_EOF (connection closed before headers complete)
+// ERROR_TIMEOUT (headers still not complete after 60 seconds)
+// ERROR_BAD_FORMAT (invalid character or line ending in headers, or first line is blank)
+// ERROR_BUFFER_OVERFLOW (each header line must be less than 4096 chars long)
+// ERROR_INVALID_DATA (first header line is malformed ("http/[01].[0-9] [0-9]+ .*", or no colon in subsequent line)
+
#define NHRV_BUF_SIZE 8192
-MIR_APP_DLL(NETLIBHTTPREQUEST*) Netlib_RecvHttpHeaders(HNETLIBCONN hConnection, int flags)
+NETLIBHTTPREQUEST* Netlib_RecvHttpHeaders(HNETLIBCONN hConnection, int flags)
{
NetlibConnection *nlc = (NetlibConnection*)hConnection;
if (!NetlibEnterNestedCS(nlc, NLNCS_RECV))
diff --git a/src/mir_app/src/netlib_httpproxy.cpp b/src/mir_app/src/netlib_httpproxy.cpp index 66adc7fe9a..4c51f2b417 100644 --- a/src/mir_app/src/netlib_httpproxy.cpp +++ b/src/mir_app/src/netlib_httpproxy.cpp @@ -71,15 +71,3 @@ MIR_APP_DLL(int) Netlib_SetStickyHeaders(HNETLIBUSER nlu, const char *szHeaders) replaceStr(nlu->szStickyHeaders, szHeaders); // pointer is ours
return 0;
}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-
-MIR_APP_DLL(int) Netlib_SetPollingTimeout(HNETLIBCONN nlc, int iTimeout)
-{
- if (GetNetlibHandleType(nlc) != NLH_CONNECTION)
- return -1;
-
- int oldTimeout = nlc->pollingTimeout;
- nlc->pollingTimeout = iTimeout;
- return oldTimeout;
-}
|