s4:lib/tevent: rename structs
[gd/samba-autobuild/.git] / source4 / client / cifsdd.c
index ce48c7bad1f7f73422b6bbb8038bdf7a6e6e22b4..302d470afdb747b0e88430afb58481c6ca657a4f 100644 (file)
@@ -355,9 +355,13 @@ static void print_transfer_stats(void)
 }
 
 static struct dd_iohandle * open_file(struct resolve_context *resolve_ctx, 
-                                     struct event_context *ev,
+                                     struct tevent_context *ev,
                                      const char * which, const char **ports,
-                                     struct smbcli_options *smb_options)
+                                     struct smbcli_options *smb_options,
+                                     const char *socket_options,
+                                     struct smbcli_session_options *smb_session_options,
+                                     struct smb_iconv_convenience *iconv_convenience,
+                                     struct gensec_settings *gensec_settings)
 {
        int                     options = 0;
        const char *            path = NULL;
@@ -379,13 +383,19 @@ static struct dd_iohandle * open_file(struct resolve_context *resolve_ctx,
                path = check_arg_pathname("if");
                handle = dd_open_path(resolve_ctx, ev, path, ports,
                                      check_arg_numeric("ibs"), options,
-                                     smb_options);
+                                     socket_options,
+                                     smb_options, smb_session_options,
+                                     iconv_convenience,
+                                     gensec_settings);
        } else if (strcmp(which, "of") == 0) {
                options |= DD_WRITE;
                path = check_arg_pathname("of");
                handle = dd_open_path(resolve_ctx, ev, path, ports,
                                      check_arg_numeric("obs"), options,
-                                     smb_options);
+                                     socket_options,
+                                     smb_options, smb_session_options,
+                                     iconv_convenience,
+                                     gensec_settings);
        } else {
                SMB_ASSERT(0);
                return(NULL);
@@ -398,7 +408,7 @@ static struct dd_iohandle * open_file(struct resolve_context *resolve_ctx,
        return(handle);
 }
 
-static int copy_files(struct event_context *ev, struct loadparm_context *lp_ctx)
+static int copy_files(struct tevent_context *ev, struct loadparm_context *lp_ctx)
 {
        uint8_t *       iobuf;  /* IO buffer. */
        uint64_t        iomax;  /* Size of the IO buffer. */
@@ -412,12 +422,14 @@ static int copy_files(struct event_context *ev, struct loadparm_context *lp_ctx)
        struct dd_iohandle *    ofile;
 
        struct smbcli_options options;
+       struct smbcli_session_options session_options;
 
        ibs = check_arg_numeric("ibs");
        obs = check_arg_numeric("obs");
        count = check_arg_numeric("count");
 
        lp_smbcli_options(lp_ctx, &options);
+       lp_smbcli_session_options(lp_ctx, &session_options);
 
        /* Allocate IO buffer. We need more than the max IO size because we
         * could accumulate a remainder if ibs and obs don't match.
@@ -436,12 +448,19 @@ static int copy_files(struct event_context *ev, struct loadparm_context *lp_ctx)
                        (unsigned long long)iomax, options.max_xmit));
 
        if (!(ifile = open_file(lp_resolve_context(lp_ctx), ev, "if",
-                               lp_smb_ports(lp_ctx), &options))) {
+                               lp_smb_ports(lp_ctx), &options,
+                               lp_socket_options(lp_ctx),
+                               &session_options, lp_iconv_convenience(lp_ctx),
+                               lp_gensec_settings(lp_ctx, lp_ctx)))) {
                return(FILESYS_EXIT_CODE);
        }
 
        if (!(ofile = open_file(lp_resolve_context(lp_ctx), ev, "of",
-                               lp_smb_ports(lp_ctx), &options))) {
+                               lp_smb_ports(lp_ctx), &options,
+                               lp_socket_options(lp_ctx),
+                               &session_options,
+                               lp_iconv_convenience(lp_ctx),
+                               lp_gensec_settings(lp_ctx, lp_ctx)))) {
                return(FILESYS_EXIT_CODE);
        }
 
@@ -530,7 +549,7 @@ int main(int argc, const char ** argv)
 {
        int i;
        const char ** dd_args;
-       struct event_context *ev;
+       struct tevent_context *ev;
 
        poptContext pctx;
        struct poptOption poptions[] = {
@@ -581,7 +600,7 @@ int main(int argc, const char ** argv)
                }
        }
 
-       ev = event_context_init(talloc_autofree_context());
+       ev = s4_event_context_init(talloc_autofree_context());
 
        gensec_init(cmdline_lp_ctx);
        dump_args();