separate out the setting of the fde in the packet context from the

enabling of packet serialisation

git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@11713 0c0555d6-39d7-0310-84fc-f1cc0bd64818

diff --git a/source/kdc/kdc.c b/source/kdc/kdc.c
index e633b5baa732231e0fbdaea794866035e91e2183..4e7865b5f9929a0949f432f94742c9817fe69d01 100644 (file)
--- a/source/kdc/kdc.c
+++ b/source/kdc/kdc.c
@@ -360,7 +360,8 @@ static void kdc_tcp_accept(struct stream_connection *conn)
        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 = {

diff --git a/source/ldap_server/ldap_server.c b/source/ldap_server/ldap_server.c
index 3465c8ad863c15bd2732dccc6694014d20aae947..b74bec0b1be52100b16abe1b9b6b94f7437e5e82 100644 (file)
--- a/source/ldap_server/ldap_server.c
+++ b/source/ldap_server/ldap_server.c
@@ -319,7 +319,8 @@ static void ldapsrv_accept(struct stream_connection *c)
        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))) {

diff --git a/source/lib/stream/packet.c b/source/lib/stream/packet.c
index 23db44ef021374e3121b638824535036138c5921..45ca1feb45a6065f1bcbe8bfdfe38e178d721ca1 100644 (file)
--- a/source/lib/stream/packet.c
+++ b/source/lib/stream/packet.c
@@ -127,15 +127,23 @@ void packet_set_event_context(struct packet_context *pc, struct event_context *e
 }
 
 /*
-  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

diff --git a/source/lib/stream/packet.h b/source/lib/stream/packet.h
index 4a8c26a8090990c9fb053d51be2c9c5552c6760b..79d4acacd01f136fe62e41f1f403b3aa00ac2ce4 100644 (file)
--- a/source/lib/stream/packet.h
+++ b/source/lib/stream/packet.h
@@ -38,7 +38,8 @@ void packet_set_full_request(struct packet_context *pc, packet_full_request_fn_t
 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);

diff --git a/source/libcli/ldap/ldap_client.c b/source/libcli/ldap/ldap_client.c
index 503016e896dd4ad481df7e2877b8074ab95d8e01..a5f647939fc5b7ad38b84f0830fb4df7105b6535 100644 (file)
--- a/source/libcli/ldap/ldap_client.c
+++ b/source/libcli/ldap/ldap_client.c
@@ -398,7 +398,8 @@ static void ldap_connect_recv_conn(struct composite_context *ctx)
        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);
 

diff --git a/source/libcli/raw/clitransport.c b/source/libcli/raw/clitransport.c
index fba6c36bbe9f8bd2b5f5e77329cb76dd03aba228..b60ea1dc02d2e9946abf0c4bb5bf9bb78d3550fa 100644 (file)
--- a/source/libcli/raw/clitransport.c
+++ b/source/libcli/raw/clitransport.c
@@ -121,7 +121,8 @@ struct smbcli_transport *smbcli_transport_init(struct smbcli_socket *sock,
                                                    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);
 

diff --git a/source/libcli/smb2/transport.c b/source/libcli/smb2/transport.c
index e87c7a68c02dd64481d9d16900c29b52e0b6f6d4..c6fc890e34156dbc74f51e4ec2761e010190970d 100644 (file)
--- a/source/libcli/smb2/transport.c
+++ b/source/libcli/smb2/transport.c
@@ -107,7 +107,8 @@ struct smb2_transport *smb2_transport_init(struct smbcli_socket *sock,
                                                    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);
 

diff --git a/source/librpc/rpc/dcerpc_sock.c b/source/librpc/rpc/dcerpc_sock.c
index 2ecf9f15305de51309827515b3a077c79cb94871..838ddc628b59df15fe21708cf265529c225f6c19 100644 (file)
--- a/source/librpc/rpc/dcerpc_sock.c
+++ b/source/librpc/rpc/dcerpc_sock.c
@@ -254,7 +254,8 @@ static NTSTATUS dcerpc_pipe_open_socket(struct dcerpc_connection *c,
        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);
 

diff --git a/source/smb_server/smb_server.c b/source/smb_server/smb_server.c
index 1467beccac677d5cbb8b173d3c951fa53e1a4c77..8f6accb370fc1489b9e09a3784066ef66547d3d3 100644 (file)
--- a/source/smb_server/smb_server.c
+++ b/source/smb_server/smb_server.c
@@ -718,7 +718,8 @@ static void smbsrv_accept(struct stream_connection *conn)
        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);