aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gns/gnunet-gns-fcfsd.c22
-rw-r--r--src/transport/plugin_transport_wlan.c7
2 files changed, 10 insertions, 19 deletions
diff --git a/src/gns/gnunet-gns-fcfsd.c b/src/gns/gnunet-gns-fcfsd.c
index 13d2df650..36b5c3fae 100644
--- a/src/gns/gnunet-gns-fcfsd.c
+++ b/src/gns/gnunet-gns-fcfsd.c
@@ -363,7 +363,7 @@ lookup_result_processor (void *cls,
363 const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key, 363 const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
364 struct GNUNET_TIME_Absolute expire, 364 struct GNUNET_TIME_Absolute expire,
365 const char *name, 365 const char *name,
366 unsigned int rd_len, 366 unsigned int rd_count,
367 const struct GNUNET_NAMESTORE_RecordData *rd, 367 const struct GNUNET_NAMESTORE_RecordData *rd,
368 const struct GNUNET_CRYPTO_RsaSignature *signature) 368 const struct GNUNET_CRYPTO_RsaSignature *signature)
369{ 369{
@@ -371,11 +371,11 @@ lookup_result_processor (void *cls,
371 struct GNUNET_NAMESTORE_RecordData r; 371 struct GNUNET_NAMESTORE_RecordData r;
372 372
373 request->qe = NULL; 373 request->qe = NULL;
374 if (0 != rd_len) 374 if (0 != rd_count)
375 { 375 {
376 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 376 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
377 _("Found %u existing records for domain `%s'\n"), 377 _("Found %u existing records for domain `%s'\n"),
378 rd_len, 378 rd_count,
379 request->domain_name); 379 request->domain_name);
380 request->phase = RP_FAIL; 380 request->phase = RP_FAIL;
381 run_httpd_now (); 381 run_httpd_now ();
@@ -398,9 +398,8 @@ lookup_result_processor (void *cls,
398/** 398/**
399 * Main MHD callback for handling requests. 399 * Main MHD callback for handling requests.
400 * 400 *
401 * 401 * @param cls unused
402 * @param cls argument given together with the function 402 * @param connection MHD connection handle
403 * pointer when the handler was registered with MHD
404 * @param url the requested url 403 * @param url the requested url
405 * @param method the HTTP method used ("GET", "PUT", etc.) 404 * @param method the HTTP method used ("GET", "PUT", etc.)
406 * @param version the HTTP version string (i.e. "HTTP/1.1") 405 * @param version the HTTP version string (i.e. "HTTP/1.1")
@@ -414,16 +413,7 @@ lookup_result_processor (void *cls,
414 * @param upload_data_size set initially to the size of the 413 * @param upload_data_size set initially to the size of the
415 * upload_data provided; the method must update this 414 * upload_data provided; the method must update this
416 * value to the number of bytes NOT processed; 415 * value to the number of bytes NOT processed;
417 * @param con_cls pointer that the callback can set to some 416 * @param ptr pointer to location where we store the 'struct Request'
418 * address and that will be preserved by MHD for future
419 * calls for this request; since the access handler may
420 * be called many times (i.e., for a PUT/POST operation
421 * with plenty of upload data) this allows the application
422 * to easily associate some request-specific state.
423 * If necessary, this state can be cleaned up in the
424 * global "MHD_RequestCompleted" callback (which
425 * can be set with the MHD_OPTION_NOTIFY_COMPLETED).
426 * Initially, <tt>*con_cls</tt> will be NULL.
427 * @return MHS_YES if the connection was handled successfully, 417 * @return MHS_YES if the connection was handled successfully,
428 * MHS_NO if the socket must be closed due to a serios 418 * MHS_NO if the socket must be closed due to a serios
429 * error while handling the request 419 * error while handling the request
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c
index 08f9c5833..7aebad93a 100644
--- a/src/transport/plugin_transport_wlan.c
+++ b/src/transport/plugin_transport_wlan.c
@@ -2840,9 +2840,10 @@ wlan_data_helper (void *cls, struct Session_light *session_light,
2840} 2840}
2841 2841
2842/** 2842/**
2843 * Function to print mac addresses nice * 2843 * Function to print mac addresses nicely.
2844 * @param pointer to 6 byte with the mac address 2844 *
2845 * @return pointer to the chars which hold the print out 2845 * @param mac the mac address
2846 * @return string to a static buffer with the human-readable mac, will be overwritten during the next call to this function
2846 */ 2847 */
2847static const char * 2848static const char *
2848macprinter (const u_int8_t * mac) 2849macprinter (const u_int8_t * mac)