From: Sapan Bhatia <gwsapan@gmail.com>
Date: Fri, 13 Jan 2012 22:36:48 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/vsys-scripts
X-Git-Tag: vsys-scripts-0.95-34~1
X-Git-Url: http://git.onelab.eu/?p=vsys-scripts.git;a=commitdiff_plain;h=2b4f689052d9c9e987bce3b9c44382f9b67b78bd;hp=4eaf0341fb09e263f13b0e05cd5ebd454146127f

Merge branch 'master' of ssh://git.planet-lab.org/git/vsys-scripts
---

diff --git a/exec/connectswitch b/exec/connectswitch
index fb15ee3..b61e186 100755
--- a/exec/connectswitch
+++ b/exec/connectswitch
@@ -21,7 +21,9 @@ arglines = map(string.strip, sys.stdin.readlines())
 if len(arglines) != 1: sys.exit(1)
 of_server = arglines[0]
 
-if re.match(r'^(tcp|udp):[\d\.]+$', vif) is None: exit(1)
+if re.match(r'^(tcp|udp):[\d\.]+$', of_server) is None:
+    print "Address '%s' is invalid; should look like 'tcp:10.0.5.6'" % of_server
+    exit(1)
 
 print "Requesting creation of data path %s."%dpname
-os.system("ovs-openflowd dp0 tcp:192.168.1.2")
+os.system("ovs-openflowd %s %s" % (dpname, of_server))
diff --git a/vsys-scripts.spec b/vsys-scripts.spec
index 5e74480..e1c31b0 100644
--- a/vsys-scripts.spec
+++ b/vsys-scripts.spec
@@ -8,7 +8,7 @@
 
 %define name vsys-scripts
 %define version 0.95
-%define taglevel 32
+%define taglevel 33
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 
 %changelog
+* Mon Oct 24 2011 Sapan Bhatia <sapanb@cs.princeton.edu> - vsys-scripts-0.95-33
+- Build fd_netlink, a new script that lets slices stream packet headers
+
 * Mon Oct 03 2011 Sapan Bhatia <sapanb@cs.princeton.edu> - vsys-scripts-0.95-32
 - New script for slices to stream the headers of all packets going out of a node.