From 2b69f31280d0146670bded9889bfa9e3c0ef3134 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Thu, 23 Apr 2015 15:04:08 +0200
Subject: Use port 0 with {fd,Fd}, use snmpm_fd in manager

---
 lib/snmp/src/agent/snmpa_net_if.erl   | 67 ++++++++++++++++++-----------------
 lib/snmp/src/app/snmp.appup.src       |  4 ++-
 lib/snmp/src/manager/snmpm_net_if.erl |  4 +--
 lib/snmp/src/manager/snmpm_server.erl |  8 +++--
 lib/snmp/vsn.mk                       |  4 +--
 5 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/lib/snmp/src/agent/snmpa_net_if.erl b/lib/snmp/src/agent/snmpa_net_if.erl
index 840d56d563..1e580072ba 100644
--- a/lib/snmp/src/agent/snmpa_net_if.erl
+++ b/lib/snmp/src/agent/snmpa_net_if.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2015. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -1447,38 +1447,39 @@ get_counters([Counter|Counters], Acc) ->
 %% ----------------------------------------------------------------
 
 socket_opts(Domain, {IpAddr, IpPort}, Opts) ->
-    [IpPort, % Picked off at socket open, separate argument
-     binary
-     |   case snmp_conf:tdomain_to_family(Domain) of
-	     inet6 = Family ->
-		 [Family, {ipv6_v6only, true}];
-	     Family ->
-		 [Family]
-	 end ++
-	 case get_bind_to_ip_address(Opts) of
-	     true ->
-		 [{ip, IpAddr}];
-	     _ ->
-		 []
-	 end ++
-	 case get_no_reuse_address(Opts) of
-	     false ->
-		 [{reuseaddr, true}];
-	     _ ->
-		 []
-	 end ++
-	 case get_recbuf(Opts) of
-	     use_default ->
-		 [];
-	     Sz ->
-		 [{recbuf, Sz}]
-	 end ++
-	 case get_sndbuf(Opts) of
-	     use_default ->
-		 [];
-	     Sz ->
-		 [{sndbuf, Sz}]
-	 end].
+    case get_bind_to_ip_address(Opts) of
+	true ->
+	    [IpPort, % Picked off at socket open, separate argument
+	     binary,
+	     {ip, IpAddr}];
+	_ ->
+	    [0, % Picked off at socket open, separate argument
+	     binary]
+    end ++
+	case snmp_conf:tdomain_to_family(Domain) of
+	    inet6 = Family ->
+		[Family, {ipv6_v6only, true}];
+	    Family ->
+		[Family]
+	end ++
+	case get_no_reuse_address(Opts) of
+	    false ->
+		[{reuseaddr, true}];
+	    _ ->
+		[]
+	end ++
+	case get_recbuf(Opts) of
+	    use_default ->
+		[];
+	    Sz ->
+		[{recbuf, Sz}]
+	end ++
+	case get_sndbuf(Opts) of
+	    use_default ->
+		[];
+	    Sz ->
+		[{sndbuf, Sz}]
+	end.
 
 
 %% ----------------------------------------------------------------
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index e7e54f5b7e..081163b368 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2014. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2015. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -28,6 +28,7 @@
 %% {update, snmpa_local_db, soft, soft_purge, soft_purge, []}
 %% {add_module,  snmpm_net_if_mt}
  [
+  {"5.1.1", [{restart_application, snmp}]},
   {"5.1", [ % Only compiler changes
   ]},
   {"5.0", [{restart_application, snmp}]},
@@ -46,6 +47,7 @@
 %% {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
 
  [
+  {"5.1.1", [{restart_application, snmp}]},
   {"5.1", [ % Only compiler changes
   ]},
   {"5.0", [{restart_application, snmp}]},
diff --git a/lib/snmp/src/manager/snmpm_net_if.erl b/lib/snmp/src/manager/snmpm_net_if.erl
index b4cc165d2e..0e1c51c609 100644
--- a/lib/snmp/src/manager/snmpm_net_if.erl
+++ b/lib/snmp/src/manager/snmpm_net_if.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2015. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -330,7 +330,7 @@ socket_params(Domain, {IpAddr, IpPort} = Addr, BindTo, CommonSocketOpts) ->
 	end,
     case Family of
 	inet ->
-	    case init:get_argument(snmp_fd) of
+	    case init:get_argument(snmpm_fd) of
 		{ok, [[FdStr]]} ->
 		    Fd = list_to_integer(FdStr),
 		    case BindTo of
diff --git a/lib/snmp/src/manager/snmpm_server.erl b/lib/snmp/src/manager/snmpm_server.erl
index a75122d0bb..8fc3359159 100644
--- a/lib/snmp/src/manager/snmpm_server.erl
+++ b/lib/snmp/src/manager/snmpm_server.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2015. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -2116,7 +2116,8 @@ do_handle_agent(DefUserId, DefMod,
 	    ok;
 
 	InvalidResult ->
-	    CallbackArgs = [Domain, Addr, Type, SnmpInfo, DefData],
+	    CallbackArgs =
+		[Domain_or_Ip, Addr_or_Port, Type, SnmpInfo, DefData],
 	    handle_invalid_result(handle_agent, CallbackArgs, InvalidResult) 
 
     catch
@@ -2212,7 +2213,8 @@ do_handle_agent(DefUserId, DefMod,
 	    end;
 	
 	T:E ->
-	    CallbackArgs = [Domain, Addr, Type, SnmpInfo, DefData],
+	    CallbackArgs =
+		[Domain_or_Ip, Addr_or_Port, Type, SnmpInfo, DefData],
 	    handle_invalid_result(handle_agent, CallbackArgs, T, E)
 	    
     end.
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 345cc790f2..67adf0a34f 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2014. All Rights Reserved.
+# Copyright Ericsson AB 1997-2015. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -18,6 +18,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 5.1.1
+SNMP_VSN    = 5.1.2
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"
-- 
cgit v1.2.3