From 25c761202ee20d00a3b9fabb6d79e8ba18fe1819 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sun, 28 Oct 2018 13:36:41 +0100
Subject: [PATCH] Announce base:1.0 capability (because we support only legacy
 framing system).(@SCadilhac) No quotes around revision value. (@SCadilhac)
 Removed '42+' session id. See https://github.com/clicon/clixon/issues/39

---
 apps/netconf/netconf_hello.c | 6 +++---
 test/test_netconf.sh         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/netconf/netconf_hello.c b/apps/netconf/netconf_hello.c
index eb57ab958..1be1211c6 100644
--- a/apps/netconf/netconf_hello.c
+++ b/apps/netconf/netconf_hello.c
@@ -163,8 +163,8 @@ netconf_create_hello(clicon_handle h,
     add_preamble(cb);
     cprintf(cb, "<hello xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">");
     cprintf(cb, "<capabilities>");
-        cprintf(cb, "<capability>urn:ietf:params:netconf:base:1.1</capability>");
-    if (xml_chardata_encode(&encstr, "urn:ietf:params:netconf:capability:yang-library:1.0?revision=\"%s\"&module-set-id=%s",
+        cprintf(cb, "<capability>urn:ietf:params:netconf:base:1.0</capability>");
+    if (xml_chardata_encode(&encstr, "urn:ietf:params:netconf:capability:yang-library:1.0?revision=%s&module-set-id=%s",
 			    ietf_yang_library_revision,
 			    module_set_id) < 0)
 	goto done;
@@ -175,7 +175,7 @@ netconf_create_hello(clicon_handle h,
     cprintf(cb, "<capability>urn:ietf:params:netconf:capability:xpath:1.0</capability>");
     cprintf(cb, "<capability>urn:ietf:params:netconf:capability:notification:1.0</capability>");
     cprintf(cb, "</capabilities>");
-    cprintf(cb, "<session-id>%lu</session-id>", (long unsigned int)42+session_id);
+    cprintf(cb, "<session-id>%lu</session-id>", (long unsigned int)session_id);
     cprintf(cb, "</hello>");
     add_postamble(cb);
     retval = 0;
diff --git a/test/test_netconf.sh b/test/test_netconf.sh
index a4009b4c1..de312f689 100755
--- a/test/test_netconf.sh
+++ b/test/test_netconf.sh
@@ -98,7 +98,7 @@ if [ $? -ne 0 ]; then
 fi
 
 new "netconf hello"
-expecteof "$clixon_netconf -f $cfg -y $fyang" 0 '<rpc message-id="101"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<hello xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><capabilities><capability>urn:ietf:params:netconf:base:1.1</capability><capability>urn:ietf:params:netconf:capability:yang-library:1.0?revision="2016-06-21"&amp; module-set-id=42</capability><capability>urn:ietf:params:netconf:capability:candidate:1:0</capability><capability>urn:ietf:params:netconf:capability:validate:1.1</capability><capability>urn:ietf:params:netconf:capability:startup:1.0</capability><capability>urn:ietf:params:netconf:capability:xpath:1.0</capability><capability>urn:ietf:params:netconf:capability:notification:1.0</capability></capabilities><session-id>[0-9]*</session-id></hello>]]>]]><rpc-reply message-id="101"><data/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -f $cfg -y $fyang" 0 '<rpc message-id="101"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<hello xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><capabilities><capability>urn:ietf:params:netconf:base:1.0</capability><capability>urn:ietf:params:netconf:capability:yang-library:1.0?revision=2016-06-21&amp; module-set-id=42</capability><capability>urn:ietf:params:netconf:capability:candidate:1:0</capability><capability>urn:ietf:params:netconf:capability:validate:1.1</capability><capability>urn:ietf:params:netconf:capability:startup:1.0</capability><capability>urn:ietf:params:netconf:capability:xpath:1.0</capability><capability>urn:ietf:params:netconf:capability:notification:1.0</capability></capabilities><session-id>[0-9]*</session-id></hello>]]>]]><rpc-reply message-id="101"><data/></rpc-reply>]]>]]>$'
 
 new "netconf get-config double quotes"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><data/></rpc-reply>]]>]]>$'