Mercurial > pidgin
view libpurple/upnp.h @ 15784:eed84b59c252
There were a few problems here
1. Raw gnutls error codes were being printed in debug messages. This
isn't necessarily bad, but it's much less useful than the text
returned from gnutls_strerror(). Never underestimate the value of
good error handling.
2. ssl_gnutls_read() and ssl_gnutls_write() were returning 0 when there
was an error reading from or writing to the ssl connection. They
should return -1 to indicate failure (0 normally indicates that the
server closed the connection)
3. ssl_gnutls_read() and ssl_gnutls_write() weren't setting errno when
they failed. errno would be set to something random, which seemed
to frequently be EAGAIN for me when reading, which causes Gaim to
keep trying to read from the connection even though it's closed.
Ideally ssl-gnutls.c would have a function equivalent to set_errno()
in ssl-nss.c, but the gnutls documentation does a poor job of
telling you what possible error codes could be returned from
gnutls_record_recv() and gnutls_record_send()
Even better would be if we allowed the ssl plugins to keep track of
the error message themselves, then added a new ssl ops function
to fetch the message from the plugin.
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Tue, 13 Mar 2007 06:53:43 +0000 |
parents | 56a2a0bb290a |
children | 32c366eeeb99 |
line wrap: on
line source
/** * @file upnp.h Universal Plug N Play API * @ingroup core * * gaim * * Gaim is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * * 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_UPNP_H_ #define _GAIM_UPNP_H_ typedef struct _UPnPMappingAddRemove UPnPMappingAddRemove; #ifdef __cplusplus extern "C" { #endif /**************************************************************************/ /** @name UPnP API */ /**************************************************************************/ /*@{*/ /* typedef struct _GaimUPnPRequestData GaimUPnPRequestData; */ typedef void (*GaimUPnPCallback) (gboolean success, gpointer data); /** * Sends a discovery request to search for a UPnP enabled IGD that * contains the WANIPConnection service that will allow us to recieve the * public IP address of the IGD, and control it for forwarding ports. * The result will be cached for further use. * * @param cb an optional callback function to be notified when the UPnP * discovery is complete * @param cb_data Extra data to be passed to the callback */ void gaim_upnp_discover(GaimUPnPCallback cb, gpointer cb_data); #if 0 /** * Retrieve the current UPnP control info, if there is any available. * This will only be filled in if gaim_upnp_discover() had been called, * and finished discovering. * * @return The control URL for the IGD we'll use to use the IGD services */ const GaimUPnPControlInfo* gaim_upnp_get_control_info(void); #endif /** * Gets the IP address from a UPnP enabled IGD that sits on the local * network, so when getting the network IP, instead of returning the * local network IP, the public IP is retrieved. This is a cached value from * the time of the UPnP discovery. * * @return The IP address of the network, or NULL if something went wrong */ const gchar* gaim_upnp_get_public_ip(void); /** * Cancel a pending port mapping request initiated with either * gaim_upnp_set_port_mapping() or gaim_upnp_remove_port_mapping(). * * @param mapping_data The data returned when you initiated the UPnP mapping request. */ void gaim_upnp_cancel_port_mapping(UPnPMappingAddRemove *mapping_data); /** * Maps Ports in a UPnP enabled IGD that sits on the local network to * this gaim client. Essentially, this function takes care of the port * forwarding so things like file transfers can work behind NAT firewalls * * @param portmap The port to map to this client * @param protocol The protocol to map, either "TCP" or "UDP" * @param cb an optional callback function to be notified when the mapping * addition is complete * @param cb_data Extra data to be passed to the callback * * @return Data which can be passed to gaim_upnp_port_mapping_cancel() to cancel */ UPnPMappingAddRemove *gaim_upnp_set_port_mapping(unsigned short portmap, const gchar* protocol, GaimUPnPCallback cb, gpointer cb_data); /** * Deletes a port mapping in a UPnP enabled IGD that sits on the local network * to this gaim client. Essentially, this function takes care of deleting the * port forwarding after they have completed a connection so another client on * the local network can take advantage of the port forwarding * * @param portmap The port to delete the mapping for * @param protocol The protocol to map to. Either "TCP" or "UDP" * @param cb an optional callback function to be notified when the mapping * removal is complete * @param cb_data Extra data to be passed to the callback * * @return Data which can be passed to gaim_upnp_port_mapping_cancel() to cancel */ UPnPMappingAddRemove *gaim_upnp_remove_port_mapping(unsigned short portmap, const gchar* protocol, GaimUPnPCallback cb, gpointer cb_data); /*@}*/ #ifdef __cplusplus } #endif #endif /* _GAIM_UPNP_H_ */