aboutsummaryrefslogtreecommitdiff
path: root/src/transport/gnunet-service-transport.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-10-18 12:33:21 +0000
committerChristian Grothoff <christian@grothoff.org>2015-10-18 12:33:21 +0000
commit9cd0d5068f3341fe8451a61872894f28a5ac9047 (patch)
tree390b09e837978c1dbef176950b04f42ecf39e140 /src/transport/gnunet-service-transport.c
parent38d26a302cba9de8362960186b645e8f2133a538 (diff)
downloadgnunet-9cd0d5068f3341fe8451a61872894f28a5ac9047.tar.gz
gnunet-9cd0d5068f3341fe8451a61872894f28a5ac9047.zip
rename 'struct Session' to 'struct GNUNET_ATS_Session' to satisfy naming conventions
Diffstat (limited to 'src/transport/gnunet-service-transport.c')
-rw-r--r--src/transport/gnunet-service-transport.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 8e2a135f2..89a1ec4c9 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -44,22 +44,22 @@
44/** 44/**
45 * Information we need for an asynchronous session kill. 45 * Information we need for an asynchronous session kill.
46 */ 46 */
47struct SessionKiller 47struct GNUNET_ATS_SessionKiller
48{ 48{
49 /** 49 /**
50 * Kept in a DLL. 50 * Kept in a DLL.
51 */ 51 */
52 struct SessionKiller *next; 52 struct GNUNET_ATS_SessionKiller *next;
53 53
54 /** 54 /**
55 * Kept in a DLL. 55 * Kept in a DLL.
56 */ 56 */
57 struct SessionKiller *prev; 57 struct GNUNET_ATS_SessionKiller *prev;
58 58
59 /** 59 /**
60 * Session to kill. 60 * Session to kill.
61 */ 61 */
62 struct Session *session; 62 struct GNUNET_ATS_Session *session;
63 63
64 /** 64 /**
65 * Plugin for the session. 65 * Plugin for the session.
@@ -123,12 +123,12 @@ struct GNUNET_TIME_Relative hello_expiration;
123/** 123/**
124 * Head of DLL of asynchronous tasks to kill sessions. 124 * Head of DLL of asynchronous tasks to kill sessions.
125 */ 125 */
126static struct SessionKiller *sk_head; 126static struct GNUNET_ATS_SessionKiller *sk_head;
127 127
128/** 128/**
129 * Tail of DLL of asynchronous tasks to kill sessions. 129 * Tail of DLL of asynchronous tasks to kill sessions.
130 */ 130 */
131static struct SessionKiller *sk_tail; 131static struct GNUNET_ATS_SessionKiller *sk_tail;
132 132
133/** 133/**
134 * Interface scanner determines our LAN address range(s). 134 * Interface scanner determines our LAN address range(s).
@@ -206,7 +206,7 @@ process_hello_update (void *cls,
206 */ 206 */
207static struct GNUNET_TIME_Relative 207static struct GNUNET_TIME_Relative
208process_payload (const struct GNUNET_HELLO_Address *address, 208process_payload (const struct GNUNET_HELLO_Address *address,
209 struct Session *session, 209 struct GNUNET_ATS_Session *session,
210 const struct GNUNET_MessageHeader *message) 210 const struct GNUNET_MessageHeader *message)
211{ 211{
212 struct GNUNET_TIME_Relative ret; 212 struct GNUNET_TIME_Relative ret;
@@ -249,14 +249,14 @@ process_payload (const struct GNUNET_HELLO_Address *address,
249/** 249/**
250 * Task to asynchronously terminate a session. 250 * Task to asynchronously terminate a session.
251 * 251 *
252 * @param cls the `struct SessionKiller` with the information for the kill 252 * @param cls the `struct GNUNET_ATS_SessionKiller` with the information for the kill
253 * @param tc scheduler context 253 * @param tc scheduler context
254 */ 254 */
255static void 255static void
256kill_session_task (void *cls, 256kill_session_task (void *cls,
257 const struct GNUNET_SCHEDULER_TaskContext *tc) 257 const struct GNUNET_SCHEDULER_TaskContext *tc)
258{ 258{
259 struct SessionKiller *sk = cls; 259 struct GNUNET_ATS_SessionKiller *sk = cls;
260 260
261 sk->task = NULL; 261 sk->task = NULL;
262 GNUNET_CONTAINER_DLL_remove (sk_head, sk_tail, sk); 262 GNUNET_CONTAINER_DLL_remove (sk_head, sk_tail, sk);
@@ -274,10 +274,10 @@ kill_session_task (void *cls,
274 */ 274 */
275static void 275static void
276kill_session (const char *plugin_name, 276kill_session (const char *plugin_name,
277 struct Session *session) 277 struct GNUNET_ATS_Session *session)
278{ 278{
279 struct GNUNET_TRANSPORT_PluginFunctions *plugin; 279 struct GNUNET_TRANSPORT_PluginFunctions *plugin;
280 struct SessionKiller *sk; 280 struct GNUNET_ATS_SessionKiller *sk;
281 281
282 for (sk = sk_head; NULL != sk; sk = sk->next) 282 for (sk = sk_head; NULL != sk; sk = sk->next)
283 if (sk->session == session) 283 if (sk->session == session)
@@ -289,7 +289,7 @@ kill_session (const char *plugin_name,
289 return; 289 return;
290 } 290 }
291 /* need to issue disconnect asynchronously */ 291 /* need to issue disconnect asynchronously */
292 sk = GNUNET_new (struct SessionKiller); 292 sk = GNUNET_new (struct GNUNET_ATS_SessionKiller);
293 sk->session = session; 293 sk->session = session;
294 sk->plugin = plugin; 294 sk->plugin = plugin;
295 sk->task = GNUNET_SCHEDULER_add_now (&kill_session_task, sk); 295 sk->task = GNUNET_SCHEDULER_add_now (&kill_session_task, sk);
@@ -313,7 +313,7 @@ static void
313connect_bl_check_cont (void *cls, 313connect_bl_check_cont (void *cls,
314 const struct GNUNET_PeerIdentity *peer, 314 const struct GNUNET_PeerIdentity *peer,
315 const struct GNUNET_HELLO_Address *address, 315 const struct GNUNET_HELLO_Address *address,
316 struct Session *session, 316 struct GNUNET_ATS_Session *session,
317 int result) 317 int result)
318{ 318{
319 struct GNUNET_MessageHeader *msg = cls; 319 struct GNUNET_MessageHeader *msg = cls;
@@ -365,7 +365,7 @@ connect_bl_check_cont (void *cls,
365struct GNUNET_TIME_Relative 365struct GNUNET_TIME_Relative
366GST_receive_callback (void *cls, 366GST_receive_callback (void *cls,
367 const struct GNUNET_HELLO_Address *address, 367 const struct GNUNET_HELLO_Address *address,
368 struct Session *session, 368 struct GNUNET_ATS_Session *session,
369 const struct GNUNET_MessageHeader *message) 369 const struct GNUNET_MessageHeader *message)
370{ 370{
371 const char *plugin_name = cls; 371 const char *plugin_name = cls;
@@ -559,9 +559,9 @@ plugin_env_address_change_notification (void *cls,
559static void 559static void
560plugin_env_session_end (void *cls, 560plugin_env_session_end (void *cls,
561 const struct GNUNET_HELLO_Address *address, 561 const struct GNUNET_HELLO_Address *address,
562 struct Session *session) 562 struct GNUNET_ATS_Session *session)
563{ 563{
564 struct SessionKiller *sk; 564 struct GNUNET_ATS_SessionKiller *sk;
565 565
566 if (NULL == address) 566 if (NULL == address)
567 { 567 {
@@ -614,7 +614,7 @@ static void
614plugin_env_session_start_bl_check_cont (void *cls, 614plugin_env_session_start_bl_check_cont (void *cls,
615 const struct GNUNET_PeerIdentity *peer, 615 const struct GNUNET_PeerIdentity *peer,
616 const struct GNUNET_HELLO_Address *address, 616 const struct GNUNET_HELLO_Address *address,
617 struct Session *session, 617 struct GNUNET_ATS_Session *session,
618 int result) 618 int result)
619{ 619{
620 if (GNUNET_OK != result) 620 if (GNUNET_OK != result)
@@ -646,7 +646,7 @@ plugin_env_session_start_bl_check_cont (void *cls,
646static void 646static void
647plugin_env_session_start (void *cls, 647plugin_env_session_start (void *cls,
648 const struct GNUNET_HELLO_Address *address, 648 const struct GNUNET_HELLO_Address *address,
649 struct Session *session, 649 struct GNUNET_ATS_Session *session,
650 enum GNUNET_ATS_Network_Type scope) 650 enum GNUNET_ATS_Network_Type scope)
651{ 651{
652 struct GNUNET_ATS_Properties prop; 652 struct GNUNET_ATS_Properties prop;
@@ -713,7 +713,7 @@ static void
713ats_request_address_change (void *cls, 713ats_request_address_change (void *cls,
714 const struct GNUNET_PeerIdentity *peer, 714 const struct GNUNET_PeerIdentity *peer,
715 const struct GNUNET_HELLO_Address *address, 715 const struct GNUNET_HELLO_Address *address,
716 struct Session *session, 716 struct GNUNET_ATS_Session *session,
717 struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out, 717 struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
718 struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in) 718 struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
719{ 719{