updated configuration files

9 files changed, 95 insertions, 38 deletions

diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am
index 79010f06d..3285143aa 100644
--- a/src/ats-tests/Makefile.am
+++ b/src/ats-tests/Makefile.am
@@ -13,13 +13,17 @@ if USE_COVERAGE
 endif
 
 if HAVE_LIBGLPK
-
+ PERF_MLP_BANDWIDTH = perf_ats_mlp_bandwidth
+ PERF_MLP_DELAY = perf_ats_mlp_delay
 endif
 
 if HAVE_TESTING
 TESTING_TESTS = \
  perf_ats_proportional_bandwidth \
- perf_ats_proportional_delay
+ perf_ats_proportional_delay \
+ perf_ats_ril_bandwidth \
+ perf_ats_ril_delay \
+ $(PERF_MLP_BANDWIDTH) $(PERF_MLP_DELAY)
 endif
 
 check_PROGRAMS = \
@@ -44,7 +48,45 @@ perf_ats_proportional_delay_LDADD = \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/core/libgnunetcore.la  
+  
+if HAVE_LIBGLPK
+perf_ats_mlp_bandwidth_SOURCES = \
+  perf_ats.c  
+perf_ats_mlp_bandwidth_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la  
+  
+perf_ats_mlp_delay_SOURCES = \
+  perf_ats.c  
+perf_ats_mlp_delay_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la
+endif
+
+perf_ats_ril_bandwidth_SOURCES = \
+  perf_ats.c  
+perf_ats_ril_bandwidth_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la  
+  
+perf_ats_ril_delay_SOURCES = \
+  perf_ats.c  
+perf_ats_ril_delay_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la
 
 EXTRA_DIST = \
   perf_ats_proportional_bandwidth.conf \
-  perf_ats_proportional_delay.conf
+  perf_ats_proportional_delay.conf \
+  perf_ats_mlp_bandwidth.conf \
+  perf_ats_mlp_delay.conf \
+  perf_ats_ril_bandwidth.conf \
+  perf_ats_ril_delay.conf
diff --git a/src/ats-tests/perf_ats.c b/src/ats-tests/perf_ats.c
index 34334c643..c67933bd2 100644
--- a/src/ats-tests/perf_ats.c
+++ b/src/ats-tests/perf_ats.c
@@ -693,8 +693,6 @@ core_connect_cb (void *cls, const struct GNUNET_PeerIdentity * peer)
   int c;
   int cs;
 
-  id = GNUNET_strdup (GNUNET_i2s (&p->id));
-
   t = find_peer (peer);
   if (NULL == t)
   {
@@ -702,6 +700,7 @@ core_connect_cb (void *cls, const struct GNUNET_PeerIdentity * peer)
         return;
   }
 
+  id = GNUNET_strdup (GNUNET_i2s (&p->id));
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "%s %s connected to %s %s\n",
               (p->master == GNUNET_YES) ? "Master": "Slave",
diff --git a/src/ats-tests/perf_ats_mlp_bandwidth.conf b/src/ats-tests/perf_ats_mlp_bandwidth.conf
new file mode 100644
index 000000000..175521c87
--- /dev/null
+++ b/src/ats-tests/perf_ats_mlp_bandwidth.conf
@@ -0,0 +1,4 @@
+@INLINE@ template_perf_ats.conf
+
+[ats]
+MODE = MLP
\ No newline at end of file
diff --git a/src/ats-tests/perf_ats_mlp_delay.conf b/src/ats-tests/perf_ats_mlp_delay.conf
new file mode 100644
index 000000000..7bdf20182
--- /dev/null
+++ b/src/ats-tests/perf_ats_mlp_delay.conf
@@ -0,0 +1,4 @@
+@INLINE@ template_perf_ats.conf
+
+[ats]
+MODE = MLP
diff --git a/src/ats-tests/perf_ats_proportional_bandwidth.conf b/src/ats-tests/perf_ats_proportional_bandwidth.conf
index d83653d15..dc2f47313 100644
--- a/src/ats-tests/perf_ats_proportional_bandwidth.conf
+++ b/src/ats-tests/perf_ats_proportional_bandwidth.conf
@@ -1,28 +1,4 @@
-[hostlist]
-SERVERS = 
-
-[transport-udp]
-BROADCAST = NO
-
-[peerinfo]
-USE_INCLUDED_HELLOS = NO
+@INLINE@ template_perf_ats.conf
 
 [ats]
-# Network specific inbound/outbound quotas
-UNSPECIFIED_QUOTA_IN = 128 KiB
-UNSPECIFIED_QUOTA_OUT = 128 KiB
-# LOOPBACK
-LOOPBACK_QUOTA_IN = 128 KiB
-LOOPBACK_QUOTA_OUT = 128 KiB
-# LAN
-LAN_QUOTA_IN = 128 KiB
-LAN_QUOTA_OUT = 128 KiB
-# WAN
-WAN_QUOTA_IN = 128 KiB
-WAN_QUOTA_OUT = 128 KiB
-# WLAN
-WLAN_QUOTA_IN = 128 KiB
-WLAN_QUOTA_OUT = 128 KiB
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = 128 KiB
-BLUETOOTH_QUOTA_OUT = 128 KiB
\ No newline at end of file
+MODE = PROPORTIONAL
diff --git a/src/ats-tests/perf_ats_proportional_delay.conf b/src/ats-tests/perf_ats_proportional_delay.conf
index a5127d25f..dc2f47313 100644
--- a/src/ats-tests/perf_ats_proportional_delay.conf
+++ b/src/ats-tests/perf_ats_proportional_delay.conf
@@ -1,8 +1,4 @@
-[hostlist]
-SERVERS = 
+@INLINE@ template_perf_ats.conf
 
-[transport-udp]
-BROADCAST = NO
-
-[peerinfo]
-USE_INCLUDED_HELLOS = NO
+[ats]
+MODE = PROPORTIONAL
diff --git a/src/ats-tests/perf_ats_ril_bandwidth.conf b/src/ats-tests/perf_ats_ril_bandwidth.conf
new file mode 100644
index 000000000..14eb9f68d
--- /dev/null
+++ b/src/ats-tests/perf_ats_ril_bandwidth.conf
@@ -0,0 +1,4 @@
+@INLINE@ template_perf_ats.conf
+
+[ats]
+MODE = RIL
\ No newline at end of file
diff --git a/src/ats-tests/perf_ats_ril_delay.conf b/src/ats-tests/perf_ats_ril_delay.conf
new file mode 100644
index 000000000..40336a90d
--- /dev/null
+++ b/src/ats-tests/perf_ats_ril_delay.conf
@@ -0,0 +1,4 @@
+@INLINE@ template_perf_ats.conf
+
+[ats]
+MODE = RIL
diff --git a/src/ats-tests/template_perf_ats.conf b/src/ats-tests/template_perf_ats.conf
new file mode 100644
index 000000000..d83653d15
--- /dev/null
+++ b/src/ats-tests/template_perf_ats.conf
@@ -0,0 +1,28 @@
+[hostlist]
+SERVERS = 
+
+[transport-udp]
+BROADCAST = NO
+
+[peerinfo]
+USE_INCLUDED_HELLOS = NO
+
+[ats]
+# Network specific inbound/outbound quotas
+UNSPECIFIED_QUOTA_IN = 128 KiB
+UNSPECIFIED_QUOTA_OUT = 128 KiB
+# LOOPBACK
+LOOPBACK_QUOTA_IN = 128 KiB
+LOOPBACK_QUOTA_OUT = 128 KiB
+# LAN
+LAN_QUOTA_IN = 128 KiB
+LAN_QUOTA_OUT = 128 KiB
+# WAN
+WAN_QUOTA_IN = 128 KiB
+WAN_QUOTA_OUT = 128 KiB
+# WLAN
+WLAN_QUOTA_IN = 128 KiB
+WLAN_QUOTA_OUT = 128 KiB
+# BLUETOOTH
+BLUETOOTH_QUOTA_IN = 128 KiB
+BLUETOOTH_QUOTA_OUT = 128 KiB
\ No newline at end of file