Browse Source

Correct JackNetUnixSocket::GetError.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3270 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.1
sletz 17 years ago
parent
commit
84892ca209
2 changed files with 9 additions and 10 deletions
  1. +4
    -4
      common/JackNetInterface.cpp
  2. +5
    -6
      posix/JackNetUnixSocket.cpp

+ 4
- 4
common/JackNetInterface.cpp View File

@@ -331,7 +331,7 @@ namespace Jack
Exit();
}
else
jack_error ( "Error in send : %s", StrError ( NET_ERROR_CODE ) );
jack_error ( "Error in master send : %s", StrError ( NET_ERROR_CODE ) );
}
return tx_bytes;
}
@@ -353,7 +353,7 @@ namespace Jack
Exit();
}
else
jack_error ( "Error in receive : %s", StrError ( NET_ERROR_CODE ) );
jack_error ( "Error in master receive : %s", StrError ( NET_ERROR_CODE ) );
}
return rx_bytes;
}
@@ -691,7 +691,7 @@ namespace Jack
throw JackNetException();
}
else
jack_error ( "Fatal error in receive : %s", StrError ( NET_ERROR_CODE ) );
jack_error ( "Fatal error in slave receive : %s", StrError ( NET_ERROR_CODE ) );
}
return rx_bytes;
}
@@ -710,7 +710,7 @@ namespace Jack
throw JackNetException();
}
else
jack_error ( "Fatal error in send : %s", StrError ( NET_ERROR_CODE ) );
jack_error ( "Fatal error in slave send : %s", StrError ( NET_ERROR_CODE ) );
}
return tx_bytes;
}


+ 5
- 6
posix/JackNetUnixSocket.cpp View File

@@ -287,18 +287,17 @@ namespace Jack
{
case EAGAIN:
return NET_NO_DATA;
case ECONNABORTED:
return NET_CONN_ERROR;
case EINVAL:
return NET_CONN_ERROR;
case ECONNREFUSED:
return NET_CONN_ERROR;
case ECONNRESET:
return NET_CONN_ERROR;
case EINVAL:
case EHOSTDOWN:
return NET_CONN_ERROR;
case EHOSTUNREACH:
case ENETDOWN:
case ENETUNREACH:
return NET_CONN_ERROR;
default:
return NET_OP_ERROR;
}


Loading…
Cancel
Save