mirror of
https://gitlab.isc.org/isc-projects/dhcp
synced 2025-09-04 00:05:30 +00:00
Support ISC_R_INCOMPLETE for partial connects.
This commit is contained in:
@@ -100,7 +100,9 @@ dhcpctl_status dhcpctl_connect (dhcpctl_handle *connection,
|
|||||||
|
|
||||||
status = omapi_protocol_connect (*connection, server_name,
|
status = omapi_protocol_connect (*connection, server_name,
|
||||||
(unsigned)port, authinfo);
|
(unsigned)port, authinfo);
|
||||||
if (status != ISC_R_SUCCESS) {
|
if (status == ISC_R_SUCCESS)
|
||||||
|
return status;
|
||||||
|
if (status != ISC_R_INCOMPLETE) {
|
||||||
omapi_object_dereference (connection, MDL);
|
omapi_object_dereference (connection, MDL);
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
@@ -74,8 +74,9 @@ ISC_LANG_BEGINDECLS
|
|||||||
#define ISC_R_NOKEYS 46
|
#define ISC_R_NOKEYS 46
|
||||||
#define ISC_R_KEY_UNKNOWN 47
|
#define ISC_R_KEY_UNKNOWN 47
|
||||||
#define ISC_R_INVALIDKEY 48
|
#define ISC_R_INVALIDKEY 48
|
||||||
|
#define ISC_R_INCOMPLETE 49
|
||||||
|
|
||||||
#define ISC_R_NRESULTS 49 /* Number of results */
|
#define ISC_R_NRESULTS 50 /* Number of results */
|
||||||
|
|
||||||
const char * isc_result_totext(isc_result_t);
|
const char * isc_result_totext(isc_result_t);
|
||||||
isc_result_t isc_result_register(unsigned int base,
|
isc_result_t isc_result_register(unsigned int base,
|
||||||
|
@@ -361,7 +361,7 @@ isc_result_t omapi_connection_connect (omapi_object_t *h)
|
|||||||
return ISC_R_UNEXPECTED;
|
return ISC_R_UNEXPECTED;
|
||||||
}
|
}
|
||||||
c -> state = omapi_connection_connecting;
|
c -> state = omapi_connection_connecting;
|
||||||
return ISC_R_SUCCESS;
|
return ISC_R_INCOMPLETE;
|
||||||
}
|
}
|
||||||
c -> state = omapi_connection_connected;
|
c -> state = omapi_connection_connected;
|
||||||
}
|
}
|
||||||
|
@@ -94,6 +94,7 @@ static const char *text[ISC_R_NRESULTS] = {
|
|||||||
"no key specified", /* 46 */
|
"no key specified", /* 46 */
|
||||||
"zone TSIG key not known", /* 47 */
|
"zone TSIG key not known", /* 47 */
|
||||||
"invalid TSIG key", /* 48 */
|
"invalid TSIG key", /* 48 */
|
||||||
|
"operation in progress", /* 49 */
|
||||||
};
|
};
|
||||||
|
|
||||||
const char *isc_result_totext (isc_result_t result)
|
const char *isc_result_totext (isc_result_t result)
|
||||||
|
Reference in New Issue
Block a user