diff --git a/CHANGELOG.md b/CHANGELOG.md index aec8f915..350c6238 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ * Replaced JSON `null` with `[null]` as proper empty JSON leaf/leaf-list encoding. ### Corrected Bugs +* Hello netconf candidate capability misspelled, mentioned in [Can clixon_netconf receive netconf packets as a server? #93](https://github.com/clicon/clixon/issues/93) * [Cannot write to config using restconf example #91](https://github.com/clicon/clixon/issues/91) * Updated restconf documentation (the example was wrong) * [clixon-lib yang revision file name update #92](https://github.com/clicon/clixon/issues/92) diff --git a/README.md b/README.md index 1ed52e8a..c1e3551f 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Clixon is a YANG-based configuration manager, with interactive CLI, NETCONF and RESTCONF interfaces, an embedded database and transaction mechanism. -See [main documentation](https://clixon-docs.readthedocs.io). +See [main documentation](https://clixon-docs.readthedocs.io) and [project page](https://www.clicon.org). Clixon is open-source and dual licensed. Either Apache License, Version 2.0 or GNU General Public License Version 2; you choose. diff --git a/apps/netconf/netconf_hello.c b/apps/netconf/netconf_hello.c index c7ab25ac..fc8a620c 100644 --- a/apps/netconf/netconf_hello.c +++ b/apps/netconf/netconf_hello.c @@ -133,7 +133,7 @@ netconf_hello_dispatch(cxobj *xn) * * Question: should the NETCONF in RFC6241 sections 8.2-8.9 be announced both * as features and as capabilities in the message according to RFC6241? - * urn:ietf:params:netconf:capability:candidate:1:0 (8.3) + * urn:ietf:params:netconf:capability:candidate:1.0 (8.3) * urn:ietf:params:netconf:capability:validate:1.1 (8.6) * urn:ietf:params:netconf:capability:startup:1.0 (8.7) * urn:ietf:params:netconf:capability:xpath:1.0 (8.9) @@ -169,7 +169,7 @@ netconf_create_hello(clicon_handle h, module_set_id) < 0) goto done; cprintf(cb, "%s", encstr); - cprintf(cb, "urn:ietf:params:netconf:capability:candidate:1:0"); + cprintf(cb, "urn:ietf:params:netconf:capability:candidate:1.0"); cprintf(cb, "urn:ietf:params:netconf:capability:validate:1.1"); cprintf(cb, "urn:ietf:params:netconf:capability:startup:1.0"); cprintf(cb, "urn:ietf:params:netconf:capability:xpath:1.0"); diff --git a/test/test_netconf.sh b/test/test_netconf.sh index b7b77f0a..dea3fb75 100755 --- a/test/test_netconf.sh +++ b/test/test_netconf.sh @@ -50,7 +50,7 @@ if [ $BE -ne 0 ]; then fi new "netconf hello" -expecteof "$clixon_netconf -f $cfg" 0 ']]>]]>' '^urn:ietf:params:netconf:base:1.0urn:ietf:params:netconf:capability:yang-library:1.0?revision=2016-06-21&module-set-id=42urn:ietf:params:netconf:capability:candidate:1:0urn:ietf:params:netconf:capability:validate:1.1urn:ietf:params:netconf:capability:startup:1.0urn:ietf:params:netconf:capability:xpath:1.0urn:ietf:params:netconf:capability:notification:1.0[0-9]*]]>]]>]]>]]>$' +expecteof "$clixon_netconf -f $cfg" 0 ']]>]]>' '^urn:ietf:params:netconf:base:1.0urn:ietf:params:netconf:capability:yang-library:1.0?revision=2016-06-21&module-set-id=42urn:ietf:params:netconf:capability:candidate:1.0urn:ietf:params:netconf:capability:validate:1.1urn:ietf:params:netconf:capability:startup:1.0urn:ietf:params:netconf:capability:xpath:1.0urn:ietf:params:netconf:capability:notification:1.0[0-9]*]]>]]>]]>]]>$' new "netconf get-config double quotes" expecteof "$clixon_netconf -qf $cfg" 0 ']]>]]>' '^]]>]]>$'