[Pkg] The Trunk: Network-ct.255.mcz

commits at source.squeak.org commits at source.squeak.org
Mon Jan 3 21:19:23 UTC 2022


Christoph Thiede uploaded a new version of Network to project The Trunk:
http://source.squeak.org/trunk/Network-ct.255.mcz

==================== Summary ====================

Name: Network-ct.255
Author: ct
Time: 3 January 2022, 10:19:21.768397 pm
UUID: 50fb6477-19e1-1444-a9ca-697aff405f6e
Ancestors: Network-mt.254

Improves multilingual support.

=============== Diff against Network-mt.254 ===============

Item was changed:
  ----- Method: Socket>>connectTo:port:waitForConnectionFor: (in category 'connection open/close') -----
  connectTo: hostAddress port: port waitForConnectionFor: timeout 
  	"Initiate a connection to the given port at the given host 
  	address. Waits until the connection is established or time outs."
  	self connectNonBlockingTo: hostAddress port: port.
  	self
  		waitForConnectionFor: timeout
+ 		ifTimedOut: [ConnectionTimedOut signal: ('Cannot connect to {1}' translated format: {hostAddress})]
+ 		ifRefused: [ConnectionRefused signal: ('Cannot connect to {1}' translated format: {hostAddress})]!
- 		ifTimedOut: [ConnectionTimedOut signal: 'Cannot connect to ', hostAddress printString]
- 		ifRefused: [ConnectionRefused signal: 'Cannot connect to ', hostAddress printString]!

Item was changed:
  ----- Method: Socket>>connectTo:waitForConnectionFor: (in category 'ipv6') -----
  connectTo: aSocketAddress waitForConnectionFor: timeout 
  
  	self connectNonBlockingTo: aSocketAddress.
  	self
  		waitForConnectionFor: timeout
+ 		ifTimedOut: [ConnectionTimedOut signal: ('Cannot connect to {1}' translated format: {aSocketAddress})]
+ 		ifRefused: [ConnectionRefused signal: ('Cannot connect to {1}' translated format: {aSocketAddress})]!
- 		ifTimedOut: [ConnectionTimedOut signal: 'Cannot connect to ', aSocketAddress printString]
- 		ifRefused: [ConnectionRefused signal: 'Cannot connect to ', aSocketAddress printString]!

Item was changed:
  ----- Method: Socket>>waitForDataFor: (in category 'waiting') -----
  waitForDataFor: timeout
  	"Wait for the given nr of seconds for data to arrive.
  	Signal a time out or connection close exception if either happens before data becomes available."
  
  	^self
  		waitForDataFor: timeout
+ 		ifClosed: [ConnectionClosed signal: 'Connection closed while waiting for data.' translated]
+ 		ifTimedOut: [ConnectionTimedOut signal: 'Data receive timed out.' translated]
- 		ifClosed: [ConnectionClosed signal: 'Connection closed while waiting for data.']
- 		ifTimedOut: [ConnectionTimedOut signal: 'Data receive timed out.']
  !

Item was changed:
  ----- Method: SocketAddressInformation>>connect (in category 'circuit setup') -----
  connect
  
  	| sock |
  	socketType == SocketTypeStream ifFalse: [^nil].
  	sock := Socket newTCP: addressFamily.
  	sock connectTo: socketAddress.
  	sock waitForConnectionFor: Socket standardTimeout
+ 		ifTimedOut: [ConnectionTimedOut signal: ('Cannot connect to {1}' translated format: {self})]
+ 		ifRefused: [ConnectionRefused signal: ('Cannot connect to {1}' translated format: {self})].
- 		ifTimedOut: [ConnectionTimedOut signal: 'Cannot connect to ', self printString]
- 		ifRefused: [ConnectionRefused signal: 'Cannot connect to ', self printString].
  	^sock!

Item was changed:
  ----- Method: SocketStream class>>openConnectionToHostNamed:port: (in category 'instance creation') -----
  openConnectionToHostNamed: hostName port: portNumber
  	
  	| addressInformations stream |
  	NetNameResolver useOldNetwork
  		ifTrue: [	| hostIP |
  			hostIP := NetNameResolver addressForName: hostName timeout: 20.
+ 			hostIP ifNil: [NetworkError signal: ('Cannot resolve {1}.' translated format: {hostName})].
- 			hostIP ifNil: [NetworkError signal: ('Cannot resolve {1}.' format: {hostName})].
  			^self openConnectionToHost: hostIP port: portNumber].
  	addressInformations := SocketAddressInformation
  			forHost: hostName
  			service: portNumber asString
  			flags: 0
  			addressFamily: 0
  			socketType: SocketAddressInformation socketTypeStream
  			protocol: SocketAddressInformation protocolTCP.
  	addressInformations ifEmpty: [
  		NoNetworkError signal: ('Could not find a network for {1} on port {2}' translated format: {hostName. portNumber})].
  	stream := addressInformations readStream.
  	^ [self on: stream next connect] on: NetworkError
  			do: [:exc | stream atEnd
  					ifTrue:
  						["No more address to retry, pass the exception to upper level"
  						exc pass]
  					ifFalse:
  						["retry with next address"
  						exc retry]].!

Item was changed:
  ----- Method: SocketStream>>signalClosed (in category 'private-socket') -----
  signalClosed
  	self shouldSignal ifFalse: [^ self]. 
+ 	ConnectionClosed signal: 'Connection closed while waiting for data.' translated.!
- 	ConnectionClosed signal: 'Connection closed while waiting for data.'!

Item was changed:
  ----- Method: SocketStream>>signalTimeout (in category 'private-socket') -----
  signalTimeout
  	self shouldSignal ifFalse: [^ self]. 
+ 	ConnectionTimedOut signal: 'Data receive timed out.' translated.!
- 	ConnectionTimedOut signal: 'Data receive timed out.'!



More information about the Packages mailing list