aboutsummaryrefslogtreecommitdiff
path: root/src/cadet/gnunet-cadet.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/cadet/gnunet-cadet.c')
-rw-r--r--src/cadet/gnunet-cadet.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/cadet/gnunet-cadet.c b/src/cadet/gnunet-cadet.c
index 5afb64e24..eeef2ff89 100644
--- a/src/cadet/gnunet-cadet.c
+++ b/src/cadet/gnunet-cadet.c
@@ -727,8 +727,8 @@ tunnel_callback (void *cls,
727 const struct GNUNET_PeerIdentity *peer, 727 const struct GNUNET_PeerIdentity *peer,
728 unsigned int n_channels, 728 unsigned int n_channels,
729 unsigned int n_connections, 729 unsigned int n_connections,
730 uint32_t *channels, 730 const struct GNUNET_CADET_ChannelNumber *channels,
731 struct GNUNET_CADET_Hash *connections, 731 const struct GNUNET_CADET_ConnectionTunnelIdentifier *connections,
732 unsigned int estate, 732 unsigned int estate,
733 unsigned int cstate) 733 unsigned int cstate)
734{ 734{
@@ -739,10 +739,10 @@ tunnel_callback (void *cls,
739 FPRINTF (stdout, "Tunnel %s\n", GNUNET_i2s_full (peer)); 739 FPRINTF (stdout, "Tunnel %s\n", GNUNET_i2s_full (peer));
740 FPRINTF (stdout, "\t%u channels\n", n_channels); 740 FPRINTF (stdout, "\t%u channels\n", n_channels);
741 for (i = 0; i < n_channels; i++) 741 for (i = 0; i < n_channels; i++)
742 FPRINTF (stdout, "\t\t%X\n", ntohl (channels[i])); 742 FPRINTF (stdout, "\t\t%X\n", ntohl (channels[i].cn));
743 FPRINTF (stdout, "\t%u connections\n", n_connections); 743 FPRINTF (stdout, "\t%u connections\n", n_connections);
744 for (i = 0; i < n_connections; i++) 744 for (i = 0; i < n_connections; i++)
745 FPRINTF (stdout, "\t\t%s\n", GC_h2s (&connections[i])); 745 FPRINTF (stdout, "\t\t%s\n", GC_h2s (&connections[i].connection_of_tunnel));
746 FPRINTF (stdout, "\tencryption state: %s\n", enc_2s (estate)); 746 FPRINTF (stdout, "\tencryption state: %s\n", enc_2s (estate));
747 FPRINTF (stdout, "\tconnection state: %s\n", conn_2s (cstate)); 747 FPRINTF (stdout, "\tconnection state: %s\n", conn_2s (cstate));
748 } 748 }
@@ -827,7 +827,10 @@ show_tunnel (void *cls)
827 GNUNET_SCHEDULER_shutdown (); 827 GNUNET_SCHEDULER_shutdown ();
828 return; 828 return;
829 } 829 }
830 GNUNET_CADET_get_tunnel (mh, &pid, tunnel_callback, NULL); 830 GNUNET_CADET_get_tunnel (mh,
831 &pid,
832 &tunnel_callback,
833 NULL);
831} 834}
832 835
833 836