view src/proxy.h @ 7652:ac6b2b3a9a1f

[gaim-migrate @ 8296] Bj?rn Voigt (bjoernv) writes: " I found a small problem in Gaim's proxy settings. There is an option "Use Environmental Settings". This option does not work as expected. Gaim reads the environment variables http_proxy (or HTTP_PROXY or HTTPPROXY) and http_proxy_port (or HTTP_PROXY_PORT or HTTPPROXYPORT) and variables for proxy user and proxy password. Gaim expects the following format: export http_proxy=your.proxy.server export http_proxy_port=8080 As far as I know this is a unusual format. Probably there is no standard document, which describes the correct format of proxy variables, but browsers like Konqueror, Amaya, Lynx and others use a pseudo standard format: export http_proxy="http://your.proxy.server:8080/" The port number defaults to 80. The variable http_proxy_port is unknown. The proxy variable format is described in some W3C pages, for instance: http://www.w3.org/Daemon/User/Proxies/ProxyClients.html http://www.w3.org/Library/User/Using/Proxy.html http://www.w3.org/Amaya/User/Proxy.html Solution -------- My patch fixes the proxy environment variable parsing in src/proxy.c:1626: gaim_proxy_connect(). The patch removes http_proxy_port and uses gaim_url_parse() from src/util.c to parse the http_proxy variable. Remaining problems ------------------ If a user has adjusted his proxy settings to Gaim's old proxy variable format, he gets an error. I don't think, that this is a big problem, as not much users set their proxy variables only for one program (old proxy variables where incompatible with browsers like Lynx, Konqueror, ...). Gaim still doesn't look at the no_proxy variable. This variables defines hosts and domains, which should be connected directly: export no_proxy="cern.ch,ncsa.uiuc.edu,some.host:8080" For example, one user may want to connect to Yahoo! over a proxy and to an internal Jabber server without a proxy. But the user can define individual proxy variables for each account." he continues: "Nathan Walp <[e-mail]> wrote: > Why not have your patch check to see if the http_proxy var starts with > "http://", and if so, parse it, otherwise fall back on the old behavior. Ok, the function gaim_url_parse() automatically detects hostnames and port numbers, if the http_proxy URL does not start with http://. My new patch also checks for http_proxy_port. Now my patch (file proxy2.patch) is fully backward compatible and tested." given how rarely the current proxy code works, i don't see how this could possibly make things worse, so i'm taking a chance since it compiles. someone please test this. committer: Tailor Script <[e-mail]>

/**
 * @file proxy.h Proxy API
 * @ingroup core
 *
 * gaim
 *
 * Copyright (C) 1998-1999, Mark Spencer <[e-mail]>
 * Copyright (C) 2003 Christian Hammond <[e-mail]>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
#ifndef _GAIM_PROXY_H_
#define _GAIM_PROXY_H_

#include <glib.h>

/**
 * A type of proxy connection.
 */
typedef enum
{
	GAIM_PROXY_USE_GLOBAL = -1,  /**< Use the global proxy information. */
	GAIM_PROXY_NONE = 0,         /**< No proxy.                         */
	GAIM_PROXY_HTTP,             /**< HTTP proxy.                       */
	GAIM_PROXY_SOCKS4,           /**< SOCKS 4 proxy.                    */
	GAIM_PROXY_SOCKS5,           /**< SOCKS 5 proxy.                    */
	GAIM_PROXY_USE_ENVVAR        /**< Use environmental settings.       */

} GaimProxyType;

/**
 * An input condition.
 */
typedef enum
{
	GAIM_INPUT_READ  = 1 << 0,  /**< A read condition.  */
	GAIM_INPUT_WRITE = 1 << 1   /**< A write condition. */

} GaimInputCondition;

/**
 * Information on proxy settings.
 */
typedef struct
{
	GaimProxyType type;   /**< The proxy type.  */

	char *host;           /**< The host.        */
	int   port;           /**< The port number. */
	char *username;       /**< The username.    */
	char *password;       /**< The password.    */

} GaimProxyInfo;

typedef void (*GaimInputFunction)(gpointer, gint, GaimInputCondition);


#include "account.h"

#ifdef __cplusplus
extern "C" {
#endif

/**************************************************************************/
/** @name Proxy structure API                                             */
/**************************************************************************/
/*@{*/

/**
 * Creates a proxy information structure.
 *
 * @return The proxy information structure.
 */
GaimProxyInfo *gaim_proxy_info_new(void);

/**
 * Destroys a proxy information structure.
 *
 * @param info The proxy information structure to destroy.
 */
void gaim_proxy_info_destroy(GaimProxyInfo *info);

/**
 * Sets the type of proxy.
 *
 * @param info The proxy information.
 * @param type The proxy type.
 */
void gaim_proxy_info_set_type(GaimProxyInfo *info, GaimProxyType type);

/**
 * Sets the proxy host.
 *
 * @param info The proxy information.
 * @param host The host.
 */
void gaim_proxy_info_set_host(GaimProxyInfo *info, const char *host);

/**
 * Sets the proxy port.
 *
 * @param info The proxy information.
 * @param port The port.
 */
void gaim_proxy_info_set_port(GaimProxyInfo *info, int port);

/**
 * Sets the proxy username.
 *
 * @param info     The proxy information.
 * @param username The username.
 */
void gaim_proxy_info_set_username(GaimProxyInfo *info, const char *username);

/**
 * Sets the proxy password.
 *
 * @param info     The proxy information.
 * @param password The password.
 */
void gaim_proxy_info_set_password(GaimProxyInfo *info, const char *password);

/**
 * Returns the proxy's type.
 *
 * @param info The proxy information.
 *
 * @return The type.
 */
GaimProxyType gaim_proxy_info_get_type(const GaimProxyInfo *info);

/**
 * Returns the proxy's host.
 *
 * @param info The proxy information.
 *
 * @return The host.
 */
const char *gaim_proxy_info_get_host(const GaimProxyInfo *info);

/**
 * Returns the proxy's port.
 *
 * @param info The proxy information.
 *
 * @return The port.
 */
int gaim_proxy_info_get_port(const GaimProxyInfo *info);

/**
 * Returns the proxy's username.
 *
 * @param info The proxy information.
 *
 * @return The username.
 */
const char *gaim_proxy_info_get_username(const GaimProxyInfo *info);

/**
 * Returns the proxy's password.
 *
 * @param info The proxy information.
 *
 * @return The password.
 */
const char *gaim_proxy_info_get_password(const GaimProxyInfo *info);

/*@}*/

/**************************************************************************/
/** @name Global Proxy API                                                */
/**************************************************************************/
/*@{*/

/**
 * Returns gaim's global proxy information.
 *
 * @return The global proxy information.
 */
GaimProxyInfo *gaim_global_proxy_get_info(void);

/*@}*/

/**************************************************************************/
/** @name Proxy API                                                       */
/**************************************************************************/
/*@{*/

/**
 * Initializes the proxy subsystem.
 */
void gaim_proxy_init(void);

/**
 * Adds an input handler.
 *
 * @param source    The input source.
 * @param cond      The condition type.
 * @param func      The callback function for data.
 * @param user_data User-specified data.
 *
 * @return The resulting handle.
 */
gint gaim_input_add(int source, GaimInputCondition cond,
					GaimInputFunction func, gpointer user_data);

/**
 * Removes an input handler.
 *
 * @param handle The handle of the input handler.
 */
void gaim_input_remove(gint handle);

/**
 * Makes a connection to the specified host and port.
 *
 * @param account The account making the connection.
 * @param host    The destination host.
 * @param port    The destination port.
 * @param func    The input handler function.
 * @param data    User-defined data.
 *
 * @return The socket handle.
 */
int gaim_proxy_connect(GaimAccount *account, const char *host, int port,
					   GaimInputFunction func, gpointer data);

/*@}*/

#ifdef __cplusplus
}
#endif

#endif /* _GAIM_PROXY_H_ */