aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/src/misc/snmp_conf.erl
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2014-05-14 08:22:23 +0200
committerRaimo Niskanen <[email protected]>2014-07-25 12:15:15 +0200
commit9a955974c52baa62ca7283f86257ddca59d4dfd3 (patch)
tree3116bf04fef8ee1d29089366e0d0835770db7a11 /lib/snmp/src/misc/snmp_conf.erl
parentb012122510b88bd752652bbd400cc03e68c45a7e (diff)
downloadotp-9a955974c52baa62ca7283f86257ddca59d4dfd3.tar.gz
otp-9a955974c52baa62ca7283f86257ddca59d4dfd3.tar.bz2
otp-9a955974c52baa62ca7283f86257ddca59d4dfd3.zip
wip: Fix agent logging
Diffstat (limited to 'lib/snmp/src/misc/snmp_conf.erl')
-rw-r--r--lib/snmp/src/misc/snmp_conf.erl15
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/snmp/src/misc/snmp_conf.erl b/lib/snmp/src/misc/snmp_conf.erl
index 0cad61e5c8..bf1a025457 100644
--- a/lib/snmp/src/misc/snmp_conf.erl
+++ b/lib/snmp/src/misc/snmp_conf.erl
@@ -42,7 +42,7 @@
check_domain/1,
all_tdomains/0,
check_tdomain/1,
- mk_tdomain/1,
+ mk_tdomain/0, mk_tdomain/1,
tdomain_to_family/1,
which_domain/1,
check_ip/1, check_ip/2,
@@ -50,7 +50,7 @@
ip_port_to_domaddr/2,
check_address/2, check_address/3,
check_taddress/2,
- mk_taddress/2,
+ mk_taddress/1, mk_taddress/2,
check_packet_size/1,
@@ -462,6 +462,9 @@ check_tdomain(TDomain) ->
%% ---------
+mk_tdomain() ->
+ mk_tdomain(snmpUDPDomain).
+
mk_tdomain(snmpUDPDomain) ->
mk_tdomain(transportDomainUdpIpv4);
mk_tdomain(transportDomainUdpIpv4) ->
@@ -598,14 +601,14 @@ check_domain(Domain) ->
%% ---------
+mk_taddress(Address) ->
+ mk_taddress(snmpUDPDomain, Address).
+
%% The values of Domain, Ip and Port has both been checked at this
%% point, so we dont need to do that again, but this function is
%% also used on incoming packets from net_if so a little
%% check that net_if does not supply bad arguments is in order.
%%
-mk_taddress(snmpUDPDomain, Address) -> % Legacy
- mk_taddress(transportDomainUdpIpv4, Address);
-%%
%% These are just for convenience
mk_taddress(?snmpUDPDomain, Address) ->
mk_taddress(snmpUDPDomain, Address);
@@ -614,6 +617,8 @@ mk_taddress(?transportDomainUdpIpv4, Address) ->
mk_taddress(?transportDomainUdpIpv6, Address) ->
mk_taddress(transportDomainUdpIpv6, Address);
%%
+mk_taddress(snmpUDPDomain, Address) -> % Legacy
+ mk_taddress(transportDomainUdpIpv4, Address);
mk_taddress(transportDomainUdpIpv4 = Domain, Address) ->
case Address of
[] -> % Empty mask