Merge branch 'testing' into be

3 files changed, 15 insertions, 14 deletions

diff --git a/src/tools/ocbr/ocbr.c b/src/tools/ocbr/ocbr.c
index e2bd84af..12983da3 100644
--- a/src/tools/ocbr/ocbr.c
+++ b/src/tools/ocbr/ocbr.c
@@ -60,7 +60,7 @@ struct s {
 static void usage(void)
 {
         printf("Usage: cbr [OPTION]...\n"
-               "Sends SDUs from client to server at a constant bit rate.\n\n"
+               "Sends packets from client to server at a constant bit rate.\n\n"
                "  -l, --listen              Run in server mode\n"
                "\n"
                "Server options:\n"
@@ -70,10 +70,10 @@ static void usage(void)
                "Client options:\n"
                "  -n, --server_apn          Specify the name of the server.\n"
                "  -d, --duration            Duration for sending (s)\n"
-               "  -f, --flood               Send SDUs as fast as possible\n"
-               "  -s, --size                SDU size (B, max %ld B)\n"
+               "  -f, --flood               Send packets as fast as possible\n"
+               "  -s, --size                packet size (B, max %ld B)\n"
                "  -r, --rate                Rate (b/s)\n"
-               "      --sleep               Sleep in between sending SDUs\n"
+               "      --sleep               Sleep in between sending packets\n"
                "\n\n"
                "      --help                Display this help text and exit\n",
                BUF_SIZE);
@@ -82,7 +82,7 @@ static void usage(void)
 int main(int argc, char ** argv)
 {
         int    duration = 60;  /* One minute test */
-        int    size = 1000;    /* 1000 byte SDUs */
+        int    size = 1000;    /* 1000 byte packets */
         long   rate = 1000000; /* 1 Mb/s */
         bool   flood = false;
         bool   sleep = false;
diff --git a/src/tools/ocbr/ocbr_client.c b/src/tools/ocbr/ocbr_client.c
index 026ab001..63b43721 100644
--- a/src/tools/ocbr/ocbr_client.c
+++ b/src/tools/ocbr/ocbr_client.c
@@ -155,7 +155,7 @@ int client_main(char * server,
         ms = ts_diff_ms(&start, &end);
 
         printf("sent statistics: "
-               "%9ld SDUs, %12ld bytes in %9d ms, %4.4f Mb/s\n",
+               "%9ld packets, %12ld bytes in %9d ms, %4.4f Mb/s\n",
                seqnr, seqnr * size, ms, (seqnr / (ms * 1000.0)) * size * 8.0);
 
         flow_dealloc(fd);
diff --git a/src/tools/ocbr/ocbr_server.c b/src/tools/ocbr/ocbr_server.c
index 4f080eff..75983201 100644
--- a/src/tools/ocbr/ocbr_server.c
+++ b/src/tools/ocbr/ocbr_server.c
@@ -90,8 +90,8 @@ static void handle_flow(int fd)
 
         bool stop = false;
 
-        long sdus            = 0;
-        long sdus_intv       = 0;
+        long packets         = 0;
+        long packets_intv    = 0;
         long bytes_read      = 0;
         long bytes_read_intv = 0;
 
@@ -109,7 +109,7 @@ static void handle_flow(int fd)
 
                 if (count > 0) {
                         clock_gettime(CLOCK_REALTIME, &alive);
-                        sdus++;
+                        packets++;
                         bytes_read += count;
                 }
 
@@ -121,17 +121,18 @@ static void handle_flow(int fd)
 
                 if (stop || ts_diff_ms(&now, &iv_end) < 0) {
                         long us = ts_diff_us(&iv_start, &now);
-                        printf("Flow %4d: %9ld SDUs (%12ld bytes) in %9ld ms"
-                               " => %9.4f p/s, %9.4f Mb/s\n",
+                        printf("Flow %4d: %9ld packets (%12ld bytes) in %9ld ms"
+                               " => %9.4f pps, %9.4f Mbps\n",
                                fd,
-                               sdus - sdus_intv,
+                               packets - packets_intv,
                                bytes_read - bytes_read_intv,
                                us / 1000,
-                               ((sdus - sdus_intv) / (double) us) * MILLION,
+                               ((packets - packets_intv) / (double) us)
+                               * MILLION,
                                8 * ((bytes_read - bytes_read_intv)
                                     / (double)(us)));
                         iv_start = iv_end;
-                        sdus_intv = sdus;
+                        packets_intv = packets;
                         bytes_read_intv = bytes_read;
                         ts_add(&iv_start, &intv, &iv_end);
                 }