r1291: rename struct smbsrv_context to smbsrv_connection

because this is the connection state per transport layer (tcp)
connection

I also moved the substructs directly into smbsrv_connection,
because they don't need a struct name and we should allway pass the complete
smbsrv_connection struct into functions

metze
(This used to be commit 60f823f201fcedf5473008e8453a6351e73a92c7)

6 files changed, 12 insertions, 12 deletions

diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c
index b098e740ca..16bce3913d 100644
--- a/source4/smbd/process_model.c
+++ b/source4/smbd/process_model.c
@@ -110,7 +110,7 @@ const struct process_model_critical_sizes *process_model_version(void)
 	static const struct process_model_critical_sizes critical_sizes = {
 		PROCESS_MODEL_VERSION,
 		sizeof(struct model_ops),
-		sizeof(struct smbsrv_context),
+		sizeof(struct smbsrv_connection),
 		sizeof(struct event_context),
 		sizeof(struct fd_event)
 	};
diff --git a/source4/smbd/process_model.h b/source4/smbd/process_model.h
index 8d6635205c..c4c3aa68df 100644
--- a/source4/smbd/process_model.h
+++ b/source4/smbd/process_model.h
@@ -45,13 +45,13 @@ struct model_ops {
 	void (*accept_rpc_connection)(struct event_context *, struct fd_event *, time_t, uint16_t);
 				
 	/* function to terminate a connection */
-	void (*terminate_connection)(struct smbsrv_context *smb, const char *reason);
+	void (*terminate_connection)(struct smbsrv_connection *smb, const char *reason);
 
 	/* function to terminate a connection */
 	void (*terminate_rpc_connection)(void *r, const char *reason);
 	
 	/* function to exit server */
-	void (*exit_server)(struct smbsrv_context *smb, const char *reason);
+	void (*exit_server)(struct smbsrv_connection *smb, const char *reason);
 	
 	/* returns process or thread id */
 	int (*get_id)(struct smbsrv_request *req);
diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c
index ba4c7225e7..9c92d8569a 100644
--- a/source4/smbd/process_single.c
+++ b/source4/smbd/process_single.c
@@ -76,7 +76,7 @@ static void accept_rpc_connection(struct event_context *ev, struct fd_event *fde
 }
 
 /* called when a SMB connection goes down */
-static void terminate_connection(struct smbsrv_context *server, const char *reason) 
+static void terminate_connection(struct smbsrv_connection *server, const char *reason) 
 {
 	server_terminate(server);
 }
@@ -89,10 +89,10 @@ static void terminate_rpc_connection(void *r, const char *reason)
 
 static int get_id(struct smbsrv_request *req)
 {
-	return (int)req->smb_ctx->pid;
+	return (int)req->smb_conn->pid;
 }
 
-static void single_exit_server(struct smbsrv_context *smb, const char *reason)
+static void single_exit_server(struct smbsrv_connection *smb, const char *reason)
 {
 	DEBUG(1,("single_exit_server: reason[%s]\n",reason));
 }
diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c
index 84166196d5..2ee486e1d2 100644
--- a/source4/smbd/process_standard.c
+++ b/source4/smbd/process_standard.c
@@ -115,7 +115,7 @@ static void accept_rpc_connection(struct event_context *ev, struct fd_event *fde
 }
 
 /* called when a SMB connection goes down */
-static void terminate_connection(struct smbsrv_context *server, const char *reason) 
+static void terminate_connection(struct smbsrv_connection *server, const char *reason) 
 {
 	server_terminate(server);
 	/* terminate this process */
@@ -132,10 +132,10 @@ static void terminate_rpc_connection(void *r, const char *reason)
 
 static int get_id(struct smbsrv_request *req)
 {
-	return (int)req->smb_ctx->pid;
+	return (int)req->smb_conn->pid;
 }
 
-static void standard_exit_server(struct smbsrv_context *smb, const char *reason)
+static void standard_exit_server(struct smbsrv_connection *smb, const char *reason)
 {
 	DEBUG(1,("standard_exit_server: reason[%s]\n",reason));
 }
diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c
index bccf132fe4..f79f34e389 100644
--- a/source4/smbd/process_thread.c
+++ b/source4/smbd/process_thread.c
@@ -126,7 +126,7 @@ static void accept_rpc_connection(struct event_context *ev, struct fd_event *fde
 }
 
 /* called when a SMB connection goes down */
-static void terminate_connection(struct smbsrv_context *server, const char *reason) 
+static void terminate_connection(struct smbsrv_connection *server, const char *reason) 
 {
 	server_terminate(server);
 
@@ -465,7 +465,7 @@ static void model_startup(void)
 	register_debug_handlers("thread", &d_ops);	
 }
 
-static void thread_exit_server(struct smbsrv_context *smb, const char *reason)
+static void thread_exit_server(struct smbsrv_connection *smb, const char *reason)
 {
 	DEBUG(1,("thread_exit_server: reason[%s]\n",reason));
 }
diff --git a/source4/smbd/rewrite.c b/source4/smbd/rewrite.c
index b0ef693497..5bc826bf71 100644
--- a/source4/smbd/rewrite.c
+++ b/source4/smbd/rewrite.c
@@ -96,7 +96,7 @@ void init_subsystems(void)
 /****************************************************************************
  Reload the services file.
 **************************************************************************/
-BOOL reload_services(struct smbsrv_context *smb, BOOL test)
+BOOL reload_services(struct smbsrv_connection *smb, BOOL test)
 {
 	BOOL ret;