s4:rpc_server: only use context within op_bind() hooks and dcesrv_interface_bind_...

[samba.git] / source4 / rpc_server / echo / rpc_echo.c

diff --git a/source4/rpc_server/echo/rpc_echo.c b/source4/rpc_server/echo/rpc_echo.c
index d7d7ef31c2024d5c7b2f0b1de6c6e4a473c0f3a6..e00eaecbd456cc4072623d7bbc003a09ae4c90d7 100644 (file)
--- a/source4/rpc_server/echo/rpc_echo.c
+++ b/source4/rpc_server/echo/rpc_echo.c
@@ -8,7 +8,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -27,20 +26,28 @@
 #include "librpc/gen_ndr/ndr_echo.h"
 #include "lib/events/events.h"
 
+#define DCESRV_INTERFACE_RPCECHO_BIND(call, iface) \
+       dcesrv_interface_rpcecho_bind(call, iface)
+static NTSTATUS dcesrv_interface_rpcecho_bind(struct dcesrv_call_state *dce_call,
+                                             const struct dcesrv_interface *iface)
+{
+       struct dcesrv_connection_context *context = dce_call->context;
+       return dcesrv_interface_bind_allow_connect(context, iface);
+}
 
-static NTSTATUS echo_AddOne(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_AddOne *r)
+static NTSTATUS dcesrv_echo_AddOne(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_AddOne *r)
 {
        *r->out.out_data = r->in.in_data + 1;
        return NT_STATUS_OK;
 }
 
-static NTSTATUS echo_EchoData(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_EchoData *r)
+static NTSTATUS dcesrv_echo_EchoData(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_EchoData *r)
 {
        if (!r->in.len) {
                return NT_STATUS_OK;
        }
 
-       r->out.out_data = talloc_memdup(mem_ctx, r->in.in_data, r->in.len);
+       r->out.out_data = (uint8_t *)talloc_memdup(mem_ctx, r->in.in_data, r->in.len);
        if (!r->out.out_data) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -48,16 +55,19 @@ static NTSTATUS echo_EchoData(struct dcesrv_call_state *dce_call, TALLOC_CTX *me
        return NT_STATUS_OK;
 }
 
-static NTSTATUS echo_SinkData(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_SinkData *r)
+static NTSTATUS dcesrv_echo_SinkData(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_SinkData *r)
 {
        return NT_STATUS_OK;
 }
 
-static NTSTATUS echo_SourceData(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_SourceData *r)
+static NTSTATUS dcesrv_echo_SourceData(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_SourceData *r)
 {
-       int i;
+       unsigned int i;
 
        r->out.data = talloc_array(mem_ctx, uint8_t, r->in.len);
+       if (!r->out.data) {
+               return NT_STATUS_NO_MEMORY;
+       }
        
        for (i=0;i<r->in.len;i++) {
                r->out.data[i] = i;
@@ -66,14 +76,16 @@ static NTSTATUS echo_SourceData(struct dcesrv_call_state *dce_call, TALLOC_CTX *
        return NT_STATUS_OK;
 }
 
-static NTSTATUS echo_TestCall(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_TestCall *r)
+static NTSTATUS dcesrv_echo_TestCall(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_TestCall *r)
 {
-       r->out.s2 = talloc_strdup(mem_ctx, "this is a test string");
-       
+       *r->out.s2 = talloc_strdup(mem_ctx, r->in.s1);
+       if (r->in.s1 && !*r->out.s2) {
+               return NT_STATUS_NO_MEMORY;
+       }
        return NT_STATUS_OK;
 }
 
-static NTSTATUS echo_TestCall2(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_TestCall2 *r)
+static NTSTATUS dcesrv_echo_TestCall2(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_TestCall2 *r)
 {
        r->out.info = talloc(mem_ctx, union echo_Info);
        if (!r->out.info) {
@@ -112,13 +124,13 @@ static NTSTATUS echo_TestCall2(struct dcesrv_call_state *dce_call, TALLOC_CTX *m
        return NT_STATUS_OK;
 }
 
-static NTSTATUS echo_TestEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_TestEnum *r)
+static NTSTATUS dcesrv_echo_TestEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_TestEnum *r)
 {
        r->out.foo2->e1 = ECHO_ENUM2;
        return NT_STATUS_OK;
 }
 
-static NTSTATUS echo_TestSurrounding(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_TestSurrounding *r)
+static NTSTATUS dcesrv_echo_TestSurrounding(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_TestSurrounding *r)
 {
        if (!r->in.data) {
                r->out.data = NULL;
@@ -126,13 +138,19 @@ static NTSTATUS echo_TestSurrounding(struct dcesrv_call_state *dce_call, TALLOC_
        }
 
        r->out.data = talloc(mem_ctx, struct echo_Surrounding);
+       if (!r->out.data) {
+               return NT_STATUS_NO_MEMORY;
+       }
        r->out.data->x = 2 * r->in.data->x;
        r->out.data->surrounding = talloc_zero_array(mem_ctx, uint16_t, r->out.data->x);
+       if (!r->out.data->surrounding) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
        return NT_STATUS_OK;
 }
 
-static uint16_t echo_TestDoublePointer(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_TestDoublePointer *r) 
+static uint16_t dcesrv_echo_TestDoublePointer(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_TestDoublePointer *r) 
 {
        if (!*r->in.data) 
                return 0;
@@ -146,10 +164,10 @@ struct echo_TestSleep_private {
        struct echo_TestSleep *r;
 };
 
-static void echo_TestSleep_handler(struct event_context *ev, struct timed_event *te, 
-                                  struct timeval t, void *private)
+static void echo_TestSleep_handler(struct tevent_context *ev, struct tevent_timer *te, 
+                                  struct timeval t, void *private_data)
 {
-       struct echo_TestSleep_private *p = talloc_get_type(private, 
+       struct echo_TestSleep_private *p = talloc_get_type(private_data,
                                                           struct echo_TestSleep_private);
        struct echo_TestSleep *r = p->r;
        NTSTATUS status;
@@ -163,7 +181,7 @@ static void echo_TestSleep_handler(struct event_context *ev, struct timed_event
        }
 }
 
-static long echo_TestSleep(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_TestSleep *r)
+static long dcesrv_echo_TestSleep(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_TestSleep *r)
 {
        struct echo_TestSleep_private *p;
 
@@ -182,7 +200,7 @@ static long echo_TestSleep(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_c
        p->dce_call     = dce_call;
        p->r            = r;
 
-       event_add_timed(dce_call->event_ctx, p, 
+       tevent_add_timer(dce_call->event_ctx, p,
                        timeval_add(&dce_call->time, r->in.seconds, 0),
                        echo_TestSleep_handler, p);