Author: vlendec Date: 2007-08-14 21:07:44 +0000 (Tue, 14 Aug 2007) New Revision: 24440
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24440 Log: Convert the reply_sendXX functions to the new API Modified: branches/SAMBA_3_2/source/smbd/message.c branches/SAMBA_3_2/source/smbd/process.c Changeset: Modified: branches/SAMBA_3_2/source/smbd/message.c =================================================================== --- branches/SAMBA_3_2/source/smbd/message.c 2007-08-14 20:55:24 UTC (rev 24439) +++ branches/SAMBA_3_2/source/smbd/message.c 2007-08-14 21:07:44 UTC (rev 24440) @@ -114,11 +114,10 @@ conn POINTER CAN BE NULL HERE ! ****************************************************************************/ -int reply_sends(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, int dum_buffsize) +void reply_sends(connection_struct *conn, struct smb_request *req) { int len; char *msg; - int outsize = 0; char *p; START_PROFILE(SMBsends); @@ -126,16 +125,15 @@ msgpos = 0; if (! (*lp_msg_command())) { + reply_doserror(req, ERRSRV, ERRmsgoff); END_PROFILE(SMBsends); - return(ERROR_DOS(ERRSRV,ERRmsgoff)); + return; } - outsize = set_message(inbuf,outbuf,0,0,True); - - p = smb_buf(inbuf)+1; - p += srvstr_pull_buf(inbuf, SVAL(inbuf, smb_flg2), msgfrom, p, + p = smb_buf(req->inbuf)+1; + p += srvstr_pull_buf((char *)req->inbuf, req->flags2, msgfrom, p, sizeof(msgfrom), STR_ASCII|STR_TERMINATE) + 1; - p += srvstr_pull_buf(inbuf, SVAL(inbuf, smb_flg2), msgto, p, + p += srvstr_pull_buf((char *)req->inbuf, req->flags2, msgto, p, sizeof(msgto), STR_ASCII|STR_TERMINATE) + 1; msg = p; @@ -150,8 +148,10 @@ msg_deliver(); + reply_outbuf(req, 0, 0); + END_PROFILE(SMBsends); - return(outsize); + return; } /**************************************************************************** @@ -159,33 +159,33 @@ conn POINTER CAN BE NULL HERE ! ****************************************************************************/ -int reply_sendstrt(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, int dum_buffsize) +void reply_sendstrt(connection_struct *conn, struct smb_request *req) { - int outsize = 0; char *p; START_PROFILE(SMBsendstrt); if (! (*lp_msg_command())) { + reply_doserror(req, ERRSRV, ERRmsgoff); END_PROFILE(SMBsendstrt); - return(ERROR_DOS(ERRSRV,ERRmsgoff)); + return; } - outsize = set_message(inbuf,outbuf,1,0,True); - memset(msgbuf,'\0',sizeof(msgbuf)); msgpos = 0; - p = smb_buf(inbuf)+1; - p += srvstr_pull_buf(inbuf, SVAL(inbuf, smb_flg2), msgfrom, p, + p = smb_buf(req->inbuf)+1; + p += srvstr_pull_buf((char *)req->inbuf, req->flags2, msgfrom, p, sizeof(msgfrom), STR_ASCII|STR_TERMINATE) + 1; - p += srvstr_pull_buf(inbuf, SVAL(inbuf, smb_flg2), msgto, p, + p += srvstr_pull_buf((char *)req->inbuf, req->flags2, msgto, p, sizeof(msgto), STR_ASCII|STR_TERMINATE) + 1; DEBUG( 3, ( "SMBsendstrt (from %s to %s)\n", msgfrom, msgto ) ); + reply_outbuf(req, 0, 0); + END_PROFILE(SMBsendstrt); - return(outsize); + return; } /**************************************************************************** @@ -193,22 +193,20 @@ conn POINTER CAN BE NULL HERE ! ****************************************************************************/ -int reply_sendtxt(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, int dum_buffsize) +void reply_sendtxt(connection_struct *conn, struct smb_request *req) { int len; - int outsize = 0; char *msg; START_PROFILE(SMBsendtxt); if (! (*lp_msg_command())) { + reply_doserror(req, ERRSRV, ERRmsgoff); END_PROFILE(SMBsendtxt); - return(ERROR_DOS(ERRSRV,ERRmsgoff)); + return; } - outsize = set_message(inbuf,outbuf,0,0,True); + msg = smb_buf(req->inbuf) + 1; - msg = smb_buf(inbuf) + 1; - len = SVAL(msg,0); len = MIN(len,sizeof(msgbuf)-msgpos); @@ -217,8 +215,10 @@ DEBUG( 3, ( "SMBsendtxt\n" ) ); + reply_outbuf(req, 0, 0); + END_PROFILE(SMBsendtxt); - return(outsize); + return; } /**************************************************************************** @@ -226,22 +226,22 @@ conn POINTER CAN BE NULL HERE ! ****************************************************************************/ -int reply_sendend(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, int dum_buffsize) +void reply_sendend(connection_struct *conn, struct smb_request *req) { - int outsize = 0; START_PROFILE(SMBsendend); if (! (*lp_msg_command())) { + reply_doserror(req, ERRSRV, ERRmsgoff); END_PROFILE(SMBsendend); - return(ERROR_DOS(ERRSRV,ERRmsgoff)); + return; } - outsize = set_message(inbuf,outbuf,0,0,True); - DEBUG(3,("SMBsendend\n")); msg_deliver(); + reply_outbuf(req, 0, 0); + END_PROFILE(SMBsendend); - return(outsize); + return; } Modified: branches/SAMBA_3_2/source/smbd/process.c =================================================================== --- branches/SAMBA_3_2/source/smbd/process.c 2007-08-14 20:55:24 UTC (rev 24439) +++ branches/SAMBA_3_2/source/smbd/process.c 2007-08-14 21:07:44 UTC (rev 24440) @@ -898,14 +898,14 @@ /* 0xcd */ { NULL, NULL, NULL, 0 }, /* 0xce */ { NULL, NULL, NULL, 0 }, /* 0xcf */ { NULL, NULL, NULL, 0 }, -/* 0xd0 */ { "SMBsends",reply_sends,NULL,AS_GUEST}, +/* 0xd0 */ { "SMBsends",NULL,reply_sends,AS_GUEST}, /* 0xd1 */ { "SMBsendb",NULL, NULL,AS_GUEST}, /* 0xd2 */ { "SMBfwdname",NULL, NULL,AS_GUEST}, /* 0xd3 */ { "SMBcancelf",NULL, NULL,AS_GUEST}, /* 0xd4 */ { "SMBgetmac",NULL, NULL,AS_GUEST}, -/* 0xd5 */ { "SMBsendstrt",reply_sendstrt,NULL,AS_GUEST}, -/* 0xd6 */ { "SMBsendend",reply_sendend,NULL,AS_GUEST}, -/* 0xd7 */ { "SMBsendtxt",reply_sendtxt,NULL,AS_GUEST}, +/* 0xd5 */ { "SMBsendstrt",NULL,reply_sendstrt,AS_GUEST}, +/* 0xd6 */ { "SMBsendend",NULL,reply_sendend,AS_GUEST}, +/* 0xd7 */ { "SMBsendtxt",NULL,reply_sendtxt,AS_GUEST}, /* 0xd8 */ { NULL, NULL, NULL, 0 }, /* 0xd9 */ { NULL, NULL, NULL, 0 }, /* 0xda */ { NULL, NULL, NULL, 0 },
