-improve UDP logging

[oweals/gnunet.git] / src / regex / regex_api.c

diff --git a/src/regex/regex_api.c b/src/regex/regex_api.c
index e18674d654c66db766b4b34c690588ad8984b54d..ebb824f6138ab994005577da7507e01b810a8604 100644 (file)
--- a/src/regex/regex_api.c
+++ b/src/regex/regex_api.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet
-     (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2012, 2013 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -105,7 +105,7 @@ handle_a_reconnect (void *cls,
 
 /**
  * Announce the given peer under the given regular expression.  Does
- * not free resources, must call GNUNET_REGEX_announce_cancel for
+ * not free resources, must call #GNUNET_REGEX_announce_cancel for
  * that.
  *
  * @param cfg configuration to use
@@ -113,7 +113,7 @@ handle_a_reconnect (void *cls,
  * @param refresh_delay after what delay should the announcement be repeated?
  * @param compression How many characters per edge can we squeeze?
  * @return Handle to reuse o free cached resources.
- *         Must be freed by calling GNUNET_REGEX_announce_cancel.
+ *         Must be freed by calling #GNUNET_REGEX_announce_cancel.
  */
 struct GNUNET_REGEX_Announcement *
 GNUNET_REGEX_announce (const struct GNUNET_CONFIGURATION_Handle *cfg,
@@ -127,6 +127,9 @@ GNUNET_REGEX_announce (const struct GNUNET_CONFIGURATION_Handle *cfg,
   slen = strlen (regex) + 1;
   if (slen + sizeof (struct AnnounceMessage) >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                _("Regex `%s' is too long!\n"),
+                regex);
     GNUNET_break (0);
     return NULL;
   }
@@ -183,14 +186,14 @@ struct GNUNET_REGEX_Search
   GNUNET_REGEX_Found callback;
 
   /**
-   * Closure for 'callback'.
+   * Closure for @e callback.
    */
   void *callback_cls;
 
   /**
    * Search message to transmit to the service.
    */
-  struct SearchMessage *msg;
+  struct RegexSearchMessage *msg;
 };
 
 
@@ -198,7 +201,7 @@ struct GNUNET_REGEX_Search
  * We got a response or disconnect after asking regex
  * to do the search.  Handle it.
  *
- * @param cls the 'struct GNUNET_REGEX_Search' to retry
+ * @param cls the `struct GNUNET_REGEX_Search` to retry
  * @param msg NULL on disconnect
  */
 static void
@@ -269,7 +272,7 @@ handle_search_response (void *cls,
       s->callback (s->callback_cls,
                   pid,
                   &pid[1], gpl,
-                  &pid[1 + gpl], ppl);         
+                  &pid[1 + gpl], ppl);
       return;
     }
   }
@@ -312,9 +315,9 @@ GNUNET_REGEX_search (const struct GNUNET_CONFIGURATION_Handle *cfg,
   }
   s->callback = callback;
   s->callback_cls = callback_cls;
-  s->msg = GNUNET_malloc (sizeof (struct SearchMessage) + slen);
+  s->msg = GNUNET_malloc (sizeof (struct RegexSearchMessage) + slen);
   s->msg->header.type = htons (GNUNET_MESSAGE_TYPE_REGEX_SEARCH);
-  s->msg->header.size = htons (sizeof (struct SearchMessage) + slen);
+  s->msg->header.size = htons (sizeof (struct RegexSearchMessage) + slen);
   memcpy (&s->msg[1], string, slen);
   retry_search (s);
   return s;