[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18901 - gnunet/src/vpn
From: |
gnunet |
Subject: |
[GNUnet-SVN] r18901 - gnunet/src/vpn |
Date: |
Sun, 1 Jan 2012 23:49:53 +0100 |
Author: grothoff
Date: 2012-01-01 23:49:53 +0100 (Sun, 01 Jan 2012)
New Revision: 18901
Modified:
gnunet/src/vpn/gnunet-dns-parser.h
gnunet/src/vpn/gnunet-vpn-packet.h
Log:
-moving DNS structs to gnunet-dns-parser.h
Modified: gnunet/src/vpn/gnunet-dns-parser.h
===================================================================
--- gnunet/src/vpn/gnunet-dns-parser.h 2012-01-01 22:37:47 UTC (rev 18900)
+++ gnunet/src/vpn/gnunet-dns-parser.h 2012-01-01 22:49:53 UTC (rev 18901)
@@ -2,8 +2,87 @@
#define _GNVPN_DNSP_H_
#include "platform.h"
-#include "gnunet-vpn-packet.h"
+#include "gnunet_common.h"
+// DNS-Stuff
+GNUNET_NETWORK_STRUCT_BEGIN
+
+struct dns_static
+{
+ uint16_t id GNUNET_PACKED;
+
+ unsigned rd:1 GNUNET_PACKED; // recursion desired (client -> server)
+ unsigned tc:1 GNUNET_PACKED; // message is truncated
+ unsigned aa:1 GNUNET_PACKED; // authoritative answer
+ unsigned op:4 GNUNET_PACKED; // query:0, inverse q.:1, status: 2
+ unsigned qr:1 GNUNET_PACKED; // query:0, response:1
+
+ unsigned rcode:4 GNUNET_PACKED; // 0 No error
+ // 1 Format error
+ // 2 Server failure
+ // 3 Name Error
+ // 4 Not Implemented
+ // 5 Refused
+ unsigned z:3 GNUNET_PACKED; // reserved
+ unsigned ra:1 GNUNET_PACKED; // recursion available (server -> client)
+
+ uint16_t qdcount GNUNET_PACKED; // number of questions
+ uint16_t ancount GNUNET_PACKED; // number of answers
+ uint16_t nscount GNUNET_PACKED; // number of authority-records
+ uint16_t arcount GNUNET_PACKED; // number of additional records
+};
+GNUNET_NETWORK_STRUCT_END
+
+struct dns_pkt
+{
+ struct dns_static s;
+ unsigned char data[1];
+};
+
+struct dns_pkt_parsed
+{
+ struct dns_static s;
+ struct dns_query **queries;
+ struct dns_record **answers;
+ struct dns_record **nameservers;
+ struct dns_record **additional;
+};
+
+struct dns_query_line
+{
+ unsigned short type;
+ unsigned short class;
+};
+
+struct dns_query
+{
+ char *name;
+ unsigned char namelen;
+ unsigned short qtype;
+ unsigned short qclass;
+};
+
+struct dns_record_line
+{
+ unsigned short type;
+ unsigned short class;
+ unsigned int ttl;
+ unsigned short data_len;
+ unsigned char data;
+};
+
+struct dns_record
+{
+ char *name;
+ unsigned char namelen;
+ unsigned short type;
+ unsigned short class;
+ unsigned int ttl;
+ unsigned short data_len;
+ unsigned char *data;
+};
+
+
struct dns_pkt_parsed *
parse_dns_packet (struct dns_pkt *pkt);
Modified: gnunet/src/vpn/gnunet-vpn-packet.h
===================================================================
--- gnunet/src/vpn/gnunet-vpn-packet.h 2012-01-01 22:37:47 UTC (rev 18900)
+++ gnunet/src/vpn/gnunet-vpn-packet.h 2012-01-01 22:49:53 UTC (rev 18901)
@@ -3,6 +3,7 @@
#include "platform.h"
#include "gnunet_common.h"
+#include "gnunet-dns-parser.h"
GNUNET_NETWORK_STRUCT_BEGIN
@@ -76,83 +77,9 @@
unsigned code:8 GNUNET_PACKED;
unsigned chks:16 GNUNET_PACKED;
};
-
-// DNS-Stuff
-struct dns_static
-{
- uint16_t id GNUNET_PACKED;
-
- unsigned rd:1 GNUNET_PACKED; // recursion desired (client -> server)
- unsigned tc:1 GNUNET_PACKED; // message is truncated
- unsigned aa:1 GNUNET_PACKED; // authoritative answer
- unsigned op:4 GNUNET_PACKED; // query:0, inverse q.:1, status: 2
- unsigned qr:1 GNUNET_PACKED; // query:0, response:1
-
- unsigned rcode:4 GNUNET_PACKED; // 0 No error
- // 1 Format error
- // 2 Server failure
- // 3 Name Error
- // 4 Not Implemented
- // 5 Refused
- unsigned z:3 GNUNET_PACKED; // reserved
- unsigned ra:1 GNUNET_PACKED; // recursion available (server -> client)
-
- uint16_t qdcount GNUNET_PACKED; // number of questions
- uint16_t ancount GNUNET_PACKED; // number of answers
- uint16_t nscount GNUNET_PACKED; // number of authority-records
- uint16_t arcount GNUNET_PACKED; // number of additional records
-};
GNUNET_NETWORK_STRUCT_END
-struct dns_pkt
-{
- struct dns_static s;
- unsigned char data[1];
-};
-struct dns_pkt_parsed
-{
- struct dns_static s;
- struct dns_query **queries;
- struct dns_record **answers;
- struct dns_record **nameservers;
- struct dns_record **additional;
-};
-
-struct dns_query_line
-{
- unsigned short type;
- unsigned short class;
-};
-
-struct dns_query
-{
- char *name;
- unsigned char namelen;
- unsigned short qtype;
- unsigned short qclass;
-};
-
-struct dns_record_line
-{
- unsigned short type;
- unsigned short class;
- unsigned int ttl;
- unsigned short data_len;
- unsigned char data;
-};
-
-struct dns_record
-{
- char *name;
- unsigned char namelen;
- unsigned short type;
- unsigned short class;
- unsigned int ttl;
- unsigned short data_len;
- unsigned char *data;
-};
-
struct udp_dns
{
struct udp_pkt udp_hdr;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18901 - gnunet/src/vpn,
gnunet <=