cwx/op-packages
1
0 Fork 0
mirror of https://github.com/kiddin9/op-packages.git synced 2026-11-12 18:27:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🏅 Sync 2026-10-30 20:56:14

Browse Source
This commit is contained in:
github-actions[bot] committed 2026-10-30 20:56:14 +08:00
1 parent f470897df5
commit 2d2368945f
32 files changed
+2793 -2828
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

maxminddb-dump-country/Makefile
+1 -1
View File
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=maxminddb-dump-country
PKG_VERSION:=2
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_MAINTAINER:=Konstantine Shevlakov <shevlakov@132lan.ru>
PKG_LICENSE:=LICENSE
maxminddb-dump-country/patches/0001-geoip-add-DB-IP-CSV-input-support.patch
+20 -10
View File
@@ -1,7 +1,7 @@
From 8ea81c36bee0d4eefc023561a423cbfaac7acc41 Mon Sep 17 00:00:00 2001
From 2090af86fc5769d865bacb9446af046500f48914 Mon Sep 17 00:00:00 2001
From: koshev-msk <kosnt.shell@gmail.com>
Date: Thu, 29 Oct 2026 23:04:25 +0000
Subject: [PATCH] geoip: add DB-IP CSV input support
Date: Fri, 30 Oct 2026 10:55:20 +0000
Subject: [PATCH 1/2] geoip: add DB-IP CSV input support
Add a -d option to read DB-IP Country Lite CSV files and generate the
same per-country .iv4/.iv6 binary range files as the existing MMDB
@@ -16,11 +16,11 @@ unchanged.
Signed-off-by: OpenWrt Developer <builder@example.invalid>
---
xt_geoip_build_maxmind.c | 292 ++++++++++++++++++++++++++++++++++-----
1 file changed, 260 insertions(+), 32 deletions(-)
xt_geoip_build_maxmind.c | 295 ++++++++++++++++++++++++++++++++++-----
1 file changed, 262 insertions(+), 33 deletions(-)
diff --git a/xt_geoip_build_maxmind.c b/xt_geoip_build_maxmind.c
index 55e86d0..95d2c92 100644
index 55e86d0..eeb6bae 100644
--- a/xt_geoip_build_maxmind.c
+++ b/xt_geoip_build_maxmind.c
@@ -3,6 +3,7 @@
@@ -245,7 +245,17 @@ index 55e86d0..95d2c92 100644
static int skip_n96 = 0;
void tree_walk(int rn,int l, uint8_t *path) {
@@ -372,9 +573,10 @@ int main(int argc, char **argv)
@@ -358,7 +559,8 @@ void tree_walk(int rn,int l, uint8_t *path) {
}
void usage(void) {
- printf("%s [-4] [-6] [-v] [-c] [-N ASNUM|string ][-A all|asnum[,asnum...]] [-o outputdir] file.mmdb\n",progname);
+ printf("%s [-4] [-6] [-v] [-c] [-d dbip.csv] [-N ASNUM|string ][-A all|asnum[,asnum...]] [-o outputdir] [file.mmdb]\n",progname);
+ printf("\t -d: read DB-IP Country Lite CSV and write binary GeoIP files\n");
printf("\t asnum: number | number-number\n");
exit(1);
}
@@ -372,9 +574,10 @@ int main(int argc, char **argv)
progname = strdup(argv[0]);
@@ -257,7 +267,7 @@ index 55e86d0..95d2c92 100644
case '4': opt_6 = 0; break;
case '6': opt_4 = 0; break;
case 'v': opt_v++; break;
@@ -394,17 +596,29 @@ int main(int argc, char **argv)
@@ -394,17 +597,29 @@ int main(int argc, char **argv)
filename = strdup(argv[optind]);
} else {
filename = opt_asn ? asn_name:country_name;
@@ -289,7 +299,7 @@ index 55e86d0..95d2c92 100644
if(opt_asn && (opt_xtgeo || opt_csv)) {
fprintf(stderr,"%s: cant use -A with -o or -c\n",progname);
exit(1);
@@ -426,43 +640,55 @@ int main(int argc, char **argv)
@@ -426,43 +641,55 @@ int main(int argc, char **argv)
output_dir[l+2] = '\0';
}
@@ -374,7 +384,7 @@ index 55e86d0..95d2c92 100644
}
c_ipv4 += CCN4[fd];
c_ipv6 += CCN6[fd];
@@ -482,6 +708,8 @@ int main(int argc, char **argv)
@@ -482,6 +709,8 @@ int main(int argc, char **argv)
if(CSV_IPv6_fd) fclose(CSV_IPv6_fd);
if(CSV_EN_fd) fclose(CSV_EN_fd);
maxminddb-dump-country/patches/0002-add-help-CSV-args.patch
-11
View File
@@ -1,11 +0,0 @@
--- a/xt_geoip_build_maxmind.c
+++ b/xt_geoip_build_maxmind.c
@@ -559,7 +559,7 @@
}
void usage(void) {
- printf("%s [-4] [-6] [-v] [-c] [-N ASNUM|string ][-A all|asnum[,asnum...]] [-o outputdir] file.mmdb\n",progname);
+ printf("%s [-4] [-6] [-v] [-c] [-N ASNUM|string ][-A all|asnum[,asnum...]] [-o outputdir] file.mmdb|-d file.dbip.csv\n",progname);
printf("\t asnum: number | number-number\n");
exit(1);
}
maxminddb-dump-country/patches/0002-geoip-accept-ip-prefix-country-lines-in-d-CSV-input.patch
+167
View File
@@ -0,0 +1,167 @@
From d77c01d155793a19d28828bbb1d659ec19089b18 Mon Sep 17 00:00:00 2001
From: koshev-msk <kosnt.shell@gmail.com>
Date: Fri, 30 Oct 2026 10:55:20 +0000
Subject: [PATCH 2/2] geoip: accept ip/prefix,country lines in -d CSV input
Besides the DB-IP start_ip,end_ip,country format, allow two-field
lines in the form ip/prefix,country so that own lists can be written
in CIDR notation. Both IPv4 and IPv6 are supported; the range is
computed by clearing host bits for the start address and setting them
for the end address. Prefix length is validated against the address
family (0..32 / 0..128).
Signed-off-by: OpenWrt Developer <builder@example.invalid>
---
xt_geoip_build_maxmind.c | 90 ++++++++++++++++++++++++++++++----------
1 file changed, 67 insertions(+), 23 deletions(-)
diff --git a/xt_geoip_build_maxmind.c b/xt_geoip_build_maxmind.c
index eeb6bae..0c81d58 100644
--- a/xt_geoip_build_maxmind.c
+++ b/xt_geoip_build_maxmind.c
@@ -332,6 +332,8 @@ void p_dump(int l, uint8_t *path, MMDB_entry_s *e) {
/*
* DB-IP Country Lite CSV format:
* start_ip,end_ip,country
+ * or, for own lists:
+ * ip/prefix,country
*
* The fields may optionally be quoted. The CSV has no embedded commas.
*/
@@ -351,6 +353,21 @@ static char *csv_trim(char *field)
return field;
}
+/* Convert addr/plen to first and last address of the network. */
+static void cidr_range(uint8_t *start, uint8_t *end, unsigned alen,
+ unsigned plen)
+{
+ unsigned i, bits;
+ uint8_t mask;
+
+ for(i = 0; i < alen; i++) {
+ bits = plen > i * 8 ? plen - i * 8 : 0;
+ mask = bits >= 8 ? 0xff : (uint8_t)(0xff00 >> bits);
+ start[i] &= mask;
+ end[i] = start[i] | (uint8_t)~mask;
+ }
+}
+
static int dbip_write_range(int family, const uint8_t *start,
const uint8_t *end, const char *country, int cind)
{
@@ -411,8 +428,10 @@ static int dbip_csv_dump(const char *path)
}
while(fgets(line, sizeof(line), input)) {
- char *field[3], *p, *comma;
+ char *field[3], *p, *comma, *slash, *endp;
char *country;
+ unsigned long plen;
+ int nfields;
uint8_t start[16], end[16];
char start_text[INET6_ADDRSTRLEN];
char end_text[INET6_ADDRSTRLEN];
@@ -438,17 +457,22 @@ static int dbip_csv_dump(const char *path)
field[1] = comma + 1;
comma = strchr(field[1], ',');
- if(!comma)
- goto malformed;
- *comma = '\0';
- field[2] = comma + 1;
- if(strchr(field[2], ','))
- goto malformed;
+ if(comma) {
+ *comma = '\0';
+ field[2] = comma + 1;
+ if(strchr(field[2], ','))
+ goto malformed;
+ nfields = 3;
+ } else {
+ field[2] = NULL;
+ nfields = 2;
+ }
field[0] = csv_trim(field[0]);
field[1] = csv_trim(field[1]);
- field[2] = csv_trim(field[2]);
- country = field[2];
+ if(field[2])
+ field[2] = csv_trim(field[2]);
+ country = field[nfields - 1];
if(first_line) {
first_line = 0;
@@ -474,6 +498,14 @@ static int dbip_csv_dump(const char *path)
if(cind < 0)
continue;
+ slash = NULL;
+ if(nfields == 2) {
+ slash = strchr(field[0], '/');
+ if(!slash)
+ goto malformed;
+ *slash++ = '\0';
+ }
+
if(inet_pton(AF_INET, field[0], start) == 1)
family = AF_INET;
else if(inet_pton(AF_INET6, field[0], start) == 1)
@@ -485,19 +517,31 @@ static int dbip_csv_dump(const char *path)
break;
}
- if(inet_pton(family, field[1], end) != 1) {
- fprintf(stderr, "Invalid or mismatched end IP on DB-IP CSV line %lu\n",
- lineno);
- result = -1;
- break;
- }
- end_family = family;
- if(end_family != family ||
- memcmp(start, end, family == AF_INET ? 4 : 16) > 0) {
- fprintf(stderr, "Invalid IP range on DB-IP CSV line %lu\n",
- lineno);
- result = -1;
- break;
+ if(slash) {
+ plen = strtoul(slash, &endp, 10);
+ if(!isdigit((unsigned char)*slash) || *endp ||
+ plen > (family == AF_INET ? 32 : 128)) {
+ fprintf(stderr, "Invalid prefix length on DB-IP CSV line %lu\n",
+ lineno);
+ result = -1;
+ break;
+ }
+ cidr_range(start, end, family == AF_INET ? 4 : 16, plen);
+ } else {
+ if(inet_pton(family, field[1], end) != 1) {
+ fprintf(stderr, "Invalid or mismatched end IP on DB-IP CSV line %lu\n",
+ lineno);
+ result = -1;
+ break;
+ }
+ end_family = family;
+ if(end_family != family ||
+ memcmp(start, end, family == AF_INET ? 4 : 16) > 0) {
+ fprintf(stderr, "Invalid IP range on DB-IP CSV line %lu\n",
+ lineno);
+ result = -1;
+ break;
+ }
}
if(dbip_write_range(family, start, end, country, cind)) {
@@ -560,7 +604,7 @@ void tree_walk(int rn,int l, uint8_t *path) {
void usage(void) {
printf("%s [-4] [-6] [-v] [-c] [-d dbip.csv] [-N ASNUM|string ][-A all|asnum[,asnum...]] [-o outputdir] [file.mmdb]\n",progname);
- printf("\t -d: read DB-IP Country Lite CSV and write binary GeoIP files\n");
+ printf("\t -d: read CSV (start_ip,end_ip,CC or ip/prefix,CC) and write binary GeoIP files\n");
printf("\t asnum: number | number-number\n");
exit(1);
}
--
2.43.0