ndt-dev - [ndt-dev] [ndt-project/ndt] cdd00a: Merged Issue154 branch into trunk

Subject: NDT-DEV email list created

List archive

[ndt-dev] [ndt-project/ndt] cdd00a: Merged Issue154 branch into trunk

From: GitHub <>
To:
Subject: [ndt-dev] [ndt-project/ndt] cdd00a: Merged Issue154 branch into trunk
Date: Tue, 09 Jun 2015 07:15:34 -0700
Domainkey-signature: a=rsa-sha1; c=nofws; d=github.com; s=mailo; q=dns; h=Date: From: Reply-To: To: Message-Id: Subject: Mime-Version: Content-Type: Content-Transfer-Encoding: Sender; b=XY+kjeq6PPPAXprTzfFconn/s97lytMMbZxCmMUwAvb028rKMGoFBotSDk9bjJEGImLOxV jq2T+rh8A8Morh/3DoAy86DO+0vyTvdYjoNvmfxpCwS4zXuvBicZW35zjKdJokk1zVuskILG z1wVkaDD3aa+bLLYsMoORrs54AOSA=

Branch: refs/heads/MultiplePorts
Home: https://github.com/ndt-project/ndt
Commit: cdd00a4b31710b0f37978d51bf51d99763b70578

https://github.com/ndt-project/ndt/commit/cdd00a4b31710b0f37978d51bf51d99763b70578
Author:

<>
Date: 2014-11-04 (Tue, 04 Nov 2014)

Changed paths:
M HTML5-frontend/script.js
M HTML5-frontend/style.css
M HTML5-frontend/widget.html
M flash-client/src/GUI.as
M flash-client/src/Main.as
M flash-client/src/NDTConstants.as
M flash-client/src/NDTPController.as
M flash-client/src/NDTUtils.as
M flash-client/src/TestC2S.as
M flash-client/src/TestS2C.as
M flash-client/src/UserAgentTools.as

Log Message:
-----------
Merged Issue154 branch into trunk

Commit: 9a34dbf78ac0dd35f88d72103d5dd11a52f53d8d

https://github.com/ndt-project/ndt/commit/9a34dbf78ac0dd35f88d72103d5dd11a52f53d8d
Author:

<@889c6698-20a3-11df-95ad-bbeafe1f0ab2>
Date: 2014-11-12 (Wed, 12 Nov 2014)

Changed paths:
M configure.ac
M src/Makefile.am

Log Message:
-----------
Improved build scripts to better support jansson library.

Commit: 2a0792d2d421946cfab991a48b4c4f382c9c55f8

https://github.com/ndt-project/ndt/commit/2a0792d2d421946cfab991a48b4c4f382c9c55f8
Author:

<>
Date: 2014-11-13 (Thu, 13 Nov 2014)

Changed paths:
A flash-client/assets/downArrow.png
A flash-client/assets/upArrow.png
M flash-client/src/GUI.as
M flash-client/src/TestResultsUtils.as
M flash-client/src/locale/ca_ES/DisplayMessages.properties
M flash-client/src/locale/el_GR/DisplayMessages.properties
M flash-client/src/locale/en_US/DisplayMessages.properties
M flash-client/src/locale/fr_FR/DisplayMessages.properties
M flash-client/src/locale/nb_NO/DisplayMessages.properties
M flash-client/src/locale/nl_NL/DisplayMessages.properties
M flash-client/src/locale/pt_BR/DisplayMessages.properties
M flash-client/src/locale/ru_RU/DisplayMessages.properties

Log Message:
-----------
Merged FlashClientIssues branch into trunk

Commit: b75f89fc75390bd1ed6313d8b551579a5a3b169e

https://github.com/ndt-project/ndt/commit/b75f89fc75390bd1ed6313d8b551579a5a3b169e
Author:

<>
Date: 2014-11-13 (Thu, 13 Nov 2014)

Changed paths:
M Applet/MANIFEST.MF

Log Message:
-----------
Updated manifest file to make it proper for new java security updates

Commit: 612197a93c4f8fa7ca1bbd06ad9e5cb0df7f1e8e

https://github.com/ndt-project/ndt/commit/612197a93c4f8fa7ca1bbd06ad9e5cb0df7f1e8e
Author:

<>
Date: 2014-11-14 (Fri, 14 Nov 2014)

Changed paths:
M flash-client/ndt-flash-config.xml

Log Message:
-----------
Disabled debug mode for release version of flash client

Commit: 2ae41852b54be4e07d8b9bea1f191d248f7e4ff0

https://github.com/ndt-project/ndt/commit/2ae41852b54be4e07d8b9bea1f191d248f7e4ff0
Author:

<>
Date: 2014-11-14 (Fri, 14 Nov 2014)

Changed paths:
M HTML5-frontend/script.js
M HTML5-frontend/set-active-client.sh
M HTML5-frontend/style.css
M HTML5-frontend/widget.html

Log Message:
-----------
Edited widget.html for better user experience

Commit: a783ee2c1b6058e03aed77a90a90d891c8caf884

https://github.com/ndt-project/ndt/commit/a783ee2c1b6058e03aed77a90a90d891c8caf884
Author: Peter Boothe
<>
Date: 2014-11-20 (Thu, 20 Nov 2014)

Changed paths:
M src/web100srv.c

Log Message:
-----------
Replace tight gotos with equivalent do-while.

Commit: 0809d82eadf3b8db10e7fd978f2bb10b29506576

https://github.com/ndt-project/ndt/commit/0809d82eadf3b8db10e7fd978f2bb10b29506576
Author:

<>
Date: 2014-11-24 (Mon, 24 Nov 2014)

Changed paths:
M flash-client/src/TestResultsUtils.as

Log Message:
-----------
Issue 163 Fixed incorrect variables usage in TestResultsUtils.as

Commit: be40bff7268bd90fff2c99a1fa747b4a52223ee4

https://github.com/ndt-project/ndt/commit/be40bff7268bd90fff2c99a1fa747b4a52223ee4
Author: Peter Boothe
<>
Date: 2014-12-08 (Mon, 08 Dec 2014)

Changed paths:
M src/Makefile.am
A src/unit_testing.c
A src/unit_testing.h
A src/web100srv_unit_tests.c

Log Message:
-----------
Added an end-to-end test and a basic unit testing framework to run it in.
Also added test support to autoconf.

You can now type
$ make check
and tests will be run.

Commit: 26990e4985ace50a142ed32e32629dce5545a460

https://github.com/ndt-project/ndt/commit/26990e4985ace50a142ed32e32629dce5545a460
Author:

<>
Date: 2015-01-09 (Fri, 09 Jan 2015)

Changed paths:
M Applet/precompiled/Tcpbw100.jar
A HTML5-frontend/Makefile.am
M HTML5-frontend/script.js
M HTML5-frontend/style.css
M HTML5-frontend/widget.html
M Makefile.am
M conf/ndt-apache.conf
M conf/ndt-init
M conf/ndt-sysconfig
M configure.ac
M flash-client/Makefile.am
A flash-client/precompiled/FlashClt.swf
A flashpolicy.xml
A ndt-flashpolicyd
M ndt.spec
M src/fakewww.c

Log Message:
-----------
Merge Issue162 branch into trunk

Commit: 2cf1f41e8706f9c0d8ed015c31f982d65e4ce083

https://github.com/ndt-project/ndt/commit/2cf1f41e8706f9c0d8ed015c31f982d65e4ce083
Author:

<>
Date: 2015-01-09 (Fri, 09 Jan 2015)

Changed paths:
M configure.ac

Log Message:
-----------
Have the configure script work with an I2util version installed like a
normal library

Commit: ff796850d3a7585f82921b2e05878ff34f05a5bb

https://github.com/ndt-project/ndt/commit/ff796850d3a7585f82921b2e05878ff34f05a5bb
Author:

<>
Date: 2015-01-09 (Fri, 09 Jan 2015)

Changed paths:
M flash-client/precompiled/FlashClt.swf

Log Message:
-----------
Update the precompiled flash client

Commit: d6b60bcd6d114e1eba064257be4a82099ed98653

https://github.com/ndt-project/ndt/commit/d6b60bcd6d114e1eba064257be4a82099ed98653
Author:

<>
Date: 2015-01-09 (Fri, 09 Jan 2015)

Changed paths:
M Applet/precompiled/Tcpbw100.jar

Log Message:
-----------
Build and sign a new precompiled version of the Applet

Commit: 8db8271c5a748371cf4072223c149c82eb670390

https://github.com/ndt-project/ndt/commit/8db8271c5a748371cf4072223c149c82eb670390
Author:

<>
Date: 2015-01-09 (Fri, 09 Jan 2015)

Changed paths:
M configure.ac

Log Message:
-----------
Change how the "test for I2util" happens to avoid an AMDEP error

Commit: 29bfff7df61b906caddca1490e99c880cd382678

https://github.com/ndt-project/ndt/commit/29bfff7df61b906caddca1490e99c880cd382678
Author:

<>
Date: 2015-01-21 (Wed, 21 Jan 2015)

Changed paths:
M Applet/MANIFEST.MF
M Applet/precompiled/Tcpbw100.jar
M configure.ac
M ndt.spec
M src/Makefile.am

Log Message:
-----------
Misc. fixes for the -rc1 prerelease

Commit: 972bd9f9550b0feecea0da56227bcffd28be9c1c

https://github.com/ndt-project/ndt/commit/972bd9f9550b0feecea0da56227bcffd28be9c1c
Author:

<>
Date: 2015-02-18 (Wed, 18 Feb 2015)

Changed paths:
M src/logging.c

Log Message:
-----------
Merge Issue36 branch

Commit: f308f665add253d55cb88e12f976fb8d557830c7

https://github.com/ndt-project/ndt/commit/f308f665add253d55cb88e12f976fb8d557830c7
Author:

<>
Date: 2015-02-18 (Wed, 18 Feb 2015)

Changed paths:
M src/analyze.c
M src/ndt_odbc.c
M src/ndt_odbc.h
M src/testoptions.c
M src/web100srv.c
M src/web100srv.h

Log Message:
-----------
Merge Issue165 branch

Commit: a5eceeed8e7e009ed4bdfe62bf9aa0bf196878c7

https://github.com/ndt-project/ndt/commit/a5eceeed8e7e009ed4bdfe62bf9aa0bf196878c7
Author:

<>
Date: 2015-03-11 (Wed, 11 Mar 2015)

Changed paths:
M src/Makefile.am

Log Message:
-----------
web100clt is also installed when using web10g

Commit: 91a829f06554cde3d81c655371ad3bc11fa6f305

https://github.com/ndt-project/ndt/commit/91a829f06554cde3d81c655371ad3bc11fa6f305
Author:

<>
Date: 2015-03-11 (Wed, 11 Mar 2015)

Changed paths:
M HTML5-frontend/script.js
M HTML5-frontend/widget.html

Log Message:
-----------
Jitter value display fix

Commit: 584fc5a58a066134996139f24a898d88ed22c205

https://github.com/ndt-project/ndt/commit/584fc5a58a066134996139f24a898d88ed22c205
Author:

<>
Date: 2015-03-11 (Wed, 11 Mar 2015)

Changed paths:
M HTML5-frontend/script.js
M HTML5-frontend/widget.html

Log Message:
-----------
Revert jitter value display fix from trunk

Commit: 3c1df3d1bc558f7d64da05fcc9336f718242f3d2

https://github.com/ndt-project/ndt/commit/3c1df3d1bc558f7d64da05fcc9336f718242f3d2
Author:

<>
Date: 2015-03-13 (Fri, 13 Mar 2015)

Changed paths:
M HTML5-frontend/script.js

Log Message:
-----------
Merge Issue171 branch into trunk

Commit: 1b4a6eb1747acae3b7528f35cc4a6a9e4a970225

https://github.com/ndt-project/ndt/commit/1b4a6eb1747acae3b7528f35cc4a6a9e4a970225
Author:

<>
Date: 2015-03-13 (Fri, 13 Mar 2015)

Changed paths:
M HTML5-frontend/script.js

Log Message:
-----------
Merge Issue170 branch into trunk

Commit: 6216f0ae61da66ebfc661b64bf0785b3c17af6b8

https://github.com/ndt-project/ndt/commit/6216f0ae61da66ebfc661b64bf0785b3c17af6b8
Author: Peter Boothe
<>
Date: 2015-03-18 (Wed, 18 Mar 2015)

Log Message:
-----------
Adding websocket support to NDT to enable Javascript-run tests

Commit: 15d08ff37abb65ddbd861a6e2fed9e953b0db9fa

https://github.com/ndt-project/ndt/commit/15d08ff37abb65ddbd861a6e2fed9e953b0db9fa
Author:

<>
Date: 2015-03-20 (Fri, 20 Mar 2015)

Changed paths:
M HTML5-frontend/script.js

Log Message:
-----------
Merge Issue174 into trunk

Commit: 4c30a2060772c9d9cd12a6d80286bddcc649380d

https://github.com/ndt-project/ndt/commit/4c30a2060772c9d9cd12a6d80286bddcc649380d
Author:

<>
Date: 2015-03-20 (Fri, 20 Mar 2015)

Changed paths:
M HTML5-frontend/script.js
M src/web100-util.c

Log Message:
-----------
Merge branch Issue167 into trunk

Commit: a68b8bacb15d4420ba4482ab1816c87df2351ae4

https://github.com/ndt-project/ndt/commit/a68b8bacb15d4420ba4482ab1816c87df2351ae4
Author:

<>
Date: 2015-03-20 (Fri, 20 Mar 2015)

Changed paths:
M HTML5-frontend/script.js
M HTML5-frontend/widget.html

Log Message:
-----------
Merge Issue169 branch into trunkx

Commit: b03c8d65a62cdf51d80eb53461ec856175157939

https://github.com/ndt-project/ndt/commit/b03c8d65a62cdf51d80eb53461ec856175157939
Author:

<>
Date: 2015-03-20 (Fri, 20 Mar 2015)

Changed paths:
M HTML5-frontend/script.js
M HTML5-frontend/style.css
M HTML5-frontend/widget.html

Log Message:
-----------
Merge Issue173 branch into trunk

Commit: 25bb0e094c19b6ddf8c1aeaec4af57c5d5ec06d4

https://github.com/ndt-project/ndt/commit/25bb0e094c19b6ddf8c1aeaec4af57c5d5ec06d4
Author:

<>
Date: 2015-03-20 (Fri, 20 Mar 2015)

Changed paths:
M HTML5-frontend/script.js

Log Message:
-----------
Merge Issue172 into trunk

Commit: 606ecf4d7a5a71b620a16a45d695e045862a2513

https://github.com/ndt-project/ndt/commit/606ecf4d7a5a71b620a16a45d695e045862a2513
Author:

<>
Date: 2015-03-23 (Mon, 23 Mar 2015)

Changed paths:
M HTML5-frontend/script.js

Log Message:
-----------
Removed NaN entries when test failed for some reason

Commit: bbe0fb467865a421fb5e4af2c848709b2e5e8f5a

https://github.com/ndt-project/ndt/commit/bbe0fb467865a421fb5e4af2c848709b2e5e8f5a
Author: Peter Boothe
<>
Date: 2015-03-23 (Mon, 23 Mar 2015)

Changed paths:
M src/Makefile.am
M src/jsonutils.c
M src/network.c
M src/network.h
A src/node_tests/README
A src/node_tests/ndt_client.js
M src/test_c2s_srv.c
M src/test_meta_srv.c
M src/test_mid_srv.c
M src/test_s2c_srv.c
M src/test_sfw_srv.c
M src/testoptions.c
M src/testoptions.h
A src/testoptions_unit_tests.c
A src/third_party/safe_iop.h
A src/third_party/safe_iop_LICENSE
M src/unit_testing.c
M src/unit_testing.h
M src/web100-util.c
M src/web100srv.c
M src/web100srv.h
M src/web100srv_unit_tests.c
A src/websocket.c
A src/websocket.h
A src/websocket_unit_tests.c

Log Message:
-----------
This patch adds websocket support to ndt.

It also adds a safe integer arithmetic library in third_party/safe_iop.h, and
it adds a unit testing framework in unit_testing.c. You can see the unit
tests
get run via "make check".

This adds websocket capabilities to the server by having it sniff the first
incoming message to the control socket. If the first incoming messate is GET,
then we assume that the socket is a websocket and try to perform the websocket
handshake. otherwise, everything proceeds as normal.

Although this test required lots of changes to lots of places, no code changes
were required for the web100clt, and all existing clients should work as
before.

Commit: b4f9c7db0ff07675a9d1774d65a9e6effd838518

https://github.com/ndt-project/ndt/commit/b4f9c7db0ff07675a9d1774d65a9e6effd838518
Author:

<>
Date: 2015-03-31 (Tue, 31 Mar 2015)

Changed paths:
M HTML5-frontend/script.js
M HTML5-frontend/style.css
M HTML5-frontend/widget.html

Log Message:
-----------
Merge the warnings branch in

Commit: db81241e5c18ee1b53e503b2bf92eba6dee22ea5

https://github.com/ndt-project/ndt/commit/db81241e5c18ee1b53e503b2bf92eba6dee22ea5
Author:

<>
Date: 2015-03-31 (Tue, 31 Mar 2015)

Changed paths:
M configure.ac
M ndt.spec

Log Message:
-----------
Bump the version numbers

Commit: 64feef6d17d45272dd1e25c75f4acccaea39f150

https://github.com/ndt-project/ndt/commit/64feef6d17d45272dd1e25c75f4acccaea39f150
Author:

<>
Date: 2015-03-31 (Tue, 31 Mar 2015)

Changed paths:
M ndt.spec

Log Message:
-----------
Bump the rc number in the spec

Commit: 07801fead0888ec00222b04f22581088d3e50fbf

https://github.com/ndt-project/ndt/commit/07801fead0888ec00222b04f22581088d3e50fbf
Author:

<>
Date: 2015-03-31 (Tue, 31 Mar 2015)

Changed paths:
M flash-client/src/GUI.as
M flash-client/src/NDTPController.as
M flash-client/src/TestResults.as
M flash-client/src/TestResultsUtils.as

Log Message:
-----------
Merge in the new javascript variables for the flash client

Commit: 80a31b93707076a8eee1a78e9d191133168f4afb

https://github.com/ndt-project/ndt/commit/80a31b93707076a8eee1a78e9d191133168f4afb
Author:

<>
Date: 2015-03-31 (Tue, 31 Mar 2015)

Changed paths:
M flash-client/precompiled/FlashClt.swf

Log Message:
-----------
Add a precompiled swf with the flash changes

Commit: 20545b499eac1e59442d1a69e464a19dc0b7e1f3

https://github.com/ndt-project/ndt/commit/20545b499eac1e59442d1a69e464a19dc0b7e1f3
Author: Peter Boothe
<>
Date: 2015-04-06 (Mon, 06 Apr 2015)

Changed paths:
M src/web100srv.c

Log Message:
-----------
Working cleanup, and elimination of a random /*}*/ that confuses
brace-matching in vim.

Commit: 2c8fbcc783a0cf725747ffd8eff4d39cf78afb7f

https://github.com/ndt-project/ndt/commit/2c8fbcc783a0cf725747ffd8eff4d39cf78afb7f
Author: Peter Boothe
<>
Date: 2015-04-06 (Mon, 06 Apr 2015)

Changed paths:
M src/websocket.c
M src/websocket_unit_tests.c

Log Message:
-----------
Firefox adds an unexpected piece to one of the headers, so we had to change
the
header parsing and validation slightly.

Commit: f9ee5ef76e1ada80ba56ae2af9327f65e5d02fbc

https://github.com/ndt-project/ndt/commit/f9ee5ef76e1ada80ba56ae2af9327f65e5d02fbc
Author: Peter Boothe
<>
Date: 2015-04-08 (Wed, 08 Apr 2015)

Changed paths:
M src/node_tests/ndt_client.js
M src/protocol.h
M src/testoptions.c
M src/testoptions_unit_tests.c
M src/web100clt.c
M src/web100srv_unit_tests.c

Log Message:
-----------
Fixed a bug in the NDT JSON protocol where requesting the right combination
of tests could make it so that the mesage was no longer a JSON message.

Commit: c0f376e8421b646459766e5e6c8392ff64f74d6b

https://github.com/ndt-project/ndt/commit/c0f376e8421b646459766e5e6c8392ff64f74d6b
Author: aaronmbr
<>
Date: 2015-04-08 (Wed, 08 Apr 2015)

Changed paths:
M src/node_tests/ndt_client.js
M src/protocol.h
M src/testoptions.c
M src/testoptions_unit_tests.c
M src/web100clt.c
M src/web100srv_unit_tests.c

Log Message:
-----------
Merge pull request #177 from m-lab/websockets

Fixed a bug in the NDT JSON protocol

Commit: 79ff7ad7a096c0f63a0076fdc16a1476d7456d9a

https://github.com/ndt-project/ndt/commit/79ff7ad7a096c0f63a0076fdc16a1476d7456d9a
Author: Aaron Brown
<>
Date: 2015-04-13 (Mon, 13 Apr 2015)

Changed paths:
M src/Makefile.am
M src/jsonutils.c
M src/network.c
M src/network.h
A src/node_tests/README
A src/node_tests/ndt_client.js
M src/protocol.h
M src/test_c2s_srv.c
M src/test_meta_srv.c
M src/test_mid_srv.c
M src/test_s2c_srv.c
M src/test_sfw_srv.c
M src/testoptions.c
M src/testoptions.h
A src/testoptions_unit_tests.c
A src/third_party/safe_iop.h
A src/third_party/safe_iop_LICENSE
M src/unit_testing.c
M src/unit_testing.h
M src/web100-util.c
M src/web100clt.c
M src/web100srv.c
M src/web100srv.h
M src/web100srv_unit_tests.c
A src/websocket.c
A src/websocket.h
A src/websocket_unit_tests.c

Log Message:
-----------
Merge branch 'websockets'

Commit: e1c5fb89ed64a94f141f4123a31fcd7d5aba699f

https://github.com/ndt-project/ndt/commit/e1c5fb89ed64a94f141f4123a31fcd7d5aba699f
Author: Aaron Brown
<>
Date: 2015-04-13 (Mon, 13 Apr 2015)

Changed paths:
M src/ndt_odbc.c
M src/testoptions_unit_tests.c
M src/websocket.c
M src/websocket_unit_tests.c

Log Message:
-----------
Fix some warnings

Commit: f11e9bd69e92f0f4a69b1b0dab9ba0c1aff029d4

https://github.com/ndt-project/ndt/commit/f11e9bd69e92f0f4a69b1b0dab9ba0c1aff029d4
Author: Aaron Brown
<>
Date: 2015-04-13 (Mon, 13 Apr 2015)

Changed paths:
M src/Makefile.am

Log Message:
-----------
Don't double-up the web100clt in the Makefile if both web100 and web10g are
available

Commit: efd95987ccd3405d69e7e6ed967c6ab28f184d6b

https://github.com/ndt-project/ndt/commit/efd95987ccd3405d69e7e6ed967c6ab28f184d6b
Author: Aaron Brown
<>
Date: 2015-04-13 (Mon, 13 Apr 2015)

Changed paths:
A config/ax_check_openssl.m4
M configure.ac
M ndt.spec
M src/Makefile.am

Log Message:
-----------
Check for OpenSSL when configuring

Commit: 8dfbda087262ed09789ff3fe9eec935cea143cd2

https://github.com/ndt-project/ndt/commit/8dfbda087262ed09789ff3fe9eec935cea143cd2
Author: Aaron Brown
<>
Date: 2015-04-13 (Mon, 13 Apr 2015)

Changed paths:
M src/node_tests/ndt_client.js
M src/testoptions_unit_tests.c
M src/websocket.c
M src/websocket_unit_tests.c

Log Message:
-----------
Change the url to /ndt_protocol

Commit: e8e4f58e742fb7bab11ad21982f9e4f4417092a7

https://github.com/ndt-project/ndt/commit/e8e4f58e742fb7bab11ad21982f9e4f4417092a7
Author: Peter Boothe
<>
Date: 2015-04-13 (Mon, 13 Apr 2015)

Changed paths:
M src/Makefile.am
M src/jsonutils.c
M src/ndt_odbc.c
M src/network.c
M src/network.h
A src/node_tests/README
A src/node_tests/ndt_client.js
M src/protocol.h
M src/test_c2s_srv.c
M src/test_meta_srv.c
M src/test_mid_srv.c
M src/test_s2c_srv.c
M src/test_sfw_srv.c
M src/testoptions.c
M src/testoptions.h
A src/testoptions_unit_tests.c
A src/third_party/safe_iop.h
A src/third_party/safe_iop_LICENSE
M src/unit_testing.c
M src/unit_testing.h
M src/web100-util.c
M src/web100clt.c
M src/web100srv.c
M src/web100srv.h
M src/web100srv_unit_tests.c
A src/websocket.c
A src/websocket.h
A src/websocket_unit_tests.c

Log Message:
-----------
Merge pull request #1 from ndt-project/master

Bring in the ndt-project's changes

Commit: 2d9f1a440ecb6eb9a4bb1e9bc9f8b5fe39a52114

https://github.com/ndt-project/ndt/commit/2d9f1a440ecb6eb9a4bb1e9bc9f8b5fe39a52114
Author: Aaron Brown
<>
Date: 2015-04-13 (Mon, 13 Apr 2015)

Changed paths:
M HTML5-frontend/widget.html
M Makefile.am
M src/fakewww.c

Log Message:
-----------
Include the NDT WebSocket client, and a link from the HTML5-frontend. Kind
of gross, but works for now.

Commit: bb3ae1ce911adbae0a18821f6cd0d2c51622f3a6

https://github.com/ndt-project/ndt/commit/bb3ae1ce911adbae0a18821f6cd0d2c51622f3a6
Author: Aaron Brown
<>
Date: 2015-04-13 (Mon, 13 Apr 2015)

Changed paths:
A websocket-client

Log Message:
-----------
Bump the websocket client submodule to HEAD

Commit: e7bbfe54c3092038f1781c0b66678d65fb1ec2b3

https://github.com/ndt-project/ndt/commit/e7bbfe54c3092038f1781c0b66678d65fb1ec2b3
Author: Aaron Brown
<>
Date: 2015-04-13 (Mon, 13 Apr 2015)

Changed paths:
A .gitmodules
M configure.ac
M ndt.spec

Log Message:
-----------
Bump the version numbers

Commit: 14abeeaf9462dbd470f5b6389b66b21347e61c08

https://github.com/ndt-project/ndt/commit/14abeeaf9462dbd470f5b6389b66b21347e61c08
Author: Peter Boothe
<>
Date: 2015-04-13 (Mon, 13 Apr 2015)

Changed paths:
A .gitmodules
M HTML5-frontend/widget.html
M Makefile.am
A config/ax_check_openssl.m4
M configure.ac
M ndt.spec
M src/Makefile.am
M src/fakewww.c
M src/node_tests/ndt_client.js
M src/testoptions_unit_tests.c
M src/websocket.c
M src/websocket_unit_tests.c
A websocket-client

Log Message:
-----------
Merge branch 'master' of github.com:ndt-project/ndt

Commit: 80ed0f9e76621d0fee20d1f98124407e5d4d4c4c

https://github.com/ndt-project/ndt/commit/80ed0f9e76621d0fee20d1f98124407e5d4d4c4c
Author: Aaron Brown
<>
Date: 2015-04-14 (Tue, 14 Apr 2015)

Changed paths:
R .gitmodules
M HTML5-frontend/Makefile.am
A HTML5-frontend/ndt-browser-client.js
A HTML5-frontend/ndt-wrapper.js
M HTML5-frontend/script.js
R HTML5-frontend/set-active-client.sh
M HTML5-frontend/widget.html
M Makefile.am
M conf/ndt-init
M flash-client/Makefile.am
A flash-client/flashpolicy.xml
A flash-client/ndt-flashpolicyd
R flashpolicy.xml
R ndt-flashpolicyd
M ndt.spec
M src/fakewww.c

Log Message:
-----------
A somewhat radical change. Remove the flash client stuff from
HTML5-frontend, and directly integrate websockets instead.

Commit: 8545918839077401c1d6bb53115447457930d2fe

https://github.com/ndt-project/ndt/commit/8545918839077401c1d6bb53115447457930d2fe
Author: Aaron Brown
<>
Date: 2015-04-14 (Tue, 14 Apr 2015)

Changed paths:
A .gitmodules

Log Message:
-----------
Add an empty .gitmodules file to see about fixing the "websocket-client
still there" issue

Commit: 5a5dded906d0b09f26c7000fc37662d1798af0bf

https://github.com/ndt-project/ndt/commit/5a5dded906d0b09f26c7000fc37662d1798af0bf
Author: Aaron Brown
<>
Date: 2015-04-14 (Tue, 14 Apr 2015)

Changed paths:
R websocket-client

Log Message:
-----------
Remove the websocket-client use rm --cached

Commit: 373c81bb92f84c8492136c5d76ab44f3ab0c2160

https://github.com/ndt-project/ndt/commit/373c81bb92f84c8492136c5d76ab44f3ab0c2160
Author: Aaron Brown
<>
Date: 2015-04-14 (Tue, 14 Apr 2015)

Changed paths:
M HTML5-frontend/script.js
M HTML5-frontend/widget.html

Log Message:
-----------
Clean up some wording, and default to Java with a specific note about
WebSocket support being 'Beta'

Commit: f4ec81d9622ed6d4cf32f23dfc8bcf87f51a75de

https://github.com/ndt-project/ndt/commit/f4ec81d9622ed6d4cf32f23dfc8bcf87f51a75de
Author: Aaron Brown
<>
Date: 2015-04-17 (Fri, 17 Apr 2015)

Changed paths:
M HTML5-frontend/ndt-browser-client.js
A HTML5-frontend/ndt-wrapper-ww.js
M HTML5-frontend/ndt-wrapper.js
M src/fakewww.c

Log Message:
-----------
Support pushing the NDT client into a web worker for better performance

Commit: c6836e79fd26cf26e6f33d13828fa1e8f828d872

https://github.com/ndt-project/ndt/commit/c6836e79fd26cf26e6f33d13828fa1e8f828d872
Author: Aaron Brown
<>
Date: 2015-04-17 (Fri, 17 Apr 2015)

Changed paths:
M HTML5-frontend/Makefile.am

Log Message:
-----------
Make sure the new .js file gets included in 'make dist'

Commit: e5b84fa047c5e713bd4385204a60fbeaec0372c3

https://github.com/ndt-project/ndt/commit/e5b84fa047c5e713bd4385204a60fbeaec0372c3
Author: Aaron Brown
<>
Date: 2015-04-17 (Fri, 17 Apr 2015)

Changed paths:
M ndt.spec

Log Message:
-----------
Bump the NDT RPM version number slightly

Commit: 83225cc63e4bc4d1304f46ea44a28b0b363084ab

https://github.com/ndt-project/ndt/commit/83225cc63e4bc4d1304f46ea44a28b0b363084ab
Author: Aaron Brown
<>
Date: 2015-04-20 (Mon, 20 Apr 2015)

Changed paths:
M src/Makefile.am
M src/web100-util.c

Log Message:
-----------
Some fixes for websockets/unit tests with web10g support

Commit: 8ade2e06a028506b39c94607b30d4de30bbef766

https://github.com/ndt-project/ndt/commit/8ade2e06a028506b39c94607b30d4de30bbef766
Author: Aaron Brown
<>
Date: 2015-04-20 (Mon, 20 Apr 2015)

Changed paths:
M .gitmodules
A I2util

Log Message:
-----------
Re-add the I2util submodule that I apparently removed somehow

Commit: 38d46a9eead35143e889329ddca18041509d96a0

https://github.com/ndt-project/ndt/commit/38d46a9eead35143e889329ddca18041509d96a0
Author: Aaron Brown
<>
Date: 2015-04-20 (Mon, 20 Apr 2015)

Changed paths:
M src/websocket.c

Log Message:
-----------
Fix for websocket support on IE11

Commit: 7180173617953c842c5ff48a21a64cc1de67e961

https://github.com/ndt-project/ndt/commit/7180173617953c842c5ff48a21a64cc1de67e961
Author: Aaron Brown
<>
Date: 2015-04-20 (Mon, 20 Apr 2015)

Changed paths:
M src/fakewww.c

Log Message:
-----------
Truly hacky "fix" to get IE11 to not complain when loading style.css

Commit: 18aa1e7129118bd6c00d3d3a67c4860b5b64a3d0

https://github.com/ndt-project/ndt/commit/18aa1e7129118bd6c00d3d3a67c4860b5b64a3d0
Author: Aaron Brown
<>
Date: 2015-04-21 (Tue, 21 Apr 2015)

Changed paths:
M HTML5-frontend/ndt-wrapper.js

Log Message:
-----------
Bugfix for update interval for non-WebWorker javascript (i.e. fix a typo on
my part)

Commit: 8bc34f47f307a8cf21695afef2c490c816349f71

https://github.com/ndt-project/ndt/commit/8bc34f47f307a8cf21695afef2c490c816349f71
Author: Aaron Brown
<>
Date: 2015-04-21 (Tue, 21 Apr 2015)

Changed paths:
M configure.ac

Log Message:
-----------
Fix configure.ac's I2util handling to make it a bit cleaner

Commit: 523d50862aee1d34a8a3aaa26f47e54e4fad30fb

https://github.com/ndt-project/ndt/commit/523d50862aee1d34a8a3aaa26f47e54e4fad30fb
Author: Aaron Brown
<>
Date: 2015-04-21 (Tue, 21 Apr 2015)

Changed paths:
M src/Makefile.am

Log Message:
-----------
Fix for a copy-paste issue with the web10g unit tests

Commit: 6c9d66f9e7cbae928c4cdc4a228ff6a7466d2d9f

https://github.com/ndt-project/ndt/commit/6c9d66f9e7cbae928c4cdc4a228ff6a7466d2d9f
Author: Aaron Brown
<>
Date: 2015-04-22 (Wed, 22 Apr 2015)

Changed paths:
M conf/ndt-init

Log Message:
-----------
Run fakewww as 'nobody'

Commit: f67a8d9625c5c8e97364c8456e3d4cabdcf3a2b3

https://github.com/ndt-project/ndt/commit/f67a8d9625c5c8e97364c8456e3d4cabdcf3a2b3
Author: Benjamin Chase
<>
Date: 2015-04-22 (Wed, 22 Apr 2015)

Changed paths:
M HTML5-frontend/ndt-browser-client.js

Log Message:
-----------
Remove unnecessary processing of incoming data

Removed all the unneeded processing. In the S2C Test all we want to know is
how many bytes are being transmitted. The extra processing slows it down too
much. Just grad the byteLength of the incoming binary data.

Commit: 1dc14ca8b7780b6dce71488f5d87fea6d6dde04d

https://github.com/ndt-project/ndt/commit/1dc14ca8b7780b6dce71488f5d87fea6d6dde04d
Author: Benjamin Chase
<>
Date: 2015-04-22 (Wed, 22 Apr 2015)

Changed paths:
M HTML5-frontend/ndt-browser-client.js

Log Message:
-----------
replaced header size adjustments

Commit: 635ccdcc81cef4223b8f38208f90199111d38782

https://github.com/ndt-project/ndt/commit/635ccdcc81cef4223b8f38208f90199111d38782
Author: aaronmbr
<>
Date: 2015-04-22 (Wed, 22 Apr 2015)

Changed paths:
M HTML5-frontend/ndt-browser-client.js

Log Message:
-----------
Merge pull request #184 from bchase78/patch-1

Improved websocket client performance in S2C test

Commit: 8721825af92bd509a2e2bf6b692c37778be339f6

https://github.com/ndt-project/ndt/commit/8721825af92bd509a2e2bf6b692c37778be339f6
Author: Aaron Brown
<>
Date: 2015-04-22 (Wed, 22 Apr 2015)

Changed paths:
M src/fakewww.c

Log Message:
-----------
Bump the filename buffer size up to BUFFSIZE length

Commit: 95a23291d1f287a7b1782f1f9a958ab029377c79

https://github.com/ndt-project/ndt/commit/95a23291d1f287a7b1782f1f9a958ab029377c79
Author: Aaron Brown
<>
Date: 2015-04-22 (Wed, 22 Apr 2015)

Changed paths:
M HTML5-frontend/ndt-browser-client.js

Log Message:
-----------
Have an 'appropriate' error message show up if there isn't data in the
onerror callback

Commit: 4511355c829cda0214977ac3f88d8f6813727f96

https://github.com/ndt-project/ndt/commit/4511355c829cda0214977ac3f88d8f6813727f96
Author: Aaron Brown
<>
Date: 2015-04-22 (Wed, 22 Apr 2015)

Changed paths:
M conf/ndt-init
M ndt.spec

Log Message:
-----------
Add a "conditional restart" to the init script, and conditionally restart
on RPM update

Commit: 2d0d5e7b104db317f9b58acc01f338332baae135

https://github.com/ndt-project/ndt/commit/2d0d5e7b104db317f9b58acc01f338332baae135
Author: Sebastian Kostuch
<>
Date: 2015-04-23 (Thu, 23 Apr 2015)

Changed paths:
M src/test_c2s_srv.c
M src/test_s2c_srv.c
M src/web100-admin.c
M src/web100-pcap.c
M src/web100-util.c
M src/web100srv.c

Log Message:
-----------
Removed some unused code and fixed some compilation warnings

Commit: dfa9681ad8c201dcfeeb8e5e7bb48943a1412f19

https://github.com/ndt-project/ndt/commit/dfa9681ad8c201dcfeeb8e5e7bb48943a1412f19
Author: Sebastian Kostuch
<>
Date: 2015-04-23 (Thu, 23 Apr 2015)

Changed paths:
M HTML5-frontend/ndt-browser-client.js
M HTML5-frontend/script.js

Log Message:
-----------
Fix for WebSocket support check

Commit: 413dc6638d24de85fc912363be75dcc24151fa51

https://github.com/ndt-project/ndt/commit/413dc6638d24de85fc912363be75dcc24151fa51
Author: Sebastian Kostuch
<>
Date: 2015-04-23 (Thu, 23 Apr 2015)

Changed paths:
M HTML5-frontend/script.js
M HTML5-frontend/style.css
M HTML5-frontend/widget.html

Log Message:
-----------
Added warning when using WebSocket to inform that it is beta version

Commit: bf57580d035ffa23a2911a95e195dc888c144eb6

https://github.com/ndt-project/ndt/commit/bf57580d035ffa23a2911a95e195dc888c144eb6
Author: Aaron Brown
<>
Date: 2015-04-23 (Thu, 23 Apr 2015)

Changed paths:
M HTML5-frontend/widget.html

Log Message:
-----------
Clean up and extend the "websocket client is beta" warning a bit

Commit: 7e9a5e51e20f3c5badee9c6fd620fc819004593c

https://github.com/ndt-project/ndt/commit/7e9a5e51e20f3c5badee9c6fd620fc819004593c
Author: Sebastian Kostuch
<>
Date: 2015-04-23 (Thu, 23 Apr 2015)

Changed paths:
M src/test_c2s_srv.c
M src/test_s2c_srv.c
M src/web100-util.c

Log Message:
-----------
Improve 'pipe' and 'system' function handling

Commit: b949c8e3b42d9b1dd0c2949325605416f5349039

https://github.com/ndt-project/ndt/commit/b949c8e3b42d9b1dd0c2949325605416f5349039
Author: Aaron Brown
<>
Date: 2015-04-23 (Thu, 23 Apr 2015)

Changed paths:
M HTML5-frontend/ndt-browser-client.js

Log Message:
-----------
Pull in the updated ndt-browser-client.js

Commit: a2f9b4e9c80220cc502f8f480d2344982fa1203f

https://github.com/ndt-project/ndt/commit/a2f9b4e9c80220cc502f8f480d2344982fa1203f
Author: Aaron Brown
<>
Date: 2015-04-23 (Thu, 23 Apr 2015)

Changed paths:
M HTML5-frontend/ndt-browser-client.js

Log Message:
-----------
Use 'self' instead of 'window' for the checkBrowserSupported function since
it may be run in a WebWorker which doesn't have a window

Commit: a94432b6d9f6458a296265b73ea28cda571b27e4

https://github.com/ndt-project/ndt/commit/a94432b6d9f6458a296265b73ea28cda571b27e4
Author: Aaron Brown
<>
Date: 2015-04-23 (Thu, 23 Apr 2015)

Changed paths:
M HTML5-frontend/ndt-wrapper-ww.js
M HTML5-frontend/ndt-wrapper.js
M HTML5-frontend/script.js

Log Message:
-----------
Update the wrappers and whatnot to account for changes in
ndt-browser-client.js

Commit: 9f2ed78def64484bcfe1ff6873ba21fa6f7bb8d1

https://github.com/ndt-project/ndt/commit/9f2ed78def64484bcfe1ff6873ba21fa6f7bb8d1
Author: Aaron Brown
<>
Date: 2015-04-23 (Thu, 23 Apr 2015)

Changed paths:
M src/test_c2s_srv.c
M src/test_s2c_srv.c
M src/web100-util.c

Log Message:
-----------
Merge branch 'master' of github.com:ndt-project/ndt

Commit: 2ded66ec01682fb750dc11e3e3d582926f55c4a0

https://github.com/ndt-project/ndt/commit/2ded66ec01682fb750dc11e3e3d582926f55c4a0
Author: Aaron Brown
<>
Date: 2015-04-23 (Thu, 23 Apr 2015)

Changed paths:
M HTML5-frontend/ndt-browser-client.js

Log Message:
-----------
Include the non-web100 variable results in the results

Commit: 7e1ba9bcb253e335f1a3e278d69ff7804bfbf675

https://github.com/ndt-project/ndt/commit/7e1ba9bcb253e335f1a3e278d69ff7804bfbf675
Author: Aaron Brown
<>
Date: 2015-04-23 (Thu, 23 Apr 2015)

Changed paths:
M ndt.spec

Log Message:
-----------
Only do the chkconfig on new install, just conditional restart otherwise

Commit: f44a2794b4a0520e46d358540faaee03143eec49

https://github.com/ndt-project/ndt/commit/f44a2794b4a0520e46d358540faaee03143eec49
Author: Aaron Brown
<>
Date: 2015-04-23 (Thu, 23 Apr 2015)

Changed paths:
M configure.ac
M ndt.spec

Log Message:
-----------
Bump to -rc5

Commit: 63d726819415cc6e919e8a057ba906bf36ec376a

https://github.com/ndt-project/ndt/commit/63d726819415cc6e919e8a057ba906bf36ec376a
Author: Jordan McCarthy
<>
Date: 2015-04-24 (Fri, 24 Apr 2015)

Changed paths:
M src/test_meta.h
M src/test_meta_clt.c
M src/usage.c
M src/web100clt.c

Log Message:
-----------
Added runtime parameter to CLI for specifying custom client app id

Commit: 9b8b5252d911b824c9bd38d2652ece681e5dd8c4

https://github.com/ndt-project/ndt/commit/9b8b5252d911b824c9bd38d2652ece681e5dd8c4
Author: Aaron Brown
<>
Date: 2015-04-24 (Fri, 24 Apr 2015)

Changed paths:
M conf/ndt-logrotate
M ndt.spec

Log Message:
-----------
Change the fakewww logs to be owned by 'nobody' so fakewww can write them

Commit: 4c532ce528a8b771791f8f9a9b6cf11c10c1589a

https://github.com/ndt-project/ndt/commit/4c532ce528a8b771791f8f9a9b6cf11c10c1589a
Author: Jordan McCarthy
<>
Date: 2015-04-24 (Fri, 24 Apr 2015)

Changed paths:
M src/web100clt.c

Log Message:
-----------
Fixed typos in code adding runtime parameter for specifying client app id

Commit: 31f64930904cc0021362974853d96784ffadbc96

https://github.com/ndt-project/ndt/commit/31f64930904cc0021362974853d96784ffadbc96
Author: aaronmbr
<>
Date: 2015-04-24 (Fri, 24 Apr 2015)

Changed paths:
M src/test_meta.h
M src/test_meta_clt.c
M src/usage.c
M src/web100clt.c

Log Message:
-----------
Merge pull request #185 from m-lab/client_id_flag

Client id flag

Commit: f8824cd36c52f0a324faf1525439c3bc50c115e4

https://github.com/ndt-project/ndt/commit/f8824cd36c52f0a324faf1525439c3bc50c115e4
Author: Aaron Brown
<>
Date: 2015-04-26 (Sun, 26 Apr 2015)

Changed paths:
M conf/ndt-sysconfig
M flash-client/Makefile.am

Log Message:
-----------
Fix some issues with the flash client directory move

Commit: 189f5e942d8872f0da1f44f4c48aa32048e0c2f3

https://github.com/ndt-project/ndt/commit/189f5e942d8872f0da1f44f4c48aa32048e0c2f3
Author: Aaron Brown
<>
Date: 2015-04-26 (Sun, 26 Apr 2015)

Changed paths:
M configure.ac

Log Message:
-----------
Bump the -rc number for the minor -rc with the flash compilation fixes

Commit: 26938791e5052ae2a79db705b1d9bc10ac9dc48a

https://github.com/ndt-project/ndt/commit/26938791e5052ae2a79db705b1d9bc10ac9dc48a
Author: Aaron Brown
<>
Date: 2015-04-28 (Tue, 28 Apr 2015)

Changed paths:
M conf/ndt-init

Log Message:
-----------
Make sure that fakewww can write to the log files

Commit: 6616681a06272e7e7c2eb88ae20cc3d256d99572

https://github.com/ndt-project/ndt/commit/6616681a06272e7e7c2eb88ae20cc3d256d99572
Author: Aaron Brown
<>
Date: 2015-04-29 (Wed, 29 Apr 2015)

Changed paths:
M Applet/src/edu/internet2/ndt/NDTConstants.java
M flash-client/ndt-flash-config.xml
M flash-client/precompiled/FlashClt.swf

Log Message:
-----------
Bump some of the version numbers

Commit: adc09809f510acc175fa851f4018bc1803e11b1e

https://github.com/ndt-project/ndt/commit/adc09809f510acc175fa851f4018bc1803e11b1e
Author: Aaron Brown
<>
Date: 2015-04-29 (Wed, 29 Apr 2015)

Changed paths:
M conf/ndt-logrotate

Log Message:
-----------
Revert the log rotate changes since the restart phase will set the
appropriate log permissions

Commit: 035a4c43aaa5e3ade3807e0f9a81489cdfc51706

https://github.com/ndt-project/ndt/commit/035a4c43aaa5e3ade3807e0f9a81489cdfc51706
Author: Aaron Brown
<>
Date: 2015-04-29 (Wed, 29 Apr 2015)

Changed paths:
M src/network.h
M src/testoptions.h
M src/web100-util.c

Log Message:
-----------
Fix up some compilation issues if both web100 and web10g are missing

Commit: 7869e5fde47e4b2c3e07ef98731e428f22d41b24

https://github.com/ndt-project/ndt/commit/7869e5fde47e4b2c3e07ef98731e428f22d41b24
Author: Aaron Brown
<>
Date: 2015-05-01 (Fri, 01 May 2015)

Changed paths:
M configure.ac
M ndt.spec

Log Message:
-----------
Bump the version numbers to 3.7.0

Commit: a35250592814ec2b16af659bf8b089690c5a46f3

https://github.com/ndt-project/ndt/commit/a35250592814ec2b16af659bf8b089690c5a46f3
Author: Aaron Brown
<>
Date: 2015-05-04 (Mon, 04 May 2015)

Changed paths:
M ndt.spec

Log Message:
-----------
The init script already changes ownership so we don't need to duplicate in
the spec

Commit: b96c92fb69ffdf3e8761b7097622bcd9581e3f30

https://github.com/ndt-project/ndt/commit/b96c92fb69ffdf3e8761b7097622bcd9581e3f30
Author: Aaron Brown
<>
Date: 2015-05-04 (Mon, 04 May 2015)

Changed paths:
M HTML5-frontend/script.js

Log Message:
-----------
Fix an issue where "Test Again" might not work for Java

Commit: 8996ee1f33bf71e1c7a3b7a4df5794c1539d1857

https://github.com/ndt-project/ndt/commit/8996ee1f33bf71e1c7a3b7a4df5794c1539d1857
Author: Aaron Brown
<>
Date: 2015-05-04 (Mon, 04 May 2015)

Changed paths:
M conf/ndt-init

Log Message:
-----------
Make cond-restart restart if either fakewww or web100srv is running

Commit: 98c39afaa92aded0603d163196b3794d9c248a43

https://github.com/ndt-project/ndt/commit/98c39afaa92aded0603d163196b3794d9c248a43
Author: Aaron Brown
<>
Date: 2015-05-04 (Mon, 04 May 2015)

Changed paths:
M conf/ndt-init

Log Message:
-----------
Use runuser to launch fakewww

Commit: bb4dacbb87c696c55c4f026c84c38d99ab452b85

https://github.com/ndt-project/ndt/commit/bb4dacbb87c696c55c4f026c84c38d99ab452b85
Author: Aaron Brown
<>
Date: 2015-05-04 (Mon, 04 May 2015)

Changed paths:
M ndt.spec

Log Message:
-----------
Don't undo fakewww installation on upgrade

Commit: 3554758d114171ad041568b3565745a9166b3a2d

https://github.com/ndt-project/ndt/commit/3554758d114171ad041568b3565745a9166b3a2d
Author: Aaron Brown
<>
Date: 2015-05-05 (Tue, 05 May 2015)

Changed paths:
M conf/ndt-init
M ndt.spec

Log Message:
-----------
Ensure that apache/ndt restart properly during ndt-server-apache
installation/removal/upgrade

Commit: c6f16461e239002ba6d7f0ffa768a85ddb731ca5

https://github.com/ndt-project/ndt/commit/c6f16461e239002ba6d7f0ffa768a85ddb731ca5
Author: Aaron Brown
<>
Date: 2015-05-05 (Tue, 05 May 2015)

Changed paths:
M configure.ac
M ndt.spec

Log Message:
-----------
Bump the version numbers

Commit: e803fddbcbf90bbc0596bf70e8ac1ca4d7842bef

https://github.com/ndt-project/ndt/commit/e803fddbcbf90bbc0596bf70e8ac1ca4d7842bef
Author: Peter Boothe
<>
Date: 2015-05-05 (Tue, 05 May 2015)

Changed paths:
M src/Makefile.am
A src/connection.h
M src/network.c
M src/network.h
A src/network_clt.c
A src/network_clt.h

Log Message:
-----------
Dividing code up into "old no-SSL code" and "new shiny TLS code"

Commit: 059b0c9ba56737b17f3e5c24dc031c48e658e9d6

https://github.com/ndt-project/ndt/commit/059b0c9ba56737b17f3e5c24dc031c48e658e9d6
Author: Peter Boothe
<>
Date: 2015-05-05 (Tue, 05 May 2015)

Changed paths:
M src/network.c
M src/network_clt.c

Log Message:
-----------
Updated in response to Michael's comments.

Commit: b876b83b0bf064f1efb912ed413535ba7498ca8b

https://github.com/ndt-project/ndt/commit/b876b83b0bf064f1efb912ed413535ba7498ca8b
Author: aaronmbr
<>
Date: 2015-05-05 (Tue, 05 May 2015)

Changed paths:
M src/Makefile.am
A src/connection.h
M src/network.c
M src/network.h
A src/network_clt.c
A src/network_clt.h

Log Message:
-----------
Merge pull request #187 from m-lab/tls

Dividing code up into "old no-SSL code" and "new shiny TLS code"

Commit: 788be51a4202a159089ab888499fd2274c7ddb19

https://github.com/ndt-project/ndt/commit/788be51a4202a159089ab888499fd2274c7ddb19
Author: Peter Boothe
<>
Date: 2015-05-06 (Wed, 06 May 2015)

Changed paths:
M src/Makefile.am
R src/connection.h
M src/network.c
M src/network.h
R src/network_clt.c
R src/network_clt.h

Log Message:
-----------
Revert "Dividing code up into "old no-SSL code" and "new shiny TLS code""

Commit: 0fbe27910cbddbb65ad63340829f65104d6e5c4e

https://github.com/ndt-project/ndt/commit/0fbe27910cbddbb65ad63340829f65104d6e5c4e
Author: aaronmbr
<>
Date: 2015-05-06 (Wed, 06 May 2015)

Changed paths:
M src/Makefile.am
R src/connection.h
M src/network.c
M src/network.h
R src/network_clt.c
R src/network_clt.h

Log Message:
-----------
Merge pull request #188 from ndt-project/revert-187-tls

Revert "Dividing code up into "old no-SSL code" and "new shiny TLS code"...

Commit: 942de5a286b9ef04e8e3223a8aee547ca17b2a0f

https://github.com/ndt-project/ndt/commit/942de5a286b9ef04e8e3223a8aee547ca17b2a0f
Author: Aaron Brown
<>
Date: 2015-05-06 (Wed, 06 May 2015)

Changed paths:
M HTML5-frontend/script.js
M conf/ndt-init
M configure.ac
M ndt.spec

Log Message:
-----------
Merge branch '3.7'

Commit: df0d608160b10016f1dd2d3659b4453a49a6a86d

https://github.com/ndt-project/ndt/commit/df0d608160b10016f1dd2d3659b4453a49a6a86d
Author: Aaron Brown
<>
Date: 2015-05-06 (Wed, 06 May 2015)

Changed paths:
M HTML5-frontend/script.js

Log Message:
-----------
This patch changes the default interval to 1000, and adapts the units
accordingly.

Adapted from Ben Chase's patch

Commit: 645364c0342585976b5d3afb15b8f8f4719ec51a

https://github.com/ndt-project/ndt/commit/645364c0342585976b5d3afb15b8f8f4719ec51a
Author: Aaron Brown
<>
Date: 2015-05-06 (Wed, 06 May 2015)

Changed paths:
M HTML5-frontend/script.js

Log Message:
-----------
Merge branch '3.7'

Commit: 94529a464e265ce7d5eecd414367b453fbb3c012

https://github.com/ndt-project/ndt/commit/94529a464e265ce7d5eecd414367b453fbb3c012
Author: Sebastian Kostuch
<>
Date: 2015-05-20 (Wed, 20 May 2015)

Changed paths:
M Applet/src/edu/internet2/ndt/Tcpbw100.java

Log Message:
-----------
Revert "Added support for multiple ports (Applet)"

This reverts commit a435b9274956c0509de02257c5c33c8f8762e91d.

Commit: 62a443a032b900d959ef241976b66c7bdeaf18b2

https://github.com/ndt-project/ndt/commit/62a443a032b900d959ef241976b66c7bdeaf18b2
Author: Sebastian Kostuch
<>
Date: 2015-05-20 (Wed, 20 May 2015)

Changed paths:
M src/test_s2c_clt.c
M src/test_s2c_srv.c

Log Message:
-----------
Revert "Added support for multiple ports (S2C)"

This reverts commit f2823496db53759067a6c9331fce3fe11f5da2fa.

Commit: f635bc01e36e5dcbe62e7f5679ec5fa40b690ea9

https://github.com/ndt-project/ndt/commit/f635bc01e36e5dcbe62e7f5679ec5fa40b690ea9
Author: Sebastian Kostuch
<>
Date: 2015-05-20 (Wed, 20 May 2015)

Changed paths:
M src/test_c2s_clt.c
M src/test_c2s_srv.c

Log Message:
-----------
Revert "Added support for multiple ports (C2S)"

This reverts commit b0499745beba47f7118ce41c508e28e5dee9a597.

Conflicts:
src/test_c2s_srv.c

Commit: aa254745f3d636073423ca06469a0e90b8d7b8e0

https://github.com/ndt-project/ndt/commit/aa254745f3d636073423ca06469a0e90b8d7b8e0
Author: Sebastian Kostuch
<>
Date: 2015-05-28 (Thu, 28 May 2015)

Changed paths:
M src/logging.c
M src/logging.h
M src/ndtptestconstants.h
M src/test_c2s_clt.c
M src/test_c2s_srv.c
M src/test_meta_srv.c
M src/test_results_clt.c
M src/test_results_clt.h
M src/test_s2c_clt.c
M src/test_s2c_srv.c
M src/testoptions.c
M src/usage.c
M src/web100clt.c
M src/web100srv.c

Log Message:
-----------
Removed option for enabling/disabling extended tests support

Commit: 2951615448960cb8265a999c33acfa40396d580f

https://github.com/ndt-project/ndt/commit/2951615448960cb8265a999c33acfa40396d580f
Author: Sebastian Kostuch
<>
Date: 2015-05-29 (Fri, 29 May 2015)

Changed paths:
M src/clt_tests.h
M src/logging.c
M src/logging.h
M src/test_c2s_clt.c
M src/test_c2s_srv.c
M src/test_s2c_clt.c
M src/test_s2c_srv.c
M src/tests_srv.h
M src/web100clt.c
M src/web100srv.c
M src/web100srv.h

Log Message:
-----------
Remove global use of throughputSnapshot variables from logging

Commit: f5e44e8e3073ab54d03d5fa1b9eb43a33e08dac0

https://github.com/ndt-project/ndt/commit/f5e44e8e3073ab54d03d5fa1b9eb43a33e08dac0
Author: Sebastian Kostuch
<>
Date: 2015-05-29 (Fri, 29 May 2015)

Changed paths:
M src/ndtptestconstants.h
M src/test_c2s_clt.c
M src/test_c2s_srv.c
M src/test_s2c_clt.c
M src/test_s2c_srv.c
M src/web100-util.c
M src/web100srv.h

Log Message:
-----------
Added constant value for maximum number of streams

Commit: 32405777d82bfe047436a05a3561506198739904

https://github.com/ndt-project/ndt/commit/32405777d82bfe047436a05a3561506198739904
Author: Sebastian Kostuch
<>
Date: 2015-05-29 (Fri, 29 May 2015)

Changed paths:
M src/test_c2s_clt.c

Log Message:
-----------
Removed redundant code

Commit: 091a2349049d2a2176bc063a769d78db7835c476

https://github.com/ndt-project/ndt/commit/091a2349049d2a2176bc063a769d78db7835c476
Author: Sebastian Kostuch
<>
Date: 2015-06-02 (Tue, 02 Jun 2015)

Changed paths:
M src/test_c2s_srv.c
M src/test_s2c_clt.c

Log Message:
-----------
Closing opened sockets before returning from unsuccessfull test

Commit: 4b8f6ed842defea7c88bcdf02bd29abd12de3afc

https://github.com/ndt-project/ndt/commit/4b8f6ed842defea7c88bcdf02bd29abd12de3afc
Author: Sebastian Kostuch
<>
Date: 2015-06-02 (Tue, 02 Jun 2015)

Changed paths:
M src/test_c2s_srv.c
M src/test_s2c_srv.c
M src/web100-pcap.c
M src/web100srv.h

Log Message:
-----------
Trace packets from all streams (but use only the one from first stream to
calculate network statistics)

Commit: fd118383096106bb0bfbd017f982d4841cd36180

https://github.com/ndt-project/ndt/commit/fd118383096106bb0bfbd017f982d4841cd36180
Author: Sebastian Kostuch
<>
Date: 2015-06-03 (Wed, 03 Jun 2015)

Changed paths:
M Applet/src/edu/internet2/ndt/Tcpbw100.java
M src/clt_tests.h
M src/logging.c
M src/test_c2s_clt.c
M src/test_c2s_srv.c
M src/test_meta_srv.c
M src/test_results_clt.c
M src/test_results_clt.h
M src/test_s2c_clt.c
M src/test_s2c_srv.c
M src/tests_srv.h
M src/usage.c
M src/web100-util.c
M src/web100clt.c
M src/web100srv.c
M src/web100srv.h

Log Message:
-----------
Change confusing naming

Commit: a01ee1394c6860ce29371b9cf1a3b1a7d303092e

https://github.com/ndt-project/ndt/commit/a01ee1394c6860ce29371b9cf1a3b1a7d303092e
Author: Sebastian Kostuch
<>
Date: 2015-06-08 (Mon, 08 Jun 2015)

Changed paths:
M src/web100-util.c
M src/web100srv.c

Log Message:
-----------
Save all web values in one file with stream number included

Commit: dd61456983bd87ea520eb9753db82f9d9c040aa7

https://github.com/ndt-project/ndt/commit/dd61456983bd87ea520eb9753db82f9d9c040aa7
Author: Sebastian Kostuch
<>
Date: 2015-06-09 (Tue, 09 Jun 2015)

Changed paths:
M src/test_c2s_srv.c
M src/test_s2c_srv.c
M src/testoptions.c
M src/testoptions.h

Log Message:
-----------
Snaplog every stream

Commit: 4351ffd749c9ae4c4c5d26c9605c9a5faa9a9a37

https://github.com/ndt-project/ndt/commit/4351ffd749c9ae4c4c5d26c9605c9a5faa9a9a37
Author: Sebastian Kostuch
<>
Date: 2015-06-09 (Tue, 09 Jun 2015)

Changed paths:
M src/test_c2s_clt.c
M src/test_s2c_clt.c
M src/test_s2c_srv.c

Log Message:
-----------
Added structs holding 'per stream' variables

Commit: b5b0ec8d41dd062505c6540d53238e635ac7ca78

https://github.com/ndt-project/ndt/commit/b5b0ec8d41dd062505c6540d53238e635ac7ca78
Author: Sebastian Kostuch
<>
Date: 2015-06-09 (Tue, 09 Jun 2015)

Changed paths:
A .gitmodules
M Applet/src/edu/internet2/ndt/NDTConstants.java
M HTML5-frontend/Makefile.am
A HTML5-frontend/ndt-browser-client.js
A HTML5-frontend/ndt-wrapper-ww.js
A HTML5-frontend/ndt-wrapper.js
M HTML5-frontend/script.js
M HTML5-frontend/style.css
M HTML5-frontend/widget.html
A I2util
M Makefile.am
M conf/ndt-init
A config/ax_check_openssl.m4
M configure.ac
M flash-client/Makefile.am
A flash-client/flashpolicy.xml
M flash-client/ndt-flash-config.xml
A flash-client/ndt-flashpolicyd
M flash-client/src/GUI.as
M flash-client/src/NDTPController.as
M flash-client/src/TestResults.as
M flash-client/src/TestResultsUtils.as
M ndt.spec
M src/Makefile.am
M src/analyze.c
M src/fakewww.c
M src/jsonutils.c
M src/logging.c
M src/ndt_odbc.c
M src/ndt_odbc.h
M src/network.c
M src/network.h
A src/node_tests/README
A src/node_tests/ndt_client.js
M src/protocol.h
M src/test_c2s_srv.c
M src/test_meta.h
M src/test_meta_clt.c
M src/test_meta_srv.c
M src/test_mid_srv.c
M src/test_s2c_srv.c
M src/test_sfw_srv.c
M src/testoptions.c
M src/testoptions.h
A src/testoptions_unit_tests.c
A src/third_party/safe_iop.h
A src/third_party/safe_iop_LICENSE
M src/unit_testing.c
M src/unit_testing.h
M src/usage.c
M src/web100-admin.c
M src/web100-pcap.c
M src/web100-util.c
M src/web100clt.c
M src/web100srv.c
M src/web100srv.h
M src/web100srv_unit_tests.c
A src/websocket.c
A src/websocket.h
A src/websocket_unit_tests.c

Log Message:
-----------
Merged newest master into MultiplePorts branch

Conflicts:
HTML5-frontend/Makefile.am
HTML5-frontend/script.js
HTML5-frontend/set-active-client.sh
HTML5-frontend/style.css
HTML5-frontend/widget.html
Makefile.am
conf/ndt-init
configure.ac
flash-client/Makefile.am
flash-client/ndt-flash-config.xml
flash-client/precompiled/FlashClt.swf
flash-client/src/GUI.as
flash-client/src/NDTPController.as
ndt.spec
src/Makefile.am
src/fakewww.c
src/test_c2s_srv.c
src/test_s2c_srv.c
src/unit_testing.c
src/unit_testing.h
src/web100-util.c
src/web100srv.c
src/web100srv.h
src/web100srv_unit_tests.c

Compare:
https://github.com/ndt-project/ndt/compare/e3bf77fe97c7...b5b0ec8d41dd

[ndt-dev] [ndt-project/ndt] cdd00a: Merged Issue154 branch into trunk, GitHub, 06/09/2015

List archive

[ndt-dev] [ndt-project/ndt] cdd00a: Merged Issue154 branch into trunk