aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-05-28SSL: fix OpenSSL known renegotiation bug detectionAndreas Schultz
The OpenSSL detection match would actually consider all 1.0.1 versions as affected when really only 1.0.1 - 1.0.1c are.
2014-05-28SSL: in tests, filter ssl client ciphers for version compatibilityAndreas Schultz
Some psk and some not yet supported anonymous suites are only supported with TLS version >= 1.2. This adds them to the tests and makes sure that they are not tested on TLS versions that do not support them.
2014-05-26Merge branch 'saa/add_default_value_for_maps_get/OTP-11951' into maintBjörn-Egil Dahlberg
* saa/add_default_value_for_maps_get/OTP-11951: stdlib: Fix indentation of maps doc Add docs and test for maps:get/3 Add default value for maps:get
2014-05-26stdlib: Fix indentation of maps docBjörn-Egil Dahlberg
2014-05-26Merge branch 'dgud/observer/tests/OTP-11949' into maintDan Gudmundsson
* dgud/observer/tests/OTP-11949: observer: Let wx create statusbar observer: Destroy the wx env observer: Fix range check Test Tweaks Enable tests
2014-05-26Merge branch 'dgud/mnesia/timing-issue' into maintDan Gudmundsson
* dgud/mnesia/timing-issue: mnesia: Fix timing issue
2014-05-26Merge branch 'dgud/testcasecuddling' into maintDan Gudmundsson
* dgud/testcasecuddling: mnesia: Improve tests
2014-05-26Merge branch 'dgud/mnesia/force-load-hangs/OTP-11948' into maintDan Gudmundsson
* dgud/mnesia/force-load-hangs/OTP-11948: mnesia: Handle failed net_loads better
2014-05-26Merge branch 'egil/fix-maps-pretty-layout/OTP-11947' into maintBjörn-Egil Dahlberg
* egil/fix-maps-pretty-layout/OTP-11947: dialyzer: Add Maps type mismatch test hipe,compiler: Fix Map literals pretty printing
2014-05-26Merge branch 'nox/maps-cerl-ann_make_tree' into maintBjörn-Egil Dahlberg
* nox/maps-cerl-ann_make_tree: Support maps in cerl:ann_make_tree/3
2014-05-26Merge branch 'anders/diameter/dpr/OTP-11938' into maintAnders Svensson
* anders/diameter/dpr/OTP-11938: Ensure watchdog dies with transport if DPA was sent
2014-05-26Merge branch 'anders/diameter/sctp/OTP-11901' into maintAnders Svensson
* anders/diameter/sctp/OTP-11901: Fix diameter_sctp function_clause Anchor path regexps in examples suite Run examples suite over both TCP and SCTP
2014-05-26Merge branch 'hb/hipe/field_with_remote/OTP-11918' into maintHans Bolinder
* hb/hipe/field_with_remote/OTP-11918: hipe: fix a bug concerning typed record fields
2014-05-25Merge branch 'anders/diameter/rc_counters/OTP-11937' into maintAnders Svensson
* anders/diameter/rc_counters/OTP-11937: Count encode errors in outgoing messages Count decode errors in incoming requests Count decode errors independently of result codes
2014-05-25Merge branch 'anders/diameter/rc_counters/OTP-11891' into maintAnders Svensson
* anders/diameter/rc_counters/OTP-11891: Count result codes in CEA/DWA/DPA
2014-05-25Merge branch 'anders/diameter/watchdog_leak/OTP-11934' into maintAnders Svensson
* anders/diameter/watchdog_leak/OTP-11934: Simplify sending of 'close' to watchdog Fix watchdog table leak
2014-05-25Merge branch 'anders/diameter/request_leak/OTP-11893' into maintAnders Svensson
* anders/diameter/request_leak/OTP-11893: Fix leaking request table Add check that request table is empty to failover suite Comment fix
2014-05-25Fix diameter_sctp function_clauseAnders Svensson
Introduced in commit ed6395a6. The {stream, Id} transport_data set upon reception is passed back to us by default when receiving the answer to a request message, so even capabilities exchange failed.
2014-05-25Anchor path regexps in examples suiteAnders Svensson
They match emacs backup files and more without the anchor, although this doesn't stop the matches from finding files the suite isn't (yet) intended to test: files under development, not yet commited, etc.
2014-05-25Run examples suite over both TCP and SCTPAnders Svensson
This was supposed to already be the case (in what passes for my memory), and detects that commit ed6395a6 is horrifically broken: diameter is unable to send CEA over SCTP.
2014-05-23Ensure watchdog dies with transport if DPA was sentAnders Svensson
A DPR/DPA exchange should always cause the watchdog process in question to die with the transport, so that a subsequent connection with the same peer doesn't result in a 3 x DWR/DWA exchange. Commit 5903d6db saw to this for the sending of DPR but neglected the corresponding problem for DPA. In the case of sending DPR (the aforementioned commit), note that there's no distinction between receiving DPA as expected and not: the watchdog dies with the transport regardless. diameter_watchdog must be loaded first at upgrade.
2014-05-23Count encode errors in outgoing messagesAnders Svensson
Only decode errors were counted previously. Keys are of the form {Id, send, error}, where Id is: {ApplicationId, CommandCode, Rbit} | unknown The latter will be the case if not even a #diameter_header{} can be constructed.
2014-05-23hipe: fix a bug concerning typed record fieldsHans Bolinder
2014-05-22Change ERTS vsnRickard Green
2014-05-22Merge branch 'scrapinghub/stream_for_chunked_single_message' into maintMarcus Arendt
* scrapinghub/stream_for_chunked_single_message: inets: Fix streaming with single chunk body
2014-05-22Merge branch 'jv/ssh-io-binary' into maintMarcus Arendt
* jv/ssh-io-binary: Support binary standard_input in ssh_io
2014-05-22Merge branch 'dz/fix_ssl_max_seq_num' into maintMarcus Arendt
* dz/fix_ssl_max_seq_num: ssl: fix max sequence number so it does not overflow
2014-05-22Count decode errors in incoming requestsAnders Svensson
Errors were only counted in incoming answers. Counters are keyed on tuples of the same form: {{ApplicationId, CommandCode, Rbit}, recv, error}
2014-05-22Count decode errors independently of result codesAnders Svensson
Since the former doesn't exclude the latter. Counter values are returned by diameter:service_info/2. They can currently only be retrieved for a service, not for individual transports or peer connections.
2014-05-21Count result codes in CEA/DWA/DPAAnders Svensson
Corresponding counters for other answer messages have been counted previously, but those for CEA, DWA, and DPA have been missing since diameter itself sends these messages and the implementation is as bit more separate than it might be. The counters are keyed on values of the following form. {{ApplicationId, CommandCode, 0 = Rbit}, send|recv, {'Result-Code', RC}}
2014-05-20Merge branch 'sverk/etp-block-fix' into maintSverker Eriksson
* sverk/etp-block-fix: erts: Fix bug in etp-block commands
2014-05-20Simplify sending of 'close' to watchdogAnders Svensson
There's no need to send the message immediately if there's no transport configuration since that in itself means the service process will tell the watchdogs to die.
2014-05-20Fix watchdog table leakAnders Svensson
Commit ef5fddcb (diameter-1.4.1, R16B) caused the leak in the case of an accepting watchdog with restrict_connections = false. It (correctly) ensured the state remained at INITIAL but a subsequent 'close' message to terminate the process was ignored since the state was not DOWN. In fact, no 'close' was sent since there was no state transition or previous connection: the former triggers the message from diameter_service, the latter from diameter_watchdog. The message is now sent to self() from the watchdog itself. Send 'close' in the same way when multiple connections to the same peer are allowed, to avoid waiting for a watchdog timer expiry for the process to terminate in this case.
2014-05-18Fix leaking request tableAnders Svensson
A new connection writes the pid to the table diameter_request. The normal handling is that loss of a connection leads to a watchdog state change in the service process, which removes the entry, but this usually won't happen in the case of diameter:stop_service/1 since the service process is terminated without waiting for watchdog transitions. The request table should really be service-specific, so that the table is deleted when the service is stopped, which requires passing the table identifier into request processes and handling that the table may not exist. Just clear out the service-specific entries at service process termination for now.
2014-05-18Add check that request table is empty to failover suiteAnders Svensson
The way in which this suite causes transport connections to be broken - by stopping the service - makes it prone to orphaning entries in the request table, which is a bug we're about to fix.
2014-05-18Comment fixAnders Svensson
2014-05-15Merge branch 'egil/move-maps-doc' into maintBjörn-Egil Dahlberg
* egil/move-maps-doc: doc: Move Maps reference documentation to expressions
2014-05-15Merge branch 'ia/ssl/dubble-next-proto/OTP-11926' into maintIngela Anderton Andin
* ia/ssl/dubble-next-proto/OTP-11926: ssl: Fix dialyzer spec ssl: Only allow one next protocol handsake message
2014-05-14Merge branch 'rolkar/fix-syntax_tools-revert-bug/OTP-11930' into maintBjörn-Egil Dahlberg
* rolkar/fix-syntax_tools-revert-bug/OTP-11930: Fix reverting map in syntax_tools Add test case to syntax_tools
2014-05-14doc: Move Maps reference documentation to expressionsBjörn-Egil Dahlberg
2014-05-14Merge branch 'fenollp/remove-erl_parse-legacy-map' into maintMarcus Arendt
* fenollp/remove-erl_parse-legacy-map: Replace local mapl/2 (Erlang < 5.0) unique call by a LC
2014-05-14Merge branch 'dz/inet_getstat_doc_typo_fix' into maintMarcus Arendt
* dz/inet_getstat_doc_typo_fix: inet: fix typo in inet:getstat/2 doc
2014-05-14ssl: Fix dialyzer specIngela Anderton Andin
2014-05-13ssl: Only allow one next protocol handsake messageIngela Anderton Andin
2014-05-13Merge branch 'hb/hipe/field_with_remote/OTP-11918' into maintHans Bolinder
* hb/hipe/field_with_remote/OTP-11918: hipe: fix a bug concerning typed record fields
2014-05-13hipe: fix a bug concerning typed record fieldsHans Bolinder
When checking typed record fields Dialyzer failed to handle types containing remote types. Thanks to Erik Søe Sørensen for reporting this bug.
2014-05-12Merge branch 'egil/fix-erts_debug-size/OTP-11923' into maintBjörn-Egil Dahlberg
* egil/fix-erts_debug-size/OTP-11923: erts: Update preloaded erts_internal.beam erts: Add spec for erts_internal:map_to_tuple_keys/1 erts: Add testcase for erts_debug:size/1 Map terms kernel: Fix erts_debug:size/1 to handle Map sizes erts: Add erts_internal:map_to_tuple_keys/1
2014-05-12Merge branch 'nox/fix-eval-map-update/OTP-11922' into maintBjörn-Egil Dahlberg
* nox/fix-eval-map-update/OTP-11922: Fix evaluation of map updates in the debugger and erl_eval
2014-05-12erts: Fix bug in etp-block commandsSverker Eriksson
2014-05-12Merge branch 'ia/ssl/inherit/OTP-11897' into maintIngela Anderton Andin
* ia/ssl/inherit/OTP-11897: ssl: Handle socket option inheritance when pooling of accept sockets is used