diff options
| -rw-r--r-- | librpc/rpc/dcerpc_util.c | 53 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc.c | 30 | ||||
| -rwxr-xr-x[-rw-r--r--] | source4/librpc/wscript_build | 2 |
3 files changed, 54 insertions, 31 deletions
diff --git a/librpc/rpc/dcerpc_util.c b/librpc/rpc/dcerpc_util.c new file mode 100644 index 0000000000..c859bedf2d --- /dev/null +++ b/librpc/rpc/dcerpc_util.c @@ -0,0 +1,53 @@ +/* + Unix SMB/CIFS implementation. + raw dcerpc operations + + Copyright (C) Andrew Tridgell 2003-2005 + Copyright (C) Jelmer Vernooij 2004-2005 + + 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 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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, see <http://www.gnu.org/licenses/>. +*/ + +#include "includes.h" +#include "librpc/rpc/dcerpc.h" +#include "librpc/gen_ndr/ndr_dcerpc.h" + +/* we need to be able to get/set the fragment length without doing a full + decode */ +void dcerpc_set_frag_length(DATA_BLOB *blob, uint16_t v) +{ + if (CVAL(blob->data,DCERPC_DREP_OFFSET) & DCERPC_DREP_LE) { + SSVAL(blob->data, DCERPC_FRAG_LEN_OFFSET, v); + } else { + RSSVAL(blob->data, DCERPC_FRAG_LEN_OFFSET, v); + } +} + +uint16_t dcerpc_get_frag_length(const DATA_BLOB *blob) +{ + if (CVAL(blob->data,DCERPC_DREP_OFFSET) & DCERPC_DREP_LE) { + return SVAL(blob->data, DCERPC_FRAG_LEN_OFFSET); + } else { + return RSVAL(blob->data, DCERPC_FRAG_LEN_OFFSET); + } +} + +void dcerpc_set_auth_length(DATA_BLOB *blob, uint16_t v) +{ + if (CVAL(blob->data,DCERPC_DREP_OFFSET) & DCERPC_DREP_LE) { + SSVAL(blob->data, DCERPC_AUTH_LEN_OFFSET, v); + } else { + RSSVAL(blob->data, DCERPC_AUTH_LEN_OFFSET, v); + } +} diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index 7265105525..59aa9c6a8b 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -137,36 +137,6 @@ static uint32_t next_call_id(struct dcerpc_connection *c) return c->call_id; } -/* we need to be able to get/set the fragment length without doing a full - decode */ -void dcerpc_set_frag_length(DATA_BLOB *blob, uint16_t v) -{ - if (CVAL(blob->data,DCERPC_DREP_OFFSET) & DCERPC_DREP_LE) { - SSVAL(blob->data, DCERPC_FRAG_LEN_OFFSET, v); - } else { - RSSVAL(blob->data, DCERPC_FRAG_LEN_OFFSET, v); - } -} - -uint16_t dcerpc_get_frag_length(const DATA_BLOB *blob) -{ - if (CVAL(blob->data,DCERPC_DREP_OFFSET) & DCERPC_DREP_LE) { - return SVAL(blob->data, DCERPC_FRAG_LEN_OFFSET); - } else { - return RSVAL(blob->data, DCERPC_FRAG_LEN_OFFSET); - } -} - -void dcerpc_set_auth_length(DATA_BLOB *blob, uint16_t v) -{ - if (CVAL(blob->data,DCERPC_DREP_OFFSET) & DCERPC_DREP_LE) { - SSVAL(blob->data, DCERPC_AUTH_LEN_OFFSET, v); - } else { - RSSVAL(blob->data, DCERPC_AUTH_LEN_OFFSET, v); - } -} - - /** setup for a ndr pull, also setting up any flags from the binding string */ diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index 6de3064ac6..b21647ad16 100644..100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -614,7 +614,7 @@ bld.SAMBA_SUBSYSTEM('NDR_DCERPC', ) bld.SAMBA_LIBRARY('dcerpc', - source='rpc/dcerpc.c rpc/dcerpc_auth.c rpc/dcerpc_schannel.c rpc/dcerpc_util.c rpc/dcerpc_smb.c rpc/dcerpc_smb2.c rpc/dcerpc_sock.c rpc/dcerpc_connect.c rpc/dcerpc_secondary.c ../../librpc/rpc/binding.c ../../librpc/rpc/dcerpc_error.c', + source='rpc/dcerpc.c rpc/dcerpc_auth.c rpc/dcerpc_schannel.c rpc/dcerpc_util.c rpc/dcerpc_smb.c rpc/dcerpc_smb2.c rpc/dcerpc_sock.c rpc/dcerpc_connect.c rpc/dcerpc_secondary.c ../../librpc/rpc/binding.c ../../librpc/rpc/dcerpc_error.c ../../librpc/rpc/dcerpc_util.c', pc_files='dcerpc.pc', deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH LIBCLI_RAW LP_RESOLVE UTIL_TEVENT', autoproto='rpc/dcerpc_proto.h', |