diff options
author | Philipp Tölke <toelke@in.tum.de> | 2010-07-20 22:21:59 +0000 |
---|---|---|
committer | Philipp Tölke <toelke@in.tum.de> | 2010-07-20 22:21:59 +0000 |
commit | 329e01c484e59ef1308c39bbd99b341d4ff60b21 (patch) | |
tree | 806f469ee6044953130379bca1cfa9e20af63b09 /src/vpn/gnunet-vpn-packet.h | |
parent | 7a77cfe5da48dacd3ceb27ee0f8dfc86dc3ce0d6 (diff) | |
download | gnunet-329e01c484e59ef1308c39bbd99b341d4ff60b21.tar.gz gnunet-329e01c484e59ef1308c39bbd99b341d4ff60b21.zip |
Changed the communication between the vpn-helper and the daemon to use GNUNET_MessageHeaders
Diffstat (limited to 'src/vpn/gnunet-vpn-packet.h')
-rw-r--r-- | src/vpn/gnunet-vpn-packet.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/vpn/gnunet-vpn-packet.h b/src/vpn/gnunet-vpn-packet.h index 89b75ba35..4ba6f2528 100644 --- a/src/vpn/gnunet-vpn-packet.h +++ b/src/vpn/gnunet-vpn-packet.h | |||
@@ -2,6 +2,7 @@ | |||
2 | #define _GNTUN_PACKET_H_ | 2 | #define _GNTUN_PACKET_H_ |
3 | 3 | ||
4 | #include "gnunet-vpn-helper-p.h" | 4 | #include "gnunet-vpn-helper-p.h" |
5 | #include "gnunet_common.h" | ||
5 | 6 | ||
6 | // Headers | 7 | // Headers |
7 | struct pkt_tun { | 8 | struct pkt_tun { |
@@ -83,14 +84,14 @@ struct dns_record { | |||
83 | 84 | ||
84 | // Complete Packets | 85 | // Complete Packets |
85 | struct ip6_pkt { | 86 | struct ip6_pkt { |
86 | struct suid_packet_header shdr; | 87 | struct GNUNET_MessageHeader shdr; |
87 | struct pkt_tun tun; | 88 | struct pkt_tun tun; |
88 | struct ip6_hdr ip6_hdr; | 89 | struct ip6_hdr ip6_hdr; |
89 | unsigned char data[1]; | 90 | unsigned char data[1]; |
90 | }; | 91 | }; |
91 | 92 | ||
92 | struct ip6_tcp { | 93 | struct ip6_tcp { |
93 | struct suid_packet_header shdr; | 94 | struct GNUNET_MessageHeader shdr; |
94 | struct pkt_tun tun; | 95 | struct pkt_tun tun; |
95 | struct ip6_hdr ip6_hdr; | 96 | struct ip6_hdr ip6_hdr; |
96 | struct tcp_pkt tcp_hdr; | 97 | struct tcp_pkt tcp_hdr; |
@@ -98,7 +99,7 @@ struct ip6_tcp { | |||
98 | }; | 99 | }; |
99 | 100 | ||
100 | struct ip6_udp { | 101 | struct ip6_udp { |
101 | struct suid_packet_header shdr; | 102 | struct GNUNET_MessageHeader shdr; |
102 | struct pkt_tun tun; | 103 | struct pkt_tun tun; |
103 | struct ip6_hdr ip6_hdr; | 104 | struct ip6_hdr ip6_hdr; |
104 | struct udp_pkt udp_hdr; | 105 | struct udp_pkt udp_hdr; |
@@ -106,7 +107,7 @@ struct ip6_udp { | |||
106 | }; | 107 | }; |
107 | 108 | ||
108 | struct ip6_udp_dns { | 109 | struct ip6_udp_dns { |
109 | struct suid_packet_header shdr; | 110 | struct GNUNET_MessageHeader shdr; |
110 | struct pkt_tun tun; | 111 | struct pkt_tun tun; |
111 | struct ip6_hdr ip6_hdr; | 112 | struct ip6_hdr ip6_hdr; |
112 | struct udp_pkt udp_hdr; | 113 | struct udp_pkt udp_hdr; |