diff options
author | t3sserakt <t3ss@posteo.de> | 2021-12-01 14:06:12 +0100 |
---|---|---|
committer | t3sserakt <t3ss@posteo.de> | 2021-12-01 14:06:12 +0100 |
commit | 1408842544b1cbea01efc636bdcb6be73a4e20a9 (patch) | |
tree | 238ee0392d0597d297f6dcfa613ea0000a01d6d3 /src/transport/transport_api_cmd_connecting_peers.c | |
parent | 5b4c1620bb7ed90d7bb26484c0a39807bb7f1dd5 (diff) | |
download | gnunet-1408842544b1cbea01efc636bdcb6be73a4e20a9.tar.gz gnunet-1408842544b1cbea01efc636bdcb6be73a4e20a9.zip |
- using the big macrofication of the traits from GNU Taler now
Diffstat (limited to 'src/transport/transport_api_cmd_connecting_peers.c')
-rw-r--r-- | src/transport/transport_api_cmd_connecting_peers.c | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/src/transport/transport_api_cmd_connecting_peers.c b/src/transport/transport_api_cmd_connecting_peers.c index f65b6f666..fc925675d 100644 --- a/src/transport/transport_api_cmd_connecting_peers.c +++ b/src/transport/transport_api_cmd_connecting_peers.c | |||
@@ -47,11 +47,11 @@ connect_peers_run (void *cls, | |||
47 | { | 47 | { |
48 | struct ConnectPeersState *cps = cls; | 48 | struct ConnectPeersState *cps = cls; |
49 | const struct GNUNET_TESTING_Command *system_cmd; | 49 | const struct GNUNET_TESTING_Command *system_cmd; |
50 | struct GNUNET_TESTING_System *tl_system; | 50 | const struct GNUNET_TESTING_System *tl_system; |
51 | 51 | ||
52 | 52 | ||
53 | const struct GNUNET_TESTING_Command *peer1_cmd; | 53 | const struct GNUNET_TESTING_Command *peer1_cmd; |
54 | struct GNUNET_TRANSPORT_ApplicationHandle *ah; | 54 | const struct GNUNET_TRANSPORT_ApplicationHandle *ah; |
55 | struct GNUNET_PeerIdentity *peer; | 55 | struct GNUNET_PeerIdentity *peer; |
56 | char *addr; | 56 | char *addr; |
57 | enum GNUNET_NetworkType nt = 0; | 57 | enum GNUNET_NetworkType nt = 0; |
@@ -98,7 +98,9 @@ connect_peers_run (void *cls, | |||
98 | "validating peer number %u with identity %s\n", | 98 | "validating peer number %u with identity %s\n", |
99 | num, | 99 | num, |
100 | GNUNET_i2s (peer)); | 100 | GNUNET_i2s (peer)); |
101 | GNUNET_TRANSPORT_application_validate (ah, | 101 | GNUNET_TRANSPORT_application_validate ((struct |
102 | GNUNET_TRANSPORT_ApplicationHandle | ||
103 | *) ah, | ||
102 | peer, | 104 | peer, |
103 | nt, | 105 | nt, |
104 | addr); | 106 | addr); |
@@ -176,13 +178,9 @@ connect_peers_traits (void *cls, | |||
176 | const char *trait, | 178 | const char *trait, |
177 | unsigned int index) | 179 | unsigned int index) |
178 | { | 180 | { |
179 | struct StartPeerState *cps = cls; | 181 | struct ConnectPeersState *cps = cls; |
180 | struct GNUNET_TESTING_Trait traits[] = { | 182 | struct GNUNET_TESTING_Trait traits[] = { |
181 | { | 183 | GNUNET_TRANSPORT_make_trait_connect_peer_state ((const void *) cps), |
182 | .index = 0, | ||
183 | .trait_name = "state", | ||
184 | .ptr = (const void *) cps, | ||
185 | }, | ||
186 | GNUNET_TESTING_trait_end () | 184 | GNUNET_TESTING_trait_end () |
187 | }; | 185 | }; |
188 | return GNUNET_TESTING_get_trait (traits, | 186 | return GNUNET_TESTING_get_trait (traits, |
@@ -193,25 +191,6 @@ connect_peers_traits (void *cls, | |||
193 | 191 | ||
194 | 192 | ||
195 | /** | 193 | /** |
196 | * Function to get the trait with the struct ConnectPeersState. | ||
197 | * | ||
198 | * @param[out] sps struct ConnectPeersState. | ||
199 | * @return #GNUNET_OK if no error occurred, #GNUNET_SYSERR otherwise. | ||
200 | * | ||
201 | */ | ||
202 | enum GNUNET_GenericReturnValue | ||
203 | GNUNET_TRANSPORT_get_trait_connect_peer_state ( | ||
204 | const struct GNUNET_TESTING_Command *cmd, | ||
205 | struct ConnectPeersState **cps) | ||
206 | { | ||
207 | return cmd->traits (cmd->cls, | ||
208 | (const void **) cps, | ||
209 | "state", | ||
210 | (unsigned int) 0); | ||
211 | } | ||
212 | |||
213 | |||
214 | /** | ||
215 | * Create command | 194 | * Create command |
216 | * | 195 | * |
217 | * @param label name for command | 196 | * @param label name for command |