aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-09-09Merge branch 'anders/diameter/17.3_release/OTP-12093' into maintAnders Svensson
* anders/diameter/17.3_release/OTP-12093: vsn -> 1.7.1 Update appup for OTP-12094 Update appup for OTP-12080 Update appup for OTP-12069
2014-09-09Merge branch 'anders/diameter/5014/OTP-12074' into maintAnders Svensson
* anders/diameter/5014/OTP-12074: Don't leave extra bit in decoded AVP data
2014-09-09Merge branch 'anders/diameter/Failed-AVP/OTP-12094' into maintAnders Svensson
* anders/diameter/Failed-AVP/OTP-12094: Fix best effort decode of Failed-AVP Fix decode of Failed-AVP in RFC 3588 answer-message
2014-09-09Merge branch 'anders/diameter/counters/OTP-12080' into maintAnders Svensson
* anders/diameter/counters/OTP-12080: Fix counters for answer-message Count relayed messages on {relay, Rbit} Count request retransmissions Fix counting of outgoing requests
2014-09-09Merge branch 'anders/diameter/info/OTP-12069' into maintAnders Svensson
* anders/diameter/info/OTP-12069: Map binary process info to a reference/byte count Add info item for diameter:service_info/2 Add (process) info tuple to diameter:service_info/2 Add diameter_dbg:sizes/0 Tweak comments
2014-09-09Merge branch 'sverk/crypto-check-version/OTP-12146' into maintSverker Eriksson
* sverk/crypto-check-version/OTP-12146: crypto: Verify OpenSSL library major version at load
2014-09-09Merge branch 'fishcakez/dialyzer_beam_opts' into maintHenrik Nord
* fishcakez/dialyzer_beam_opts: Use compile options when dialyzing beam files
2014-09-09Merge branch 'hans/common_test/prop_test' into maintHans Nilsson
* hans/common_test/prop_test: ssh: update for triq tests common_test: ct_property_test call correct Triq function. ct_property_test: add Triq support
2014-09-09ssh: update for triq testsHans Nilsson
2014-09-09common_test: ct_property_test call correct Triq function.Hans Nilsson
2014-09-09ct_property_test: add Triq supportTuncer Ayaz
Also, ensure that the right module's counterexample/0 is called.
2014-09-08Don't leave extra bit in decoded AVP dataAnders Svensson
The bit is added in diameter_codec to induce a decode error in the case of 5014 errors, but was not removed before returning the decoded result. Code examining the binary data in a diameter_avp record would then see the extra bit.
2014-09-08vsn -> 1.7.1Anders Svensson
2014-09-08Update appup for OTP-12094Anders Svensson
diameter_codec must be loaded before diameter_traffic.
2014-09-08Update appup for OTP-12080Anders Svensson
2014-09-08Update appup for OTP-12069Anders Svensson
2014-09-08Fix best effort decode of Failed-AVPAnders Svensson
Commit c2c00fdd didn't get it quite right: it only decoded failed AVPs in the common dictionary since it's this dictionary an answer-message is decoded in. An extra dictionary isn't something that's easily passed through the decode without rewriting dictionary compilation however, and that's no small job, so continue with the use/abuse of the process dictionary by storing the dictionary module for the decode to retrieve. This is one step worse than previous uses since the dictionary is put in one module (diameter_codec) and got in another (the dictionary module), but it's the lesser of two evils.
2014-09-08Fix decode of Failed-AVP in RFC 3588 answer-messageAnders Svensson
Commit 066544fa had the unintended consequence of breaking the decode of Failed-AVP in answer-message as defined in the RFC 3588, since the grammar doesn't list Failed-AVP as an explicit component AVP, in contrast to the RFC 6733 grammar, which does. Handle this case explicitly, as an exception, just as with Failed-AVP as parent AVP.
2014-09-08Fix counters for answer-messageAnders Svensson
An answer message that sets the E-bit is encoded/decoded with Diameter common dictionary, using the answer-message grammar specified in the RFC. However, the dictionary of the application in question is the one that knows the command code of the message. Commit df19c272 didn't make this distinction when incrementing counters for an answer-message, using the common dictionary for both purposes, causing the message to be counted as unknown. This commit remedies that.
2014-09-08crypto: Verify OpenSSL library major version at loadSverker Eriksson
to prevent strange memory corruption crashes due to mismatch between header and library versions.
2014-09-08Merge branch 'bjorn/asn1/misc-bug-fixes/OTP-12125' into maintBjörn Gustavsson
* bjorn/asn1/misc-bug-fixes/OTP-12125: Workaround for combining two object sets separated by extension Clean up and correct handling of parameters for parameterized types Check the formal parameter for parameterized type definitions Report errors also for unused parameterized types Remove unused code for ABSTRACT-SYNTAX and TYPE-IDENTIFIER Correct expansion of parameterized types Add the module name to the #classdef{} record Eliminate the use of #identifier{} outside the tokeniser and parser Fix problem with object identifiers in external modules Rewrite get_referenced_type/2 Teach the ASN.1 compiler to handle objects in field names Teach the ASN.1 compiler to understand "EXPORTS ALL" Teach the ASN.1 compiler the parse option
2014-09-08Merge branch 'bjorn/asn1/decoding-robustness/OTP-12145' into maintBjörn Gustavsson
* bjorn/asn1/decoding-robustness/OTP-12145: BER decoding: Improve error checking for indefinite length BER: Test decoding of indefinite lengths
2014-09-08Merge branch 'lucafavatella/improve-cpu_sup-error-when-slow-port-init' into ↵Marcus Arendt
maint * lucafavatella/improve-cpu_sup-error-when-slow-port-init: Clarify error for slow `cpu_sup` port init
2014-09-05Merge branch 'rickard/memory_consuming_tuple_tests' into maintRickard Green
* rickard/memory_consuming_tuple_tests: Only run upper boundry tuple test with lots of memory
2014-09-05Only run upper boundry tuple test with lots of memoryRickard Green
2014-09-05Merge branch 'vinoski/enif-schedule-nif' into maintRickard Green
OTP-12128 * vinoski/enif-schedule-nif: Fix leak of NIF exports Use separate allocation type for NIF export
2014-09-05Fix leak of NIF exportsRickard Green
2014-09-05Use separate allocation type for NIF exportRickard Green
2014-09-05Merge branch 'hans/common_test/Makefile_fix' into maintHans Nilsson
* hans/common_test/Makefile_fix: common_test: update Makefile for ct_property_test module.
2014-09-05common_test: update Makefile for ct_property_test module.Hans Nilsson
2014-09-05Merge branch 'ia/public_key/utf8-doc' into maintIngela Anderton Andin
* ia/public_key/utf8-doc: public_key: Correct documentation of ASN-1 type utf8String
2014-09-05Merge branch 'maint' of git-server:otp into maintIngela Anderton Andin
2014-09-05public_key: Correct documentation of ASN-1 type utf8StringIngela Anderton Andin
2014-09-04Merge branch 'sverk/term_to_binary-realloc-size/OTP-12141' into maintSverker Eriksson
* sverk/term_to_binary-realloc-size/OTP-12141: erts: Fix bug in term_to_binary that reallocates binary with wrong size
2014-09-04Merge branch 'sverk/MIN_SMALL-to-integer' into maintSverker Eriksson
* sverk/MIN_SMALL-to-integer: erts: Correct conversion of MIN_SMALL numeral to fixnum OTP-12140
2014-09-04erts: Correct conversion of MIN_SMALL numeral to fixnumSverker Eriksson
list_to_integer and binary_to_integer returned un-normalized bignum for -134217728 on 32-bit and -576460752303423488 on 64-bit. Thanks to Jesper Louis Andersen, Mikael Pettersson and Anthony Ramine for report, initial patch and optimization suggestion.
2014-09-04Merge branch 'sverk/nif-inspect-copy-bug/OTP-9828' into maintSverker Eriksson
* sverk/nif-inspect-copy-bug/OTP-9828: erts: Fix bug with enif_make_copy reallocating writable binary Conflicts: erts/emulator/test/nif_SUITE.erl
2014-09-04Merge branch 'egil/fix-llvm-cc-warnings/OTP-12138' into maintBjörn-Egil Dahlberg
* egil/fix-llvm-cc-warnings/OTP-12138: odbc: Suppress signedness warnings for 'char *' ic: Suppress unused-value warning erts: Fix tentative-definition-incomplete-type erts: Don't redefine '_XOPEN_SOURCE'
2014-09-04Merge branch 'egil/maps-with-doc-tests/OTP-12137' into maintBjörn-Egil Dahlberg
* egil/maps-with-doc-tests/OTP-12137: stdlib: Test maps:with/2 stdlib: Document maps:with/2
2014-09-03erts: Fix bug with enif_make_copy reallocating writable binarySverker Eriksson
that could invalidate a pointer received from an earlier call to enif_inspect_binary. Solution: Emasculate writable binary at enif_inspect_binary. There are room for optimizations here as we now do an unconditional emasculation even though enif_make_copy is not called later in the NIF.
2014-09-03erts: Fix bug in term_to_binary that reallocates binary with wrong sizeSverker Eriksson
2014-09-03Merge branch 'arekinath/ssh/aes-ctr' into maintMarcus Arendt
* arekinath/ssh/aes-ctr: ssh: check if ssh client supports newer cipher- and MAC-algorithms SSH: only enable ciphers/MACs when they are available in crypto SSH: add ssh_to_openssh test for ciphers and macs SSH: documentation update for new algos SSH: add support for aes128-ctr and hmac-sha2-256
2014-09-03Merge branch 'hans/update_vsn.mk' into maintHans Nilsson
2014-09-03ssh: update vsn.mkHans Nilsson
2014-09-03inets: update vsn.mkHans Nilsson
2014-09-03common_test: update vsn.mkHans Nilsson
2014-09-02Merge branch 'hans/proptest/init/OTP-12119' into maintHans Nilsson
* hans/proptest/init/OTP-12119: ssh: Add simple experimental property test suites inets: Add simple experimental property test suite common_test: Add experimental module ct_property_test
2014-09-02ssh: Add simple experimental property test suitesHans Nilsson
2014-09-02inets: Add simple experimental property test suiteHans Nilsson
2014-09-02common_test: Add experimental module ct_property_testHans Nilsson
This module may change without warning...