Deleted Added
full compact
smb_iod.c (139823) smb_iod.c (161523)
1/*-
2 * Copyright (c) 2000-2001 Boris Popov
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2000-2001 Boris Popov
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/sys/netsmb/smb_iod.c 139823 2005-01-07 01:45:51Z imp $");
34__FBSDID("$FreeBSD: head/sys/netsmb/smb_iod.c 161523 2006-08-22 03:05:51Z marcel $");
35
36#include <sys/param.h>
37#include <sys/systm.h>
38#include <sys/endian.h>
39#include <sys/proc.h>
40#include <sys/kernel.h>
41#include <sys/kthread.h>
42#include <sys/malloc.h>

--- 196 unchanged lines hidden (view full) ---

239 default:
240 break;
241 }
242 if (rqp->sr_sendcnt == 0) {
243#ifdef movedtoanotherplace
244 if (vcp->vc_maxmux != 0 && iod->iod_muxcnt >= vcp->vc_maxmux)
245 return 0;
246#endif
35
36#include <sys/param.h>
37#include <sys/systm.h>
38#include <sys/endian.h>
39#include <sys/proc.h>
40#include <sys/kernel.h>
41#include <sys/kthread.h>
42#include <sys/malloc.h>

--- 196 unchanged lines hidden (view full) ---

239 default:
240 break;
241 }
242 if (rqp->sr_sendcnt == 0) {
243#ifdef movedtoanotherplace
244 if (vcp->vc_maxmux != 0 && iod->iod_muxcnt >= vcp->vc_maxmux)
245 return 0;
246#endif
247 *rqp->sr_rqtid = htole16(ssp ? ssp->ss_tid : SMB_TID_UNKNOWN);
248 *rqp->sr_rquid = htole16(vcp ? vcp->vc_smbuid : 0);
247 le16enc(rqp->sr_rqtid, ssp ? ssp->ss_tid : SMB_TID_UNKNOWN);
248 le16enc(rqp->sr_rquid, vcp ? vcp->vc_smbuid : 0);
249 mb_fixhdr(&rqp->sr_rq);
250 if (vcp->vc_hflags2 & SMB_FLAGS2_SECURITY_SIGNATURE)
251 smb_rq_sign(rqp);
252 }
253 if (rqp->sr_sendcnt++ > 5) {
254 rqp->sr_flags |= SMBR_RESTART;
255 smb_iod_rqprocessed(rqp, rqp->sr_lerror);
256 /*

--- 467 unchanged lines hidden ---
249 mb_fixhdr(&rqp->sr_rq);
250 if (vcp->vc_hflags2 & SMB_FLAGS2_SECURITY_SIGNATURE)
251 smb_rq_sign(rqp);
252 }
253 if (rqp->sr_sendcnt++ > 5) {
254 rqp->sr_flags |= SMBR_RESTART;
255 smb_iod_rqprocessed(rqp, rqp->sr_lerror);
256 /*

--- 467 unchanged lines hidden ---