mirror of
https://github.com/moparisthebest/curl
synced 2024-11-15 14:05:03 -05:00
5a053ffe80
This commit renames lib/setup.h to lib/curl_setup.h and renames lib/setup_once.h to lib/curl_setup_once.h. Removes the need and usage of a header inclusion guard foreign to libcurl. [1] Removes the need and presence of an alarming notice we carried in old setup_once.h [2] ---------------------------------------- 1 - lib/setup_once.h used __SETUP_ONCE_H macro as header inclusion guard up to commitec691ca3
which changed this to HEADER_CURL_SETUP_ONCE_H, this single inclusion guard is enough to ensure that inclusion of lib/setup_once.h done from lib/setup.h is only done once. Additionally lib/setup.h has always used __SETUP_ONCE_H macro to protect inclusion of setup_once.h even after commitec691ca3
, this was to avoid a circular header inclusion triggered when building a c-ares enabled version with c-ares sources available which also has a setup_once.h header. Commitec691ca3
exposes the real nature of __SETUP_ONCE_H usage in lib/setup.h, it is a header inclusion guard foreign to libcurl belonging to c-ares's setup_once.h The renaming this commit does, fixes the circular header inclusion, and as such removes the need and usage of a header inclusion guard foreign to libcurl. Macro __SETUP_ONCE_H no longer used in libcurl. 2 - Due to the circular interdependency of old lib/setup_once.h and the c-ares setup_once.h header, old file lib/setup_once.h has carried back from 2006 up to now days an alarming and prominent notice about the need of keeping libcurl's and c-ares's setup_once.h in sync. Given that this commit fixes the circular interdependency, the need and presence of mentioned notice is removed. All mentioned interdependencies come back from now old days when the c-ares project lived inside a curl subdirectory. This commit removes last traces of such fact.
286 lines
7.1 KiB
C
286 lines
7.1 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 2012, Linus Nielsen Feltzing, <linus@haxx.se>
|
|
* Copyright (C) 2012, 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
|
|
* are also available at http://curl.haxx.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#include <curl/curl.h>
|
|
|
|
#include "urldata.h"
|
|
#include "url.h"
|
|
#include "progress.h"
|
|
#include "multiif.h"
|
|
#include "sendf.h"
|
|
#include "rawstr.h"
|
|
#include "bundles.h"
|
|
#include "conncache.h"
|
|
|
|
#include "curl_memory.h"
|
|
/* The last #include file should be: */
|
|
#include "memdebug.h"
|
|
|
|
#define CONNECTION_HASH_SIZE 97
|
|
|
|
static void free_bundle_hash_entry(void *freethis)
|
|
{
|
|
struct connectbundle *b = (struct connectbundle *) freethis;
|
|
|
|
Curl_bundle_destroy(b);
|
|
}
|
|
|
|
struct conncache *Curl_conncache_init(conncachetype type)
|
|
{
|
|
struct conncache *connc;
|
|
|
|
connc = calloc(1, sizeof(struct conncache));
|
|
if(!connc)
|
|
return NULL;
|
|
|
|
connc->hash = Curl_hash_alloc(CONNECTION_HASH_SIZE, Curl_hash_str,
|
|
Curl_str_key_compare, free_bundle_hash_entry);
|
|
|
|
if(!connc->hash) {
|
|
free(connc);
|
|
return NULL;
|
|
}
|
|
|
|
connc->type = type;
|
|
connc->num_connections = 0;
|
|
|
|
return connc;
|
|
}
|
|
|
|
void Curl_conncache_destroy(struct conncache *connc)
|
|
{
|
|
if(connc) {
|
|
Curl_hash_destroy(connc->hash);
|
|
connc->hash = NULL;
|
|
free(connc);
|
|
}
|
|
}
|
|
|
|
struct connectbundle *Curl_conncache_find_bundle(struct conncache *connc,
|
|
char *hostname)
|
|
{
|
|
struct connectbundle *bundle = NULL;
|
|
|
|
if(connc)
|
|
bundle = Curl_hash_pick(connc->hash, hostname, strlen(hostname)+1);
|
|
|
|
return bundle;
|
|
}
|
|
|
|
static bool conncache_add_bundle(struct conncache *connc,
|
|
char *hostname,
|
|
struct connectbundle *bundle)
|
|
{
|
|
void *p;
|
|
|
|
p = Curl_hash_add(connc->hash, hostname, strlen(hostname)+1, bundle);
|
|
|
|
return p?TRUE:FALSE;
|
|
}
|
|
|
|
static void conncache_remove_bundle(struct conncache *connc,
|
|
struct connectbundle *bundle)
|
|
{
|
|
struct curl_hash_iterator iter;
|
|
struct curl_hash_element *he;
|
|
|
|
if(!connc)
|
|
return;
|
|
|
|
Curl_hash_start_iterate(connc->hash, &iter);
|
|
|
|
he = Curl_hash_next_element(&iter);
|
|
while(he) {
|
|
if(he->ptr == bundle) {
|
|
/* The bundle is destroyed by the hash destructor function,
|
|
free_bundle_hash_entry() */
|
|
Curl_hash_delete(connc->hash, he->key, he->key_len);
|
|
return;
|
|
}
|
|
|
|
he = Curl_hash_next_element(&iter);
|
|
}
|
|
}
|
|
|
|
CURLcode Curl_conncache_add_conn(struct conncache *connc,
|
|
struct connectdata *conn)
|
|
{
|
|
CURLcode result;
|
|
struct connectbundle *bundle;
|
|
struct connectbundle *new_bundle = NULL;
|
|
struct SessionHandle *data = conn->data;
|
|
|
|
bundle = Curl_conncache_find_bundle(data->state.conn_cache,
|
|
conn->host.name);
|
|
if(!bundle) {
|
|
result = Curl_bundle_create(data, &new_bundle);
|
|
if(result != CURLE_OK)
|
|
return result;
|
|
|
|
if(!conncache_add_bundle(data->state.conn_cache,
|
|
conn->host.name, new_bundle)) {
|
|
Curl_bundle_destroy(new_bundle);
|
|
return CURLE_OUT_OF_MEMORY;
|
|
}
|
|
bundle = new_bundle;
|
|
}
|
|
|
|
result = Curl_bundle_add_conn(bundle, conn);
|
|
if(result != CURLE_OK) {
|
|
if(new_bundle)
|
|
conncache_remove_bundle(data->state.conn_cache, new_bundle);
|
|
return result;
|
|
}
|
|
|
|
connc->num_connections++;
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
void Curl_conncache_remove_conn(struct conncache *connc,
|
|
struct connectdata *conn)
|
|
{
|
|
struct connectbundle *bundle = conn->bundle;
|
|
|
|
/* The bundle pointer can be NULL, since this function can be called
|
|
due to a failed connection attempt, before being added to a bundle */
|
|
if(bundle) {
|
|
Curl_bundle_remove_conn(bundle, conn);
|
|
if(bundle->num_connections == 0) {
|
|
conncache_remove_bundle(connc, bundle);
|
|
}
|
|
connc->num_connections--;
|
|
|
|
DEBUGF(infof(conn->data, "The cache now contains %d members\n",
|
|
connc->num_connections));
|
|
}
|
|
}
|
|
|
|
/* This function iterates the entire connection cache and calls the
|
|
function func() with the connection pointer as the first argument
|
|
and the supplied 'param' argument as the other,
|
|
|
|
Return 0 from func() to continue the loop, return 1 to abort it.
|
|
*/
|
|
void Curl_conncache_foreach(struct conncache *connc,
|
|
void *param,
|
|
int (*func)(struct connectdata *conn, void *param))
|
|
{
|
|
struct curl_hash_iterator iter;
|
|
struct curl_llist_element *curr;
|
|
struct curl_hash_element *he;
|
|
|
|
if(!connc)
|
|
return;
|
|
|
|
Curl_hash_start_iterate(connc->hash, &iter);
|
|
|
|
he = Curl_hash_next_element(&iter);
|
|
while(he) {
|
|
struct connectbundle *bundle;
|
|
struct connectdata *conn;
|
|
|
|
bundle = he->ptr;
|
|
|
|
curr = bundle->conn_list->head;
|
|
while(curr) {
|
|
/* Yes, we need to update curr before calling func(), because func()
|
|
might decide to remove the connection */
|
|
conn = curr->ptr;
|
|
curr = curr->next;
|
|
|
|
if(1 == func(conn, param))
|
|
return;
|
|
}
|
|
|
|
he = Curl_hash_next_element(&iter);
|
|
}
|
|
}
|
|
|
|
/* Return the first connection found in the cache. Used when closing all
|
|
connections */
|
|
struct connectdata *
|
|
Curl_conncache_find_first_connection(struct conncache *connc)
|
|
{
|
|
struct curl_hash_iterator iter;
|
|
struct curl_llist_element *curr;
|
|
struct curl_hash_element *he;
|
|
struct connectbundle *bundle;
|
|
|
|
Curl_hash_start_iterate(connc->hash, &iter);
|
|
|
|
he = Curl_hash_next_element(&iter);
|
|
while(he) {
|
|
bundle = he->ptr;
|
|
|
|
curr = bundle->conn_list->head;
|
|
if(curr) {
|
|
return curr->ptr;
|
|
}
|
|
|
|
he = Curl_hash_next_element(&iter);
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
|
|
#if 0
|
|
/* Useful for debugging the connection cache */
|
|
void Curl_conncache_print(struct conncache *connc)
|
|
{
|
|
struct curl_hash_iterator iter;
|
|
struct curl_llist_element *curr;
|
|
struct curl_hash_element *he;
|
|
|
|
if(!connc)
|
|
return;
|
|
|
|
fprintf(stderr, "=Bundle cache=\n");
|
|
|
|
Curl_hash_start_iterate(connc->hash, &iter);
|
|
|
|
he = Curl_hash_next_element(&iter);
|
|
while(he) {
|
|
struct connectbundle *bundle;
|
|
struct connectdata *conn;
|
|
|
|
bundle = he->ptr;
|
|
|
|
fprintf(stderr, "%s -", he->key);
|
|
curr = bundle->conn_list->head;
|
|
while(curr) {
|
|
conn = curr->ptr;
|
|
|
|
fprintf(stderr, " [%p %d]", (void *)conn, conn->inuse);
|
|
curr = curr->next;
|
|
}
|
|
fprintf(stderr, "\n");
|
|
|
|
he = Curl_hash_next_element(&iter);
|
|
}
|
|
}
|
|
#endif
|