head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.46 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.44 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.42 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.40 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.38 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.36 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.34 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.32 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.30 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.28 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.26 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.24 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.22 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.20 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.18 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.16 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.14 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.12 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.10 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.8 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.6 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.4 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.2 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.2.0.6 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.4 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.2 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1 netbsd-1-5-PATCH001:1.1; locks; strict; comment @# @; 1.3 date 2004.11.05.10.40.35; author seb; state dead; branches; next 1.2; 1.2 date 2004.02.13.17.46.22; author seb; state Exp; branches; next 1.1; 1.1 date 2001.01.30.22.03.39; author wrstuden; state Exp; branches; next ; desc @@ 1.3 log @Remove package p5-SNMP as the net-snmp package now includes the associated Perl modules. @ text @$NetBSD: patch-ab,v 1.2 2004/02/13 17:46:22 seb Exp $ --- SNMP/SNMP.xs.orig Fri Jul 25 01:14:48 2003 +++ SNMP/SNMP.xs @@@@ -119,15 +119,15 @@@@ static int __snprint_value _((char *, si netsnmp_variable_list*, struct tree *, int, int)); static int __sprint_num_objid _((char *, oid *, int)); -static int __scan_num_objid _((char *, oid *, int *)); +static int __scan_num_objid _((char *, oid *, size_t *)); static int __get_type_str _((int, char *)); static int __get_label_iid _((char *, char **, char **, int)); static int __oid_cmp _((oid *, int, oid *, int)); static int __tp_sprint_num_objid _((char*,SnmpMibNode *)); static SnmpMibNode * __get_next_mib_node _((SnmpMibNode *)); static struct tree * __oid2tp _((oid*, int, struct tree *, int*)); -static struct tree * __tag2oid _((char *, char *, oid *, int *, int *, int)); -static int __concat_oid_str _((oid *, int *, char *)); +static struct tree * __tag2oid _((char *, char *, oid *, size_t *, int *, int)); +static int __concat_oid_str _((oid *, size_t *, char *)); static int __add_var_val_str _((netsnmp_pdu *, oid *, int, char *, int, int)); static int __send_sync_pdu _((netsnmp_session *, netsnmp_pdu *, @@@@ -565,7 +565,7 @@@@ static int __scan_num_objid (buf, objid, len) char *buf; oid *objid; -int *len; +size_t *len; { char *cp; *len = 0; @@@@ -818,7 +818,7 @@@@ __tag2oid(tag, iid, oid_arr, oid_arr_len char * tag; char * iid; oid * oid_arr; -int * oid_arr_len; +size_t * oid_arr_len; int * type; int best_guess; { @@@@ -826,7 +826,7 @@@@ int best_guess; struct tree *rtp = NULL; DLL_IMPORT extern struct tree *tree_head; oid newname[MAX_OID_LEN], *op; - int newname_len = 0; + size_t newname_len = 0; if (type) *type = TYPE_UNKNOWN; if (oid_arr_len) *oid_arr_len = 0; @@@@ -926,7 +926,7 @@@@ found: static int __concat_oid_str(doid_arr, doid_arr_len, soid_str) oid *doid_arr; -int *doid_arr_len; +size_t *doid_arr_len; char * soid_str; { char soid_buf[STR_BUF_SIZE]; @@@@ -2794,7 +2794,10 @@@@ snmp_read_mib(mib_file, force=0) if (verbose) warn("failed\n"); } } - RETVAL = (I32)Mib; + if (Mib) + RETVAL = (I32)1; + else + RETVAL = (I32)0; } OUTPUT: RETVAL @@@@ -2817,7 +2820,10 @@@@ snmp_read_module(module) } else { if (verbose) warn("Failed reading %s\n", module); } - RETVAL = (I32)Mib; + if (Mib) + RETVAL = (I32)1; + else + RETVAL = (I32)0; } OUTPUT: RETVAL @@@@ -2840,7 +2846,7 @@@@ snmp_set(sess_ref, varlist_ref, perl_cal netsnmp_pdu *pdu, *response; struct tree *tp; oid *oid_arr; - int oid_arr_len = MAX_OID_LEN; + size_t oid_arr_len = MAX_OID_LEN; char *tag_pv; snmp_xs_cb_data *xs_cb_data; SV **sess_ptr_sv; @@@@ -3035,7 +3041,7 @@@@ snmp_get(sess_ref, retry_nosuch, varlist struct tree *tp; int len; oid *oid_arr = NULL; - int oid_arr_len = MAX_OID_LEN; + size_t oid_arr_len = MAX_OID_LEN; SV *tmp_sv; char *tag_pv; int type; @@@@ -3188,7 +3194,7 @@@@ snmp_getnext(sess_ref, varlist_ref, perl struct tree *tp; int len; oid *oid_arr; - int oid_arr_len = MAX_OID_LEN; + size_t oid_arr_len = MAX_OID_LEN; SV *tmp_sv; int type; char tmp_type_str[MAX_TYPE_NAME_LEN]; @@@@ -3394,7 +3400,7 @@@@ snmp_getbulk(sess_ref, nonrepeaters, max struct tree *tp; int len; oid *oid_arr; - int oid_arr_len = MAX_OID_LEN; + size_t oid_arr_len = MAX_OID_LEN; SV *tmp_sv; int type; char tmp_type_str[MAX_TYPE_NAME_LEN]; @@@@ -3599,7 +3605,7 @@@@ snmp_bulkwalk(sess_ref, nonrepeaters, ma netsnmp_session *ss; netsnmp_pdu *pdu = NULL; oid oid_arr[MAX_OID_LEN]; - int oid_arr_len; + size_t oid_arr_len; SV **sess_ptr_sv; SV **err_str_svp; SV **err_num_svp; @@@@ -3813,9 +3819,9 @@@@ snmp_bulkwalk(sess_ref, nonrepeaters, ma } /* Sent okay... Return the request ID in 'pdu' as an SvIV. */ - DBPRT(1,( "Okay, request id is %d\n", (int)pdu)); +/* DBPRT(1,( "Okay, request id is %d\n", (int)pdu)); */ /* XSRETURN_IV((int)pdu); */ - XPUSHs(sv_2mortal(newSViv((int)pdu))); + XPUSHs(sv_2mortal(newSViv((IV)pdu))); XSRETURN(1); } @@@@ -3908,7 +3914,7 @@@@ snmp_trapV1(sess_ref,enterprise,agent,ge netsnmp_pdu *pdu = NULL; struct tree *tp; oid *oid_arr; - int oid_arr_len = MAX_OID_LEN; + size_t oid_arr_len = MAX_OID_LEN; SV **sess_ptr_sv; SV **err_str_svp; SV **err_num_svp; @@@@ -4045,7 +4051,7 @@@@ snmp_trapV2(sess_ref,uptime,trap_oid,var netsnmp_pdu *pdu = NULL; struct tree *tp; oid *oid_arr; - int oid_arr_len = MAX_OID_LEN; + size_t oid_arr_len = MAX_OID_LEN; SV **sess_ptr_sv; SV **err_str_svp; SV **err_num_svp; @@@@ -4180,7 +4186,7 @@@@ snmp_inform(sess_ref,uptime,trap_oid,var netsnmp_pdu *response; struct tree *tp; oid *oid_arr; - int oid_arr_len = MAX_OID_LEN; + size_t oid_arr_len = MAX_OID_LEN; snmp_xs_cb_data *xs_cb_data; SV **sess_ptr_sv; SV **err_str_svp; @@@@ -4405,7 +4411,7 @@@@ snmp_translate_obj(var,mode,use_long,aut { char str_buf[STR_BUF_SIZE]; oid oid_arr[MAX_OID_LEN]; - int oid_arr_len = MAX_OID_LEN; + size_t oid_arr_len = MAX_OID_LEN; char * label; char * iid; int status = FAILURE; @ 1.2 log @Update to version 5.0.9. The main change is the switch from UCD-SNMP to Net-SNMP, gaining asynchronous operation in the process and support for net-snmp configuration files -this will likely affect your perl applications. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Update to version 3.1.0. Also added support for regression testing. make test in package directory will run test suite. snmpd and snmptrapd need to already running, and t/startagent.pl needs to have correct values for SNMP v1 access. @ text @d2 175 a176 15 --- t/mibload.t.orig Mon Jan 29 10:19:18 2001 +++ t/mibload.t Mon Jan 29 10:24:02 2001 @@@@ -33,9 +33,9 @@@@ @@mibdir = ("/usr/mibs"); @@mibfile = ("/usr/mibs/IPV6-TCP-MIB.txt", "/usr/mibs/snmp-proxy-mib.txt"); } else { - $mibfile1 = "/usr/local/share/snmp/mibs/TCP-MIB.txt"; - @@mibdir = ('/usr/local/share/snmp/mibs/'); - @@mibfile = ('/usr/local/share/snmp/mibs/IPV6-TCP-MIB.txt'); + $mibfile1 = "$ENV{'PREFIX'}/share/snmp/mibs/TCP-MIB.txt"; + @@mibdir = ("$ENV{'PREFIX'}/share/snmp/mibs/"); + @@mibfile = ("$ENV{'PREFIX'}/share/snmp/mibs/IPV6-TCP-MIB.txt"); } ###################################################################### # See if we can find a mib to use, return of 0 means the file wasn't @