Mercurial > pidgin.yaz
view src/network.c @ 11719:109ee3bfeac5
[gaim-migrate @ 14010]
SF Patch #1333770 from corfe83
"Many times in gaim we use the function
g_slist_remove(list,node->data) to remove an element
from a GSList. If we already have the pointer to the
node we want to delete, it is faster to send it the
pointer to the node to delete rather than the data of
the node (we can do this by calling
g_slist_delete_link(list,node)). This change was made
while looking at glib's documentation and the code in
glib's gslist.c.
This is because as the remove/delete function traverses
each node in the list, it doesn't need to spend an
extra memory access to retrieve the data for each
element in the node it is traversing and then compare,
it can simply compare the pointer. In my tests outside
of gaim, this makes a big difference if the node you
are deleting is at a high index in the list. However,
even if you're deleting the first node, it about breaks
even.
So, I've found each case in gaim where we are calling
g_slist_remove, and we already have the pointer to the
appropriate node to delete (this is often the case when
we're doing a for or while loop on a GSList). I've then
replaced it with the appropriate call to
g_slist_delete_link. I, however, didn't do this in
situations where we are explicitly removing the first
element in the list, because in those situations it is
an unnecessary change.
There should be no difference in behavior, but just in
case I've tried running it with valgrind, which reports
the same number of memory leaks after my patch as
before my patch. Of course, I can't guarantee that my
normal behavior on gaim is hitting all the functions
I've changed, but in general testing it Works For Me (tm)."
As with the last patch, this one may not have a practical performance impact (or maybe it does, I have no idea), but it's not worse for any case. Given two ways of doing things where one is always at least as fast and may be faster under some cases, I like to prefer that faster way. This doesn't make the code any uglier, so I'm applying.
committer: Tailor Script <tailor@pidgin.im>
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sat, 22 Oct 2005 20:48:18 +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); }