Fix buffer resizing logic in buffer_put_at().

[utcp] / test.c

diff --git a/test.c b/test.c
index 3491e296c9a558a6b587d63cec23702f65ec4b21..81244f90027819f5a456027c390f5a48ecd5a1ac 100644 (file)
--- a/test.c
+++ b/test.c
@@ -25,7 +25,7 @@ long outpktno;
 long dropfrom;
 long dropto;
 double reorder;
-long reorder_dist;
+long reorder_dist = 10;
 double dropin;
 double dropout;
 long total_out;
@@ -35,6 +35,7 @@ char *reorder_data;
 size_t reorder_len;
 int reorder_countdown;
 
+#if UTCP_DEBUG
 void debug(const char *format, ...) {
        struct timeval now;
        gettimeofday(&now, NULL);
@@ -44,6 +45,9 @@ void debug(const char *format, ...) {
        vfprintf(stderr, format, ap);
        va_end(ap);
 }
+#else
+#define debug(...)
+#endif
 
 ssize_t do_recv(struct utcp_connection *c, const void *data, size_t len) {
        if(!data || !len) {
@@ -69,8 +73,10 @@ ssize_t do_send(struct utcp *utcp, const void *data, size_t len) {
        int s = *(int *)utcp->priv;
        outpktno++;
        if(outpktno >= dropfrom && outpktno < dropto) {
-               if(drand48() < dropout)
+               if(drand48() < dropout) {
+                       debug("Dropped outgoing packet\n");
                        return len;
+               }
                if(!reorder_data && drand48() < reorder) {
                        reorder_data = malloc(len);
                        if(!reorder_data) {
@@ -110,12 +116,12 @@ int main(int argc, char *argv[]) {
        bool server = argc == 2;
        bool connected = false;
 
-       dropin = atof(getenv("DROPIN") ?: "0");
-       dropout = atof(getenv("DROPOUT") ?: "0");
-       dropfrom = atoi(getenv("DROPFROM") ?: "0");
-       dropto = atoi(getenv("DROPTO") ?: "0");
-       reorder = atof(getenv("REORDER") ?: "0");
-       reorder_dist = atoi(getenv("REORDER_DIST") ?: "10");
+       if(getenv("DROPIN")) dropin = atof(getenv("DROPIN"));
+       if(getenv("DROPOUT")) dropout = atof(getenv("DROPOUT"));
+       if(getenv("DROPFROM")) dropfrom = atoi(getenv("DROPFROM"));
+       if(getenv("DROPTO")) dropto = atoi(getenv("DROPTO"));
+       if(getenv("REORDER")) reorder = atof(getenv("REORDER"));
+       if(getenv("REORDER_DIST")) reorder_dist = atoi(getenv("REORDER_DIST"));
 
        if(dropto < dropfrom)
                dropto = 1 << 30;
@@ -213,7 +219,10 @@ int main(int argc, char *argv[]) {
                        inpktno++;
                        if(inpktno >= dropto || inpktno < dropfrom || drand48() >= dropin) {
                                total_in += len;
-                               utcp_recv(u, buf, len);
+                               if(utcp_recv(u, buf, len) == -1)
+                                       debug("Error receiving UTCP packet: %s\n", strerror(errno));
+                       } else {
+                               debug("Dropped incoming packet\n");
                        }
                }