* using a "forwarder" (i.e. HTTP proxy and/or a SOCKS4
* or SOCKS5 proxy).
*
- * Copyright : Written by and Copyright (C) 2001-2017 the
+ * Copyright : Written by and Copyright (C) 2001-2020 the
* Privoxy team. https://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
assert(reusable_connection[slot].gateway_host == NULL);
assert(reusable_connection[slot].gateway_port == 0);
+ assert(reusable_connection[slot].auth_username == NULL);
+ assert(reusable_connection[slot].auth_password == NULL);
assert(reusable_connection[slot].forwarder_type == SOCKS_NONE);
assert(reusable_connection[slot].forward_host == NULL);
assert(reusable_connection[slot].forward_port == 0);
reusable_connection[slot].gateway_host = NULL;
}
reusable_connection[slot].gateway_port = connection->gateway_port;
+ if (NULL != connection->auth_username)
+ {
+ reusable_connection[slot].auth_username = strdup_or_die(connection->auth_username);
+ }
+ else
+ {
+ reusable_connection[slot].auth_username = NULL;
+ }
+ if (NULL != connection->auth_password)
+ {
+ reusable_connection[slot].auth_password = strdup_or_die(connection->auth_password);
+ }
+ else
+ {
+ reusable_connection[slot].auth_password = NULL;
+ }
if (NULL != connection->forward_host)
{
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
+/*********************************************************************
+ *
+ * Function : string_or_none
+ *
+ * Description : Returns a given string or "none" if a NULL pointer
+ * is given.
+ * Helper function for connection_destination_matches().
+ *
+ * Parameters :
+ * 1 : string = The string to check.
+ *
+ * Returns : The string if non-NULL, "none" otherwise.
+ *
+ *********************************************************************/
+static const char *string_or_none(const char *string)
+{
+ return(string != NULL ? string : "none");
+}
+
+
/*********************************************************************
*
* Function : connection_detail_matches
{
log_error(LOG_LEVEL_CONNECT,
"Gateway mismatch. Previous gateway: %s. Current gateway: %s",
- connection->gateway_host != NULL ? connection->gateway_host : "none",
- fwd->gateway_host != NULL ? fwd->gateway_host : "none");
+ string_or_none(connection->gateway_host),
+ string_or_none(fwd->gateway_host));
return FALSE;
}
{
log_error(LOG_LEVEL_CONNECT, "Socks user name mismatch. "
"Previous user name: %s. Current user name: %s",
- connection->auth_username != NULL ? connection->auth_username : "none",
- fwd->auth_username != NULL ? fwd->auth_username : "none");
+ string_or_none(connection->auth_username),
+ string_or_none(fwd->auth_username));
return FALSE;
}
{
log_error(LOG_LEVEL_CONNECT, "Socks user name mismatch. "
"Previous password: %s. Current password: %s",
- connection->auth_password != NULL ? connection->auth_password : "none",
- fwd->auth_password != NULL ? fwd->auth_password : "none");
+ string_or_none(connection->auth_password),
+ string_or_none(fwd->auth_password));
return FALSE;
}
{
log_error(LOG_LEVEL_CONNECT,
"Forwarding proxy mismatch. Previous proxy: %s. Current proxy: %s",
- connection->forward_host != NULL ? connection->forward_host : "none",
- fwd->forward_host != NULL ? fwd->forward_host : "none");
+ string_or_none(connection->forward_host),
+ string_or_none(fwd->forward_host));
return FALSE;
}