isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Split most of server_commit_cb() out into schedule_commit_point().

Browse Source 
This allows it to be used by the relay code too.
This commit is contained in:
Todd C. Miller
2021-04-06 14:44:19 -06:00
parent 533fcc3f02
commit 343100307d
1 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
logsrvd/logsrvd.c
View File

@@ -1072,24 +1072,19 @@ close_connection:
/* /*
* Format and schedule a commit_point message. * Format and schedule a commit_point message.
*/ */
static void static bool
server_commit_cb(int unused, int what, void *v) schedule_commit_point(TimeSpec *commit_point,
struct connection_closure *closure)
{ {
ServerMessage msg = SERVER_MESSAGE__INIT; ServerMessage msg = SERVER_MESSAGE__INIT;
TimeSpec commit_point = TIME_SPEC__INIT; debug_decl(schedule_commit_point, SUDO_DEBUG_UTIL);
struct connection_closure *closure = v;
debug_decl(server_commit_cb, SUDO_DEBUG_UTIL);
/* Send the client an acknowledgement of what has been committed to disk. */ /* Send the client an acknowledgement of what has been committed to disk. */
commit_point.tv_sec = closure->elapsed_time.tv_sec; msg.u.commit_point = commit_point;
commit_point.tv_nsec = closure->elapsed_time.tv_nsec;
msg.u.commit_point = &commit_point;
msg.type_case = SERVER_MESSAGE__TYPE_COMMIT_POINT; msg.type_case = SERVER_MESSAGE__TYPE_COMMIT_POINT;
sudo_debug_printf(SUDO_DEBUG_INFO, "%s: sending commit point [%lld, %ld]", sudo_debug_printf(SUDO_DEBUG_INFO, "%s: sending commit point [%lld, %ld]",
__func__, (long long)closure->elapsed_time.tv_sec, __func__, (long long)commit_point->tv_sec, (long)commit_point->tv_nsec);
closure->elapsed_time.tv_nsec);
if (!fmt_server_message(closure, &msg)) { if (!fmt_server_message(closure, &msg)) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO, sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
@@ -1105,9 +1100,28 @@ server_commit_cb(int unused, int what, void *v)
if (closure->state == EXITED) if (closure->state == EXITED)
closure->state = FINISHED; closure->state = FINISHED;
debug_return; debug_return_bool(true);
bad: bad:
connection_closure_free(closure); connection_closure_free(closure);
debug_return_bool(false);
}
/*
* Time-based event that fires periodically to report to the client
* what has been committed to disk.
*/
static void
server_commit_cb(int unused, int what, void *v)
{
struct connection_closure *closure = v;
TimeSpec commit_point = TIME_SPEC__INIT;
debug_decl(server_commit_cb, SUDO_DEBUG_UTIL);
commit_point.tv_sec = closure->elapsed_time.tv_sec;
commit_point.tv_nsec = closure->elapsed_time.tv_nsec;
if (!schedule_commit_point(&commit_point, closure))
connection_closure_free(closure);
debug_return; debug_return;
} }