aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/src/misc/snmp_misc.erl
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-03-28 18:29:04 +0200
committerMicael Karlberg <[email protected]>2011-03-28 18:29:04 +0200
commit5f4c56191dd2ff41768b3ac2873a61da934298fc (patch)
treeb6983e14b74e97ac44c2192dae9ee22e26552f73 /lib/snmp/src/misc/snmp_misc.erl
parentfd7d92ab5f37c27817543b33ac9be5c38ed3ceb0 (diff)
downloadotp-5f4c56191dd2ff41768b3ac2873a61da934298fc.tar.gz
otp-5f4c56191dd2ff41768b3ac2873a61da934298fc.tar.bz2
otp-5f4c56191dd2ff41768b3ac2873a61da934298fc.zip
Cosmetic prep for handling of domains in the config tool.
Diffstat (limited to 'lib/snmp/src/misc/snmp_misc.erl')
-rw-r--r--lib/snmp/src/misc/snmp_misc.erl9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/snmp/src/misc/snmp_misc.erl b/lib/snmp/src/misc/snmp_misc.erl
index 1b535743a4..2dce76992b 100644
--- a/lib/snmp/src/misc/snmp_misc.erl
+++ b/lib/snmp/src/misc/snmp_misc.erl
@@ -347,10 +347,15 @@ bits_to_int([Kibble|Ks],Kibbles,Res) ->
%%----------------------------------------------------------------------
-%% Returns: {ok, {int(),int(),int(),int()}} | {error, Reason}
+%% Returns: {ok, {int(),int(),int(),int()}} |
+%% {ok, {int(),int(),int(),int()},int(),int(),int(),int()} |
+%% {error, Reason}
%%----------------------------------------------------------------------
ip(Host) ->
- inet:getaddr(Host, inet).
+ ip(Host, inet).
+
+ip(Host, Family) ->
+ inet:getaddr(Host, Family).
ensure_trailing_dir_delimiter([]) -> "/";
ensure_trailing_dir_delimiter(DirSuggestion) ->