Attachment #143598 for bug #150966

View | Details | Raw Unified | Return to bug 150966
Collapse All | Expand All




    }
    if (EVENT_FD((&client->server_read_ev)) != -1) {
        event_del(&client->server_read_ev);
        (&client->server_read_ev)->ev_fd = -1;
    }
    if (EVENT_FD((&client->server_write_ev)) != -1) {
        event_del(&client->server_write_ev);
        (&client->server_write_ev)->ev_fd = -1;
    }
    if (EVENT_FD((&client->client_read_ev)) != -1) {
        event_del(&client->client_read_ev);
        (&client->client_read_ev)->ev_fd = -1;
    }
    if (EVENT_FD((&client->client_write_ev)) != -1) {
        event_del(&client->client_write_ev);
        (&client->client_write_ev)->ev_fd = -1;
    }
    if (client->server_fd != -1) {
        while (close(client->server_fd) != 0 && errno == EINTR);

    client->postbuf_written = (size_t) 0U;    
    client->replybuf_len = (size_t) 0U;
    client->replybuf_written = (size_t) 0U;    
    (&client->client_read_ev)->ev_fd = -1;
    (&client->client_write_ev)->ev_fd = -1;
    (&client->server_read_ev)->ev_fd = -1;
    (&client->server_write_ev)->ev_fd = -1;
    event_set(&client->client_read_ev, client_fd,
              EV_READ, client_read, &clients[client_fd]);
    event_add(&client->client_read_ev, &timeout_header_client_read);

Return to bug 150966

Lines 31-49 Link Here

(-)plb-0.3/src/plb_session.c (-8 / +8 lines)
31	}	31	}
32	if (EVENT_FD((&client->server_read_ev)) != -1) {	32	if (EVENT_FD((&client->server_read_ev)) != -1) {
33	event_del(&client->server_read_ev);	33	event_del(&client->server_read_ev);
34	EVENT_FD((&client->server_read_ev)) = -1;	34	(&client->server_read_ev)->ev_fd = -1;
35	}	35	}
36	if (EVENT_FD((&client->server_write_ev)) != -1) {	36	if (EVENT_FD((&client->server_write_ev)) != -1) {
37	event_del(&client->server_write_ev);	37	event_del(&client->server_write_ev);
38	EVENT_FD((&client->server_write_ev)) = -1;	38	(&client->server_write_ev)->ev_fd = -1;
39	}	39	}
40	if (EVENT_FD((&client->client_read_ev)) != -1) {	40	if (EVENT_FD((&client->client_read_ev)) != -1) {
41	event_del(&client->client_read_ev);	41	event_del(&client->client_read_ev);
42	EVENT_FD((&client->client_read_ev)) = -1;	42	(&client->client_read_ev)->ev_fd = -1;
43	}	43	}
44	if (EVENT_FD((&client->client_write_ev)) != -1) {	44	if (EVENT_FD((&client->client_write_ev)) != -1) {
45	event_del(&client->client_write_ev);	45	event_del(&client->client_write_ev);
46	EVENT_FD((&client->client_write_ev)) = -1;	46	(&client->client_write_ev)->ev_fd = -1;
47	}	47	}
48	if (client->server_fd != -1) {	48	if (client->server_fd != -1) {
49	while (close(client->server_fd) != 0 && errno == EINTR);	49	while (close(client->server_fd) != 0 && errno == EINTR);
Lines 137-146 Link Here
137	client->postbuf_written = (size_t) 0U;	137	client->postbuf_written = (size_t) 0U;
138	client->replybuf_len = (size_t) 0U;	138	client->replybuf_len = (size_t) 0U;
139	client->replybuf_written = (size_t) 0U;	139	client->replybuf_written = (size_t) 0U;
140	EVENT_FD((&client->client_read_ev)) = -1;	140	(&client->client_read_ev)->ev_fd = -1;
141	EVENT_FD((&client->client_write_ev)) = -1;	141	(&client->client_write_ev)->ev_fd = -1;
142	EVENT_FD((&client->server_read_ev)) = -1;	142	(&client->server_read_ev)->ev_fd = -1;
143	EVENT_FD((&client->server_write_ev)) = -1;	143	(&client->server_write_ev)->ev_fd = -1;
144	event_set(&client->client_read_ev, client_fd,	144	event_set(&client->client_read_ev, client_fd,
145	EV_READ, client_read, &clients[client_fd]);	145	EV_READ, client_read, &clients[client_fd]);
146	event_add(&client->client_read_ev, &timeout_header_client_read);	146	event_add(&client->client_read_ev, &timeout_header_client_read);