Author: tridge Date: 2005-11-14 03:45:57 +0000 (Mon, 14 Nov 2005) New Revision: 11713
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11713 Log: separate out the setting of the fde in the packet context from the enabling of packet serialisation Modified: branches/SAMBA_4_0/source/kdc/kdc.c branches/SAMBA_4_0/source/ldap_server/ldap_server.c branches/SAMBA_4_0/source/lib/stream/packet.c branches/SAMBA_4_0/source/lib/stream/packet.h branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c branches/SAMBA_4_0/source/libcli/raw/clitransport.c branches/SAMBA_4_0/source/libcli/smb2/transport.c branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c branches/SAMBA_4_0/source/smb_server/smb_server.c Changeset: Modified: branches/SAMBA_4_0/source/kdc/kdc.c =================================================================== --- branches/SAMBA_4_0/source/kdc/kdc.c 2005-11-14 02:45:28 UTC (rev 11712) +++ branches/SAMBA_4_0/source/kdc/kdc.c 2005-11-14 03:45:57 UTC (rev 11713) @@ -360,7 +360,8 @@ packet_set_full_request(kdcconn->packet, packet_full_request_u32); packet_set_error_handler(kdcconn->packet, kdc_tcp_recv_error); packet_set_event_context(kdcconn->packet, conn->event.ctx); - packet_set_serialise(kdcconn->packet, conn->event.fde); + packet_set_fde(kdcconn->packet, conn->event.fde); + packet_set_serialise(kdcconn->packet); } static const struct stream_server_ops kdc_tcp_stream_ops = { Modified: branches/SAMBA_4_0/source/ldap_server/ldap_server.c =================================================================== --- branches/SAMBA_4_0/source/ldap_server/ldap_server.c 2005-11-14 02:45:28 UTC (rev 11712) +++ branches/SAMBA_4_0/source/ldap_server/ldap_server.c 2005-11-14 03:45:57 UTC (rev 11713) @@ -319,7 +319,8 @@ packet_set_full_request(conn->packet, ldapsrv_complete_packet); packet_set_error_handler(conn->packet, ldapsrv_error_handler); packet_set_event_context(conn->packet, c->event.ctx); - packet_set_serialise(conn->packet, c->event.fde); + packet_set_fde(conn->packet, c->event.fde); + packet_set_serialise(conn->packet); /* Connections start out anonymous */ if (!NT_STATUS_IS_OK(auth_anonymous_session_info(conn, &conn->session_info))) { Modified: branches/SAMBA_4_0/source/lib/stream/packet.c =================================================================== --- branches/SAMBA_4_0/source/lib/stream/packet.c 2005-11-14 02:45:28 UTC (rev 11712) +++ branches/SAMBA_4_0/source/lib/stream/packet.c 2005-11-14 03:45:57 UTC (rev 11713) @@ -127,16 +127,24 @@ } /* - tell the packet layer to serialise requests, so we don't process two requests at once on - one connection. You must have set the event_context + tell the packet layer the fde for the socket */ -void packet_set_serialise(struct packet_context *pc, struct fd_event *fde) +void packet_set_fde(struct packet_context *pc, struct fd_event *fde) { - pc->serialise = True; pc->fde = fde; } /* + tell the packet layer to serialise requests, so we don't process two + requests at once on one connection. You must have set the + event_context and fde +*/ +void packet_set_serialise(struct packet_context *pc) +{ + pc->serialise = True; +} + +/* tell the packet layer how much to read when starting a new packet this ensures it doesn't overread */ Modified: branches/SAMBA_4_0/source/lib/stream/packet.h =================================================================== --- branches/SAMBA_4_0/source/lib/stream/packet.h 2005-11-14 02:45:28 UTC (rev 11712) +++ branches/SAMBA_4_0/source/lib/stream/packet.h 2005-11-14 03:45:57 UTC (rev 11713) @@ -38,7 +38,8 @@ void packet_set_tls(struct packet_context *pc, struct tls_context *tls); void packet_set_socket(struct packet_context *pc, struct socket_context *sock); void packet_set_event_context(struct packet_context *pc, struct event_context *ev); -void packet_set_serialise(struct packet_context *pc, struct fd_event *fde); +void packet_set_fde(struct packet_context *pc, struct fd_event *fde); +void packet_set_serialise(struct packet_context *pc); void packet_set_initial_read(struct packet_context *pc, uint32_t initial_read); void packet_set_nofree(struct packet_context *pc); void packet_recv(struct packet_context *pc); Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c =================================================================== --- branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c 2005-11-14 02:45:28 UTC (rev 11712) +++ branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c 2005-11-14 03:45:57 UTC (rev 11713) @@ -398,7 +398,8 @@ packet_set_full_request(conn->packet, ldap_complete_packet); packet_set_error_handler(conn->packet, ldap_error_handler); packet_set_event_context(conn->packet, conn->event.event_ctx); - packet_set_serialise(conn->packet, conn->event.fde); + packet_set_fde(conn->packet, conn->event.fde); + packet_set_serialise(conn->packet); composite_done(state->ctx); Modified: branches/SAMBA_4_0/source/libcli/raw/clitransport.c =================================================================== --- branches/SAMBA_4_0/source/libcli/raw/clitransport.c 2005-11-14 02:45:28 UTC (rev 11712) +++ branches/SAMBA_4_0/source/libcli/raw/clitransport.c 2005-11-14 03:45:57 UTC (rev 11713) @@ -121,7 +121,8 @@ smbcli_transport_event_handler, transport); - packet_set_serialise(transport->packet, transport->socket->event.fde); + packet_set_fde(transport->packet, transport->socket->event.fde); + packet_set_serialise(transport->packet); talloc_set_destructor(transport, transport_destructor); Modified: branches/SAMBA_4_0/source/libcli/smb2/transport.c =================================================================== --- branches/SAMBA_4_0/source/libcli/smb2/transport.c 2005-11-14 02:45:28 UTC (rev 11712) +++ branches/SAMBA_4_0/source/libcli/smb2/transport.c 2005-11-14 03:45:57 UTC (rev 11713) @@ -107,7 +107,8 @@ smb2_transport_event_handler, transport); - packet_set_serialise(transport->packet, transport->socket->event.fde); + packet_set_fde(transport->packet, transport->socket->event.fde); + packet_set_serialise(transport->packet); talloc_set_destructor(transport, transport_destructor); Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c =================================================================== --- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c 2005-11-14 02:45:28 UTC (rev 11712) +++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c 2005-11-14 03:45:57 UTC (rev 11713) @@ -254,7 +254,8 @@ packet_set_full_request(sock->packet, sock_complete_packet); packet_set_error_handler(sock->packet, sock_error_handler); packet_set_event_context(sock->packet, c->event_ctx); - packet_set_serialise(sock->packet, sock->fde); + packet_set_fde(sock->packet, sock->fde); + packet_set_serialise(sock->packet); packet_recv_disable(sock->packet); packet_set_initial_read(sock->packet, 16); Modified: branches/SAMBA_4_0/source/smb_server/smb_server.c =================================================================== --- branches/SAMBA_4_0/source/smb_server/smb_server.c 2005-11-14 02:45:28 UTC (rev 11712) +++ branches/SAMBA_4_0/source/smb_server/smb_server.c 2005-11-14 03:45:57 UTC (rev 11713) @@ -718,7 +718,8 @@ packet_set_full_request(smb_conn->packet, packet_full_request_nbt); packet_set_error_handler(smb_conn->packet, smbsrv_recv_error); packet_set_event_context(smb_conn->packet, conn->event.ctx); - packet_set_serialise(smb_conn->packet, conn->event.fde); + packet_set_fde(smb_conn->packet, conn->event.fde); + packet_set_serialise(smb_conn->packet); smbsrv_vuid_init(smb_conn);
