Mercurial > pidgin
view src/network.c @ 12115:e9790eb93216
[gaim-migrate @ 14415]
quoth charkins:
" This patch has a few small fixes for the visibility
stuff in gtkblist.c.
First, tracking of the ICONIFIED state of the blist was
removed. This was intended to allow the blist to
"remember" if it was minimized between restarts.
Unfortunately, this is not possible because the
ICONIFIED state gets set when the blist is on a
different desktop with many window managers.
Second, while talking about the ICONIFIED issue on
#gtk@GIMPNet, muntyan_ asked about a bug where the
blist would get shown on an account re-connect with
1.5.0. Luke mentioned something about this with cvs as
well. This patch introduces a check in
gaim_gtk_blist_show() to prevent the window from being
shown if it already exists and is visible.
Third, sadrul pointed me to a one-line fix for the
missing blist on startup. I added a second line to make
sure the blist restores its proper size as well.
Finally, when the last visibility manager is removed,
gaim will now minimize the blist if it was previously
hidden, rather than showing it. This could prevent a
race condition with out-of-process applets, preventing
gaim from maintaining the visibility state properly
between restarts.
This was 'cvs diff'ed against the last available anon
cvs from Friday. Hopefully it'll apply cleanly."
it did.
committer: Tailor Script <tailor@pidgin.im>
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Wed, 16 Nov 2005 17:55:26 +0000 |
parents | e1ab173ef3b5 |
children | 5f65a0cca87c |
line wrap: on
line source
/** * @file network.c Network Implementation * @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 */ #include "internal.h" #include "debug.h" #include "account.h" #include "network.h" #include "prefs.h" #include "stun.h" #include "upnp.h" const unsigned char * gaim_network_ip_atoi(const char *ip) { static unsigned char ret[4]; gchar *delimiter = "."; gchar **split; int i; g_return_val_if_fail(ip != NULL, NULL); split = g_strsplit(ip, delimiter, 4); for (i = 0; split[i] != NULL; i++) ret[i] = atoi(split[i]); g_strfreev(split); /* i should always be 4 */ if (i != 4) return NULL; return ret; } void gaim_network_set_public_ip(const char *ip) { g_return_if_fail(ip != NULL); /* XXX - Ensure the IP address is valid */ gaim_prefs_set_string("/core/network/public_ip", ip); } const char * gaim_network_get_public_ip(void) { const char *ip; struct stun_nattype *stun; ip = gaim_prefs_get_string("/core/network/public_ip"); if (ip == NULL || *ip == '\0') { /* Check if STUN discovery was already done */ stun = gaim_stun_discover(NULL); if(stun && stun->status>1) return stun->publicip; return NULL; } return ip; } static const char * gaim_network_get_local_ip_from_fd(int fd) { struct sockaddr_in addr; socklen_t len; static char ip[16]; const char *tmp; g_return_val_if_fail(fd >= 0, NULL); len = sizeof(addr); if (getsockname(fd, (struct sockaddr *) &addr, &len) == -1) { gaim_debug_warning("network", "getsockname: %s\n", strerror(errno)); return NULL; } tmp = inet_ntoa(addr.sin_addr); strncpy(ip, tmp, sizeof(ip)); return ip; } const char * gaim_network_get_local_system_ip(int fd) { struct hostent *host; char localhost[129]; long unsigned add; static char ip[46]; const char *tmp = NULL; if (fd >= 0) tmp = gaim_network_get_local_ip_from_fd(fd); if (tmp) return tmp; if (gethostname(localhost, 128) < 0) return NULL; if ((host = gethostbyname(localhost)) == NULL) return NULL; memcpy(&add, host->h_addr_list[0], 4); add = htonl(add); g_snprintf(ip, 16, "%lu.%lu.%lu.%lu", ((add >> 24) & 255), ((add >> 16) & 255), ((add >> 8) & 255), add & 255); return ip; } const char * gaim_network_get_my_ip(int fd) { const char *ip = NULL; GaimUPnPControlInfo* controlInfo = NULL; struct stun_nattype *stun; /* Check if the user specified an IP manually */ if (!gaim_prefs_get_bool("/core/network/auto_ip")) { ip = gaim_network_get_public_ip(); if (ip != NULL) return ip; } if (ip == NULL || *ip == '\0') { /* Check if STUN discovery was already done */ stun = gaim_stun_discover(NULL); if(stun && stun->status>1) return stun->publicip; } /* attempt to get the ip from a NAT device */ if ((controlInfo = gaim_upnp_discover()) != NULL) { ip = gaim_upnp_get_public_ip(controlInfo); g_free(controlInfo->controlURL); g_free(controlInfo->serviceType); g_free(controlInfo); if (ip != NULL) { return ip; } } /* Just fetch the IP of the local system */ return gaim_network_get_local_system_ip(fd); } static int gaim_network_do_listen(unsigned short port) { int listenfd = -1; const int on = 1; GaimUPnPControlInfo* controlInfo = NULL; #if HAVE_GETADDRINFO int errnum; struct addrinfo hints, *res, *next; char serv[6]; /* * Get a list of addresses on this machine. */ snprintf(serv, sizeof(serv), "%hu", port); memset(&hints, 0, sizeof(struct addrinfo)); hints.ai_flags = AI_PASSIVE; hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_STREAM; errnum = getaddrinfo(NULL /* any IP */, serv, &hints, &res); if (errnum != 0) { #ifndef _WIN32 gaim_debug_warning("network", "getaddrinfo: %s\n", gai_strerror(errnum)); if (errnum == EAI_SYSTEM) gaim_debug_warning("network", "getaddrinfo: system error: %s\n", strerror(errno)); #else gaim_debug_warning("network", "getaddrinfo: Error Code = %d\n", errnum); #endif return -1; } /* * Go through the list of addresses and attempt to listen on * one of them. * XXX - Try IPv6 addresses first? */ for (next = res; next != NULL; next = next->ai_next) { listenfd = socket(next->ai_family, next->ai_socktype, next->ai_protocol); if (listenfd < 0) continue; if (setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) != 0) gaim_debug_warning("network", "setsockopt: %s\n", strerror(errno)); if (bind(listenfd, next->ai_addr, next->ai_addrlen) == 0) break; /* success */ close(listenfd); } freeaddrinfo(res); if (next == NULL) return -1; #else struct sockaddr_in sockin; if ((listenfd = socket(AF_INET, SOCK_STREAM, 0)) < 0) { gaim_debug_warning("network", "socket: %s\n", strerror(errno)); return -1; } if (setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) != 0) gaim_debug_warning("network", "setsockopt: %s\n", strerror(errno)); memset(&sockin, 0, sizeof(struct sockaddr_in)); sockin.sin_family = PF_INET; sockin.sin_port = htons(port); if (bind(listenfd, (struct sockaddr *)&sockin, sizeof(struct sockaddr_in)) != 0) { gaim_debug_warning("network", "bind: %s\n", strerror(errno)); close(listenfd); return -1; } #endif if (listen(listenfd, 4) != 0) { gaim_debug_warning("network", "listen: %s\n", strerror(errno)); close(listenfd); return -1; } fcntl(listenfd, F_SETFL, O_NONBLOCK); if((controlInfo = gaim_upnp_discover()) != NULL) { if(!gaim_upnp_set_port_mapping(controlInfo, gaim_network_get_port_from_fd(listenfd), "TCP")) { gaim_upnp_remove_port_mapping(controlInfo, gaim_network_get_port_from_fd(listenfd), "TCP"); gaim_upnp_set_port_mapping(controlInfo, gaim_network_get_port_from_fd(listenfd), "TCP"); } g_free(controlInfo->serviceType); g_free(controlInfo->controlURL); g_free(controlInfo); } gaim_debug_info("network", "Listening on port: %hu\n", gaim_network_get_port_from_fd(listenfd)); return listenfd; } int gaim_network_listen(unsigned short port) { g_return_val_if_fail(port != 0, -1); return gaim_network_do_listen(port); } int gaim_network_listen_range(unsigned short start, unsigned short end) { int ret = -1; if (gaim_prefs_get_bool("/core/network/ports_range_use")) { start = gaim_prefs_get_int("/core/network/ports_range_start"); end = gaim_prefs_get_int("/core/network/ports_range_end"); } else { if (end < start) end = start; } for (; start <= end; start++) { ret = gaim_network_do_listen(start); if (ret >= 0) break; } return ret; } unsigned short gaim_network_get_port_from_fd(int fd) { struct sockaddr_in addr; socklen_t len; g_return_val_if_fail(fd >= 0, 0); len = sizeof(addr); if (getsockname(fd, (struct sockaddr *) &addr, &len) == -1) { gaim_debug_warning("network", "getsockname: %s\n", strerror(errno)); return 0; } return ntohs(addr.sin_port); } void gaim_network_init(void) { gaim_prefs_add_none ("/core/network"); gaim_prefs_add_bool ("/core/network/auto_ip", TRUE); gaim_prefs_add_string("/core/network/public_ip", ""); gaim_prefs_add_bool ("/core/network/ports_range_use", FALSE); gaim_prefs_add_int ("/core/network/ports_range_start", 1024); gaim_prefs_add_int ("/core/network/ports_range_end", 2048); }