diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2021-02-24 12:32:11 +0100 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2021-02-24 12:32:11 +0100 |
commit | 2c704e2175d94238e0006192eadf767c9754bb98 (patch) | |
tree | 24f65b61da721fe0c4215911b19c47d52d0b71c5 /src | |
parent | e7b2f86d362dca94c03b50e9a9f1ec9220de9b21 (diff) | |
download | gnunet-2c704e2175d94238e0006192eadf767c9754bb98.tar.gz gnunet-2c704e2175d94238e0006192eadf767c9754bb98.zip |
-remove legacy transport
Diffstat (limited to 'src')
-rw-r--r-- | src/transport/Makefile.am | 2 | ||||
-rw-r--r-- | src/transport/transport-testing2.c | 14 | ||||
-rw-r--r-- | src/transport/transport-testing2.h | 5 |
3 files changed, 1 insertions, 20 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index a1ffbdb5c..bc3004a70 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -174,7 +174,6 @@ libgnunettransporttesting2_la_SOURCES = \ | |||
174 | transport-testing-send2.c \ | 174 | transport-testing-send2.c \ |
175 | transport-testing-communicator.c transport-testing-communicator.h | 175 | transport-testing-communicator.c transport-testing-communicator.h |
176 | libgnunettransporttesting2_la_LIBADD = \ | 176 | libgnunettransporttesting2_la_LIBADD = \ |
177 | libgnunettransport.la \ | ||
178 | libgnunettransportapplication.la \ | 177 | libgnunettransportapplication.la \ |
179 | libgnunettransportcore.la \ | 178 | libgnunettransportcore.la \ |
180 | $(top_builddir)/src/arm/libgnunetarm.la \ | 179 | $(top_builddir)/src/arm/libgnunetarm.la \ |
@@ -956,7 +955,6 @@ test_transport_api_tcp_LDADD = \ | |||
956 | test_transport_api2_tcp_SOURCES = \ | 955 | test_transport_api2_tcp_SOURCES = \ |
957 | test_transport_api2.c | 956 | test_transport_api2.c |
958 | test_transport_api2_tcp_LDADD = \ | 957 | test_transport_api2_tcp_LDADD = \ |
959 | libgnunettransport.la \ | ||
960 | $(top_builddir)/src/hello/libgnunethello.la \ | 958 | $(top_builddir)/src/hello/libgnunethello.la \ |
961 | $(top_builddir)/src/util/libgnunetutil.la \ | 959 | $(top_builddir)/src/util/libgnunetutil.la \ |
962 | libgnunettransporttesting2.la | 960 | libgnunettransporttesting2.la |
diff --git a/src/transport/transport-testing2.c b/src/transport/transport-testing2.c index 513b030b8..ee0c4494e 100644 --- a/src/transport/transport-testing2.c +++ b/src/transport/transport-testing2.c | |||
@@ -504,15 +504,13 @@ GNUNET_TRANSPORT_TESTING_start_peer (struct | |||
504 | "Peer %u configured with identity `%s'\n", | 504 | "Peer %u configured with identity `%s'\n", |
505 | p->no, | 505 | p->no, |
506 | GNUNET_i2s_full (&p->id)); | 506 | GNUNET_i2s_full (&p->id)); |
507 | p->tmh = GNUNET_TRANSPORT_manipulation_connect (p->cfg); | ||
508 | p->th = GNUNET_TRANSPORT_core_connect (p->cfg, | 507 | p->th = GNUNET_TRANSPORT_core_connect (p->cfg, |
509 | NULL, | 508 | NULL, |
510 | handlers, | 509 | handlers, |
511 | p, | 510 | p, |
512 | ¬ify_connect, | 511 | ¬ify_connect, |
513 | ¬ify_disconnect); | 512 | ¬ify_disconnect); |
514 | if ((NULL == p->th) || | 513 | if (NULL == p->th) |
515 | (NULL == p->tmh)) | ||
516 | { | 514 | { |
517 | LOG (GNUNET_ERROR_TYPE_ERROR, | 515 | LOG (GNUNET_ERROR_TYPE_ERROR, |
518 | "Failed to connect to transport service for peer `%s': `%s'\n", | 516 | "Failed to connect to transport service for peer `%s': `%s'\n", |
@@ -577,11 +575,6 @@ GNUNET_TRANSPORT_TESTING_restart_peer (struct | |||
577 | GNUNET_TRANSPORT_core_disconnect (p->th); | 575 | GNUNET_TRANSPORT_core_disconnect (p->th); |
578 | p->th = NULL; | 576 | p->th = NULL; |
579 | } | 577 | } |
580 | if (NULL != p->tmh) | ||
581 | { | ||
582 | GNUNET_TRANSPORT_manipulation_disconnect (p->tmh); | ||
583 | p->tmh = NULL; | ||
584 | } | ||
585 | for (cc = p->tth->cc_head; NULL != cc; cc = ccn) | 578 | for (cc = p->tth->cc_head; NULL != cc; cc = ccn) |
586 | { | 579 | { |
587 | ccn = cc->next; | 580 | ccn = cc->next; |
@@ -668,11 +661,6 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct | |||
668 | GNUNET_PEERSTORE_iterate_cancel (p->pic); | 661 | GNUNET_PEERSTORE_iterate_cancel (p->pic); |
669 | p->pic = NULL; | 662 | p->pic = NULL; |
670 | } | 663 | } |
671 | if (NULL != p->tmh) | ||
672 | { | ||
673 | GNUNET_TRANSPORT_manipulation_disconnect (p->tmh); | ||
674 | p->tmh = NULL; | ||
675 | } | ||
676 | if (NULL != p->th) | 664 | if (NULL != p->th) |
677 | { | 665 | { |
678 | GNUNET_TRANSPORT_core_disconnect (p->th); | 666 | GNUNET_TRANSPORT_core_disconnect (p->th); |
diff --git a/src/transport/transport-testing2.h b/src/transport/transport-testing2.h index 3554436d8..8c0f03556 100644 --- a/src/transport/transport-testing2.h +++ b/src/transport/transport-testing2.h | |||
@@ -85,11 +85,6 @@ struct GNUNET_TRANSPORT_TESTING_PeerContext | |||
85 | struct GNUNET_TRANSPORT_CoreHandle *th; | 85 | struct GNUNET_TRANSPORT_CoreHandle *th; |
86 | 86 | ||
87 | /** | 87 | /** |
88 | * Peer's transport service manipulation handle | ||
89 | */ | ||
90 | struct GNUNET_TRANSPORT_ManipulationHandle *tmh; | ||
91 | |||
92 | /** | ||
93 | * Peer's ATS handle. | 88 | * Peer's ATS handle. |
94 | */ | 89 | */ |
95 | struct GNUNET_ATS_ConnectivityHandle *ats; | 90 | struct GNUNET_ATS_ConnectivityHandle *ats; |