Permalink
Browse files

Merge branch 'master' of https://github.com/ciccio-87/zmap into cicci…

…o-87-master
  • Loading branch information...
zakird committed Aug 17, 2013
2 parents eaf4ece + 7438bdd commit 779424fe2c7bd6bee525a1705fa878b965fb242c
Showing with 10 additions and 4 deletions.
  1. +6 −0 README
  2. +1 −1 lib/blacklist.c
  3. +3 −3 src/zmap.c
View
6 README
@@ -1,3 +1,9 @@
+==============================================================================
+Now it should be working on 32 bits systems (only possible issues
+should be on some prints).
+Further testing is needed though
+==============================================================================
+
ZMap is a fast network scanner designed for Internet-wide network surveys. On a
typical desktop computer with a gigabit Ethernet connection, ZMap is capable
scanning the entire public IPv4 address space in under 45 minutes.
View
@@ -124,6 +124,6 @@ int blacklist_init_from_files(char *whitelist_filename, char *blacklist_filename
constraint_optimize(constraint);
uint64_t allowed = blacklist_count_allowed();
log_debug("blacklist", "%lu addresses allowed to be scanned (%0.0f%% of address space)",
- allowed, allowed*100./(1L << 32));
+ allowed, allowed*100./((long long int)1 << 32));
return 0;
}
View
@@ -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 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 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 STRTIME_LEN 1024
@@ -458,7 +458,7 @@ int main(int argc, char *argv[])
}
if (end[0] == '%' && end[1] == '\0') {
// treat as percentage
- v = v * (1L << 32) / 100.;
+ v = v * ((unsigned long long int)1 << 32) / 100.;
} else if (end[0] != '\0') {
fprintf(stderr, "%s: extra characters after max-targets\n",
CMDLINE_PARSER_PACKAGE);
@@ -467,7 +467,7 @@ int main(int argc, char *argv[])
if (v <= 0) {
zconf.max_targets = 0;
}
- else if (v >= (1L << 32)) {
+ else if (v >= ((unsigned long long int)1 << 32)) {
zconf.max_targets = 0xFFFFFFFF;
} else {
zconf.max_targets = v;

0 comments on commit 779424f

Please sign in to comment.