Deleted Added
sdiff udiff text old ( 136700 ) new ( 150312 )
full compact
mbuf.c (136700) mbuf.c (150312)
1/*
2 * Copyright (c) 2000, 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

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

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 * $Id: mbuf.c,v 1.6 2001/02/24 15:56:04 bp Exp $
33 */
34
35#include <sys/cdefs.h>
1/*
2 * Copyright (c) 2000, 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

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

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 * $Id: mbuf.c,v 1.6 2001/02/24 15:56:04 bp Exp $
33 */
34
35#include <sys/cdefs.h>
36__FBSDID("$FreeBSD: head/contrib/smbfs/lib/smb/mbuf.c 136700 2004-10-19 17:44:31Z obrien $");
36__FBSDID("$FreeBSD: head/contrib/smbfs/lib/smb/mbuf.c 150312 2005-09-19 08:07:18Z imura $");
37
38#include <sys/types.h>
37
38#include <sys/types.h>
39#include <sys/mchain.h>
39#include <sys/endian.h>
40#include <arpa/inet.h>
41#include <ctype.h>
42#include <errno.h>
43#include <stdio.h>
44#include <stdlib.h>
45#include <string.h>
46
47#include <netsmb/smb_lib.h>

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

263 setdle(p, 0, x);
264 return 0;
265}
266
267int
268mb_put_int64be(struct mbdata *mbp, int64_t x)
269{
270 MB_PUT(int64_t);
40#include <arpa/inet.h>
41#include <ctype.h>
42#include <errno.h>
43#include <stdio.h>
44#include <stdlib.h>
45#include <string.h>
46
47#include <netsmb/smb_lib.h>

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

263 setdle(p, 0, x);
264 return 0;
265}
266
267int
268mb_put_int64be(struct mbdata *mbp, int64_t x)
269{
270 MB_PUT(int64_t);
271 *p = htobeq(x);
271 *p = htobe64(x);
272 return 0;
273}
274
275int
276mb_put_int64le(struct mbdata *mbp, int64_t x)
277{
278 MB_PUT(int64_t);
272 return 0;
273}
274
275int
276mb_put_int64le(struct mbdata *mbp, int64_t x)
277{
278 MB_PUT(int64_t);
279 *p = htoleq(x);
279 *p = htole64(x);
280 return 0;
281}
282
283int
284mb_put_mem(struct mbdata *mbp, const char *source, size_t size)
285{
286 struct mbuf *m;
287 char * dst;

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

362}
363
364int
365mb_get_uint16le(struct mbdata *mbp, u_int16_t *x)
366{
367 u_int16_t v;
368 int error = mb_get_uint16(mbp, &v);
369
280 return 0;
281}
282
283int
284mb_put_mem(struct mbdata *mbp, const char *source, size_t size)
285{
286 struct mbuf *m;
287 char * dst;

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

362}
363
364int
365mb_get_uint16le(struct mbdata *mbp, u_int16_t *x)
366{
367 u_int16_t v;
368 int error = mb_get_uint16(mbp, &v);
369
370 *x = letohs(v);
370 *x = le16toh(v);
371 return error;
372}
373
374int
375mb_get_uint16be(struct mbdata *mbp, u_int16_t *x) {
376 u_int16_t v;
377 int error = mb_get_uint16(mbp, &v);
378
371 return error;
372}
373
374int
375mb_get_uint16be(struct mbdata *mbp, u_int16_t *x) {
376 u_int16_t v;
377 int error = mb_get_uint16(mbp, &v);
378
379 *x = betohs(v);
379 *x = be16toh(v);
380 return error;
381}
382
383int
384mb_get_uint32(struct mbdata *mbp, u_int32_t *x)
385{
386 return mb_get_mem(mbp, (char *)x, 4);
387}
388
389int
390mb_get_uint32be(struct mbdata *mbp, u_int32_t *x)
391{
392 u_int32_t v;
393 int error;
394
395 error = mb_get_uint32(mbp, &v);
380 return error;
381}
382
383int
384mb_get_uint32(struct mbdata *mbp, u_int32_t *x)
385{
386 return mb_get_mem(mbp, (char *)x, 4);
387}
388
389int
390mb_get_uint32be(struct mbdata *mbp, u_int32_t *x)
391{
392 u_int32_t v;
393 int error;
394
395 error = mb_get_uint32(mbp, &v);
396 *x = betohl(v);
396 *x = be32toh(v);
397 return error;
398}
399
400int
401mb_get_uint32le(struct mbdata *mbp, u_int32_t *x)
402{
403 u_int32_t v;
404 int error;
405
406 error = mb_get_uint32(mbp, &v);
397 return error;
398}
399
400int
401mb_get_uint32le(struct mbdata *mbp, u_int32_t *x)
402{
403 u_int32_t v;
404 int error;
405
406 error = mb_get_uint32(mbp, &v);
407 *x = letohl(v);
407 *x = le32toh(v);
408 return error;
409}
410
411int
412mb_get_int64(struct mbdata *mbp, int64_t *x)
413{
414 return mb_get_mem(mbp, (char *)x, 8);
415}
416
417int
418mb_get_int64be(struct mbdata *mbp, int64_t *x)
419{
420 int64_t v;
421 int error;
422
423 error = mb_get_int64(mbp, &v);
408 return error;
409}
410
411int
412mb_get_int64(struct mbdata *mbp, int64_t *x)
413{
414 return mb_get_mem(mbp, (char *)x, 8);
415}
416
417int
418mb_get_int64be(struct mbdata *mbp, int64_t *x)
419{
420 int64_t v;
421 int error;
422
423 error = mb_get_int64(mbp, &v);
424 *x = betohq(v);
424 *x = be64toh(v);
425 return error;
426}
427
428int
429mb_get_int64le(struct mbdata *mbp, int64_t *x)
430{
431 int64_t v;
432 int error;
433
434 error = mb_get_int64(mbp, &v);
425 return error;
426}
427
428int
429mb_get_int64le(struct mbdata *mbp, int64_t *x)
430{
431 int64_t v;
432 int error;
433
434 error = mb_get_int64(mbp, &v);
435 *x = letohq(v);
435 *x = le64toh(v);
436 return error;
437}
438
439int
440mb_get_mem(struct mbdata *mbp, char * target, size_t size)
441{
442 struct mbuf *m = mbp->mb_cur;
443 u_int count;

--- 28 unchanged lines hidden --- 		436 return error;
437}
438
439int
440mb_get_mem(struct mbdata *mbp, char * target, size_t size)
441{
442 struct mbuf *m = mbp->mb_cur;
443 u_int count;

--- 28 unchanged lines hidden ---