tinc-gui: Reformat codebase according to PEP8
[tinc] / src / sptps_test.c
index 95bfda8..9452ed1 100644 (file)
@@ -35,6 +35,7 @@ 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; }
 char *logfilename = NULL;
+bool do_detach = false;
 struct timeval now;
 
 static bool verbose;
@@ -271,11 +272,19 @@ int main(int argc, char *argv[]) {
        crypto_init();
 
        FILE *fp = fopen(argv[1], "r");
+       if(!fp) {
+               fprintf(stderr, "Could not open %s: %s\n", argv[1], strerror(errno));
+               return 1;
+       }
        if(!(mykey = ecdsa_read_pem_private_key(fp)))
                return 1;
        fclose(fp);
 
        fp = fopen(argv[2], "r");
+       if(!fp) {
+               fprintf(stderr, "Could not open %s: %s\n", argv[2], strerror(errno));
+               return 1;
+       }
        if(!(hiskey = ecdsa_read_pem_public_key(fp)))
                return 1;
        fclose(fp);
@@ -348,8 +357,19 @@ int main(int argc, char *argv[]) {
                                        fprintf(stderr, "Dropped.\n");
                                continue;
                        }
-                       if(!sptps_receive_data(&s, buf, len) && !datagram)
-                               return 1;
+                       char *bufp = buf;
+                       while(len) {
+                               size_t done = sptps_receive_data(&s, bufp, len);
+                               if(!done) {
+                                       if(!datagram)
+                                               return 1;
+                               } else {
+                                       break;
+                               }
+
+                               bufp += done;
+                               len -= done;
+                       }
                }
        }