Merge.

[irc/quakenet/newserv.git] / trusts_newsearch / formats.c

diff --git a/trusts_newsearch/formats.c b/trusts_newsearch/formats.c
index 0133736a307e8ec38a81297221bf0504d5be6c61..9504ad4f5435b5653a98c1bd3aec98bd0951c9ce 100644 (file)
--- a/trusts_newsearch/formats.c
+++ b/trusts_newsearch/formats.c
@@ -3,7 +3,7 @@
 #include "../newsearch/newsearch.h"
 #include "../control/control.h"
 #include "../lib/stringbuf.h"
-#include "../trusts/trusts.h"
+#include "../trusts2/trusts.h"
 
 void printtrust_group(searchCtx *ctx, nick *sender, patricia_node_t *node) {
   trusthost_t *tgh = node->exts[tgh_ext];
@@ -11,9 +11,28 @@ void printtrust_group(searchCtx *ctx, nick *sender, patricia_node_t *node) {
 
   if (tgh) {
     tg = tgh->trustgroup;
-    ctx->reply(sender,"%s | [%lu] | %lu/%lu", IPtostr(node->prefix->sin), tg->id, tg->currenton, tg->maxusage); 
+    ctx->reply(sender,"%s/%d | [%lu] | %lu/%lu", IPtostr(node->prefix->sin), irc_bitlen(&(node->prefix->sin),(node->prefix->bitlen)), tg->id, tg->currenton, tg->maxusage); 
   } else { 
-    ctx->reply(sender,"%s | <none>", IPtostr(node->prefix->sin));
+    ctx->reply(sender,"%s/%d | <none>", IPtostr(node->prefix->sin), irc_bitlen(&(node->prefix->sin),(node->prefix->bitlen)));
   }
 }
 
+void printtrust_block(searchCtx *ctx, nick *sender, patricia_node_t *node) {
+  trustblock_t *tb = node->exts[tgb_ext];
+
+  if (tb) {
+    ctx->reply(sender,"%s/%d | [%lu] | %s", IPtostr(node->prefix->sin), irc_bitlen(&(node->prefix->sin),(node->prefix->bitlen)), tb->id, tb->reason_public ? tb->reason_public->content : "");
+  } else {
+    ctx->reply(sender,"%s/%d | <none>", IPtostr(node->prefix->sin), irc_bitlen(&(node->prefix->sin),(node->prefix->bitlen)));
+  } 
+}
+
+void printtrust_blockprivate(searchCtx *ctx, nick *sender, patricia_node_t *node) {
+  trustblock_t *tb = node->exts[tgb_ext];
+
+  if (tb) {
+    ctx->reply(sender,"%s/%d | [%lu] | %s", IPtostr(node->prefix->sin), irc_bitlen(&(node->prefix->sin),(node->prefix->bitlen)), tb->id, tb->reason_private ? tb->reason_private->content : "");
+  } else {
+    ctx->reply(sender,"%s/%d | <none>", IPtostr(node->prefix->sin), irc_bitlen(&(node->prefix->sin),(node->prefix->bitlen)));
+  }
+}