ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/hopm/trunk/src/dnsbl.c

Comparing hopm/trunk/src/dnsbl.c (file contents):
Revision 8578 by michael, Sun Sep 23 11:39:44 2018 UTC vs.
Revision 8579 by michael, Sun Oct 14 15:12:50 2018 UTC

#	Line 63 | Line 63 | dnsbl_add(struct scan_struct *ss)
63		return;
64		}
65
66	<	LIST_FOREACH(node, OpmItem->blacklists->head)
66	>	LIST_FOREACH(node, OpmItem.blacklists.head)
67		{
68		struct BlacklistConf *bl = node->data;
69
#	Line 132 | Line 132 | dnsbl_positive(struct scan_struct *ss, s
132
133		if (bl->type == A_BITMASK)
134		{
135	<	LIST_FOREACH(node, bl->reply->head)
135	>	LIST_FOREACH(node, bl->reply.head)
136		{
137		const struct BlacklistReplyConf *item = node->data;
138
#	Line 148 | Line 148 | dnsbl_positive(struct scan_struct *ss, s
148		}
149		else
150		{
151	<	LIST_FOREACH(node, bl->reply->head)
151	>	LIST_FOREACH(node, bl->reply.head)
152		{
153		const struct BlacklistReplyConf *item = node->data;
154
#	Line 174 | Line 174 | dnsbl_positive(struct scan_struct *ss, s
174		else if (ss->positive == 0)
175		{
176		/* Only report it if no other scans have found positives yet. */
177	<	scan_positive(ss, (EmptyString(bl->kline) ? IRCItem->kline : bl->kline), text_type);
177	>	scan_positive(ss, (EmptyString(bl->kline) ? IRCItem.kline : bl->kline), text_type);
178
179		irc_send_channels("DNSBL -> %s!%s@%s [%s] appears in BL zone %s (%s)",
180		ss->irc_nick, ss->irc_username, ss->irc_hostname, ss->ip, bl->name,
#	Line 264 | Line 264 | dnsbl_report(const struct scan_struct *s
264
265		assert(ss->ip);
266
267	<	if (EmptyString(OpmItem->dnsbl_to) || EmptyString(OpmItem->dnsbl_from) || EmptyString(OpmItem->sendmail))
267	>	if (EmptyString(OpmItem.dnsbl_to) || EmptyString(OpmItem.dnsbl_from) || EmptyString(OpmItem.sendmail))
268		return;
269
270	<	snprintf(cmdbuf, sizeof(cmdbuf), "%s -t", OpmItem->sendmail);
270	>	snprintf(cmdbuf, sizeof(cmdbuf), "%s -t", OpmItem.sendmail);
271		snprintf(buf, sizeof(buf),
272		"From: %s <%s>\n"
273		"To: %s\n"
274		"Subject: HOPM Report\n"
275		"X-HOPM-Version: %s\n\n"
276		"%s: %s:%d\n\n"
277	<	"%s\n", IRCItem->nick, OpmItem->dnsbl_from, OpmItem->dnsbl_to,
277	>	"%s\n", IRCItem.nick, OpmItem.dnsbl_from, OpmItem.dnsbl_to,
278		VERSION, scan_gettype(ss->remote->protocol), ss->ip,
279		ss->remote->port, ss->proof);
280
#	Line 293 | Line 293 | dnsbl_report(const struct scan_struct *s
293		fputs(buf, fp);
294		pclose(fp);
295
296	<	log_printf("DNSBL -> Sent report to %s [%s]", OpmItem->dnsbl_to, ss->ip);
296	>	log_printf("DNSBL -> Sent report to %s [%s]", OpmItem.dnsbl_to, ss->ip);
297
298		/* Record send in stats */
299		stats_dnsblsend();

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)