coydog/zmap-freebsd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

quick and dirty fix to make it compile and (seemingly) work

Browse Source 
on 32 bits systems, it needs more testing though
This commit is contained in:
Ciccio87 2013-08-17 07:26:44 +02:00
parent cc47ec25ca
commit 9ae0d5e656
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/blacklist.c
View File

@ -124,6 +124,6 @@ int blacklist_init_from_files(char *whitelist_filename, char *blacklist_filename
constraint_optimize(constraint); constraint_optimize(constraint);
uint64_t allowed = blacklist_count_allowed(); uint64_t allowed = blacklist_count_allowed();
log_debug("blacklist", "%lu addresses allowed to be scanned (%0.0f%% of address space)", log_debug("blacklist", "%lu addresses allowed to be scanned (%0.0f%% of address space)",
allowed, allowed*100./(1L << 32)); allowed, allowed*100./(1L << (int)sizeof(long)*4));
return 0; return 0;
} }

6
src/zmap.c
View File

@ -81,7 +81,7 @@ static void *start_mon(__attribute__((unused)) void *arg)
#define SI(w,x,y) printf("%s\t%s\t%i\n", w, x, y); #define SI(w,x,y) printf("%s\t%s\t%i\n", w, x, y);
#define SD(w,x,y) printf("%s\t%s\t%f\n", w, x, y); #define SD(w,x,y) printf("%s\t%s\t%f\n", w, x, y);
#define SU(w,x,y) printf("%s\t%s\t%u\n", w, x, y); #define SU(w,x,y) printf("%s\t%s\t%u\n", w, x, y);
#define SLU(w,x,y) printf("%s\t%s\t%lu\n", w, x, y); #define SLU(w,x,y) printf("%s\t%s\t%lu\n", w, x, (long unsigned int)y);
#define SS(w,x,y) printf("%s\t%s\t%s\n", w, x, y); #define SS(w,x,y) printf("%s\t%s\t%s\n", w, x, y);
#define STRTIME_LEN 1024 #define STRTIME_LEN 1024
@ -458,7 +458,7 @@ int main(int argc, char *argv[])
} }
if (end[0] == '%' && end[1] == '\0') { if (end[0] == '%' && end[1] == '\0') {
// treat as percentage // treat as percentage
v = v * (1L << 32) / 100.; v = v * (1L << (int)sizeof(long)*4) / 100.;
} else if (end[0] != '\0') { } else if (end[0] != '\0') {
fprintf(stderr, "%s: extra characters after max-targets\n", fprintf(stderr, "%s: extra characters after max-targets\n",
CMDLINE_PARSER_PACKAGE); CMDLINE_PARSER_PACKAGE);
@ -467,7 +467,7 @@ int main(int argc, char *argv[])
if (v <= 0) { if (v <= 0) {
zconf.max_targets = 0; zconf.max_targets = 0;
} }
else if (v >= (1L << 32)) { else if (v >= (1L << (int)sizeof(long)*4)) {
zconf.max_targets = 0xFFFFFFFF; zconf.max_targets = 0xFFFFFFFF;
} else { } else {
zconf.max_targets = v; zconf.max_targets = v;