#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;
}
if (!err && (sbuf[1] == '\x02'))
{
- /* check cbuf overflow */
- size_t auth_len = strlen(fwd->auth_username) + strlen(fwd->auth_password) + 3;
- if (auth_len > sizeof(cbuf))
+ if (fwd->auth_username && fwd->auth_password)
+ {
+ /* check cbuf overflow */
+ size_t auth_len = strlen(fwd->auth_username) + strlen(fwd->auth_password) + 3;
+ if (auth_len > sizeof(cbuf))
+ {
+ errstr = "SOCKS5 username and/or password too long";
+ err = 1;
+ }
+ }
+ else
{
- errstr = "SOCKS5 username and/or password too long";
+ errstr = "SOCKS5 server requested authentication while "
+ "no credentials are configured";
err = 1;
}
cbuf[client_pos++] = (char)(hostlen & 0xffu);
assert(sizeof(cbuf) - client_pos > (size_t)255);
/* Using strncpy because we really want the nul byte padding. */
- strncpy(cbuf + client_pos, target_host, sizeof(cbuf) - client_pos);
+ strncpy(cbuf + client_pos, target_host, sizeof(cbuf) - client_pos - 1);
client_pos += (hostlen & 0xffu);
cbuf[client_pos++] = (char)((target_port >> 8) & 0xff);
cbuf[client_pos++] = (char)((target_port ) & 0xff);