← Back to branch summary

~ubuntu-branches/ubuntu/trusty/erlang/trusty

« back to all changes in this revision

Viewing changes to lib/snmp/src/agent/snmp_target_mib.erl

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2011-05-05 15:48:43 UTC
  • mfrom: (3.5.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110505154843-0om6ekzg6m7ugj27
Tags: 1:14.b.2-dfsg-3ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not
    supposed to.
  - Drop erlang-wx binary.
  - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they
    do not really need wx. Also drop it from -debugger; the GUI needs wx,
    but it apparently has CLI bits as well, and is also needed by -megaco,
    so let's keep the package for now.
  - debian/patches/series: Do what I meant, and enable build-options.patch
    instead.
* Additional changes:
  - Drop erlang-wx from -et
* Dropped Changes:
  - patches/pcre-crash.patch: CVE-2008-2371: outer level option with
    alternatives caused crash. (Applied Upstream)
  - fix for ssl certificate verification in newSSL: 
    ssl_cacertfile_fix.patch (Applied Upstream)
  - debian/patches/series: Enable native.patch again, to get stripped beam
    files and reduce the package size again. (build-options is what
    actually accomplished this)
  - Remove build-options.patch on advice from upstream and because it caused
    odd build failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/snmp/src/agent/snmp_target_mib.erl
1
1
%% 
2
2
%% %CopyrightBegin%
3
3
%% 
4
 
%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
 
4
%% Copyright Ericsson AB 1998-2010. All Rights Reserved.
5
5
%% 
6
6
%% The contents of this file are subject to the Erlang Public License,
7
7
%% Version 1.1, (the "License"); you may not use this file except in
18
18
%% 
19
19
-module(snmp_target_mib).
20
20
 
 
21
%% Avoid warning for local function error/1 clashing with autoimported BIF.
 
22
-compile({no_auto_import,[error/1]}).
21
23
-export([configure/1, reconfigure/1,
22
24
         snmpTargetSpinLock/1, snmpTargetSpinLock/2,
23
25
         snmpTargetAddrTable/1, snmpTargetAddrTable/3,
509
511
%%-----------------------------------------------------------------
510
512
%% Instrumentation Functions
511
513
%%-----------------------------------------------------------------
 
514
snmpTargetSpinLock(print) ->
 
515
    VarAndValue = [{snmpTargetSpinLock, snmpTargetSpinLock(get)}],
 
516
    snmpa_mib_lib:print_variables(VarAndValue);
 
517
    
512
518
snmpTargetSpinLock(new) ->
513
519
    snmp_generic:variable_func(new, {snmpTargetSpinLock, volatile}),
514
520
    {A1,A2,A3} = erlang:now(),
589
595
                                     ?'snmpTargetAddrRowStatus_active' -> active;
590
596
                                     _ -> undefined
591
597
                                 end,
592
 
                                 Prefix,
593
 
                                 element(?snmpTargetAddrEngineId, Row),
594
 
                                 Prefix,
595
 
                                 element(?snmpTargetAddrTMask, Row),
596
 
                                 Prefix,
597
 
                                 element(?snmpTargetAddrMMS, Row)]))
 
598
                                 Prefix, element(?snmpTargetAddrEngineId, Row),
 
599
                                 Prefix, element(?snmpTargetAddrTMask, Row),
 
600
                                 Prefix, element(?snmpTargetAddrMMS, Row)]))
598
601
        end,
599
602
    snmpa_mib_lib:print_table(Table, DB, FOI, PrintRow);
600
603
%% Op == new | delete