diff options
| author | Raimo Niskanen <[email protected]> | 2014-07-02 15:37:41 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2014-07-30 10:31:24 +0200 |
| commit | 1e67db678ea40e4b8a125da425c86fdfe7f1b986 (patch) | |
| tree | 1abe0b5f8f91fb6efaa17aa4f393f79739b9da56 | |
| parent | 81d2a6e1b13e944893377d93505523b8e7995e53 (diff) | |
| download | otp-1e67db678ea40e4b8a125da425c86fdfe7f1b986.tar.gz otp-1e67db678ea40e4b8a125da425c86fdfe7f1b986.tar.bz2 otp-1e67db678ea40e4b8a125da425c86fdfe7f1b986.zip | |
Use {ipv6_v6only, true}
| -rw-r--r-- | lib/snmp/src/agent/snmpa_net_if.erl | 11 | ||||
| -rw-r--r-- | lib/snmp/src/app/snmp.appup.src | 4 | ||||
| -rw-r--r-- | lib/snmp/vsn.mk | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/lib/snmp/src/agent/snmpa_net_if.erl b/lib/snmp/src/agent/snmpa_net_if.erl index 8f6706166b..389c26834d 100644 --- a/lib/snmp/src/agent/snmpa_net_if.erl +++ b/lib/snmp/src/agent/snmpa_net_if.erl @@ -1448,9 +1448,14 @@ get_counters([Counter|Counters], Acc) -> socket_opts(Domain, {IpAddr, IpPort}, Opts) -> [IpPort, % Picked off at socket open, separate argument - binary, - snmp_conf:tdomain_to_family(Domain) - | case get_bind_to_ip_address(Opts) of + 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}]; _ -> diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src index babc33e6a5..ae79e3c1d1 100644 --- a/lib/snmp/src/app/snmp.appup.src +++ b/lib/snmp/src/app/snmp.appup.src @@ -28,6 +28,8 @@ %% {update, snmpa_local_db, soft, soft_purge, soft_purge, []} %% {add_module, snmpm_net_if_mt} [ + {"4.25.1", [{restart_application, snmp}]}, + {"4.25.0.1", [{restart_application, snmp}]}, {"4.25", [{restart_application, snmp}]}, {"4.24.2", [{restart_application, snmp}]}, {"4.24.1", [{restart_application, snmp}]}, @@ -40,6 +42,8 @@ %% {remove, {snmpm_net_if_mt, soft_purge, soft_purge}} [ + {"4.25.1", [{restart_application, snmp}]}, + {"4.25.0.1", [{restart_application, snmp}]}, {"4.25", [{restart_application, snmp}]}, {"4.24.2", [{restart_application, snmp}]}, {"4.24.1", [{restart_application, snmp}]}, diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk index 533e313bdb..fd10244386 100644 --- a/lib/snmp/vsn.mk +++ b/lib/snmp/vsn.mk @@ -18,6 +18,6 @@ # %CopyrightEnd% APPLICATION = snmp -SNMP_VSN = 4.25.0.1 +SNMP_VSN = 5.0 PRE_VSN = APP_VSN = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)" |