External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

phyp: Use actual error code instead of 0

Browse Source
This commit is contained in:
Matthias Bolte 2009-11-06 03:19:22 +01:00
parent 6f5e63324f
commit ec3fa12e94
1 changed files with 28 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/phyp/phyp_driver.c
View File

@ -61,6 +61,10 @@
#define VIR_FROM_THIS VIR_FROM_PHYP #define VIR_FROM_THIS VIR_FROM_PHYP
#define PHYP_ERROR(conn, code, fmt...) \
virReportErrorHelper(conn, VIR_FROM_PHYP, code, __FILE__, __FUNCTION__, \
__LINE__, fmt)
/* /*
* URI: phyp://user@[hmc|ivm]/managed_system * URI: phyp://user@[hmc|ivm]/managed_system
* */ * */
@ -86,23 +90,14 @@ phypOpen(virConnectPtr conn,
return VIR_DRV_OPEN_DECLINED; return VIR_DRV_OPEN_DECLINED;
if (conn->uri->server == NULL) { if (conn->uri->server == NULL) {
virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP, PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, "%s", _("Missing server name in phyp:// URI"));
_("Missing server name in phyp:// URI"));
return VIR_DRV_OPEN_ERROR; return VIR_DRV_OPEN_ERROR;
} }
if (conn->uri->path == NULL) { if (conn->uri->path == NULL) {
virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP, PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, "%s", _("Missing managed system name in phyp:// URI"));
_("Missing managed system name in phyp:// URI"));
return VIR_DRV_OPEN_ERROR;
}
if (conn->uri->path == NULL) {
virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP,
VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, "%s",
_("Missing path name in phyp:// URI"));
return VIR_DRV_OPEN_ERROR; return VIR_DRV_OPEN_ERROR;
} }
@ -148,16 +143,14 @@ phypOpen(virConnectPtr conn,
*char_ptr = '\0'; *char_ptr = '\0';
if (escape_specialcharacters(conn->uri->path, string, len) == -1) { if (escape_specialcharacters(conn->uri->path, string, len) == -1) {
virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP, PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, "%s", _("Error parsing 'path'. Invalid characters."));
_("Error parsing 'path'. Invalid characters."));
goto failure; goto failure;
} }
if ((session = openSSHSession(conn, auth, &internal_socket)) == NULL) { if ((session = openSSHSession(conn, auth, &internal_socket)) == NULL) {
virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP, PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, "%s", _("Error while opening SSH session."));
_("Error while opening SSH session."));
goto failure; goto failure;
} }
//conn->uri->path = string; //conn->uri->path = string;
@ -244,9 +237,8 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth,
ret = getaddrinfo(hostname, "22", &hints, &ai); ret = getaddrinfo(hostname, "22", &hints, &ai);
if (ret != 0) { if (ret != 0) {
virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP, PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, _("Error while getting %s address info"), hostname);
_("Error while getting %s address info"), hostname);
goto err; goto err;
} }
@ -262,9 +254,8 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth,
cur = cur->ai_next; cur = cur->ai_next;
} }
virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP, PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, _("Failed to connect to %s"), hostname);
_("Failed to connect to %s"), hostname);
freeaddrinfo(ai); freeaddrinfo(ai);
goto err; goto err;
@ -283,9 +274,8 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth,
while ((rc = libssh2_session_startup(session, sock)) == while ((rc = libssh2_session_startup(session, sock)) ==
LIBSSH2_ERROR_EAGAIN) ; LIBSSH2_ERROR_EAGAIN) ;
if (rc) { if (rc) {
virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP, PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, "%s", _("Failure establishing SSH session."));
_("Failure establishing SSH session."));
goto disconnect; goto disconnect;
} }
@ -307,9 +297,8 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth,
}; };
if (!auth || !auth->cb) { if (!auth || !auth->cb) {
virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP, PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED,
VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, "%s", _("No authentication callback provided."));
_("No authentication callback provided."));
goto disconnect; goto disconnect;
} }
@ -319,9 +308,8 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth,
} }
if (!hasPassphrase) { if (!hasPassphrase) {
virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP, PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED,
VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, "%s", _("Required credentials are not supported."));
_("Required credentials are not supported."));
goto disconnect; goto disconnect;
} }
@ -329,18 +317,16 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth,
(auth->cb) (creds, ARRAY_CARDINALITY(creds), auth->cbdata); (auth->cb) (creds, ARRAY_CARDINALITY(creds), auth->cbdata);
if (res < 0) { if (res < 0) {
virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP, PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED,
VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, "%s", _("Unable to fetch credentials."));
_("Unable to fetch credentials."));
goto disconnect; goto disconnect;
} }
if (creds[0].result) { if (creds[0].result) {
password = creds[0].result; password = creds[0].result;
} else { } else {
virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP, PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED,
VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, "%s", _("Unable to get password certificates"));
_("Unable to get password certificates"));
goto disconnect; goto disconnect;
} }
@ -350,9 +336,8 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth,
LIBSSH2_ERROR_EAGAIN) ; LIBSSH2_ERROR_EAGAIN) ;
if (rc) { if (rc) {
virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP, PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED,
VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, "%s", _("Authentication failed"));
_("Authentication failed"));
goto disconnect; goto disconnect;
} else } else
goto exit; goto exit;