#include "includes.h"
#include <tevent.h>
#include "process_model.h"
+#include "lib/util/server_id.h"
#include "lib/messaging/irpc.h"
#include "cluster/cluster.h"
#include "param/param.h"
#include "../lib/tsocket/tsocket.h"
#include "lib/util/util_net.h"
-/* the range of ports to try for dcerpc over tcp endpoints */
-#define SERVER_TCP_LOW_PORT 1024
-#define SERVER_TCP_HIGH_PORT 1300
-
/* size of listen() backlog in smbd */
#define SERVER_LISTEN_BACKLOG 10
const struct model_ops *model_ops;
struct socket_context *sock;
void *private_data;
+ void *process_context;
};
{
struct tevent_context *event_ctx = srv_conn->event.ctx;
const struct model_ops *model_ops = srv_conn->model_ops;
+ struct loadparm_context *lp_ctx = srv_conn->lp_ctx;
+ void *process_context = srv_conn->process_context;
+ TALLOC_CTX *frame = NULL;
if (!reason) reason = "unknown reason";
return;
}
+ frame = talloc_stackframe();
+
+ reason = talloc_strdup(frame, reason);
+ if (reason == NULL) {
+ reason = "OOM - unknown reason";
+ }
+
talloc_free(srv_conn->event.fde);
srv_conn->event.fde = NULL;
imessaging_cleanup(srv_conn->msg_ctx);
- model_ops->terminate(event_ctx, srv_conn->lp_ctx, reason);
- talloc_free(srv_conn);
+ TALLOC_FREE(srv_conn);
+ model_ops->terminate(event_ctx, lp_ctx, reason, process_context);
+ TALLOC_FREE(frame);
}
/**
const struct stream_server_ops *stream_ops,
struct imessaging_context *msg_ctx,
void *private_data,
- struct stream_connection **_srv_conn)
+ struct stream_connection **_srv_conn,
+ void *process_context)
{
struct stream_connection *srv_conn;
srv_conn = talloc_zero(ev, struct stream_connection);
NT_STATUS_HAVE_NO_MEMORY(srv_conn);
- srv_conn->private_data = private_data;
- srv_conn->model_ops = model_ops;
- srv_conn->socket = NULL;
- srv_conn->server_id = cluster_id(0, 0);
- srv_conn->ops = stream_ops;
- srv_conn->msg_ctx = msg_ctx;
- srv_conn->event.ctx = ev;
- srv_conn->lp_ctx = lp_ctx;
- srv_conn->event.fde = NULL;
+ srv_conn->private_data = private_data;
+ srv_conn->model_ops = model_ops;
+ srv_conn->socket = NULL;
+ srv_conn->server_id = cluster_id(0, 0);
+ srv_conn->ops = stream_ops;
+ srv_conn->msg_ctx = msg_ctx;
+ srv_conn->event.ctx = ev;
+ srv_conn->lp_ctx = lp_ctx;
+ srv_conn->event.fde = NULL;
+ srv_conn->process_context = process_context;
*_srv_conn = srv_conn;
return NT_STATUS_OK;
static void stream_new_connection(struct tevent_context *ev,
struct loadparm_context *lp_ctx,
struct socket_context *sock,
- struct server_id server_id, void *private_data)
+ struct server_id server_id,
+ void *private_data,
+ void *process_context)
{
struct stream_socket *stream_socket = talloc_get_type(private_data, struct stream_socket);
struct stream_connection *srv_conn;
talloc_steal(srv_conn, sock);
- srv_conn->private_data = stream_socket->private_data;
- srv_conn->model_ops = stream_socket->model_ops;
- srv_conn->socket = sock;
- srv_conn->server_id = server_id;
- srv_conn->ops = stream_socket->ops;
- srv_conn->event.ctx = ev;
- srv_conn->lp_ctx = lp_ctx;
+ srv_conn->private_data = stream_socket->private_data;
+ srv_conn->model_ops = stream_socket->model_ops;
+ srv_conn->socket = sock;
+ srv_conn->server_id = server_id;
+ srv_conn->ops = stream_socket->ops;
+ srv_conn->event.ctx = ev;
+ srv_conn->lp_ctx = lp_ctx;
+ srv_conn->process_context = process_context;
if (!socket_check_access(sock, "smbd", lpcfg_hosts_allow(NULL, lpcfg_default_service(lp_ctx)), lpcfg_hosts_deny(NULL, lpcfg_default_service(lp_ctx)))) {
stream_terminate_connection(srv_conn, "denied by access rules");
/* setup to receive internal messages on this connection */
srv_conn->msg_ctx = imessaging_init(srv_conn,
lp_ctx,
- srv_conn->server_id, ev, false);
+ srv_conn->server_id, ev);
if (!srv_conn->msg_ctx) {
stream_terminate_connection(srv_conn, "imessaging_init() failed");
return;
{
TALLOC_CTX *tmp_ctx;
const char *title;
+ struct server_id_buf idbuf;
tmp_ctx = talloc_new(srv_conn);
stream_socket->ops->name,
tsocket_address_string(srv_conn->remote_address, tmp_ctx),
tsocket_address_string(srv_conn->local_address, tmp_ctx),
- server_id_str(tmp_ctx, &server_id));
+ server_id_str_buf(server_id, &idbuf));
if (title) {
stream_connection_set_title(srv_conn, title);
}
/* ask the process model to create us a process for this new
connection. When done, it calls stream_new_connection()
with the newly created socket */
- stream_socket->model_ops->accept_connection(ev, stream_socket->lp_ctx,
- stream_socket->sock,
- stream_new_connection, stream_socket);
+ stream_socket->model_ops->accept_connection(
+ ev,
+ stream_socket->lp_ctx,
+ stream_socket->sock,
+ stream_new_connection,
+ stream_socket,
+ stream_socket->process_context);
}
/*
const char *sock_addr,
uint16_t *port,
const char *socket_options,
- void *private_data)
+ void *private_data,
+ void *process_context)
{
NTSTATUS status;
struct stream_socket *stream_socket;
}
socket_address = socket_address_from_sockaddr_storage(stream_socket, &ss, port?*port:0);
- NT_STATUS_HAVE_NO_MEMORY_AND_FREE(socket_address, stream_socket);
+ if (socket_address == NULL) {
+ TALLOC_FREE(stream_socket);
+ return NT_STATUS_NO_MEMORY;
+ }
status = socket_create(socket_address->family, SOCKET_TYPE_STREAM, &stream_socket->sock, 0);
NT_STATUS_NOT_OK_RETURN(status);
if (!port) {
status = socket_listen(stream_socket->sock, socket_address, SERVER_LISTEN_BACKLOG, 0);
} else if (*port == 0) {
- for (i=SERVER_TCP_LOW_PORT;i<= SERVER_TCP_HIGH_PORT;i++) {
+ for (i = lpcfg_rpc_low_port(lp_ctx);
+ i <= lpcfg_rpc_high_port(lp_ctx);
+ i++) {
socket_address->port = i;
status = socket_listen(stream_socket->sock, socket_address,
SERVER_LISTEN_BACKLOG, 0);
stream_socket->ops = stream_ops;
stream_socket->event_ctx = event_context;
stream_socket->model_ops = model_ops;
+ stream_socket->process_context = process_context;
return NT_STATUS_OK;
}
git.samba.org / metze / samba / wip.git / blobdiff