Reformat all code using astyle.

[tinc] / src / sptps_speed.c

diff --git a/src/sptps_speed.c b/src/sptps_speed.c
index ef97be7..db7314e 100644 (file)
--- a/src/sptps_speed.c
+++ b/src/sptps_speed.c
@@ -29,9 +29,13 @@
 #include "sptps.h"
 
 // Symbols necessary to link with logger.o
-bool send_request(void *c, const char *msg, ...) { return false; }
+bool send_request(void *c, const char *msg, ...) {
+       return false;
+}
 struct list_t *connection_list = NULL;
-bool send_meta(void *c, const char *msg , int len) { return false; }
+bool send_meta(void *c, const char *msg, int len) {
+       return false;
+}
 char *logfilename = NULL;
 bool do_detach = false;
 struct timeval now;
@@ -50,10 +54,14 @@ static void receive_data(sptps_t *sptps) {
        char buf[4096], *bufp = buf;
        int fd = *(int *)sptps->handle;
        size_t len = recv(fd, buf, sizeof(buf), 0);
+
        while(len) {
                size_t done = sptps_receive_data(sptps, bufp, len);
-               if(!done)
+
+               if(!done) {
                        abort();
+               }
+
                bufp += done;
                len -= done;
        }
@@ -73,8 +81,10 @@ static void clock_start() {
 static bool clock_countto(double seconds) {
        clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &end);
        elapsed = end.tv_sec + end.tv_nsec * 1e-9 - start.tv_sec - start.tv_nsec * 1e-9;
-       if(elapsed < seconds)
+
+       if(elapsed < seconds) {
                return ++count;
+       }
 
        rate = count / elapsed;
        return false;
@@ -96,8 +106,11 @@ int main(int argc, char *argv[]) {
        // Key generation
 
        fprintf(stderr, "Generating keys for %lg seconds: ", duration);
-       for(clock_start(); clock_countto(duration);)
+
+       for(clock_start(); clock_countto(duration);) {
                ecdsa_free(ecdsa_generate());
+       }
+
        fprintf(stderr, "%17.2lf op/s\n", rate);
 
        key1 = ecdsa_generate();
@@ -106,34 +119,46 @@ int main(int argc, char *argv[]) {
        // Ed25519 signatures
 
        fprintf(stderr, "Ed25519 sign for %lg seconds: ", duration);
+
        for(clock_start(); clock_countto(duration);)
-               if(!ecdsa_sign(key1, buf1, 256, buf2))
+               if(!ecdsa_sign(key1, buf1, 256, buf2)) {
                        return 1;
+               }
+
        fprintf(stderr, "%20.2lf op/s\n", rate);
 
        fprintf(stderr, "Ed25519 verify for %lg seconds: ", duration);
+
        for(clock_start(); clock_countto(duration);)
                if(!ecdsa_verify(key1, buf1, 256, buf2)) {
                        fprintf(stderr, "Signature verification failed\n");
                        return 1;
                }
+
        fprintf(stderr, "%18.2lf op/s\n", rate);
 
        ecdh1 = ecdh_generate_public(buf1);
        fprintf(stderr, "ECDH for %lg seconds: ", duration);
+
        for(clock_start(); clock_countto(duration);) {
                ecdh2 = ecdh_generate_public(buf2);
-               if(!ecdh2)
+
+               if(!ecdh2) {
                        return 1;
-               if(!ecdh_compute_shared(ecdh2, buf1, buf3))
+               }
+
+               if(!ecdh_compute_shared(ecdh2, buf1, buf3)) {
                        return 1;
+               }
        }
+
        fprintf(stderr, "%28.2lf op/s\n", rate);
        ecdh_free(ecdh1);
 
        // SPTPS authentication phase
 
        int fd[2];
+
        if(socketpair(AF_UNIX, SOCK_STREAM, 0, fd)) {
                fprintf(stderr, "Could not create a UNIX socket pair: %s\n", sockstrerror(sockerrno));
                return 1;
@@ -142,43 +167,62 @@ int main(int argc, char *argv[]) {
        struct pollfd pfd[2] = {{fd[0], POLLIN}, {fd[1], POLLIN}};
 
        fprintf(stderr, "SPTPS/TCP authenticate for %lg seconds: ", duration);
+
        for(clock_start(); clock_countto(duration);) {
                sptps_start(&sptps1, fd + 0, true, false, key1, key2, "sptps_speed", 11, send_data, receive_record);
                sptps_start(&sptps2, fd + 1, false, false, key2, key1, "sptps_speed", 11, send_data, receive_record);
+
                while(poll(pfd, 2, 0)) {
-                       if(pfd[0].revents)
+                       if(pfd[0].revents) {
                                receive_data(&sptps1);
-                       if(pfd[1].revents)
+                       }
+
+                       if(pfd[1].revents) {
                                receive_data(&sptps2);
+                       }
                }
+
                sptps_stop(&sptps1);
                sptps_stop(&sptps2);
        }
+
        fprintf(stderr, "%10.2lf op/s\n", rate * 2);
 
        // SPTPS data
 
        sptps_start(&sptps1, fd + 0, true, false, key1, key2, "sptps_speed", 11, send_data, receive_record);
        sptps_start(&sptps2, fd + 1, false, false, key2, key1, "sptps_speed", 11, send_data, receive_record);
+
        while(poll(pfd, 2, 0)) {
-               if(pfd[0].revents)
+               if(pfd[0].revents) {
                        receive_data(&sptps1);
-               if(pfd[1].revents)
+               }
+
+               if(pfd[1].revents) {
                        receive_data(&sptps2);
+               }
        }
+
        fprintf(stderr, "SPTPS/TCP transmit for %lg seconds: ", duration);
+
        for(clock_start(); clock_countto(duration);) {
-               if(!sptps_send_record(&sptps1, 0, buf1, 1451))
+               if(!sptps_send_record(&sptps1, 0, buf1, 1451)) {
                        abort();
+               }
+
                receive_data(&sptps2);
        }
+
        rate *= 2 * 1451 * 8;
-       if(rate > 1e9)
+
+       if(rate > 1e9) {
                fprintf(stderr, "%14.2lf Gbit/s\n", rate / 1e9);
-       else if(rate > 1e6)
+       } else if(rate > 1e6) {
                fprintf(stderr, "%14.2lf Mbit/s\n", rate / 1e6);
-       else if(rate > 1e3)
+       } else if(rate > 1e3) {
                fprintf(stderr, "%14.2lf kbit/s\n", rate / 1e3);
+       }
+
        sptps_stop(&sptps1);
        sptps_stop(&sptps2);
 
@@ -193,43 +237,62 @@ int main(int argc, char *argv[]) {
        }
 
        fprintf(stderr, "SPTPS/UDP authenticate for %lg seconds: ", duration);
+
        for(clock_start(); clock_countto(duration);) {
                sptps_start(&sptps1, fd + 0, true, true, key1, key2, "sptps_speed", 11, send_data, receive_record);
                sptps_start(&sptps2, fd + 1, false, true, key2, key1, "sptps_speed", 11, send_data, receive_record);
+
                while(poll(pfd, 2, 0)) {
-                       if(pfd[0].revents)
+                       if(pfd[0].revents) {
                                receive_data(&sptps1);
-                       if(pfd[1].revents)
+                       }
+
+                       if(pfd[1].revents) {
                                receive_data(&sptps2);
+                       }
                }
+
                sptps_stop(&sptps1);
                sptps_stop(&sptps2);
        }
+
        fprintf(stderr, "%10.2lf op/s\n", rate * 2);
 
        // SPTPS datagram data
 
        sptps_start(&sptps1, fd + 0, true, true, key1, key2, "sptps_speed", 11, send_data, receive_record);
        sptps_start(&sptps2, fd + 1, false, true, key2, key1, "sptps_speed", 11, send_data, receive_record);
+
        while(poll(pfd, 2, 0)) {
-               if(pfd[0].revents)
+               if(pfd[0].revents) {
                        receive_data(&sptps1);
-               if(pfd[1].revents)
+               }
+
+               if(pfd[1].revents) {
                        receive_data(&sptps2);
+               }
        }
+
        fprintf(stderr, "SPTPS/UDP transmit for %lg seconds: ", duration);
+
        for(clock_start(); clock_countto(duration);) {
-               if(!sptps_send_record(&sptps1, 0, buf1, 1451))
+               if(!sptps_send_record(&sptps1, 0, buf1, 1451)) {
                        abort();
+               }
+
                receive_data(&sptps2);
        }
+
        rate *= 2 * 1451 * 8;
-       if(rate > 1e9)
+
+       if(rate > 1e9) {
                fprintf(stderr, "%14.2lf Gbit/s\n", rate / 1e9);
-       else if(rate > 1e6)
+       } else if(rate > 1e6) {
                fprintf(stderr, "%14.2lf Mbit/s\n", rate / 1e6);
-       else if(rate > 1e3)
+       } else if(rate > 1e3) {
                fprintf(stderr, "%14.2lf kbit/s\n", rate / 1e3);
+       }
+
        sptps_stop(&sptps1);
        sptps_stop(&sptps2);