SNMP frontend: Generalized type handling for set functions
SPlit scalar_handler into get and set subfunctions
This commit is contained in:
Olof hagsand
parent
ef604be610
commit
46cb21f3e8
8 changed files with 285 additions and 398 deletions
|
|
@ -118,6 +118,143 @@ done:
|
|||
return retval;
|
||||
}
|
||||
|
||||
/*! Scalar handler, set a value to clixon
|
||||
* get xpath: see yang2api_path_fmt / api_path2xpath
|
||||
*/
|
||||
static int
|
||||
snmp_scalar_get(clicon_handle h,
|
||||
yang_stmt *ys,
|
||||
netsnmp_variable_list *requestvb,
|
||||
char *defaultval,
|
||||
enum cv_type cvtype,
|
||||
netsnmp_agent_request_info *reqinfo,
|
||||
netsnmp_request_info *requests)
|
||||
{
|
||||
int retval = -1;
|
||||
cvec *nsc = NULL;
|
||||
char *xpath = NULL;
|
||||
cxobj *xt = NULL;
|
||||
cxobj *xerr;
|
||||
cxobj *x;
|
||||
char *valstr = NULL;
|
||||
u_char *snmpval = NULL;
|
||||
size_t snmplen;
|
||||
int ret;
|
||||
|
||||
if (xml_nsctx_yang(ys, &nsc) < 0)
|
||||
goto done;
|
||||
if (yang2xpath(ys, &xpath) < 0)
|
||||
goto done;
|
||||
if (clicon_rpc_get(h, xpath, nsc, CONTENT_ALL, -1, &xt) < 0)
|
||||
goto done;
|
||||
if ((xerr = xpath_first(xt, NULL, "/rpc-error")) != NULL){
|
||||
clixon_netconf_error(xerr, "clicon_rpc_get", NULL);
|
||||
goto done;
|
||||
}
|
||||
/* Get value, either from xml, or smiv2 default */
|
||||
if ((x = xpath_first(xt, nsc, "%s", xpath)) != NULL) {
|
||||
valstr = xml_body(x);
|
||||
}
|
||||
else if ((valstr = defaultval) != NULL)
|
||||
;
|
||||
else{
|
||||
netsnmp_set_request_error(reqinfo, requests, SNMP_NOSUCHINSTANCE);
|
||||
goto ok;
|
||||
}
|
||||
if ((ret = type_yang2snmp(valstr, cvtype, reqinfo, requests, &snmpval, &snmplen)) < 0)
|
||||
goto done;
|
||||
if (ret == 0)
|
||||
goto ok;
|
||||
|
||||
/* 1. use cligen object and get rwa buf / size from that, OR
|
||||
* + have parse function from YANG
|
||||
* - does not have
|
||||
* 2. use union netsnmp_vardata and pass that here?
|
||||
* 3. Make cv2asn1 conversion function <--
|
||||
*/
|
||||
|
||||
/* see snmplib/snmp_client.c */
|
||||
if (snmp_set_var_value(requestvb,
|
||||
snmpval,
|
||||
snmplen) != 0){
|
||||
clicon_err(OE_SNMP, 0, "snmp_set_var_value");
|
||||
goto done;
|
||||
}
|
||||
ok:
|
||||
retval = 0;
|
||||
done:
|
||||
if (snmpval)
|
||||
free(snmpval);
|
||||
if (xt)
|
||||
xml_free(xt);
|
||||
if (xpath)
|
||||
free(xpath);
|
||||
if (nsc)
|
||||
xml_nsctx_free(nsc);
|
||||
return retval;
|
||||
}
|
||||
|
||||
/*! Scalar handler, get a value from clixon
|
||||
*/
|
||||
static int
|
||||
snmp_scalar_set(clicon_handle h,
|
||||
yang_stmt *ys,
|
||||
netsnmp_variable_list *requestvb,
|
||||
netsnmp_agent_request_info *reqinfo,
|
||||
netsnmp_request_info *requests)
|
||||
{
|
||||
int retval = -1;
|
||||
char *api_path = NULL;
|
||||
cxobj *xtop = NULL;
|
||||
cxobj *xbot = NULL;
|
||||
cxobj *xb;
|
||||
yang_stmt *yspec;
|
||||
int ret;
|
||||
char *valstr = NULL;
|
||||
cbuf *cb = NULL;
|
||||
|
||||
if ((yspec = clicon_dbspec_yang(h)) == NULL){
|
||||
clicon_err(OE_FATAL, 0, "No DB_SPEC");
|
||||
goto done;
|
||||
}
|
||||
if ((xtop = xml_new(NETCONF_INPUT_CONFIG, NULL, CX_ELMNT)) == NULL)
|
||||
goto done;
|
||||
if (yang2api_path_fmt(ys, 0, &api_path) < 0)
|
||||
goto done;
|
||||
if ((ret = api_path2xml(api_path, yspec, xtop, YC_DATANODE, 1, &xbot, NULL, NULL)) < 0)
|
||||
goto done;
|
||||
|
||||
if (ret == 0){
|
||||
clicon_err(OE_XML, 0, "api_path2xml %s invalid", api_path);
|
||||
goto done;
|
||||
}
|
||||
if ((xb = xml_new("body", xbot, CX_BODY)) == NULL)
|
||||
goto done;
|
||||
if ((ret = type_snmp2yang(requestvb, reqinfo, requests, &valstr)) < 0)
|
||||
goto done;
|
||||
if (ret == 0)
|
||||
goto ok;
|
||||
if (xml_value_set(xb, valstr) < 0)
|
||||
goto done;
|
||||
if ((cb = cbuf_new()) == NULL){
|
||||
clicon_err(OE_UNIX, errno, "cbuf_new");
|
||||
goto done;
|
||||
}
|
||||
if (clicon_xml2cbuf(cb, xtop, 0, 0, -1) < 0)
|
||||
goto done;
|
||||
if (clicon_rpc_edit_config(h, "candidate", OP_MERGE, cbuf_get(cb)) < 0)
|
||||
goto done;
|
||||
ok:
|
||||
retval = 0;
|
||||
done:
|
||||
if (cb)
|
||||
cbuf_free(cb);
|
||||
if (xtop)
|
||||
xml_free(xtop);
|
||||
if (valstr)
|
||||
free(valstr);
|
||||
return retval;
|
||||
}
|
||||
|
||||
/*! SNMP Scalar operation handler
|
||||
* Calls order: READ:160,
|
||||
|
|
@ -131,25 +268,13 @@ snmp_scalar_handler(netsnmp_mib_handler *handler,
|
|||
netsnmp_agent_request_info *reqinfo,
|
||||
netsnmp_request_info *requests)
|
||||
{
|
||||
int retval = -1;
|
||||
clixon_snmp_handle *sh;
|
||||
yang_stmt *ys;
|
||||
clicon_handle h;
|
||||
cg_var *cv = NULL;
|
||||
cxobj *xt = NULL;
|
||||
cxobj *xerr;
|
||||
cvec *nsc = NULL;
|
||||
cxobj *x;
|
||||
char *xpath = NULL;
|
||||
int asn1_type;
|
||||
enum cv_type cvtype;
|
||||
char *valstr;
|
||||
u_char *snmpval = NULL;
|
||||
size_t snmplen;
|
||||
int ret;
|
||||
int retval = -1;
|
||||
clixon_snmp_handle *sh;
|
||||
yang_stmt *ys;
|
||||
int asn1_type;
|
||||
netsnmp_variable_list *requestvb; /* sub of requests */
|
||||
cbuf *cb = NULL;
|
||||
|
||||
enum cv_type cvtype;
|
||||
|
||||
/*
|
||||
* can be used to pass information on a per-pdu basis from a
|
||||
* helper to the later handlers
|
||||
|
|
@ -174,7 +299,6 @@ snmp_scalar_handler(netsnmp_mib_handler *handler,
|
|||
requests->inclusive);
|
||||
sh = (clixon_snmp_handle*)nhreg->my_reg_void;
|
||||
ys = sh->sh_ys;
|
||||
h = sh->sh_h;
|
||||
// fprint_objid(stderr, nhreg->rootoid, nhreg->rootoid_len);
|
||||
assert(sh->sh_oidlen == requestvb->name_length);
|
||||
assert(requestvb->name_length == nhreg->rootoid_len);
|
||||
|
|
@ -188,123 +312,43 @@ snmp_scalar_handler(netsnmp_mib_handler *handler,
|
|||
SNMP_NOSUCHOBJECT);
|
||||
return SNMP_ERR_NOERROR;
|
||||
#endif
|
||||
|
||||
if (yang2snmp_types(ys, &asn1_type, &cvtype) < 0)
|
||||
goto done;
|
||||
|
||||
/* see net-snmp/agent/snmp_agent.h / net-snmp/library/snmp.h */
|
||||
switch (reqinfo->mode) {
|
||||
case MODE_GET: // 160
|
||||
case MODE_GET: /* 160 */
|
||||
requestvb->type = asn1_type; // ASN_NULL on input
|
||||
|
||||
/* get xpath: see yang2api_path_fmt / api_path2xpath
|
||||
New fn: yang2xpath?
|
||||
clicon_rpc_get()
|
||||
<rpc $DEFAULTNS><get><filter type=\"xpath\" select=\"/if:interfaces\" xmlns:if=\"urn:ietf:params:xml:ns:yang:ietf-interfaces\" /></get></rpc>"
|
||||
|
||||
*/
|
||||
|
||||
if (xml_nsctx_yang(ys, &nsc) < 0)
|
||||
if (snmp_scalar_get(sh->sh_h, ys, requestvb, sh->sh_default, cvtype, reqinfo, requests) < 0)
|
||||
goto done;
|
||||
if (yang2xpath(ys, &xpath) < 0)
|
||||
goto done;
|
||||
if (clicon_rpc_get(h, xpath, nsc, CONTENT_ALL, -1, &xt) < 0)
|
||||
goto done;
|
||||
if ((xerr = xpath_first(xt, NULL, "/rpc-error")) != NULL){
|
||||
clixon_netconf_error(xerr, "clicon_rpc_get", NULL);
|
||||
goto done;
|
||||
}
|
||||
/* Get value, either from xml, or smiv2 default */
|
||||
if ((x = xpath_first(xt, nsc, "%s", xpath)) != NULL) {
|
||||
valstr = xml_body(x);
|
||||
}
|
||||
else if ((valstr = sh->sh_default) != NULL)
|
||||
;
|
||||
else{
|
||||
netsnmp_set_request_error(reqinfo, requests, SNMP_NOSUCHINSTANCE);
|
||||
goto ok;
|
||||
}
|
||||
if ((ret = type_yang2snmp(valstr, cvtype, reqinfo, requests, &snmpval, &snmplen)) < 0)
|
||||
goto done;
|
||||
if (ret == 0)
|
||||
goto ok;
|
||||
|
||||
/* 1. use cligen object and get rwa buf / size from that, OR
|
||||
* + have parse function from YANG
|
||||
* - does not have
|
||||
* 2. use union netsnmp_vardata and pass that here?
|
||||
* 3. Make cv2asn1 conversion function <--
|
||||
*/
|
||||
|
||||
/* see snmplib/snmp_client.c */
|
||||
if (snmp_set_var_value(requestvb,
|
||||
snmpval,
|
||||
snmplen) != 0){
|
||||
clicon_err(OE_SNMP, 0, "snmp_set_var_value");
|
||||
goto done;
|
||||
}
|
||||
break;
|
||||
case MODE_GETNEXT: // 161
|
||||
case MODE_GETNEXT: /* 161 */
|
||||
assert(0); // Not seen?
|
||||
break;
|
||||
case MODE_SET_RESERVE1: // 0
|
||||
case MODE_SET_RESERVE1: /* 0 */
|
||||
if (requestvb->type != asn1_type)
|
||||
netsnmp_set_request_error(reqinfo, requests,
|
||||
SNMP_ERR_WRONGTYPE);
|
||||
break;
|
||||
|
||||
case MODE_SET_RESERVE2: // 1
|
||||
case MODE_SET_RESERVE2: /* 1 */
|
||||
break;
|
||||
|
||||
case MODE_SET_ACTION: // 2
|
||||
/*
|
||||
* update current
|
||||
*/
|
||||
/* yang2xpath -> xpath2xml
|
||||
* accesses = *(requestvb->val.integer);
|
||||
* rpc edit-config
|
||||
<data></data>
|
||||
*/
|
||||
|
||||
if ((cb = cbuf_new()) == NULL){
|
||||
clicon_err(OE_UNIX, errno, "cbuf_new");
|
||||
goto done;
|
||||
}
|
||||
/*! XXX only int */
|
||||
cprintf(cb, "<config><NET-SNMP-EXAMPLES-MIB xmlns=\"urn:ietf:params:xml:ns:yang:smiv2:NET-SNMP-EXAMPLES-MIB\"><netSnmpExampleScalars><netSnmpExampleInteger>%ld</netSnmpExampleInteger></netSnmpExampleScalars></NET-SNMP-EXAMPLES-MIB></config>", *requestvb->val.integer);
|
||||
if (clicon_rpc_edit_config(h, "candidate", OP_MERGE, cbuf_get(cb)) < 0)
|
||||
case MODE_SET_ACTION: /* 2 */
|
||||
if (snmp_scalar_set(sh->sh_h, ys, requestvb, reqinfo, requests) < 0)
|
||||
goto done;
|
||||
break;
|
||||
|
||||
case MODE_SET_UNDO: // 5
|
||||
if (clicon_rpc_discard_changes(h) < 0)
|
||||
case MODE_SET_UNDO: /* 5 */
|
||||
if (clicon_rpc_discard_changes(sh->sh_h) < 0)
|
||||
goto done;
|
||||
break;
|
||||
|
||||
case MODE_SET_COMMIT: // 3
|
||||
if (clicon_rpc_commit(h) < 0)
|
||||
case MODE_SET_COMMIT: /* 3 */
|
||||
if (clicon_rpc_commit(sh->sh_h) < 0)
|
||||
goto done;
|
||||
break;
|
||||
case MODE_SET_FREE: // 4
|
||||
/*
|
||||
* nothing to do
|
||||
*/
|
||||
case MODE_SET_FREE: /* 4 */
|
||||
break;
|
||||
}
|
||||
ok:
|
||||
retval = SNMP_ERR_NOERROR;
|
||||
done:
|
||||
if (snmpval)
|
||||
free(snmpval);
|
||||
if (cb)
|
||||
cbuf_free(cb);
|
||||
if (xpath)
|
||||
free(xpath);
|
||||
if (xt)
|
||||
xml_free(xt);
|
||||
if (nsc)
|
||||
xml_nsctx_free(nsc);
|
||||
if (cv)
|
||||
cv_free(cv);
|
||||
return retval;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue