2008-03-29 18:37:07 +00:00
|
|
|
/*
|
2014-01-19 01:09:44 +00:00
|
|
|
* This file Copyright (C) 2008-2014 Mnemosyne LLC
|
2008-03-29 18:37:07 +00:00
|
|
|
*
|
2014-01-21 03:10:30 +00:00
|
|
|
* It may be used under the GNU GPL versions 2 or 3
|
2014-01-19 01:09:44 +00:00
|
|
|
* or any future license endorsed by Mnemosyne LLC.
|
2008-03-29 18:37:07 +00:00
|
|
|
*
|
2008-05-28 17:17:12 +00:00
|
|
|
* $Id$
|
2008-03-29 18:37:07 +00:00
|
|
|
*/
|
|
|
|
|
2011-03-24 21:49:42 +00:00
|
|
|
#include <assert.h>
|
|
|
|
#include <errno.h>
|
2008-03-29 18:37:07 +00:00
|
|
|
#include <stdio.h>
|
2012-12-05 17:29:46 +00:00
|
|
|
#include <stdlib.h> /* bsearch (), qsort () */
|
2008-03-29 18:37:07 +00:00
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include "transmission.h"
|
2008-03-30 13:22:45 +00:00
|
|
|
#include "blocklist.h"
|
2014-07-28 04:13:38 +00:00
|
|
|
#include "error.h"
|
2014-07-08 00:08:43 +00:00
|
|
|
#include "file.h"
|
2013-01-25 23:34:20 +00:00
|
|
|
#include "log.h"
|
2008-12-02 03:41:58 +00:00
|
|
|
#include "net.h"
|
2008-04-01 19:20:21 +00:00
|
|
|
#include "utils.h"
|
|
|
|
|
2008-12-09 21:39:05 +00:00
|
|
|
|
2008-04-01 19:20:21 +00:00
|
|
|
/***
|
|
|
|
**** PRIVATE
|
|
|
|
***/
|
2008-03-29 18:37:07 +00:00
|
|
|
|
2011-02-12 21:20:19 +00:00
|
|
|
struct tr_ipv4_range
|
2008-03-29 21:05:51 +00:00
|
|
|
{
|
2013-01-21 17:39:20 +00:00
|
|
|
uint32_t begin;
|
|
|
|
uint32_t end;
|
2008-03-29 21:05:51 +00:00
|
|
|
};
|
|
|
|
|
2013-01-21 17:48:36 +00:00
|
|
|
struct tr_blocklistFile
|
2008-03-30 13:22:45 +00:00
|
|
|
{
|
2013-01-21 17:39:20 +00:00
|
|
|
bool isEnabled;
|
2014-07-28 04:13:38 +00:00
|
|
|
tr_sys_file_t fd;
|
2013-01-21 17:39:20 +00:00
|
|
|
size_t ruleCount;
|
2014-07-28 04:13:38 +00:00
|
|
|
uint64_t byteCount;
|
2013-01-21 17:39:20 +00:00
|
|
|
char * filename;
|
|
|
|
struct tr_ipv4_range * rules;
|
2008-03-30 13:22:45 +00:00
|
|
|
};
|
2008-03-29 18:37:07 +00:00
|
|
|
|
|
|
|
static void
|
2013-01-21 17:48:36 +00:00
|
|
|
blocklistClose (tr_blocklistFile * b)
|
2008-03-29 18:37:07 +00:00
|
|
|
{
|
2013-01-21 17:39:20 +00:00
|
|
|
if (b->rules != NULL)
|
2008-03-29 18:37:07 +00:00
|
|
|
{
|
2014-07-28 04:13:38 +00:00
|
|
|
tr_sys_file_unmap (b->rules, b->byteCount, NULL);
|
|
|
|
tr_sys_file_close (b->fd, NULL);
|
2013-01-21 17:39:20 +00:00
|
|
|
b->rules = NULL;
|
|
|
|
b->ruleCount = 0;
|
|
|
|
b->byteCount = 0;
|
2014-07-28 04:13:38 +00:00
|
|
|
b->fd = TR_BAD_SYS_FILE;
|
2008-03-29 18:37:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-01-21 17:48:36 +00:00
|
|
|
blocklistLoad (tr_blocklistFile * b)
|
2008-03-29 18:37:07 +00:00
|
|
|
{
|
2014-07-28 04:13:38 +00:00
|
|
|
tr_sys_file_t fd;
|
|
|
|
uint64_t byteCount;
|
2014-07-08 00:08:43 +00:00
|
|
|
tr_sys_path_info info;
|
2013-01-21 17:39:20 +00:00
|
|
|
char * base;
|
2014-07-28 04:13:38 +00:00
|
|
|
tr_error * error = NULL;
|
2013-01-21 17:39:20 +00:00
|
|
|
const char * err_fmt = _("Couldn't read \"%1$s\": %2$s");
|
2008-03-29 18:37:07 +00:00
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
blocklistClose (b);
|
2008-03-29 18:37:07 +00:00
|
|
|
|
2014-07-08 00:08:43 +00:00
|
|
|
if (!tr_sys_path_get_info (b->filename, 0, &info, NULL))
|
|
|
|
return;
|
|
|
|
|
2014-07-28 04:13:38 +00:00
|
|
|
byteCount = info.size;
|
2014-07-08 00:08:43 +00:00
|
|
|
if (byteCount == 0)
|
2013-01-21 17:39:20 +00:00
|
|
|
return;
|
2008-04-05 16:45:35 +00:00
|
|
|
|
2014-07-28 04:13:38 +00:00
|
|
|
fd = tr_sys_file_open (b->filename, TR_SYS_FILE_READ, 0, &error);
|
|
|
|
if (fd == TR_BAD_SYS_FILE)
|
2008-09-23 19:11:04 +00:00
|
|
|
{
|
2014-07-28 04:13:38 +00:00
|
|
|
tr_logAddError (err_fmt, b->filename, error->message);
|
|
|
|
tr_error_free (error);
|
2013-01-21 17:39:20 +00:00
|
|
|
return;
|
2008-03-29 18:37:07 +00:00
|
|
|
}
|
2008-04-05 16:45:35 +00:00
|
|
|
|
2014-07-28 04:13:38 +00:00
|
|
|
b->rules = tr_sys_file_map_for_reading (fd, 0, byteCount, &error);
|
2013-01-21 17:39:20 +00:00
|
|
|
if (!b->rules)
|
2008-09-23 19:11:04 +00:00
|
|
|
{
|
2014-07-28 04:13:38 +00:00
|
|
|
tr_logAddError (err_fmt, b->filename, error->message);
|
|
|
|
tr_sys_file_close (fd, NULL);
|
|
|
|
tr_error_free (error);
|
2013-01-21 17:39:20 +00:00
|
|
|
return;
|
2008-03-29 18:37:07 +00:00
|
|
|
}
|
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
b->fd = fd;
|
|
|
|
b->byteCount = byteCount;
|
|
|
|
b->ruleCount = byteCount / sizeof (struct tr_ipv4_range);
|
2008-06-11 16:15:45 +00:00
|
|
|
|
2014-07-08 00:08:43 +00:00
|
|
|
base = tr_sys_path_basename (b->filename, NULL);
|
2013-09-08 17:36:11 +00:00
|
|
|
tr_logAddInfo (_("Blocklist \"%s\" contains %"TR_PRIuSIZE" entries"), base, b->ruleCount);
|
2013-01-21 17:39:20 +00:00
|
|
|
tr_free (base);
|
2008-03-29 21:05:51 +00:00
|
|
|
}
|
|
|
|
|
2008-03-30 00:00:28 +00:00
|
|
|
static void
|
2013-01-21 17:48:36 +00:00
|
|
|
blocklistEnsureLoaded (tr_blocklistFile * b)
|
2008-03-30 00:00:28 +00:00
|
|
|
{
|
2013-01-21 17:39:20 +00:00
|
|
|
if (b->rules == NULL)
|
|
|
|
blocklistLoad (b);
|
2008-03-30 00:00:28 +00:00
|
|
|
}
|
|
|
|
|
2008-03-29 21:05:51 +00:00
|
|
|
static int
|
2013-01-21 17:39:20 +00:00
|
|
|
compareAddressToRange (const void * va, const void * vb)
|
2008-03-29 21:05:51 +00:00
|
|
|
{
|
2013-01-21 17:39:20 +00:00
|
|
|
const uint32_t * a = va;
|
|
|
|
const struct tr_ipv4_range * b = vb;
|
2008-09-23 19:11:04 +00:00
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
if (*a < b->begin) return -1;
|
|
|
|
if (*a > b->end) return 1;
|
|
|
|
return 0;
|
2008-03-29 18:37:07 +00:00
|
|
|
}
|
|
|
|
|
2008-03-30 13:22:45 +00:00
|
|
|
static void
|
2013-01-21 17:48:36 +00:00
|
|
|
blocklistDelete (tr_blocklistFile * b)
|
2008-03-30 13:22:45 +00:00
|
|
|
{
|
2013-01-21 17:39:20 +00:00
|
|
|
blocklistClose (b);
|
2014-07-08 00:08:43 +00:00
|
|
|
tr_sys_path_remove (b->filename, NULL);
|
2008-03-30 13:22:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/***
|
2008-04-01 19:20:21 +00:00
|
|
|
**** PACKAGE-VISIBLE
|
2008-03-30 13:22:45 +00:00
|
|
|
***/
|
|
|
|
|
2013-01-21 17:48:36 +00:00
|
|
|
tr_blocklistFile *
|
|
|
|
tr_blocklistFileNew (const char * filename, bool isEnabled)
|
2008-03-30 13:22:45 +00:00
|
|
|
{
|
2013-01-21 17:48:36 +00:00
|
|
|
tr_blocklistFile * b;
|
2008-03-30 13:22:45 +00:00
|
|
|
|
2013-01-21 17:48:36 +00:00
|
|
|
b = tr_new0 (tr_blocklistFile, 1);
|
2014-07-28 04:13:38 +00:00
|
|
|
b->fd = TR_BAD_SYS_FILE;
|
2013-01-21 17:39:20 +00:00
|
|
|
b->filename = tr_strdup (filename);
|
|
|
|
b->isEnabled = isEnabled;
|
2008-03-30 13:22:45 +00:00
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
return b;
|
2008-03-30 13:22:45 +00:00
|
|
|
}
|
|
|
|
|
2008-06-11 16:15:45 +00:00
|
|
|
const char*
|
2013-01-21 17:48:36 +00:00
|
|
|
tr_blocklistFileGetFilename (const tr_blocklistFile * b)
|
2008-06-11 16:15:45 +00:00
|
|
|
{
|
2013-01-21 17:39:20 +00:00
|
|
|
return b->filename;
|
2008-06-11 16:15:45 +00:00
|
|
|
}
|
|
|
|
|
2008-03-30 13:22:45 +00:00
|
|
|
void
|
2013-01-21 17:48:36 +00:00
|
|
|
tr_blocklistFileFree (tr_blocklistFile * b)
|
2008-03-30 13:22:45 +00:00
|
|
|
{
|
2013-01-21 17:39:20 +00:00
|
|
|
blocklistClose (b);
|
|
|
|
tr_free (b->filename);
|
|
|
|
tr_free (b);
|
2008-03-30 13:22:45 +00:00
|
|
|
}
|
|
|
|
|
2013-09-08 21:25:13 +00:00
|
|
|
bool
|
2013-01-21 17:48:36 +00:00
|
|
|
tr_blocklistFileExists (const tr_blocklistFile * b)
|
2008-03-29 23:12:34 +00:00
|
|
|
{
|
2014-07-08 00:08:43 +00:00
|
|
|
return tr_sys_path_exists (b->filename, NULL);
|
2008-06-11 16:15:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2013-01-21 17:48:36 +00:00
|
|
|
tr_blocklistFileGetRuleCount (const tr_blocklistFile * b)
|
2008-06-11 16:15:45 +00:00
|
|
|
{
|
2013-01-21 17:48:36 +00:00
|
|
|
blocklistEnsureLoaded ((tr_blocklistFile*)b);
|
2008-03-30 13:22:45 +00:00
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
return b->ruleCount;
|
2008-03-30 13:22:45 +00:00
|
|
|
}
|
|
|
|
|
2013-09-08 21:25:13 +00:00
|
|
|
bool
|
2013-01-21 17:48:36 +00:00
|
|
|
tr_blocklistFileIsEnabled (tr_blocklistFile * b)
|
2008-03-30 13:22:45 +00:00
|
|
|
{
|
2013-01-21 17:39:20 +00:00
|
|
|
return b->isEnabled;
|
2008-03-29 23:12:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2013-01-21 17:48:36 +00:00
|
|
|
tr_blocklistFileSetEnabled (tr_blocklistFile * b, bool isEnabled)
|
2008-03-29 23:12:34 +00:00
|
|
|
{
|
2013-08-24 18:18:38 +00:00
|
|
|
assert (b != NULL);
|
|
|
|
assert (tr_isBool (isEnabled));
|
|
|
|
|
|
|
|
b->isEnabled = isEnabled;
|
2008-03-29 23:12:34 +00:00
|
|
|
}
|
|
|
|
|
2013-09-08 21:25:13 +00:00
|
|
|
bool
|
2013-01-21 17:48:36 +00:00
|
|
|
tr_blocklistFileHasAddress (tr_blocklistFile * b, const tr_address * addr)
|
2008-03-29 18:37:07 +00:00
|
|
|
{
|
2013-01-21 17:39:20 +00:00
|
|
|
uint32_t needle;
|
|
|
|
const struct tr_ipv4_range * range;
|
2008-03-29 21:05:51 +00:00
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
assert (tr_address_is_valid (addr));
|
2008-12-20 02:56:44 +00:00
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
if (!b->isEnabled || addr->type == TR_AF_INET6)
|
2013-09-08 21:25:13 +00:00
|
|
|
return false;
|
2008-03-29 23:12:34 +00:00
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
blocklistEnsureLoaded (b);
|
2009-12-14 18:47:45 +00:00
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
if (!b->rules || !b->ruleCount)
|
2013-09-08 21:25:13 +00:00
|
|
|
return false;
|
2008-03-29 18:37:07 +00:00
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
needle = ntohl (addr->addr.addr4.s_addr);
|
2008-03-29 18:37:07 +00:00
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
range = bsearch (&needle,
|
|
|
|
b->rules,
|
|
|
|
b->ruleCount,
|
|
|
|
sizeof (struct tr_ipv4_range),
|
|
|
|
compareAddressToRange);
|
2008-03-29 21:05:51 +00:00
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
return range != NULL;
|
2008-03-29 21:05:51 +00:00
|
|
|
}
|
2008-03-29 18:37:07 +00:00
|
|
|
|
2010-05-31 11:38:36 +00:00
|
|
|
/*
|
2010-11-07 02:53:50 +00:00
|
|
|
* P2P plaintext format: "comment:x.x.x.x-y.y.y.y"
|
|
|
|
* http://wiki.phoenixlabs.org/wiki/P2P_Format
|
|
|
|
* http://en.wikipedia.org/wiki/PeerGuardian#P2P_plaintext_format
|
2010-05-31 11:38:36 +00:00
|
|
|
*/
|
2011-03-22 15:19:54 +00:00
|
|
|
static bool
|
2012-12-05 17:29:46 +00:00
|
|
|
parseLine1 (const char * line, struct tr_ipv4_range * range)
|
2010-05-31 11:38:36 +00:00
|
|
|
{
|
2013-01-21 17:39:20 +00:00
|
|
|
char * walk;
|
|
|
|
int b[4];
|
|
|
|
int e[4];
|
|
|
|
char str[64];
|
|
|
|
tr_address addr;
|
|
|
|
|
|
|
|
walk = strrchr (line, ':');
|
|
|
|
if (!walk)
|
|
|
|
return false;
|
|
|
|
++walk; /* walk past the colon */
|
|
|
|
|
|
|
|
if (sscanf (walk, "%d.%d.%d.%d-%d.%d.%d.%d",
|
|
|
|
&b[0], &b[1], &b[2], &b[3],
|
|
|
|
&e[0], &e[1], &e[2], &e[3]) != 8)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
tr_snprintf (str, sizeof (str), "%d.%d.%d.%d", b[0], b[1], b[2], b[3]);
|
|
|
|
if (!tr_address_from_string (&addr, str))
|
|
|
|
return false;
|
|
|
|
range->begin = ntohl (addr.addr.addr4.s_addr);
|
|
|
|
|
|
|
|
tr_snprintf (str, sizeof (str), "%d.%d.%d.%d", e[0], e[1], e[2], e[3]);
|
|
|
|
if (!tr_address_from_string (&addr, str))
|
|
|
|
return false;
|
|
|
|
range->end = ntohl (addr.addr.addr4.s_addr);
|
|
|
|
|
|
|
|
return true;
|
2010-05-31 11:38:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2010-11-07 02:53:50 +00:00
|
|
|
* DAT format: "000.000.000.000 - 000.255.255.255 , 000 , invalid ip"
|
|
|
|
* http://wiki.phoenixlabs.org/wiki/DAT_Format
|
2010-05-31 11:38:36 +00:00
|
|
|
*/
|
2011-03-22 15:19:54 +00:00
|
|
|
static bool
|
2012-12-05 17:29:46 +00:00
|
|
|
parseLine2 (const char * line, struct tr_ipv4_range * range)
|
2010-05-31 11:38:36 +00:00
|
|
|
{
|
2013-01-21 17:39:20 +00:00
|
|
|
int unk;
|
|
|
|
int a[4];
|
|
|
|
int b[4];
|
|
|
|
char str[32];
|
|
|
|
tr_address addr;
|
|
|
|
|
|
|
|
if (sscanf (line, "%3d.%3d.%3d.%3d - %3d.%3d.%3d.%3d , %3d , ",
|
|
|
|
&a[0], &a[1], &a[2], &a[3],
|
|
|
|
&b[0], &b[1], &b[2], &b[3],
|
|
|
|
&unk) != 9)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
tr_snprintf (str, sizeof (str), "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
|
|
|
|
if (!tr_address_from_string (&addr, str))
|
|
|
|
return false;
|
|
|
|
range->begin = ntohl (addr.addr.addr4.s_addr);
|
|
|
|
|
|
|
|
tr_snprintf (str, sizeof (str), "%d.%d.%d.%d", b[0], b[1], b[2], b[3]);
|
|
|
|
if (!tr_address_from_string (&addr, str))
|
|
|
|
return false;
|
|
|
|
range->end = ntohl (addr.addr.addr4.s_addr);
|
|
|
|
|
|
|
|
return true;
|
2010-05-31 11:38:36 +00:00
|
|
|
}
|
|
|
|
|
2013-09-08 21:25:13 +00:00
|
|
|
static bool
|
2012-12-05 17:29:46 +00:00
|
|
|
parseLine (const char * line, struct tr_ipv4_range * range)
|
2010-05-31 11:38:36 +00:00
|
|
|
{
|
2013-01-21 17:39:20 +00:00
|
|
|
return parseLine1 (line, range)
|
|
|
|
|| parseLine2 (line, range);
|
2010-05-31 11:38:36 +00:00
|
|
|
}
|
|
|
|
|
2011-02-13 16:14:31 +00:00
|
|
|
static int
|
2012-12-05 17:29:46 +00:00
|
|
|
compareAddressRangesByFirstAddress (const void * va, const void * vb)
|
2011-02-13 16:14:31 +00:00
|
|
|
{
|
2013-01-21 17:39:20 +00:00
|
|
|
const struct tr_ipv4_range * a = va;
|
|
|
|
const struct tr_ipv4_range * b = vb;
|
|
|
|
if (a->begin != b->begin)
|
|
|
|
return a->begin < b->begin ? -1 : 1;
|
|
|
|
return 0;
|
2011-02-13 16:14:31 +00:00
|
|
|
}
|
|
|
|
|
2008-03-30 00:00:28 +00:00
|
|
|
int
|
2013-01-21 17:48:36 +00:00
|
|
|
tr_blocklistFileSetContent (tr_blocklistFile * b, const char * filename)
|
2008-03-29 18:37:07 +00:00
|
|
|
{
|
2014-09-21 18:01:36 +00:00
|
|
|
tr_sys_file_t in;
|
|
|
|
tr_sys_file_t out;
|
2013-01-21 17:39:20 +00:00
|
|
|
int inCount = 0;
|
|
|
|
char line[2048];
|
|
|
|
const char * err_fmt = _("Couldn't read \"%1$s\": %2$s");
|
|
|
|
struct tr_ipv4_range * ranges = NULL;
|
|
|
|
size_t ranges_alloc = 0;
|
|
|
|
size_t ranges_count = 0;
|
2014-09-21 18:01:36 +00:00
|
|
|
tr_error * error = NULL;
|
2013-01-21 17:39:20 +00:00
|
|
|
|
|
|
|
if (!filename)
|
2008-09-23 19:11:04 +00:00
|
|
|
{
|
2013-01-21 17:39:20 +00:00
|
|
|
blocklistDelete (b);
|
|
|
|
return 0;
|
2008-03-29 18:37:07 +00:00
|
|
|
}
|
|
|
|
|
2014-09-21 18:01:36 +00:00
|
|
|
in = tr_sys_file_open (filename, TR_SYS_FILE_READ, 0, &error);
|
|
|
|
if (in == TR_BAD_SYS_FILE)
|
2008-09-23 19:11:04 +00:00
|
|
|
{
|
2014-09-21 18:01:36 +00:00
|
|
|
tr_logAddError (err_fmt, filename, error->message);
|
|
|
|
tr_error_free (error);
|
2013-01-21 17:39:20 +00:00
|
|
|
return 0;
|
2008-03-29 18:37:07 +00:00
|
|
|
}
|
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
blocklistClose (b);
|
2008-09-23 19:11:04 +00:00
|
|
|
|
2014-09-21 18:01:36 +00:00
|
|
|
out = tr_sys_file_open (b->filename,
|
|
|
|
TR_SYS_FILE_WRITE | TR_SYS_FILE_CREATE | TR_SYS_FILE_TRUNCATE,
|
|
|
|
0666, &error);
|
|
|
|
if (out == TR_BAD_SYS_FILE)
|
2008-09-23 19:11:04 +00:00
|
|
|
{
|
2014-09-21 18:01:36 +00:00
|
|
|
tr_logAddError (err_fmt, b->filename, error->message);
|
|
|
|
tr_error_free (error);
|
|
|
|
tr_sys_file_close (in, NULL);
|
2013-01-21 17:39:20 +00:00
|
|
|
return 0;
|
2008-03-29 18:37:07 +00:00
|
|
|
}
|
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
/* load the rules into memory */
|
2014-09-21 18:01:36 +00:00
|
|
|
while (tr_sys_file_read_line (in, line, sizeof (line), NULL))
|
2008-03-29 18:37:07 +00:00
|
|
|
{
|
2013-01-21 17:39:20 +00:00
|
|
|
struct tr_ipv4_range range;
|
2008-03-29 18:37:07 +00:00
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
++inCount;
|
2010-04-27 03:58:25 +00:00
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
if (!parseLine (line, &range))
|
2010-04-30 22:58:03 +00:00
|
|
|
{
|
2013-01-21 17:39:20 +00:00
|
|
|
/* don't try to display the actual lines - it causes issues */
|
2013-01-25 23:34:20 +00:00
|
|
|
tr_logAddError (_("blocklist skipped invalid address at line %d"), inCount);
|
2013-01-21 17:39:20 +00:00
|
|
|
continue;
|
2010-04-30 22:58:03 +00:00
|
|
|
}
|
2008-03-29 18:37:07 +00:00
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
if (ranges_alloc == ranges_count)
|
2008-09-23 19:11:04 +00:00
|
|
|
{
|
2013-01-21 17:39:20 +00:00
|
|
|
ranges_alloc += 4096; /* arbitrary */
|
|
|
|
ranges = tr_renew (struct tr_ipv4_range, ranges, ranges_alloc);
|
2008-03-29 18:37:07 +00:00
|
|
|
}
|
2008-03-29 21:05:51 +00:00
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
ranges[ranges_count++] = range;
|
2008-03-29 18:37:07 +00:00
|
|
|
}
|
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
if (ranges_count > 0) /* sort and merge */
|
2008-06-11 16:15:45 +00:00
|
|
|
{
|
2013-01-21 17:39:20 +00:00
|
|
|
struct tr_ipv4_range * r;
|
|
|
|
struct tr_ipv4_range * keep = ranges;
|
|
|
|
const struct tr_ipv4_range * end;
|
2011-02-13 16:14:31 +00:00
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
/* sort */
|
|
|
|
qsort (ranges, ranges_count, sizeof (struct tr_ipv4_range),
|
|
|
|
compareAddressRangesByFirstAddress);
|
|
|
|
|
|
|
|
/* merge */
|
|
|
|
for (r=ranges+1, end=ranges+ranges_count; r!=end; ++r) {
|
|
|
|
if (keep->end < r->begin)
|
|
|
|
*++keep = *r;
|
|
|
|
else if (keep->end < r->end)
|
|
|
|
keep->end = r->end;
|
|
|
|
}
|
|
|
|
|
|
|
|
ranges_count = keep + 1 - ranges;
|
2011-02-13 16:14:31 +00:00
|
|
|
|
|
|
|
#ifndef NDEBUG
|
2013-01-21 17:39:20 +00:00
|
|
|
/* sanity checks: make sure the rules are sorted
|
|
|
|
* in ascending order and don't overlap */
|
|
|
|
{
|
|
|
|
size_t i;
|
2011-02-13 16:14:31 +00:00
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
for (i=0; i<ranges_count; ++i)
|
|
|
|
assert (ranges[i].begin <= ranges[i].end);
|
2011-02-13 16:14:31 +00:00
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
for (i=1; i<ranges_count; ++i)
|
|
|
|
assert (ranges[i-1].end < ranges[i].begin);
|
|
|
|
}
|
2011-02-13 16:14:31 +00:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2014-09-21 18:01:36 +00:00
|
|
|
if (!tr_sys_file_write (out, ranges, sizeof (struct tr_ipv4_range) * ranges_count, NULL, &error))
|
2013-01-21 17:39:20 +00:00
|
|
|
{
|
2014-09-21 18:01:36 +00:00
|
|
|
tr_logAddError (_("Couldn't save file \"%1$s\": %2$s"), b->filename, error->message);
|
|
|
|
tr_error_free (error);
|
2013-01-21 17:39:20 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2014-07-08 00:08:43 +00:00
|
|
|
char * base = tr_sys_path_basename (b->filename, NULL);
|
2013-09-08 17:36:11 +00:00
|
|
|
tr_logAddInfo (_("Blocklist \"%s\" updated with %"TR_PRIuSIZE" entries"), base, ranges_count);
|
2013-01-21 17:39:20 +00:00
|
|
|
tr_free (base);
|
2008-06-11 16:15:45 +00:00
|
|
|
}
|
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
tr_free (ranges);
|
2014-09-21 18:01:36 +00:00
|
|
|
tr_sys_file_close (out, NULL);
|
|
|
|
tr_sys_file_close (in, NULL);
|
2008-03-29 21:05:51 +00:00
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
blocklistLoad (b);
|
2008-03-30 00:00:28 +00:00
|
|
|
|
2013-01-21 17:39:20 +00:00
|
|
|
return ranges_count;
|
2008-03-29 18:37:07 +00:00
|
|
|
}
|