diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-01-30 00:54:57 +0000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2005-01-30 00:54:57 +0000 |
commit | cfc79e1f7ae1f2966ace7d1a260d12edadde0c52 (patch) | |
tree | d72b47214a4bbbd135494e6d737772842a0276a4 /source/torture | |
parent | 9a7ba4059e4d18af2837718f92e7aaf88cfe6a07 (diff) | |
download | samba-cfc79e1f7ae1f2966ace7d1a260d12edadde0c52.tar.gz samba-cfc79e1f7ae1f2966ace7d1a260d12edadde0c52.tar.xz samba-cfc79e1f7ae1f2966ace7d1a260d12edadde0c52.zip |
r5102: This is a major simplification of the logic for controlling top level
servers in smbd. The old code still contained a fairly bit of legacy
from the time when smbd was only handling SMB connection. The new code
gets rid of all of the smb_server specific code in smbd/, and creates
a much simpler infrastructures for new server code.
Major changes include:
- simplified the process model code a lot.
- got rid of the top level server and service structures
completely. The top level context is now the event_context. This
got rid of service.h and server.h completely (they were the most
confusing parts of the old code)
- added service_stream.[ch] for the helper functions that are
specific to stream type services (services that handle streams, and
use a logically separate process per connection)
- got rid of the builtin idle_handler code in the service logic, as
none of the servers were using it, and it can easily be handled by
a server in future by adding its own timed_event to the event
context.
- fixed some major memory leaks in the rpc server code.
- added registration of servers, rather than hard coding our list of
possible servers. This allows for servers as modules in the future.
- temporarily disabled the winbind code until I add the helper
functions for that type of server
- added error checking on service startup. If a configured server
fails to startup then smbd doesn't startup.
- cleaned up the command line handling in smbd, removing unused options
Diffstat (limited to 'source/torture')
-rw-r--r-- | source/torture/local/messaging.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/torture/local/messaging.c b/source/torture/local/messaging.c index 9c6f55a6c45..bef26040067 100644 --- a/source/torture/local/messaging.c +++ b/source/torture/local/messaging.c @@ -25,7 +25,7 @@ enum {MY_PING=1000, MY_PONG, MY_EXIT}; static void ping_message(struct messaging_context *msg, void *private, - uint32_t msg_type, servid_t src, DATA_BLOB *data) + uint32_t msg_type, uint32_t src, DATA_BLOB *data) { NTSTATUS status; status = messaging_send(msg, src, MY_PONG, data); @@ -35,14 +35,14 @@ static void ping_message(struct messaging_context *msg, void *private, } static void pong_message(struct messaging_context *msg, void *private, - uint32_t msg_type, servid_t src, DATA_BLOB *data) + uint32_t msg_type, uint32_t src, DATA_BLOB *data) { int *count = private; (*count)++; } static void exit_message(struct messaging_context *msg, void *private, - uint32_t msg_type, servid_t src, DATA_BLOB *data) + uint32_t msg_type, uint32_t src, DATA_BLOB *data) { talloc_free(private); exit(0); |