Changeset 745 for trunk/server/source3/libsmb/clireadwrite.c
- Timestamp:
- Nov 27, 2012, 4:43:17 PM (13 years ago)
- Location:
- trunk/server
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
source3/libsmb/clireadwrite.c (modified) (22 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/server
- Property svn:mergeinfo changed
/vendor/current merged: 581,587,591,594,597,600,615,618,740
- Property svn:mergeinfo changed
-
trunk/server/source3/libsmb/clireadwrite.c
r668 r745 19 19 20 20 #include "includes.h" 21 #include "libsmb/libsmb.h" 22 #include "../lib/util/tevent_ntstatus.h" 23 #include "async_smb.h" 24 #include "trans2.h" 21 25 22 26 /**************************************************************************** … … 25 29 static size_t cli_read_max_bufsize(struct cli_state *cli) 26 30 { 31 size_t data_offset = smb_size - 4; 32 size_t wct = 12; 33 34 size_t useable_space; 35 27 36 if (!client_is_signing_on(cli) && !cli_encryption_on(cli) 28 && (cli-> posix_capabilities & CIFS_UNIX_LARGE_READ_CAP)) {37 && (cli->server_posix_capabilities & CIFS_UNIX_LARGE_READ_CAP)) { 29 38 return CLI_SAMBA_MAX_POSIX_LARGE_READX_SIZE; 30 39 } … … 34 43 : CLI_WINDOWS_MAX_LARGE_READX_SIZE; 35 44 } 36 return (cli->max_xmit - (smb_size+32)) & ~1023; 45 46 data_offset += wct * sizeof(uint16_t); 47 data_offset += 1; /* pad */ 48 49 useable_space = cli->max_xmit - data_offset; 50 51 return useable_space; 37 52 } 38 53 … … 40 55 Calculate the recommended write buffer size 41 56 ****************************************************************************/ 42 static size_t cli_write_max_bufsize(struct cli_state *cli, uint16_t write_mode) 57 static size_t cli_write_max_bufsize(struct cli_state *cli, 58 uint16_t write_mode, 59 uint8_t wct) 43 60 { 44 61 if (write_mode == 0 && 45 62 !client_is_signing_on(cli) && 46 63 !cli_encryption_on(cli) && 47 (cli-> posix_capabilities & CIFS_UNIX_LARGE_WRITE_CAP) &&64 (cli->server_posix_capabilities & CIFS_UNIX_LARGE_WRITE_CAP) && 48 65 (cli->capabilities & CAP_LARGE_FILES)) { 49 66 /* Only do massive writes if we can do them direct … … 59 76 || client_is_signing_on(cli) 60 77 || strequal(cli->dev, "LPT1:")) { 61 62 /* 63 * Printer devices are restricted to max_xmit writesize in 64 * Vista and XPSP3 as are signing connections. 65 */ 66 67 return (cli->max_xmit - (smb_size+32)) & ~1023; 78 size_t data_offset = smb_size - 4; 79 size_t useable_space; 80 81 data_offset += wct * sizeof(uint16_t); 82 data_offset += 1; /* pad */ 83 84 useable_space = cli->max_xmit - data_offset; 85 86 return useable_space; 68 87 } 69 88 … … 89 108 struct tevent_req *req, *subreq; 90 109 struct cli_read_andx_state *state; 91 bool bigoffset = False;92 110 uint8_t wct = 10; 93 111 … … 117 135 118 136 if ((uint64_t)offset >> 32) { 119 bigoffset = true;120 137 SIVAL(state->vwv + 10, 0, 121 138 (((uint64_t)offset)>>32) & 0xffffffff); … … 149 166 150 167 status = cli_smb_req_send(subreq); 151 if (!NT_STATUS_IS_OK(status)) { 152 tevent_req_nterror(req, status); 168 if (tevent_req_nterror(req, status)) { 153 169 return tevent_req_post(req, ev); 154 170 } … … 168 184 uint8_t *bytes; 169 185 170 state->status = cli_smb_recv(subreq, 12, &wct, &vwv, &num_bytes, 171 &bytes); 186 state->status = cli_smb_recv(subreq, state, &inbuf, 12, &wct, &vwv, 187 &num_bytes, &bytes); 188 TALLOC_FREE(subreq); 172 189 if (NT_STATUS_IS_ERR(state->status)) { 173 190 tevent_req_nterror(req, state->status); … … 197 214 } 198 215 199 inbuf = cli_smb_inbuf(subreq);200 216 state->buf = (uint8_t *)smb_base(inbuf) + SVAL(vwv+6, 0); 201 217 … … 283 299 284 300 status = cli_read_andx_recv(subreq, &received, &buf); 285 if (!NT_STATUS_IS_OK(status)) { 286 tevent_req_nterror(req, status); 301 if (tevent_req_nterror(req, status)) { 287 302 return; 288 303 } … … 411 426 char *result; 412 427 413 result = tevent_req_ print(mem_ctx, req);428 result = tevent_req_default_print(req, mem_ctx); 414 429 if (result == NULL) { 415 430 return NULL; … … 570 585 status = state->sink((char *)top_subreq->buf, 571 586 top_subreq->received, state->priv); 572 if (!NT_STATUS_IS_OK(status)) { 573 tevent_req_nterror(state->req, status); 587 if (tevent_req_nterror(state->req, status)) { 574 588 return; 575 589 } … … 697 711 698 712 /**************************************************************************** 699 Issue a single SMBwrite and don't wait for a reply.700 ****************************************************************************/701 702 static bool cli_issue_write(struct cli_state *cli,703 uint16_t fnum,704 off_t offset,705 uint16 mode,706 const char *buf,707 size_t size)708 {709 char *p;710 bool large_writex = false;711 /* We can only do direct writes if not signing and not encrypting. */712 bool direct_writes = !client_is_signing_on(cli) && !cli_encryption_on(cli);713 714 if (!direct_writes && size + 1 > cli->bufsize) {715 cli->outbuf = (char *)SMB_REALLOC(cli->outbuf, size + 1024);716 if (!cli->outbuf) {717 return False;718 }719 cli->inbuf = (char *)SMB_REALLOC(cli->inbuf, size + 1024);720 if (cli->inbuf == NULL) {721 SAFE_FREE(cli->outbuf);722 return False;723 }724 cli->bufsize = size + 1024;725 }726 727 memset(cli->outbuf,'\0',smb_size);728 memset(cli->inbuf,'\0',smb_size);729 730 if (cli->capabilities & CAP_LARGE_FILES) {731 large_writex = True;732 }733 734 if (large_writex) {735 cli_set_message(cli->outbuf,14,0,True);736 } else {737 cli_set_message(cli->outbuf,12,0,True);738 }739 740 SCVAL(cli->outbuf,smb_com,SMBwriteX);741 SSVAL(cli->outbuf,smb_tid,cli->cnum);742 cli_setup_packet(cli);743 744 SCVAL(cli->outbuf,smb_vwv0,0xFF);745 SSVAL(cli->outbuf,smb_vwv2,fnum);746 747 SIVAL(cli->outbuf,smb_vwv3,offset);748 SIVAL(cli->outbuf,smb_vwv5,0);749 SSVAL(cli->outbuf,smb_vwv7,mode);750 751 SSVAL(cli->outbuf,smb_vwv8,(mode & 0x0008) ? size : 0);752 /*753 * According to CIFS-TR-1p00, this following field should only754 * be set if CAP_LARGE_WRITEX is set. We should check this755 * locally. However, this check might already have been756 * done by our callers.757 */758 SSVAL(cli->outbuf,smb_vwv9,(size>>16));759 SSVAL(cli->outbuf,smb_vwv10,size);760 /* +1 is pad byte. */761 SSVAL(cli->outbuf,smb_vwv11,762 smb_buf(cli->outbuf) - smb_base(cli->outbuf) + 1);763 764 if (large_writex) {765 SIVAL(cli->outbuf,smb_vwv12,(((uint64_t)offset)>>32) & 0xffffffff);766 }767 768 p = smb_base(cli->outbuf) + SVAL(cli->outbuf,smb_vwv11) -1;769 *p++ = '\0'; /* pad byte. */770 if (!direct_writes) {771 memcpy(p, buf, size);772 }773 if (size > 0x1FFFF) {774 /* This is a POSIX 14 word large write. */775 set_message_bcc(cli->outbuf, 0); /* Set bcc to zero. */776 _smb_setlen_large(cli->outbuf,smb_size + 28 + 1 /* pad */ + size - 4);777 } else {778 cli_setup_bcc(cli, p+size);779 }780 781 show_msg(cli->outbuf);782 if (direct_writes) {783 /* For direct writes we now need to write the data784 * directly out of buf. */785 return cli_send_smb_direct_writeX(cli, buf, size);786 } else {787 return cli_send_smb(cli);788 }789 }790 791 /****************************************************************************792 write to a file793 write_mode: 0x0001 disallow write cacheing794 0x0002 return bytes remaining795 0x0004 use raw named pipe protocol796 0x0008 start of message mode named pipe protocol797 ****************************************************************************/798 799 ssize_t cli_write(struct cli_state *cli,800 uint16_t fnum, uint16 write_mode,801 const char *buf, off_t offset, size_t size)802 {803 ssize_t bwritten = 0;804 unsigned int issued = 0;805 unsigned int received = 0;806 int mpx = 1;807 size_t writesize;808 int blocks;809 810 if(cli->max_mux > 1) {811 mpx = cli->max_mux-1;812 } else {813 mpx = 1;814 }815 816 writesize = cli_write_max_bufsize(cli, write_mode);817 818 blocks = (size + (writesize-1)) / writesize;819 820 while (received < blocks) {821 822 while ((issued - received < mpx) && (issued < blocks)) {823 ssize_t bsent = issued * writesize;824 ssize_t size1 = MIN(writesize, size - bsent);825 826 if (!cli_issue_write(cli, fnum, offset + bsent,827 write_mode,828 buf + bsent,829 size1))830 return -1;831 issued++;832 }833 834 if (!cli_receive_smb(cli)) {835 return bwritten;836 }837 838 received++;839 840 if (cli_is_error(cli))841 break;842 843 bwritten += SVAL(cli->inbuf, smb_vwv2);844 if (writesize > 0xFFFF) {845 bwritten += (((int)(SVAL(cli->inbuf, smb_vwv4)))<<16);846 }847 }848 849 while (received < issued && cli_receive_smb(cli)) {850 received++;851 }852 853 return bwritten;854 }855 856 /****************************************************************************857 713 write to a file using a SMBwrite and not bypassing 0 byte writes 858 714 ****************************************************************************/ 859 715 860 ssize_t cli_smbwrite(struct cli_state *cli,861 uint16_t fnum, char *buf, off_t offset, size_t size1)862 { 863 char *p;716 NTSTATUS cli_smbwrite(struct cli_state *cli, uint16_t fnum, char *buf, 717 off_t offset, size_t size1, size_t *ptotal) 718 { 719 uint8_t *bytes; 864 720 ssize_t total = 0; 721 722 /* 723 * 3 bytes prefix 724 */ 725 726 bytes = TALLOC_ARRAY(talloc_tos(), uint8_t, 3); 727 if (bytes == NULL) { 728 return NT_STATUS_NO_MEMORY; 729 } 730 bytes[0] = 1; 865 731 866 732 do { 867 733 size_t size = MIN(size1, cli->max_xmit - 48); 868 869 memset(cli->outbuf,'\0',smb_size); 870 memset(cli->inbuf,'\0',smb_size); 871 872 cli_set_message(cli->outbuf,5, 0,True); 873 874 SCVAL(cli->outbuf,smb_com,SMBwrite); 875 SSVAL(cli->outbuf,smb_tid,cli->cnum); 876 cli_setup_packet(cli); 877 878 SSVAL(cli->outbuf,smb_vwv0,fnum); 879 SSVAL(cli->outbuf,smb_vwv1,size); 880 SIVAL(cli->outbuf,smb_vwv2,offset); 881 SSVAL(cli->outbuf,smb_vwv4,0); 882 883 p = smb_buf(cli->outbuf); 884 *p++ = 1; 885 SSVAL(p, 0, size); p += 2; 886 memcpy(p, buf + total, size); p += size; 887 888 cli_setup_bcc(cli, p); 889 890 if (!cli_send_smb(cli)) 891 return -1; 892 893 if (!cli_receive_smb(cli)) 894 return -1; 895 896 if (cli_is_error(cli)) 897 return -1; 898 899 size = SVAL(cli->inbuf,smb_vwv0); 900 if (size == 0) 734 struct tevent_req *req; 735 uint16_t vwv[5]; 736 uint16_t *ret_vwv; 737 NTSTATUS status; 738 739 SSVAL(vwv+0, 0, fnum); 740 SSVAL(vwv+1, 0, size); 741 SIVAL(vwv+2, 0, offset); 742 SSVAL(vwv+4, 0, 0); 743 744 bytes = TALLOC_REALLOC_ARRAY(talloc_tos(), bytes, uint8_t, 745 size+3); 746 if (bytes == NULL) { 747 return NT_STATUS_NO_MEMORY; 748 } 749 SSVAL(bytes, 1, size); 750 memcpy(bytes + 3, buf + total, size); 751 752 status = cli_smb(talloc_tos(), cli, SMBwrite, 0, 5, vwv, 753 size+3, bytes, &req, 1, NULL, &ret_vwv, 754 NULL, NULL); 755 if (!NT_STATUS_IS_OK(status)) { 756 TALLOC_FREE(bytes); 757 return status; 758 } 759 760 size = SVAL(ret_vwv+0, 0); 761 TALLOC_FREE(req); 762 if (size == 0) { 901 763 break; 902 764 } 903 765 size1 -= size; 904 766 total += size; … … 907 769 } while (size1); 908 770 909 return total; 771 TALLOC_FREE(bytes); 772 773 if (ptotal != NULL) { 774 *ptotal = total; 775 } 776 return NT_STATUS_OK; 910 777 } 911 778 … … 937 804 bool bigoffset = ((cli->capabilities & CAP_LARGE_FILES) != 0); 938 805 uint8_t wct = bigoffset ? 14 : 12; 939 size_t max_write = cli_write_max_bufsize(cli, mode );806 size_t max_write = cli_write_max_bufsize(cli, mode, wct); 940 807 uint16_t *vwv; 941 808 … … 1003 870 1004 871 status = cli_smb_req_send(subreq); 1005 if (!NT_STATUS_IS_OK(status)) { 1006 tevent_req_nterror(req, status); 872 if (tevent_req_nterror(req, status)) { 1007 873 return tevent_req_post(req, ev); 1008 874 } … … 1018 884 uint8_t wct; 1019 885 uint16_t *vwv; 1020 NTSTATUS status; 1021 1022 status = cli_smb_recv(subreq, 6, &wct, &vwv, NULL, NULL); 886 uint8_t *inbuf; 887 NTSTATUS status; 888 889 status = cli_smb_recv(subreq, state, &inbuf, 6, &wct, &vwv, 890 NULL, NULL); 891 TALLOC_FREE(subreq); 1023 892 if (NT_STATUS_IS_ERR(status)) { 1024 TALLOC_FREE(subreq);1025 893 tevent_req_nterror(req, status); 1026 894 return; … … 1102 970 status = cli_write_andx_recv(subreq, &written); 1103 971 TALLOC_FREE(subreq); 1104 if (!NT_STATUS_IS_OK(status)) { 1105 tevent_req_nterror(req, status); 972 if (tevent_req_nterror(req, status)) { 1106 973 return; 1107 974 } … … 1131 998 } 1132 999 1133 static NTSTATUS cli_writeall_recv(struct tevent_req *req) 1134 { 1135 return tevent_req_simple_recv_ntstatus(req); 1000 static NTSTATUS cli_writeall_recv(struct tevent_req *req, 1001 size_t *pwritten) 1002 { 1003 struct cli_writeall_state *state = tevent_req_data( 1004 req, struct cli_writeall_state); 1005 NTSTATUS status; 1006 1007 if (tevent_req_is_nterror(req, &status)) { 1008 return status; 1009 } 1010 if (pwritten != NULL) { 1011 *pwritten = state->written; 1012 } 1013 return NT_STATUS_OK; 1014 } 1015 1016 NTSTATUS cli_writeall(struct cli_state *cli, uint16_t fnum, uint16_t mode, 1017 const uint8_t *buf, off_t offset, size_t size, 1018 size_t *pwritten) 1019 { 1020 TALLOC_CTX *frame = talloc_stackframe(); 1021 struct event_context *ev; 1022 struct tevent_req *req; 1023 NTSTATUS status = NT_STATUS_NO_MEMORY; 1024 1025 if (cli_has_async_calls(cli)) { 1026 /* 1027 * Can't use sync call while an async call is in flight 1028 */ 1029 status = NT_STATUS_INVALID_PARAMETER; 1030 goto fail; 1031 } 1032 ev = event_context_init(frame); 1033 if (ev == NULL) { 1034 goto fail; 1035 } 1036 req = cli_writeall_send(frame, ev, cli, fnum, mode, buf, offset, size); 1037 if (req == NULL) { 1038 goto fail; 1039 } 1040 if (!tevent_req_poll(req, ev)) { 1041 status = map_nt_error_from_unix(errno); 1042 goto fail; 1043 } 1044 status = cli_writeall_recv(req, pwritten); 1045 fail: 1046 TALLOC_FREE(frame); 1047 if (!NT_STATUS_IS_OK(status)) { 1048 cli_set_error(cli, status); 1049 } 1050 return status; 1136 1051 } 1137 1052 … … 1245 1160 state->next_offset = start_offset; 1246 1161 1247 state->chunk_size = cli_write_max_bufsize(cli, mode );1162 state->chunk_size = cli_write_max_bufsize(cli, mode, 14); 1248 1163 1249 1164 if (window_size == 0) { … … 1298 1213 state->pending -= 1; 1299 1214 1300 status = cli_writeall_recv(subreq );1215 status = cli_writeall_recv(subreq, NULL); 1301 1216 TALLOC_FREE(subreq); 1302 1217 TALLOC_FREE(substate); 1303 if (!NT_STATUS_IS_OK(status)) { 1304 tevent_req_nterror(req, status); 1218 if (tevent_req_nterror(req, status)) { 1305 1219 return; 1306 1220 }
Note:
See TracChangeset
for help on using the changeset viewer.
