NDT-DEV email list created

Revision: 1026
Author:   

Date:     Wed Mar 19 12:55:52 2014 UTC
Log:      Merged Issue130 branch into trunk

http://code.google.com/p/ndt/source/detail?r=1026

Modified:
 /branches/Issue126
 /branches/Issue126/Applet/src/edu/internet2/ndt/Tcpbw100.java
  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_ca_ES.properties
  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_el_GR.properties
  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_en_US.properties
  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_fr_FR.properties
  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_nb_NO.properties
  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_nl_NL.properties
  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_pt_BR.properties
  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_ru_RU.properties
 /branches/Issue126/HTML5-frontend/widget.html
 /branches/Issue126/src/test_c2s_srv.c
 /branches/Issue126/src/web100-pcap.c
 /branches/Issue126/src/web100srv.c
 /branches/Issue126/src/web100srv.h

=======================================
--- /branches/Issue126/Applet/src/edu/internet2/ndt/Tcpbw100.java	Wed Mar   
5 15:15:26 2014 UTC
+++ /branches/Issue126/Applet/src/edu/internet2/ndt/Tcpbw100.java	Wed Mar  
19 12:55:52 2014 UTC
@@ -92,6 +92,8 @@
 import java.util.Locale;
 import java.util.ResourceBundle;
 import java.util.StringTokenizer;
+import java.util.Timer;
+import java.util.TimerTask;

 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
@@ -147,8 +149,8 @@
        String _sErrMsg;
        JButton _buttonStartTest;
        // TODO: Could use just one button for dismiss and copy. For later 
release
-       JButton _buttonDismiss, _buttonStatsDismiss;
-       JButton _buttonCopy, _buttonStatsCopy;
+       JButton _buttonDetailsDismiss, _buttonStatsDismiss;
+       JButton _buttonDetailsCopy, _buttonStatsCopy;
        JButton _buttonDetails;
        JButton _buttonStatistics;
        JButton _buttonMailTo;
@@ -165,6 +167,7 @@
        NewFrame _frameWeb100Vars, _frameDetailedStats, _frameOptions;
        // String s; Unused, commenting out
        double _dTime;
+        int _s2cspdUpdateTime = 500, _c2sspdUpdateTime = 500; // ms
        int _iECNEnabled, _iNagleEnabled, MSSSent, MSSRcvd;
        int _iSACKEnabled, _iTimestampsEnabled, _iWinScaleRcvd, 
_iWinScaleSent;
        int _iFastRetran, _iAckPktsOut, _iSmoothedRTT, _iCurrentCwnd, 
_iMaxCwnd;
@@ -174,7 +177,7 @@
        int _iSumRTT, _iCountRTT, _iCurrentMSS, _iTimeouts, _iPktsRetrans;
        int _iSACKsRcvd, _iDupAcksIn, _iMaxRwinRcvd, _iMaxRwinSent;
        int _iDataPktsOut, _iRcvbuf, _iSndbuf, _iAckPktsIn;
-    long _iDataBytesOut;
+        long _iDataBytesOut;
        int _iPktsOut, _iCongestionSignals, _iRcvWinScale;
        // int _iPkts, _iLength=8192, _iCurrentRTO;
        int _iPkts, _iLength = NDTConstants.PREDEFINED_BUFFER_SIZE, 
_iCurrentRTO;
@@ -188,6 +191,7 @@
        double _dS2cspd, _dC2sspd, _dSc2sspd, _dSs2cspd;
        int _iSsndqueue;
        double _dSbytes;
+        byte[] _yabuff2Write;

        /**
         * Added by Martin Sandsmark, UNINETT AS Internationalization
@@ -926,24 +930,24 @@
                _frameWeb100Vars.getContentPane().add("South", buttons);

                // Add "close" button
-               _buttonDismiss = new 
JButton(_resBundDisplayMsgs.getString("close"));
-               _buttonDismiss.addActionListener(this);
+		_buttonDetailsDismiss = new  
JButton(_resBundDisplayMsgs.getString("close"));
+               _buttonDetailsDismiss.addActionListener(this);

                // Add "copy" button
-               _buttonCopy = new 
JButton(_resBundDisplayMsgs.getString("copy"));
-               _buttonCopy.addActionListener(this);
+               _buttonDetailsCopy = new 
JButton(_resBundDisplayMsgs.getString("copy"));
+               _buttonDetailsCopy.addActionListener(this);

                // Create Text area for displaying results, add "Heading"
                _txtDiagnosis = new JTextArea(
                                _resBundDisplayMsgs.getString(_sServerType + 
"KernelVar") + ":\n", 15,
-                               30);
+                               70);
                _txtDiagnosis.setEditable(true);
-               _buttonDismiss.setEnabled(true);
-               _buttonCopy.setEnabled(_bCanCopy);
+               _buttonDetailsDismiss.setEnabled(true);
+               _buttonDetailsCopy.setEnabled(_bCanCopy);

                // Now place all the buttons
-               buttons.add("West", _buttonDismiss);
-               buttons.add("East", _buttonCopy);
+               buttons.add("West", _buttonDetailsDismiss);
+               buttons.add("East", _buttonDetailsCopy);
                _frameWeb100Vars.getContentPane().add(new 
JScrollPane(_txtDiagnosis));
                _frameWeb100Vars.pack();
        } // createDiagnoseWindow() ends
@@ -1117,9 +1121,14 @@
                else if (source == _buttonDetails) {
                        _frameWeb100Vars.setResizable(true);
                        _frameWeb100Vars.setVisible(true);
+
+            if (NDTUtils.isNotEmpty(_txtDiagnosis.getText())) {
+                // enable copy button only if there is details informations
+                _buttonDetailsCopy.setEnabled(true);
+            }
                }
                // "More Details" Web100 variables window to be closed
-               else if (source == _buttonDismiss) {
+               else if (source == _buttonDetailsDismiss) {
                        _frameWeb100Vars.toBack();
                        _frameWeb100Vars.dispose();
                }
@@ -1129,29 +1138,13 @@
                        _frameDetailedStats.dispose();
                }
                // "More details" copy button functionality
-               else if (source == _buttonCopy) {
-                       try {
-                               Clipboard clipbd = 
getToolkit().getSystemClipboard();
-                               _bCanCopy = true;
-                               String s = _txtDiagnosis.getText();
-                               StringSelection ss = new StringSelection(s);
-                               clipbd.setContents(ss, ss);
-                               _txtDiagnosis.selectAll();
-                       } catch (SecurityException e) {
-                               _bCanCopy = false;
-                               // this Exception is only when the client 
cannot copy
-                               // some data, and is acted on by disabling the
-                               // copy button.
-				System.err.println(" You may not have some security Permissions.  
Please confirm");
-                       }
+               else if (source == _buttonDetailsCopy) {
+                       copy(_txtDiagnosis);
                }
                // "Statistics" copy button functionality
                else if (source == _buttonStatsCopy) {
-                       Clipboard clipbd = getToolkit().getSystemClipboard();
-                       String sTemp = _txtStatistics.getText();
-                       StringSelection ssTemp = new StringSelection(sTemp);
-                       clipbd.setContents(ssTemp, ssTemp);
-               }
+            copy(_txtStatistics);
+        }
                // Show "statistics" window
                else if (source == _buttonStatistics) {
                        _frameDetailedStats.setResizable(true);
@@ -1222,6 +1215,28 @@
                        }
                } // end mail-to functionality
        } // actionPerformed()
+
+    /**
+     * Copy text from JTextarea to clipboard
+     *
+     * @param _txt
+     *            Source copied text to clipboard
+     * */
+    private void copy (JTextArea _txt) {
+        try {
+            Clipboard clipbd = getToolkit().getSystemClipboard();
+            _bCanCopy = true;
+            String sTemp = _txt.getText();
+            StringSelection ssTemp = new StringSelection(sTemp);
+            clipbd.setContents(ssTemp, ssTemp);
+        } catch (SecurityException e) {
+            _bCanCopy = false;
+            // this Exception is only when the client cannot copy
+            // some data, and is acted on by disabling the
+            // copy button.
+            System.err.println(" You may not have some security  
Permissions. Please confirm");
+        }
+    }

        /**
         * Display current status in Applet window.
@@ -1674,7 +1689,7 @@

                // byte buff2[] = new byte[8192];
                // Initialise for 64 Kb
-               byte yabuff2Write[] = new byte[64 * NDTConstants.KILO_BITS];
+               _yabuff2Write = new byte[64 * NDTConstants.KILO_BITS];
                Message msg = new Message();
                // start C2S throughput tests
                if ((_yTests & NDTConstants.TEST_C2S) == 
NDTConstants.TEST_C2S) {
@@ -1764,7 +1779,7 @@
                                if (c == 'z') {
                                        c = '0';
                                }
-                               yabuff2Write[i] = c++;
+                                _yabuff2Write[i] = c++;
                        }
                        System.err.println("******Send buffer size =" + i);

@@ -1795,12 +1810,21 @@
                                }
                        }.start();

+                        Timer c2sspdUpdateTimer = new Timer();
+                        c2sspdUpdateTimer.scheduleAtFixedRate(new  
TimerTask() {
+                            @Override
+                            public void run() {
+                                pub_c2sspd = ((NDTConstants.EIGHT * _iPkts  
* _yabuff2Write.length) / NDTConstants.KILO)
+                                        / (System.currentTimeMillis() -  
_dTime);
+                            }
+                        }, 100, _c2sspdUpdateTime);
+
                        // While the 10 s timer ticks, write buffer data into 
server socket
                        while (true) {
                                // System.err.println("Send pkt = " + pkts + "; at 
" +
                                // System.currentTimeMillis());
                                try {
-                                       outStream.write(yabuff2Write, 0, 
yabuff2Write.length);
+                                       outStream.write(_yabuff2Write, 0, 
_yabuff2Write.length);
                                } catch (SocketException e) {
                                        System.out.println("SocketException while 
writing to server" + e);
                                        break;
@@ -1820,18 +1844,19 @@
                                pub_bytes = (_iPkts * _iLength);
                        }

+                        c2sspdUpdateTimer.cancel();
                        _dTime = System.currentTimeMillis() - _dTime;
                        System.err.println(_dTime + " millisec test completed" + 
","
-                                       + yabuff2Write.length + ","+ _iPkts);
+                                       + _yabuff2Write.length + ","+ _iPkts);
                        if (_dTime == 0) {
                                _dTime = 1;
                        }

                        // Calculate C2S throughput in kbps
-			System.out.println((NDTConstants.EIGHT * _iPkts * yabuff2Write.length)  
/ _dTime
+			System.out.println((NDTConstants.EIGHT * _iPkts * _yabuff2Write.length)  
/ _dTime
                                        + " kb/s outbound"); //*8 for 
calculating bits

-			_dC2sspd = ((NDTConstants.EIGHT * _iPkts * yabuff2Write.length) /  
NDTConstants.KILO)
+			_dC2sspd = ((NDTConstants.EIGHT * _iPkts * _yabuff2Write.length) /  
NDTConstants.KILO)
                                        / _dTime;

                        // The client has stopped streaming data, and the 
server is now
@@ -2006,6 +2031,15 @@
                        _dTime = System.currentTimeMillis();
                        pub_time = _dTime;

+                        Timer s2cspdUpdateTimer = new Timer();
+                        s2cspdUpdateTimer.scheduleAtFixedRate(new  
TimerTask() {
+                            @Override
+                            public void run() {
+                                pub_s2cspd = ((NDTConstants.EIGHT *  
pub_bytes) / NDTConstants.KILO)
+                                        / (System.currentTimeMillis() -  
_dTime);
+                            }
+                        }, 100, _s2cspdUpdateTime);
+
                        // read data sent by server
                        try {
                                while ((inlth = srvin.read(buff, 0, 
buff.length)) > 0) {
@@ -2021,7 +2055,9 @@
                                                + sHostName + ":" + ioExcep);
                                _sErrMsg = "Server Failed while reading socket 
data\n";
                                return true;
-                       }
+                       } finally {
+                                s2cspdUpdateTimer.cancel();
+                        }

                        // get time duration during which bytes were received
                        _dTime = System.currentTimeMillis() - _dTime;
@@ -2447,6 +2483,13 @@
                                                                // proceed to 
running tests
                                break;
                        }
+
+            if (wait == NDTConstants.SRV_QUEUE_SERVER_FAULT) {
+                _sErrMsg = _resBundDisplayMsgs.getString("serverFault")
+                        + "\n";
+                _bFailed = true;
+                return;
+            }

                        if (wait == NDTConstants.SRV_QUEUE_SERVER_BUSY) {
                                if (iServerWaitFlag == 0) { // First message 
from server,
@@ -3303,7 +3346,7 @@
                                                
_txtStatistics.append(_resBundDisplayMsgs
                                                                
.getString("c2s")
                                                                + " "
-                                                               + 
_resBundDisplayMsgs.getString("qSeen")
+                                                               + 
_resBundDisplayMsgs.getString("eqSeen")
                                                                + ": "
                                                                + 
NDTUtils.prtdbl(NDTConstants.PERCENTAGE * (_dC2sspd - _dSc2sspd)
                                                                                / 
_dC2sspd) + "%\n");
@@ -3328,7 +3371,7 @@
                                                
_txtStatistics.append(_resBundDisplayMsgs
                                                                
.getString("s2c")
                                                                + " "
-                                                               + 
_resBundDisplayMsgs.getString("qSeen")
+                                                               + 
_resBundDisplayMsgs.getString("eqSeen")
                                                                + ": "
                                                                + 
NDTUtils.prtdbl(NDTConstants.PERCENTAGE * (_dSs2cspd - _dS2cspd)
                                                                                / 
_dSs2cspd) + "%\n");
=======================================
---  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_ca_ES.properties	 
Mon Feb 10 12:11:55 2014 UTC
+++  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_ca_ES.properties	 
Wed Mar 19 12:55:52 2014 UTC
@@ -57,6 +57,7 @@
 duplexNok = Advert\u00e8ncia: Condici\u00f3 doble antiga no concordant  
antiga
 duplexOk = Operaci\u00f3 normal trobada (Normal duplex operation found.)
 endOfEmail = Final del missatge de Correu electr\u00f2nic
+eqSeen = Test de throughput: Detectat excessius encuament de paquets
 excLoss = Exc\u00e9s de p\u00e8rdua de paquets est\u00e0 impactant al  
rendiment, prova la funci\u00f3 d'autonegociaci\u00f3 entre el teu PC i el  
switch de xarxa
 excessiveErrors = Alarma: Excessius errors, revisa el(s) cable(s) de xarxa.
 firewallNo = no est\u00e0 darrere un firewall. [Conexi\u00f3 al port  
ef\u00edmer correcte]
=======================================
---  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_el_GR.properties	 
Mon Feb 10 12:11:55 2014 UTC
+++  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_el_GR.properties	 
Wed Mar 19 12:55:52 2014 UTC
@@ -57,6 +57,7 @@
 duplexNok = \u03a0\u03c1\u03bf\u03c3\u03bf\u03c7\u03ae!  
\u03c0\u03b9\u03b8\u03b1\u03bd\u03ae  
\u03b1\u03bd\u03b1\u03bd\u03c4\u03b9\u03c3\u03c4\u03bf\u03b9\u03c7\u03af\u03b1  
\u03c3\u03c4\u03b7\u03bd  
\u03b4\u03b9\u03b1\u03bc\u03cc\u03c1\u03c6\u03c9\u03c3\u03b7 duplex  
\u03bc\u03b5 \u03b2\u03ac\u03c3\u03b7 \u03c4\u03b7\u03bd  
\u03c0\u03b1\u03bb\u03b9\u03ac \u03c3\u03c5\u03bd\u03b8\u03ae\u03ba\u03b7:
 duplexOk = \u0392\u03c1\u03ad\u03b8\u03b7\u03ba\u03b5  
\u03ba\u03b1\u03bd\u03bf\u03bd\u03b9\u03ba\u03ae  
\u03b4\u03b9\u03b1\u03bc\u03cc\u03c1\u03c6\u03c9\u03c3\u03b7 duplex.
 endOfEmail = \u03a4\u03ad\u03bb\u03bf\u03c2  
\u03bc\u03b7\u03bd\u03cd\u03bc\u03b1\u03c4\u03bf\u03c2
+eqSeen = \u03b4\u03bf\u03ba\u03b9\u03bc\u03ae  
\u03c4\u03b1\u03c7\u03cd\u03c4\u03b7\u03c4\u03b1\u03c2  
\u03b4\u03b9\u03b1\u03bc\u03b5\u03c4\u03b1\u03b3\u03c9\u03b3\u03ae\u03c2:  
\u0391\u03bd\u03b9\u03c7\u03bd\u03b5\u03cd\u03b8\u03b7\u03ba\u03b5  
\u03cc\u03c4\u03b9 \u03c4\u03b1  
\u03c5\u03c0\u03b5\u03c1\u03b2\u03bf\u03bb\u03b9\u03ba\u03ac  
\u03c0\u03b1\u03ba\u03ad\u03c4\u03b1  
\u03bc\u03c0\u03b1\u03af\u03bd\u03bf\u03c5\u03bd \u03c3\u03b5  
\u03bf\u03c5\u03c1\u03ac
 excLoss = \u03a5\u03c0\u03b5\u03c1\u03b2\u03bf\u03bb\u03b9\u03ba\u03ae  
\u03b1\u03c0\u03ce\u03bb\u03b5\u03b9\u03b1  
\u03c0\u03b1\u03ba\u03ad\u03c4\u03c9\u03bd  
\u03bc\u03b5\u03b9\u03ce\u03bd\u03b5\u03b9 \u03c4\u03b9\u03c2  
\u03b5\u03c0\u03b9\u03b4\u03cc\u03c3\u03b5\u03b9\u03c2 \u03c3\u03b1\u03c2,  
\u03b5\u03bb\u03ad\u03be\u03c4\u03b5 \u03c4\u03b7\u03bd  
\u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 auto-negotiate  
\u03c3\u03c4\u03bf\u03bd  
\u03c5\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03c4\u03ae  
\u03ba\u03b1\u03b9 \u03c4\u03bf switch \u03c3\u03b1\u03c2
 excessiveErrors = \u03a0\u03c1\u03bf\u03c3\u03bf\u03c7\u03ae:  
\u03c5\u03c0\u03b5\u03c1\u03b2\u03bf\u03bb\u03b9\u03ba\u03ac  
\u03c0\u03bf\u03bb\u03bb\u03ac \u03bb\u03ac\u03b8\u03b7,  
\u03b5\u03bb\u03ad\u03b3\u03be\u03c4\u03b5 \u03c4\u03bf  
\u03ba\u03b1\u03bb\u03ce\u03b4\u03b9\u03bf(\u03b1) \u03c4\u03bf\u03c5  
\u03b4\u03b9\u03ba\u03c4\u03cd\u03bf\u03c5.
 firewallNo = \u03b4\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9  
\u03c0\u03af\u03c3\u03c9 \u03b1\u03c0\u03cc firewall. [\u0397  
\u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7 \u03c3\u03c4\u03bf  
\u03b5\u03c6\u03ae\u03bc\u03b5\u03c1\u03bf port  
\u03c0\u03ad\u03c4\u03c5\u03c7\u03b5]
=======================================
---  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_en_US.properties	 
Mon Feb 10 12:11:55 2014 UTC
+++  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_en_US.properties	 
Wed Mar 19 12:55:52 2014 UTC
@@ -57,6 +57,7 @@
 duplexNok = Warning: Old Duplex mismatch condition detected:
 duplexOk = Normal duplex operation found.
 endOfEmail = End Of Email Message
+eqSeen = throughput test: Excessive packet queuing detected
 excLoss = Excessive packet loss is impacting your performance, check the  
auto-negotiate function on your local PC and network switch
 excessiveErrors = Alarm: Excessive errors, check network cable(s).
 firewallNo = is not behind a firewall. [Connection to the ephemeral port  
was successful]
=======================================
---  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_fr_FR.properties	 
Mon Feb 10 12:11:55 2014 UTC
+++  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_fr_FR.properties	 
Wed Mar 19 12:55:52 2014 UTC
@@ -57,6 +57,7 @@
 duplexNok = Attention: condition de vieux duplex mismatch  
d\u00E9tect\u00E9e:
 duplexOk = Op\u00E9ration normale du duplex d\u00E9tect\u00E9e.
 endOfEmail = Fin de message e-mail
+eqSeen = test de d\u00E9bit: Mise en file trop d'attente de paquets  
d\u00E9tect\u00E9e
 excLoss = Une perte de paquets excessive diminue vos performances,  
v\u00E9rifiez les r\u00E9glages auto-negotiate de votre PC et du  
commutateur r\u00E9seau.
 excessiveErrors = Alerte: Trop d'erreurs, v\u00E9rifiez le(s)  
c\u00E2ble(s) r\u00E9seau.
 firewallNo = n'est pas derri\u00E8re un firewall. [Connexion vers un port  
\u00E9ph\u00E9m\u00E8re r\u00E9ussie]
=======================================
---  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_nb_NO.properties	 
Mon Feb 10 12:11:55 2014 UTC
+++  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_nb_NO.properties	 
Wed Mar 19 12:55:52 2014 UTC
@@ -58,6 +58,7 @@
 duplexNok = Alarm: Dupleksitetsfeil:
 duplexOk = Dupleksitet er i orden.
 endOfEmail = Slutt p\u00e5 epost
+eqSeen = ytelsestest: For mange pakkek\u00f8ing oppdaget
 excLoss = "H\u00f8yt pakketap begrenser ytelsen, kontroller automatisk  
konfigurering mellom din datamaskin og nettverkssvitsjen.
 excessiveErrors = Alarm: Alvorlige pakketap, sjekk nettverkskabler.
 firewallNo = er ikke bak brannmur. [Oppn\u00e5dde forbindelse med  
midlertidig port]
=======================================
---  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_nl_NL.properties	 
Mon Feb 10 12:11:55 2014 UTC
+++  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_nl_NL.properties	 
Wed Mar 19 12:55:52 2014 UTC
@@ -57,6 +57,7 @@
 duplexNok = Melding: Oude Duplex mismatch conditie gedetecteerd:
 duplexOk = Normale duplex instellingen gevonden.
 endOfEmail = Einde Van Email Bericht
+eqSeen = doorvoer test: Erg veel pakket queuing gedetecteerd
 excLoss = Excessieve verloren pakketten zorgen voor een slechtere  
doorvoer, controleer de auto-negotiate functie op uw PC en de netwerk switch
 excessiveErrors = Alarm: Excessieve errors, controleer netwerk kabel(s).
 firewallNo = is niet achter een firewall. [Connectie naar de directe poort  
was succesvol]
=======================================
---  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_pt_BR.properties	 
Mon Feb 10 12:11:55 2014 UTC
+++  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_pt_BR.properties	 
Wed Mar 19 12:55:52 2014 UTC
@@ -57,6 +57,7 @@
 duplexNok = Aviso: Antiga dupla condi\u00E7\u00E3o de incompatibilidade  
detectada:
 duplexOk = Dupla opera\u00E7\u00E3o normal encontrada.
 endOfEmail = Final da mensagem de E-mail
+eqSeen = teste de taxa de transfer\u00EAncia: Excessivos enfileiramento de  
pacotes detectado
 excLoss = Excessiva perda de pacotes est\u00E1 impactando na sua  
performance, cheque a fun\u00E7\u00E3o auto-negotiate no seu computador  
local e no switch da rede
 excessiveErrors = Alerta: Erros excessivos, verifique o(s) cabo(s) de rede.
 firewallNo = n\u00E3o protegido por firewall. [Conex\u00E3o com a porta  
ef\u00EAmera conclu\u00EDda com \u00EAxito]
=======================================
---  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_ru_RU.properties	 
Mon Feb 10 12:11:55 2014 UTC
+++  
/branches/Issue126/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_ru_RU.properties	 
Wed Mar 19 12:55:52 2014 UTC
@@ -57,7 +57,8 @@
 duplexNok =  
\u041F\u0440\u0435\u0434\u0443\u043F\u0440\u0435\u0436\u0434\u0435\u043D\u0438\u0435:  
\u0440\u0430\u043D\u0435\u0435  
\u043E\u0431\u043D\u0430\u0440\u0443\u0436\u0435\u043D\u043D\u043E\u0435  
\u041D\u0435\u0441\u043E\u0432\u043F\u0430\u0434\u0435\u043D\u0438\u0435  
\u0434\u0443\u043F\u043B\u0435\u043A\u0441\u0430  
\u043E\u0431\u043D\u0430\u0440\u0443\u0436\u0435\u043D\u043E:
 duplexOk = \u041D\u043E\u0440\u043C\u0430\u043B\u044C\u043D\u044B\u0439  
\u0440\u0435\u0436\u0438\u043C \u0440\u0430\u0431\u043E\u0442\u044B  
\u0434\u0443\u043F\u043B\u0435\u043A\u0441\u0430  
\u043E\u0431\u043D\u0430\u0440\u0443\u0436\u0435\u043D.
 endOfEmail = \u041E\u043A\u043E\u043D\u0447\u0430\u043D\u0438\u0435  
\u044D\u043B\u0435\u043A\u0442\u0440\u043E\u043D\u043D\u043E\u0433\u043E  
\u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044F
-excLoss = \u0427\u0440\u0435\u0437\u043C\u0435\u0440\u043D\u044B\u0435  
\u043F\u043E\u0442\u0435\u0440\u0438  
\u0441\u0435\u0442\u0435\u0432\u044B\u0445  
\u043F\u0430\u043A\u0435\u0442\u043E\u0432  
\u0441\u043A\u0430\u0437\u044B\u0432\u0430\u0435\u0442\u0441\u044F  
\u043D\u0430 \u0440\u0430\u0431\u043E\u0442\u0435  
\u0432\u0430\u0448\u0435\u0439 \u0441\u0435\u0442\u0438,  
\u043F\u0440\u043E\u0432\u0435\u0440\u044C\u0442\u0435  
\u0444\u0443\u043D\u043A\u0446\u0438\u044E  
\u0430\u0432\u0442\u043E-\u0441\u043E\u0433\u043B\u0430\u0441\u043E\u0432\u0430\u043D\u0438\u044F  
\u0434\u0443\u043F\u043B\u0435\u043A\u0441\u0430 \u043D\u0430  
\u0432\u0430\u0448\u0435\u043C \u041F\u041A \u0438 \u043D\u0430  
\u0431\u043B\u0438\u0436\u0430\u0439\u0448\u0435\u043C  
\u0441\u0435\u0442\u0435\u0432\u043E\u043C  
\u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0435
+eqSeen = \u0442\u0435\u0441\u0442 \u043D\u0430  
\u043F\u0440\u043E\u043F\u0443\u0441\u043A\u043D\u0443\u044E  
\u0441\u043F\u043E\u0441\u043E\u0431\u043D\u043E\u0441\u0442\u044C:  
\u0447\u0440\u0435\u0437\u043C\u0435\u0440\u043D\u043E\u0435  
\u041E\u0431\u043D\u0430\u0440\u0443\u0436\u0435\u043D\u043E  
\u043D\u0430\u043A\u043E\u043F\u043B\u0435\u043D\u0438\u0435  
\u043F\u0430\u043A\u0435\u0442\u043E\u0432 \u0432  
\u043E\u0447\u0435\u0440\u0435\u0434\u0438
+excLoss = \u0427\u0440\u0435\u0437\u043C\u0435\u0440\u043D\u044B\u0435  
\u043F\u043E\u0442\u0435\u0440\u0438  
\u0441\u0435\u0442\u0435\u0432\u044B\u0445  
\u043F\u0430\u043A\u0435\u0442\u043E\u0432  
\u0441\u043A\u0430\u0437\u044B\u0432\u0430\u0435\u0442\u0441\u044F  
\u043D\u0430 \u0440\u0430\u0431\u043E\u0442\u0435  
\u0432\u0430\u0448\u0435\u0439 \u0441\u0435\u0442\u0438,  
\u043F\u0440\u043E\u0432\u0435\u0440\u044C\u0442\u0435  
\u0444\u0443\u043D\u043A\u0446\u0438\u044E  
\u0430\u0432\u0442\u043E-\u0441\u043E\u0433\u043B\u0430\u0441\u043E\u0432\u0430\u043D\u0438\u044F  
\u0434\u0443\u043F\u043B\u0435\u043A\u0441\u0430 \u043D\u0430  
\u0432\u0430\u0448\u0435\u043C \u041F\u041A \u0438 \u043D\u0430  
\u0431\u043B\u0438\u0436\u0430\u0439\u0448\u0435\u043C  
\u0441\u0435\u0442\u0435\u0432\u043E\u043C  
\u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0435
 excessiveErrors = \u0412\u043D\u0438\u043C\u0430\u043D\u0438\u0435:  
\u0447\u0440\u0435\u0437\u043C\u0435\u0440\u043D\u043E\u0435  
\u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E  
\u043E\u0448\u0438\u0431\u043E\u043A,  
\u043F\u0440\u043E\u0432\u0435\u0440\u044C\u0442\u0435  
\u0441\u0435\u0442\u0435\u0432\u043E\u0439  
\u043A\u0430\u0431\u0435\u043B\u044C(\u044B).
 firewallNo = \u043D\u0435  
\u043D\u0430\u0445\u043E\u0434\u0438\u0442\u0441\u044F \u0437\u0430  
\u043C\u0435\u0436\u0441\u0435\u0442\u0435\u0432\u044B\u043C  
\u044D\u043A\u0440\u0430\u043D\u043E\u043C.  
[\u041F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0435 \u043A  
\u0432\u0438\u0440\u0442\u0443\u0430\u043B\u044C\u043D\u043E\u043C\u0443  
\u043F\u043E\u0440\u0442 \u043F\u0440\u043E\u0448\u043B\u043E  
\u0443\u0441\u043F\u0435\u0448\u043D\u043E]
 firewallYes = \u0432\u0435\u0440\u043E\u044F\u0442\u043D\u043E  
\u0437\u0430 \u043C\u0435\u0436\u0441\u0435\u0442\u0435\u0432\u044B\u043C  
\u044D\u043A\u0440\u0430\u043D\u043E\u043C. [\u041D\u0435  
\u0443\u0434\u0430\u043B\u043E\u0441\u044C  
\u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0438\u0442\u044C\u0441\u044F  
\u043A  
\u0432\u0438\u0440\u0442\u0443\u0430\u043B\u044C\u043D\u043E\u043C\u0443  
\u043F\u043E\u0440\u0442\u0443]
@@ -74,8 +75,7 @@
 fullDuplex =  
\u043F\u043E\u043B\u043D\u043E\u0434\u0443\u043F\u043B\u0435\u043A\u0441\u043D\u0430\u044F  
Fast Ethernet \u043F\u043E\u0434\u0441\u0435\u0442\u044C
 general= \u041E\u0431\u0449\u0438\u0435
 generatingReport = \u0413\u043E\u0442\u043E\u0432\u0438\u0442\u0441\u044F  
\u043E\u0442\u0447\u0435\u0442 \u043E  
\u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0435:  
\u0414\u0430\u043D\u043D\u044B\u0439 \u043E\u0442\u0447\u0435\u0442  
\u0431\u0443\u0434\u0435\u0442 \u0432\u044B\u0441\u043B\u0430\u043D  
\u0443\u043A\u0430\u0437\u0430\u043D\u043D\u044B\u043C  
\u043B\u0438\u0446\u0430\u043C
-getWeb100Var = \u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C Web100  
\u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435
-getWeb100Var = \u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C Web10G  
\u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435
+getWeb100Var = \u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C Web100  
\u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435
 halfDuplex =  
\u043F\u043E\u043B\u0443\u0434\u0443\u043F\u043B\u0435\u043A\u0441\u043D\u0430\u044F  
Fast Ethernet \u043F\u043E\u0434\u0441\u0435\u0442\u044C
 id = TCP/Web100/Web10G Network Diagnostic Tool (NDT)
 immediate = \u0441\u0438\u044E \u043C\u0438\u043D\u0443\u0442\u0443
=======================================
--- /branches/Issue126/HTML5-frontend/widget.html	Wed Mar  5 15:18:48 2014  
UTC
+++ /branches/Issue126/HTML5-frontend/widget.html	Wed Mar 19 12:55:52 2014  
UTC
@@ -77,7 +77,7 @@
         <div class="upload result">
           <h3>Upload speed</h3>
           <p>
-            <span class="number" id="upload-speed"  
class="number">0.00</span>
+            <span class="number" id="upload-speed">0.00</span>
             <span class="units">mb/s</span>
           </p>
         </div>
@@ -85,7 +85,7 @@
         <div class="download result">
           <h3>Download speed</h3>
           <p>
-            <span class="number" id="download-speed"  
class="number">0.00</span>
+            <span class="number" id="download-speed">0.00</span>
             <span class="units">mb/s</span>
         </div>

=======================================
--- /branches/Issue126/src/test_c2s_srv.c       Mon Oct 14 13:20:21 2013 UTC
+++ /branches/Issue126/src/test_c2s_srv.c       Wed Mar 19 12:55:52 2014 UTC
@@ -294,7 +294,9 @@
           continue;
         break;
       }
-      memcpy(meta.c2s_ndttrace, tmpstr, strlen(tmpstr));
+
+      if (strlen(tmpstr) > 5)
+        memcpy(meta.c2s_ndttrace, tmpstr, strlen(tmpstr));
       // name of nettrace file passed back from pcap child
       log_println(3, "--tracefile after packet_trace %s",
                   meta.c2s_ndttrace);
=======================================
--- /branches/Issue126/src/web100-pcap.c        Mon Oct 14 13:20:21 2013 UTC
+++ /branches/Issue126/src/web100-pcap.c        Wed Mar 19 12:55:52 2014 UTC
@@ -27,7 +27,6 @@
   u_int16_t speed[32];
 } iflist;

-static int dumptrace;
 static pcap_t *pd;
 static pcap_dumper_t *pdump;
 static int* mon_pipe;
=======================================
--- /branches/Issue126/src/web100srv.c  Fri Feb 21 16:32:03 2014 UTC
+++ /branches/Issue126/src/web100srv.c  Wed Mar 19 12:55:52 2014 UTC
@@ -101,7 +101,7 @@
 // list of global variables used throughout this program.
 static int window = 64000;  // TCP buffer size
 static int count_vars = 0;
-static int dumptrace = 0;
+int dumptrace = 0;
 static int usesyslog = 0;
 static int multiple = 0;
 static int compress = 1;
=======================================
--- /branches/Issue126/src/web100srv.h  Mon Oct 14 13:20:21 2013 UTC
+++ /branches/Issue126/src/web100srv.h  Wed Mar 19 12:55:52 2014 UTC
@@ -332,4 +332,7 @@
 sig_atomic_t sig17;
 pid_t sig17_pid[256];

+/* global variables shared with other source files */
+extern int dumptrace;
+
 #endif  // SRC_WEB100SRV_H_