experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SNMP frontend table fix: handler called with heartrate, return 0

Browse source
This commit is contained in:
Olof hagsand 2022-05-08 17:37:11 +02:00
parent bbcea8b780
commit 4ff2ea099c
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/snmp/snmp_mib_yang.c
View file

@ -337,8 +337,7 @@ snmp_scalar_handler(netsnmp_mib_handler *handler,
netsnmp_data_list *agent_data; netsnmp_data_list *agent_data;
netsnmp_free_agent_data_set() netsnmp_free_agent_data_set()
*/ */
clicon_debug(1, "%s", __FUNCTION__); clicon_debug(1, "%s %s", __FUNCTION__, handler->handler_name);
clicon_debug(1, "%s %p", __FUNCTION__, reginfo);
sh = (clixon_snmp_handle*)handler->myvoid; sh = (clixon_snmp_handle*)handler->myvoid;
ys = sh->sh_ys; ys = sh->sh_ys;
@ -381,7 +380,6 @@ snmp_scalar_handler(netsnmp_mib_handler *handler,
} }
if ((x = xpath_first(xt, nsc, "%s", xpath)) < 0) if ((x = xpath_first(xt, nsc, "%s", xpath)) < 0)
goto done; goto done;
xml_body(x);
if ((cv = cv_new(CGV_INT32)) == NULL){ if ((cv = cv_new(CGV_INT32)) == NULL){
clicon_err(OE_UNIX, errno, "cv_new"); clicon_err(OE_UNIX, errno, "cv_new");
goto done; goto done;
@ -392,8 +390,7 @@ snmp_scalar_handler(netsnmp_mib_handler *handler,
} }
if (ret == 0){ if (ret == 0){
clicon_debug(1, "%s %s", __FUNCTION__, reason); clicon_debug(1, "%s %s", __FUNCTION__, reason);
netsnmp_set_request_error(reqinfo, requests, // XXX netsnmp_set_request_error(reqinfo, requests, SNMP_ERR_WRONGTYPE);
SNMP_ERR_WRONGTYPE);
} }
accesses = cv_int32_get(cv); // XXX Use cv type space accesses = cv_int32_get(cv); // XXX Use cv type space

5
test/test_snmp_set.sh
View file

@ -48,6 +48,11 @@ module clixon-example{
import NET-SNMP-EXAMPLES-MIB { import NET-SNMP-EXAMPLES-MIB {
prefix "net-snmp-examples"; prefix "net-snmp-examples";
} }
deviation "/net-snmp-examples:NET-SNMP-EXAMPLES-MIB" {
deviate replace {
config true;
}
}
} }
EOF EOF

2
test/test_snmp_table.sh
View file

@ -41,7 +41,7 @@ cat <<EOF > $cfg
<CLICON_BACKEND_PIDFILE>/var/tmp/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE> <CLICON_BACKEND_PIDFILE>/var/tmp/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
<CLICON_XMLDB_DIR>$dir</CLICON_XMLDB_DIR> <CLICON_XMLDB_DIR>$dir</CLICON_XMLDB_DIR>
<CLICON_SNMP_AGENT_SOCK>unix:$SOCK</CLICON_SNMP_AGENT_SOCK> <CLICON_SNMP_AGENT_SOCK>unix:$SOCK</CLICON_SNMP_AGENT_SOCK>
<!--CLICON_SNMP_MIB>NET-SNMP-EXAMPLES-MIB</CLICON_SNMP_MIB--> <CLICON_SNMP_MIB>NET-SNMP-EXAMPLES-MIB</CLICON_SNMP_MIB>
</clixon-config> </clixon-config>
EOF EOF