Use qualified stream tag when expecting stream close.

4 files changed, 8 insertions, 4 deletions

diff --git a/input b/input
index 5effb70..2d508fe 100644
--- a/input
+++ b/input
@@ -26,4 +26,4 @@
   </bind>
 </iq>
 <iq from='test0@localhost' to='test0@localhost/xmpt' id='session' type='result'/>
-</stream>
+</stream:stream>
diff --git a/xml/signout.expected.xml b/xml/signout.expected.xml
index 522b4a3..4ae4038 100644
--- a/xml/signout.expected.xml
+++ b/xml/signout.expected.xml
@@ -1 +1 @@
-</stream>
+</{stream}>
diff --git a/xml/signout.xml b/xml/signout.xml
index 522b4a3..34e306d 100644
--- a/xml/signout.xml
+++ b/xml/signout.xml
@@ -1 +1 @@
-</stream>
+</stream:stream>
diff --git a/xmpt b/xmpt
index bae4eee..37af263 100755
--- a/xmpt
+++ b/xmpt
@@ -245,7 +245,7 @@ sub assert_arg {
 
 # Stick actual execution in its own package so you don't accidentally
 # clobber stuff in main while running templates.
-package evalpkg;
+package evalpkg; # TODO: Make package name dynamic.
 
 use MIME::Base64;
 
@@ -277,3 +277,7 @@ sub resourcepart() {
 sub plain_auth() {
   MIME::Base64::encode(join("\0", "", bare_jid(), $env{password}));
 }
+
+sub stream() {
+  main::assert_arg('stream', 'stream:stream');
+}