[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.

[samba.git] / source / libsmb / climessage.c

diff --git a/source/libsmb/climessage.c b/source/libsmb/climessage.c
index 5ded79de96c3c72b384ad45d96ac67ece7bcc5fb..46d7c1c3befae3e13a7873a7714299b9de3faa80 100644 (file)
--- a/source/libsmb/climessage.c
+++ b/source/libsmb/climessage.c
@@ -1,12 +1,11 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 3.0
+   Unix SMB/CIFS implementation.
    client message handling routines
    Copyright (C) Andrew Tridgell 1994-1998
    
    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,
@@ -15,24 +14,20 @@
    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/>.
 */
 
-#define NO_SYSLOG
-
 #include "includes.h"
 
 
 /****************************************************************************
 start a message sequence
 ****************************************************************************/
-BOOL cli_message_start(struct cli_state *cli, char *host, char *username, 
-                             int *grp)
+int cli_message_start_build(struct cli_state *cli, char *host, char *username)
 {
        char *p;
 
-       /* send a SMBsendstrt command */
+       /* construct a SMBsendstrt command */
        memset(cli->outbuf,'\0',smb_size);
        set_message(cli->outbuf,0,0,True);
        SCVAL(cli->outbuf,smb_com,SMBsendstrt);
@@ -41,11 +36,19 @@ BOOL cli_message_start(struct cli_state *cli, char *host, char *username,
        
        p = smb_buf(cli->outbuf);
        *p++ = 4;
-       p += clistr_push(cli, p, username, -1, STR_TERMINATE);
+       p += clistr_push(cli, p, username, -1, STR_ASCII|STR_TERMINATE);
        *p++ = 4;
-       p += clistr_push(cli, p, host, -1, STR_TERMINATE);
+       p += clistr_push(cli, p, host, -1, STR_ASCII|STR_TERMINATE);
        
        cli_setup_bcc(cli, p);
+
+       return(PTR_DIFF(p, cli->outbuf));
+}
+
+BOOL cli_message_start(struct cli_state *cli, char *host, char *username,
+                             int *grp)
+{
+       cli_message_start_build(cli, host, username);
        
        cli_send_smb(cli);      
        
@@ -64,8 +67,10 @@ BOOL cli_message_start(struct cli_state *cli, char *host, char *username,
 /****************************************************************************
 send a message 
 ****************************************************************************/
-BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp)
+int cli_message_text_build(struct cli_state *cli, char *msg, int len, int grp)
 {
+       char *msgdos;
+       int lendos;
        char *p;
 
        memset(cli->outbuf,'\0',smb_size);
@@ -78,11 +83,28 @@ BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp)
        
        p = smb_buf(cli->outbuf);
        *p++ = 1;
-       SSVAL(p,0,len); p += 2;
-       memcpy(p,msg,len);
-       p += len;
+
+       if ((lendos = (int)convert_string_allocate(NULL,CH_UNIX, CH_DOS, msg,len, (void **)(void *)&msgdos, True)) < 0 || !msgdos) {
+               DEBUG(3,("Conversion failed, sending message in UNIX charset\n"));
+               SSVAL(p, 0, len); p += 2;
+               memcpy(p, msg, len);
+               p += len;
+       } else {
+               SSVAL(p, 0, lendos); p += 2;
+               memcpy(p, msgdos, lendos);
+               p += lendos;
+               SAFE_FREE(msgdos);
+       }
 
        cli_setup_bcc(cli, p);
+
+       return(PTR_DIFF(p, cli->outbuf));
+}
+
+BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp)
+{
+       cli_message_text_build(cli, msg, len, grp);
+
        cli_send_smb(cli);
 
        if (!cli_receive_smb(cli)) {
@@ -97,8 +119,10 @@ BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp)
 /****************************************************************************
 end a message 
 ****************************************************************************/
-BOOL cli_message_end(struct cli_state *cli, int grp)
+int cli_message_end_build(struct cli_state *cli, int grp)
 {
+       char *p;
+
        memset(cli->outbuf,'\0',smb_size);
        set_message(cli->outbuf,1,0,True);
        SCVAL(cli->outbuf,smb_com,SMBsendend);
@@ -107,7 +131,16 @@ BOOL cli_message_end(struct cli_state *cli, int grp)
        SSVAL(cli->outbuf,smb_vwv0,grp);
 
        cli_setup_packet(cli);
-       
+
+       p = smb_buf(cli->outbuf);
+
+       return(PTR_DIFF(p, cli->outbuf));
+}
+
+BOOL cli_message_end(struct cli_state *cli, int grp)
+{
+       cli_message_end_build(cli, grp);
+
        cli_send_smb(cli);
 
        if (!cli_receive_smb(cli)) {
@@ -118,4 +151,3 @@ BOOL cli_message_end(struct cli_state *cli, int grp)
 
        return True;
 }      
-