GOSTSec/vanitygen
1
0
Fork 0
mirror of https://github.com/GOSTSec/vanitygen synced 2025-02-07 12:24:20 +00:00
Code Issues Releases Wiki Activity

Ignore impossible case-differing variants of prefixes, as long as at

Browse Source 
least one variant is possible.
This commit is contained in:
samr7 2011-07-31 21:51:42 -07:00
parent efb7cedde5
commit b20eb08517
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pattern.c
View File

@ -748,7 +748,6 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
if (0) { if (0) {
not_possible: not_possible:
printf("Prefix '%s' not possible\n", pfx);
ret = -2; ret = -2;
} }
@ -1487,6 +1486,7 @@ vg_prefix_context_add_patterns(vg_context_t *vcp,
BIGNUM *ranges[4]; BIGNUM *ranges[4];
int ret = 0; int ret = 0;
int i, impossible = 0; int i, impossible = 0;
int case_impossible;
unsigned long npfx; unsigned long npfx;
char *dbuf; char *dbuf;
@ -1522,11 +1522,17 @@ vg_prefix_context_add_patterns(vg_context_t *vcp,
patterns[i], caseiter.ci_nbits); patterns[i], caseiter.ci_nbits);
} }
case_impossible = 0;
vp = NULL; vp = NULL;
do { do {
ret = get_prefix_ranges(vcpp->base.vc_addrtype, ret = get_prefix_ranges(vcpp->base.vc_addrtype,
caseiter.ci_prefix, caseiter.ci_prefix,
ranges, bnctx); ranges, bnctx);
if (ret == -2) {
case_impossible++;
ret = 0;
continue;
}
if (ret) if (ret)
break; break;
vp2 = vg_prefix_add_ranges(&vcpp->vcp_avlroot, vp2 = vg_prefix_add_ranges(&vcpp->vcp_avlroot,
@ -1542,14 +1548,19 @@ vg_prefix_context_add_patterns(vg_context_t *vcp,
} while (prefix_case_iter_next(&caseiter)); } while (prefix_case_iter_next(&caseiter));
if (!vp && case_impossible)
ret = -2;
if (ret && vp) { if (ret && vp) {
vg_prefix_delete(&vcpp->vcp_avlroot, vp); vg_prefix_delete(&vcpp->vcp_avlroot, vp);
vp = NULL; vp = NULL;
} }
} }
if (ret == -2) if (ret == -2) {
printf("Prefix '%s' not possible\n", patterns[i]);
impossible++; impossible++;
}
if (!vp) if (!vp)
continue; continue;