[GNUnet-SVN] r8943 - GNUnet/src/applications/testing

[gnunet]

Author: nevans
Date: 2009-09-04 16:33:21 -0600 (Fri, 04 Sep 2009)
New Revision: 8943

Modified:
   GNUnet/src/applications/testing/remote.c
Log:
more configuration options

Modified: GNUnet/src/applications/testing/remote.c
===================================================================
--- GNUnet/src/applications/testing/remote.c    2009-09-04 14:23:41 UTC (rev 
8942)
+++ GNUnet/src/applications/testing/remote.c    2009-09-04 22:33:21 UTC (rev 
8943)
@@ -346,6 +346,7 @@
   unsigned long long malicious_putters;
   unsigned long long malicious_put_frequency;
   unsigned long long malicious_droppers;
+  unsigned long long maxnetbps;
 
   unsigned long long extra_daemons;
   unsigned int count;
@@ -414,7 +415,7 @@
                                             "PERCENTAGE", "1.0",
                                             &percentage_string);
   percentage = atof (percentage_string);
-  if (strcmp(percentage_string, "") != 0)
+  if (strcmp (percentage_string, "") != 0)
     percentage = atof (percentage_string);
   else
     percentage = 1.0;
@@ -423,7 +424,7 @@
                                             "LOGNMODIFIER", "1.0",
                                             &logNModifier_string);
 
-  if (strcmp(logNModifier_string, "") != 0)
+  if (strcmp (logNModifier_string, "") != 0)
     logNModifier = atof (logNModifier_string);
   else
     logNModifier = 1.0;
@@ -461,6 +462,10 @@
                                             1, -1, 2, &port_increment);
 
   GNUNET_GC_get_configuration_value_number (newcfg, "MULTIPLE_SERVER_TESTING",
+                                            "MAXNETBPS",
+                                            1, -1, 50000000, &maxnetbps);
+
+  GNUNET_GC_get_configuration_value_number (newcfg, "MULTIPLE_SERVER_TESTING",
                                             "MYSQL_PORT",
                                             1, -1, 3306, &mysql_port);
 
@@ -559,6 +564,13 @@
       GNUNET_GC_set_configuration_value_number (basecfg, NULL,
                                                 "MULTIPLE_SERVER_TESTING",
                                                 "MYSQL_PORT", mysql_port);
+      GNUNET_GC_set_configuration_value_number (basecfg, NULL,
+                                                "LOAD",
+                                                "MAXNETDOWNBPSTOTAL",
+                                                maxnetbps);
+      GNUNET_GC_set_configuration_value_number (basecfg, NULL, "LOAD",
+                                                "MAXNETUPBPSTOTAL",
+                                                maxnetbps);
 
       while (hostnames[pos] != ' ' && pos > 0)
         pos--;
@@ -920,6 +932,13 @@
                                                         
"MULTIPLE_SERVER_TESTING",
                                                         "MYSQL_PORT",
                                                         mysql_port);
+              GNUNET_GC_set_configuration_value_number (basecfg, NULL,
+                                                        "LOAD",
+                                                        "MAXNETDOWNBPSTOTAL",
+                                                        maxnetbps);
+              GNUNET_GC_set_configuration_value_number (basecfg, NULL, "LOAD",
+                                                        "MAXNETUPBPSTOTAL",
+                                                        maxnetbps);
               length_temp =
                 snprintf (NULL, 0, "%s%s%d", remote_pid_path, "pid", j + 1);
               temp_pid_file = GNUNET_malloc (length_temp + 1);