pidgin3: comparison libpurple/nat-pmp.c

-:6eac2f6c32e2
+:d0fdd378a635
 {
 	int i;
 	for (i = 0; i < RTAX_MAX; i++)
 	{
 		if (bitmask & (1 << i))
 		{
 			addrs[i] = sa;
 #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
 			sa = (struct sockaddr *)(ROUNDUP(sa->sa_len) + (char *)sa);
 #else
 #ifdef AF_INET6
 			else if (sa->sa_family == AF_INET6)
 				sa = (struct sockaddr*)(sizeof(struct sockaddr_in6) + (char *)sa);
 #endif
 #endif
 		}
 		else
 		{
 			addrs[i] = NULL;
 		}
 	}
 mib[3] = 0; /* address family - 0 for all addres families */
 mib[4] = NET_RT_DUMP;
 mib[5] = 0;
 	/* Determine the buffer side needed to get the full routing table */
 if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
 	{
 		purple_debug_warning("nat-pmp", "sysctl: net.route.0.0.dump estimate\n");
 		return NULL;
 }
 		purple_debug_warning("nat-pmp", "Failed to malloc %i\n", needed);
 		return NULL;
 }
 	/* Read the routing table into buf */
 if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0)
 	{
 		purple_debug_warning("nat-pmp", "sysctl: net.route.0.0.dump\n");
 		return NULL;
 }
 lim = buf + needed;
 for (next = buf; next < lim; next += rtm->rtm_msglen)
 	{
 		rtm = (struct rt_msghdr *)next;
 		sa = (struct sockaddr *)(rtm + 1);
 		if (sa->sa_family == AF_INET)
 		{
 			sin = (struct sockaddr_in*) sa;
 			if ((rtm->rtm_flags & RTF_GATEWAY) && sin->sin_addr.s_addr == INADDR_ANY)
 			{
 				if (rtm->rtm_addrs & RTA_NETMASK)
 					memcpy(&mask, rti_info[RTAX_NETMASK], sizeof(mask));
 				if (rtm->rtm_addrs & RTA_GATEWAY &&
 					is_default_route(&addr, &mask))
 				{
 					if (rti_info[RTAX_GATEWAY]) {
 						struct sockaddr_in *rti_sin = (struct sockaddr_in *)rti_info[RTAX_GATEWAY];
 						sin = g_new0(struct sockaddr_in, 1);
 						sin->sin_family = rti_sin->sin_family;
 	return (found ? sin : NULL);
 }
 /*!
 *	purple_pmp_get_public_ip() will return the publicly facing IP address of the
 *	default NAT gateway. The function will return NULL if:
 *		- The gateway doesn't support NAT-PMP
 *		- The gateway errors in some other spectacular fashion
 */
 char *
 	socklen_t len;
 	PurplePmpIpRequest req;
 	PurplePmpIpResponse resp;
 	int sendfd;
 	if (pmp_info.status == PURPLE_PMP_STATUS_UNABLE_TO_DISCOVER)
 		return NULL;
 	if ((pmp_info.status == PURPLE_PMP_STATUS_DISCOVERED) && (pmp_info.publicip != NULL))
 	{
 #ifdef PMP_DEBUG
 		purple_debug_info("nat-pmp", "Returning cached publicip %s\n",pmp_info.publicip);
 #endif
 	req.opcode = 0;
 	/* The NAT-PMP spec says we should attempt to contact the gateway 9 times, doubling the time we wait each time.
 	 * Even starting with a timeout of 0.1 seconds, that means that we have a total waiting of 204.6 seconds.
 	 * With the recommended timeout of 0.25 seconds, we're talking 511.5 seconds (8.5 minutes).
 	 *
 	 * This seems really silly... if this were nonblocking, a couple retries might be in order, but it's not at present.
 	 */
 #ifdef PMP_DEBUG
 	purple_debug_info("nat-pmp", "Attempting to retrieve the public ip address for the NAT device at: %s\n", inet_ntoa(gateway->sin_addr));
 	purple_debug_info("nat-pmp", "\tTimeout: %ds %dus\n", req_timeout.tv_sec, req_timeout.tv_usec);
 #endif
 	/* TODO: Non-blocking! */
 	if (sendto(sendfd, &req, sizeof(req), 0, (struct sockaddr *)(gateway), sizeof(struct sockaddr)) < 0)
 	{
 		purple_debug_info("nat-pmp", "There was an error sending the NAT-PMP public IP request! (%s)\n", g_strerror(errno));
 		g_free(gateway);
 		pmp_info.status = PURPLE_PMP_STATUS_UNABLE_TO_DISCOVER;
 		return NULL;
 	}
 	if (!publicsockaddr) {
 		g_free(gateway);
 		pmp_info.status = PURPLE_PMP_STATUS_UNABLE_TO_DISCOVER;
 		return NULL;
 	}
 #ifdef PMP_DEBUG
 	req.lifetime = htonl(lifetime);
 	/* The NAT-PMP spec says we should attempt to contact the gateway 9 times, doubling the time we wait each time.
 	 * Even starting with a timeout of 0.1 seconds, that means that we have a total waiting of 204.6 seconds.
 	 * With the recommended timeout of 0.25 seconds, we're talking 511.5 seconds (8.5 minutes).
 	 *
 	 * This seems really silly... if this were nonblocking, a couple retries might be in order, but it's not at present.
 	 * XXX Make this nonblocking.
 	 * XXX This code looks like the pmp_get_public_ip() code. Can it be consolidated?
 	 */
 #ifdef PMP_DEBUG

Mercurial > pidgin3 / file comparison

comparison: libpurple/nat-pmp.c

libpurple/nat-pmp.c