diff options
| author | Raimo Niskanen <[email protected]> | 2014-05-20 15:15:43 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2014-07-25 12:15:16 +0200 |
| commit | cc1ab998ce905cd673c7ea14ee4e31ddb2412350 (patch) | |
| tree | ee74e4790f89a8282d077458ee9d1af472d8a914 /lib/snmp/src/agent/snmpa_mpd.erl | |
| parent | c1104d6708917d7ec0b3b77340242b679ee10122 (diff) | |
| download | otp-cc1ab998ce905cd673c7ea14ee4e31ddb2412350.tar.gz otp-cc1ab998ce905cd673c7ea14ee4e31ddb2412350.tar.bz2 otp-cc1ab998ce905cd673c7ea14ee4e31ddb2412350.zip | |
Don't encode IPv6 address into v1 trap and fix legacy arguments to snmpa_network_interface_filter functions
Diffstat (limited to 'lib/snmp/src/agent/snmpa_mpd.erl')
| -rw-r--r-- | lib/snmp/src/agent/snmpa_mpd.erl | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/lib/snmp/src/agent/snmpa_mpd.erl b/lib/snmp/src/agent/snmpa_mpd.erl index dbd57b732c..642b1f7fc5 100644 --- a/lib/snmp/src/agent/snmpa_mpd.erl +++ b/lib/snmp/src/agent/snmpa_mpd.erl @@ -1103,8 +1103,22 @@ transform_taddr(?transportDomainUdpIpv4, [A, B, C, D, P1, P2]) -> {ok, {Domain, Address}}; transform_taddr(?transportDomainUdpIpv4, BadAddr) -> {error, {bad_transportDomainUdpIpv4_address, BadAddr}}; -transform_taddr(?transportDomainUdpIpv6, - [A1, A2, A3, A4, A5, A6, A7, A8, P1, P2]) -> +transform_taddr( + ?transportDomainUdpIpv6, + [A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, + P1, P2]) -> + Domain = transportDomainUdpIpv6, + Addr = + {(A1 bsl 8) bor A2, (A3 bsl 8) bor A4, + (A5 bsl 8) bor A6, (A7 bsl 8) bor A8, + (A9 bsl 8) bor A10, (A11 bsl 8) bor A12, + (A13 bsl 8) bor A14, (A15 bsl 8) bor A16}, + Port = P1 bsl 8 + P2, + Address = {Addr, Port}, + {ok, {Domain, Address}}; +transform_taddr( + ?transportDomainUdpIpv6, + [A1, A2, A3, A4, A5, A6, A7, A8, P1, P2]) -> Domain = transportDomainUdpIpv6, Addr = {A1, A2, A3, A4, A5, A6, A7, A8}, Port = P1 bsl 8 + P2, |