diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-07-09 06:18:00 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-07-09 06:18:00 +0000 |
commit | 7c492f3807011ff6a20bcf6761695f1a2efd754d (patch) | |
tree | f1d3d3ce28c700238b21130153b924fa320bbc74 /src/core | |
parent | 7c5ff01102473d922816d1cedd44ddcd4f7d7bd9 (diff) | |
download | gnunet-7c492f3807011ff6a20bcf6761695f1a2efd754d.tar.gz gnunet-7c492f3807011ff6a20bcf6761695f1a2efd754d.zip |
move
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/Makefile.am | 13 | ||||
-rw-r--r-- | src/core/gnunet-core-list-connections.c | 206 |
2 files changed, 218 insertions, 1 deletions
diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 93af6f039..4f9a20433 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am | |||
@@ -25,7 +25,8 @@ libgnunetcore_la_LDFLAGS = \ | |||
25 | 25 | ||
26 | 26 | ||
27 | bin_PROGRAMS = \ | 27 | bin_PROGRAMS = \ |
28 | gnunet-service-core | 28 | gnunet-service-core \ |
29 | gnunet-core-list-connections | ||
29 | 30 | ||
30 | gnunet_service_core_SOURCES = \ | 31 | gnunet_service_core_SOURCES = \ |
31 | gnunet-service-core.c | 32 | gnunet-service-core.c |
@@ -37,6 +38,16 @@ gnunet_service_core_LDADD = \ | |||
37 | $(top_builddir)/src/util/libgnunetutil.la \ | 38 | $(top_builddir)/src/util/libgnunetutil.la \ |
38 | $(GN_LIBINTL) | 39 | $(GN_LIBINTL) |
39 | 40 | ||
41 | |||
42 | gnunet_core_list_connections_SOURCES = \ | ||
43 | gnunet-core-list-connections.c | ||
44 | gnunet_core_list_connections_LDADD = \ | ||
45 | $(top_builddir)/src/core/libgnunetcore.la \ | ||
46 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
47 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
48 | $(top_builddir)/src/util/libgnunetutil.la | ||
49 | |||
50 | |||
40 | check_PROGRAMS = \ | 51 | check_PROGRAMS = \ |
41 | test_core_api_start_only \ | 52 | test_core_api_start_only \ |
42 | test_core_api \ | 53 | test_core_api \ |
diff --git a/src/core/gnunet-core-list-connections.c b/src/core/gnunet-core-list-connections.c new file mode 100644 index 000000000..8b0f6773a --- /dev/null +++ b/src/core/gnunet-core-list-connections.c | |||
@@ -0,0 +1,206 @@ | |||
1 | /* | ||
2 | This file is part of GNUnet. | ||
3 | (C) 2011 Christian Grothoff (and other contributing authors) | ||
4 | |||
5 | GNUnet is free software; you can redistribute it and/or modify | ||
6 | it under the terms of the GNU General Public License as published | ||
7 | by the Free Software Foundation; either version 3, or (at your | ||
8 | option) any later version. | ||
9 | |||
10 | GNUnet is distributed in the hope that it will be useful, but | ||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | General Public License for more details. | ||
14 | |||
15 | You should have received a copy of the GNU General Public License | ||
16 | along with GNUnet; see the file COPYING. If not, write to the | ||
17 | Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
18 | Boston, MA 02111-1307, USA. | ||
19 | */ | ||
20 | |||
21 | /** | ||
22 | * @file core/gnunet-core-list-connections.c | ||
23 | * @brief Print information about other known _connected_ peers. | ||
24 | * @author Nathan Evans | ||
25 | */ | ||
26 | #include "platform.h" | ||
27 | #include "gnunet_crypto_lib.h" | ||
28 | #include "gnunet_configuration_lib.h" | ||
29 | #include "gnunet_getopt_lib.h" | ||
30 | #include "gnunet_peerinfo_service.h" | ||
31 | #include "gnunet_transport_service.h" | ||
32 | #include "gnunet_core_service.h" | ||
33 | #include "gnunet_program_lib.h" | ||
34 | |||
35 | #define VERBOSE 0 | ||
36 | static int no_resolve; | ||
37 | |||
38 | #if VERBOSE | ||
39 | static unsigned int peer_count; | ||
40 | #endif | ||
41 | |||
42 | static const struct GNUNET_CONFIGURATION_Handle *cfg; | ||
43 | |||
44 | struct AddressStringList | ||
45 | { | ||
46 | /** | ||
47 | * Pointer to previous element. | ||
48 | */ | ||
49 | struct AddressStringList *prev; | ||
50 | |||
51 | /** | ||
52 | * Pointer to next element. | ||
53 | */ | ||
54 | struct AddressStringList *next; | ||
55 | |||
56 | /** | ||
57 | * Address as string. | ||
58 | */ | ||
59 | char *address_string; | ||
60 | }; | ||
61 | |||
62 | struct PrintContext | ||
63 | { | ||
64 | struct GNUNET_PeerIdentity peer; | ||
65 | struct AddressStringList *address_list_head; | ||
66 | struct AddressStringList *address_list_tail; | ||
67 | }; | ||
68 | |||
69 | |||
70 | static void | ||
71 | dump_pc (struct PrintContext *pc) | ||
72 | { | ||
73 | struct GNUNET_CRYPTO_HashAsciiEncoded enc; | ||
74 | struct AddressStringList *address; | ||
75 | |||
76 | GNUNET_CRYPTO_hash_to_enc (&pc->peer.hashPubKey, &enc); | ||
77 | printf (_("Peer `%s'\n"), | ||
78 | (const char *) &enc); | ||
79 | while (NULL != (address = pc->address_list_head)) | ||
80 | { | ||
81 | printf ("\t%s\n", address->address_string); | ||
82 | GNUNET_free(address->address_string); | ||
83 | GNUNET_CONTAINER_DLL_remove(pc->address_list_head, pc->address_list_tail, address); | ||
84 | GNUNET_free(address); | ||
85 | } | ||
86 | |||
87 | printf ("\n"); | ||
88 | |||
89 | GNUNET_free (pc); | ||
90 | } | ||
91 | |||
92 | |||
93 | /** | ||
94 | * Function to call with a human-readable format of an address | ||
95 | * | ||
96 | * @param cls closure | ||
97 | * @param address NULL on error, otherwise 0-terminated printable UTF-8 string | ||
98 | */ | ||
99 | static void | ||
100 | process_resolved_address (void *cls, | ||
101 | const char *address) | ||
102 | { | ||
103 | struct PrintContext *pc = cls; | ||
104 | struct AddressStringList *new_address; | ||
105 | |||
106 | if (address == NULL) | ||
107 | { | ||
108 | dump_pc (pc); | ||
109 | return; | ||
110 | } | ||
111 | |||
112 | new_address = GNUNET_malloc(sizeof(struct AddressStringList)); | ||
113 | #if VERBOSE | ||
114 | fprintf(stderr, "Received address %s\n", address); | ||
115 | #endif | ||
116 | new_address->address_string = GNUNET_strdup(address); | ||
117 | GNUNET_CONTAINER_DLL_insert(pc->address_list_head, pc->address_list_tail, new_address); | ||
118 | } | ||
119 | |||
120 | |||
121 | /** | ||
122 | * Callback for retrieving a list of connected peers. | ||
123 | */ | ||
124 | static void | ||
125 | connected_peer_callback (void *cls, const struct GNUNET_PeerIdentity *peer, | ||
126 | const struct GNUNET_TRANSPORT_ATS_Information *atsi) | ||
127 | { | ||
128 | struct PrintContext *pc; | ||
129 | |||
130 | if (peer != NULL) /* Not yet finished */ | ||
131 | { | ||
132 | #if VERBOSE | ||
133 | fprintf(stderr, "Learned about peer %s\n", GNUNET_i2s(peer)); | ||
134 | peer_count++; | ||
135 | #endif | ||
136 | pc = GNUNET_malloc (sizeof (struct PrintContext)); | ||
137 | pc->peer = *peer; | ||
138 | GNUNET_TRANSPORT_peer_address_lookup (cfg, peer, | ||
139 | GNUNET_TIME_UNIT_MINUTES, | ||
140 | &process_resolved_address, pc); | ||
141 | } | ||
142 | #if VERBOSE | ||
143 | else | ||
144 | { | ||
145 | fprintf(stderr, "Counted %u total connected peers.\n", peer_count); | ||
146 | } | ||
147 | #endif | ||
148 | } | ||
149 | |||
150 | |||
151 | /** | ||
152 | * Main function that will be run by the scheduler. | ||
153 | * | ||
154 | * @param cls closure | ||
155 | * @param args remaining command-line arguments | ||
156 | * @param cfgfile name of the configuration file used (for saving, can be NULL!) | ||
157 | * @param c configuration | ||
158 | */ | ||
159 | static void | ||
160 | run (void *cls, | ||
161 | char *const *args, | ||
162 | const char *cfgfile, | ||
163 | const struct GNUNET_CONFIGURATION_Handle *c) | ||
164 | { | ||
165 | |||
166 | cfg = c; | ||
167 | if (args[0] != NULL) | ||
168 | { | ||
169 | fprintf (stderr, | ||
170 | _("Invalid command line argument `%s'\n"), | ||
171 | args[0]); | ||
172 | return; | ||
173 | } | ||
174 | |||
175 | GNUNET_CORE_iterate_peers (cfg, | ||
176 | &connected_peer_callback, | ||
177 | NULL); | ||
178 | |||
179 | } | ||
180 | |||
181 | |||
182 | /** | ||
183 | * The main function to obtain peer information. | ||
184 | * | ||
185 | * @param argc number of arguments from the command line | ||
186 | * @param argv command line arguments | ||
187 | * @return 0 ok, 1 on error | ||
188 | */ | ||
189 | int | ||
190 | main (int argc, char *const *argv) | ||
191 | { | ||
192 | static const struct GNUNET_GETOPT_CommandLineOption options[] = { | ||
193 | {'n', "numeric", NULL, | ||
194 | gettext_noop ("don't resolve host names"), | ||
195 | 0, &GNUNET_GETOPT_set_one, &no_resolve}, | ||
196 | GNUNET_GETOPT_OPTION_END | ||
197 | }; | ||
198 | return (GNUNET_OK == | ||
199 | GNUNET_PROGRAM_run (argc, | ||
200 | argv, | ||
201 | "gnunet-list-connections", | ||
202 | gettext_noop ("Print information about connected peers."), | ||
203 | options, &run, NULL)) ? 0 : 1; | ||
204 | } | ||
205 | |||
206 | /* end of gnunet-core-list-connections.c */ | ||