Index: perl/SNMP/SNMP.xs =================================================================== RCS file: /cvsroot/net-snmp/net-snmp/perl/SNMP/SNMP.xs,v retrieving revision 5.12.2.2 retrieving revision 5.12.2.4 diff -u -r5.12.2.2 -r5.12.2.4 --- perl/SNMP/SNMP.xs 25 Jul 2003 01:14:48 -0000 5.12.2.2 +++ perl/SNMP/SNMP.xs 27 Sep 2003 04:27:30 -0000 5.12.2.4 @@ -1270,14 +1270,17 @@ */ old_numeric = netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_NUMERIC_OIDS); old_printfull = netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_FULL_OID); - if (SvIV(*hv_fetch((HV*)SvRV(sess_ref),"UseNumeric", 10, 1))) { - getlabel_flag |= USE_NUMERIC_OIDS; - netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_NUMERIC_OIDS, 1); - } if (SvIV(*hv_fetch((HV*)SvRV(sess_ref),"UseLongNames", 12, 1))) { getlabel_flag |= USE_LONG_NAMES; netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_FULL_OID, 1); } + /* Setting UseNumeric forces UseLongNames on so check for UseNumeric + after UseLongNames (above) to make sure the final outcome of + NETSNMP_DS_LIB_OID_OUTPUT_FORMAT is NETSNMP_OID_OUTPUT_NUMERIC */ + if (SvIV(*hv_fetch((HV*)SvRV(sess_ref),"UseNumeric", 10, 1))) { + getlabel_flag |= USE_NUMERIC_OIDS; + netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_NUMERIC_OIDS, 1); + } sv_bless(varlist_ref, gv_stashpv("SNMP::VarList",0)); for(vars = (pdu?pdu->variables:NULL); vars; vars = vars->next_variable) { @@ -3040,15 +3043,22 @@ char *tag_pv; int type; char tmp_type_str[MAX_TYPE_NAME_LEN]; - char str_buf[STR_BUF_SIZE]; snmp_xs_cb_data *xs_cb_data; SV **sess_ptr_sv; SV **err_str_svp; SV **err_num_svp; SV **err_ind_svp; int status; + u_char str_buf[STR_BUF_SIZE], *str_bufp = str_buf; + size_t str_buf_len = sizeof(str_buf); + size_t out_len = 0; + int buf_over = 0; + char *label; + char *iid; + int getlabel_flag = NO_FLAGS; int sprintval_flag = USE_BASIC; int verbose = SvIV(perl_get_sv("SNMP::verbose", 0x01 | 0x04)); + int old_format; SV *sv_timestamp = NULL; New (0, oid_arr, MAX_OID_LEN, oid); @@ -3063,6 +3073,10 @@ sv_setpv(*err_str_svp, ""); sv_setiv(*err_num_svp, 0); sv_setiv(*err_ind_svp, 0); + if (SvIV(*hv_fetch((HV*)SvRV(sess_ref),"UseLongNames", 12, 1))) + getlabel_flag |= USE_LONG_NAMES; + if (SvIV(*hv_fetch((HV*)SvRV(sess_ref),"UseNumeric", 10, 1))) + getlabel_flag |= USE_NUMERIC_OIDS; if (SvIV(*hv_fetch((HV*)SvRV(sess_ref),"UseEnums", 8, 1))) sprintval_flag = USE_ENUMS; if (SvIV(*hv_fetch((HV*)SvRV(sess_ref),"UseSprintValue", 14, 1))) @@ -3122,46 +3136,95 @@ last_vars = (response ? response->variables : NULL); + /* + ** Set up for numeric or full OID's, if necessary. Save the old + ** output format so that it can be restored when we finish -- this + ** is a library-wide global, and has to be set/restored for each + ** session. + */ + old_format = netsnmp_ds_get_int(NETSNMP_DS_LIBRARY_ID, + NETSNMP_DS_LIB_OID_OUTPUT_FORMAT); + + if (SvIV(*hv_fetch((HV*)SvRV(sess_ref),"UseLongNames", 12, 1))) { + getlabel_flag |= USE_LONG_NAMES; + + netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, + NETSNMP_DS_LIB_OID_OUTPUT_FORMAT, + NETSNMP_OID_OUTPUT_FULL); + } + /* Setting UseNumeric forces UseLongNames on so check for UseNumeric + after UseLongNames (above) to make sure the final outcome of + NETSNMP_DS_LIB_OID_OUTPUT_FORMAT is NETSNMP_OID_OUTPUT_NUMERIC */ + if (SvIV(*hv_fetch((HV*)SvRV(sess_ref),"UseNumeric", 10, 1))) { + getlabel_flag |= USE_LONG_NAMES; + getlabel_flag |= USE_NUMERIC_OIDS; + + netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, + NETSNMP_DS_LIB_OID_OUTPUT_FORMAT, + NETSNMP_OID_OUTPUT_NUMERIC); + } + if (SvIOK(*hv_fetch((HV*)SvRV(sess_ref),"TimeStamp", 9, 1)) && SvIV(*hv_fetch((HV*)SvRV(sess_ref),"TimeStamp", 9, 1))) sv_timestamp = newSViv((IV)time(NULL)); - for(varlist_ind = 0; varlist_ind <= varlist_len; varlist_ind++) { + for(vars = (response?response->variables:NULL), varlist_ind = 0; + vars && (varlist_ind <= varlist_len); + vars = vars->next_variable, varlist_ind++) { varbind_ref = av_fetch(varlist, varlist_ind, 0); if (SvROK(*varbind_ref)) { varbind = (AV*) SvRV(*varbind_ref); - tp=__tag2oid(__av_elem_pv(varbind, VARBIND_TAG_F,NULL), - __av_elem_pv(varbind, VARBIND_IID_F,NULL), - oid_arr, &oid_arr_len, &type,0); + *str_buf = '.'; + *(str_buf+1) = '\0'; + out_len = 0; + tp = netsnmp_sprint_realloc_objid_tree(&str_bufp, &str_buf_len, + &out_len, 0, &buf_over, + vars->name,vars->name_length); + str_buf[sizeof(str_buf)-1] = '\0'; - for (vars = last_vars; vars; vars=vars->next_variable) { - if (__oid_cmp(oid_arr, oid_arr_len, vars->name, - vars->name_length) == 0) { - if (type == TYPE_UNKNOWN) - type = __translate_asn_type(vars->type); - last_vars = vars->next_variable; - break; - } + if (__is_leaf(tp)) { + type = tp->type; + } else { + getlabel_flag |= NON_LEAF_NAME; + type = __translate_asn_type(vars->type); } - if (vars) { - __get_type_str(type, tmp_type_str); - tmp_sv = newSVpv(tmp_type_str,strlen(tmp_type_str)); - av_store(varbind, VARBIND_TYPE_F, tmp_sv); - len=__snprint_value(str_buf,sizeof(str_buf), - vars,tp,type,sprintval_flag); - tmp_sv=newSVpv((char*)str_buf, len); - av_store(varbind, VARBIND_VAL_F, tmp_sv); - if (sv_timestamp) - av_store(varbind, VARBIND_TYPE_F, sv_timestamp); - XPUSHs(sv_mortalcopy(tmp_sv)); + __get_label_iid(str_buf,&label,&iid,getlabel_flag); + if (label) { + av_store(varbind, VARBIND_TAG_F, + newSVpv(label, strlen(label))); } else { - av_store(varbind, VARBIND_VAL_F, &sv_undef); - av_store(varbind, VARBIND_TYPE_F, &sv_undef); - XPUSHs(&sv_undef); + av_store(varbind, VARBIND_TAG_F, + newSVpv("", 0)); } + if (iid) { + av_store(varbind, VARBIND_IID_F, + newSVpv(iid, strlen(iid))); + } else { + av_store(varbind, VARBIND_IID_F, + newSVpv("", 0)); + } + __get_type_str(type, tmp_type_str); + tmp_sv = newSVpv(tmp_type_str, strlen(tmp_type_str)); + av_store(varbind, VARBIND_TYPE_F, tmp_sv); + len=__snprint_value(str_buf,sizeof(str_buf), + vars,tp,type,sprintval_flag); + tmp_sv = newSVpv((char*)str_buf, len); + av_store(varbind, VARBIND_VAL_F, tmp_sv); + if (sv_timestamp) + av_store(varbind, VARBIND_TYPE_F, sv_timestamp); + XPUSHs(sv_mortalcopy(tmp_sv)); + } else { + /* Return undef for this variable. */ + XPUSHs(&sv_undef); } } + + /* Reset the library's behavior for numeric/symbolic OID's. */ + netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, + NETSNMP_DS_LIB_OID_OUTPUT_FORMAT, + old_format); + if (response) snmp_free_pdu(response); } else { XPUSHs(&sv_undef); /* no mem or bad args */ @@ -3207,7 +3270,7 @@ int getlabel_flag = NO_FLAGS; int sprintval_flag = USE_BASIC; int verbose = SvIV(perl_get_sv("SNMP::verbose", 0x01 | 0x04)); - int old_numeric, old_printfull; /* Old values of globals */ + int old_format; SV *sv_timestamp = NULL; New (0, oid_arr, MAX_OID_LEN, oid); @@ -3289,16 +3352,28 @@ ** library-wide globals, and have to be set/restored for each ** session. */ - old_numeric = netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, - NETSNMP_DS_LIB_PRINT_NUMERIC_OIDS); - old_printfull = netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, - NETSNMP_DS_LIB_PRINT_FULL_OID); + old_format = netsnmp_ds_get_int(NETSNMP_DS_LIBRARY_ID, + NETSNMP_DS_LIB_OID_OUTPUT_FORMAT); + if (SvIV(*hv_fetch((HV*)SvRV(sess_ref),"UseLongNames", 12, 1))) { + getlabel_flag |= USE_LONG_NAMES; + + netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, + NETSNMP_DS_LIB_OID_OUTPUT_FORMAT, + NETSNMP_OID_OUTPUT_FULL); + } + /* Setting UseNumeric forces UseLongNames on so check + for UseNumeric after UseLongNames (above) to make + sure the final outcome of + NETSNMP_DS_LIB_OID_OUTPUT_FORMAT is + NETSNMP_OID_OUTPUT_NUMERIC */ if (SvIV(*hv_fetch((HV*)SvRV(sess_ref),"UseNumeric", 10, 1))) { + getlabel_flag |= USE_LONG_NAMES; getlabel_flag |= USE_NUMERIC_OIDS; - netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_NUMERIC_OIDS, 1); - netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_FULL_OID, 1); + netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, + NETSNMP_DS_LIB_OID_OUTPUT_FORMAT, + NETSNMP_OID_OUTPUT_NUMERIC); } if (SvIOK(*hv_fetch((HV*)SvRV(sess_ref),"TimeStamp", 9, 1)) && @@ -3358,12 +3433,9 @@ } /* Reset the library's behavior for numeric/symbolic OID's. */ - if (getlabel_flag & USE_NUMERIC_OIDS) { - netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_NUMERIC_OIDS, - old_numeric ); - netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_FULL_OID, - old_printfull); - } + netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, + NETSNMP_DS_LIB_OID_OUTPUT_FORMAT, + old_format); if (response) snmp_free_pdu(response); @@ -3413,7 +3485,7 @@ int getlabel_flag = NO_FLAGS; int sprintval_flag = USE_BASIC; int verbose = SvIV(perl_get_sv("SNMP::verbose", 0x01 | 0x04)); - int old_numeric, old_printfull; /* Old values of globals */ + int old_format; SV *rv; SV *sv_timestamp = NULL; @@ -3502,20 +3574,33 @@ av_clear(varlist); /* - ** Set up for numeric OID's, if necessary. Save the old values - ** so that they can be restored when we finish -- these are - ** library-wide globals, and have to be set/restored for each + ** Set up for numeric or full OID's, if necessary. Save the old + ** output format so that it can be restored when we finish -- this + ** is a library-wide global, and has to be set/restored for each ** session. */ - old_numeric = netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, - NETSNMP_DS_LIB_PRINT_NUMERIC_OIDS); - old_printfull = netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, - NETSNMP_DS_LIB_PRINT_FULL_OID); + old_format = netsnmp_ds_get_int(NETSNMP_DS_LIBRARY_ID, + NETSNMP_DS_LIB_OID_OUTPUT_FORMAT); + + if (SvIV(*hv_fetch((HV*)SvRV(sess_ref),"UseLongNames", 12, 1))) { + getlabel_flag |= USE_LONG_NAMES; + + netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, + NETSNMP_DS_LIB_OID_OUTPUT_FORMAT, + NETSNMP_OID_OUTPUT_FULL); + } + /* Setting UseNumeric forces UseLongNames on so check + for UseNumeric after UseLongNames (above) to make + sure the final outcome of + NETSNMP_DS_LIB_OID_OUTPUT_FORMAT is + NETSNMP_OID_OUTPUT_NUMERIC */ if (SvIV(*hv_fetch((HV*)SvRV(sess_ref),"UseNumeric", 10, 1))) { + getlabel_flag |= USE_LONG_NAMES; getlabel_flag |= USE_NUMERIC_OIDS; - netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_NUMERIC_OIDS, 1); - netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_FULL_OID, 1); + netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, + NETSNMP_DS_LIB_OID_OUTPUT_FORMAT, + NETSNMP_OID_OUTPUT_NUMERIC); } if(response && response->variables) { @@ -3566,12 +3651,9 @@ } /* Reset the library's behavior for numeric/symbolic OID's. */ - if (getlabel_flag & USE_NUMERIC_OIDS) { - netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_NUMERIC_OIDS, - old_numeric ); - netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_FULL_OID, - old_printfull); - } + netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, + NETSNMP_DS_LIB_OID_OUTPUT_FORMAT, + old_format); if (response) snmp_free_pdu(response);