diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2021-01-08 17:58:15 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-01-17 23:56:09 +0100 |
| commit | 215db086e09665ee7af9b646ad6c4d6e281001ac (patch) | |
| tree | 50c74f8456df87e86de6d72e90190a3563083a1a /lib/curl_sasl.h | |
| parent | 0d26ab9ed3ac29da2a383d313e93df3e9f5295a2 (diff) | |
| download | curl-215db086e09665ee7af9b646ad6c4d6e281001ac.tar.gz | |
lib: pass in 'struct Curl_easy *' to most functions
... in most cases instead of 'struct connectdata *' but in some cases in
addition to.
- We mostly operate on transfers and not connections.
- We need the transfer handle to log, store data and more. Everything in
libcurl is driven by a transfer (the CURL * in the public API).
- This work clarifies and separates the transfers from the connections
better.
- We should avoid "conn->data". Since individual connections can be used
by many transfers when multiplexing, making sure that conn->data
points to the current and correct transfer at all times is difficult
and has been notoriously error-prone over the years. The goal is to
ultimately remove the conn->data pointer for this reason.
Closes #6425
Diffstat (limited to 'lib/curl_sasl.h')
| -rw-r--r-- | lib/curl_sasl.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/curl_sasl.h b/lib/curl_sasl.h index ba40ec461..6371933fb 100644 --- a/lib/curl_sasl.h +++ b/lib/curl_sasl.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2012 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2012 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -88,10 +88,12 @@ struct SASLproto { int contcode; /* Code to receive when continuation is expected */ int finalcode; /* Code to receive upon authentication success */ size_t maxirlen; /* Maximum initial response length */ - CURLcode (*sendauth)(struct connectdata *conn, + CURLcode (*sendauth)(struct Curl_easy *data, + struct connectdata *conn, const char *mech, const char *ir); /* Send authentication command */ - CURLcode (*sendcont)(struct connectdata *conn, const char *contauth); + CURLcode (*sendcont)(struct Curl_easy *data, + struct connectdata *conn, const char *contauth); /* Send authentication continuation */ void (*getmessage)(char *buffer, char **outptr); /* Get SASL response message */ |