--- gvpe/src/vpn_dns.C	2008/08/07 17:54:27	1.47
+++ gvpe/src/vpn_dns.C	2011/02/08 23:11:36	1.49
@@ -85,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
@@ -169,12 +170,14 @@
     }
 }
 
-unsigned int basecoder::encode_len (unsigned int len)
+unsigned int
+basecoder::encode_len (unsigned int len)
 {
   return enc_len [len];
 }
 
-unsigned int basecoder::decode_len (unsigned int len)
+unsigned int
+basecoder::decode_len (unsigned int len)
 {
   while (len && !dec_len [len])
     --len;
@@ -182,7 +185,8 @@
   return dec_len [len];
 }
 
-unsigned int basecoder::encode (char *dst, u8 *src, unsigned int len)
+unsigned int
+basecoder::encode (char *dst, u8 *src, unsigned int len)
 {
   if (!len || len > MAX_DEC_LEN)
     return 0;
@@ -211,7 +215,8 @@
   return elen;
 }
 
-unsigned int basecoder::decode (u8 *dst, char *src, unsigned int len)
+unsigned int
+basecoder::decode (u8 *dst, char *src, unsigned int len)
 {
   if (!len || len > MAX_ENC_LEN)
     return 0;
@@ -280,7 +285,8 @@
 
 #define HDRSIZE 6
  
-inline void encode_header (char *data, int clientid, int seqno, int retry = 0)
+inline void
+encode_header (char *data, int clientid, int seqno, int retry = 0)
 {
   seqno &= SEQNO_MASK;
 
@@ -295,7 +301,8 @@
   cdc26.encode (data, hdr, 3);
 }
 
-inline void decode_header (char *data, int &clientid, int &seqno)
+inline void
+decode_header (char *data, int &clientid, int &seqno)
 {
   u8 hdr[3];
 
@@ -338,7 +345,8 @@
   delete data;
 }
 
-void byte_stream::remove (int count)
+void
+byte_stream::remove (int count)
 {
   if (count > fill)
     assert (count <= fill);
@@ -346,7 +354,8 @@
   memmove (data, data + count, fill -= count);
 }
 
-bool byte_stream::put (u8 *data, unsigned int datalen)
+bool
+byte_stream::put (u8 *data, unsigned int datalen)
 {
   if (maxsize - fill < datalen)
     return false;
@@ -356,7 +365,8 @@
   return true;
 }
 
-bool byte_stream::put (vpn_packet *pkt)
+bool
+byte_stream::put (vpn_packet *pkt)
 {
   if (maxsize - fill < pkt->len + 2)
     return false;
@@ -448,7 +458,8 @@
 
 int dns_cfg::next_uid;
 
-void dns_cfg::reset (int clientid)
+void
+dns_cfg::reset (int clientid)
 {
   id1 = 'G';
   id2 = 'V';
@@ -472,7 +483,8 @@
   r4 = r5 = r6 = r7 = 0;
 }
 
-bool dns_cfg::valid ()
+bool
+dns_cfg::valid ()
 {
   // although the protocol itself allows for some configurability,
   // only the following encoding/decoding settings are implemented.
@@ -497,7 +509,8 @@
   int decode_label (char *data, int size, int &offs);
 };
 
-int dns_packet::decode_label (char *data, int size, int &offs)
+int
+dns_packet::decode_label (char *data, int size, int &offs)
 {
   char *orig = data;
 
@@ -533,10 +546,11 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
-static u16 dns_id = 0; // TODO: should be per-vpn
-
-static u16 next_id ()
+static
+u16 next_id ()
 {
+  static u16 dns_id = 0; // TODO: should be per-vpn
+
   if (!dns_id)
     dns_id = time (0);
 
@@ -614,7 +628,8 @@
   delete pkt;
 }
 
-static void append_domain (dns_packet &pkt, int &offs, const char *domain)
+static void
+append_domain (dns_packet &pkt, int &offs, const char *domain)
 {
   // add tunnel domain
   for (;;)
@@ -637,7 +652,8 @@
     }
 }
 
-void dns_snd::gen_stream_req (int seqno, byte_stream &stream)
+void
+dns_snd::gen_stream_req (int seqno, byte_stream &stream)
 {
   stdhdr = true;
   this->seqno = seqno;
@@ -685,7 +701,8 @@
   pkt->len = offs;
 }
 
-void dns_snd::gen_syn_req ()
+void
+dns_snd::gen_syn_req ()
 {
   timeout = ev_now () + INITIAL_SYN_TIMEOUT;
 
@@ -760,7 +777,8 @@
     delete *i;
 }
 
-void dns_connection::receive_rep (dns_rcv *r)
+void
+dns_connection::receive_rep (dns_rcv *r)
 {
   if (r->datalen)
     {