aboutsummaryrefslogtreecommitdiffstats
path: root/erts/epmd
AgeCommit message (Collapse)Author
2010-01-22Merge branch 'bg/avoid-etop-in-include' into ccase/r13b04_devErlang/OTP
* bg/avoid-etop-in-include: epmd tests: fix build of test suites on Windows system test: fix build of test suites on Windows
2010-01-20epmd tests: fix build of test suites on WindowsBjörn Gustavsson
On Windows, the ERL_TOP environment variable contains a path that only is valid for cygwin-enabled programs, such as 'make'. It is not meaningful to pass the value of $ERL_TOP in the -I option to the Erlang compiler, because the Erlang emulator does not interpret cygwin paths correctly. Therefore, -include("test_server.hrl") will fail to find test_server.hrl. Work around the problem by creating an Emakefile and let ts:run() take care of the build (ts:run() will set up the include path so that test_server.hrl can be found).
2010-01-11Merge branch 'kj/epmd-port2resp-trunc-extra' into ccase/r13b04_devErlang/OTP
* kj/epmd-port2resp-trunc-extra: Handle "extra" field according to specs in ALIVE2_REQ and PORT2_RESP. OTP-8361 EPMD now correctly handles the extra data field which can be given in the ALIVE2_REQ request and retrieved in the PORT2_RESP response. (Thanks to Klas Johansson.)
2009-12-22Handle "extra" field according to specs in ALIVE2_REQ and PORT2_RESP.Klas Johansson
Don't let the length field pollute the value of the "extra" field in ALIVE2_REQ. Extra was read, starting at the second byte of the two byte length field, which meant that it was included in the result and the last byte of the value was skipped: if "extra" is <<1, 2>>, return <<0, 2, 1, 2>> not <<0, 2, 2, 1>> Increment the offset correctly when sending PORT2_RESP, in order to make sure the "extra" field won't be truncated: if "extra" is <<>>, return <<0, 0>> not <<0>> if "extra" is <<1, 2>>, return <<0, 2, 1, 2>> not <<0, 2, 1>> Allow null characters in "extra".
2009-11-20The R13B03 release.OTP_R13B03Erlang/OTP