mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-12 10:54:48 +08:00
15e6a98bba
================ Written by Hallvard B. Furuseth and placed into the public domain. This software is not subject to any license of the University of Oslo. ================ Here is a patch which does what I described. Of course, someone has to decide if that is the right solution:-) - Add an "opid:" line to the input to back-shell commands. - Add an "abandonid: <opid> line to back-shell/abandon input. - Replace message id with opid in back-tcl arguments. - Add an abandonid = <opid> argument to back-tcl/abandon. An opid (operation ID) is a "connection ID/message ID" string. I would have liked to use another name to avoid confusion with struct slap_op->o_opid, but I could not think of another apt word. This also fixes ITS#1784 and ITS#1792. Since calling conventions changed anyway, I fixed back-shell by adding abandonid: and making opid: always be the ID of the current operation. Hallvard B. Furuseth <h.b.furuseth@usit.uio.no>, May 2002.
79 lines
1.7 KiB
C
79 lines
1.7 KiB
C
/* abandon.c - shell backend abandon function */
|
|
/* $OpenLDAP$ */
|
|
/*
|
|
* Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
|
|
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
|
|
*/
|
|
|
|
#include "portable.h"
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <ac/socket.h>
|
|
#include <ac/string.h>
|
|
|
|
#include "slap.h"
|
|
#include "shell.h"
|
|
|
|
int
|
|
shell_back_abandon(
|
|
Backend *be,
|
|
Connection *conn,
|
|
Operation *op,
|
|
int msgid
|
|
)
|
|
{
|
|
struct shellinfo *si = (struct shellinfo *) be->be_private;
|
|
FILE *rfp, *wfp;
|
|
pid_t pid;
|
|
Operation *o;
|
|
|
|
/* no abandon command defined - just kill the process handling it */
|
|
if ( si->si_abandon == NULL ) {
|
|
ldap_pvt_thread_mutex_lock( &conn->c_mutex );
|
|
pid = -1;
|
|
LDAP_STAILQ_FOREACH( o, &conn->c_ops, o_next ) {
|
|
if ( o->o_msgid == msgid ) {
|
|
pid = (pid_t) o->o_private;
|
|
break;
|
|
}
|
|
}
|
|
if( pid == -1 ) {
|
|
LDAP_STAILQ_FOREACH( o, &conn->c_pending_ops, o_next ) {
|
|
if ( o->o_msgid == msgid ) {
|
|
pid = (pid_t) o->o_private;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
|
|
|
|
if ( pid != -1 ) {
|
|
Debug( LDAP_DEBUG_ARGS, "shell killing pid %d\n",
|
|
(int) pid, 0, 0 );
|
|
kill( pid, SIGTERM );
|
|
} else {
|
|
Debug( LDAP_DEBUG_ARGS, "shell could not find op %d\n",
|
|
msgid, 0, 0 );
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
if ( forkandexec( si->si_abandon, &rfp, &wfp ) == -1 ) {
|
|
return 0;
|
|
}
|
|
|
|
/* write out the request to the abandon process */
|
|
fprintf( wfp, "ABANDON\n" );
|
|
fprintf( wfp, "opid: %ld/%ld\n", op->o_connid, (long) op->o_msgid );
|
|
fprintf( wfp, "msgid: %d\n", msgid );
|
|
print_suffixes( wfp, be );
|
|
fprintf( wfp, "abandonid: %ld/%d\n", op->o_connid, msgid );
|
|
fclose( wfp );
|
|
|
|
/* no result from abandon */
|
|
fclose( rfp );
|
|
|
|
return 0;
|
|
}
|