--- gvpe/src/vpn_dns.C	2007/12/01 23:35:31	1.43
+++ gvpe/src/vpn_dns.C	2009/07/28 00:42:14	1.48
@@ -1,22 +1,32 @@
 /*
     vpn_dns.C -- handle the dns tunnel part of the protocol.
-    Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
+    Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
  
     This file is part of GVPE.
 
-    GVPE 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 gvpe; if not, write to the Free Software
-    Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    GVPE 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 3 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, see <http://www.gnu.org/licenses/>.
+   
+    Additional permission under GNU GPL version 3 section 7
+   
+    If you modify this Program, or any covered work, by linking or
+    combining it with the OpenSSL project's OpenSSL library (or a modified
+    version of that library), containing parts covered by the terms of the
+    OpenSSL or SSLeay licenses, the licensors of this Program grant you
+    additional permission to convey the resulting work.  Corresponding
+    Source for a non-source form of such a combination shall include the
+    source code for the parts of OpenSSL used as well as that of the
+    covered work.
 */
 
 // TODO: EDNS0 option to increase dns mtu?
@@ -44,6 +54,7 @@
 
 #include <map>
 
+#include <cstdio> /* bug in libgmp: gmp.h relies on cstdio being included */
 #include <gmp.h>
 
 #include "netcompat.h"
@@ -74,6 +85,7 @@
 #define RR_TYPE_A     1
 #define RR_TYPE_NULL 10
 #define RR_TYPE_TXT  16
+#define RR_TYPE_AAAA 28
 #define RR_TYPE_ANY 255
 
 #define RR_CLASS_IN   1
@@ -561,7 +573,7 @@
   byte_stream rcvdq; int rcvseq; int repseq;
   byte_stream snddq; int sndseq;
 
-  void time_cb (ev::timer &w, int revents); ev::timer tw;
+  inline void time_cb (ev::timer &w, int revents); ev::timer tw;
   void receive_rep (dns_rcv *r);
 
   dns_connection (connection *c);
@@ -726,8 +738,9 @@
 : c (c)
 , rcvdq (MAX_BACKLOG * 2)
 , snddq (MAX_BACKLOG)
-, tw (this, &dns_connection::time_cb)
 {
+  tw.set<dns_connection, &dns_connection::time_cb> (this);
+
   vpn = c->vpn;
 
   established = false;