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

Fix pr review findings (typos and formatting)

Browse source
This commit is contained in:
Mico Micic 2024-03-04 12:10:23 +01:00 • committed by Olof Hagsand
parent 4f306056ea
commit d3587b8646
2 changed files with 30 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/clixon/clixon_xml_map.h
View file

@ -41,7 +41,7 @@
#define _CLIXON_XML_MAP_H_ #define _CLIXON_XML_MAP_H_
/* /*
* Maximum number of supported bit pisitions in YANG "bits" data * Maximum number of supported bit positions in YANG "bits" data
* type. As defined in RFC7950 (section 9.7.4.2.) the position * type. As defined in RFC7950 (section 9.7.4.2.) the position
* value must be in the range 0 to 4294967295. But who needs * value must be in the range 0 to 4294967295. But who needs
* that much bit positions? (To set bit 4'294'967'295 it would be * that much bit positions? (To set bit 4'294'967'295 it would be
@ -77,8 +77,8 @@ int assign_namespace_element(cxobj *x0, cxobj *x1, cxobj *x1p);
int assign_namespace_body(cxobj *x0, cxobj *x1); int assign_namespace_body(cxobj *x0, cxobj *x1);
int xml_merge(cxobj *x0, cxobj *x1, yang_stmt *yspec, char **reason); int xml_merge(cxobj *x0, cxobj *x1, yang_stmt *yspec, char **reason);
int yang_valstr2enum(yang_stmt *ytype, char *valstr, char **enumstr); int yang_valstr2enum(yang_stmt *ytype, char *valstr, char **enumstr);
int yang_bitsstr2val(yang_stmt *ytype, char *bitsstr, unsigned char **snmpval, size_t *snmplen); int yang_bitsstr2val(clixon_handle h, yang_stmt *ytype, char *bitsstr, unsigned char **snmpval, size_t *snmplen);
int yang_val2bitsstr(yang_stmt *ytype, unsigned char *snmpval, size_t snmplen, cbuf *cb); int yang_val2bitsstr(clixon_handle h, yang_stmt *ytype, unsigned char *snmpval, size_t snmplen, cbuf *cb);
int yang_enum2valstr(yang_stmt *ytype, char *enumstr, char **valstr); int yang_enum2valstr(yang_stmt *ytype, char *enumstr, char **valstr);
int yang_enum2int(yang_stmt *ytype, char *enumstr, int32_t *val); int yang_enum2int(yang_stmt *ytype, char *enumstr, int32_t *val);
int yang_enum_int_value(cxobj *node, int32_t *val); int yang_enum_int_value(cxobj *node, int32_t *val);

66
lib/src/clixon_xml_map.c
View file

@ -1615,18 +1615,17 @@ yang_bits_pos(yang_stmt *ytype,
char *bitstr, char *bitstr,
uint32_t *bitpos) uint32_t *bitpos)
{ {
int retval = 0; int retval = 0;
int ret = 0; int ret = 0;
int is_first = 1; int is_first = 1;
char *reason; char *reason;
yang_stmt *yprev = NULL; yang_stmt *yprev = NULL;
yang_stmt *ypos = NULL; yang_stmt *ypos = NULL;
while ((yprev = yn_each(ytype, yprev)) != NULL){ while ((yprev = yn_each(ytype, yprev)) != NULL){
// Check for the given bit name (flag) /* Check for the given bit name (flag) */
if (yang_keyword_get(yprev) == Y_BIT){ if (yang_keyword_get(yprev) == Y_BIT){
/* Use position from Y_POSITION statement if defined */
// Use position from Y_POSITION statement if defined
if ((ypos = yang_find(yprev, Y_POSITION, NULL)) != NULL){ if ((ypos = yang_find(yprev, Y_POSITION, NULL)) != NULL){
if ((ret = parse_uint32(yang_argument_get(ypos), bitpos, &reason)) < 0){ if ((ret = parse_uint32(yang_argument_get(ypos), bitpos, &reason)) < 0){
clixon_err(OE_UNIX, EINVAL, "cannot parse bit position val: %s", reason); clixon_err(OE_UNIX, EINVAL, "cannot parse bit position val: %s", reason);
@ -1635,22 +1634,18 @@ yang_bits_pos(yang_stmt *ytype,
if (ret == 0) if (ret == 0)
goto fail; goto fail;
} else { } else {
// Position not defined. Use last known position + 1 (skip first node to start with 0) /* Position not defined. Use last known position + 1 (skip first node to start with 0) */
if (is_first == 0) (*bitpos)++; if (is_first == 0) (*bitpos)++;
} }
if (strcmp(bitstr, yang_argument_get(yprev)) == 0){ if (strcmp(bitstr, yang_argument_get(yprev)) == 0){
retval = 1; retval = 1;
goto done; goto done;
} }
is_first = 0; is_first = 0;
} }
} }
clixon_debug(CLIXON_DBG_YANG, "flag %s not found", bitstr);
clixon_debug(CLIXON_DBG_DEFAULT, "flag %s not found", bitstr);
goto fail; goto fail;
done: done:
return retval; return retval;
fail: fail:
@ -1661,6 +1656,7 @@ yang_bits_pos(yang_stmt *ytype,
/*! Given a YANG (bits) type node and string value, return the /*! Given a YANG (bits) type node and string value, return the
* SNMP value for all bits (flags) that are set. * SNMP value for all bits (flags) that are set.
* *
* @param[in] h Clixon handle
* @param[in] ytype YANG type noden * @param[in] ytype YANG type noden
* @param[in] bitsstr Value of bits as space separated string * @param[in] bitsstr Value of bits as space separated string
* @param[out] snmpval SNMP value with all bits set for given bitsstr * @param[out] snmpval SNMP value with all bits set for given bitsstr
@ -1671,7 +1667,8 @@ yang_bits_pos(yang_stmt *ytype,
* @see yang_val2bitsstr * @see yang_val2bitsstr
*/ */
int int
yang_bitsstr2val(yang_stmt *ytype, yang_bitsstr2val(clixon_handle h,
yang_stmt *ytype,
char *bitsstr, char *bitsstr,
unsigned char **snmpval, unsigned char **snmpval,
size_t *snmplen) size_t *snmplen)
@ -1687,18 +1684,15 @@ yang_bitsstr2val(yang_stmt *ytype,
uint32_t bitpos; uint32_t bitpos;
*snmplen = 0; *snmplen = 0;
if ((buffer = calloc(CLIXON_BITS_POS_MAX / 8, sizeof(unsigned char))) == NULL){ if ((buffer = calloc(CLIXON_BITS_POS_MAX / 8, sizeof(unsigned char))) == NULL){
clixon_err(OE_UNIX, errno, "calloc"); clixon_err(OE_UNIX, errno, "calloc");
goto done; goto done;
} }
if ((vec = clicon_strsep(bitsstr, " ", &nvec)) == NULL){ if ((vec = clicon_strsep(bitsstr, " ", &nvec)) == NULL){
clixon_err(OE_UNIX, EINVAL, "split string failed"); clixon_err(OE_UNIX, EINVAL, "split string failed");
goto done; goto done;
} }
/* Go over all set flags in given bitstring */
// Go over all set flags in given bitstring
for (i=0; i<nvec; i++){ for (i=0; i<nvec; i++){
v = clixon_trim(vec[i]); v = clixon_trim(vec[i]);
if (strlen(v) > 0) { if (strlen(v) > 0) {
@ -1706,12 +1700,10 @@ yang_bitsstr2val(yang_stmt *ytype,
goto done; goto done;
if (ret == 0) if (ret == 0)
goto fail; goto fail;
/* Set bit at correct byte and bit position */
// Set bit at correct byte and bit position
byte = bitpos / 8; byte = bitpos / 8;
buffer[byte] = buffer[byte] | (1 << (7 - (bitpos % 8))); buffer[byte] = buffer[byte] | (1 << (7 - (bitpos % 8)));
*snmplen = byte + 1; *snmplen = byte + 1;
if (*snmplen >= CLIXON_BITS_POS_MAX) { if (*snmplen >= CLIXON_BITS_POS_MAX) {
clixon_err(OE_UNIX, EINVAL, "bit position %zu out of range. (max. allowed %d)", clixon_err(OE_UNIX, EINVAL, "bit position %zu out of range. (max. allowed %d)",
*snmplen, CLIXON_BITS_POS_MAX); *snmplen, CLIXON_BITS_POS_MAX);
@ -1719,22 +1711,18 @@ yang_bitsstr2val(yang_stmt *ytype,
} }
} }
} }
if ((*snmpval = malloc(*snmplen)) == NULL){ if ((*snmpval = malloc(*snmplen)) == NULL){
clixon_err(OE_UNIX, errno, "calloc"); clixon_err(OE_UNIX, errno, "calloc");
goto done; goto done;
} }
memcpy(*snmpval, buffer, *snmplen); memcpy(*snmpval, buffer, *snmplen);
retval = 1; retval = 1;
done: done:
if (buffer) if (buffer)
free(buffer); free(buffer);
if (vec) if (vec)
free(vec); free(vec);
return retval; return retval;
fail: fail:
retval = 0; retval = 0;
goto done; goto done;
@ -1742,6 +1730,7 @@ yang_bitsstr2val(yang_stmt *ytype,
/*! Given a YANG (bits) type node and SNMP value, return the string value for all bits (flags) that are set. /*! Given a YANG (bits) type node and SNMP value, return the string value for all bits (flags) that are set.
* *
* @param[in] h Clixon handle
* @param[in] ytype YANG type noden * @param[in] ytype YANG type noden
* @param[in] snmpval SNMP value * @param[in] snmpval SNMP value
* @param[in] snmplen length of snmpval * @param[in] snmplen length of snmpval
@ -1752,16 +1741,17 @@ yang_bitsstr2val(yang_stmt *ytype,
* @see yang_bitsstr2val * @see yang_bitsstr2val
*/ */
int int
yang_val2bitsstr(yang_stmt *ytype, yang_val2bitsstr(clixon_handle h,
unsigned char *snmpval, yang_stmt *ytype,
size_t snmplen, unsigned char *snmpval,
cbuf *cb) size_t snmplen,
cbuf *cb)
{ {
int retval = -1; int retval = -1;
int is_first = 1; int is_first = 1;
int ret = 0; int ret = 0;
int byte = 0; int byte = 0;
char *reason; char *reason = NULL;
yang_stmt *yprev = NULL; yang_stmt *yprev = NULL;
yang_stmt *ypos; yang_stmt *ypos;
uint32_t bitpos = 0; uint32_t bitpos = 0;
@ -1770,11 +1760,10 @@ yang_val2bitsstr(yang_stmt *ytype,
clixon_err(OE_UNIX, EINVAL, "cb is NULL"); clixon_err(OE_UNIX, EINVAL, "cb is NULL");
goto done; goto done;
} }
/* Go over all defined bits and check if it is seet in intval */
// Go over all defined bits and check if it is seet in intval
while ((yprev = yn_each(ytype, yprev)) != NULL && byte < snmplen){ while ((yprev = yn_each(ytype, yprev)) != NULL && byte < snmplen){
if (yang_keyword_get(yprev) == Y_BIT) { if (yang_keyword_get(yprev) == Y_BIT) {
// Use position from Y_POSITION statement if defined /* Use position from Y_POSITION statement if defined */
if ((ypos = yang_find(yprev, Y_POSITION, NULL)) != NULL){ if ((ypos = yang_find(yprev, Y_POSITION, NULL)) != NULL){
if ((ret = parse_uint32(yang_argument_get(ypos), &bitpos, &reason)) < 0){ if ((ret = parse_uint32(yang_argument_get(ypos), &bitpos, &reason)) < 0){
clixon_err(OE_UNIX, EINVAL, "cannot parse bit position val: %s", reason); clixon_err(OE_UNIX, EINVAL, "cannot parse bit position val: %s", reason);
@ -1783,25 +1772,24 @@ yang_val2bitsstr(yang_stmt *ytype,
if (ret == 0) if (ret == 0)
goto fail; goto fail;
} else { } else {
// Position not defined. Use last known position + 1 (skip first node to start with 0) /* Position not defined. Use last known position + 1 (skip first node to start with 0) */
if (is_first == 0) bitpos++; if (is_first == 0) bitpos++;
} }
byte = bitpos / 8; byte = bitpos / 8;
if (snmpval[byte] & (1 << (7 - (bitpos % 8)))){ if (snmpval[byte] & (1 << (7 - (bitpos % 8)))){
if (is_first == 0) cbuf_append_str(cb, " "); if (is_first == 0) cbuf_append_str(cb, " ");
cbuf_append_str(cb, yang_argument_get(yprev)); cbuf_append_str(cb, yang_argument_get(yprev));
} }
is_first = 0; is_first = 0;
} }
} }
// append space if no flag is set to indicate that /* append space if no flag is set to indicate that */
if (cbuf_len(cb) == 0) if (cbuf_len(cb) == 0)
cbuf_append_str(cb, " "); cbuf_append_str(cb, " ");
retval = 1; retval = 1;
done: done:
if (reason)
free(reason);
return retval; return retval;
fail: fail:
retval = 0; retval = 0;