summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@intec.ugent.be>2016-12-03 14:50:45 +0100
committerdimitri staessens <dimitri.staessens@intec.ugent.be>2016-12-03 14:50:45 +0100
commit0334843d9f0a73f613e1dd20e30e6f3333d12d62 (patch)
tree612b48f6f713c9447c15d6e43c8fe85175823c1d /src
parentef2e50b94fbc7ce1c7dbe1f2ea860e6ab0724726 (diff)
downloadouroboros-0334843d9f0a73f613e1dd20e30e6f3333d12d62.tar.gz
ouroboros-0334843d9f0a73f613e1dd20e30e6f3333d12d62.zip
ipcpd, tools: Fix compilation on 32 bit linux
Fixes issues with uint64_t not corresponding with unsigned long in printf statements. Reorganises a calculation to reduce overflows.
Diffstat (limited to 'src')
-rw-r--r--src/ipcpd/normal/ribmgr.c2
-rw-r--r--src/tools/cbr/cbr_server.c4
-rw-r--r--src/tools/operf/operf.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/ipcpd/normal/ribmgr.c b/src/ipcpd/normal/ribmgr.c
index 127eb9f2..02cbbbfd 100644
--- a/src/ipcpd/normal/ribmgr.c
+++ b/src/ipcpd/normal/ribmgr.c
@@ -1365,7 +1365,7 @@ int ribmgr_start_policies(void)
}
rib.address = rib.addr_auth->address();
- LOG_DBG("IPCP has address %lu", rib.address);
+ LOG_DBG("IPCP has address %lu", (unsigned long) rib.address);
return 0;
}
diff --git a/src/tools/cbr/cbr_server.c b/src/tools/cbr/cbr_server.c
index 52c2aa73..d4826e03 100644
--- a/src/tools/cbr/cbr_server.c
+++ b/src/tools/cbr/cbr_server.c
@@ -113,8 +113,8 @@ void handle_flow(int fd)
bytes_read - bytes_read_intv,
us / 1000,
((sdus - sdus_intv) / (double) us) * MILLION,
- 8 * (bytes_read - bytes_read_intv)
- / (double)(us));
+ 8 * ((bytes_read - bytes_read_intv)
+ / (double)(us)));
iv_start = iv_end;
sdus_intv = sdus;
bytes_read_intv = bytes_read;
diff --git a/src/tools/operf/operf.c b/src/tools/operf/operf.c
index 808a8807..bc7ade3a 100644
--- a/src/tools/operf/operf.c
+++ b/src/tools/operf/operf.c
@@ -44,8 +44,8 @@ struct c {
bool sleep;
int duration;
- uint64_t sent;
- uint64_t rcvd;
+ unsigned long sent;
+ unsigned long rcvd;
flow_set_t * flows;
fqueue_t * fq;