#include "../irc/irc.h"
+#include "../trusts/trusts.h"
#include "glines.h"
int glinebyip(const char *user, struct irc_in_addr *ip, unsigned char bits, int duration, const char *reason, int flags, const char *creator) {
glinebuf gbuf;
int hits;
- glinebufinit(&gbuf, 1);
+ glinebufinit(&gbuf, 0);
+ glinebufcommentf(&gbuf, "on IP mask %s@%s, set by %s", user, CIDRtostr(*ip, bits), creator);
glinebufaddbyip(&gbuf, user, ip, bits, flags, creator, reason, getnettime() + duration, getnettime(), getnettime() + duration);
- glinebufcounthits(&gbuf, &hits, NULL, NULL);
+ glinebufcounthits(&gbuf, &hits, NULL);
if (flags & GLINE_SIMULATE)
- glinebufabandon(&gbuf);
+ glinebufabort(&gbuf);
else
- glinebufflush(&gbuf, 1);
+ glinebufcommit(&gbuf, 1);
return hits;
}
glinebuf gbuf;
int hits;
- glinebufinit(&gbuf, 1);
+ glinebufinit(&gbuf, 0);
+ glinebufcommentf(&gbuf, "on nick %s!%s@%s, set by %s", np->nick, np->ident, np->host->name->content, creator);
glinebufaddbynick(&gbuf, np, flags, creator, reason, getnettime() + duration, getnettime(), getnettime() + duration);
- glinebufcounthits(&gbuf, &hits, NULL, NULL);
+ glinebufcounthits(&gbuf, &hits, NULL);
if (flags & GLINE_SIMULATE)
- glinebufabandon(&gbuf);
+ glinebufabort(&gbuf);
else
- glinebufflush(&gbuf, 1);
+ glinebufcommit(&gbuf, 1);
return hits;
}