aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2010-02-18 15:07:02 +0000
committerChristian Grothoff <christian@grothoff.org>2010-02-18 15:07:02 +0000
commitd720cc786723169cfdbb246ad6f1f584581f589d (patch)
tree2b2dad9c9a0d4d2d01545cac7f9f11993984884c /src
parent0e421fd4f11c564dba39d9c533aed642560c7655 (diff)
downloadgnunet-d720cc786723169cfdbb246ad6f1f584581f589d.tar.gz
gnunet-d720cc786723169cfdbb246ad6f1f584581f589d.zip
fixing doxygen warnings
Diffstat (limited to 'src')
-rw-r--r--src/core/core_api_peer_request.c1
-rw-r--r--src/fs/gnunet-service-fs.c5
-rw-r--r--src/fs/gnunet-service-fs_drq.c9
-rw-r--r--src/include/gnunet_container_lib.h2
-rw-r--r--src/include/gnunet_core_service.h1
-rw-r--r--src/include/gnunet_disk_lib.h5
-rw-r--r--src/include/gnunet_os_lib.h4
-rw-r--r--src/transport/gnunet-nat-client-udp.c2
-rw-r--r--src/transport/gnunet-nat-server-udp.c2
-rw-r--r--src/transport/gnunet-service-transport.c8
-rw-r--r--src/transport/gnunet-service-transport_blacklist.c1
-rw-r--r--src/transport/plugin_transport.h3
-rw-r--r--src/transport/plugin_transport_tcp.c1
-rw-r--r--src/transport/plugin_transport_template.c12
-rw-r--r--src/transport/plugin_transport_udp.c19
-rw-r--r--src/transport/transport_api.c2
-rw-r--r--src/util/disk.c6
-rw-r--r--src/util/os_priority.c6
18 files changed, 61 insertions, 28 deletions
diff --git a/src/core/core_api_peer_request.c b/src/core/core_api_peer_request.c
index 008393227..ec5fae32b 100644
--- a/src/core/core_api_peer_request.c
+++ b/src/core/core_api_peer_request.c
@@ -130,6 +130,7 @@ send_request (void *cls,
130 * @param sched scheduler to use 130 * @param sched scheduler to use
131 * @param cfg configuration to use 131 * @param cfg configuration to use
132 * @param timeout how long to try to talk to core 132 * @param timeout how long to try to talk to core
133 * @param peer who should we connect to
133 * @param cont function to call once the request has been completed (or timed out) 134 * @param cont function to call once the request has been completed (or timed out)
134 * @param cont_cls closure for cont 135 * @param cont_cls closure for cont
135 * @return NULL on error (cont will not be called), otherwise handle for cancellation 136 * @return NULL on error (cont will not be called), otherwise handle for cancellation
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index ffda521dd..11ab41582 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -1083,7 +1083,7 @@ test_load_too_high ()
1083 * at transmitting a query to a peer. 1083 * at transmitting a query to a peer.
1084 * 1084 *
1085 * @param cls the requests "struct PendingRequest*" 1085 * @param cls the requests "struct PendingRequest*"
1086 * @param pid ID of receiving peer, 0 on transmission error 1086 * @param tpid ID of receiving peer, 0 on transmission error
1087 */ 1087 */
1088static void 1088static void
1089transmit_query_continuation (void *cls, 1089transmit_query_continuation (void *cls,
@@ -1414,7 +1414,7 @@ forward_request_task (void *cls,
1414 * at transmitting a reply to a peer. 1414 * at transmitting a reply to a peer.
1415 * 1415 *
1416 * @param cls the requests "struct PendingRequest*" 1416 * @param cls the requests "struct PendingRequest*"
1417 * @param pid ID of receiving peer, 0 on transmission error 1417 * @param tpid ID of receiving peer, 0 on transmission error
1418 */ 1418 */
1419static void 1419static void
1420transmit_reply_continuation (void *cls, 1420transmit_reply_continuation (void *cls,
@@ -2498,7 +2498,6 @@ static struct GNUNET_SERVER_MessageHandler handlers[] = {
2498/** 2498/**
2499 * Process fs requests. 2499 * Process fs requests.
2500 * 2500 *
2501 * @param cls closure
2502 * @param s scheduler to use 2501 * @param s scheduler to use
2503 * @param server the initialized server 2502 * @param server the initialized server
2504 * @param c configuration to use 2503 * @param c configuration to use
diff --git a/src/fs/gnunet-service-fs_drq.c b/src/fs/gnunet-service-fs_drq.c
index cb941c72b..29b2dca82 100644
--- a/src/fs/gnunet-service-fs_drq.c
+++ b/src/fs/gnunet-service-fs_drq.c
@@ -300,6 +300,15 @@ struct GetClosure
300 * complete. 300 * complete.
301 * 301 *
302 * @param cls our 'struct GetClosure*' 302 * @param cls our 'struct GetClosure*'
303 * @param key key for the content
304 * @param size number of bytes in data
305 * @param data content stored
306 * @param type type of the content
307 * @param priority priority of the content
308 * @param anonymity anonymity-level for the content
309 * @param expiration expiration time for the content
310 * @param uid unique identifier for the datum;
311 * maybe 0 if no unique identifier is available
303 */ 312 */
304static void 313static void
305get_iterator (void *cls, 314get_iterator (void *cls,
diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index bc72e2e09..204d3d6ab 100644
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -243,7 +243,7 @@ GNUNET_CONTAINER_meta_data_test_equal (const struct
243 * 243 *
244 * @param md metadata to extend 244 * @param md metadata to extend
245 * @param plugin_name name of the plugin that produced this value; 245 * @param plugin_name name of the plugin that produced this value;
246 * special values can be used (i.e. '<zlib>' for zlib being 246 * special values can be used (i.e. '&lt;zlib&gt;' for zlib being
247 * used in the main libextractor library and yielding 247 * used in the main libextractor library and yielding
248 * meta data). 248 * meta data).
249 * @param type libextractor-type describing the meta data 249 * @param type libextractor-type describing the meta data
diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h
index af431ba56..060a0f8ee 100644
--- a/src/include/gnunet_core_service.h
+++ b/src/include/gnunet_core_service.h
@@ -240,6 +240,7 @@ struct GNUNET_CORE_PeerRequestHandle;
240 * @param sched scheduler to use 240 * @param sched scheduler to use
241 * @param cfg configuration to use 241 * @param cfg configuration to use
242 * @param timeout how long to try to talk to core 242 * @param timeout how long to try to talk to core
243 * @param peer who should we connect to
243 * @param cont function to call once the request has been completed (or timed out) 244 * @param cont function to call once the request has been completed (or timed out)
244 * @param cont_cls closure for cont 245 * @param cont_cls closure for cont
245 * @return NULL on error (cont will not be called), otherwise handle for cancellation 246 * @return NULL on error (cont will not be called), otherwise handle for cancellation
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h
index f4ede1384..7b6898293 100644
--- a/src/include/gnunet_disk_lib.h
+++ b/src/include/gnunet_disk_lib.h
@@ -340,9 +340,11 @@ int GNUNET_DISK_pipe_close (struct GNUNET_DISK_PipeHandle *p);
340 * 340 *
341 * @param p pipe to close end of 341 * @param p pipe to close end of
342 * @param end which end of the pipe to close 342 * @param end which end of the pipe to close
343 * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
343 */ 344 */
344int 345int
345GNUNET_DISK_pipe_close_end (struct GNUNET_DISK_PipeHandle *p, enum GNUNET_DISK_PipeEnd end); 346GNUNET_DISK_pipe_close_end (struct GNUNET_DISK_PipeHandle *p,
347 enum GNUNET_DISK_PipeEnd end);
346 348
347/** 349/**
348 * Close an open file. 350 * Close an open file.
@@ -355,6 +357,7 @@ int GNUNET_DISK_file_close (struct GNUNET_DISK_FileHandle *h);
355 357
356/** 358/**
357 * Get the handle to a particular pipe end 359 * Get the handle to a particular pipe end
360 *
358 * @param p pipe 361 * @param p pipe
359 * @param n end to access 362 * @param n end to access
360 * @return handle for the respective end 363 * @return handle for the respective end
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h
index 02d1063f7..32d9dc7ff 100644
--- a/src/include/gnunet_os_lib.h
+++ b/src/include/gnunet_os_lib.h
@@ -196,7 +196,9 @@ int GNUNET_OS_set_process_priority (pid_t proc,
196 * @return process ID of the new process, -1 on error 196 * @return process ID of the new process, -1 on error
197 */ 197 */
198pid_t 198pid_t
199GNUNET_OS_start_process (struct GNUNET_DISK_PipeHandle *pipe_stdin, struct GNUNET_DISK_PipeHandle *pipe_stdout, const char *filename, ...); 199GNUNET_OS_start_process (struct GNUNET_DISK_PipeHandle *pipe_stdin,
200 struct GNUNET_DISK_PipeHandle *pipe_stdout,
201 const char *filename, ...);
200 202
201 203
202/** 204/**
diff --git a/src/transport/gnunet-nat-client-udp.c b/src/transport/gnunet-nat-client-udp.c
index c17710b61..f594db20a 100644
--- a/src/transport/gnunet-nat-client-udp.c
+++ b/src/transport/gnunet-nat-client-udp.c
@@ -19,7 +19,7 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/transport/client-test.c 22 * @file src/transport/gnunet-nat-client-udp.c
23 * @brief Test for NAT traversal using ICMP method. 23 * @brief Test for NAT traversal using ICMP method.
24 * @author Christian Grothoff 24 * @author Christian Grothoff
25 */ 25 */
diff --git a/src/transport/gnunet-nat-server-udp.c b/src/transport/gnunet-nat-server-udp.c
index 693adbcf5..b1d221294 100644
--- a/src/transport/gnunet-nat-server-udp.c
+++ b/src/transport/gnunet-nat-server-udp.c
@@ -19,7 +19,7 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file src/transport/server-test.c 22 * @file src/transport/gnunet-nat-server-udp.c
23 * @brief Test for NAT traversal using ICMP method. 23 * @brief Test for NAT traversal using ICMP method.
24 * @author Christian Grothoff 24 * @author Christian Grothoff
25 */ 25 */
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 3fbbc8804..e206da43e 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -1844,11 +1844,11 @@ check_pending_validation (void *cls,
1844 * (otherwise we may be seeing a MiM attack). 1844 * (otherwise we may be seeing a MiM attack).
1845 * 1845 *
1846 * @param cls closure 1846 * @param cls closure
1847 * @param name name of the transport that generated the address 1847 * @param message the pong message
1848 * @param peer who responded to our challenge 1848 * @param peer who responded to our challenge
1849 * @param challenge the challenge number we presumably used
1850 * @param sender_addr string describing our sender address (as observed 1849 * @param sender_addr string describing our sender address (as observed
1851 * by the other peer in human-readable format) 1850 * by the other peer in binary format)
1851 * @param sender_address_len number of bytes in 'sender_address'
1852 */ 1852 */
1853static void 1853static void
1854handle_pong (void *cls, const struct GNUNET_MessageHeader *message, 1854handle_pong (void *cls, const struct GNUNET_MessageHeader *message,
@@ -2215,7 +2215,7 @@ add_to_foreign_address_list (void *cls,
2215 * 2215 *
2216 * @param cls closure 2216 * @param cls closure
2217 * @param peer id of the peer, NULL for last call 2217 * @param peer id of the peer, NULL for last call
2218 * @param hello hello message for the peer (can be NULL) 2218 * @param h hello message for the peer (can be NULL)
2219 * @param trust amount of trust we have in the peer (not used) 2219 * @param trust amount of trust we have in the peer (not used)
2220 */ 2220 */
2221static void 2221static void
diff --git a/src/transport/gnunet-service-transport_blacklist.c b/src/transport/gnunet-service-transport_blacklist.c
index 6b90929f1..8f78f498f 100644
--- a/src/transport/gnunet-service-transport_blacklist.c
+++ b/src/transport/gnunet-service-transport_blacklist.c
@@ -250,6 +250,7 @@ GNUNET_TRANSPORT_blacklist_check (const struct GNUNET_PeerIdentity *id)
250/** 250/**
251 * Initialize the blacklisting subsystem. 251 * Initialize the blacklisting subsystem.
252 * 252 *
253 * @param server server of the transport service
253 * @param s scheduler to use 254 * @param s scheduler to use
254 */ 255 */
255void 256void
diff --git a/src/transport/plugin_transport.h b/src/transport/plugin_transport.h
index e00c97799..2630ffbad 100644
--- a/src/transport/plugin_transport.h
+++ b/src/transport/plugin_transport.h
@@ -171,7 +171,8 @@ typedef void
171 * 171 *
172 * @param cls closure 172 * @param cls closure
173 * @param target who should receive this message 173 * @param target who should receive this message
174 * @param msg the message to transmit 174 * @param msgbuf the message to transmit
175 * @param msgbuf_size number of bytes in 'msgbuf'
175 * @param priority how important is the message (most plugins will 176 * @param priority how important is the message (most plugins will
176 * ignore message priority and just FIFO) 177 * ignore message priority and just FIFO)
177 * @param timeout how long to wait at most for the transmission (does not 178 * @param timeout how long to wait at most for the transmission (does not
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 05a7c2eb0..7135d5ddc 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -557,6 +557,7 @@ disconnect_session (struct Session *session)
557 * @param cls closure 557 * @param cls closure
558 * @param target who should receive this message 558 * @param target who should receive this message
559 * @param msg the message to transmit 559 * @param msg the message to transmit
560 * @param msgbuf_size number of bytes in 'msg'
560 * @param priority how important is the message (most plugins will 561 * @param priority how important is the message (most plugins will
561 * ignore message priority and just FIFO) 562 * ignore message priority and just FIFO)
562 * @param timeout how long to wait at most for the transmission (does not 563 * @param timeout how long to wait at most for the transmission (does not
diff --git a/src/transport/plugin_transport_template.c b/src/transport/plugin_transport_template.c
index bac9bcd82..fc1c1722b 100644
--- a/src/transport/plugin_transport_template.c
+++ b/src/transport/plugin_transport_template.c
@@ -136,13 +136,23 @@ struct Plugin
136 * @param cls closure 136 * @param cls closure
137 * @param target who should receive this message 137 * @param target who should receive this message
138 * @param priority how important is the message 138 * @param priority how important is the message
139 * @param msg the message to transmit 139 * @param msgbuf the message to transmit
140 * @param msgbuf_size number of bytes in 'msgbuf'
140 * @param timeout when should we time out 141 * @param timeout when should we time out
142 * @param addr the address to use (can be NULL if the plugin
143 * is "on its own" (i.e. re-use existing TCP connection))
144 * @param addrlen length of the address in bytes
145 * @param force_address GNUNET_YES if the plugin MUST use the given address,
146 * otherwise the plugin may use other addresses or
147 * existing connections (if available)
141 * @param cont continuation to call once the message has 148 * @param cont continuation to call once the message has
142 * been transmitted (or if the transport is ready 149 * been transmitted (or if the transport is ready
143 * for the next transmission call; or if the 150 * for the next transmission call; or if the
144 * peer disconnected...) 151 * peer disconnected...)
145 * @param cont_cls closure for cont 152 * @param cont_cls closure for cont
153 * @return number of bytes used (on the physical network, with overheads);
154 * -1 on hard errors (i.e. address invalid); 0 is a legal value
155 * and does NOT mean that the message was not transmitted (DV)
146 */ 156 */
147static ssize_t 157static ssize_t
148template_plugin_send (void *cls, 158template_plugin_send (void *cls,
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index 94222bd6d..be8e2848c 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -75,8 +75,6 @@ struct UDPMessage
75 75
76}; 76};
77 77
78/* Forward definition */
79struct Plugin;
80 78
81struct PrettyPrinterContext 79struct PrettyPrinterContext
82{ 80{
@@ -111,6 +109,11 @@ struct Plugin
111 struct GNUNET_RESOLVER_RequestHandle *hostname_dns; 109 struct GNUNET_RESOLVER_RequestHandle *hostname_dns;
112 110
113 /** 111 /**
112 * FD Read set
113 */
114 struct GNUNET_NETWORK_FDSet *rs;
115
116 /**
114 * ID of task used to update our addresses when one expires. 117 * ID of task used to update our addresses when one expires.
115 */ 118 */
116 GNUNET_SCHEDULER_TaskIdentifier address_update_task; 119 GNUNET_SCHEDULER_TaskIdentifier address_update_task;
@@ -131,11 +134,6 @@ struct Plugin
131 */ 134 */
132 uint16_t adv_port; 135 uint16_t adv_port;
133 136
134 /*
135 * FD Read set
136 */
137 struct GNUNET_NETWORK_FDSet *rs;
138
139}; 137};
140 138
141/* *********** globals ************* */ 139/* *********** globals ************* */
@@ -148,13 +146,14 @@ static struct GNUNET_NETWORK_Handle *udp_sock;
148/** 146/**
149 * Disconnect from a remote node. 147 * Disconnect from a remote node.
150 * 148 *
151 * @param tsession the session that is closed 149 * @param cls closure ('struct Plugin'), unused
150 * @param target peer do disconnect
152 * @return GNUNET_OK on success, GNUNET_SYSERR if the operation failed 151 * @return GNUNET_OK on success, GNUNET_SYSERR if the operation failed
153 */ 152 */
154void 153void
155udp_disconnect (void *cls, const struct GNUNET_PeerIdentity *target) 154udp_disconnect (void *cls, const struct GNUNET_PeerIdentity *target)
156{ 155{
157 return; 156 /* nothing to do, UDP is stateless */
158} 157}
159 158
160/** 159/**
@@ -187,7 +186,7 @@ udp_transport_server_stop (void *cls)
187 * @param cls closure 186 * @param cls closure
188 * @param target who should receive this message (ignored by UDP) 187 * @param target who should receive this message (ignored by UDP)
189 * @param msgbuf one or more GNUNET_MessageHeader(s) strung together 188 * @param msgbuf one or more GNUNET_MessageHeader(s) strung together
190 * @param msgbufsize the size of the msgbuf to send 189 * @param msgbuf_size the size of the msgbuf to send
191 * @param priority how important is the message (ignored by UDP) 190 * @param priority how important is the message (ignored by UDP)
192 * @param timeout when should we time out (give up) if we can not transmit? 191 * @param timeout when should we time out (give up) if we can not transmit?
193 * @param addr the addr to send the message to, needs to be a sockaddr for us 192 * @param addr the addr to send the message to, needs to be a sockaddr for us
diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c
index 9e326c9aa..b98cabf0b 100644
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -897,7 +897,6 @@ GNUNET_TRANSPORT_set_quota (struct GNUNET_TRANSPORT_Handle *handle,
897 * Obtain the HELLO message for this peer. 897 * Obtain the HELLO message for this peer.
898 * 898 *
899 * @param handle connection to transport service 899 * @param handle connection to transport service
900 * @param timeout how long to wait for the HELLO
901 * @param rec function to call with the HELLO, sender will be our peer 900 * @param rec function to call with the HELLO, sender will be our peer
902 * identity; message and sender will be NULL on timeout 901 * identity; message and sender will be NULL on timeout
903 * (handshake with transport service pending/failed). 902 * (handshake with transport service pending/failed).
@@ -1059,7 +1058,6 @@ send_start (void *cls, size_t size, void *buf)
1059/** 1058/**
1060 * Free neighbour. 1059 * Free neighbour.
1061 * 1060 *
1062 * @param h our state
1063 * @param n the entry to free 1061 * @param n the entry to free
1064 */ 1062 */
1065static void 1063static void
diff --git a/src/util/disk.c b/src/util/disk.c
index 710935516..c1a988464 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -1675,10 +1675,12 @@ GNUNET_DISK_pipe (int blocking)
1675 * Closes an interprocess channel 1675 * Closes an interprocess channel
1676 * 1676 *
1677 * @param p pipe to close 1677 * @param p pipe to close
1678 * @param end which end of the pipe to close
1678 * @return GNUNET_OK on success, GNUNET_SYSERR otherwise 1679 * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
1679 */ 1680 */
1680int 1681int
1681GNUNET_DISK_pipe_close_end (struct GNUNET_DISK_PipeHandle *p, enum GNUNET_DISK_PipeEnd end) 1682GNUNET_DISK_pipe_close_end (struct GNUNET_DISK_PipeHandle *p,
1683 enum GNUNET_DISK_PipeEnd end)
1682{ 1684{
1683 int ret = GNUNET_OK; 1685 int ret = GNUNET_OK;
1684 int save; 1686 int save;
@@ -1779,8 +1781,10 @@ GNUNET_DISK_pipe_close (struct GNUNET_DISK_PipeHandle *p)
1779 1781
1780/** 1782/**
1781 * Get the handle to a particular pipe end 1783 * Get the handle to a particular pipe end
1784 *
1782 * @param p pipe 1785 * @param p pipe
1783 * @param n end to access 1786 * @param n end to access
1787 * @return handle for the respective end
1784 */ 1788 */
1785const struct GNUNET_DISK_FileHandle * 1789const struct GNUNET_DISK_FileHandle *
1786GNUNET_DISK_pipe_handle (const struct GNUNET_DISK_PipeHandle *p, 1790GNUNET_DISK_pipe_handle (const struct GNUNET_DISK_PipeHandle *p,
diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index 547d6cd8a..d501b3511 100644
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -119,12 +119,16 @@ GNUNET_OS_set_process_priority (pid_t proc,
119/** 119/**
120 * Start a process. 120 * Start a process.
121 * 121 *
122 * @param pipe_stdin pipe to use to send input to child process (or NULL)
123 * @param pipe_stdout pipe to use to get output from child process (or NULL)
122 * @param filename name of the binary 124 * @param filename name of the binary
123 * @param ... NULL-terminated list of arguments to the process 125 * @param ... NULL-terminated list of arguments to the process
124 * @return process ID of the new process, -1 on error 126 * @return process ID of the new process, -1 on error
125 */ 127 */
126pid_t 128pid_t
127GNUNET_OS_start_process (struct GNUNET_DISK_PipeHandle *pipe_stdin, struct GNUNET_DISK_PipeHandle *pipe_stdout, const char *filename, ...) 129GNUNET_OS_start_process (struct GNUNET_DISK_PipeHandle *pipe_stdin,
130 struct GNUNET_DISK_PipeHandle *pipe_stdout,
131 const char *filename, ...)
128{ 132{
129 /* FIXME: Make this work on windows!!! */ 133 /* FIXME: Make this work on windows!!! */
130 va_list ap; 134 va_list ap;