Skip to Content.
Sympa Menu

ndt-dev - [ndt] r314 committed - Patch from uninett applied - generting dummy release to test. ...

Subject: NDT-DEV email list created

List archive

[ndt] r314 committed - Patch from uninett applied - generting dummy release to test. ...


Chronological Thread 
  • From:
  • To:
  • Subject: [ndt] r314 committed - Patch from uninett applied - generting dummy release to test. ...
  • Date: Wed, 17 Mar 2010 13:45:36 +0000
Revision: 314
Author: jwzurawski
Date: Wed Mar 17 06:44:30 2010
Log: Patch from uninett applied - generting dummy release to test.

-jason


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

Added:
/branches/jz-localization/Applet/Tcpbw100_msgs_en_US.properties
/branches/jz-localization/Applet/Tcpbw100_msgs_nb_NO.properties
Modified:
/branches/jz-localization/Applet/Tcpbw100.java
/branches/jz-localization/configure.ac

=======================================
--- /dev/null
+++ /branches/jz-localization/Applet/Tcpbw100_msgs_en_US.properties Wed Mar 17 06:44:30 2010
@@ -0,0 +1,218 @@
+10gbps = 10 Gbps 10 Gigabit Ethernet/OC-192 subnet
+10mbps = 10 Mbps Ethernet subnet
+10mins = 10 mins
+12hours = 12 hours
+1day = 1 day
+1gbps = 1.0 Gbps Gigabit Ethernet subnet
+1min = 1 min
+2.4gbps = 2.4 Gbps OC-48 subnet
+2hours = 2 hours
+30mins = 30 mins
+45mbps = 45 Mbps T3/DS3 subnet
+5mins = 5 mins
+622mbps = a 622 Mbps OC-12 subnet
+and = and
+architecture = Architecture
+bytes = Bytes
+c2s = C2S
+c2sPacketQueuingDetected = [C2S]: Packet queueing detected
+c2sThroughput = C2S throughput
+c2sThroughputFailed = C2S throughput test FAILED!
+cabledsl = Cable/DSL modem
+cablesNok = Warning: excessive network errors, check network cable(s)
+cablesOk = Good network cable(s) found
+checkingFirewalls = Checking for firewalls . . . . . . . . . . . . . . . . . . .
+checkingMiddleboxes = Checking for Middleboxes . . . . . . . . . . . . . . . . . .
+clickStart = Click START to start the test
+clickStart2 = Click START to re-test
+client = Client
+client2 = Client
+clientAcksReport = Client Acks report link is
+clientDataReports = Client Data reports link is
+clientInfo = Client System Details
+clientIpModified = Information: Network Address Translation (NAT) box is modifying the Client's IP address
+clientIpNotFound = Client IP address not found. For IE users, modify the Java parameters\n click Tools - Internet Options - Security - Custom Level, scroll down to\n Microsoft VM - Java permissions and click Custom, click Java Custom Settings\n Edit Permissions - Access to all Network Addresses, click Eanble and save changes
+clientIpPreserved = Server IP addresses are preserved End-to-End
+clientSays = but Client says
+close = Close
+comments = Comments
+congestNo = No network congestion discovered.
+congestYes = Information: throughput is limited by other network traffic.
+connIdle = The connection was idle
+connStalled = The connection stalled
+connected = Connected to:
+connectedTo = is connected to a
+copy = Copy
+defaultTests = Default tests
+delayBetweenTests = Delay between tests
+detailedStats = Detailed Statistics
+dialup = Dial-up Modem
+dialup2 = Dial-up
+done = Done.
+done2 = Tcpbw100 done
+dupAcksIn = duplicate acks received
+duplexFullHalf = Alarm: Duplex Mismatch condition detected Switch=Full and Host=half
+duplexHalfFull = Alarm: Duplex Mismatch condition detected Switch=half and Host=full
+duplexNok = Warning: Old Duplex mismatch condition detected:
+duplexOk = Normal duplex operation found.
+endOfEmail = End Of Email Message
+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]
+firewallYes = is probably behind a firewall. [Connection to the ephemeral port failed]
+flowControlLimits = The network based flow control limits the throughput to
+found100mbps = 100 Mbps FastEthernet link found.
+found10gbps = 10 Gbps 10 GigEthernet/OC-192 link found.
+found10mbps = 10 Mbps Ethernet link found.
+found1gbps = 1 Gbps GigabitEthernet link found.
+found2.4gbps = 2.4 Gbps OC-48 link found.
+found45mbps = 45 Mbps T3/DS3 link found.
+found622mbps = 622 Mbps OC-12 link found.
+foundDialup = Dial-up modem link found.
+foundDsl = Cable modem/DSL/T1 link found.
+fullDuplex = Full duplex Fast Ethernet subnet
+general = General
+generatingReport = Generating Trouble Report: This report will be emailed to the person you specify
+getWeb100Var = Get WEB100 Variables
+halfDuplex = Half duplex Fast Ethernet subnet
+id = TCP/Web100 Network Diagnostic Tool
+immediate = immediate
+inboundTest = Tcpbw100 inbound test...
+inboundWrongMessage = C2S throughput test: Received wrong type of the message
+incompatibleVersion = Incompatible version number
+incrRxBuf = Increasing the the client's receive buffer
+incrTxBuf = Increasing the NDT server's send buffer
+information = Information
+initialization = Initialization...
+insufficient = Insufficent data collected to determine link type.
+invokingMailtoFunction = Tcpbw100 Invoking Mailto function
+ipProtocol = IP protocol
+ipcFail = Interprocess communications failed, unknown link type.
+usingIpv4 = -- Using IPv4 address
+usingIpv6 = -- Using IPv6 address
+javaData = Java data
+kbyteBufferLimits = KByte buffer which limits the throughput to
+limitNet = network limited
+limitRx = receiver limited
+limitTx = sender limited
+linkFullDpx = Link set to Full Duplex mode
+linkHalfDpx = Link set to Half Duplex mode
+loggingWrongMessage = Logging to server: Received wrong type of the message
+lookupError = Unable to obtain remote IP address
+mboxWrongMessage = Middlebox test: Received wrong type of the message
+middlebox = Middlebox
+middleboxFail = Server Failed while middlebox testing
+middleboxFail2 = Middlebox test FAILED!
+middleboxModifyingMss = Information: Network Middlebox is modifying MSS variable
+middleboxTest = Tcpbw100 Middlebox test...
+moreDetails = More Details...
+name = Name
+ndtServerHas = The NDT server has a
+noPktLoss1 = No packet loss
+noPktLoss2 = No packet loss was observed
+numberOfTests = Number of tests
+of = of
+off = OFF
+ok = OK
+oldDuplexMismatch = "Warning: Old Duplex mismatch condition detected: "
+on = ON
+ooOrder = but packets arrived out-of-order
+options = Options
+osData = OS data:
+otherClient = Another client is currently being served, your test will begin within
+otherTraffic = Information: Other network traffic is congesting the link
+outboundTest = Tcpbw100 outbound test...
+outboundWrongMessage = C2S throughput test: Received wrong type of the message
+packetQueuing = Packet queuing
+packetQueuingInfo = TCP (Transmission Control Protocol) reliably transfers data between two\n Internet hosts. It automatically detects and recovers from errors and\n losses. TCP uses buffers to provide this reliability. In addition,\n switches and routers use buffers to handle cases where multiple input\n links send packets to a single output link or link speeds change\n (FastEthernet to DSL modem).\n\n The NDT server generates and sends 10 seconds of data to the client. In\n some cases the server can generate data faster than it can send packets\n into the network (e.g., a 2 GHz CPU sending to a DSL connected client).\n When this happens, some packets may remain in the server output queue\n when the 10 second timer expires. TCP will automatically continue to\n send these queued packets and the client will continue to accept and\n process these incoming packets. This will result in the client test\n running longer than expected.\n\n This condition has occurred during this test. No action is required to\n resolve this issue.
+packetSizePreserved = Packet size is preserved End-to-End
+packetsize = the Packet size
+pc = PC
+pctOfTime = % of the time
+performedTests = Performed tests
+pktsRetrans = packets retransmitted
+possibleDuplexFullHalf = Alarm: Possible Duplex Mismatch condition detected Switch=Full and Host=half
+possibleDuplexHalfFull = Alarm: Possible Duplex Mismatch condition detected Switch=half and Host=full
+possibleDuplexHalfFullWarning = Warning: Possible Duplex Mismatch condition detected Switch=half and Host=full
+preferIPv6 = prefer IPv6
+printDetailedStats = Print Detailed Statistics
+protocolError = Protocol error!
+qSeen = throughput test: Packet queuing detected
+ready = Tcpbw100 ready
+receiveBufferShouldBe = Information: The receive buffer should be
+receiving = Receiving results...
+reportProblem = Report problem
+resultsParseError = Error parsing test results!
+resultsTimeout = Warning! Client time-out while reading data, possible duplex mismatch exists
+resultsWrongMessage = Tests results: Received wrong type of the message
+rtt = RTT
+rttFail = Link detection algorithm failed due to excessive Round Trip Times.
+runningInboundTest = running 10s inbound test (server-to-client [S2C]) . . . . . .
+runningOutboundTest = running 10s outbound test (client-to-server [C2S]) . . . . .
+s2c = S2C
+s2cPacketQueuingDetected = [S2C]: Packet queueing detected
+s2cThroughput = S2C throughput
+s2cThroughputFailed = S2C throughput test FAILED!
+sackReceived = SACK blocks received
+scalingFactors = Scaling Factors
+seconds = seconds
+server = Server
+serverAcksReport = Server Acks report link is
+serverBusy = Server Busy: Too many clients waiting in server queue. Please try again later
+serverBusy15s = Server Busy: Please wait 15 seconds for previous test to finish
+serverBusy30s = Server busy: Please wait 30 seconds for previous test to finish
+serverBusy60s = Server Busy: Please wait 60 seconds for previous test to finish
+serverDataReports = Server Data reports link is
+serverFail = Server failed while receiving data
+serverIpModified = Information: Network Address Translation (NAT) box is modifying the Client's IP address
+serverIpPreserved = Server IP addresses are preserved End-to-End
+serverNotRunning = Server process not running: start web100srv process on remote server
+serverSays = Server says
+sfwFail = Simple firewall test FAILED!
+sfwSocketFail = Simple firewall test: Cannot create listen socket
+sfwTest = Simple firewall test...
+sfwWrongMessage = Simple firewall test: Received wrong type of the message
+showOptions = Show options
+simpleFirewall = Simple firewall
+sleep10m = Sleeping for 10 mins...
+sleep1m = Sleeping for 1 min...
+sleep30m = Sleeping for 30 mins...
+sleep5m = Sleeping for 5 mins...
+sleep12h = Sleeping for 12 hours...
+sleep1d = Sleeping for 1 day...
+sleep2h = Sleeping for 2 hours...
+start = START
+startingTest = Starting test
+statistics = Statistics
+stop = STOP
+stopped = The tests were stopped!
+stopping = Stopping...
+systemFault = System Fault
+test = Test
+testsuiteWrongMessage = Negotiating test suite: Received wrong type of the message
+theSlowestLink = The slowest link in the end-to-end path is a
+theoreticalLimit = The theoretical network limit is
+thisConnIs = This connection is
+timesPktLoss = times due to packet loss
+toMaximizeThroughput = kbytes to maximize throughput
+troubleReportFrom = Trouble Report from NDT on
+unableToDetectBottleneck = Server unable to determine bottleneck link type.
+unableToObtainIP = Unable to obtain local IP address
+unknownID = Unknown test ID
+unknownServer = Unknown server
+unsupportedClient = Information: The server does not support this command line client
+vendor = Vendor
+version = Version
+versionWrongMessage = Negotiating NDT version: Received wrong type of the message
+web100Details = Web100 Detailed Analysis
+web100KernelVar = WEB100 Kernel Variables
+web100Stats = WEB100 Enabled Statistics
+web100Var = Web100 Variables
+web100rtt = Web100 reports the Round trip time
+web100tcpOpts = Web100 reports TCP negotiated the optional Performance Settings to:
+willImprove = will improve performance
+workstation = Workstation
+your = Your
+yourPcHas = Your PC/Workstation has a
+connectingTo = Connecting to
+toRunTest = to run test
=======================================
--- /dev/null
+++ /branches/jz-localization/Applet/Tcpbw100_msgs_nb_NO.properties Wed Mar 17 06:44:30 2010
@@ -0,0 +1,218 @@
+10gbps = 10 Gbps 10 Gigabit Ethernet/OC-192-subnett
+10mbps = 10 Mbps Ethernet-subnett
+10mins = 10 mins
+12hours = 12 hours
+1day = 1 d\u00f8ygn
+1gbps = 1.0 Gbps Gigabit Ethernet-subnett
+1min = 1 min
+2.4gbps = 2.4 Gbps OC-48-subnett
+2hours = 2 timer
+30mins = 30 min
+45mbps = 45 Mbps T3/DS3-subnett
+5mins = 5 min
+622mbps = et 622 Mbps OC-12-subnett
+and = og
+architecture = Arkitektur
+bytes = byte
+c2s = K-T
+c2sPacketQueuingDetected = [K-T]: Pakkek\u00f8ing oppdaget
+c2sThroughput = K-T ytelse
+c2sThroughputFailed = K-T ytelsestest FEILET!
+cabledsl = Kabel/DSL-modem
+cablesNok = Advarsel: for mange nettverksfeil, sjekk kablene.
+cablesOk = Nettverkskablene er i orden.
+checkingFirewalls = Ser etter brannmurer . . . . . . . . . . . . . . . . . . .
+checkingMiddleboxes = Ser etter mellombokser . . . . . . . . . . . . . . . . .
+clickStart = Trykk START for \u00e5 starte testene.
+clickStart2 = Trykk START for \u00e5 teste en gang til.
+client = Klient
+client2 = Klienten
+clientAcksReport = basert p\u00e5 ack fra klienten ansl\u00e5s linken til
+clientDataReports = Basert p\u00e5 data fra klienten ansl\u00e5s linken til
+clientInfo = Opplysninger om klientmaskinen
+clientIpModified = Til orientering: Network Address Translation (NAT) forandrer klientmaskinens IP-adresse
+clientIpNotFound = IP-addressen til klientmaskinen ble ikke funnet
+clientIpPreserved = Tjenermaskinens IP-adresse blir bevart fra ende til ende
+clientSays = men klienten sier
+close = Lukk
+comments = Kommentarer
+congestNo = Overbelastning i nettet ikke funnet.
+congestYes = Til orientering: ytelsen er begrenset av annen trafikk i nettet.
+connIdle = Forbindelsen ventet
+connStalled = Forbindelsen hang
+connected = Koblet til:
+connectedTo = er koblet til et
+connectingTo = Kobler opp mot
+copy = Kopier
+defaultTests = Standardtester
+delayBetweenTests = Delay between tests
+detailedStats = Detaljer
+dialup = Oppringt modem
+dialup2 = oppringt
+done = Ferdig
+done2 = Tcpbw100 ferdig
+dupAcksIn = dupliserte ack ble mottatt
+duplexFullHalf = Alarm: Dupleksitetsfeil oppdaget; svitsj=full og maskin=halv
+duplexHalfFull = Alarm: Dupleksitetsfeil oppdaget; svitsj=halv og maskin=full
+duplexNok = Alarm: Dupleksitetsfeil:
+duplexOk = Dupleksitet er i orden.
+endOfEmail = Slutt p\u00e5 epost
+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]
+firewallYes = er trolig bak en brannmur . [Oppn\u00e5dde ikke forbindelse med midlertidig port]
+flowControlLimits = Flytkontroll i nettet begrenser ytelsen til
+found100mbps = Link med 100 Mbit/s FastEthernet funnet.
+found10gbps = Link med 10 Gbit/s 10 GigEthernet/OC-192 funnet.
+found10mbps = Link med 10 Mbit/s Ethernet funnet.
+found1gbps = Link med 1 Gbit/s GigabitEthernet funnet.
+found2.4gbps = Link med 2.4 Gbit/s OC-48 funnet.
+found45mbps = Link med 45 Mbit/s T3/DS3 funnet.
+found622mbps = Link med 622 Mbit/s OC-12 funnet.
+foundDialup = Link med oppringt modem funnet.
+foundDsl = Link med kabelmodem/DSL/T1 funnet.
+fullDuplex = full dupleks "Fast Ethernet"-subnett
+general = Annet
+generatingReport = Genererer feilrapport; denne vil bli sendt til personen du spesifiserer
+getWeb100Var = Viser variabler fra WEB100
+halfDuplex = Halv-dupleks "Fast Ethernet"-subnett
+id = TCP/Web100 nettverksdiagnostikkverkt\u00f8y
+immediate = umiddelbart
+inboundTest = Tcpbw100 innkommende test...
+inboundWrongMessage = Klient-til-tjener-ytelsestest: mottok feil melding
+incompatibleVersion = Inkompatibelt versjonsnummer
+incrRxBuf = \u00c5 \u00f8ke klientmaskinens mottaksbuffer
+incrTxBuf = \u00c5 \u00f8ke tjenermaskinens sendebuffer
+information = Informasjon
+initialization = Initialiserer...
+insufficient = Ikke nok data til \u00e5 bestemme type link.
+invokingMailtoFunction = Tcpbw100 sender post
+ipProtocol = IP-protokoll
+ipcFail = Feil ved kommunikasjon mellom prosesser, type link ikke bestemt.
+javaData = Opplysninger om Java
+kbyteBufferLimits = kbyte som begrenser ytelsen til
+limitNet = begrenset av nettet
+limitRx = begrenset av mottakeren
+limitTx = begrenset av senderen
+linkFullDpx = Linken er i full dupleksmodus.
+linkHalfDpx = Linken er i halv dupleksmodus.
+loggingWrongMessage = Logging til tjener: Mottok feil type melding
+lookupError = Greide ikke sl\u00e5 opp tjenerens IP-addresse
+mboxWrongMessage = Mellombokstest: Mottok feil type melding
+middlebox = Mellomboks
+middleboxFail = Tjenerfeil under mellombokstesting
+middleboxFail2 = Mellombokstest feilet!
+middleboxModifyingMss = Til orientering: En mellomboks i nettet forandrer valgt MSS
+middleboxTest = Tcpbw100 mellombokstest...
+moreDetails = Detaljer
+name = Navn
+ndtServerHas = NDT-tjeneren har en buffer p\u00e5
+noPktLoss1 = Intet pakketap
+noPktLoss2 = Intet pakketap
+numberOfTests = Antall tester
+of = av
+off = AV
+ok = OK
+oldDuplexMismatch = Advarsel: Gammel dupleksitetsfeil oppdaget:
+on = P\u00C5
+ooOrder = men pakker ankom i feil rekkef\u00f8lge
+options = Innstillinger
+osData = Operativsystem:
+otherClient = Tjeneren er for \u00f8yeblikket opptatt med en annen klient. Testen din vil begynne innen
+otherTraffic = Informasjon: Annen trafikk overbelaster linken
+outboundTest = Tcpbw100 utg\u00e5ende test...
+outboundWrongMessage = K-T ytelsestest: mottok feil type melding
+packetQueuing = Pakkek\u00f8ing
+packetQueuingInfo = TCP (Transmission Control Protocol) er en p\u00e5litelig nettverksprotokoll\n som overf\u00f8rer data mellom forskjellige maskiner. Den oppdager og motvirker\n automatisk feil og pakketap. TCP bruker buffere for \u00e5 oppn\u00e5 dette.\n I tillegg s\u00e5 har svitsjer og rutere buffere for \u00e5 h\u00e5ndtere tilfeller\n hvor mange maskiner sender til samme port, eller hvor hastigheter\n endres (for eksempel "Fast Ethernet" eller et DSL-modem).\n \n NDT-tjeneren genererer og sender 10 sekunder med data til klienten.\n I noen tilfeller genererer tjeneren data kjappere enn den klarer \u00e5\n sende ut pakker til nettverket (for eksempel en tjener med 2GHz CPU\n som sender til en klient koblet til via DSL). N\u00e5r dette skjer, hender\n det at det er igjen pakker i pakkek\u00f8en n\u00e5r de 10 sekundene har passert.\n TCP vil automatisk fors\u00f8ke \u00e5 sende disse pakkene, selv om tiden er ute,\n og klienten vil fortsette \u00e5 motta de. Dette vil f\u00f8re til at klienttesten\n kan kj\u00f8re litt lenger enn forventet.\n \n Dette hendte under kj\u00f8ringen av denne testen. Du trenger ikke gj\u00f8re noe\n for \u00e5 fikse dette.
+packetSizePreserved = Pakkest\u00f8rrelse blir bevart fra ende til ende
+packetsize = pakkkest\u00f8rrelse
+pc = Personlig datamaskin
+pctOfTime = % av tiden
+performedTests = Tester \u00e5 utf\u00f8re
+pktsRetrans = pakker ble retransmittert
+possibleDuplexFullHalf = Alarm: Mulig dupleksitetsfeil oppdaget; svitsj=full og maskin=halv
+possibleDuplexHalfFull = Alarm: Mulig dupleksitetsfeil oppdaget; svitsj=halv og maskin=full
+possibleDuplexHalfFullWarning = Advarsel: Mulig dupleksitetsfeil oppdaget; svitsj=halv og maskin=full
+preferIPv6 = bruk IPv6 hvis mulig
+printDetailedStats = Viser detaljer
+protocolError = Protokollfeil!
+qSeen = ytelsestest: Pakkek\u00f8ing oppdaget
+ready = Tcpbw100 klar
+receiveBufferShouldBe = Informasjon: Mottaksbufferen burde v\u00e6re
+receiving = Henter resultater...
+reportProblem = Meld fra om problemer
+resultsParseError = Feil under tolkingen av testresultater!
+resultsTimeout = Advarsel! Tidsavbrudd under henting av data, mulig dupleksitetsfeil
+resultsWrongMessage = Testresultater: Mottok feil type melding
+rtt = rundreisetid
+rttFail = For lang rundreisetid til \u00e5 bestemme type link.
+runningInboundTest = Kj\u00f8rer 10 sekunders innkommende test (tjener-til-klient [T-K]) . . . .
+runningOutboundTest = Kj\u00f8rer 10 sekunders utg\u00e5ende test (klient-til-tjener [K-T]) . . . . . . .
+s2c = T-K
+s2cPacketQueuingDetected = [T-K]: Pakkek\u00f8ing oppdaget
+s2cThroughput = Ytelse tjener-klient
+s2cThroughputFailed = Ytelsestest fra tjener til klient FEILET!
+sackReceived = SACK-blokker ble mottatt.
+scalingFactors = Skaleringsfaktorer
+seconds = sekunder
+server = Tjener
+serverAcksReport = basert p\u00e5 ack fra tjeneren ansl\u00e5s linken til
+serverBusy = Tjener opptatt; For mange klienter i k\u00f8. Du kan pr\u00f8ve senere
+serverBusy15s = Tjener opptatt; vennligst vent 15 sekunder mens forrige test kj\u00f8res ferdig
+serverBusy30s = Tjener opptatt; vennligst vent 30 sekunder mens forrige test kj\u00f8res ferdig
+serverBusy60s = Tjener opptatt; vennligst vent 60 sekunder mens forrige test kj\u00f8res ferdig
+serverDataReports = Basert p\u00e5 data fra tjeneren ansl\u00e5s linken til
+serverFail = Tjenerfeil under mottak av data
+serverIpModified = Til orientering: Network Address Translation (NAT) forandrer klientmaskinens IP-adresse
+serverIpPreserved = Tjenermaskinens IP-adresse blir bevart fra ende til ende
+serverNotRunning = Tjenerprosess kj\u00f8rer ikke; vennligst start "web100srv" p\u00e5 tjeneren.
+serverSays = Tjeneren sier
+sfwFail = Enkel brannmurtest FEILET!
+sfwSocketFail = Enkel brannmurtest: Kan ikke opprette lytteport
+sfwTest = Enkel brannmurtest...
+sfwWrongMessage = Enkel brannmurtest: Mottok feil type melding
+showOptions = Vis innstillinger
+simpleFirewall = Enkel brannmur
+sleep10m = Venter 10 minutter...
+sleep12h = Venter 12 timer...
+sleep1d = Venter ett d\u00f8gn...
+sleep1m = Venter ett minutt...
+sleep2h = Venter to timer...
+sleep30m = Venter 30 minutter...
+sleep5m = Venter fem minutter...
+start = START
+startingTest = Starter test
+statistics = Statistikk
+stop = STOPP
+stopped = Testene ble stoppet!
+stopping = Stopper...
+systemFault = systemfeil
+test = Test
+testsuiteWrongMessage = Avtaler tester: Mottok feil type melding
+theSlowestLink = Den tregeste linken i stien mellom din maskin og tjeneren er et
+theoreticalLimit = Teoretisk grense for nettet er
+thisConnIs = Denne forbindelsen er
+timesPktLoss = ganger p\u00e5 grunn av pakketap
+toMaximizeThroughput = kilobyte for \u00e5 maksimere ytelsen
+toRunTest = for \u00e5 teste
+troubleReportFrom = Feilrapport fra NDT p\u00e5
+unableToDetectBottleneck = Tjeneren greide ikke \u00e5 bestemme flaskehalsen i stien
+unableToObtainIP = Kunne ikke f\u00e5 tak i den lokale IP-addressen
+unknownID = Ukjent test-ID
+unknownServer = Ukjent tjener
+unsupportedClient = Informasjon: Tjeneren st\u00f8tter ikke denne kommandolinjeklienten
+usingIpv4 = -- Bruker IPv4-addresse
+usingIpv6 = -- Bruker IPv6-addresse
+vendor = Leverand\u00f8r
+version = Versjon
+versionWrongMessage = Avtaler NDT-versjon: Mottok feil type melding
+web100Details = Detaljerte opplysninger fra Web100
+web100KernelVar = Kjernevariabler fra WEB100
+web100Stats = Statistikk fra WEB100
+web100Var = Variabler fra Web100
+web100rtt = Web100 melder at rundreisetid
+web100tcpOpts = Web100 melder at valgbare felt i TCP som p\u00e5virker ytelse er satt til:
+willImprove = vil forbedre ytelsen
+workstation = Arbeidsstasjon
+your = Din
+yourPcHas = Datamaskinen din har en buffer p\u00e5
=======================================
--- /branches/jz-localization/Applet/Tcpbw100.java Mon Mar 8 14:34:02
2010
+++ /branches/jz-localization/Applet/Tcpbw100.java Wed Mar 17 06:44:30
2010
@@ -98,7 +98,7 @@

public class Tcpbw100 extends JApplet implements ActionListener
{
- private static final String VERSION = "3.6.1";
+ private static final String VERSION = "3.6.2a";
private static final byte TEST_MID = (1 << 0);
private static final byte TEST_C2S = (1 << 1);
private static final byte TEST_S2C = (1 << 2);
@@ -135,11 +135,10 @@
JButton sTatistics;
JButton mailTo;
JButton options;
- JCheckBox defaultTest = new JCheckBox("Default tests"),
- preferIPv6 = new JCheckBox("prefer IPv6");
+ JCheckBox defaultTest, preferIPv6;
JSpinner numOfTests = new JSpinner();
- String[] delays = { "immediate", "1 min", "5 mins", "10 mins", "30 mins", "2 hours", "12 hours", "1 day" };
- JComboBox delay = new JComboBox(delays);
+ String[] delays = { "immediate", "1min","5mins","10mins","30mins","2hours","12hours","1day" };
+ JComboBox delay;

boolean Randomize, failed, cancopy;
URL location;
@@ -440,6 +439,17 @@
**/
/************************************************************************/

+ /**
+ * Added by Martin Sandsmark, UNINETT AS
+ * Internationalization
+ */
+ private Locale locale;
+ private ResourceBundle messages;
+ private String lang="en";
+ private String country="US";
+ //private static String lang="nb";
+ //private static String country="NO";
+ /***/

int half_duplex, congestion, bad_cable, mismatch;
double mylink;
@@ -472,8 +482,19 @@


public void init() {
+ if (getParameter("country") != null) country = getParameter("country");
+ if (getParameter("language") != null) lang = getParameter("language");
+
+ try {
+ locale = new Locale(lang, country);
+ messages = ResourceBundle.getBundle("Tcpbw100_msgs", locale);
+ } catch (Exception e) {
+ JOptionPane.showMessageDialog(null, "Error while loading language files:\n" + e.getMessage());
+ e.printStackTrace();
+ }
+
getContentPane().setLayout(new BorderLayout());
- showStatus("Tcpbw100 ready");
+ showStatus(messages.getString("ready"));
failed = false ;
Randomize = false;
cancopy = false;
@@ -481,30 +502,30 @@
results.append("TCP/Web100 Network Diagnostic Tool v" + VERSION + "\n");
results.setEditable(false);
getContentPane().add(new JScrollPane(results));
- results.append("click START to begin\n");
+ results.append(messages.getString("clickStart") + "\n");
Panel mPanel = new Panel();
- startTest = new JButton("START");
+ startTest = new JButton(messages.getString("start"));
startTest.addActionListener(this);
mPanel.add(startTest);
- sTatistics = new JButton("Statistics");
+ sTatistics = new JButton(messages.getString("statistics"));
sTatistics.addActionListener(this);
if (getParameter("disableStatistics") == null) {
mPanel.add(sTatistics);
}
sTatistics.setEnabled(false);
- deTails = new JButton("More Details...");
+ deTails = new JButton(messages.getString("moreDetails"));
deTails.addActionListener(this);
if (getParameter("disableDetails") == null) {
mPanel.add(deTails);
}
deTails.setEnabled(false);
- mailTo = new JButton("Report Problem");
+ mailTo = new JButton(messages.getString("reportProblem"));
mailTo.addActionListener(this);
if (getParameter("disableMailto") == null) {
mPanel.add(mailTo);
}
mailTo.setEnabled(false);
- options = new JButton("Options");
+ options = new JButton(messages.getString("options") + "...");
options.addActionListener(new ActionListener() {

public void actionPerformed(ActionEvent e) {
@@ -518,7 +539,9 @@
mPanel.add(options);
}
getContentPane().add(BorderLayout.SOUTH, mPanel);
+ preferIPv6 = new JCheckBox(messages.getString("preferIPv6"));
preferIPv6.setSelected(true);
+ defaultTest = new JCheckBox(messages.getString("defaultTests"));
defaultTest.setSelected(true);
defaultTest.setEnabled(false);
SpinnerNumberModel model = new SpinnerNumberModel();
@@ -526,6 +549,10 @@
model.setValue(new Integer(1));
numOfTests.setModel(model);
numOfTests.setPreferredSize(new Dimension(60, 20));
+ delay = new JComboBox();
+ for (int i = 0; i < delays.length; i++) {
+ delay.addItem(messages.getString(delays[i]));
+ }
delay.setSelectedIndex(0);

//Autorun functionality
@@ -566,7 +593,7 @@
private boolean _stop = false;

private JLabel testNoLabel = new JLabel();
- private JButton stopButton= new JButton("STOP");
+ private JButton stopButton;
private JProgressBar progressBar = new JProgressBar();

StatusPanel(int testsNum) {
@@ -586,15 +613,16 @@
progressBar.setIndeterminate(true);
}
else {
- progressBar.setString("initialization...");
+ progressBar.setString(messages.getString("initialization"));
}
add(progressBar);
+ stopButton= new JButton(messages.getString("stop"));
stopButton.addActionListener(new ActionListener() {

public void actionPerformed(ActionEvent e) {
_stop = true;
stopButton.setEnabled(false);
- StatusPanel.this.setText("Stopping...");
+ StatusPanel.this.setText(messages.getString("stopping"));
}

});
@@ -604,7 +632,7 @@
}

private void setTestNoLabelText() {
- testNoLabel.setText("Test " + _testNo + " of " + _testsNum);
+ testNoLabel.setText(messages.getString("test") + " " + _testNo + " " + messages.getString("of") + " " +_testsNum);
}

public boolean wantToStop() {
@@ -651,10 +679,10 @@
break;
}
if (testsNum == 0) {
- results.append("\n** Starting test " + testNo + " **\n");
+ results.append("\n** " + messages.getString("startingTest") + " " + testNo + " **\n");
}
else {
- results.append("\n** Starting test " + testNo + " of " + testsNum + " **\n");
+ results.append("\n** " + messages.getString("startingTest") + " " + testNo + " " + messages.getString("of") + " " + testsNum + " **\n");
}
dottcp(sPanel);
if (testNo == testsNum) {
@@ -670,36 +698,36 @@
sTatistics.setEnabled(true);
mailTo.setEnabled(true);
options.setEnabled(true);
- statistics.append("\n** Test " + testNo + " **\n");
- diagnosis.append("\n** Test " + testNo + " **\n");
+ statistics.append("\n** " + messages.getString("test") + " " + testNo + " **\n");
+ diagnosis.append("\n** " + messages.getString("test") + " " + testNo + " **\n");
try {
switch (delay.getSelectedIndex()) {
case 1:
- results.append("\n** Sleeping for 1 min... **\n");
+ results.append("\n** " + messages.getString("sleep1m") + " **\n");
Thread.sleep(1000 * 60);
break;
case 2:
- results.append("\n** Sleeping for 5 mins... **\n");
+ results.append("\n** " + messages.getString("sleep5m") + " **\n");
Thread.sleep(1000 * 60 * 5);
break;
case 3:
- results.append("\n** Sleeping for 10 mins... **\n");
+ results.append("\n** " + messages.getString("sleep10m") + " **\n");
Thread.sleep(1000 * 60 * 10);
break;
case 4:
- results.append("\n** Sleeping for 30 mins... **\n");
+ results.append("\n** " + messages.getString("sleep30m") + " **\n");
Thread.sleep(1000 * 60 * 30);
break;
case 5:
- results.append("\n** Sleeping for 2 hours... **\n");
+ results.append("\n** " + messages.getString("sleep2h") + " **\n");
Thread.sleep(1000 * 60 * 120);
break;
case 6:
- results.append("\n** Sleeping for 12 hours... **\n");
+ results.append("\n** " + messages.getString("sleep12h") + " **\n");
Thread.sleep(1000 * 60 * 720);
break;
case 7:
- results.append("\n** Sleeping for 1 day... **\n");
+ results.append("\n** " + messages.getString("sleep1d") + " **\n");
Thread.sleep(1000 * 60 * 1440);
break;
}
@@ -711,7 +739,7 @@
} catch(IOException e) {
e.printStackTrace();
failed=true;
- errmsg = "Server busy: Please wait 30 seconds for previous test to finish\n";
+ errmsg = messages.getString("serverBusy30s") + "\n";
}

if (failed) {
@@ -726,8 +754,8 @@
mailTo.setEnabled(true);
options.setEnabled(true);
numOfTests.setEnabled(true);
- showStatus("Tcpbw100 done");
- results.append("\nclick START to re-test\n");
+ showStatus(messages.getString("done2"));
+ results.append("\n" + messages.getString("clickStart2") + "\n");
startTest.setEnabled(true);
testInProgress = false;
getContentPane().remove(sPanel);
@@ -823,20 +851,20 @@
/* now look for middleboxes (firewalls, NATs, and other boxes that
* muck with TCP's end-to-end priciples
*/
- showStatus("Tcpbw100 Middlebox test...");
- results.append("Checking for Middleboxes . . . . . . . . . . . . . . . . . . ");
- statistics.append("Checking for Middleboxes . . . . . . . . . . . . . . . . . . ");
- emailText = "Checking for Middleboxes . . . . . . . . . . . . . . . . . . ";
+ showStatus(messages.getString("middleboxTest"));
+ results.append(messages.getString("checkingMiddleboxes") + " ");
+ statistics.append(messages.getString("checkingMiddleboxes") + " ");
+ emailText = messages.getString("checkingMiddleboxes") + " ";

if (ctl.recv_msg(msg) != 0) {
//errmsg = "Protocol error! Expected prepare, got: " + new String(msg.body) + "instead\n";
// XXX JZ: 03/08/2010
// Reverting to old error message.
- errmsg = "Protocol error! Expected prepare, received something else.\n";
+ errmsg = messages.getString("protocolError") + "\n";
return true;
}
if (msg.type != TEST_PREPARE) {
- errmsg = "Middlebox test: Received wrong type of the message\n";
+ errmsg = messages.getString("mboxWrongMessage") + "\n";
if (msg.type == MSG_ERROR) {
errmsg += "ERROR MSG: " + new String(msg.body) + "\n";
}
@@ -849,11 +877,11 @@
in2Socket = new Socket(host, midport);
} catch (UnknownHostException e) {
System.err.println("Don't know about host: " + host);
- errmsg = "unknown server\n" ;
+ errmsg = messages.getString("unknownServer") + "\n" ;
return true;
} catch (IOException e) {
System.err.println("Couldn't perform middlebox testing to: " + host);
- errmsg = "Server Failed while middlebox testing\n" ;
+ errmsg = messages.getString("middleboxFail") + "\n" ;
return true;
}

@@ -885,11 +913,11 @@
//errmsg = "Protocol error! Expected test data, got: " + new String(msg.body) + "instead\n";
// XXX JZ: 03/08/2010
// Reverting to old error message.
- errmsg = "Protocol error! Expected test data, received something else.\n";
+ errmsg = messages.getString("protocolError") + "\n";
return true;
}
if (msg.type != TEST_MSG) {
- errmsg = "Middlebox test results: Received wrong type of the message\n";
+ errmsg = messages.getString("mboxWrongMessage") + "\n";
if (msg.type == MSG_ERROR) {
errmsg += "ERROR MSG: " + new String(msg.body) + "\n";
}
@@ -907,7 +935,7 @@
System.err.println("Unable to obtain Servers IP addresses: using " + host);
errmsg = "getInetAddress() called failed\n" ;
tmpstr2 += host + ";";
- results.append("Unable to obtain remote IP address\n");
+ results.append(messages.getString("lookupError") + "\n");
}

System.err.println("calling in2Socket.getLocalAddress()");
@@ -927,19 +955,19 @@
//errmsg = "Protocol error! Expected finalize, got: " + new String(msg.body) + "instead\n";
// XXX JZ: 03/08/2010
// Reverting to old error message.
- errmsg = "Protocol error! Expected finalize, received something else.\n";
+ errmsg = messages.getString("protocolError") + "\n";
return true;
}
if (msg.type != TEST_FINALIZE) {
- errmsg = "Middlebox test: Received wrong type of the message\n";
+ errmsg = messages.getString("mboxWrongMessage");
if (msg.type == MSG_ERROR) {
errmsg += "ERROR MSG: " + new String(msg.body) + "\n";
}
return true;
}
- results.append("Done\n");
- statistics.append("Done\n");
- emailText += "Done\n%0A";
+ results.append(messages.getString("done") + "\n");
+ statistics.append(messages.getString("done") + "\n");
+ emailText += messages.getString("done") + "\n%0A";
}
return false;
}
@@ -948,20 +976,20 @@
{
Message msg = new Message();
if ((tests & TEST_SFW) == TEST_SFW) {
- showStatus("Simple firewall test...");
- results.append("checking for firewalls . . . . . . . . . . . . . . . . . . . ");
- statistics.append("checking for firewalls . . . . . . . . . . . . . . . . . . . ");
- emailText = "checking for firewalls . . . . . . . . . . . . . . . . . . . ";
+ showStatus(messages.getString("sfwTest"));
+ results.append(messages.getString("checkingFirewalls") + " ");
+ statistics.append(messages.getString("checkingFirewalls") + " ");
+ emailText = messages.getString("checkingFirewalls") + " ";

if (ctl.recv_msg(msg) != 0) {
//errmsg = "Protocol error! Expected prepare, got: " + new String(msg.body) + "instead\n";
// XXX JZ: 03/08/2010
// Reverting to old error message.
- errmsg = "Protocol error! Expected prepare, received something else.\n";
+ errmsg = messages.getString("protocolError") + "\n";
return true;
}
if (msg.type != TEST_PREPARE) {
- errmsg = "Simple firewall test: Received wrong type of the message\n";
+ errmsg = messages.getString("sfwWrongMessage") + "\n";
if (msg.type == MSG_ERROR) {
errmsg += "ERROR MSG: " + new String(msg.body) + "\n";
}
@@ -977,7 +1005,7 @@
testTime = Integer.parseInt(message.substring(k+1));
}
catch (Exception e) {
- errmsg = "Simple firewall test: Received improper message\n";
+ errmsg = messages.getString("sfwWrongMessage") + "\n";
return true;
}

@@ -995,7 +1023,7 @@
}
catch (Exception e) {
e.printStackTrace();
- errmsg = "Simple firewall test: Cannot create listen socket\n";
+ errmsg = messages.getString("sfwSocketFail") + "\n";
return true;
}

@@ -1006,11 +1034,11 @@
//errmsg = "Protocol error! Expected port number, got: " + new String(msg.body) + "instead\n";
// XXX JZ: 03/08/2010
// Reverting to old error message.
- errmsg = "Protocol error! Expected port number, received something else.\n";
+ errmsg = messages.getString("protocolError") + "\n";
return true;
}
if (msg.type != TEST_START) {
- errmsg = "Simple firewall test: Received wrong type of the message\n";
+ errmsg = messages.getString("sfwWrongMessage");
if (msg.type == MSG_ERROR) {
errmsg += "ERROR MSG: " + new String(msg.body) + "\n";
}
@@ -1035,11 +1063,11 @@
//errmsg = "Protocol error! Expected test data, got: " + new String(msg.body) + "instead\n";
// XXX JZ: 03/08/2010
// Reverting to old error message.
- errmsg = "Protocol error! Expected test data, received something else.\n";
+ errmsg = messages.getString("protocolError") + "\n";
return true;
}
if (msg.type != TEST_MSG) {
- errmsg = "Simple firewall test: Received wrong type of the message\n";
+ errmsg = messages.getString("sfwWrongMessage") + "\n";
if (msg.type == MSG_ERROR) {
errmsg += "ERROR MSG: " + new String(msg.body) + "\n";
}
@@ -1053,19 +1081,19 @@
//errmsg = "Protocol error! Expected finalize, got: " + new String(msg.body) + "instead\n";
// XXX JZ: 03/08/2010
// Reverting to old error message.
- errmsg = "Protocol error! Expected finalize, received something else.\n";
+ errmsg = messages.getString("protocolError") + "\n";
return true;
}
if (msg.type != TEST_FINALIZE) {
- errmsg = "Simple firewall test: Received wrong type of the message\n";
+ errmsg = messages.getString("sfwWrongMessage") + "\n";
if (msg.type == MSG_ERROR) {
errmsg += "ERROR MSG: " + new String(msg.body) + "\n";
}
return true;
}
- results.append("Done\n");
- statistics.append("Done\n");
- emailText += "Done\n%0A";
+ results.append(messages.getString("done") + "\n");
+ statistics.append(messages.getString("done") + "\n");
+ emailText += messages.getString("done") + "\n%0A";
}
return false;
}
@@ -1076,20 +1104,20 @@
byte buff2[] = new byte[64*1024];
Message msg = new Message();
if ((tests & TEST_C2S) == TEST_C2S) {
- showStatus("Tcpbw100 outbound test...");
- results.append("running 10s outbound test (client-to-server [C2S]) . . . . . ");
- statistics.append("running 10s outbound test (client-to-server [C2S]) . . . . . ");
- emailText += "running 10s outbound test (client-to-server [C2S]) . . . . . ";
+ showStatus(messages.getString("outboundTest"));
+ results.append(messages.getString("runningOutboundTest") + " ");
+ statistics.append(messages.getString("runningOutboundTest") + " ");
+ emailText += messages.getString("runningOutboundTest") + " ";

if (ctl.recv_msg(msg) != 0) {
//errmsg = "Protocol error! Expected prepare, got: " + new String(msg.body) + "instead\n";
// XXX JZ: 03/08/2010
// Reverting to old error message.
- errmsg = "Protocol error! Expected prepare, received something else.\n";
+ errmsg = messages.getString("protocolError") + "\n";
return true;
}
if (msg.type != TEST_PREPARE) {
- errmsg = "C2S throughput test: Received wrong type of the message\n";
+ errmsg = messages.getString("outboundWrongMessage") + "\n";
if (msg.type == MSG_ERROR) {
errmsg += "ERROR MSG: " + new String(msg.body) + "\n";
}
@@ -1102,11 +1130,11 @@
outSocket = new Socket(host, c2sport);
} catch (UnknownHostException e) {
System.err.println("Don't know about host: " + host);
- errmsg = "unknown server\n" ;
+ errmsg = messages.getString("unknownServer") + "\n" ;
return true;
} catch (IOException e) {
System.err.println("Couldn't get 2nd connection to: " + host);
- errmsg = "Server Busy: Please wait 15 seconds for previous test to finish\n" ;
+ errmsg = messages.getString("serverBusy15s") + "\n";
return true;
}

@@ -1123,11 +1151,11 @@
//errmsg = "Protocol error! Expected start signal, got: " + new String(msg.body) + "instead\n";
// XXX JZ: 03/08/2010
// Reverting to old error message.
- errmsg = "Protocol error! Expected start signal, received something else.\n";
+ errmsg = messages.getString("protocolError") + "\n";
return true;
}
if (msg.type != TEST_START) {
- errmsg = "C2S throughput test: Received wrong type of the message\n";
+ errmsg = messages.getString("outboundWrongMessage") + "\n";
if (msg.type == MSG_ERROR) {
errmsg += "ERROR MSG: " + new String(msg.body) + "\n";
}
@@ -1172,11 +1200,11 @@
//errmsg = "Protocol error! Expected test data, got: " + new String(msg.body) + "instead\n";
// XXX JZ: 03/08/2010
// Reverting to old error message.
- errmsg = "Protocol error! Expected test data, received something else.\n";
+ errmsg = messages.getString("protocolError") + "\n";
return true;
}
if (msg.type != TEST_MSG) {
- errmsg = "C2S throughput test: Received wrong type of the message\n";
+ errmsg = messages.getString("outboundWrongMessage");
if (msg.type == MSG_ERROR) {
errmsg += "ERROR MSG: " + new String(msg.body) + "\n";
}
@@ -1203,11 +1231,11 @@
//errmsg = "Protocol error! Expected finalize, got: " + new String(msg.body) + "instead\n";
// XXX JZ: 03/08/2010
// Reverting to old error message.
- errmsg = "Protocol error! Expected finalize, received something else.\n";
+ errmsg = messages.getString("protocolError") + "\n";
return true;
}
if (msg.type != TEST_FINALIZE) {
- errmsg = "C2S throughput test: Received wrong type of the message\n";
+ errmsg = messages.getString("outboundWrongMessage");
if (msg.type == MSG_ERROR) {
errmsg += "ERROR MSG: " + new String(msg.body) + "\n";
}
@@ -1222,20 +1250,20 @@
byte buff[] = new byte[8192];
Message msg = new Message();
if ((tests & TEST_S2C) == TEST_S2C) {
- showStatus("Tcpbw100 inbound test...");
- results.append("running 10s inbound test (server-to-client [S2C]) . . . . . . ");
- statistics.append("running 10s inbound test (server-to-client [S2C]) . . . . . . ");
- emailText += "running 10s inbound test (server-to-client [S2C]) . . . . . . ";
+ showStatus(messages.getString("inboundTest"));
+ results.append(messages.getString("runningInboundTest") + " ");
+ statistics.append(messages.getString("runningInboundTest") + " ");
+ emailText += messages.getString("runningInboundTest") + " ";

if (ctl.recv_msg(msg) != 0) {
//errmsg = "Protocol error! Expected prepare, got: " + new String(msg.body) + "instead\n";
// XXX JZ: 03/08/2010
// Reverting to old error message.
- errmsg = "Protocol error! Expected prepare, received something else.\n";
+ errmsg = messages.getString("protocolError") + "\n";
return true;
}
if (msg.type != TEST_PREPARE) {
- errmsg = "C2S throughput test: Received wrong type of the message\n";
+ errmsg = messages.getString("inboundWrongMessage") + "\n";
if (msg.type == MSG_ERROR) {
errmsg += "ERROR MSG: " + new String(msg.body) + "\n";
}
@@ -1267,11 +1295,11 @@
//errmsg = "Protocol error! Expected start signal, got: " + new String(msg.body) + "instead\n";
// XXX JZ: 03/08/2010
// Reverting to old error message.
- errmsg = "Protocol error! Expected start signal, received something else.\n";
+ errmsg = messages.getString("unknownServer") + "\n";
return true;
}
if (msg.type != TEST_START) {
- errmsg = "S2C throughput test: Received wrong type of the message\n";
+ errmsg = messages.getString("serverFail") + "\n";
if (msg.type == MSG_ERROR) {
errmsg += "ERROR MSG: " + new String(msg.body) + "\n";
}
@@ -1299,11 +1327,11 @@
//errmsg = "Protocol error! Expected test data, got: " + new String(msg.body) + "instead\n";
// XXX JZ: 03/08/2010
// Reverting to old error message.
- errmsg = "Protocol error! Expected test data, received something else.\n";
+ errmsg = messages.getString("protocolError") + "\n";
return true;
}
if (msg.type != TEST_MSG) {
- errmsg = "S2C throughput test: Received wrong type of the message\n";
+ errmsg = messages.getString("inboundWrongMessage") + "\n";
if (msg.type == MSG_ERROR) {
errmsg += "ERROR MSG: " + new String(msg.body) + "\n";
}
@@ -1319,7 +1347,7 @@
}
catch (Exception e) {
e.printStackTrace();
- errmsg = "S2C throughput test: Received improper message\n";
+ errmsg = messages.getString("inboundWrongMessage") + "\n";
return true;
}

@@ -1357,17 +1385,17 @@
//errmsg = "Protocol error! Expected finalize, got: " + new String(msg.body) + "instead\n";
// XXX JZ: 03/08/2010
// Reverting to old error message.
- errmsg = "Protocol error! Expected finalize, received something else.\n";
+ errmsg = messages.getString("protocolError") + "\n";
return true;
}
if (msg.type == TEST_FINALIZE) {
break;
}
if (msg.type != TEST_MSG) {
- errmsg = "S2C throughput test: Received wrong type of the message\n";
- if (msg.type == MSG_ERROR) {
- errmsg += "ERROR MSG: " + new String(msg.body) + "\n";
- }
+ errmsg = messages.getString("inboundWrongMessage") + "\n";
+ if (msg.type == MSG_ERROR) {
+ errmsg += "ERROR MSG: " + new String(msg.body) + "\n";
+ }
return true;
}
tmpstr += new String(msg.body);
@@ -1414,7 +1442,7 @@
try {

// RAC Debug message
- results.append("Connecting to '" + host + "' [" + InetAddress.getByName(host) + "] to run test\n");
+ results.append(messages.getString("connectingTo") + " '" + host + "' [" + InetAddress.getByName(host) + "] " + messages.getString("toRunTest") + "\n");

if (preferIPv6.isSelected()) {
try {
@@ -1428,12 +1456,12 @@
ctlSocket = new Socket(host, ctlport);
} catch (UnknownHostException e) {
System.err.println("Don't know about host: " + host);
- errmsg = "unknown server\n" ;
+ errmsg = messages.getString("unknownServer") + "\n" ;
failed = true;
return;
} catch (IOException e) {
System.err.println("Couldn't get the connection to: " + host + " " +ctlport);
- errmsg = "Server process not running: start web100srv process on remote server (" + host + ":" + ctlport + ")\n" ;
+ errmsg = messages.getString("serverNotRunning") + " (" + host + ":" + ctlport + ")\n" ;
failed = true;
return;
}
@@ -1443,17 +1471,17 @@
/* The beginning of the protocol */

if (ctlSocket.getInetAddress() instanceof Inet6Address) {
- results.append("Connected to: " + host + " -- Using IPv6 address\n");
+ results.append(messages.getString("connected") + " " + host + messages.getString("usingIpv6") + "\n");
}
else {
- results.append("Connected to: " + host + " -- Using IPv4 address\n");
+ results.append(messages.getString("connected") + " " + host + messages.getString("usingIpv4") + "\n");
}

/* write our test suite request */
ctl.send_msg(MSG_LOGIN, tests);
/* read the specially crafted data that kicks off the old clients */
if (ctl.readn(msg, 13) != 13) {
- errmsg = "Information: The server does not support this command line client\n";
+ errmsg = messages.getString("unsupportedClient") + "\n";
failed = true;
return;
}
@@ -1463,12 +1491,12 @@
//errmsg = "Protocol error! Expected wait time, got: " + new String(msg.body) + "instead\n";
// XXX JZ: 03/08/2010
// Reverting to old error message.
- errmsg = "Protocol error! Expected wait time, received something else.\n";
+ errmsg = messages.getString("protocolError") + "\n";
failed = true;
return;
}
if (msg.type != SRV_QUEUE) {
- errmsg = "Logging to server: Received wrong type of the message\n";
+ errmsg = messages.getString("loggingWrongMessage") + "\n";
failed = true;
return;
}
@@ -1481,13 +1509,13 @@
}

if (wait == 9988) {
- errmsg = "Server Busy: Too many clients waiting in server queue. Please try again later.\n";
+ errmsg = messages.getString("serverBusy") + "\n";
failed = true;
return;
}

if (wait == 9999) {
- errmsg = "Server Busy: Please wait 60 seconds for the current test to finish.\n";
+ errmsg = messages.getString("serverBusy60s") + "\n";
failed = true;
return;
}
@@ -1500,8 +1528,7 @@
// Each test should take less than 30 seconds, so tell them 45 sec * number of
// tests in the queue.
wait = (wait * 45);
- results.append("Another client is currently being served, your test will " +
- "begin within " + wait + " seconds\n");
+ results.append(messages.getString("otherClient") + wait + messages.getString("seconds") +".\n");
}

f.toBack();
@@ -1511,19 +1538,19 @@
//errmsg = "Protocol error! Expected hello signal, got: " + new String(msg.body) + "instead\n";
// XXX JZ: 03/08/2010
// Reverting to old error message.
- errmsg = "Protocol error! Expected hello signal, received something else.\n";
+ errmsg = messages.getString("protocolError") + "\n";
failed = true;
return;
}
if (msg.type != MSG_LOGIN) {
- errmsg = "Negotiating NDT version: Received wrong type of the message\n";
+ errmsg = messages.getString("versionWrongMessage") + "\n";
failed = true;
return;
}

String vVersion = new String(msg.body);
if (!vVersion.startsWith("v")) {
- errmsg = "Incompatible version number";
+ errmsg = messages.getString("incompatibleVersion");
failed = true;
return;
}
@@ -1533,12 +1560,12 @@
//errmsg = "Protocol error! Expected server version info, got: " + new String(msg.body) + "instead\n";
// XXX JZ: 03/08/2010
// Reverting to old error message.
- errmsg = "Protocol error! Expected server version info, received something else.\n";
+ errmsg = messages.getString("protocolError") + "\n";
failed = true;
return;
}
if (msg.type != MSG_LOGIN) {
- errmsg = "Negotiating test suite: Received wrong type of the message\n";
+ errmsg = messages.getString("testsuiteWrongMessage") + "\n";
failed = true;
return;
}
@@ -1549,46 +1576,46 @@
ctl.send_msg(MSG_ERROR, "Manually stopped by the user".getBytes());
ctl.close();
ctlSocket.close();
- errmsg = "\nThe tests were stopped!\n";
+ errmsg = "\n" + messages.getString("stopped") + "\n";
failed = true;
return;
}
int testId = Integer.parseInt(tokenizer.nextToken());
switch (testId) {
case TEST_MID:
- sPanel.setText("Middlebox");
+ sPanel.setText(messages.getString("middlebox"));
if (test_mid(ctl)) {
results.append(errmsg);
- results.append("Middlebox test FAILED!\n");
+ results.append(messages.getString("middleboxFail2") + "\n");
tests &= (~TEST_MID);
}
break;
case TEST_SFW:
- sPanel.setText("Simple firewall");
+ sPanel.setText(messages.getString("simpleFirewall"));
if (test_sfw(ctl)) {
results.append(errmsg);
- results.append("Simple firewall test FAILED!\n");
+ results.append(messages.getString("sfwFail") + "\n");
tests &= (~TEST_SFW);
}
break;
case TEST_C2S:
- sPanel.setText("C2S throughput");
+ sPanel.setText(messages.getString("c2sThroughput"));
if (test_c2s(ctl)) {
results.append(errmsg);
- results.append("C2S throughput test FAILED!\n");
+ results.append(messages.getString("c2sThroughputFailed") + "\n");
tests &= (~TEST_C2S);
}
break;
case TEST_S2C:
- sPanel.setText("S2C throughput");
+ sPanel.setText(messages.getString("s2cThroughput"));
if (test_s2c(ctl, ctlSocket)) {
results.append(errmsg);
- results.append("S2C throughput test FAILED!\n");
+ results.append(messages.getString("s2cThroughputFailed") + "\n");
tests &= (~TEST_S2C);
}
break;
default:
- errmsg = "Unknown test ID\n";
+ errmsg = messages.getString("unknownID") + "\n";
failed = true;
return;
}
@@ -1597,12 +1624,12 @@
ctl.send_msg(MSG_ERROR, "Manually stopped by the user".getBytes());
ctl.close();
ctlSocket.close();
- errmsg = "The tests were stopped!\n";
+ errmsg = messages.getString("stopped") + "\n";
failed = true;
return;
}

- sPanel.setText("Receiving results...");
+ sPanel.setText(messages.getString("receiving"));
i = 0;

try {
@@ -1611,7 +1638,7 @@
//errmsg = "Protocol error! Expected test results, got: " + new String(msg.body) + "instead\n";
// XXX JZ: 03/08/2010
// Reverting to old error message.
- errmsg = "Protocol error! Expected test results, received something else.\n";
+ errmsg = messages.getString("protocolError") + "\n";
failed = true;
return;
}
@@ -1619,7 +1646,7 @@
break;
}
if (msg.type != MSG_RESULTS) {
- errmsg = "Tests results: Received wrong type of the message\n";
+ errmsg = messages.getString("resultsWrongMessage") + "\n";
failed = true;
return;
}
@@ -1629,21 +1656,21 @@
} catch (IOException e) {}

if (i == 0) {
- results.append("Warning! Client time-out while reading data, possible duplex mismatch exists\n");
+ results.append(messages.getString("resultsTimeout") + "\n");
}
System.err.println("Calling InetAddress.getLocalHost() twice");
try {
- diagnosis.append("Client: " + InetAddress.getLocalHost() + "\n");
+ diagnosis.append(messages.getString("client") + ": " + InetAddress.getLocalHost() + "\n");
} catch (SecurityException e) {
- diagnosis.append("Client: 127.0.0.1\n");
- results.append("Unable to obtain local IP address\n");
+ diagnosis.append(messages.getString("client") + ": 127.0.0.1\n");
+ results.append(messages.getString("unableToObtainIP") + "\n");
System.err.println("Unable to obtain local IP address: using 127.0.0.1");
}

try {
- emailText += "Client: " + InetAddress.getLocalHost() + "\n%0A";
+ emailText += messages.getString("client") + ": " + InetAddress.getLocalHost() + "\n%0A";
} catch (SecurityException e) {
- emailText += "Client: 127.0.0.1\n%0A";
+ emailText += messages.getString("client") + ": " + "127.0.0.1" + "\n%0A";
}

ctl.close();
@@ -1653,7 +1680,8 @@
testResults(tmpstr);
}
catch (Exception ex) {
- results.append("Error in parsing tests results!\n");
+ results.append(messages.getString("resultsParseError") + "\n");
+ results.append(ex + "\n");
}
if ((tests & TEST_MID) == TEST_MID) {
middleboxResults(tmpstr2);
@@ -1748,25 +1776,8 @@

public void showBufferedBytesInfo()
{
- JOptionPane.showMessageDialog(null,
- "TCP (Transmission Control Protocol) reliably transfers data between two\n" +
- "Internet hosts. It automatically detects and recovers from errors and\n" +
- "losses. TCP uses buffers to provide this reliability. In addition,\n" +
- "switches and routers use buffers to handle cases where multiple input\n" +
- "links send packets to a single output link or link speeds change\n" +
- "(FastEthernet to DSL modem).\n\n" +
- "The NDT server generates and sends 10 seconds of data to the client. In\n" +
- "some cases the server can generate data faster than it can send packets\n" +
- "into the network (e.g., a 2 GHz CPU sending to a DSL connected client).\n" +
- "When this happens, some packets may remain in the server output queue\n" +
- "when the 10 second timer expires. TCP will automatically continue to\n" +
- "send these queued packets and the client will continue to accept and\n" +
- "process these incoming packets. This will result in the client test\n" +
- "running longer than expected.\n\n" +
- "This condition has occurred during this test. No action is required to\n" +
- "resolve this issue.",
- "Packet queuing",
- JOptionPane.INFORMATION_MESSAGE);
+ JOptionPane.showMessageDialog(null, messages.getString("packetQueuingInfo"), messages.getString("packetQueuing"),
+ JOptionPane.INFORMATION_MESSAGE);
}

public void testResults(String tmpstr) {
@@ -1815,10 +1826,10 @@
javaVendor = System.getProperty("java.vendor");

if (osArch.startsWith("x86") == true) {
- client = "PC";
+ client = messages.getString("pc");
}
else {
- client = "Workstation";
+ client = messages.getString("workstation");
}

// Calculate some variables and determine path conditions
@@ -1829,40 +1840,40 @@
// Now write some messages to the screen
if (c2sData < 3) {
if (c2sData < 0) {
- results.append("Server unable to determine
bottleneck link type.\n");
+
results.append(messages.getString("unableToDetectBottleneck") + "\n");
emailText += "Server unable to determine
bottleneck link type.\n%0A";
pub_AccessTech = "Connection type
unknown";

}
else {
- results.append("Your " + client + " is
connected to a ");
- emailText += "Your " + client + " is
connected to a ";
+ results.append(messages.getString("your") + " " + client + " " + messages.getString("connectedTo") + " ");
+ emailText += messages.getString("your") + " " + client + " " + messages.getString("connectedTo") + " ";
if (c2sData == 1) {
- results.append("Dial-up
Modem\n");
- emailText += "Dial-up
Modem\n%0A";
+
results.append(messages.getString("dialup") + "\n");
+ emailText +=
messages.getString("dialup") + "\n%0A";
mylink = .064;
pub_AccessTech = "Dial-up
Modem";
}
else {
- results.append("Cable/DSL
modem\n");
- emailText += "Cable/DSL
modem\n%0A";
+
results.append(messages.getString("cabledsl") + "\n");
+ emailText +=
messages.getString("cabledsl") + "\n%0A";
mylink = 3;
pub_AccessTech = "Cable/DSL
modem";
}
}
}
else {
- results.append("The slowest link in the end-to-end
path is a ");
- emailText += "The slowest link in the end-to-end
path is a ";
+ results.append(messages.getString("theSlowestLink") +
" ");
+ emailText += messages.getString("theSlowestLink") +
" ";
if (c2sData == 3) {
- results.append("10 Mbps Ethernet
subnet\n");
- emailText += "10 Mbps Ethernet
subnet\n%0A";
+ results.append(messages.getString("10mbps") +
"\n");
+ emailText += messages.getString("10mbps") +
"\n%0A";
mylink = 10;
pub_AccessTech = "10 Mbps Ethernet";
}
else if (c2sData == 4) {
- results.append("45 Mbps T3/DS3
subnet\n");
- emailText += "45 Mbps T3/DS3
subnet\n%0A";
+ results.append(messages.getString("45mbps") +
"\n");
+ emailText += messages.getString("45mbps") +
"\n%0A";
mylink = 45;
pub_AccessTech = "45 Mbps T3/DS3
subnet";
}
@@ -1873,82 +1884,80 @@
pub_AccessTech = "100 Mbps Ethernet";

if (half_duplex == 0) {
- results.append("Full duplex Fast
Ethernet subnet\n");
- emailText += "Full duplex Fast
Ethernet subnet\n%0A";
+ results.append(messages.getString("fullDuplex") + "\n");
+ emailText += messages.getString("fullDuplex") + "\n%0A";
}
else {
- results.append("Half duplex Fast
Ethernet subnet\n");
- emailText += "Half duplex Fast
Ethernet subnet\n%0A";
+ results.append(messages.getString("halfDuplex") + "\n");
+ emailText += messages.getString("halfDuplex") + "\n%0A";
}
}
else if (c2sData == 6) {
- results.append("a 622 Mbps OC-12
subnet\n");
- emailText += "a 622 Mbps OC-12
subnet\n%0A";
+ results.append(messages.getString("622mbps") +
"\n");
+ emailText += messages.getString("622mbps") +
"\n%0A";
mylink = 622;
pub_AccessTech = "622 Mbps OC-12";
}
else if (c2sData == 7) {
- results.append("1.0 Gbps Gigabit Ethernet
subnet\n");
- emailText += "1.0 Gbps Gigabit Ethernet
subnet\n%0A";
+ results.append(messages.getString("1gbps") +
"\n");
+ emailText += messages.getString("1gbps") +
"\n%0A";
mylink = 1000;
pub_AccessTech = "1.0 Gbps Gigabit
Ethernet";
}
else if (c2sData == 8) {
- results.append("2.4 Gbps OC-48
subnet\n");
- emailText += "2.4 Gbps OC-48
subnet\n%0A";
+ results.append(messages.getString("2.4gbps") +
"\n");
+ emailText += messages.getString("2.4gbps") +
"\n%0A";
mylink = 2400;
pub_AccessTech = "2.4 Gbps OC-48";
}
else if (c2sData == 9) {
- results.append("10 Gbps 10 Gigabit
Ethernet/OC-192 subnet\n");
- emailText += "10 Gbps 10 Gigabit
Ethernet/OC-192 subnet\n%0A";
+ results.append(messages.getString("10gbps") +
"\n");
+ emailText += messages.getString("10gbps") +
"\n%0A";
mylink = 10000;
pub_AccessTech = "10 Gigabit
Ethernet/OC-192";

}
}

- if (mismatch == 1) {
- results.append("Warning: Old Duplex mismatch
condition detected: ");
- emailText += "Warning: Old Duplex mismatch
condition detected: ";
- }
- else if (mismatch == 2) {
- results.append("Alarm: Duplex Mismatch condition detected Switch=Full and Host=half\n ");
- emailText += "Alarm: Duplex Mismatch condition detected Switch=Full and Host=half\n%0A ";
***The diff for this file has been truncated for email.***
=======================================
--- /branches/jz-localization/configure.ac Sun Feb 28 11:29:32 2010
+++ /branches/jz-localization/configure.ac Wed Mar 17 06:44:30 2010
@@ -29,7 +29,7 @@
# Process this file with autoconf to produce a configure script.
#
# AC_PREREQ(2.57)
-AC_INIT([NDT],[3.6.1],[])
+AC_INIT([NDT],[3.6.2a],[])
AC_CONFIG_AUX_DIR(config)
# AM_INIT_AUTOMAKE(NDT, v1.0, [no-define])
AM_INIT_AUTOMAKE

  • [ndt] r314 committed - Patch from uninett applied - generting dummy release to test. ..., ndt, 03/17/2010

Archive powered by MHonArc 2.6.16.

Top of Page