Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cidr aggregation #14

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Cidr aggregation #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ff49f1
Implementation of CIDR prefix aggregation request.
wessels Oct 19, 2022
f97b689
Merge branch 'master' into cidr-aggregation
wessels Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions dnstop.8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ anonymize addresses
BPF filter expression
.br
(default: udp port 53)
.It Fl C Ar length
Aggregate IPv4 addresses by prefix
.Pa length
.It Fl D Ar length
Aggregate IPv6 addresses by prefix
.Pa length
.It Fl i Ar address
ignore select addresses
.It Fl p
Expand Down
48 changes: 47 additions & 1 deletion dnstop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@ int opt_count_ipv4 = 0;
int opt_count_ipv6 = 0;
int opt_count_domsrc = 1;
const char *opt_filter_by_name = 0;
unsigned int opt_v4_agg = 0;
unsigned int opt_v6_agg = 0;
static inX_addr v4mask;
static inX_addr v6mask;

/*
* flags/features for non-interactive mode
Expand Down Expand Up @@ -697,6 +701,11 @@ handle_ipv6(struct ip6_hdr *ipv6, int len)
if (ignore_list_match(&src_addr))
return (0);

if (opt_v6_agg) {
src_addr = inXaddr_mask(&src_addr, &v6mask);
dst_addr = inXaddr_mask(&dst_addr, &v6mask);
}

/*
* Parse extension headers. This only handles the standard headers, as
* defined in RFC 2460, correctly. Fragments are discarded.
Expand Down Expand Up @@ -770,6 +779,11 @@ handle_ipv4(const struct ip *ip, int len)
if (ignore_list_match(&src_addr))
return (0);

if (opt_v4_agg) {
src_addr = inXaddr_mask(&src_addr, &v4mask);
dst_addr = inXaddr_mask(&dst_addr, &v4mask);
}

if (IPPROTO_UDP != ip->ip_p)
return 0;
if (0 == handle_udp((struct udphdr *)((char *)ip + offset), len - offset, &src_addr, &dst_addr))
Expand Down Expand Up @@ -1824,6 +1838,8 @@ usage(void)
fprintf(stderr, "\t-a\tAnonymize IP Addrs\n");
fprintf(stderr, "\t-b expr\tBPF program code\n");
fprintf(stderr, "\t-B num\tUse num hash table buckets (default %u)\n", hash_buckets);
fprintf(stderr, "\t-C len\tAggregate IPv4 addresses by prefix length\n");
fprintf(stderr, "\t-D len\tAggregate IPv6 addresses by prefix length\n");
fprintf(stderr, "\t-i addr\tIgnore this source IP address\n");
fprintf(stderr, "\t-n name\tCount only messages in this domain\n");
fprintf(stderr, "\t-p\tDon't put interface in promiscuous mode\n");
Expand Down Expand Up @@ -1901,7 +1917,7 @@ main(int argc, char *argv[])
array_to_hash(KnownTLDs_array, KnownTLDs);
array_to_hash(NewGTLDs_array, NewGTLDs);

while ((x = getopt(argc, argv, "46ab:B:f:i:l:n:pPr:QRvVX")) != -1) {
while ((x = getopt(argc, argv, "46ab:B:C:D:f:i:l:n:pPr:QRvVX")) != -1) {
switch (x) {
case '4':
opt_count_ipv4 = 1;
Expand All @@ -1912,6 +1928,16 @@ main(int argc, char *argv[])
case 'a':
anon_flag = 1;
break;
case 'C':
opt_v4_agg = atoi(optarg);
if (opt_v4_agg < 1 || opt_v4_agg > 32)
usage();
break;
case 'D':
opt_v6_agg = atoi(optarg);
if (opt_v6_agg < 1 || opt_v6_agg > 128)
usage();
break;
case 'l':
max_level = atoi(optarg);
if (max_level < 1 || max_level > 9)
Expand Down Expand Up @@ -1983,6 +2009,26 @@ main(int argc, char *argv[])
opt_count_replies = 1;
}

if (opt_v4_agg) {
/* Create mask variable from v4 prefix length */
struct in_addr x;
x.s_addr = htonl(~0 << (32-opt_v4_agg));
inXaddr_assign_v4(&v4mask, &x);
}

if (opt_v6_agg) {
/* Create mask variable from v6 prefix length */
struct in6_addr x;
for (unsigned int i = 0 ; i < 128; i++) {
x.s6_addr32[i/32] <<= 1;
x.s6_addr32[i/32] += i < opt_v6_agg ? 1 : 0;
}
for (unsigned int i = 0 ; i < 4; i++) {
x.s6_addr32[i] = htonl(x.s6_addr32[i]);
}
inXaddr_assign_v6(&v6mask, &x);
}

if (0 == stat(device, &sb))
readfile_state = 1;
if (readfile_state) {
Expand Down