diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-07-29 21:55:23 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-07-29 21:55:23 +0000 |
commit | 49d8694f79f2c716fd56f803e64e0b9008179970 (patch) | |
tree | f62632bf512f270834d60b83cfb5bf6e30e4cf78 /src/testbed/gnunet-service-testbed_oc.c | |
parent | c5bf6746a62e43d0c96fed6bc474f1e42f4c1540 (diff) | |
download | gnunet-49d8694f79f2c716fd56f803e64e0b9008179970.tar.gz gnunet-49d8694f79f2c716fd56f803e64e0b9008179970.zip |
-convert to new transport API
Diffstat (limited to 'src/testbed/gnunet-service-testbed_oc.c')
-rw-r--r-- | src/testbed/gnunet-service-testbed_oc.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c index cf74ea04e..02c369aaa 100644 --- a/src/testbed/gnunet-service-testbed_oc.c +++ b/src/testbed/gnunet-service-testbed_oc.c | |||
@@ -46,7 +46,7 @@ struct ConnectivitySuggestContext | |||
46 | /** | 46 | /** |
47 | * The transport handle obtained from cache. Do NOT close/disconnect. | 47 | * The transport handle obtained from cache. Do NOT close/disconnect. |
48 | */ | 48 | */ |
49 | struct GNUNET_TRANSPORT_Handle *th_; | 49 | struct GNUNET_TRANSPORT_CoreHandle *th_; |
50 | 50 | ||
51 | /** | 51 | /** |
52 | * Configuration of the peer from cache. Do not free! | 52 | * Configuration of the peer from cache. Do not free! |
@@ -178,7 +178,7 @@ struct OverlayConnectContext | |||
178 | * Transport handle of the first peer obtained from cache to get its HELLO. Do | 178 | * Transport handle of the first peer obtained from cache to get its HELLO. Do |
179 | * NOT close/disconnect. | 179 | * NOT close/disconnect. |
180 | */ | 180 | */ |
181 | struct GNUNET_TRANSPORT_Handle *p1th_; | 181 | struct GNUNET_TRANSPORT_CoreHandle *p1th_; |
182 | 182 | ||
183 | /** | 183 | /** |
184 | * The #GST_ConnectionPool_GetHandle for the peer1's transport handle | 184 | * The #GST_ConnectionPool_GetHandle for the peer1's transport handle |
@@ -709,7 +709,7 @@ overlay_connect_notify (void *cls, | |||
709 | static void | 709 | static void |
710 | occ_cache_get_handle_ats_occ_cb (void *cls, | 710 | occ_cache_get_handle_ats_occ_cb (void *cls, |
711 | struct GNUNET_CORE_Handle *ch, | 711 | struct GNUNET_CORE_Handle *ch, |
712 | struct GNUNET_TRANSPORT_Handle *th, | 712 | struct GNUNET_TRANSPORT_CoreHandle *th, |
713 | struct GNUNET_ATS_ConnectivityHandle *ac, | 713 | struct GNUNET_ATS_ConnectivityHandle *ac, |
714 | const struct GNUNET_PeerIdentity *my_identity, | 714 | const struct GNUNET_PeerIdentity *my_identity, |
715 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 715 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
@@ -759,7 +759,7 @@ occ_cache_get_handle_ats_occ_cb (void *cls, | |||
759 | static void | 759 | static void |
760 | occ_cache_get_handle_ats_rocc_cb (void *cls, | 760 | occ_cache_get_handle_ats_rocc_cb (void *cls, |
761 | struct GNUNET_CORE_Handle *ch, | 761 | struct GNUNET_CORE_Handle *ch, |
762 | struct GNUNET_TRANSPORT_Handle *th, | 762 | struct GNUNET_TRANSPORT_CoreHandle *th, |
763 | struct GNUNET_ATS_ConnectivityHandle *ac, | 763 | struct GNUNET_ATS_ConnectivityHandle *ac, |
764 | const struct GNUNET_PeerIdentity *my_identity, | 764 | const struct GNUNET_PeerIdentity *my_identity, |
765 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 765 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
@@ -921,7 +921,7 @@ send_hello (void *cls) | |||
921 | static void | 921 | static void |
922 | p2_transport_connect_cache_callback (void *cls, | 922 | p2_transport_connect_cache_callback (void *cls, |
923 | struct GNUNET_CORE_Handle *ch, | 923 | struct GNUNET_CORE_Handle *ch, |
924 | struct GNUNET_TRANSPORT_Handle *th, | 924 | struct GNUNET_TRANSPORT_CoreHandle *th, |
925 | struct GNUNET_ATS_ConnectivityHandle *ac, | 925 | struct GNUNET_ATS_ConnectivityHandle *ac, |
926 | const struct GNUNET_PeerIdentity *ignore_, | 926 | const struct GNUNET_PeerIdentity *ignore_, |
927 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 927 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
@@ -1063,7 +1063,7 @@ hello_update_cb (void *cls, | |||
1063 | static void | 1063 | static void |
1064 | p1_transport_connect_cache_callback (void *cls, | 1064 | p1_transport_connect_cache_callback (void *cls, |
1065 | struct GNUNET_CORE_Handle *ch, | 1065 | struct GNUNET_CORE_Handle *ch, |
1066 | struct GNUNET_TRANSPORT_Handle *th, | 1066 | struct GNUNET_TRANSPORT_CoreHandle *th, |
1067 | struct GNUNET_ATS_ConnectivityHandle *ac, | 1067 | struct GNUNET_ATS_ConnectivityHandle *ac, |
1068 | const struct GNUNET_PeerIdentity *ignore_, | 1068 | const struct GNUNET_PeerIdentity *ignore_, |
1069 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 1069 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
@@ -1108,7 +1108,7 @@ p1_transport_connect_cache_callback (void *cls, | |||
1108 | static void | 1108 | static void |
1109 | occ_cache_get_handle_core_cb (void *cls, | 1109 | occ_cache_get_handle_core_cb (void *cls, |
1110 | struct GNUNET_CORE_Handle *ch, | 1110 | struct GNUNET_CORE_Handle *ch, |
1111 | struct GNUNET_TRANSPORT_Handle *th, | 1111 | struct GNUNET_TRANSPORT_CoreHandle *th, |
1112 | struct GNUNET_ATS_ConnectivityHandle *ac, | 1112 | struct GNUNET_ATS_ConnectivityHandle *ac, |
1113 | const struct GNUNET_PeerIdentity *my_identity, | 1113 | const struct GNUNET_PeerIdentity *my_identity, |
1114 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 1114 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
@@ -1759,7 +1759,7 @@ attempt_connect_task (void *cls) | |||
1759 | static void | 1759 | static void |
1760 | rocc_cache_get_handle_transport_cb (void *cls, | 1760 | rocc_cache_get_handle_transport_cb (void *cls, |
1761 | struct GNUNET_CORE_Handle *ch, | 1761 | struct GNUNET_CORE_Handle *ch, |
1762 | struct GNUNET_TRANSPORT_Handle *th, | 1762 | struct GNUNET_TRANSPORT_CoreHandle *th, |
1763 | struct GNUNET_ATS_ConnectivityHandle *ac, | 1763 | struct GNUNET_ATS_ConnectivityHandle *ac, |
1764 | const struct GNUNET_PeerIdentity *ignore_, | 1764 | const struct GNUNET_PeerIdentity *ignore_, |
1765 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 1765 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
@@ -1774,9 +1774,9 @@ rocc_cache_get_handle_transport_cb (void *cls, | |||
1774 | } | 1774 | } |
1775 | rocc->tcc.th_ = th; | 1775 | rocc->tcc.th_ = th; |
1776 | rocc->tcc.cfg = cfg; | 1776 | rocc->tcc.cfg = cfg; |
1777 | if (GNUNET_YES == | 1777 | if (NULL != |
1778 | GNUNET_TRANSPORT_check_peer_connected (rocc->tcc.th_, | 1778 | GNUNET_TRANSPORT_core_get_mq (rocc->tcc.th_, |
1779 | &rocc->a_id)) | 1779 | &rocc->a_id)) |
1780 | { | 1780 | { |
1781 | LOG_DEBUG ("0x%llx: Target peer %s already connected to local peer: %u\n", | 1781 | LOG_DEBUG ("0x%llx: Target peer %s already connected to local peer: %u\n", |
1782 | rocc->op_id, | 1782 | rocc->op_id, |