sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

r11870: fixed the problem volker reported with the RPX-XPLOGIN test. The

Browse Source 
problem was caused by a callback destroying the packet processing
context while that context was being used in packet_recv()

This is the first time we have used the ability of talloc destructors
to 'refuse' a free request. It works well in this case as it makes the
composite API simpler to use for other code, and isolates the
complexity of having callbacks destroying the packet context to the
packet.c code.
This commit is contained in:
Andrew Tridgell 2005-11-23 00:30:58 +00:00 committed by Gerald (Jerry) Carter
parent aad52d9a5f
commit b1b2d86541
1 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
source/lib/stream/packet.c
View File

@ -47,6 +47,9 @@ struct packet_context {
BOOL recv_disable;
BOOL nofree;
BOOL busy;
BOOL destructor_called;
struct send_element {
struct send_element *next, *prev;
DATA_BLOB blob;
@ -54,12 +57,35 @@ struct packet_context {
} *send_queue;
};
/*
a destructor used when we are processing packets to prevent freeing of this
context while it is being used
*/
static int packet_destructor(void *p)
{
struct packet_context *pc = talloc_get_type(p, struct packet_context);
if (pc->busy) {
pc->destructor_called = True;
/* now we refuse the talloc_free() request. The free will
happen again in the packet_recv() code */
return -1;
}
return 0;
}
/*
initialise a packet receiver
*/
struct packet_context *packet_init(TALLOC_CTX *mem_ctx)
{
return talloc_zero(mem_ctx, struct packet_context);
struct packet_context *pc = talloc_zero(mem_ctx, struct packet_context);
if (pc != NULL) {
talloc_set_destructor(pc, packet_destructor);
}
return pc;
}
@ -205,6 +231,7 @@ static void packet_next_event(struct event_context *ev, struct timed_event *te,
}
}
/*
call this when the socket becomes readable to kick off the whole
stream parsing process
@ -342,8 +369,17 @@ next_partial:
pc->processing = 1;
}
pc->busy = True;
status = pc->callback(pc->private, blob);
pc->busy = False;
if (pc->destructor_called) {
talloc_free(pc);
return;
}
if (pc->processing) {
if (pc->processing > 1) {
EVENT_FD_READABLE(pc->fde);