# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1174970042 0
# Node ID dbb87bc732fa10ff692b73975baa16cd6bbaa5be
# Parent  65b5b2b9b5bc25a360a9f16952dbbe304b536bd0# Parent  45cbb80bfd549600220c02e764d9b0fdc47f471f
merge of '94ae02f3a29e8da49d90cf447907e2c07735c9cd'
     and 'eba6bc129722d75a6ff3126b9c9834aadf296a63'

diff -r 65b5b2b9b5bc -r dbb87bc732fa libpurple/nat-pmp.c
--- a/libpurple/nat-pmp.c	Tue Mar 27 04:21:53 2007 +0000
+++ b/libpurple/nat-pmp.c	Tue Mar 27 04:34:02 2007 +0000
@@ -49,7 +49,7 @@
 #include <sys/types.h>
 #include <net/if.h>
 
-#ifdef NET_RT_DUMP2
+#ifdef NET_RT_DUMP
 
 #define PMP_DEBUG	1
 
@@ -148,7 +148,7 @@
 	int mib[6];
     size_t needed;
     char *buf, *next, *lim;
-    struct rt_msghdr2 *rtm;
+    struct rt_msghdr *rtm;
     struct sockaddr *sa;
 	struct sockaddr_in *sin = NULL;
 	gboolean found = FALSE;
@@ -157,7 +157,7 @@
     mib[1] = PF_ROUTE; /* entire routing table or a subset of it */
     mib[2] = 0; /* protocol number - always 0 */
     mib[3] = 0; /* address family - 0 for all addres families */
-    mib[4] = NET_RT_DUMP2;
+    mib[4] = NET_RT_DUMP;
     mib[5] = 0;
 
 	/* Determine the buffer side needed to get the full routing table */
@@ -184,7 +184,7 @@
 
     for (next = buf; next < lim; next += rtm->rtm_msglen) 
 	{
-		rtm = (struct rt_msghdr2 *)next;
+		rtm = (struct rt_msghdr *)next;
 		sa = (struct sockaddr *)(rtm + 1);
 		
 		if (sa->sa_family == AF_INET) 
@@ -458,7 +458,7 @@
 
 	return success;
 }
-#else /* #ifdef NET_RT_DUMP2 */
+#else /* #ifdef NET_RT_DUMP */
 char *
 purple_pmp_get_public_ip()
 {
@@ -476,4 +476,4 @@
 {
 	return FALSE;
 }
-#endif /* #ifndef NET_RT_DUMP2 */
+#endif /* #ifndef NET_RT_DUMP */