Browse Source

NetJack2 : connection error handling.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4462 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.8
sletz 14 years ago
parent
commit
c2f0498738
2 changed files with 13 additions and 0 deletions
  1. +4
    -0
      ChangeLog
  2. +9
    -0
      common/JackNetInterface.cpp

+ 4
- 0
ChangeLog View File

@@ -35,6 +35,10 @@ Chris Caudle
Jackdmp changes log
---------------------------

2011-06-17 Stephane Letz <letz@grame.fr>

* NetJack2 : connection error handling.

2011-06-16 Stephane Letz <letz@grame.fr>

* Changes in NetJack2 connection management: no more timeout, any transmission error considered as fatal.


+ 9
- 0
common/JackNetInterface.cpp View File

@@ -390,12 +390,15 @@ namespace Jack
PacketHeaderHToN(header, header);

if (((tx_bytes = fSocket.Send(fTxBuffer, size, flags)) == SOCKET_ERROR) && fRunning) {
/*
net_error_t error = fSocket.GetError();
if (error == NET_CONN_ERROR) {
FatalError();
} else {
jack_error("Error in master send : %s", StrError(NET_ERROR_CODE));
}
*/
FatalError();
}
return tx_bytes;
}
@@ -861,6 +864,7 @@ namespace Jack
int rx_bytes = fSocket.Recv(fRxBuffer, size, flags);
//handle errors
if (rx_bytes == SOCKET_ERROR) {
/*
net_error_t error = fSocket.GetError();
//no data isn't really an error in realtime processing, so just return 0
if (error == NET_NO_DATA) {
@@ -871,6 +875,8 @@ namespace Jack
} else {
jack_error("Fatal error in slave receive : %s", StrError(NET_ERROR_CODE));
}
*/
FatalError();
}

packet_header_t* header = reinterpret_cast<packet_header_t*>(fRxBuffer);
@@ -892,6 +898,7 @@ namespace Jack

//handle errors
if (tx_bytes == SOCKET_ERROR) {
/*
net_error_t error = fSocket.GetError();
//if a network error occurs, this exception will restart the driver
if (error == NET_CONN_ERROR) {
@@ -899,6 +906,8 @@ namespace Jack
} else {
jack_error("Fatal error in slave send : %s", StrError(NET_ERROR_CODE));
}
*/
FatalError();
}
return tx_bytes;
}


Loading…
Cancel
Save