[gnunet] 25/39: http3: make meson compie; remove application handle

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit b433969aabbbd2a8590ff30e1da487d3be976d88
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Fri Jul 26 14:18:46 2024 +0200

    http3: make meson compie; remove application handle
---
 meson.build                                       | 12 +++++++
 src/service/transport/gnunet-communicator-http3.c | 19 +---------
 src/service/transport/meson.build                 | 44 +++++++++++++++++++++--
 3 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/meson.build b/meson.build
index e0ed7543f..784a32e07 100644
--- a/meson.build
+++ b/meson.build
@@ -208,6 +208,18 @@ quic_dep = dependency('libquiche', required : false)
 if not quic_dep.found()
   quic_dep = cc.find_library('quiche', required : false)
 endif
+ngtcp2_crypto_dep = dependency('libngtcp2_crypto_gnutls', required : false)
+if not ngtcp2_crypto_dep.found()
+  ngtcp2_crypto_dep = cc.find_library('ngtcp2_crypto_gnutls', required : false)
+endif
+ngtcp2_dep = dependency('libngtcp2', required : false)
+if not ngtcp2_dep.found()
+  ngtcp2_dep = cc.find_library('ngtcp2', required : false)
+endif
+nghttp3_dep = dependency('libnghttp3', required : false)
+if not nghttp3_dep.found()
+  nghttp3_dep = cc.find_library('nghttp3', required : false)
+endif
 
 idn_dep = dependency('libidn2', required : false)
 if not idn_dep.found()
diff --git a/src/service/transport/gnunet-communicator-http3.c 
b/src/service/transport/gnunet-communicator-http3.c
index 92751c430..5b723d9f0 100644
--- a/src/service/transport/gnunet-communicator-http3.c
+++ b/src/service/transport/gnunet-communicator-http3.c
@@ -109,11 +109,6 @@ static struct GNUNET_SCHEDULER_Task *read_task;
  */
 static struct GNUNET_TRANSPORT_CommunicatorHandle *ch;
 
-/**
- *
- */
-static struct GNUNET_TRANSPORT_ApplicationHandle *ah;
-
 /**
  * Connection to NAT service.
  */
@@ -2660,11 +2655,6 @@ do_shutdown (void *cls)
     GNUNET_TRANSPORT_communicator_disconnect (ch);
     ch = NULL;
   }
-  if (NULL != ah)
-  {
-    GNUNET_TRANSPORT_application_done (ah);
-    ah = NULL;
-  }
   if (NULL != stats)
   {
     GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
@@ -3344,13 +3334,6 @@ run (void *cls,
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  ah = GNUNET_TRANSPORT_application_init (cfg);
-  if (NULL == ah)
-  {
-    GNUNET_break (0);
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
 
   nat = GNUNET_NAT_register (cfg,
                              COMMUNICATOR_CONFIG_SECTION,
@@ -3400,4 +3383,4 @@ main (int argc, char *const *argv)
 }
 
 
-/* end of gnunet-communicator-http3.c */
\ No newline at end of file
+/* end of gnunet-communicator-http3.c */
diff --git a/src/service/transport/meson.build 
b/src/service/transport/meson.build
index 6e9f48f72..0083726ce 100644
--- a/src/service/transport/meson.build
+++ b/src/service/transport/meson.build
@@ -6,6 +6,7 @@ libgnunettransportmonitor_src = ['transport_api2_monitor.c']
 gnunetservicetransport_src = ['gnunet-service-transport.c']
 gnunetcommunicatortcp_src = ['gnunet-communicator-tcp.c']
 gnunetcommunicatorudp_src = ['gnunet-communicator-udp.c']
+gnunetcommunicatorhttp3_src = ['gnunet-communicator-http3.c']
 gnunetcommunicatorunix_src = ['gnunet-communicator-unix.c']
 
 configure_file(input : 'transport.conf.in',
@@ -154,9 +155,25 @@ executable ('gnunet-communicator-quic',
             install: true,
             install_dir: get_option('libdir') / 'gnunet' / 'libexec')
 endif
+if nghttp3_dep.found()
+executable ('gnunet-communicator-http3',
+            gnunetcommunicatorhttp3_src,
+            dependencies: [libgnunettransportcommunicator_dep,
+                           libgnunetpeerstore_dep,
+                           libgnunetstatistics_dep,
+                           gnutls_dep,
+                           gcrypt_dep,
+                           libgnunetnat_dep,
+                           ngtcp2_dep,
+                           ngtcp2_crypto_dep,
+                           nghttp3_dep,
+                           libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+endif
 
 if false
-
 libgnunettesttransport_cmd_simplesend = 
library('gnunet_test_transport_plugin_cmd_simple_send',
                                                 
['test_transport_plugin_cmd_simple_send.c'],
                                                 dependencies: [
@@ -270,7 +287,7 @@ configure_file(input : 'test_transport_defaults.conf',
                output : 'test_transport_defaults.conf',
                copy: true)
 
-foreach p : ['unix', 'tcp', 'udp', 'quic']
+foreach p : ['unix', 'tcp', 'udp', 'quic', 'http3']
   configure_file(input : 'test_communicator_'+p+'_basic_peer1.conf',
                  output : 'test_communicator_'+p+'_basic_peer1.conf',
                  copy: true)
@@ -368,6 +385,24 @@ if quic_dep.found() and get_option('experimental')
                                            include_directories: [incdir, 
configuration_inc],
                                            install: false)
 endif
+if nghttp3_dep.found()
+  testcommunicator_basic_http3 = executable('test_communicator_basic-http3',
+                                           ['test_communicator_basic.c'],
+                                           dependencies: [
+                                             libgnunetutil_dep,
+                                             libgnunettransportapplication_dep,
+                                             libgnunettransportcore_dep,
+                                             libgnunettestingtransport_dep,
+                                             libgnunettesting_dep,
+                                             libgnunetpeerstore_dep,
+                                             libgnunetstatistics_dep,
+                                             libgnunethello_dep,
+                                             libgnunetarm_dep,
+                                             libgnunetutil_dep
+                                           ],
+                                           include_directories: [incdir, 
configuration_inc],
+                                           install: false)
+endif
 
 testcommunicator_rekey_tcp = executable('test_communicator_rekey-tcp',
                                         ['test_communicator_basic.c'],
@@ -479,6 +514,11 @@ if quic_dep.found() and get_option('experimental')
        workdir: meson.current_build_dir(),
        suite: ['transport', 'communicator'], is_parallel: false)
 endif
+if nghttp3_dep.found()
+  test('test_communicator_basic-http3', testcommunicator_basic_http3,
+       workdir: meson.current_build_dir(),
+       suite: ['transport', 'communicator'], is_parallel: false)
+endif
 test('test_communicator_rekey-tcp', testcommunicator_rekey_tcp,
      workdir: meson.current_build_dir(),
      suite: ['transport', 'communicator'], is_parallel: false)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.