fwpmngr displays budgets in bytes

diff --git a/fwp/mngr/fwp_admctrl.c b/fwp/mngr/fwp_admctrl.c
index d42ea1b0ebbec34e9220806d22c511e22204c258..889f845d1bc757cf5758ff1d8150bef2e3b36804 100644 (file)
--- a/fwp/mngr/fwp_admctrl.c
+++ b/fwp/mngr/fwp_admctrl.c
@@ -168,13 +168,13 @@ int fwp_admctrl_utilization(struct fres_sa_scenario *scenario, void *priv,
                fres_contract_id_to_string(id, &c->contract->id, sizeof(id));
                basic = fres_contract_get_basic(c->contract);
 
-               printf("  processing: id=%s, period=%ld ms, budget=%ld ms\n",
+               frsh_network_budget_to_bytes(FRSH_NETPF_FWP,&basic->budget,&bytes);
+               printf("  processing: id=%s, period=%ld ms, budget=%lu bytes\n",
                       id,
                       fosa_rel_time_to_msec(basic->period),
-                      fosa_rel_time_to_msec(basic->budget));
+                      (long unsigned int)bytes);
 
                /* Calculate protocol overhead */
-               frsh_network_budget_to_bytes(FRSH_NETPF_FWP,&basic->budget,&bytes);
                fragments = (bytes + MTU - 1) / MTU;
 
                if (fragments == 0)

diff --git a/fwp/mngr/fwp_mngr.c b/fwp/mngr/fwp_mngr.c
index 02925dd889f2db9e99c4a0169e8237e3b3bc7d87..0261c34bbb7f39197cb27fd1e7a7d1903da918c2 100644 (file)
--- a/fwp/mngr/fwp_mngr.c
+++ b/fwp/mngr/fwp_mngr.c
@@ -54,6 +54,7 @@
 #include <stdio.h>
 #include "fwp_admctrl.h"
 
+static
 int dummy_admission_test(struct fres_sa_scenario *scenario, void *priv, 
                                bool *schedulable)
 {