From afd8f6736c46a79b5f743ae0a5ce310e36705566 Mon Sep 17 00:00:00 2001
From: thierry <thierry.rakotoarivelo@nicta.com.au>
Date: Tue, 17 Mar 2015 17:06:18 +1100
Subject: [PATCH] Updated app defs

---
 gec22_demo/shaper.oedl  | 16 ++++++++++++++++
 gec22_demo/vlc-oml.oedl | 37 +++++++++++++++++++------------------
 2 files changed, 35 insertions(+), 18 deletions(-)
 create mode 100644 gec22_demo/shaper.oedl

diff --git a/gec22_demo/shaper.oedl b/gec22_demo/shaper.oedl
new file mode 100644
index 0000000..5651f6a
--- /dev/null
+++ b/gec22_demo/shaper.oedl
@@ -0,0 +1,16 @@
+# Copyright (c) 2015 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
+# This is the OMF6 Application Definition for a simple basic fix traffic shaper
+
+defApplication('shaper') do |app|
+  app.quiet = true
+  app.silent = true
+  app.binary_path = "/sbin/tc qdisc del dev eth0 root ; "+
+    "/sbin/tc qdisc add dev eth0 root handle 1: cbq avpkt 1000 bandwidth 1mbit ; "+
+    "/sbin/tc class add dev eth0 parent 1: classid 1:1 cbq rate 100kbit allot 1500 prio 5 bounded isolated ; "+
+    "/sbin/tc filter add dev eth0  parent 1: protocol ip prio 16 u32 match ip dst 192.86.139.71 flowid 1:1 ; "+
+    "/sbin/tc filter add dev eth0  parent 1: protocol ip prio 16 u32 match ip src 192.86.139.71 flowid 1:1 ; "
+end
\ No newline at end of file
diff --git a/gec22_demo/vlc-oml.oedl b/gec22_demo/vlc-oml.oedl
index 605ee41..76683d8 100644
--- a/gec22_demo/vlc-oml.oedl
+++ b/gec22_demo/vlc-oml.oedl
@@ -4,7 +4,7 @@
 # By downloading or using this software you accept the terms and the liability disclaimer in the License.
 
 # This is the OMF6 Application Definition for the OML-Instrumented VLC app,
-# which was contributed by NYPoly [1]. The OML Measurement Point described in 
+# which was contributed by NYPoly [1]. The OML Measurement Point described in
 # this app definition are the ones defined in the header file of the source code
 # available at [1].
 #
@@ -18,32 +18,33 @@
 
 defApplication('vlc') do |app|
   app.quiet = true
+  app.silent = true
   app.binary_path = "/usr/bin/vlc"
-  app.description = "OML-Instrumented VLC multimedia player and streamer" 
+  app.description = "OML-Instrumented VLC multimedia player and streamer"
   app.defProperty(
-    "input", 
-    "Stream input (e.g. file or network address)", 
-    "", 
+    "input",
+    "Stream input (e.g. file or network address)",
+    "",
     :type => :string, :dynamic => false)
   app.defProperty(
-    "enable_classic_measurement", 
-    "Set to true to enable classic VLC Measurement, otherwise enable the DASH-specific VLC stats (default: false). Both cannot run at the same time http://witestlab.poly.edu/repos/omlapps/vlc/README.txt", 
-    "--extraintf omlstats", 
+    "enable_classic_measurement",
+    "Set to true to enable classic VLC Measurement, otherwise enable the DASH-specific VLC stats (default: false). Both cannot run at the same time http://witestlab.poly.edu/repos/omlapps/vlc/README.txt",
+    "--extraintf omlstats",
     :type => :boolean, :dynamic => false, :mandatory => true, :default => false)
   app.defProperty(
-    "mintf", 
-    "The main interface used by VLC", 
-    "-I", 
+    "mintf",
+    "The main interface used by VLC",
+    "-I",
     :type => :string, :dynamic => false, :mandatory => true, :default => 'dummy')
   app.defProperty(
-    "vintf", 
-    "The video output method used by VLC", 
-    "-V", 
+    "vintf",
+    "The video output method used by VLC",
+    "-V",
     :type => :string, :dynamic => false, :mandatory => true, :default => 'dummy')
    app.defProperty(
-    "quiet", 
-    "Remove all outputs on standard out", 
-    "-q", 
+    "quiet",
+    "Remove all outputs on standard out",
+    "-q",
     :type => :boolean, :dynamic => false, :default => false)
 
 
@@ -81,7 +82,7 @@ defApplication('vlc') do |app|
     mp.defMetric('decisionRate_bps',:int)
     mp.defMetric('buffer_percent',:int)
   end
-  
+
   app.defMeasurement('dashDlSession') do |mp|
     mp.defMetric('chunkCount',:int)
     mp.defMetric('readSession_B',:int)