svn commit: samba r24000 - in branches/SAMBA_3_2/source: lib smbd
vlendec at samba.org
vlendec at samba.org
Mon Jul 23 10:52:40 GMT 2007
Author: vlendec
Date: 2007-07-23 10:52:39 +0000 (Mon, 23 Jul 2007)
New Revision: 24000
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24000
Log:
Add message_push_blob() and message_push_string().
The proposed new API convention is to start with a 0 bcc length and then
push things step by step. These routines reallocate the outbuf and
adjust the length and bcc fields as necessary.
Modified:
branches/SAMBA_3_2/source/lib/util.c
branches/SAMBA_3_2/source/smbd/srvstr.c
Changeset:
Modified: branches/SAMBA_3_2/source/lib/util.c
===================================================================
--- branches/SAMBA_3_2/source/lib/util.c 2007-07-23 09:54:36 UTC (rev 23999)
+++ branches/SAMBA_3_2/source/lib/util.c 2007-07-23 10:52:39 UTC (rev 24000)
@@ -587,6 +587,27 @@
}
/*******************************************************************
+ Add a data blob to the end of a smb_buf, adjusting bcc and smb_len.
+ Return the bytes added
+********************************************************************/
+
+ssize_t message_push_blob(uint8 **outbuf, DATA_BLOB blob)
+{
+ size_t newlen = smb_len(*outbuf) + 4 + blob.length;
+ uint8 *tmp;
+
+ if (!(tmp = TALLOC_REALLOC_ARRAY(NULL, *outbuf, uint8, newlen))) {
+ DEBUG(0, ("talloc failed\n"));
+ return -1;
+ }
+ *outbuf = tmp;
+
+ memcpy(tmp + smb_len(tmp) + 4, blob.data, blob.length);
+ set_message_bcc(NULL, (char *)tmp, smb_buflen(tmp) + blob.length);
+ return blob.length;
+}
+
+/*******************************************************************
Reduce a file name, removing .. elements.
********************************************************************/
Modified: branches/SAMBA_3_2/source/smbd/srvstr.c
===================================================================
--- branches/SAMBA_3_2/source/smbd/srvstr.c 2007-07-23 09:54:36 UTC (rev 23999)
+++ branches/SAMBA_3_2/source/smbd/srvstr.c 2007-07-23 10:52:39 UTC (rev 24000)
@@ -41,3 +41,43 @@
/* 'normal' push into size-specified buffer */
return push_string_fn(function, line, base_ptr, dest, src, dest_len, flags);
}
+
+/*******************************************************************
+ Add a string to the end of a smb_buf, adjusting bcc and smb_len.
+ Return the bytes added
+********************************************************************/
+
+ssize_t message_push_string(uint8 **outbuf, const char *str, int flags)
+{
+ size_t buf_size = smb_len(*outbuf) + 4;
+ size_t grow_size;
+ size_t result;
+ uint8 *tmp;
+
+ /*
+ * We need to over-allocate, now knowing what srvstr_push will
+ * actually use. This is very generous by incorporating potential
+ * padding, the terminating 0 and at most 4 chars per UTF-16 code
+ * point.
+ */
+ grow_size = (strlen(str) + 2) * 4;
+
+ if (!(tmp = TALLOC_REALLOC_ARRAY(NULL, *outbuf, uint8,
+ buf_size + grow_size))) {
+ DEBUG(0, ("talloc failed\n"));
+ return -1;
+ }
+
+ result = srvstr_push((char *)tmp, tmp + buf_size, str, grow_size,
+ flags);
+
+ if (result == (size_t)-1) {
+ DEBUG(0, ("srvstr_push failed\n"));
+ return -1;
+ }
+ set_message_bcc(NULL, (char *)tmp, smb_buflen(tmp) + result);
+
+ *outbuf = tmp;
+
+ return result;
+}
More information about the samba-cvs
mailing list