* RESTCONF "content" query parameter supported

* New clixon-lib@2019-08-13.yang revision
* Bugfix: If `ietf-netconf.yang` was imported from any yang module, client/backend communication stops working.

apps/restconf/restconf_lib.c

@@ -143,6 +143,7 @@ static const map_str2int http_reason_phrase_map[] = {
 };
 
 /* See RFC 8040
+ * @see restconf_media_str2int
  */
 static const map_str2int http_media_map[] = {
     {"application/yang-data+xml",     YANG_DATA_XML},
@@ -152,6 +153,16 @@ static const map_str2int http_media_map[] = {
     {NULL,                            -1}
 };
 
+/* See RFC 8040 4.8.1
+ * @see query_content_str2int
+ */
+static const map_str2int query_content_map[] = {
+    {"config",     CONTENT_CONFIG},
+    {"nonconfig",  CONTENT_NONCONFIG},
+    {"all",        CONTENT_ALL},
+    {NULL,        -1}
+};
+
 int
 restconf_err2code(char *tag)
 {
@@ -176,6 +187,18 @@ restconf_media_int2str(restconf_media media)
     return clicon_int2str(http_media_map, media);
 }
 
+const query_content
+query_content_str2int(char *str)
+{
+    return clicon_str2int(query_content_map, str);
+}
+
+const char *
+query_content_int2str(query_content nr)
+{
+    return clicon_int2str(query_content_map, nr);
+}
+
 /*! Return media_in from Content-Type, -1 if not found or unrecognized
  * @note media-type syntax does not support parameters
  * @see RFC7231 Sec 3.1.1.1 for media-type syntax type:

apps/restconf/restconf_lib.h

@@ -57,6 +57,16 @@ enum restconf_media{
 };
 typedef enum restconf_media restconf_media;
 
+/*! Content query parameter RFC 8040 Sec 4.8.1 
+ */
+enum query_content{
+    CONTENT_CONFIG,
+    CONTENT_NONCONFIG,
+    CONTENT_ALL         /* default */
+
+};
+typedef enum query_content query_content;
+
 /*
  * Prototypes (also in clixon_restconf.h)
  */
@@ -66,6 +76,8 @@ const char *restconf_code2reason(int code);
 const restconf_media restconf_media_str2int(char *media);
 const char *restconf_media_int2str(restconf_media media);
 restconf_media restconf_content_type(FCGX_Request *r);
+const query_content query_content_str2int(char *str);
+const char *query_content_int2str(query_content nr);
 int restconf_badrequest(FCGX_Request *r);
 int restconf_unauthorized(FCGX_Request *r);
 int restconf_forbidden(FCGX_Request *r);

apps/restconf/restconf_main.c

@@ -695,6 +695,12 @@ main(int    argc,
     /* Access the remaining argv/argc options (after --) w clicon-argv_get() */
     clicon_argv_set(h, argv0, argc, argv);
     
+    /* Add (hardcoded) netconf features in case ietf-netconf loaded here
+     * Otherwise it is loaded in netconf_module_load below
+     */
+    if (netconf_module_features(h) < 0)
+	goto done;
+
     /* Create top-level yang spec and store as option */
     if ((yspec = yspec_new()) == NULL)
 	goto done;

apps/restconf/restconf_methods_get.c

@@ -114,12 +114,31 @@ api_data_get2(clicon_handle h,
     int        ret;
     char      *namespace = NULL;
     cvec      *nsc = NULL;
+    char      *str;
+    query_content content = CONTENT_ALL;
     
     clicon_debug(1, "%s", __FUNCTION__);
     if ((yspec = clicon_dbspec_yang(h)) == NULL){
 	clicon_err(OE_FATAL, 0, "No DB_SPEC");
 	goto done;
     }
+    /* Check for content attribute */
+    if ((str = cvec_find_str(qvec, "content")) != NULL){
+	clicon_debug(1, "%s content=%s", __FUNCTION__, str);
+	if ((content = query_content_str2int(str)) == -1){
+	    if (netconf_bad_attribute_xml(&xerr, "application",
+					  "<bad-attribute>content</bad-attribute>", "Unrecognized value of content attribute") < 0)
+		goto done;
+	    if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+		clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+		goto done;
+	    }
+	    if (api_return_err(h, r, xe, pretty, media_out, 0) < 0)
+		goto done;
+	    goto ok;
+	}
+    }
+
     if ((cbpath = cbuf_new()) == NULL)
         goto done;
     cprintf(cbpath, "/");
@@ -144,7 +163,21 @@ api_data_get2(clicon_handle h,
      * xpath expressions */
     if ((nsc = xml_nsctx_init(NULL, namespace)) == NULL)
 	goto done;
-    if (clicon_rpc_get(h, xpath, namespace, &xret) < 0){
+    switch (content){
+    case CONTENT_CONFIG:
+	ret = clicon_rpc_get_config(h, "running", xpath, namespace, &xret);
+	break;
+    case CONTENT_NONCONFIG:
+	ret = clicon_rpc_get_state(h, xpath, namespace, &xret);
+	break;
+    case CONTENT_ALL:
+	ret = clicon_rpc_get(h, xpath, namespace, &xret);
+	break;
+    default:
+	clicon_err(OE_XML, EINVAL, "Invalid content attribute %d", content);
+	break;
+    }
+    if (ret < 0){
 	if (netconf_operation_failed_xml(&xerr, "protocol", clicon_err_reason) < 0)
 	    goto done;
 	if ((xe = xpath_first(xerr, "rpc-error")) == NULL){