← Back to branch summary

~ubuntu-branches/ubuntu/trusty/net-snmp/trusty

« back to all changes in this revision

Viewing changes to perl/SNMP/SNMP.xs

  • Committer: Bazaar Package Importer
  • Author(s): Jochen Friedrich
  • Date: 2010-06-10 18:02:54 UTC
  • mto: (1.4.1 experimental)
  • mto: This revision was merged to the branch mainline in revision 44.
  • Revision ID: james.westby@ubuntu.com-20100610180254-6ezvupl2clicwdqf
Import upstream version 5.4.3~dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
perl/SNMP/SNMP.xs
1396
1396
 
1397
1397
  case NETSNMP_CALLBACK_OP_TIMED_OUT:
1398
1398
    varlist_ref = &sv_undef;
 
1399
    sv_setpv(*err_str_svp, (char*)snmp_api_errstring(SNMPERR_TIMEOUT));
 
1400
    sv_setiv(*err_num_svp, SNMPERR_TIMEOUT);
1399
1401
    break;
1400
1402
  default:;
1401
1403
  } /* switch op */
2085
2087
      ** easy enough to do, and will avoid confusion for the caller from mis-
2086
2088
      ** behaving agents (badly misbehaving... ;^).
2087
2089
      */
2088
 
      if ((context->pkts_exch > 1) && (pix < context->repeaters)) {
 
2090
      if (context->pkts_exch > 1) {
2089
2091
         if (__oid_cmp(vars->name, vars->name_length,
2090
 
                                   context->reqbase[pix].last_oid,
2091
 
                                   context->reqbase[pix].last_len) <= 0)
 
2092
                       expect->last_oid, expect->last_len) <= 0)
2092
2093
         {
2093
2094
            if (check) 
2094
2095
            {
2115
2116
      ** variables in a completed request.  In order to maintain the correct
2116
2117
      ** ordering of which variables we expect to see in this packet, we must
2117
2118
      ** not set the ignore flags immediately.  It is done in bulkwalk_done().
2118
 
      ** XXX Can we use 'expect' instead of 'context->req_oids[pix]'?
2119
2119
      */
2120
2120
      if (context->oid_saved < context->non_reps) {
2121
2121
        DBPRT(2, (DBOUT "   expected var %s (nonrepeater %d/%d)\n",
2122
 
                  __snprint_oid(context->req_oids[pix].req_oid,
2123
 
                         context->req_oids[pix].req_len),
 
2122
                  __snprint_oid(expect->req_oid, expect->req_len),
2124
2123
                  pix, context->non_reps));
2125
2124
        DBPRT(2, (DBOUT "   received var %s\n",
2126
2125
                  __snprint_oid(vars->name, vars->name_length)));
2970
2969
        if (!strcmp(module,"ALL")) {
2971
2970
           read_all_mibs();
2972
2971
        } else {
2973
 
           read_module(module);
 
2972
           netsnmp_read_module(module);
2974
2973
        }
2975
2974
        if (get_tree_head()) {
2976
2975
           if (verbose) warn("Read %s\n", module);