undo opaque=fopaque changes; make test script more flexible

diff --git a/Demo/rpc/test b/Demo/rpc/test
index d3c9591b7022f2f0dd16694d2c051bac0b8e2665..ba220f24a216166806983d5096aaaddd100e4bec 100755 (executable)
--- a/Demo/rpc/test
+++ b/Demo/rpc/test
@@ -1,15 +1,16 @@
 : ${PYTHON=python}
+: ${SERVER=charon.cwi.nl}
 
 set -xe
 
 $PYTHON -c 'from rpc import test; test()'
-$PYTHON -c 'from rpc import test; test()' charon.cwi.nl
+$PYTHON -c 'from rpc import test; test()' ${SERVER}
 
 $PYTHON -c 'from rpc import testsvr; testsvr()' &
-SVR=$!
+PID=$!
 sleep 2
 $PYTHON -c 'from rpc import testclt; testclt()'
-kill -2 $SVR
+kill -2 $PID
 
 $PYTHON -c 'from mountclient import test; test()'
 $PYTHON -c 'from mountclient import test; test()' gatekeeper.dec.com

diff --git a/Demo/rpc/xdr.py b/Demo/rpc/xdr.py
index 109d2f94680c1f66d0be177e2454da3400818a33..43abcee5a41998f62c276d065099f6da6ad42337 100644 (file)
--- a/Demo/rpc/xdr.py
+++ b/Demo/rpc/xdr.py
@@ -69,7 +69,7 @@ class Packer:
                self.pack_uint(n)
                self.pack_fstring(n, s)
 
-       pack_opaque = pack_fopaque
+       pack_opaque = pack_string
 
        def pack_list(self, list, pack_item):
                for item in list:
@@ -176,7 +176,7 @@ class Unpacker:
                n = self.unpack_uint()
                return self.unpack_fstring(n)
 
-       unpack_opaque = unpack_fopaque
+       unpack_opaque = unpack_string
 
        def unpack_list(self, unpack_item):
                list = []