diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-09-22 14:37:41 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-09-22 14:37:41 +0000 |
commit | f3658260ec94e9874e0c773c762b4b49fda29b8e (patch) | |
tree | c452b52f0d01316322fefabcb49f3d909666669d /src/vpn/vpn.h | |
parent | d80bcf63863d4f2203d76edb8934cbd808ed9e77 (diff) | |
download | gnunet-f3658260ec94e9874e0c773c762b4b49fda29b8e.tar.gz gnunet-f3658260ec94e9874e0c773c762b4b49fda29b8e.zip |
remove 'nac' option from VPN, always return IP immediately, always build mesh tunnel asynchronously afterwards
Diffstat (limited to 'src/vpn/vpn.h')
-rw-r--r-- | src/vpn/vpn.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/vpn/vpn.h b/src/vpn/vpn.h index e1ae130e7..b74b5b766 100644 --- a/src/vpn/vpn.h +++ b/src/vpn/vpn.h | |||
@@ -38,15 +38,14 @@ GNUNET_NETWORK_STRUCT_BEGIN | |||
38 | struct RedirectToIpRequestMessage | 38 | struct RedirectToIpRequestMessage |
39 | { | 39 | { |
40 | /** | 40 | /** |
41 | * Type is GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_IP | 41 | * Type is #GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_IP |
42 | */ | 42 | */ |
43 | struct GNUNET_MessageHeader header; | 43 | struct GNUNET_MessageHeader header; |
44 | 44 | ||
45 | /** | 45 | /** |
46 | * GNUNET_YES to notify only after completion of the mesh-level connection, | 46 | * Always zero. |
47 | * GNUNET_NO to notify as soon as an address was allocated (in nbo). | ||
48 | */ | 47 | */ |
49 | int32_t nac GNUNET_PACKED; | 48 | uint32_t reserved GNUNET_PACKED; |
50 | 49 | ||
51 | /** | 50 | /** |
52 | * How long should the redirection be maintained at most? | 51 | * How long should the redirection be maintained at most? |
@@ -82,15 +81,14 @@ struct RedirectToIpRequestMessage | |||
82 | struct RedirectToServiceRequestMessage | 81 | struct RedirectToServiceRequestMessage |
83 | { | 82 | { |
84 | /** | 83 | /** |
85 | * Type is GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_SERVICE | 84 | * Type is #GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_SERVICE |
86 | */ | 85 | */ |
87 | struct GNUNET_MessageHeader header; | 86 | struct GNUNET_MessageHeader header; |
88 | 87 | ||
89 | /** | 88 | /** |
90 | * GNUNET_YES to notify only after completion of the mesh-level connection, | 89 | * Always zero. |
91 | * GNUNET_NO to notify as soon as an address was allocated (in nbo). | ||
92 | */ | 90 | */ |
93 | int32_t nac GNUNET_PACKED; | 91 | uint32_t reserved GNUNET_PACKED; |
94 | 92 | ||
95 | /** | 93 | /** |
96 | * How long should the redirection be maintained at most? | 94 | * How long should the redirection be maintained at most? |
@@ -134,7 +132,7 @@ struct RedirectToIpResponseMessage | |||
134 | { | 132 | { |
135 | 133 | ||
136 | /** | 134 | /** |
137 | * Type is GNUNET_MESSAGE_TYPE_VPN_CLIENT_USE_IP | 135 | * Type is #GNUNET_MESSAGE_TYPE_VPN_CLIENT_USE_IP |
138 | */ | 136 | */ |
139 | struct GNUNET_MessageHeader header; | 137 | struct GNUNET_MessageHeader header; |
140 | 138 | ||