aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/src/misc
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2014-04-25 16:26:13 +0200
committerRaimo Niskanen <[email protected]>2014-07-25 12:15:13 +0200
commit16b194c40f8a9ce2e12b82afd7d44bc782a80795 (patch)
treeab932af309fdadbcd4602a0335acaa7b664866a3 /lib/snmp/src/misc
parent373d9fa059875a2d68251c485968d3aa78e830b4 (diff)
downloadotp-16b194c40f8a9ce2e12b82afd7d44bc782a80795.tar.gz
otp-16b194c40f8a9ce2e12b82afd7d44bc782a80795.tar.bz2
otp-16b194c40f8a9ce2e12b82afd7d44bc782a80795.zip
wip
Diffstat (limited to 'lib/snmp/src/misc')
-rw-r--r--lib/snmp/src/misc/snmp_conf.erl52
1 files changed, 46 insertions, 6 deletions
diff --git a/lib/snmp/src/misc/snmp_conf.erl b/lib/snmp/src/misc/snmp_conf.erl
index 3fefe3e8cd..d8a19c7137 100644
--- a/lib/snmp/src/misc/snmp_conf.erl
+++ b/lib/snmp/src/misc/snmp_conf.erl
@@ -45,6 +45,7 @@
mk_tdomain/1,
which_domain/1,
check_ip/1, check_ip/2,
+ check_address_no_port/2, check_port/1,
check_address/2, check_address/3,
check_taddress/2,
mk_taddress/2,
@@ -155,7 +156,8 @@ no_filter(X) -> X.
-read(File, Check) ->
+read(File, Verify) ->
+ Check = fun (Row, State) -> {Verify(Row), State} end,
read(File, fun no_order/2, Check).
%% Ret. Res | exit(Reason)
@@ -740,32 +742,70 @@ check_ip(BadDomain, _X) ->
%% ---------
+%% check_address_default_port(Domain, Address) ->
+%% case check_address_ip(Domain, Address) of
+%% false ->
+%% case check_address_ip_port(Domain, Address) of
+%% false ->
+%% error({bad_address, {Domain, Address}});
+%% _ ->
+%% ok
+%% end;
+%% _ ->
+%% ok
+%% end.
+
+check_address_no_port(Domain, Address) ->
+ case check_address_ip(Domain, Address) of
+ false ->
+ error({bad_address, {Domain, Address}});
+ true ->
+ ok;
+ FixedIP ->
+ {ok, FixedIP}
+ end.
+
+check_port(Port) when ?is_word(Port) ->
+ ok;
+check_port(Port) ->
+ error({bad_port, Port}).
+
%% Check a configuration term field from a file to see if it
-%% can be fed to mk_taddress/2.
+%% can be fixed to be fed to mk_taddress/2.
check_address(Domain, Address, DefaultPort) ->
+ %% If Address does not contain Port or contains Port =:= 0
+ %% create an address containing DefaultPort
case check_address_ip(Domain, Address) of
false ->
case check_address_ip_port(Domain, Address) of
false ->
error({bad_address, {Domain, Address}});
true ->
- {ok, Address};
+ case Address of
+ {IP, 0} ->
+ {ok, {IP, DefaultPort}};
+ _ ->
+ ok
+ end;
+ {FixedIP, 0} ->
+ {ok, {FixedIP, DefaultPort}};
FixedAddress ->
{ok, FixedAddress}
end;
true ->
{ok, {Address, DefaultPort}};
- FixedIp ->
- {ok, {FixedIp, DefaultPort}}
+ FixedIP ->
+ {ok, {FixedIP, DefaultPort}}
end.
check_address(Domain, Address) ->
+ %% Address has to contain Port
case check_address_ip_port(Domain, Address) of
false ->
error({bad_address, {Domain, Address}});
true ->
- {ok, Address};
+ ok;
FixedAddress ->
{ok, FixedAddress}
end.