diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-06-19 21:20:39 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-06-19 21:20:39 +0200 |
commit | 33e87eb7680148006b7c9fc8f89040ad104597ea (patch) | |
tree | bee7bf0101ddd39a1fdeaa2e33d88e52be04e288 /src/nse/nse_api.c | |
parent | a31cd73472ac1b4c899a6e1d7e53851c20677f7d (diff) | |
download | gnunet-33e87eb7680148006b7c9fc8f89040ad104597ea.tar.gz gnunet-33e87eb7680148006b7c9fc8f89040ad104597ea.zip |
fix socket cmp, fix compiler warnings about unused args
Diffstat (limited to 'src/nse/nse_api.c')
-rw-r--r-- | src/nse/nse_api.c | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/src/nse/nse_api.c b/src/nse/nse_api.c index e9eaada93..259be75ed 100644 --- a/src/nse/nse_api.c +++ b/src/nse/nse_api.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include "gnunet_nse_service.h" | 32 | #include "gnunet_nse_service.h" |
33 | #include "nse.h" | 33 | #include "nse.h" |
34 | 34 | ||
35 | #define LOG(kind,...) GNUNET_log_from (kind, "nse-api",__VA_ARGS__) | 35 | #define LOG(kind, ...) GNUNET_log_from (kind, "nse-api", __VA_ARGS__) |
36 | 36 | ||
37 | /** | 37 | /** |
38 | * Handle for talking with the NSE service. | 38 | * Handle for talking with the NSE service. |
@@ -68,7 +68,6 @@ struct GNUNET_NSE_Handle | |||
68 | * Closure to pass to @e recv_cb callback. | 68 | * Closure to pass to @e recv_cb callback. |
69 | */ | 69 | */ |
70 | void *recv_cb_cls; | 70 | void *recv_cb_cls; |
71 | |||
72 | }; | 71 | }; |
73 | 72 | ||
74 | 73 | ||
@@ -91,17 +90,15 @@ reconnect (void *cls); | |||
91 | * @param error error code | 90 | * @param error error code |
92 | */ | 91 | */ |
93 | static void | 92 | static void |
94 | mq_error_handler (void *cls, | 93 | mq_error_handler (void *cls, enum GNUNET_MQ_Error error) |
95 | enum GNUNET_MQ_Error error) | ||
96 | { | 94 | { |
97 | struct GNUNET_NSE_Handle *h = cls; | 95 | struct GNUNET_NSE_Handle *h = cls; |
98 | 96 | ||
97 | (void) error; | ||
99 | GNUNET_MQ_destroy (h->mq); | 98 | GNUNET_MQ_destroy (h->mq); |
100 | h->mq = NULL; | 99 | h->mq = NULL; |
101 | h->reconnect_task | 100 | h->reconnect_task = |
102 | = GNUNET_SCHEDULER_add_delayed (h->reconnect_delay, | 101 | GNUNET_SCHEDULER_add_delayed (h->reconnect_delay, &reconnect, h); |
103 | &reconnect, | ||
104 | h); | ||
105 | h->reconnect_delay = GNUNET_TIME_STD_BACKOFF (h->reconnect_delay); | 102 | h->reconnect_delay = GNUNET_TIME_STD_BACKOFF (h->reconnect_delay); |
106 | } | 103 | } |
107 | 104 | ||
@@ -114,8 +111,7 @@ mq_error_handler (void *cls, | |||
114 | * @param client_msg message received | 111 | * @param client_msg message received |
115 | */ | 112 | */ |
116 | static void | 113 | static void |
117 | handle_estimate (void *cls, | 114 | handle_estimate (void *cls, const struct GNUNET_NSE_ClientMessage *client_msg) |
118 | const struct GNUNET_NSE_ClientMessage *client_msg) | ||
119 | { | 115 | { |
120 | struct GNUNET_NSE_Handle *h = cls; | 116 | struct GNUNET_NSE_Handle *h = cls; |
121 | 117 | ||
@@ -123,7 +119,7 @@ handle_estimate (void *cls, | |||
123 | h->recv_cb (h->recv_cb_cls, | 119 | h->recv_cb (h->recv_cb_cls, |
124 | GNUNET_TIME_absolute_ntoh (client_msg->timestamp), | 120 | GNUNET_TIME_absolute_ntoh (client_msg->timestamp), |
125 | GNUNET_ntoh_double (client_msg->size_estimate), | 121 | GNUNET_ntoh_double (client_msg->size_estimate), |
126 | GNUNET_ntoh_double (client_msg->std_deviation)); | 122 | GNUNET_ntoh_double (client_msg->std_deviation)); |
127 | } | 123 | } |
128 | 124 | ||
129 | 125 | ||
@@ -136,13 +132,12 @@ static void | |||
136 | reconnect (void *cls) | 132 | reconnect (void *cls) |
137 | { | 133 | { |
138 | struct GNUNET_NSE_Handle *h = cls; | 134 | struct GNUNET_NSE_Handle *h = cls; |
139 | struct GNUNET_MQ_MessageHandler handlers[] = { | 135 | struct GNUNET_MQ_MessageHandler handlers[] = |
140 | GNUNET_MQ_hd_fixed_size (estimate, | 136 | {GNUNET_MQ_hd_fixed_size (estimate, |
141 | GNUNET_MESSAGE_TYPE_NSE_ESTIMATE, | 137 | GNUNET_MESSAGE_TYPE_NSE_ESTIMATE, |
142 | struct GNUNET_NSE_ClientMessage, | 138 | struct GNUNET_NSE_ClientMessage, |
143 | h), | 139 | h), |
144 | GNUNET_MQ_handler_end () | 140 | GNUNET_MQ_handler_end ()}; |
145 | }; | ||
146 | struct GNUNET_MessageHeader *msg; | 141 | struct GNUNET_MessageHeader *msg; |
147 | struct GNUNET_MQ_Envelope *env; | 142 | struct GNUNET_MQ_Envelope *env; |
148 | 143 | ||
@@ -150,17 +145,11 @@ reconnect (void *cls) | |||
150 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 145 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
151 | "Connecting to network size estimation service.\n"); | 146 | "Connecting to network size estimation service.\n"); |
152 | GNUNET_assert (NULL == h->mq); | 147 | GNUNET_assert (NULL == h->mq); |
153 | h->mq = GNUNET_CLIENT_connect (h->cfg, | 148 | h->mq = GNUNET_CLIENT_connect (h->cfg, "nse", handlers, &mq_error_handler, h); |
154 | "nse", | ||
155 | handlers, | ||
156 | &mq_error_handler, | ||
157 | h); | ||
158 | if (NULL == h->mq) | 149 | if (NULL == h->mq) |
159 | return; | 150 | return; |
160 | env = GNUNET_MQ_msg (msg, | 151 | env = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_NSE_START); |
161 | GNUNET_MESSAGE_TYPE_NSE_START); | 152 | GNUNET_MQ_send (h->mq, env); |
162 | GNUNET_MQ_send (h->mq, | ||
163 | env); | ||
164 | } | 153 | } |
165 | 154 | ||
166 | 155 | ||