osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
wireshark/epan/tvbuff.c

3595 lines
90 KiB
C
Raw Normal View History

Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
/* tvbuff.c
*
* Testy, Virtual(-izable) Buffer of guint8*'s
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6116
2002-08-28 20:41:00 +00:00
*
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
* "Testy" -- the buffer gets mad when an attempt to access data
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
* beyond the bounds of the buffer. An exception is thrown.
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
*
* "Virtual" -- the buffer can have its own data, can use a subset of
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
* the data of a backing tvbuff, or can be a composite of
* other tvbuffs.
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
*
Set the svn:eol-style property on all text files to "native", so that they have LF at the end of the line on UN*X and CR/LF on Windows; hopefully this means that if a CR/LF version is checked in on Windows, the CRs will be stripped so that they show up only when checked out on Windows, not on UN*X. svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
* $Id$
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
*
Hopefully the last time I have to change my e-mail address. svn path=/trunk/; revision=4199
2001-11-13 23:55:44 +00:00
* Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
*
Use Ashok's IEEE-float-to-long code as the basis for IEEE-float-to-native-float code, and use that as the basis for IEEE-double-to-native-double code. Use that code on VAXes. Eliminate "ieee-float.h", as we no longer use it; instead, we use the tvbuff routines for extracting IEEE floating-point numbers. svn path=/trunk/; revision=5243
2002-04-24 21:19:38 +00:00
* Code to convert IEEE floating point formats to native floating point
* derived from code Copyright (c) Ashok Narayanan, 2000
*
name change svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
* Copyright 1998 Gerald Combs
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6116
2002-08-28 20:41:00 +00:00
*
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
* 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 2
* of the License, or (at your option) any later version.
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6116
2002-08-28 20:41:00 +00:00
*
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
* 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.
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6116
2002-08-28 20:41:00 +00:00
*
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
Fix build on Win32. svn path=/trunk/; revision=2411
2000-09-11 20:05:13 +00:00
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
#include <string.h>
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
#ifdef HAVE_LIBZ
#include <zlib.h>
#endif
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
#include "pint.h"
#include "tvbuff.h"
Make TVBs opaque for most users. Convert TVB_RAW_OFFSET() and TVB_GET_DS_TVB() into functions. svn path=/trunk/; revision=37422
2011-05-27 03:06:50 +00:00
#include "tvbuff-int.h"
Move format_text(), get_token_len(), and fine_line_end(), into strutil.c This keeps tvbuff.c generic; it doesn't have to pull in packet.h and all of it's included files. svn path=/trunk/; revision=2409
2000-09-11 16:16:13 +00:00
#include "strutil.h"
add ep_tvb_get_string that acts the same as tvb_get_string but the buffer returned need not be freed. svn path=/trunk/; revision=15024
2005-07-24 01:56:01 +00:00
#include "emem.h"
Add a tvb_get_ephemeral_string_enc() routine that's like tvb_get_ephemeral_string() but takes an ENC_ value for the character encoding. Use it in the MQ dissector to fetch strings to put, for example, into the Info column, so we properly handle EBCDIC strings there. svn path=/trunk/; revision=37876
2011-07-03 17:08:25 +00:00
#include "charsets.h"
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
#include "proto.h" /* XXX - only used for DISSECTOR_ASSERT, probably a new header file? */
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Constify a bunch of stuff. svn path=/trunk/; revision=10106
2004-02-19 05:19:10 +00:00
static const guint8*
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
ensure_contiguous_no_exception(tvbuff_t *tvb, const gint offset, const gint length,
Add new routines: tvb_get_string() - takes a tvbuff, an offset, and a length as arguments, allocates a buffer big enough to hold a string with the specified number of bytes plus an added null terminator (i.e., length+1), copies the specified number of bytes from the tvbuff, at the specified offset, to that buffer and puts in a null terminator, and returns a pointer to that buffer (or throws an exception before allocating the buffer if that many bytes aren't available in the tvbuff); tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to a "gint" as arguments, gets the size of the null-terminated string starting at the specified offset in the tvbuff (throwing an exception if the null terminator isn't found), allocates a buffer big enough to hold that string, copies the string to that buffer, and returns a pointer to that buffer and stores the length of the string (including the terminating null) in the variable pointed to by the "gint" pointer. Replace many pieces of code allocating a buffer and copying a string with calls to "tvb_get_string()" (for one thing, "tvb_get_string()" doesn't require you to remember that the argument to "tvb_get_nstringz0()" is the size of the buffer into which you're copying the string, which might be the length of the string to be copied *plus 1*). Don't use fixed-length buffers for null-terminated strings (even if the code that generates those packets has a #define to limit the length of the string). Use "tvb_get_stringz()", instead. In some cases where a value is fetched but is only used to pass an argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()" instead. svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
int *exception);
Constify a bunch of stuff. svn path=/trunk/; revision=10106
2004-02-19 05:19:10 +00:00
static const guint8*
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
ensure_contiguous(tvbuff_t *tvb, const gint offset, const gint length);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
From Mike Morrin: Overhaul of tvb_get_bitsxx() functions. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 svn path=/trunk/; revision=41226
2012-02-28 16:29:07 +00:00
From Mike Morrin: Fix for "The previous patch had an error and was returning too many bits." https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 From me: Correct the indentation to match the rest of the file. svn path=/trunk/; revision=41230
2012-02-28 20:32:42 +00:00
static guint64
Make bit_offset in _tvb_get_bits64 and related functions unsigned. This removes a potential buffer overflow and should fix a bunch of Coverity errors mentioned in bug 6878. We might want to do the same for no_of_bits. svn path=/trunk/; revision=41945
2012-04-04 21:54:22 +00:00
_tvb_get_bits64(tvbuff_t *tvb, guint bit_offset, const gint total_no_of_bits);
From Mike Morrin: Overhaul of tvb_get_bitsxx() functions. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 svn path=/trunk/; revision=41226
2012-02-28 16:29:07 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
static void
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_init(tvbuff_t *tvb, const tvbuff_type type)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
tvb_backing_t *backing;
tvb_comp_t *composite;
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tvb->previous = NULL;
tvb->next = NULL;
A simplified version of tvbuffs: - Essentially no changes from current dissector de facto tvbuff usage; - Do away with 'usage_counts' and with 'used_in' GSLists; - Manage tvb chains via a simple doubly linked list. - API changes: a. tvb_increment_usage_count() and tvb_decrement_usage_count() no longer exist; b. tvb_free_chain() can only be called for the 'top-level' (initial) tvb of a chain) or for a tvb not in a chain. c. tvb_free() now just calls tvb_free_chain() [should have no impact on existing dissectors]. svn path=/trunk/; revision=40264
2011-12-21 17:39:02 +00:00
tvb->type = type;
tvb->initialized = FALSE;
tvb->length = 0;
tvb->reported_length = 0;
tvb->free_cb = NULL;
tvb->real_data = NULL;
tvb->raw_offset = -1;
tvb->ds_tvb = NULL;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
switch(type) {
case TVBUFF_REAL_DATA:
/* Nothing */
break;
case TVBUFF_SUBSET:
A simplified version of tvbuffs: - Essentially no changes from current dissector de facto tvbuff usage; - Do away with 'usage_counts' and with 'used_in' GSLists; - Manage tvb chains via a simple doubly linked list. - API changes: a. tvb_increment_usage_count() and tvb_decrement_usage_count() no longer exist; b. tvb_free_chain() can only be called for the 'top-level' (initial) tvb of a chain) or for a tvb not in a chain. c. tvb_free() now just calls tvb_free_chain() [should have no impact on existing dissectors]. svn path=/trunk/; revision=40264
2011-12-21 17:39:02 +00:00
backing = &tvb->tvbuffs.subset;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
backing->tvb = NULL;
backing->offset = 0;
backing->length = 0;
break;
case TVBUFF_COMPOSITE:
A simplified version of tvbuffs: - Essentially no changes from current dissector de facto tvbuff usage; - Do away with 'usage_counts' and with 'used_in' GSLists; - Manage tvb chains via a simple doubly linked list. - API changes: a. tvb_increment_usage_count() and tvb_decrement_usage_count() no longer exist; b. tvb_free_chain() can only be called for the 'top-level' (initial) tvb of a chain) or for a tvb not in a chain. c. tvb_free() now just calls tvb_free_chain() [should have no impact on existing dissectors]. svn path=/trunk/; revision=40264
2011-12-21 17:39:02 +00:00
composite = &tvb->tvbuffs.composite;
composite->tvbs = NULL;
composite->start_offsets = NULL;
composite->end_offsets = NULL;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
break;
Add a missing DISSECTOR_ASSERT in tvb_init() svn path=/trunk/; revision=29433
2009-08-15 12:41:24 +00:00
default:
DISSECTOR_ASSERT_NOT_REACHED();
break;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
}
}
tvbuff_t*
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_new(const tvbuff_type type)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tvbuff_t *tvb;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Use the slice allocator if GLIB >= 2,10,0 as suggested by Anders Broman svn path=/trunk/; revision=29434
2009-08-15 13:24:59 +00:00
tvb = g_slice_new(tvbuff_t);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
tvb_init(tvb, type);
return tvb;
}
Add a new function, tvb_new_subset_remaining(), which is a sligtly optimized version of tvb_new_subset(). The latter can be mapped to the former by tvb_new_subset(tvb, offset, -1 /* backing_length */, -1 /* reported_length */). We can disable some bounds checking because 'backing_length' and 'reported_length' are hardcoded to -1. The current implementation of tvb_new_subset_remaining() only has the THROW_ON(reported_length < 1) check removed when compared to tvb_new_subset(). So there's room for improvement in this function. We should be able to disable some more (redundant) bounds checking. svn path=/trunk/; revision=29445
2009-08-16 10:53:47 +00:00
static tvbuff_t*
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_new_with_subset(const guint subset_tvb_offset, const guint subset_tvb_length)
Add a new function, tvb_new_subset_remaining(), which is a sligtly optimized version of tvb_new_subset(). The latter can be mapped to the former by tvb_new_subset(tvb, offset, -1 /* backing_length */, -1 /* reported_length */). We can disable some bounds checking because 'backing_length' and 'reported_length' are hardcoded to -1. The current implementation of tvb_new_subset_remaining() only has the THROW_ON(reported_length < 1) check removed when compared to tvb_new_subset(). So there's room for improvement in this function. We should be able to disable some more (redundant) bounds checking. svn path=/trunk/; revision=29445
2009-08-16 10:53:47 +00:00
{
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
tvbuff_t *tvb = tvb_new(TVBUFF_SUBSET);
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
Add a new function, tvb_new_subset_remaining(), which is a sligtly optimized version of tvb_new_subset(). The latter can be mapped to the former by tvb_new_subset(tvb, offset, -1 /* backing_length */, -1 /* reported_length */). We can disable some bounds checking because 'backing_length' and 'reported_length' are hardcoded to -1. The current implementation of tvb_new_subset_remaining() only has the THROW_ON(reported_length < 1) check removed when compared to tvb_new_subset(). So there's room for improvement in this function. We should be able to disable some more (redundant) bounds checking. svn path=/trunk/; revision=29445
2009-08-16 10:53:47 +00:00
tvb->tvbuffs.subset.offset = subset_tvb_offset;
tvb->tvbuffs.subset.length = subset_tvb_length;
return tvb;
}
A simplified version of tvbuffs: - Essentially no changes from current dissector de facto tvbuff usage; - Do away with 'usage_counts' and with 'used_in' GSLists; - Manage tvb chains via a simple doubly linked list. - API changes: a. tvb_increment_usage_count() and tvb_decrement_usage_count() no longer exist; b. tvb_free_chain() can only be called for the 'top-level' (initial) tvb of a chain) or for a tvb not in a chain. c. tvb_free() now just calls tvb_free_chain() [should have no impact on existing dissectors]. svn path=/trunk/; revision=40264
2011-12-21 17:39:02 +00:00
static void
tvb_free_internal(tvbuff_t* tvb)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
tvb_comp_t *composite;
A simplified version of tvbuffs: - Essentially no changes from current dissector de facto tvbuff usage; - Do away with 'usage_counts' and with 'used_in' GSLists; - Manage tvb chains via a simple doubly linked list. - API changes: a. tvb_increment_usage_count() and tvb_decrement_usage_count() no longer exist; b. tvb_free_chain() can only be called for the 'top-level' (initial) tvb of a chain) or for a tvb not in a chain. c. tvb_free() now just calls tvb_free_chain() [should have no impact on existing dissectors]. svn path=/trunk/; revision=40264
2011-12-21 17:39:02 +00:00
DISSECTOR_ASSERT(tvb);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
A simplified version of tvbuffs: - Essentially no changes from current dissector de facto tvbuff usage; - Do away with 'usage_counts' and with 'used_in' GSLists; - Manage tvb chains via a simple doubly linked list. - API changes: a. tvb_increment_usage_count() and tvb_decrement_usage_count() no longer exist; b. tvb_free_chain() can only be called for the 'top-level' (initial) tvb of a chain) or for a tvb not in a chain. c. tvb_free() now just calls tvb_free_chain() [should have no impact on existing dissectors]. svn path=/trunk/; revision=40264
2011-12-21 17:39:02 +00:00
switch (tvb->type) {
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
case TVBUFF_REAL_DATA:
if (tvb->free_cb) {
/*
* XXX - do this with a union?
*/
tvb->free_cb((gpointer)tvb->real_data);
}
break;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
case TVBUFF_SUBSET:
/* Nothing */
break;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
case TVBUFF_COMPOSITE:
composite = &tvb->tvbuffs.composite;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
g_slist_free(composite->tvbs);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
g_free(composite->start_offsets);
g_free(composite->end_offsets);
if (tvb->real_data) {
/*
* XXX - do this with a union?
*/
g_free((gpointer)tvb->real_data);
}
break;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
default:
DISSECTOR_ASSERT_NOT_REACHED();
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
}
A simplified version of tvbuffs: - Essentially no changes from current dissector de facto tvbuff usage; - Do away with 'usage_counts' and with 'used_in' GSLists; - Manage tvb chains via a simple doubly linked list. - API changes: a. tvb_increment_usage_count() and tvb_decrement_usage_count() no longer exist; b. tvb_free_chain() can only be called for the 'top-level' (initial) tvb of a chain) or for a tvb not in a chain. c. tvb_free() now just calls tvb_free_chain() [should have no impact on existing dissectors]. svn path=/trunk/; revision=40264
2011-12-21 17:39:02 +00:00
g_slice_free(tvbuff_t, tvb);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
}
A simplified version of tvbuffs: - Essentially no changes from current dissector de facto tvbuff usage; - Do away with 'usage_counts' and with 'used_in' GSLists; - Manage tvb chains via a simple doubly linked list. - API changes: a. tvb_increment_usage_count() and tvb_decrement_usage_count() no longer exist; b. tvb_free_chain() can only be called for the 'top-level' (initial) tvb of a chain) or for a tvb not in a chain. c. tvb_free() now just calls tvb_free_chain() [should have no impact on existing dissectors]. svn path=/trunk/; revision=40264
2011-12-21 17:39:02 +00:00
/* XXX: just call tvb_free_chain();
* Not removed so that existing dissectors using tvb_free() need not be changed.
* I'd argue that existing calls to tvb_free() should have actually beeen
* calls to tvb_free_chain() although the calls were OK as long as no
* subsets, etc had been created on the tvb. */
void
tvb_free(tvbuff_t *tvb)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
A simplified version of tvbuffs: - Essentially no changes from current dissector de facto tvbuff usage; - Do away with 'usage_counts' and with 'used_in' GSLists; - Manage tvb chains via a simple doubly linked list. - API changes: a. tvb_increment_usage_count() and tvb_decrement_usage_count() no longer exist; b. tvb_free_chain() can only be called for the 'top-level' (initial) tvb of a chain) or for a tvb not in a chain. c. tvb_free() now just calls tvb_free_chain() [should have no impact on existing dissectors]. svn path=/trunk/; revision=40264
2011-12-21 17:39:02 +00:00
tvb_free_chain(tvb);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
}
void
tvb_free_chain(tvbuff_t* tvb)
{
A simplified version of tvbuffs: - Essentially no changes from current dissector de facto tvbuff usage; - Do away with 'usage_counts' and with 'used_in' GSLists; - Manage tvb chains via a simple doubly linked list. - API changes: a. tvb_increment_usage_count() and tvb_decrement_usage_count() no longer exist; b. tvb_free_chain() can only be called for the 'top-level' (initial) tvb of a chain) or for a tvb not in a chain. c. tvb_free() now just calls tvb_free_chain() [should have no impact on existing dissectors]. svn path=/trunk/; revision=40264
2011-12-21 17:39:02 +00:00
tvbuff_t *next_tvb;
DISSECTOR_ASSERT(tvb);
From Evan Huus: Use Add DISSECTOR_ASSERT_HINT() macro. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7142 svn path=/trunk/; revision=42148
2012-04-20 05:12:20 +00:00
DISSECTOR_ASSERT_HINT(tvb->previous==NULL, "tvb_free_chain(): tvb must be initial tvb in chain");
A simplified version of tvbuffs: - Essentially no changes from current dissector de facto tvbuff usage; - Do away with 'usage_counts' and with 'used_in' GSLists; - Manage tvb chains via a simple doubly linked list. - API changes: a. tvb_increment_usage_count() and tvb_decrement_usage_count() no longer exist; b. tvb_free_chain() can only be called for the 'top-level' (initial) tvb of a chain) or for a tvb not in a chain. c. tvb_free() now just calls tvb_free_chain() [should have no impact on existing dissectors]. svn path=/trunk/; revision=40264
2011-12-21 17:39:02 +00:00
while (tvb) {
next_tvb=tvb->next;
From Evan Huus: Use Add DISSECTOR_ASSERT_HINT() macro. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7142 svn path=/trunk/; revision=42148
2012-04-20 05:12:20 +00:00
DISSECTOR_ASSERT_HINT((next_tvb==NULL) || (tvb==next_tvb->previous), "tvb_free_chain(): corrupt tvb chain ?");
A simplified version of tvbuffs: - Essentially no changes from current dissector de facto tvbuff usage; - Do away with 'usage_counts' and with 'used_in' GSLists; - Manage tvb chains via a simple doubly linked list. - API changes: a. tvb_increment_usage_count() and tvb_decrement_usage_count() no longer exist; b. tvb_free_chain() can only be called for the 'top-level' (initial) tvb of a chain) or for a tvb not in a chain. c. tvb_free() now just calls tvb_free_chain() [should have no impact on existing dissectors]. svn path=/trunk/; revision=40264
2011-12-21 17:39:02 +00:00
tvb_free_internal(tvb);
tvb = next_tvb;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
}
}
void
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_set_free_cb(tvbuff_t* tvb, const tvbuff_free_cb_t func)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
DISSECTOR_ASSERT(tvb);
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT(tvb->type == TVBUFF_REAL_DATA);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
tvb->free_cb = func;
}
Add tvb_set_child_real_data_tvbuff(), which allows you to tell the tvbuff routines that a particular TVBUFF_REAL_DATA tvbuff is a "child" of another tvbuff. This link is utilized during a tvb_free_chain(), so that the child is freed when no longer necessary. svn path=/trunk/; revision=2642
2000-11-14 04:33:34 +00:00
static void
A simplified version of tvbuffs: - Essentially no changes from current dissector de facto tvbuff usage; - Do away with 'usage_counts' and with 'used_in' GSLists; - Manage tvb chains via a simple doubly linked list. - API changes: a. tvb_increment_usage_count() and tvb_decrement_usage_count() no longer exist; b. tvb_free_chain() can only be called for the 'top-level' (initial) tvb of a chain) or for a tvb not in a chain. c. tvb_free() now just calls tvb_free_chain() [should have no impact on existing dissectors]. svn path=/trunk/; revision=40264
2011-12-21 17:39:02 +00:00
add_to_chain(tvbuff_t *parent, tvbuff_t *child)
Add tvb_set_child_real_data_tvbuff(), which allows you to tell the tvbuff routines that a particular TVBUFF_REAL_DATA tvbuff is a "child" of another tvbuff. This link is utilized during a tvb_free_chain(), so that the child is freed when no longer necessary. svn path=/trunk/; revision=2642
2000-11-14 04:33:34 +00:00
{
A simplified version of tvbuffs: - Essentially no changes from current dissector de facto tvbuff usage; - Do away with 'usage_counts' and with 'used_in' GSLists; - Manage tvb chains via a simple doubly linked list. - API changes: a. tvb_increment_usage_count() and tvb_decrement_usage_count() no longer exist; b. tvb_free_chain() can only be called for the 'top-level' (initial) tvb of a chain) or for a tvb not in a chain. c. tvb_free() now just calls tvb_free_chain() [should have no impact on existing dissectors]. svn path=/trunk/; revision=40264
2011-12-21 17:39:02 +00:00
DISSECTOR_ASSERT(parent && child);
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
DISSECTOR_ASSERT(!child->next && !child->previous);
A simplified version of tvbuffs: - Essentially no changes from current dissector de facto tvbuff usage; - Do away with 'usage_counts' and with 'used_in' GSLists; - Manage tvb chains via a simple doubly linked list. - API changes: a. tvb_increment_usage_count() and tvb_decrement_usage_count() no longer exist; b. tvb_free_chain() can only be called for the 'top-level' (initial) tvb of a chain) or for a tvb not in a chain. c. tvb_free() now just calls tvb_free_chain() [should have no impact on existing dissectors]. svn path=/trunk/; revision=40264
2011-12-21 17:39:02 +00:00
child->next = parent->next;
child->previous = parent;
if (parent->next)
parent->next->previous = child;
parent->next = child;
Add tvb_set_child_real_data_tvbuff(), which allows you to tell the tvbuff routines that a particular TVBUFF_REAL_DATA tvbuff is a "child" of another tvbuff. This link is utilized during a tvb_free_chain(), so that the child is freed when no longer necessary. svn path=/trunk/; revision=2642
2000-11-14 04:33:34 +00:00
}
void
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tvb_set_child_real_data_tvbuff(tvbuff_t *parent, tvbuff_t* child)
Add tvb_set_child_real_data_tvbuff(), which allows you to tell the tvbuff routines that a particular TVBUFF_REAL_DATA tvbuff is a "child" of another tvbuff. This link is utilized during a tvb_free_chain(), so that the child is freed when no longer necessary. svn path=/trunk/; revision=2642
2000-11-14 04:33:34 +00:00
{
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
DISSECTOR_ASSERT(parent && child);
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT(parent->initialized);
DISSECTOR_ASSERT(child->initialized);
DISSECTOR_ASSERT(child->type == TVBUFF_REAL_DATA);
A simplified version of tvbuffs: - Essentially no changes from current dissector de facto tvbuff usage; - Do away with 'usage_counts' and with 'used_in' GSLists; - Manage tvb chains via a simple doubly linked list. - API changes: a. tvb_increment_usage_count() and tvb_decrement_usage_count() no longer exist; b. tvb_free_chain() can only be called for the 'top-level' (initial) tvb of a chain) or for a tvb not in a chain. c. tvb_free() now just calls tvb_free_chain() [should have no impact on existing dissectors]. svn path=/trunk/; revision=40264
2011-12-21 17:39:02 +00:00
add_to_chain(parent, child);
Add tvb_set_child_real_data_tvbuff(), which allows you to tell the tvbuff routines that a particular TVBUFF_REAL_DATA tvbuff is a "child" of another tvbuff. This link is utilized during a tvb_free_chain(), so that the child is freed when no longer necessary. svn path=/trunk/; revision=2642
2000-11-14 04:33:34 +00:00
}
Remove a non thread-safe usage (useful when/if we ever support threading) of a static tvbuff in tvb_new_real_data(). The current version uses a static 'last_tvb' to keep track of the last allocated tvbuff. This is needed because some of the function we call can throw an exception. This patch improves this strategy by throwing an exception (if needed) before we try to allocate the tvbuff. This way we avoid a memleak _and_ we don't have to track the 'last_tvb' tvbuff. svn path=/trunk/; revision=29441
2009-08-16 07:29:11 +00:00
static void
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_set_real_data_no_exceptions(tvbuff_t* tvb, const guint8* data, const guint length, const gint reported_length)
Remove a non thread-safe usage (useful when/if we ever support threading) of a static tvbuff in tvb_new_real_data(). The current version uses a static 'last_tvb' to keep track of the last allocated tvbuff. This is needed because some of the function we call can throw an exception. This patch improves this strategy by throwing an exception (if needed) before we try to allocate the tvbuff. This way we avoid a memleak _and_ we don't have to track the 'last_tvb' tvbuff. svn path=/trunk/; revision=29441
2009-08-16 07:29:11 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tvb->real_data = data;
tvb->length = length;
Remove a non thread-safe usage (useful when/if we ever support threading) of a static tvbuff in tvb_new_real_data(). The current version uses a static 'last_tvb' to keep track of the last allocated tvbuff. This is needed because some of the function we call can throw an exception. This patch improves this strategy by throwing an exception (if needed) before we try to allocate the tvbuff. This way we avoid a memleak _and_ we don't have to track the 'last_tvb' tvbuff. svn path=/trunk/; revision=29441
2009-08-16 07:29:11 +00:00
tvb->reported_length = reported_length;
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tvb->initialized = TRUE;
Remove a non thread-safe usage (useful when/if we ever support threading) of a static tvbuff in tvb_new_real_data(). The current version uses a static 'last_tvb' to keep track of the last allocated tvbuff. This is needed because some of the function we call can throw an exception. This patch improves this strategy by throwing an exception (if needed) before we try to allocate the tvbuff. This way we avoid a memleak _and_ we don't have to track the 'last_tvb' tvbuff. svn path=/trunk/; revision=29441
2009-08-16 07:29:11 +00:00
}
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
void
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_set_real_data(tvbuff_t* tvb, const guint8* data, const guint length, const gint reported_length)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
DISSECTOR_ASSERT(tvb);
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT(tvb->type == TVBUFF_REAL_DATA);
DISSECTOR_ASSERT(!tvb->initialized);
Throw ReportedBoundsError instead of asserting if reported_length < -1. svn path=/trunk/; revision=2427
2000-09-13 20:17:23 +00:00
Remove a non thread-safe usage (useful when/if we ever support threading) of a static tvbuff in tvb_new_real_data(). The current version uses a static 'last_tvb' to keep track of the last allocated tvbuff. This is needed because some of the function we call can throw an exception. This patch improves this strategy by throwing an exception (if needed) before we try to allocate the tvbuff. This way we avoid a memleak _and_ we don't have to track the 'last_tvb' tvbuff. svn path=/trunk/; revision=29441
2009-08-16 07:29:11 +00:00
THROW_ON(reported_length < -1, ReportedBoundsError);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Remove a non thread-safe usage (useful when/if we ever support threading) of a static tvbuff in tvb_new_real_data(). The current version uses a static 'last_tvb' to keep track of the last allocated tvbuff. This is needed because some of the function we call can throw an exception. This patch improves this strategy by throwing an exception (if needed) before we try to allocate the tvbuff. This way we avoid a memleak _and_ we don't have to track the 'last_tvb' tvbuff. svn path=/trunk/; revision=29441
2009-08-16 07:29:11 +00:00
tvb_set_real_data_no_exceptions(tvb, data, length, reported_length);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
}
tvbuff_t*
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_new_real_data(const guint8* data, const guint length, const gint reported_length)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tvbuff_t *tvb;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Remove a non thread-safe usage (useful when/if we ever support threading) of a static tvbuff in tvb_new_real_data(). The current version uses a static 'last_tvb' to keep track of the last allocated tvbuff. This is needed because some of the function we call can throw an exception. This patch improves this strategy by throwing an exception (if needed) before we try to allocate the tvbuff. This way we avoid a memleak _and_ we don't have to track the 'last_tvb' tvbuff. svn path=/trunk/; revision=29441
2009-08-16 07:29:11 +00:00
THROW_ON(reported_length < -1, ReportedBoundsError);
Throw ReportedBoundsError instead of asserting if reported_length < -1. svn path=/trunk/; revision=2427
2000-09-13 20:17:23 +00:00
Remove a non thread-safe usage (useful when/if we ever support threading) of a static tvbuff in tvb_new_real_data(). The current version uses a static 'last_tvb' to keep track of the last allocated tvbuff. This is needed because some of the function we call can throw an exception. This patch improves this strategy by throwing an exception (if needed) before we try to allocate the tvbuff. This way we avoid a memleak _and_ we don't have to track the 'last_tvb' tvbuff. svn path=/trunk/; revision=29441
2009-08-16 07:29:11 +00:00
tvb = tvb_new(TVBUFF_REAL_DATA);
Throw ReportedBoundsError instead of asserting if reported_length < -1. svn path=/trunk/; revision=2427
2000-09-13 20:17:23 +00:00
Remove a non thread-safe usage (useful when/if we ever support threading) of a static tvbuff in tvb_new_real_data(). The current version uses a static 'last_tvb' to keep track of the last allocated tvbuff. This is needed because some of the function we call can throw an exception. This patch improves this strategy by throwing an exception (if needed) before we try to allocate the tvbuff. This way we avoid a memleak _and_ we don't have to track the 'last_tvb' tvbuff. svn path=/trunk/; revision=29441
2009-08-16 07:29:11 +00:00
tvb_set_real_data_no_exceptions(tvb, data, length, reported_length);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Don't give tvbuffs names; instead, give data sources names, where a "data source" has a name and a top-level tvbuff, and frames can have a list of data sources associated with them. Use the tvbuff pointer to determine which data source is the data source for a given field; this means we don't have to worry about multiple data sources with the same name - the only thing the name does is label the notebook tab for the display of the data source, and label the hex dump of the data source in print/Tethereal output. Clean up a bunch of things discovered in the process of doing the above. svn path=/trunk/; revision=4749
2002-02-18 01:08:44 +00:00
/*
* This is the top-level real tvbuff for this data source,
* so its data source tvbuff is itself.
*/
tvb->ds_tvb = tvb;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
return tvb;
}
Add to new functions from the optimization patch: tvb_child_uncompress() tvb_new_child_real_data() svn path=/trunk/; revision=27924
2009-04-01 16:22:51 +00:00
tvbuff_t*
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_new_child_real_data(tvbuff_t *parent, const guint8* data, const guint length, const gint reported_length)
Add to new functions from the optimization patch: tvb_child_uncompress() tvb_new_child_real_data() svn path=/trunk/; revision=27924
2009-04-01 16:22:51 +00:00
{
tvbuff_t *tvb = tvb_new_real_data(data, length, reported_length);
if (tvb) {
tvb_set_child_real_data_tvbuff (parent, tvb);
}
offset_from_real_beginning() is only called with 0 as second argument, so remove the argument completely. It seems that the second argument only acts as an accumulator allowing offset_from_real_beginning() to call itself recursively. To be consistent offset_from_real_beginning() is renamed to tvb_offset_from_real_beginning(). svn path=/trunk/; revision=29844
2009-09-10 16:54:02 +00:00
Add to new functions from the optimization patch: tvb_child_uncompress() tvb_new_child_real_data() svn path=/trunk/; revision=27924
2009-04-01 16:22:51 +00:00
return tvb;
}
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
static const unsigned char left_aligned_bitmask[] = {
0xff,
0x80,
0xc0,
0xe0,
0xf0,
0xf8,
0xfc,
0xfe
};
tvbuff_t *
tvb_new_octet_aligned(tvbuff_t *tvb, guint32 bit_offset, gint32 no_of_bits)
{
tvbuff_t *sub_tvb = NULL;
guint32 byte_offset;
gint32 datalen, i;
guint8 left, right, remaining_bits, *buf;
const guint8 *data;
byte_offset = bit_offset >> 3;
left = bit_offset % 8; /* for left-shifting */
right = 8 - left; /* for right-shifting */
if (no_of_bits == -1) {
datalen = tvb_length_remaining(tvb, byte_offset);
remaining_bits = 0;
} else {
datalen = no_of_bits >> 3;
remaining_bits = no_of_bits % 8;
if (remaining_bits) {
datalen++;
}
}
/* already aligned -> shortcut */
if ((left == 0) && (remaining_bits == 0)) {
return tvb_new_subset(tvb, byte_offset, datalen, -1);
}
From Martin Kaiser: CID 525 is about tvb_new_octet_aligned(). datalen can be negative or 0 when ep_alloc0(datalen) is called. If this happens, it's because of a dissector not checking the bit_offset, I think a DISSECTOR_ASSERT() is ok for fixing this. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7068 svn path=/trunk/; revision=42032
2012-04-12 05:36:26 +00:00
DISSECTOR_ASSERT(datalen>0);
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
buf = ep_alloc0(datalen);
/* if at least one trailing byte is available, we must use the content
* of that byte for the last shift (i.e. tvb_get_ptr() must use datalen + 1
* if non extra byte is available, the last shifted byte requires
* special treatment
*/
if (tvb_length_remaining(tvb, byte_offset) > datalen) {
data = tvb_get_ptr(tvb, byte_offset, datalen + 1);
/* shift tvb data bit_offset bits to the left */
for (i = 0; i < datalen; i++)
buf[i] = (data[i] << left) | (data[i+1] >> right);
} else {
data = tvb_get_ptr(tvb, byte_offset, datalen);
/* shift tvb data bit_offset bits to the left */
for (i = 0; i < (datalen-1); i++)
buf[i] = (data[i] << left) | (data[i+1] >> right);
buf[datalen-1] = data[datalen-1] << left; /* set last octet */
}
buf[datalen-1] &= left_aligned_bitmask[remaining_bits];
sub_tvb = tvb_new_child_real_data(tvb, buf, datalen, datalen);
return sub_tvb;
}
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
/* Computes the absolute offset and length based on a possibly-negative offset
* and a length that is possible -1 (which means "to the end of the data").
* Returns TRUE/FALSE indicating whether the offset is in bounds or
* not. The integer ptrs are modified with the new offset and length.
Add "tvb_reported_length()" to get the "reported length" of a tvbuff (i.e., the amount of data that was in the packet, even if not all of it was captured), for use when dissecting packets containing data that fills the packet (we want the dissector to try to dissect all of it; if it runs past the end of the captured data, we want it to throw an exception so that we'll put a "Short Frame" note in the protocol tree). This means we always want a tvbuff to have a real reported length value, so we make it an unsigned integer, and don't bother checking it for -1, as it should never be -1. If the reported length passed in to "tvb_set_subset()" is -1, set the reported length to the reported length of the tvbuff of which the new tvbuff will be a subset minus the offset in that tvbuff of the subset, so that "-1" means "what's left of the packet after we chop off the header". This is necessary in order to ensure that all tvbuffs have a real reported length value. Have "dissect_packet()" set the reported length of the top-level tvbuff to the reported length of the frame, so that we start out with a tvbuff with a real reported length value. Have "tvb_offset_exists()" return FALSE if the offset is past the end of the tvbuff. If the offset passed to it is postitive, have "compute_offset_length()" check for that it's not more than one byte past the end of the tvbuff - if it's just past the end, we don't want the check to fail, as we don't want attempts to create a subset tvbuff containing zero bytes to fail; that would be done if a captured packet was all header and no payload, and we'd want the dissector of the payload, not the dissector of the header, to throw an exception, as the problem isn't with the protocol for the header, it's with the protocol for the payload. Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector, and the Q.931 dissector to use tvbuffs. Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's not converted yet). svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
* No exception is thrown.
*
* XXX - we return TRUE, not FALSE, if the offset is positive and right
* after the end of the tvbuff (i.e., equal to the length). We do this
* so that a dissector constructing a subset tvbuff for the next protocol
* will get a zero-length tvbuff, not an exception, if there's no data
* left for the next protocol - we want the next protocol to be the one
* that gets an exception, so the error is reported as an error in that
* protocol rather than the containing protocol. */
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
static gboolean
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
compute_offset_length(const guint tvb_length_val, const guint tvb_reported_length_val,
const gint offset, const gint length_val,
guint *offset_ptr, guint *length_ptr, int *exception)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT(offset_ptr);
DISSECTOR_ASSERT(length_ptr);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
/* Compute the offset */
if (offset >= 0) {
Add "tvb_reported_length()" to get the "reported length" of a tvbuff (i.e., the amount of data that was in the packet, even if not all of it was captured), for use when dissecting packets containing data that fills the packet (we want the dissector to try to dissect all of it; if it runs past the end of the captured data, we want it to throw an exception so that we'll put a "Short Frame" note in the protocol tree). This means we always want a tvbuff to have a real reported length value, so we make it an unsigned integer, and don't bother checking it for -1, as it should never be -1. If the reported length passed in to "tvb_set_subset()" is -1, set the reported length to the reported length of the tvbuff of which the new tvbuff will be a subset minus the offset in that tvbuff of the subset, so that "-1" means "what's left of the packet after we chop off the header". This is necessary in order to ensure that all tvbuffs have a real reported length value. Have "dissect_packet()" set the reported length of the top-level tvbuff to the reported length of the frame, so that we start out with a tvbuff with a real reported length value. Have "tvb_offset_exists()" return FALSE if the offset is past the end of the tvbuff. If the offset passed to it is postitive, have "compute_offset_length()" check for that it's not more than one byte past the end of the tvbuff - if it's just past the end, we don't want the check to fail, as we don't want attempts to create a subset tvbuff containing zero bytes to fail; that would be done if a captured packet was all header and no payload, and we'd want the dissector of the payload, not the dissector of the header, to throw an exception, as the problem isn't with the protocol for the header, it's with the protocol for the payload. Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector, and the Q.931 dissector to use tvbuffs. Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's not converted yet). svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
/* Positive offset - relative to the beginning of the packet. */
Fix various gcc -Wshadow warnings. svn path=/trunk/; revision=31720
2010-01-28 18:45:46 +00:00
if ((guint) offset > tvb_reported_length_val) {
Add "tvb_reported_length()" to get the "reported length" of a tvbuff (i.e., the amount of data that was in the packet, even if not all of it was captured), for use when dissecting packets containing data that fills the packet (we want the dissector to try to dissect all of it; if it runs past the end of the captured data, we want it to throw an exception so that we'll put a "Short Frame" note in the protocol tree). This means we always want a tvbuff to have a real reported length value, so we make it an unsigned integer, and don't bother checking it for -1, as it should never be -1. If the reported length passed in to "tvb_set_subset()" is -1, set the reported length to the reported length of the tvbuff of which the new tvbuff will be a subset minus the offset in that tvbuff of the subset, so that "-1" means "what's left of the packet after we chop off the header". This is necessary in order to ensure that all tvbuffs have a real reported length value. Have "dissect_packet()" set the reported length of the top-level tvbuff to the reported length of the frame, so that we start out with a tvbuff with a real reported length value. Have "tvb_offset_exists()" return FALSE if the offset is past the end of the tvbuff. If the offset passed to it is postitive, have "compute_offset_length()" check for that it's not more than one byte past the end of the tvbuff - if it's just past the end, we don't want the check to fail, as we don't want attempts to create a subset tvbuff containing zero bytes to fail; that would be done if a captured packet was all header and no payload, and we'd want the dissector of the payload, not the dissector of the header, to throw an exception, as the problem isn't with the protocol for the header, it's with the protocol for the payload. Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector, and the Q.931 dissector to use tvbuffs. Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's not converted yet). svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
if (exception) {
*exception = ReportedBoundsError;
}
return FALSE;
Have tvbuff's keep track of cap_len and pkt_len ('length' and 'reported_length' in tvbuff terminology). This is implemented for TVBUFF_REAL and TVBUFF_SUBSET so far; support for TVBUFF_COMPOSITE is coming soon. Throw either ReportedBoundsError or BoundsError. A ReportedBoundsError is reported as "Malformed Frame" since the protocol stated that a certain number of bytes should be available but they weren't. A BoundsError is reported as a "Short Frame" since the snaplen was too short. Register proto_short (BoundsError) and proto_malformed (ReportedBounds) so searches can be made on "short" and "malformed". svn path=/trunk/; revision=1965
2000-05-16 04:44:14 +00:00
}
Fix various gcc -Wshadow warnings. svn path=/trunk/; revision=31720
2010-01-28 18:45:46 +00:00
else if ((guint) offset > tvb_length_val) {
Add "tvb_reported_length()" to get the "reported length" of a tvbuff (i.e., the amount of data that was in the packet, even if not all of it was captured), for use when dissecting packets containing data that fills the packet (we want the dissector to try to dissect all of it; if it runs past the end of the captured data, we want it to throw an exception so that we'll put a "Short Frame" note in the protocol tree). This means we always want a tvbuff to have a real reported length value, so we make it an unsigned integer, and don't bother checking it for -1, as it should never be -1. If the reported length passed in to "tvb_set_subset()" is -1, set the reported length to the reported length of the tvbuff of which the new tvbuff will be a subset minus the offset in that tvbuff of the subset, so that "-1" means "what's left of the packet after we chop off the header". This is necessary in order to ensure that all tvbuffs have a real reported length value. Have "dissect_packet()" set the reported length of the top-level tvbuff to the reported length of the frame, so that we start out with a tvbuff with a real reported length value. Have "tvb_offset_exists()" return FALSE if the offset is past the end of the tvbuff. If the offset passed to it is postitive, have "compute_offset_length()" check for that it's not more than one byte past the end of the tvbuff - if it's just past the end, we don't want the check to fail, as we don't want attempts to create a subset tvbuff containing zero bytes to fail; that would be done if a captured packet was all header and no payload, and we'd want the dissector of the payload, not the dissector of the header, to throw an exception, as the problem isn't with the protocol for the header, it's with the protocol for the payload. Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector, and the Q.931 dissector to use tvbuffs. Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's not converted yet). svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
if (exception) {
*exception = BoundsError;
}
return FALSE;
}
else {
*offset_ptr = offset;
Have tvbuff's keep track of cap_len and pkt_len ('length' and 'reported_length' in tvbuff terminology). This is implemented for TVBUFF_REAL and TVBUFF_SUBSET so far; support for TVBUFF_COMPOSITE is coming soon. Throw either ReportedBoundsError or BoundsError. A ReportedBoundsError is reported as "Malformed Frame" since the protocol stated that a certain number of bytes should be available but they weren't. A BoundsError is reported as a "Short Frame" since the snaplen was too short. Register proto_short (BoundsError) and proto_malformed (ReportedBounds) so searches can be made on "short" and "malformed". svn path=/trunk/; revision=1965
2000-05-16 04:44:14 +00:00
}
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
}
else {
Add "tvb_reported_length()" to get the "reported length" of a tvbuff (i.e., the amount of data that was in the packet, even if not all of it was captured), for use when dissecting packets containing data that fills the packet (we want the dissector to try to dissect all of it; if it runs past the end of the captured data, we want it to throw an exception so that we'll put a "Short Frame" note in the protocol tree). This means we always want a tvbuff to have a real reported length value, so we make it an unsigned integer, and don't bother checking it for -1, as it should never be -1. If the reported length passed in to "tvb_set_subset()" is -1, set the reported length to the reported length of the tvbuff of which the new tvbuff will be a subset minus the offset in that tvbuff of the subset, so that "-1" means "what's left of the packet after we chop off the header". This is necessary in order to ensure that all tvbuffs have a real reported length value. Have "dissect_packet()" set the reported length of the top-level tvbuff to the reported length of the frame, so that we start out with a tvbuff with a real reported length value. Have "tvb_offset_exists()" return FALSE if the offset is past the end of the tvbuff. If the offset passed to it is postitive, have "compute_offset_length()" check for that it's not more than one byte past the end of the tvbuff - if it's just past the end, we don't want the check to fail, as we don't want attempts to create a subset tvbuff containing zero bytes to fail; that would be done if a captured packet was all header and no payload, and we'd want the dissector of the payload, not the dissector of the header, to throw an exception, as the problem isn't with the protocol for the header, it's with the protocol for the payload. Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector, and the Q.931 dissector to use tvbuffs. Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's not converted yet). svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
/* Negative offset - relative to the end of the packet. */
Fix various gcc -Wshadow warnings. svn path=/trunk/; revision=31720
2010-01-28 18:45:46 +00:00
if ((guint) -offset > tvb_reported_length_val) {
Add "tvb_reported_length()" to get the "reported length" of a tvbuff (i.e., the amount of data that was in the packet, even if not all of it was captured), for use when dissecting packets containing data that fills the packet (we want the dissector to try to dissect all of it; if it runs past the end of the captured data, we want it to throw an exception so that we'll put a "Short Frame" note in the protocol tree). This means we always want a tvbuff to have a real reported length value, so we make it an unsigned integer, and don't bother checking it for -1, as it should never be -1. If the reported length passed in to "tvb_set_subset()" is -1, set the reported length to the reported length of the tvbuff of which the new tvbuff will be a subset minus the offset in that tvbuff of the subset, so that "-1" means "what's left of the packet after we chop off the header". This is necessary in order to ensure that all tvbuffs have a real reported length value. Have "dissect_packet()" set the reported length of the top-level tvbuff to the reported length of the frame, so that we start out with a tvbuff with a real reported length value. Have "tvb_offset_exists()" return FALSE if the offset is past the end of the tvbuff. If the offset passed to it is postitive, have "compute_offset_length()" check for that it's not more than one byte past the end of the tvbuff - if it's just past the end, we don't want the check to fail, as we don't want attempts to create a subset tvbuff containing zero bytes to fail; that would be done if a captured packet was all header and no payload, and we'd want the dissector of the payload, not the dissector of the header, to throw an exception, as the problem isn't with the protocol for the header, it's with the protocol for the payload. Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector, and the Q.931 dissector to use tvbuffs. Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's not converted yet). svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
if (exception) {
*exception = ReportedBoundsError;
}
return FALSE;
}
Fix various gcc -Wshadow warnings. svn path=/trunk/; revision=31720
2010-01-28 18:45:46 +00:00
else if ((guint) -offset > tvb_length_val) {
Add "tvb_reported_length()" to get the "reported length" of a tvbuff (i.e., the amount of data that was in the packet, even if not all of it was captured), for use when dissecting packets containing data that fills the packet (we want the dissector to try to dissect all of it; if it runs past the end of the captured data, we want it to throw an exception so that we'll put a "Short Frame" note in the protocol tree). This means we always want a tvbuff to have a real reported length value, so we make it an unsigned integer, and don't bother checking it for -1, as it should never be -1. If the reported length passed in to "tvb_set_subset()" is -1, set the reported length to the reported length of the tvbuff of which the new tvbuff will be a subset minus the offset in that tvbuff of the subset, so that "-1" means "what's left of the packet after we chop off the header". This is necessary in order to ensure that all tvbuffs have a real reported length value. Have "dissect_packet()" set the reported length of the top-level tvbuff to the reported length of the frame, so that we start out with a tvbuff with a real reported length value. Have "tvb_offset_exists()" return FALSE if the offset is past the end of the tvbuff. If the offset passed to it is postitive, have "compute_offset_length()" check for that it's not more than one byte past the end of the tvbuff - if it's just past the end, we don't want the check to fail, as we don't want attempts to create a subset tvbuff containing zero bytes to fail; that would be done if a captured packet was all header and no payload, and we'd want the dissector of the payload, not the dissector of the header, to throw an exception, as the problem isn't with the protocol for the header, it's with the protocol for the payload. Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector, and the Q.931 dissector to use tvbuffs. Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's not converted yet). svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
if (exception) {
*exception = BoundsError;
}
return FALSE;
}
else {
Fix various gcc -Wshadow warnings. svn path=/trunk/; revision=31720
2010-01-28 18:45:46 +00:00
*offset_ptr = tvb_length_val + offset;
Add "tvb_reported_length()" to get the "reported length" of a tvbuff (i.e., the amount of data that was in the packet, even if not all of it was captured), for use when dissecting packets containing data that fills the packet (we want the dissector to try to dissect all of it; if it runs past the end of the captured data, we want it to throw an exception so that we'll put a "Short Frame" note in the protocol tree). This means we always want a tvbuff to have a real reported length value, so we make it an unsigned integer, and don't bother checking it for -1, as it should never be -1. If the reported length passed in to "tvb_set_subset()" is -1, set the reported length to the reported length of the tvbuff of which the new tvbuff will be a subset minus the offset in that tvbuff of the subset, so that "-1" means "what's left of the packet after we chop off the header". This is necessary in order to ensure that all tvbuffs have a real reported length value. Have "dissect_packet()" set the reported length of the top-level tvbuff to the reported length of the frame, so that we start out with a tvbuff with a real reported length value. Have "tvb_offset_exists()" return FALSE if the offset is past the end of the tvbuff. If the offset passed to it is postitive, have "compute_offset_length()" check for that it's not more than one byte past the end of the tvbuff - if it's just past the end, we don't want the check to fail, as we don't want attempts to create a subset tvbuff containing zero bytes to fail; that would be done if a captured packet was all header and no payload, and we'd want the dissector of the payload, not the dissector of the header, to throw an exception, as the problem isn't with the protocol for the header, it's with the protocol for the payload. Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector, and the Q.931 dissector to use tvbuffs. Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's not converted yet). svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
}
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
}
/* Compute the length */
Fix various gcc -Wshadow warnings. svn path=/trunk/; revision=31720
2010-01-28 18:45:46 +00:00
if (length_val < -1) {
"compute_offset_length()" must, if it returns FALSE, and "exception" is non-null, set "*exception" to the appropriate exception - its callers rely on it. Now that it does that, there's no need for "check_offset_length()" to check for a length of -1, as "compute_offset_length()" does so, and therefore "check_offset_length_no_exception()" does so. svn path=/trunk/; revision=8562
2003-09-28 21:39:53 +00:00
if (exception) {
/* XXX - ReportedBoundsError? */
*exception = BoundsError;
}
Throw a BoundsError if a length parameter in a tvbuff-accessor is < -1. svn path=/trunk/; revision=4474
2002-01-04 06:45:14 +00:00
return FALSE;
}
Fix various gcc -Wshadow warnings. svn path=/trunk/; revision=31720
2010-01-28 18:45:46 +00:00
else if (length_val == -1) {
*length_ptr = tvb_length_val - *offset_ptr;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
}
else {
Fix various gcc -Wshadow warnings. svn path=/trunk/; revision=31720
2010-01-28 18:45:46 +00:00
*length_ptr = length_val;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
}
return TRUE;
}
static gboolean
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
check_offset_length_no_exception(const guint tvb_length_val, const guint tvb_reported_length_val,
const gint offset, gint const length_val,
guint *offset_ptr, guint *length_ptr, int *exception)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
Add a "tvb_ensure_bytes_exist()", which is like "tvb_bytes_exist()" only it throws the appropriate exception if the bytes don't exist. Use it in the GIOP and ASN.1 code to check whether the bytes to be copied to a buffer exist before allocating the buffer. Make "check_offset_length_no_exception()" check for an overflow, so that it can be used in "tvb_ensure_bytes_exist()" and do all the checking that the code "tvb_ensure_bytes_exist()" replaces did. Make "get_CDR_wchar()" return a "gint", so that if the length octet it fetched has a value between 128 and 255, the length can be returned correctly. Fix some comments not to specify the exception thrown by various routines that can throw various exceptions. svn path=/trunk/; revision=5453
2002-05-13 01:24:47 +00:00
guint end_offset;
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
if (!compute_offset_length(tvb_length_val, tvb_reported_length_val,
offset, length_val, offset_ptr, length_ptr, exception)) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
return FALSE;
}
Add a "tvb_ensure_bytes_exist()", which is like "tvb_bytes_exist()" only it throws the appropriate exception if the bytes don't exist. Use it in the GIOP and ASN.1 code to check whether the bytes to be copied to a buffer exist before allocating the buffer. Make "check_offset_length_no_exception()" check for an overflow, so that it can be used in "tvb_ensure_bytes_exist()" and do all the checking that the code "tvb_ensure_bytes_exist()" replaces did. Make "get_CDR_wchar()" return a "gint", so that if the length octet it fetched has a value between 128 and 255, the length can be returned correctly. Fix some comments not to specify the exception thrown by various routines that can throw various exceptions. svn path=/trunk/; revision=5453
2002-05-13 01:24:47 +00:00
/*
* Compute the offset of the first byte past the length.
*/
end_offset = *offset_ptr + *length_ptr;
/*
* Check for an overflow, and clamp "end_offset" at the maximum
* if we got an overflow - that should force us to indicate that
* we're past the end of the tvbuff.
*/
if (end_offset < *offset_ptr)
end_offset = UINT_MAX;
/*
* Check whether that offset goes more than one byte past the
* end of the buffer.
*
* If not, return TRUE; otherwise, return FALSE and, if "exception"
* is non-null, return the appropriate exception through it.
*/
Fix various gcc -Wshadow warnings. svn path=/trunk/; revision=31720
2010-01-28 18:45:46 +00:00
if (end_offset <= tvb_length_val) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
return TRUE;
}
Fix various gcc -Wshadow warnings. svn path=/trunk/; revision=31720
2010-01-28 18:45:46 +00:00
else if (end_offset <= tvb_reported_length_val) {
Have tvbuff's keep track of cap_len and pkt_len ('length' and 'reported_length' in tvbuff terminology). This is implemented for TVBUFF_REAL and TVBUFF_SUBSET so far; support for TVBUFF_COMPOSITE is coming soon. Throw either ReportedBoundsError or BoundsError. A ReportedBoundsError is reported as "Malformed Frame" since the protocol stated that a certain number of bytes should be available but they weren't. A BoundsError is reported as a "Short Frame" since the snaplen was too short. Register proto_short (BoundsError) and proto_malformed (ReportedBounds) so searches can be made on "short" and "malformed". svn path=/trunk/; revision=1965
2000-05-16 04:44:14 +00:00
if (exception) {
*exception = BoundsError;
}
}
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
else {
Have tvbuff's keep track of cap_len and pkt_len ('length' and 'reported_length' in tvbuff terminology). This is implemented for TVBUFF_REAL and TVBUFF_SUBSET so far; support for TVBUFF_COMPOSITE is coming soon. Throw either ReportedBoundsError or BoundsError. A ReportedBoundsError is reported as "Malformed Frame" since the protocol stated that a certain number of bytes should be available but they weren't. A BoundsError is reported as a "Short Frame" since the snaplen was too short. Register proto_short (BoundsError) and proto_malformed (ReportedBounds) so searches can be made on "short" and "malformed". svn path=/trunk/; revision=1965
2000-05-16 04:44:14 +00:00
if (exception) {
*exception = ReportedBoundsError;
}
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
}
Remove some "statement not reached" warnings. svn path=/trunk/; revision=28691
2009-06-11 10:03:08 +00:00
return FALSE;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
}
Add a "tvb_ensure_bytes_exist()", which is like "tvb_bytes_exist()" only it throws the appropriate exception if the bytes don't exist. Use it in the GIOP and ASN.1 code to check whether the bytes to be copied to a buffer exist before allocating the buffer. Make "check_offset_length_no_exception()" check for an overflow, so that it can be used in "tvb_ensure_bytes_exist()" and do all the checking that the code "tvb_ensure_bytes_exist()" replaces did. Make "get_CDR_wchar()" return a "gint", so that if the length octet it fetched has a value between 128 and 255, the length can be returned correctly. Fix some comments not to specify the exception thrown by various routines that can throw various exceptions. svn path=/trunk/; revision=5453
2002-05-13 01:24:47 +00:00
/* Checks (+/-) offset and length and throws an exception if
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
* either is out of bounds. Sets integer ptrs to the new offset
* and length. */
static void
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
check_offset_length(const guint tvb_length_val, const guint tvb_reported_length_val,
const gint offset, gint const length_val,
guint *offset_ptr, guint *length_ptr)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
Have tvbuff's keep track of cap_len and pkt_len ('length' and 'reported_length' in tvbuff terminology). This is implemented for TVBUFF_REAL and TVBUFF_SUBSET so far; support for TVBUFF_COMPOSITE is coming soon. Throw either ReportedBoundsError or BoundsError. A ReportedBoundsError is reported as "Malformed Frame" since the protocol stated that a certain number of bytes should be available but they weren't. A BoundsError is reported as a "Short Frame" since the snaplen was too short. Register proto_short (BoundsError) and proto_malformed (ReportedBounds) so searches can be made on "short" and "malformed". svn path=/trunk/; revision=1965
2000-05-16 04:44:14 +00:00
int exception = 0;
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
if (!check_offset_length_no_exception(tvb_length_val, tvb_reported_length_val,
offset, length_val, offset_ptr, length_ptr, &exception)) {
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT(exception > 0);
Have tvbuff's keep track of cap_len and pkt_len ('length' and 'reported_length' in tvbuff terminology). This is implemented for TVBUFF_REAL and TVBUFF_SUBSET so far; support for TVBUFF_COMPOSITE is coming soon. Throw either ReportedBoundsError or BoundsError. A ReportedBoundsError is reported as "Malformed Frame" since the protocol stated that a certain number of bytes should be available but they weren't. A BoundsError is reported as a "Short Frame" since the snaplen was too short. Register proto_short (BoundsError) and proto_malformed (ReportedBounds) so searches can be made on "short" and "malformed". svn path=/trunk/; revision=1965
2000-05-16 04:44:14 +00:00
THROW(exception);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
}
}
Remove the non-thread safe usage of 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29443
2009-08-16 09:18:17 +00:00
static void
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_set_subset_no_exceptions(tvbuff_t *tvb, tvbuff_t *backing, const gint reported_length)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tvb->tvbuffs.subset.tvb = backing;
tvb->length = tvb->tvbuffs.subset.length;
Throw ReportedBoundsError instead of asserting if reported_length < -1. svn path=/trunk/; revision=2427
2000-09-13 20:17:23 +00:00
Add "tvb_reported_length()" to get the "reported length" of a tvbuff (i.e., the amount of data that was in the packet, even if not all of it was captured), for use when dissecting packets containing data that fills the packet (we want the dissector to try to dissect all of it; if it runs past the end of the captured data, we want it to throw an exception so that we'll put a "Short Frame" note in the protocol tree). This means we always want a tvbuff to have a real reported length value, so we make it an unsigned integer, and don't bother checking it for -1, as it should never be -1. If the reported length passed in to "tvb_set_subset()" is -1, set the reported length to the reported length of the tvbuff of which the new tvbuff will be a subset minus the offset in that tvbuff of the subset, so that "-1" means "what's left of the packet after we chop off the header". This is necessary in order to ensure that all tvbuffs have a real reported length value. Have "dissect_packet()" set the reported length of the top-level tvbuff to the reported length of the frame, so that we start out with a tvbuff with a real reported length value. Have "tvb_offset_exists()" return FALSE if the offset is past the end of the tvbuff. If the offset passed to it is postitive, have "compute_offset_length()" check for that it's not more than one byte past the end of the tvbuff - if it's just past the end, we don't want the check to fail, as we don't want attempts to create a subset tvbuff containing zero bytes to fail; that would be done if a captured packet was all header and no payload, and we'd want the dissector of the payload, not the dissector of the header, to throw an exception, as the problem isn't with the protocol for the header, it's with the protocol for the payload. Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector, and the Q.931 dissector to use tvbuffs. Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's not converted yet). svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
if (reported_length == -1) {
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tvb->reported_length = backing->reported_length - tvb->tvbuffs.subset.offset;
Add "tvb_reported_length()" to get the "reported length" of a tvbuff (i.e., the amount of data that was in the packet, even if not all of it was captured), for use when dissecting packets containing data that fills the packet (we want the dissector to try to dissect all of it; if it runs past the end of the captured data, we want it to throw an exception so that we'll put a "Short Frame" note in the protocol tree). This means we always want a tvbuff to have a real reported length value, so we make it an unsigned integer, and don't bother checking it for -1, as it should never be -1. If the reported length passed in to "tvb_set_subset()" is -1, set the reported length to the reported length of the tvbuff of which the new tvbuff will be a subset minus the offset in that tvbuff of the subset, so that "-1" means "what's left of the packet after we chop off the header". This is necessary in order to ensure that all tvbuffs have a real reported length value. Have "dissect_packet()" set the reported length of the top-level tvbuff to the reported length of the frame, so that we start out with a tvbuff with a real reported length value. Have "tvb_offset_exists()" return FALSE if the offset is past the end of the tvbuff. If the offset passed to it is postitive, have "compute_offset_length()" check for that it's not more than one byte past the end of the tvbuff - if it's just past the end, we don't want the check to fail, as we don't want attempts to create a subset tvbuff containing zero bytes to fail; that would be done if a captured packet was all header and no payload, and we'd want the dissector of the payload, not the dissector of the header, to throw an exception, as the problem isn't with the protocol for the header, it's with the protocol for the payload. Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector, and the Q.931 dissector to use tvbuffs. Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's not converted yet). svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
}
else {
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tvb->reported_length = reported_length;
Add "tvb_reported_length()" to get the "reported length" of a tvbuff (i.e., the amount of data that was in the packet, even if not all of it was captured), for use when dissecting packets containing data that fills the packet (we want the dissector to try to dissect all of it; if it runs past the end of the captured data, we want it to throw an exception so that we'll put a "Short Frame" note in the protocol tree). This means we always want a tvbuff to have a real reported length value, so we make it an unsigned integer, and don't bother checking it for -1, as it should never be -1. If the reported length passed in to "tvb_set_subset()" is -1, set the reported length to the reported length of the tvbuff of which the new tvbuff will be a subset minus the offset in that tvbuff of the subset, so that "-1" means "what's left of the packet after we chop off the header". This is necessary in order to ensure that all tvbuffs have a real reported length value. Have "dissect_packet()" set the reported length of the top-level tvbuff to the reported length of the frame, so that we start out with a tvbuff with a real reported length value. Have "tvb_offset_exists()" return FALSE if the offset is past the end of the tvbuff. If the offset passed to it is postitive, have "compute_offset_length()" check for that it's not more than one byte past the end of the tvbuff - if it's just past the end, we don't want the check to fail, as we don't want attempts to create a subset tvbuff containing zero bytes to fail; that would be done if a captured packet was all header and no payload, and we'd want the dissector of the payload, not the dissector of the header, to throw an exception, as the problem isn't with the protocol for the header, it's with the protocol for the payload. Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector, and the Q.931 dissector to use tvbuffs. Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's not converted yet). svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
}
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tvb->initialized = TRUE;
A simplified version of tvbuffs: - Essentially no changes from current dissector de facto tvbuff usage; - Do away with 'usage_counts' and with 'used_in' GSLists; - Manage tvb chains via a simple doubly linked list. - API changes: a. tvb_increment_usage_count() and tvb_decrement_usage_count() no longer exist; b. tvb_free_chain() can only be called for the 'top-level' (initial) tvb of a chain) or for a tvb not in a chain. c. tvb_free() now just calls tvb_free_chain() [should have no impact on existing dissectors]. svn path=/trunk/; revision=40264
2011-12-21 17:39:02 +00:00
add_to_chain(backing, tvb);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
/* Optimization. If the backing buffer has a pointer to contiguous, real data,
* then we can point directly to our starting offset in that buffer */
if (backing->real_data != NULL) {
tvb->real_data = backing->real_data + tvb->tvbuffs.subset.offset;
}
}
Remove the non-thread safe usage of 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29443
2009-08-16 09:18:17 +00:00
void
tvb_set_subset(tvbuff_t *tvb, tvbuff_t *backing,
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const gint backing_offset, const gint backing_length, const gint reported_length)
Remove the non-thread safe usage of 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29443
2009-08-16 09:18:17 +00:00
{
DISSECTOR_ASSERT(tvb);
DISSECTOR_ASSERT(tvb->type == TVBUFF_SUBSET);
DISSECTOR_ASSERT(!tvb->initialized);
THROW_ON(reported_length < -1, ReportedBoundsError);
check_offset_length(backing->length, backing->reported_length, backing_offset, backing_length,
&tvb->tvbuffs.subset.offset,
&tvb->tvbuffs.subset.length);
Remove unused parameters svn path=/trunk/; revision=29444
2009-08-16 09:48:25 +00:00
tvb_set_subset_no_exceptions(tvb, backing, reported_length);
Remove the non-thread safe usage of 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29443
2009-08-16 09:18:17 +00:00
}
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
tvbuff_t*
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_new_subset(tvbuff_t *backing, const gint backing_offset, const gint backing_length, const gint reported_length)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tvbuff_t *tvb;
guint subset_tvb_offset;
guint subset_tvb_length;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Add DISSECTOR_ASSERT() before dereferencing a possible NULL pointer svn path=/trunk/; revision=30404
2009-10-08 15:01:25 +00:00
DISSECTOR_ASSERT(backing && backing->initialized);
Remove the non-thread safe usage of 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29443
2009-08-16 09:18:17 +00:00
THROW_ON(reported_length < -1, ReportedBoundsError);
Throw ReportedBoundsError instead of asserting if reported_length < -1. svn path=/trunk/; revision=2427
2000-09-13 20:17:23 +00:00
Remove the non-thread safe usage of 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29443
2009-08-16 09:18:17 +00:00
check_offset_length(backing->length, backing->reported_length, backing_offset, backing_length,
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
&subset_tvb_offset,
&subset_tvb_length);
Remove the non-thread safe usage of 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29443
2009-08-16 09:18:17 +00:00
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
tvb = tvb_new_with_subset(subset_tvb_offset, subset_tvb_length);
Throw ReportedBoundsError instead of asserting if reported_length < -1. svn path=/trunk/; revision=2427
2000-09-13 20:17:23 +00:00
Remove unused parameters svn path=/trunk/; revision=29444
2009-08-16 09:48:25 +00:00
tvb_set_subset_no_exceptions(tvb, backing, reported_length);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Don't give tvbuffs names; instead, give data sources names, where a "data source" has a name and a top-level tvbuff, and frames can have a list of data sources associated with them. Use the tvbuff pointer to determine which data source is the data source for a given field; this means we don't have to worry about multiple data sources with the same name - the only thing the name does is label the notebook tab for the display of the data source, and label the hex dump of the data source in print/Tethereal output. Clean up a bunch of things discovered in the process of doing the above. svn path=/trunk/; revision=4749
2002-02-18 01:08:44 +00:00
/*
* The top-level data source of this tvbuff is the top-level
* data source of its parent.
*/
tvb->ds_tvb = backing->ds_tvb;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
return tvb;
}
Add a new function, tvb_new_subset_remaining(), which is a sligtly optimized version of tvb_new_subset(). The latter can be mapped to the former by tvb_new_subset(tvb, offset, -1 /* backing_length */, -1 /* reported_length */). We can disable some bounds checking because 'backing_length' and 'reported_length' are hardcoded to -1. The current implementation of tvb_new_subset_remaining() only has the THROW_ON(reported_length < 1) check removed when compared to tvb_new_subset(). So there's room for improvement in this function. We should be able to disable some more (redundant) bounds checking. svn path=/trunk/; revision=29445
2009-08-16 10:53:47 +00:00
tvbuff_t*
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_new_subset_remaining(tvbuff_t *backing, const gint backing_offset)
Add a new function, tvb_new_subset_remaining(), which is a sligtly optimized version of tvb_new_subset(). The latter can be mapped to the former by tvb_new_subset(tvb, offset, -1 /* backing_length */, -1 /* reported_length */). We can disable some bounds checking because 'backing_length' and 'reported_length' are hardcoded to -1. The current implementation of tvb_new_subset_remaining() only has the THROW_ON(reported_length < 1) check removed when compared to tvb_new_subset(). So there's room for improvement in this function. We should be able to disable some more (redundant) bounds checking. svn path=/trunk/; revision=29445
2009-08-16 10:53:47 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tvbuff_t *tvb;
guint subset_tvb_offset;
guint subset_tvb_length;
Add a new function, tvb_new_subset_remaining(), which is a sligtly optimized version of tvb_new_subset(). The latter can be mapped to the former by tvb_new_subset(tvb, offset, -1 /* backing_length */, -1 /* reported_length */). We can disable some bounds checking because 'backing_length' and 'reported_length' are hardcoded to -1. The current implementation of tvb_new_subset_remaining() only has the THROW_ON(reported_length < 1) check removed when compared to tvb_new_subset(). So there's room for improvement in this function. We should be able to disable some more (redundant) bounds checking. svn path=/trunk/; revision=29445
2009-08-16 10:53:47 +00:00
check_offset_length(backing->length, backing->reported_length, backing_offset, -1 /* backing_length */,
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
&subset_tvb_offset,
&subset_tvb_length);
Add a new function, tvb_new_subset_remaining(), which is a sligtly optimized version of tvb_new_subset(). The latter can be mapped to the former by tvb_new_subset(tvb, offset, -1 /* backing_length */, -1 /* reported_length */). We can disable some bounds checking because 'backing_length' and 'reported_length' are hardcoded to -1. The current implementation of tvb_new_subset_remaining() only has the THROW_ON(reported_length < 1) check removed when compared to tvb_new_subset(). So there's room for improvement in this function. We should be able to disable some more (redundant) bounds checking. svn path=/trunk/; revision=29445
2009-08-16 10:53:47 +00:00
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
tvb = tvb_new_with_subset(subset_tvb_offset, subset_tvb_length);
Add a new function, tvb_new_subset_remaining(), which is a sligtly optimized version of tvb_new_subset(). The latter can be mapped to the former by tvb_new_subset(tvb, offset, -1 /* backing_length */, -1 /* reported_length */). We can disable some bounds checking because 'backing_length' and 'reported_length' are hardcoded to -1. The current implementation of tvb_new_subset_remaining() only has the THROW_ON(reported_length < 1) check removed when compared to tvb_new_subset(). So there's room for improvement in this function. We should be able to disable some more (redundant) bounds checking. svn path=/trunk/; revision=29445
2009-08-16 10:53:47 +00:00
tvb_set_subset_no_exceptions(tvb, backing, -1 /* reported_length */);
/*
* The top-level data source of this tvbuff is the top-level
* data source of its parent.
*/
tvb->ds_tvb = backing->ds_tvb;
return tvb;
}
A simplified version of tvbuffs: - Essentially no changes from current dissector de facto tvbuff usage; - Do away with 'usage_counts' and with 'used_in' GSLists; - Manage tvb chains via a simple doubly linked list. - API changes: a. tvb_increment_usage_count() and tvb_decrement_usage_count() no longer exist; b. tvb_free_chain() can only be called for the 'top-level' (initial) tvb of a chain) or for a tvb not in a chain. c. tvb_free() now just calls tvb_free_chain() [should have no impact on existing dissectors]. svn path=/trunk/; revision=40264
2011-12-21 17:39:02 +00:00
/*
* Composite tvb
*
* 1. A composite tvb is automatically chained to its first member when the
* tvb is finalized.
* This means that composite tvb members must all be in the same chain.
* ToDo: enforce this: By searching the chain?
*/
tvbuff_t*
tvb_new_composite(void)
{
return tvb_new(TVBUFF_COMPOSITE);
}
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
void
tvb_composite_append(tvbuff_t* tvb, tvbuff_t* member)
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tvb_comp_t *composite;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
DISSECTOR_ASSERT(tvb && !tvb->initialized);
Port over the composite tvbuff fixes from /trunk-1.0. svn path=/trunk/; revision=25498
2008-06-20 20:33:38 +00:00
DISSECTOR_ASSERT(tvb->type == TVBUFF_COMPOSITE);
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
composite = &tvb->tvbuffs.composite;
composite->tvbs = g_slist_append(composite->tvbs, member);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
}
void
tvb_composite_prepend(tvbuff_t* tvb, tvbuff_t* member)
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tvb_comp_t *composite;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
DISSECTOR_ASSERT(tvb && !tvb->initialized);
Port over the composite tvbuff fixes from /trunk-1.0. svn path=/trunk/; revision=25498
2008-06-20 20:33:38 +00:00
DISSECTOR_ASSERT(tvb->type == TVBUFF_COMPOSITE);
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
composite = &tvb->tvbuffs.composite;
composite->tvbs = g_slist_prepend(composite->tvbs, member);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
}
void
tvb_composite_finalize(tvbuff_t* tvb)
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
GSList *slist;
guint num_members;
tvbuff_t *member_tvb;
tvb_comp_t *composite;
int i = 0;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
DISSECTOR_ASSERT(tvb && !tvb->initialized);
Port over the composite tvbuff fixes from /trunk-1.0. svn path=/trunk/; revision=25498
2008-06-20 20:33:38 +00:00
DISSECTOR_ASSERT(tvb->type == TVBUFF_COMPOSITE);
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT(tvb->length == 0);
From jakub Zawadzki: I've fixed composite tests #0 and #2 svn path=/trunk/; revision=36440
2011-04-04 05:48:06 +00:00
DISSECTOR_ASSERT(tvb->reported_length == 0);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
composite = &tvb->tvbuffs.composite;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
num_members = g_slist_length(composite->tvbs);
composite->start_offsets = g_new(guint, num_members);
composite->end_offsets = g_new(guint, num_members);
for (slist = composite->tvbs; slist != NULL; slist = slist->next) {
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT((guint) i < num_members);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
member_tvb = slist->data;
composite->start_offsets[i] = tvb->length;
tvb->length += member_tvb->length;
From jakub Zawadzki: I've fixed composite tests #0 and #2 svn path=/trunk/; revision=36440
2011-04-04 05:48:06 +00:00
tvb->reported_length += member_tvb->reported_length;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
composite->end_offsets[i] = tvb->length - 1;
i++;
}
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
add_to_chain((tvbuff_t *)composite->tvbs->data, tvb); /* chain composite tvb to first member */
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
tvb->initialized = TRUE;
}
guint
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_length(const tvbuff_t* tvb)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
DISSECTOR_ASSERT(tvb && tvb->initialized);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
return tvb->length;
}
Tvbuffify the RIP and OSPF dissectors. Change them to use facilities in Ethereal that were probably not present when they were originally written, e.g. routines to fetch 24-bit integers and to dump a bunch of raw bytes in hex. Redo them to extract data from the packet as they dissect it, rather than extracting an entire data structure at once; that way, it may be able to dissect a structure not all of which is in the packet. Dissect a bit more of the type-of-service metrics etc. in OSPF packets. Make "tvb_length_remaining()" return a "gint", not a "guint"; it returns -1 if the offset is past the end of the tvbuff. Add a "tvb_reported_length_remaining()" routine, similar to "tvb_length_remaining()". Use it instead of just subtracting an offset from "tvb_reported_length()". svn path=/trunk/; revision=2787
2000-12-27 12:48:27 +00:00
gint
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_length_remaining(const tvbuff_t *tvb, const gint offset)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint abs_offset, abs_length;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
DISSECTOR_ASSERT(tvb && tvb->initialized);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
if (compute_offset_length(tvb->length, tvb->reported_length, offset, -1, &abs_offset, &abs_length, NULL)) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
return abs_length;
}
else {
return -1;
}
}
Make "tvb_ensure_length_remaining()" return a "guint" - it can't return a negative value. Use "tvb_ensure_length_remaining()" in "tcp_dissect_pdus()", rather than checking the return value of "tvb_length_remaining()" ourselves, and make various variables and parameters in it "guint" as appropriate. svn path=/trunk/; revision=5396
2002-05-05 00:57:59 +00:00
guint
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_ensure_length_remaining(const tvbuff_t *tvb, const gint offset)
Provide tvb_ensure_length_remaining(), which is like tvb_length_remaining() except that it throws BoundsError if 'offset' is out-of-bounds. Allow a length argument of -1 for FT_STRING and FT_BYTES fields in proto_tree_add_item(). Change some dissectors to either use -1 for the length argument in calls to proto_tree_add_item(), or call tvb_ensure_length_remaining() instead of tvb_length_remaining(), or to check the return-value of tvb_length_remaining(). Changes to more dissectors are necessary, but will follow later. svn path=/trunk/; revision=4656
2002-02-01 04:34:17 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint abs_offset, abs_length;
int exception;
Provide tvb_ensure_length_remaining(), which is like tvb_length_remaining() except that it throws BoundsError if 'offset' is out-of-bounds. Allow a length argument of -1 for FT_STRING and FT_BYTES fields in proto_tree_add_item(). Change some dissectors to either use -1 for the length argument in calls to proto_tree_add_item(), or call tvb_ensure_length_remaining() instead of tvb_length_remaining(), or to check the return-value of tvb_length_remaining(). Changes to more dissectors are necessary, but will follow later. svn path=/trunk/; revision=4656
2002-02-01 04:34:17 +00:00
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
DISSECTOR_ASSERT(tvb && tvb->initialized);
Provide tvb_ensure_length_remaining(), which is like tvb_length_remaining() except that it throws BoundsError if 'offset' is out-of-bounds. Allow a length argument of -1 for FT_STRING and FT_BYTES fields in proto_tree_add_item(). Change some dissectors to either use -1 for the length argument in calls to proto_tree_add_item(), or call tvb_ensure_length_remaining() instead of tvb_length_remaining(), or to check the return-value of tvb_length_remaining(). Changes to more dissectors are necessary, but will follow later. svn path=/trunk/; revision=4656
2002-02-01 04:34:17 +00:00
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
if (!compute_offset_length(tvb->length, tvb->reported_length, offset, -1, &abs_offset, &abs_length, &exception)) {
Have "tvb_ensure_length_remaining()" directly call "compute_offset_length()", and throw the exception it returns, rather than calling "tvb_length_remaining()" and throw BoundsError if it returns -1; this allows us to add additional exceptions without having to change "tvb_ensure_length_remaining()". Make "_tvb_get_nstringz()" static, as it's not used outside "tvbuff.c". svn path=/trunk/; revision=5397
2002-05-05 21:07:52 +00:00
THROW(exception);
Provide tvb_ensure_length_remaining(), which is like tvb_length_remaining() except that it throws BoundsError if 'offset' is out-of-bounds. Allow a length argument of -1 for FT_STRING and FT_BYTES fields in proto_tree_add_item(). Change some dissectors to either use -1 for the length argument in calls to proto_tree_add_item(), or call tvb_ensure_length_remaining() instead of tvb_length_remaining(), or to check the return-value of tvb_length_remaining(). Changes to more dissectors are necessary, but will follow later. svn path=/trunk/; revision=4656
2002-02-01 04:34:17 +00:00
}
Have "tvb_ensure_length_remaining()" throw the appropriate exception if there's no data remaining - its callers largely depend on it doing so. That means that the BEEP dissector doesn't have to check for it returning 0. svn path=/trunk/; revision=9433
2003-12-23 21:22:00 +00:00
if (abs_length == 0) {
/*
* This routine ensures there's at least one byte available.
* There aren't any bytes available, so throw the appropriate
* exception.
*/
In "tvb_ensure_bytes_remaining()", throw ReportedBoundsError, not BoundsError, if the offset is just past the end of the reported data (because we're ensuring that there actually *is* a byte there, and, even according to the reported length, it isn't). svn path=/trunk/; revision=9444
2003-12-24 23:28:17 +00:00
if (abs_offset >= tvb->reported_length)
Have "tvb_ensure_length_remaining()" throw the appropriate exception if there's no data remaining - its callers largely depend on it doing so. That means that the BEEP dissector doesn't have to check for it returning 0. svn path=/trunk/; revision=9433
2003-12-23 21:22:00 +00:00
THROW(ReportedBoundsError);
else
THROW(BoundsError);
}
Have "tvb_ensure_length_remaining()" directly call "compute_offset_length()", and throw the exception it returns, rather than calling "tvb_length_remaining()" and throw BoundsError if it returns -1; this allows us to add additional exceptions without having to change "tvb_ensure_length_remaining()". Make "_tvb_get_nstringz()" static, as it's not used outside "tvbuff.c". svn path=/trunk/; revision=5397
2002-05-05 21:07:52 +00:00
return abs_length;
Provide tvb_ensure_length_remaining(), which is like tvb_length_remaining() except that it throws BoundsError if 'offset' is out-of-bounds. Allow a length argument of -1 for FT_STRING and FT_BYTES fields in proto_tree_add_item(). Change some dissectors to either use -1 for the length argument in calls to proto_tree_add_item(), or call tvb_ensure_length_remaining() instead of tvb_length_remaining(), or to check the return-value of tvb_length_remaining(). Changes to more dissectors are necessary, but will follow later. svn path=/trunk/; revision=4656
2002-02-01 04:34:17 +00:00
}
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
/* Validates that 'length' bytes are available starting from
Add a "tvb_ensure_bytes_exist()", which is like "tvb_bytes_exist()" only it throws the appropriate exception if the bytes don't exist. Use it in the GIOP and ASN.1 code to check whether the bytes to be copied to a buffer exist before allocating the buffer. Make "check_offset_length_no_exception()" check for an overflow, so that it can be used in "tvb_ensure_bytes_exist()" and do all the checking that the code "tvb_ensure_bytes_exist()" replaces did. Make "get_CDR_wchar()" return a "gint", so that if the length octet it fetched has a value between 128 and 255, the length can be returned correctly. Fix some comments not to specify the exception thrown by various routines that can throw various exceptions. svn path=/trunk/; revision=5453
2002-05-13 01:24:47 +00:00
* offset (pos/neg). Does not throw an exception. */
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
gboolean
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_bytes_exist(const tvbuff_t *tvb, const gint offset, const gint length)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint abs_offset, abs_length;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
DISSECTOR_ASSERT(tvb && tvb->initialized);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
if (!compute_offset_length(tvb->length, tvb->reported_length, offset, length, &abs_offset, &abs_length, NULL))
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
return FALSE;
if (abs_offset + abs_length <= tvb->length) {
return TRUE;
}
else {
return FALSE;
}
}
Add a "tvb_ensure_bytes_exist()", which is like "tvb_bytes_exist()" only it throws the appropriate exception if the bytes don't exist. Use it in the GIOP and ASN.1 code to check whether the bytes to be copied to a buffer exist before allocating the buffer. Make "check_offset_length_no_exception()" check for an overflow, so that it can be used in "tvb_ensure_bytes_exist()" and do all the checking that the code "tvb_ensure_bytes_exist()" replaces did. Make "get_CDR_wchar()" return a "gint", so that if the length octet it fetched has a value between 128 and 255, the length can be returned correctly. Fix some comments not to specify the exception thrown by various routines that can throw various exceptions. svn path=/trunk/; revision=5453
2002-05-13 01:24:47 +00:00
/* Validates that 'length' bytes are available starting from
* offset (pos/neg). Throws an exception if they aren't. */
void
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_ensure_bytes_exist(const tvbuff_t *tvb, const gint offset, const gint length)
Add a "tvb_ensure_bytes_exist()", which is like "tvb_bytes_exist()" only it throws the appropriate exception if the bytes don't exist. Use it in the GIOP and ASN.1 code to check whether the bytes to be copied to a buffer exist before allocating the buffer. Make "check_offset_length_no_exception()" check for an overflow, so that it can be used in "tvb_ensure_bytes_exist()" and do all the checking that the code "tvb_ensure_bytes_exist()" replaces did. Make "get_CDR_wchar()" return a "gint", so that if the length octet it fetched has a value between 128 and 255, the length can be returned correctly. Fix some comments not to specify the exception thrown by various routines that can throw various exceptions. svn path=/trunk/; revision=5453
2002-05-13 01:24:47 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint abs_offset, abs_length;
Add a "tvb_ensure_bytes_exist()", which is like "tvb_bytes_exist()" only it throws the appropriate exception if the bytes don't exist. Use it in the GIOP and ASN.1 code to check whether the bytes to be copied to a buffer exist before allocating the buffer. Make "check_offset_length_no_exception()" check for an overflow, so that it can be used in "tvb_ensure_bytes_exist()" and do all the checking that the code "tvb_ensure_bytes_exist()" replaces did. Make "get_CDR_wchar()" return a "gint", so that if the length octet it fetched has a value between 128 and 255, the length can be returned correctly. Fix some comments not to specify the exception thrown by various routines that can throw various exceptions. svn path=/trunk/; revision=5453
2002-05-13 01:24:47 +00:00
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
DISSECTOR_ASSERT(tvb && tvb->initialized);
Add a "tvb_ensure_bytes_exist()", which is like "tvb_bytes_exist()" only it throws the appropriate exception if the bytes don't exist. Use it in the GIOP and ASN.1 code to check whether the bytes to be copied to a buffer exist before allocating the buffer. Make "check_offset_length_no_exception()" check for an overflow, so that it can be used in "tvb_ensure_bytes_exist()" and do all the checking that the code "tvb_ensure_bytes_exist()" replaces did. Make "get_CDR_wchar()" return a "gint", so that if the length octet it fetched has a value between 128 and 255, the length can be returned correctly. Fix some comments not to specify the exception thrown by various routines that can throw various exceptions. svn path=/trunk/; revision=5453
2002-05-13 01:24:47 +00:00
/*
* -1 doesn't mean "until end of buffer", as that's pointless
* for this routine. We must treat it as a Really Large Positive
* Number, so that we throw an exception; we throw
* ReportedBoundsError, as if it were past even the end of a
* reassembled packet, and past the end of even the data we
* didn't capture.
*
* We do the same with other negative lengths.
*/
if (length < 0) {
THROW(ReportedBoundsError);
}
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
check_offset_length(tvb->length, tvb->reported_length, offset, length, &abs_offset, &abs_length);
Add a "tvb_ensure_bytes_exist()", which is like "tvb_bytes_exist()" only it throws the appropriate exception if the bytes don't exist. Use it in the GIOP and ASN.1 code to check whether the bytes to be copied to a buffer exist before allocating the buffer. Make "check_offset_length_no_exception()" check for an overflow, so that it can be used in "tvb_ensure_bytes_exist()" and do all the checking that the code "tvb_ensure_bytes_exist()" replaces did. Make "get_CDR_wchar()" return a "gint", so that if the length octet it fetched has a value between 128 and 255, the length can be returned correctly. Fix some comments not to specify the exception thrown by various routines that can throw various exceptions. svn path=/trunk/; revision=5453
2002-05-13 01:24:47 +00:00
}
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
gboolean
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_offset_exists(const tvbuff_t *tvb, const gint offset)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint abs_offset, abs_length;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
DISSECTOR_ASSERT(tvb && tvb->initialized);
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
if (!compute_offset_length(tvb->length, tvb->reported_length, offset, -1, &abs_offset, &abs_length, NULL))
Add "tvb_reported_length()" to get the "reported length" of a tvbuff (i.e., the amount of data that was in the packet, even if not all of it was captured), for use when dissecting packets containing data that fills the packet (we want the dissector to try to dissect all of it; if it runs past the end of the captured data, we want it to throw an exception so that we'll put a "Short Frame" note in the protocol tree). This means we always want a tvbuff to have a real reported length value, so we make it an unsigned integer, and don't bother checking it for -1, as it should never be -1. If the reported length passed in to "tvb_set_subset()" is -1, set the reported length to the reported length of the tvbuff of which the new tvbuff will be a subset minus the offset in that tvbuff of the subset, so that "-1" means "what's left of the packet after we chop off the header". This is necessary in order to ensure that all tvbuffs have a real reported length value. Have "dissect_packet()" set the reported length of the top-level tvbuff to the reported length of the frame, so that we start out with a tvbuff with a real reported length value. Have "tvb_offset_exists()" return FALSE if the offset is past the end of the tvbuff. If the offset passed to it is postitive, have "compute_offset_length()" check for that it's not more than one byte past the end of the tvbuff - if it's just past the end, we don't want the check to fail, as we don't want attempts to create a subset tvbuff containing zero bytes to fail; that would be done if a captured packet was all header and no payload, and we'd want the dissector of the payload, not the dissector of the header, to throw an exception, as the problem isn't with the protocol for the header, it's with the protocol for the payload. Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector, and the Q.931 dissector to use tvbuffs. Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's not converted yet). svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
return FALSE;
if (abs_offset < tvb->length) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
return TRUE;
}
else {
return FALSE;
}
}
Add "tvb_reported_length()" to get the "reported length" of a tvbuff (i.e., the amount of data that was in the packet, even if not all of it was captured), for use when dissecting packets containing data that fills the packet (we want the dissector to try to dissect all of it; if it runs past the end of the captured data, we want it to throw an exception so that we'll put a "Short Frame" note in the protocol tree). This means we always want a tvbuff to have a real reported length value, so we make it an unsigned integer, and don't bother checking it for -1, as it should never be -1. If the reported length passed in to "tvb_set_subset()" is -1, set the reported length to the reported length of the tvbuff of which the new tvbuff will be a subset minus the offset in that tvbuff of the subset, so that "-1" means "what's left of the packet after we chop off the header". This is necessary in order to ensure that all tvbuffs have a real reported length value. Have "dissect_packet()" set the reported length of the top-level tvbuff to the reported length of the frame, so that we start out with a tvbuff with a real reported length value. Have "tvb_offset_exists()" return FALSE if the offset is past the end of the tvbuff. If the offset passed to it is postitive, have "compute_offset_length()" check for that it's not more than one byte past the end of the tvbuff - if it's just past the end, we don't want the check to fail, as we don't want attempts to create a subset tvbuff containing zero bytes to fail; that would be done if a captured packet was all header and no payload, and we'd want the dissector of the payload, not the dissector of the header, to throw an exception, as the problem isn't with the protocol for the header, it's with the protocol for the payload. Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector, and the Q.931 dissector to use tvbuffs. Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's not converted yet). svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
guint
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_reported_length(const tvbuff_t* tvb)
Add "tvb_reported_length()" to get the "reported length" of a tvbuff (i.e., the amount of data that was in the packet, even if not all of it was captured), for use when dissecting packets containing data that fills the packet (we want the dissector to try to dissect all of it; if it runs past the end of the captured data, we want it to throw an exception so that we'll put a "Short Frame" note in the protocol tree). This means we always want a tvbuff to have a real reported length value, so we make it an unsigned integer, and don't bother checking it for -1, as it should never be -1. If the reported length passed in to "tvb_set_subset()" is -1, set the reported length to the reported length of the tvbuff of which the new tvbuff will be a subset minus the offset in that tvbuff of the subset, so that "-1" means "what's left of the packet after we chop off the header". This is necessary in order to ensure that all tvbuffs have a real reported length value. Have "dissect_packet()" set the reported length of the top-level tvbuff to the reported length of the frame, so that we start out with a tvbuff with a real reported length value. Have "tvb_offset_exists()" return FALSE if the offset is past the end of the tvbuff. If the offset passed to it is postitive, have "compute_offset_length()" check for that it's not more than one byte past the end of the tvbuff - if it's just past the end, we don't want the check to fail, as we don't want attempts to create a subset tvbuff containing zero bytes to fail; that would be done if a captured packet was all header and no payload, and we'd want the dissector of the payload, not the dissector of the header, to throw an exception, as the problem isn't with the protocol for the header, it's with the protocol for the payload. Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector, and the Q.931 dissector to use tvbuffs. Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's not converted yet). svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
{
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
DISSECTOR_ASSERT(tvb && tvb->initialized);
Add "tvb_reported_length()" to get the "reported length" of a tvbuff (i.e., the amount of data that was in the packet, even if not all of it was captured), for use when dissecting packets containing data that fills the packet (we want the dissector to try to dissect all of it; if it runs past the end of the captured data, we want it to throw an exception so that we'll put a "Short Frame" note in the protocol tree). This means we always want a tvbuff to have a real reported length value, so we make it an unsigned integer, and don't bother checking it for -1, as it should never be -1. If the reported length passed in to "tvb_set_subset()" is -1, set the reported length to the reported length of the tvbuff of which the new tvbuff will be a subset minus the offset in that tvbuff of the subset, so that "-1" means "what's left of the packet after we chop off the header". This is necessary in order to ensure that all tvbuffs have a real reported length value. Have "dissect_packet()" set the reported length of the top-level tvbuff to the reported length of the frame, so that we start out with a tvbuff with a real reported length value. Have "tvb_offset_exists()" return FALSE if the offset is past the end of the tvbuff. If the offset passed to it is postitive, have "compute_offset_length()" check for that it's not more than one byte past the end of the tvbuff - if it's just past the end, we don't want the check to fail, as we don't want attempts to create a subset tvbuff containing zero bytes to fail; that would be done if a captured packet was all header and no payload, and we'd want the dissector of the payload, not the dissector of the header, to throw an exception, as the problem isn't with the protocol for the header, it's with the protocol for the payload. Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector, and the Q.931 dissector to use tvbuffs. Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's not converted yet). svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
return tvb->reported_length;
}
Tvbuffify the RIP and OSPF dissectors. Change them to use facilities in Ethereal that were probably not present when they were originally written, e.g. routines to fetch 24-bit integers and to dump a bunch of raw bytes in hex. Redo them to extract data from the packet as they dissect it, rather than extracting an entire data structure at once; that way, it may be able to dissect a structure not all of which is in the packet. Dissect a bit more of the type-of-service metrics etc. in OSPF packets. Make "tvb_length_remaining()" return a "gint", not a "guint"; it returns -1 if the offset is past the end of the tvbuff. Add a "tvb_reported_length_remaining()" routine, similar to "tvb_length_remaining()". Use it instead of just subtracting an offset from "tvb_reported_length()". svn path=/trunk/; revision=2787
2000-12-27 12:48:27 +00:00
gint
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_reported_length_remaining(const tvbuff_t *tvb, const gint offset)
Tvbuffify the RIP and OSPF dissectors. Change them to use facilities in Ethereal that were probably not present when they were originally written, e.g. routines to fetch 24-bit integers and to dump a bunch of raw bytes in hex. Redo them to extract data from the packet as they dissect it, rather than extracting an entire data structure at once; that way, it may be able to dissect a structure not all of which is in the packet. Dissect a bit more of the type-of-service metrics etc. in OSPF packets. Make "tvb_length_remaining()" return a "gint", not a "guint"; it returns -1 if the offset is past the end of the tvbuff. Add a "tvb_reported_length_remaining()" routine, similar to "tvb_length_remaining()". Use it instead of just subtracting an offset from "tvb_reported_length()". svn path=/trunk/; revision=2787
2000-12-27 12:48:27 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint abs_offset, abs_length;
Tvbuffify the RIP and OSPF dissectors. Change them to use facilities in Ethereal that were probably not present when they were originally written, e.g. routines to fetch 24-bit integers and to dump a bunch of raw bytes in hex. Redo them to extract data from the packet as they dissect it, rather than extracting an entire data structure at once; that way, it may be able to dissect a structure not all of which is in the packet. Dissect a bit more of the type-of-service metrics etc. in OSPF packets. Make "tvb_length_remaining()" return a "gint", not a "guint"; it returns -1 if the offset is past the end of the tvbuff. Add a "tvb_reported_length_remaining()" routine, similar to "tvb_length_remaining()". Use it instead of just subtracting an offset from "tvb_reported_length()". svn path=/trunk/; revision=2787
2000-12-27 12:48:27 +00:00
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
DISSECTOR_ASSERT(tvb && tvb->initialized);
Tvbuffify the RIP and OSPF dissectors. Change them to use facilities in Ethereal that were probably not present when they were originally written, e.g. routines to fetch 24-bit integers and to dump a bunch of raw bytes in hex. Redo them to extract data from the packet as they dissect it, rather than extracting an entire data structure at once; that way, it may be able to dissect a structure not all of which is in the packet. Dissect a bit more of the type-of-service metrics etc. in OSPF packets. Make "tvb_length_remaining()" return a "gint", not a "guint"; it returns -1 if the offset is past the end of the tvbuff. Add a "tvb_reported_length_remaining()" routine, similar to "tvb_length_remaining()". Use it instead of just subtracting an offset from "tvb_reported_length()". svn path=/trunk/; revision=2787
2000-12-27 12:48:27 +00:00
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
if (compute_offset_length(tvb->length, tvb->reported_length, offset, -1, &abs_offset, &abs_length, NULL)) {
Tvbuffify the RIP and OSPF dissectors. Change them to use facilities in Ethereal that were probably not present when they were originally written, e.g. routines to fetch 24-bit integers and to dump a bunch of raw bytes in hex. Redo them to extract data from the packet as they dissect it, rather than extracting an entire data structure at once; that way, it may be able to dissect a structure not all of which is in the packet. Dissect a bit more of the type-of-service metrics etc. in OSPF packets. Make "tvb_length_remaining()" return a "gint", not a "guint"; it returns -1 if the offset is past the end of the tvbuff. Add a "tvb_reported_length_remaining()" routine, similar to "tvb_length_remaining()". Use it instead of just subtracting an offset from "tvb_reported_length()". svn path=/trunk/; revision=2787
2000-12-27 12:48:27 +00:00
if (tvb->reported_length >= abs_offset)
return tvb->reported_length - abs_offset;
else
return -1;
}
else {
return -1;
}
}
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
/* Set the reported length of a tvbuff to a given value; used for protocols
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
* whose headers contain an explicit length and where the calling
* dissector's payload may include padding as well as the packet for
* this protocol.
* Also adjusts the data length. */
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
void
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_set_reported_length(tvbuff_t* tvb, const guint reported_length)
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
{
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
DISSECTOR_ASSERT(tvb && tvb->initialized);
In tvb_set_reported_length(), don't assert on reported_length <= tvb->reported_length, but throw a ReportedBoundsError if that condition is not met. svn path=/trunk/; revision=2718
2000-11-30 03:24:16 +00:00
if (reported_length > tvb->reported_length)
THROW(ReportedBoundsError);
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
tvb->reported_length = reported_length;
if (reported_length < tvb->length)
tvb->length = reported_length;
}
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Get rid of some unsued code: The warning causes a failure due to -Werror svn path=/trunk/; revision=25028
2008-04-14 21:31:19 +00:00
#if 0
Constify a bunch of stuff. svn path=/trunk/; revision=10106
2004-02-19 05:19:10 +00:00
static const guint8*
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
first_real_data_ptr(tvbuff_t *tvb)
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tvbuff_t *member;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
switch(tvb->type) {
case TVBUFF_REAL_DATA:
return tvb->real_data;
case TVBUFF_SUBSET:
member = tvb->tvbuffs.subset.tvb;
return first_real_data_ptr(member);
case TVBUFF_COMPOSITE:
member = tvb->tvbuffs.composite.tvbs->data;
return first_real_data_ptr(member);
}
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT_NOT_REACHED();
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
return NULL;
}
Get rid of some unsued code: The warning causes a failure due to -Werror svn path=/trunk/; revision=25028
2008-04-14 21:31:19 +00:00
#endif
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
offset_from_real_beginning() is only called with 0 as second argument, so remove the argument completely. It seems that the second argument only acts as an accumulator allowing offset_from_real_beginning() to call itself recursively. To be consistent offset_from_real_beginning() is renamed to tvb_offset_from_real_beginning(). svn path=/trunk/; revision=29844
2009-09-10 16:54:02 +00:00
static guint
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
offset_from_real_beginning(const tvbuff_t *tvb, const guint counter)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tvbuff_t *member;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
switch(tvb->type) {
case TVBUFF_REAL_DATA:
return counter;
case TVBUFF_SUBSET:
member = tvb->tvbuffs.subset.tvb;
return offset_from_real_beginning(member, counter + tvb->tvbuffs.subset.offset);
case TVBUFF_COMPOSITE:
member = tvb->tvbuffs.composite.tvbs->data;
return offset_from_real_beginning(member, counter);
}
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT_NOT_REACHED();
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
return 0;
}
offset_from_real_beginning() is only called with 0 as second argument, so remove the argument completely. It seems that the second argument only acts as an accumulator allowing offset_from_real_beginning() to call itself recursively. To be consistent offset_from_real_beginning() is renamed to tvb_offset_from_real_beginning(). svn path=/trunk/; revision=29844
2009-09-10 16:54:02 +00:00
guint
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_offset_from_real_beginning(const tvbuff_t *tvb)
offset_from_real_beginning() is only called with 0 as second argument, so remove the argument completely. It seems that the second argument only acts as an accumulator allowing offset_from_real_beginning() to call itself recursively. To be consistent offset_from_real_beginning() is renamed to tvb_offset_from_real_beginning(). svn path=/trunk/; revision=29844
2009-09-10 16:54:02 +00:00
{
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
return offset_from_real_beginning(tvb, 0);
offset_from_real_beginning() is only called with 0 as second argument, so remove the argument completely. It seems that the second argument only acts as an accumulator allowing offset_from_real_beginning() to call itself recursively. To be consistent offset_from_real_beginning() is renamed to tvb_offset_from_real_beginning(). svn path=/trunk/; revision=29844
2009-09-10 16:54:02 +00:00
}
Constify a bunch of stuff. svn path=/trunk/; revision=10106
2004-02-19 05:19:10 +00:00
static const guint8*
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
composite_ensure_contiguous_no_exception(tvbuff_t *tvb, const guint abs_offset, const guint abs_length)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint i, num_members;
tvb_comp_t *composite;
tvbuff_t *member_tvb = NULL;
guint member_offset, member_length;
GSList *slist;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT(tvb->type == TVBUFF_COMPOSITE);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
/* Maybe the range specified by offset/length
* is contiguous inside one of the member tvbuffs */
composite = &tvb->tvbuffs.composite;
num_members = g_slist_length(composite->tvbs);
for (i = 0; i < num_members; i++) {
if (abs_offset <= composite->end_offsets[i]) {
slist = g_slist_nth(composite->tvbs, i);
member_tvb = slist->data;
break;
}
}
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT(member_tvb);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
if (check_offset_length_no_exception(member_tvb->length, member_tvb->reported_length,
abs_offset - composite->start_offsets[i],
abs_length, &member_offset, &member_length, NULL)) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Add new routines: tvb_get_string() - takes a tvbuff, an offset, and a length as arguments, allocates a buffer big enough to hold a string with the specified number of bytes plus an added null terminator (i.e., length+1), copies the specified number of bytes from the tvbuff, at the specified offset, to that buffer and puts in a null terminator, and returns a pointer to that buffer (or throws an exception before allocating the buffer if that many bytes aren't available in the tvbuff); tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to a "gint" as arguments, gets the size of the null-terminated string starting at the specified offset in the tvbuff (throwing an exception if the null terminator isn't found), allocates a buffer big enough to hold that string, copies the string to that buffer, and returns a pointer to that buffer and stores the length of the string (including the terminating null) in the variable pointed to by the "gint" pointer. Replace many pieces of code allocating a buffer and copying a string with calls to "tvb_get_string()" (for one thing, "tvb_get_string()" doesn't require you to remember that the argument to "tvb_get_nstringz0()" is the size of the buffer into which you're copying the string, which might be the length of the string to be copied *plus 1*). Don't use fixed-length buffers for null-terminated strings (even if the code that generates those packets has a #define to limit the length of the string). Use "tvb_get_stringz()", instead. In some cases where a value is fetched but is only used to pass an argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()" instead. svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
/*
* The range is, in fact, contiguous within member_tvb.
*/
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT(!tvb->real_data);
Add new routines: tvb_get_string() - takes a tvbuff, an offset, and a length as arguments, allocates a buffer big enough to hold a string with the specified number of bytes plus an added null terminator (i.e., length+1), copies the specified number of bytes from the tvbuff, at the specified offset, to that buffer and puts in a null terminator, and returns a pointer to that buffer (or throws an exception before allocating the buffer if that many bytes aren't available in the tvbuff); tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to a "gint" as arguments, gets the size of the null-terminated string starting at the specified offset in the tvbuff (throwing an exception if the null terminator isn't found), allocates a buffer big enough to hold that string, copies the string to that buffer, and returns a pointer to that buffer and stores the length of the string (including the terminating null) in the variable pointed to by the "gint" pointer. Replace many pieces of code allocating a buffer and copying a string with calls to "tvb_get_string()" (for one thing, "tvb_get_string()" doesn't require you to remember that the argument to "tvb_get_nstringz0()" is the size of the buffer into which you're copying the string, which might be the length of the string to be copied *plus 1*). Don't use fixed-length buffers for null-terminated strings (even if the code that generates those packets has a #define to limit the length of the string). Use "tvb_get_stringz()", instead. In some cases where a value is fetched but is only used to pass an argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()" instead. svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
return ensure_contiguous_no_exception(member_tvb, member_offset, member_length, NULL);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
}
else {
tvb->real_data = tvb_memdup(tvb, 0, -1);
return tvb->real_data + abs_offset;
}
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT_NOT_REACHED();
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
}
Constify a bunch of stuff. svn path=/trunk/; revision=10106
2004-02-19 05:19:10 +00:00
static const guint8*
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
ensure_contiguous_no_exception(tvbuff_t *tvb, const gint offset, const gint length, int *exception)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint abs_offset, abs_length;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
if (!check_offset_length_no_exception(tvb->length, tvb->reported_length, offset, length,
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
&abs_offset, &abs_length, exception)) {
Fix "tvb_strneql()", "tvb_strncaseeql()", and "tvb_memeql()" not to throw an exception if there aren't enough bytes in the tvbuff to compare. svn path=/trunk/; revision=7813
2003-06-09 07:27:42 +00:00
return NULL;
}
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Add new routines: tvb_get_string() - takes a tvbuff, an offset, and a length as arguments, allocates a buffer big enough to hold a string with the specified number of bytes plus an added null terminator (i.e., length+1), copies the specified number of bytes from the tvbuff, at the specified offset, to that buffer and puts in a null terminator, and returns a pointer to that buffer (or throws an exception before allocating the buffer if that many bytes aren't available in the tvbuff); tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to a "gint" as arguments, gets the size of the null-terminated string starting at the specified offset in the tvbuff (throwing an exception if the null terminator isn't found), allocates a buffer big enough to hold that string, copies the string to that buffer, and returns a pointer to that buffer and stores the length of the string (including the terminating null) in the variable pointed to by the "gint" pointer. Replace many pieces of code allocating a buffer and copying a string with calls to "tvb_get_string()" (for one thing, "tvb_get_string()" doesn't require you to remember that the argument to "tvb_get_nstringz0()" is the size of the buffer into which you're copying the string, which might be the length of the string to be copied *plus 1*). Don't use fixed-length buffers for null-terminated strings (even if the code that generates those packets has a #define to limit the length of the string). Use "tvb_get_stringz()", instead. In some cases where a value is fetched but is only used to pass an argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()" instead. svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
/*
* We know that all the data is present in the tvbuff, so
* no exceptions should be thrown.
*/
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
if (tvb->real_data) {
return tvb->real_data + abs_offset;
}
else {
switch(tvb->type) {
case TVBUFF_REAL_DATA:
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT_NOT_REACHED();
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
case TVBUFF_SUBSET:
Add new routines: tvb_get_string() - takes a tvbuff, an offset, and a length as arguments, allocates a buffer big enough to hold a string with the specified number of bytes plus an added null terminator (i.e., length+1), copies the specified number of bytes from the tvbuff, at the specified offset, to that buffer and puts in a null terminator, and returns a pointer to that buffer (or throws an exception before allocating the buffer if that many bytes aren't available in the tvbuff); tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to a "gint" as arguments, gets the size of the null-terminated string starting at the specified offset in the tvbuff (throwing an exception if the null terminator isn't found), allocates a buffer big enough to hold that string, copies the string to that buffer, and returns a pointer to that buffer and stores the length of the string (including the terminating null) in the variable pointed to by the "gint" pointer. Replace many pieces of code allocating a buffer and copying a string with calls to "tvb_get_string()" (for one thing, "tvb_get_string()" doesn't require you to remember that the argument to "tvb_get_nstringz0()" is the size of the buffer into which you're copying the string, which might be the length of the string to be copied *plus 1*). Don't use fixed-length buffers for null-terminated strings (even if the code that generates those packets has a #define to limit the length of the string). Use "tvb_get_stringz()", instead. In some cases where a value is fetched but is only used to pass an argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()" instead. svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
return ensure_contiguous_no_exception(tvb->tvbuffs.subset.tvb,
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
abs_offset - tvb->tvbuffs.subset.offset,
Add new routines: tvb_get_string() - takes a tvbuff, an offset, and a length as arguments, allocates a buffer big enough to hold a string with the specified number of bytes plus an added null terminator (i.e., length+1), copies the specified number of bytes from the tvbuff, at the specified offset, to that buffer and puts in a null terminator, and returns a pointer to that buffer (or throws an exception before allocating the buffer if that many bytes aren't available in the tvbuff); tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to a "gint" as arguments, gets the size of the null-terminated string starting at the specified offset in the tvbuff (throwing an exception if the null terminator isn't found), allocates a buffer big enough to hold that string, copies the string to that buffer, and returns a pointer to that buffer and stores the length of the string (including the terminating null) in the variable pointed to by the "gint" pointer. Replace many pieces of code allocating a buffer and copying a string with calls to "tvb_get_string()" (for one thing, "tvb_get_string()" doesn't require you to remember that the argument to "tvb_get_nstringz0()" is the size of the buffer into which you're copying the string, which might be the length of the string to be copied *plus 1*). Don't use fixed-length buffers for null-terminated strings (even if the code that generates those packets has a #define to limit the length of the string). Use "tvb_get_stringz()", instead. In some cases where a value is fetched but is only used to pass an argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()" instead. svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
abs_length, NULL);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
case TVBUFF_COMPOSITE:
Add new routines: tvb_get_string() - takes a tvbuff, an offset, and a length as arguments, allocates a buffer big enough to hold a string with the specified number of bytes plus an added null terminator (i.e., length+1), copies the specified number of bytes from the tvbuff, at the specified offset, to that buffer and puts in a null terminator, and returns a pointer to that buffer (or throws an exception before allocating the buffer if that many bytes aren't available in the tvbuff); tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to a "gint" as arguments, gets the size of the null-terminated string starting at the specified offset in the tvbuff (throwing an exception if the null terminator isn't found), allocates a buffer big enough to hold that string, copies the string to that buffer, and returns a pointer to that buffer and stores the length of the string (including the terminating null) in the variable pointed to by the "gint" pointer. Replace many pieces of code allocating a buffer and copying a string with calls to "tvb_get_string()" (for one thing, "tvb_get_string()" doesn't require you to remember that the argument to "tvb_get_nstringz0()" is the size of the buffer into which you're copying the string, which might be the length of the string to be copied *plus 1*). Don't use fixed-length buffers for null-terminated strings (even if the code that generates those packets has a #define to limit the length of the string). Use "tvb_get_stringz()", instead. In some cases where a value is fetched but is only used to pass an argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()" instead. svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
return composite_ensure_contiguous_no_exception(tvb, abs_offset, abs_length);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
}
}
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT_NOT_REACHED();
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
return NULL;
}
(Trivial change) move ensure_contiguous() to reflect call hierarchy svn path=/trunk/; revision=29382
2009-08-11 18:28:10 +00:00
static const guint8*
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
ensure_contiguous(tvbuff_t *tvb, const gint offset, const gint length)
(Trivial change) move ensure_contiguous() to reflect call hierarchy svn path=/trunk/; revision=29382
2009-08-11 18:28:10 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
int exception;
(Trivial change) move ensure_contiguous() to reflect call hierarchy svn path=/trunk/; revision=29382
2009-08-11 18:28:10 +00:00
const guint8 *p;
p = ensure_contiguous_no_exception(tvb, offset, length, &exception);
if (p == NULL) {
DISSECTOR_ASSERT(exception > 0);
THROW(exception);
}
return p;
}
Apply yet another set of the optimization patches: - Use a fast path for the most common use of tvb_get_xxx functions: offset is >= 0 and tvb->real_data is set (this one is always true). - match_strval() is a linear search, put the most common protocols TCP/UDP/RDP first. - fix gtk1 g_strlcat declaration Use g_strlcat svn path=/trunk/; revision=23285
2007-10-27 14:44:29 +00:00
static const guint8*
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
fast_ensure_contiguous(tvbuff_t *tvb, const gint offset, const guint length)
Apply yet another set of the optimization patches: - Use a fast path for the most common use of tvb_get_xxx functions: offset is >= 0 and tvb->real_data is set (this one is always true). - match_strval() is a linear search, put the most common protocols TCP/UDP/RDP first. - fix gtk1 g_strlcat declaration Use g_strlcat svn path=/trunk/; revision=23285
2007-10-27 14:44:29 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint end_offset;
guint u_offset;
Apply yet another set of the optimization patches: - Use a fast path for the most common use of tvb_get_xxx functions: offset is >= 0 and tvb->real_data is set (this one is always true). - match_strval() is a linear search, put the most common protocols TCP/UDP/RDP first. - fix gtk1 g_strlcat declaration Use g_strlcat svn path=/trunk/; revision=23285
2007-10-27 14:44:29 +00:00
DISSECTOR_ASSERT(tvb && tvb->initialized);
Turn a comment in fast_ensure_contiguous() into a DISSECTOR_ASSERT() to make the implied requirement explicit. svn path=/trunk/; revision=29381
2009-08-11 18:16:55 +00:00
/* We don't check for overflow in this fast path so we only handle simple types */
DISSECTOR_ASSERT(length <= 8);
Apply yet another set of the optimization patches: - Use a fast path for the most common use of tvb_get_xxx functions: offset is >= 0 and tvb->real_data is set (this one is always true). - match_strval() is a linear search, put the most common protocols TCP/UDP/RDP first. - fix gtk1 g_strlcat declaration Use g_strlcat svn path=/trunk/; revision=23285
2007-10-27 14:44:29 +00:00
if (offset < 0 || !tvb->real_data) {
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
return ensure_contiguous(tvb, offset, length);
Apply yet another set of the optimization patches: - Use a fast path for the most common use of tvb_get_xxx functions: offset is >= 0 and tvb->real_data is set (this one is always true). - match_strval() is a linear search, put the most common protocols TCP/UDP/RDP first. - fix gtk1 g_strlcat declaration Use g_strlcat svn path=/trunk/; revision=23285
2007-10-27 14:44:29 +00:00
}
u_offset = offset;
end_offset = u_offset + length;
if (end_offset <= tvb->length) {
return tvb->real_data + u_offset;
}
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2649 by adding some length checks to two while loops in tvb_uncompress() svn path=/trunk/; revision=25677
2008-07-08 20:04:11 +00:00
Apply yet another set of the optimization patches: - Use a fast path for the most common use of tvb_get_xxx functions: offset is >= 0 and tvb->real_data is set (this one is always true). - match_strval() is a linear search, put the most common protocols TCP/UDP/RDP first. - fix gtk1 g_strlcat declaration Use g_strlcat svn path=/trunk/; revision=23285
2007-10-27 14:44:29 +00:00
if (end_offset > tvb->reported_length) {
THROW(ReportedBoundsError);
}
THROW(BoundsError);
/* not reached */
Turn a comment in fast_ensure_contiguous() into a DISSECTOR_ASSERT() to make the implied requirement explicit. svn path=/trunk/; revision=29381
2009-08-11 18:16:55 +00:00
return NULL;
Apply yet another set of the optimization patches: - Use a fast path for the most common use of tvb_get_xxx functions: offset is >= 0 and tvb->real_data is set (this one is always true). - match_strval() is a linear search, put the most common protocols TCP/UDP/RDP first. - fix gtk1 g_strlcat declaration Use g_strlcat svn path=/trunk/; revision=23285
2007-10-27 14:44:29 +00:00
}
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
static const guint8*
Make tvb_pbrk_guint8() return the found needle. svn path=/trunk/; revision=32144
2010-03-08 20:45:13 +00:00
guint8_pbrk(const guint8* haystack, size_t haystacklen, const guint8 *needles, guchar *found_needle)
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
gchar tmp[256] = { 0 };
From Jakub Zawadzki: - optimize guint8_pbrk(). svn path=/trunk/; revision=32583
2010-04-28 07:58:59 +00:00
const guint8 *haystack_end;
Make tvb_strneql()'s size parameter be a size_t. Remove some now-unnecessary casts. svn path=/trunk/; revision=34725
2010-10-30 18:18:12 +00:00
From Jakub Zawadzki: - optimize guint8_pbrk(). svn path=/trunk/; revision=32583
2010-04-28 07:58:59 +00:00
while (*needles)
tmp[*needles++] = 1;
haystack_end = haystack + haystacklen;
while (haystack < haystack_end) {
if (tmp[*haystack]) {
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
if (found_needle)
From Jakub Zawadzki: - optimize guint8_pbrk(). svn path=/trunk/; revision=32583
2010-04-28 07:58:59 +00:00
*found_needle = *haystack;
return haystack;
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
}
From Jakub Zawadzki: - optimize guint8_pbrk(). svn path=/trunk/; revision=32583
2010-04-28 07:58:59 +00:00
haystack++;
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
}
return NULL;
}
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
/************** ACCESSORS **************/
"memcpy()" takes void *'s as arguments and returns a void *; have tvb_memcpy() be similar, to avoid unnecessarily alignment warnings. Do the same with "ep_tvb_memdup()". svn path=/trunk/; revision=21554
2007-04-24 11:54:18 +00:00
static void*
Make the "length" argument of the tvb_mem* functions a size_t since it's not uncommon to pass them the result of pointer arithmetic. Add size_t casts in other areas. svn path=/trunk/; revision=27941
2009-04-03 15:30:38 +00:00
composite_memcpy(tvbuff_t *tvb, guint8* target, guint abs_offset, size_t abs_length)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint i, num_members;
tvb_comp_t *composite;
tvbuff_t *member_tvb = NULL;
guint member_offset, member_length;
gboolean retval;
GSList *slist;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT(tvb->type == TVBUFF_COMPOSITE);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
/* Maybe the range specified by offset/length
* is contiguous inside one of the member tvbuffs */
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
composite = &tvb->tvbuffs.composite;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
num_members = g_slist_length(composite->tvbs);
for (i = 0; i < num_members; i++) {
if (abs_offset <= composite->end_offsets[i]) {
slist = g_slist_nth(composite->tvbs, i);
member_tvb = slist->data;
break;
}
}
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT(member_tvb);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
if (check_offset_length_no_exception(member_tvb->length, member_tvb->reported_length, abs_offset - composite->start_offsets[i],
Make the "length" argument of the tvb_mem* functions a size_t since it's not uncommon to pass them the result of pointer arithmetic. Add size_t casts in other areas. svn path=/trunk/; revision=27941
2009-04-03 15:30:38 +00:00
(gint) abs_length, &member_offset, &member_length, NULL)) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT(!tvb->real_data);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
return tvb_memcpy(member_tvb, target, member_offset, member_length);
}
else {
/* The requested data is non-contiguous inside
* the member tvb. We have to memcpy() the part that's in the member tvb,
* then iterate across the other member tvb's, copying their portions
* until we have copied all data.
*/
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
retval = compute_offset_length(member_tvb->length, member_tvb->reported_length, abs_offset - composite->start_offsets[i], -1,
Have tvbuff's keep track of cap_len and pkt_len ('length' and 'reported_length' in tvbuff terminology). This is implemented for TVBUFF_REAL and TVBUFF_SUBSET so far; support for TVBUFF_COMPOSITE is coming soon. Throw either ReportedBoundsError or BoundsError. A ReportedBoundsError is reported as "Malformed Frame" since the protocol stated that a certain number of bytes should be available but they weren't. A BoundsError is reported as a "Short Frame" since the snaplen was too short. Register proto_short (BoundsError) and proto_malformed (ReportedBounds) so searches can be made on "short" and "malformed". svn path=/trunk/; revision=1965
2000-05-16 04:44:14 +00:00
&member_offset, &member_length, NULL);
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT(retval);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
tvb_memcpy(member_tvb, target, member_offset, member_length);
abs_offset += member_length;
abs_length -= member_length;
/* Recurse */
if (abs_length > 0) {
composite_memcpy(tvb, target + member_length, abs_offset, abs_length);
}
return target;
}
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT_NOT_REACHED();
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
}
"memcpy()" takes void *'s as arguments and returns a void *; have tvb_memcpy() be similar, to avoid unnecessarily alignment warnings. Do the same with "ep_tvb_memdup()". svn path=/trunk/; revision=21554
2007-04-24 11:54:18 +00:00
void*
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_memcpy(tvbuff_t *tvb, void* target, const gint offset, size_t length)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
guint abs_offset, abs_length;
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
DISSECTOR_ASSERT(tvb && tvb->initialized);
Reapply the change from revision 27946. svn path=/trunk/; revision=27963
2009-04-05 17:24:06 +00:00
/*
* XXX - we should eliminate the "length = -1 means 'to the end
* of the tvbuff'" convention, and use other means to achieve
* that; this would let us eliminate a bunch of checks for
* negative lengths in cases where the protocol has a 32-bit
* length field.
*
* Allowing -1 but throwing an assertion on other negative
* lengths is a bit more work with the length being a size_t;
* instead, we check for a length <= 2^31-1.
*/
DISSECTOR_ASSERT(length <= 0x7FFFFFFF);
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
check_offset_length(tvb->length, tvb->reported_length, offset, (gint) length, &abs_offset, &abs_length);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
if (tvb->real_data) {
"memcpy()" takes void *'s as arguments and returns a void *; have tvb_memcpy() be similar, to avoid unnecessarily alignment warnings. Do the same with "ep_tvb_memdup()". svn path=/trunk/; revision=21554
2007-04-24 11:54:18 +00:00
return memcpy(target, tvb->real_data + abs_offset, abs_length);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
}
switch(tvb->type) {
case TVBUFF_REAL_DATA:
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT_NOT_REACHED();
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
case TVBUFF_SUBSET:
return tvb_memcpy(tvb->tvbuffs.subset.tvb, target,
abs_offset - tvb->tvbuffs.subset.offset,
abs_length);
case TVBUFF_COMPOSITE:
return composite_memcpy(tvb, target, offset, length);
}
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT_NOT_REACHED();
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
return NULL;
}
Add a "tvb_ensure_bytes_exist()", which is like "tvb_bytes_exist()" only it throws the appropriate exception if the bytes don't exist. Use it in the GIOP and ASN.1 code to check whether the bytes to be copied to a buffer exist before allocating the buffer. Make "check_offset_length_no_exception()" check for an overflow, so that it can be used in "tvb_ensure_bytes_exist()" and do all the checking that the code "tvb_ensure_bytes_exist()" replaces did. Make "get_CDR_wchar()" return a "gint", so that if the length octet it fetched has a value between 128 and 255, the length can be returned correctly. Fix some comments not to specify the exception thrown by various routines that can throw various exceptions. svn path=/trunk/; revision=5453
2002-05-13 01:24:47 +00:00
/*
* XXX - this doesn't treat a length of -1 as an error.
* If it did, this could replace some code that calls
* "tvb_ensure_bytes_exist()" and then allocates a buffer and copies
* data to it.
*
Add new routines: tvb_get_string() - takes a tvbuff, an offset, and a length as arguments, allocates a buffer big enough to hold a string with the specified number of bytes plus an added null terminator (i.e., length+1), copies the specified number of bytes from the tvbuff, at the specified offset, to that buffer and puts in a null terminator, and returns a pointer to that buffer (or throws an exception before allocating the buffer if that many bytes aren't available in the tvbuff); tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to a "gint" as arguments, gets the size of the null-terminated string starting at the specified offset in the tvbuff (throwing an exception if the null terminator isn't found), allocates a buffer big enough to hold that string, copies the string to that buffer, and returns a pointer to that buffer and stores the length of the string (including the terminating null) in the variable pointed to by the "gint" pointer. Replace many pieces of code allocating a buffer and copying a string with calls to "tvb_get_string()" (for one thing, "tvb_get_string()" doesn't require you to remember that the argument to "tvb_get_nstringz0()" is the size of the buffer into which you're copying the string, which might be the length of the string to be copied *plus 1*). Don't use fixed-length buffers for null-terminated strings (even if the code that generates those packets has a #define to limit the length of the string). Use "tvb_get_stringz()", instead. In some cases where a value is fetched but is only used to pass an argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()" instead. svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
* "composite_ensure_contiguous_no_exception()" depends on -1 not being
* an error; does anything else depend on this routine treating -1 as
* meaning "to the end of the buffer"?
Add a "tvb_ensure_bytes_exist()", which is like "tvb_bytes_exist()" only it throws the appropriate exception if the bytes don't exist. Use it in the GIOP and ASN.1 code to check whether the bytes to be copied to a buffer exist before allocating the buffer. Make "check_offset_length_no_exception()" check for an overflow, so that it can be used in "tvb_ensure_bytes_exist()" and do all the checking that the code "tvb_ensure_bytes_exist()" replaces did. Make "get_CDR_wchar()" return a "gint", so that if the length octet it fetched has a value between 128 and 255, the length can be returned correctly. Fix some comments not to specify the exception thrown by various routines that can throw various exceptions. svn path=/trunk/; revision=5453
2002-05-13 01:24:47 +00:00
*/
Make tvb_memdup(), like ep_tvb_memdup(), return a "void *". svn path=/trunk/; revision=21610
2007-04-28 21:06:15 +00:00
void*
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_memdup(tvbuff_t *tvb, const gint offset, size_t length)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
guint abs_offset, abs_length;
Make tvb_memdup(), like ep_tvb_memdup(), return a "void *". svn path=/trunk/; revision=21610
2007-04-28 21:06:15 +00:00
void *duped;
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
DISSECTOR_ASSERT(tvb && tvb->initialized);
check_offset_length(tvb->length, tvb->reported_length, offset, (gint) length, &abs_offset, &abs_length);
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
duped = g_malloc(abs_length);
return tvb_memcpy(tvb, duped, abs_offset, abs_length);
}
new functions: ep_tvb_memdup() ep_alloc0() ep_strsplit() add all of the ep_ allocators to libethereal.def svn path=/trunk/; revision=15100
2005-07-26 18:32:12 +00:00
/*
* XXX - this doesn't treat a length of -1 as an error.
* If it did, this could replace some code that calls
* "tvb_ensure_bytes_exist()" and then allocates a buffer and copies
* data to it.
*
* "composite_ensure_contiguous_no_exception()" depends on -1 not being
* an error; does anything else depend on this routine treating -1 as
* meaning "to the end of the buffer"?
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
*
new functions: ep_tvb_memdup() ep_alloc0() ep_strsplit() add all of the ep_ allocators to libethereal.def svn path=/trunk/; revision=15100
2005-07-26 18:32:12 +00:00
* This function allocates memory from a buffer with packet lifetime.
* You do not have to free this buffer, it will be automatically freed
name change svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
* when wireshark starts decoding the next packet.
new functions: ep_tvb_memdup() ep_alloc0() ep_strsplit() add all of the ep_ allocators to libethereal.def svn path=/trunk/; revision=15100
2005-07-26 18:32:12 +00:00
* Do not use this function if you want the allocated memory to be persistent
* after the current packet has been dissected.
*/
"memcpy()" takes void *'s as arguments and returns a void *; have tvb_memcpy() be similar, to avoid unnecessarily alignment warnings. Do the same with "ep_tvb_memdup()". svn path=/trunk/; revision=21554
2007-04-24 11:54:18 +00:00
void*
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
ep_tvb_memdup(tvbuff_t *tvb, const gint offset, size_t length)
new functions: ep_tvb_memdup() ep_alloc0() ep_strsplit() add all of the ep_ allocators to libethereal.def svn path=/trunk/; revision=15100
2005-07-26 18:32:12 +00:00
{
guint abs_offset, abs_length;
"memcpy()" takes void *'s as arguments and returns a void *; have tvb_memcpy() be similar, to avoid unnecessarily alignment warnings. Do the same with "ep_tvb_memdup()". svn path=/trunk/; revision=21554
2007-04-24 11:54:18 +00:00
void *duped;
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
DISSECTOR_ASSERT(tvb && tvb->initialized);
check_offset_length(tvb->length, tvb->reported_length, offset, (gint) length, &abs_offset, &abs_length);
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
new functions: ep_tvb_memdup() ep_alloc0() ep_strsplit() add all of the ep_ allocators to libethereal.def svn path=/trunk/; revision=15100
2005-07-26 18:32:12 +00:00
duped = ep_alloc(abs_length);
return tvb_memcpy(tvb, duped, abs_offset, abs_length);
}
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6116
2002-08-28 20:41:00 +00:00
Make tvb_get_ptr() return 'const guint8*', and clean up all the usages of tvb_get_ptr(). packet-ieee80211.c still has one bad usage, in which it *does* modify the tvbuff's data. svn path=/trunk/; revision=3128
2001-03-13 21:34:28 +00:00
const guint8*
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_ptr(tvbuff_t *tvb, const gint offset, const gint length)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
return ensure_contiguous(tvb, offset, length);
}
Apply yet another set of the optimization patches: - Use a fast path for the most common use of tvb_get_xxx functions: offset is >= 0 and tvb->real_data is set (this one is always true). - match_strval() is a linear search, put the most common protocols TCP/UDP/RDP first. - fix gtk1 g_strlcat declaration Use g_strlcat svn path=/trunk/; revision=23285
2007-10-27 14:44:29 +00:00
/* ---------------- */
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
guint8
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_guint8(tvbuff_t *tvb, const gint offset)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Apply yet another set of the optimization patches: - Use a fast path for the most common use of tvb_get_xxx functions: offset is >= 0 and tvb->real_data is set (this one is always true). - match_strval() is a linear search, put the most common protocols TCP/UDP/RDP first. - fix gtk1 g_strlcat declaration Use g_strlcat svn path=/trunk/; revision=23285
2007-10-27 14:44:29 +00:00
ptr = fast_ensure_contiguous(tvb, offset, sizeof(guint8));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
return *ptr;
}
guint16
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_ntohs(tvbuff_t *tvb, const gint offset)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Apply yet another set of the optimization patches: - Use a fast path for the most common use of tvb_get_xxx functions: offset is >= 0 and tvb->real_data is set (this one is always true). - match_strval() is a linear search, put the most common protocols TCP/UDP/RDP first. - fix gtk1 g_strlcat declaration Use g_strlcat svn path=/trunk/; revision=23285
2007-10-27 14:44:29 +00:00
ptr = fast_ensure_contiguous(tvb, offset, sizeof(guint16));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
return pntohs(ptr);
}
If G_HAVE_GINT64 is defined, so that we can use "gint64" and "guint64" to refer to 64-bit integral quantities, add "pntohll()" and "phtonll()" macros, and "tvb_get_ntohll()" and "tvb_get_letohll()" routines, for fetching 64-bit integral quantities. (They're still a pain to *print*, as there's no standard "printf" format code for them - some systems use "%ll[dox]", some use "%q[dox]", and I think some use formats different from all of them.) svn path=/trunk/; revision=2243
2000-08-10 07:58:44 +00:00
guint32
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_ntoh24(tvbuff_t *tvb, const gint offset)
If G_HAVE_GINT64 is defined, so that we can use "gint64" and "guint64" to refer to 64-bit integral quantities, add "pntohll()" and "phtonll()" macros, and "tvb_get_ntohll()" and "tvb_get_letohll()" routines, for fetching 64-bit integral quantities. (They're still a pain to *print*, as there's no standard "printf" format code for them - some systems use "%ll[dox]", some use "%q[dox]", and I think some use formats different from all of them.) svn path=/trunk/; revision=2243
2000-08-10 07:58:44 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr;
If G_HAVE_GINT64 is defined, so that we can use "gint64" and "guint64" to refer to 64-bit integral quantities, add "pntohll()" and "phtonll()" macros, and "tvb_get_ntohll()" and "tvb_get_letohll()" routines, for fetching 64-bit integral quantities. (They're still a pain to *print*, as there's no standard "printf" format code for them - some systems use "%ll[dox]", some use "%q[dox]", and I think some use formats different from all of them.) svn path=/trunk/; revision=2243
2000-08-10 07:58:44 +00:00
Apply yet another set of the optimization patches: - Use a fast path for the most common use of tvb_get_xxx functions: offset is >= 0 and tvb->real_data is set (this one is always true). - match_strval() is a linear search, put the most common protocols TCP/UDP/RDP first. - fix gtk1 g_strlcat declaration Use g_strlcat svn path=/trunk/; revision=23285
2007-10-27 14:44:29 +00:00
ptr = fast_ensure_contiguous(tvb, offset, 3);
If G_HAVE_GINT64 is defined, so that we can use "gint64" and "guint64" to refer to 64-bit integral quantities, add "pntohll()" and "phtonll()" macros, and "tvb_get_ntohll()" and "tvb_get_letohll()" routines, for fetching 64-bit integral quantities. (They're still a pain to *print*, as there's no standard "printf" format code for them - some systems use "%ll[dox]", some use "%q[dox]", and I think some use formats different from all of them.) svn path=/trunk/; revision=2243
2000-08-10 07:58:44 +00:00
return pntoh24(ptr);
}
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
guint32
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_ntohl(tvbuff_t *tvb, const gint offset)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Apply yet another set of the optimization patches: - Use a fast path for the most common use of tvb_get_xxx functions: offset is >= 0 and tvb->real_data is set (this one is always true). - match_strval() is a linear search, put the most common protocols TCP/UDP/RDP first. - fix gtk1 g_strlcat declaration Use g_strlcat svn path=/trunk/; revision=23285
2007-10-27 14:44:29 +00:00
ptr = fast_ensure_contiguous(tvb, offset, sizeof(guint32));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
return pntohl(ptr);
}
Add tvb_get_[n|le]toh[40|48|56]() accessors. Addresses bug 5082. svn path=/trunk/; revision=35538
2011-01-14 19:02:38 +00:00
guint64
tvb_get_ntoh40(tvbuff_t *tvb, const gint offset)
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr;
Add tvb_get_[n|le]toh[40|48|56]() accessors. Addresses bug 5082. svn path=/trunk/; revision=35538
2011-01-14 19:02:38 +00:00
ptr = fast_ensure_contiguous(tvb, offset, 5);
return pntoh40(ptr);
}
guint64
tvb_get_ntoh48(tvbuff_t *tvb, const gint offset)
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr;
Add tvb_get_[n|le]toh[40|48|56]() accessors. Addresses bug 5082. svn path=/trunk/; revision=35538
2011-01-14 19:02:38 +00:00
ptr = fast_ensure_contiguous(tvb, offset, 6);
return pntoh48(ptr);
}
guint64
tvb_get_ntoh56(tvbuff_t *tvb, const gint offset)
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr;
Add tvb_get_[n|le]toh[40|48|56]() accessors. Addresses bug 5082. svn path=/trunk/; revision=35538
2011-01-14 19:02:38 +00:00
ptr = fast_ensure_contiguous(tvb, offset, 7);
return pntoh56(ptr);
}
Add "tvb_get_ntoh64()" and "tvb_get_letoh64()" routines to fetch 64-bit integers. Make FT_INT64 and FT_UINT64 add numerical values, rather than byte-array values, to the protocol tree, and add routines to add specified 64-bit integer values to the protocol tree. Use those routines in the RSVP dissector. svn path=/trunk/; revision=11796
2004-08-22 00:31:58 +00:00
guint64
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_ntoh64(tvbuff_t *tvb, const gint offset)
Add "tvb_get_ntoh64()" and "tvb_get_letoh64()" routines to fetch 64-bit integers. Make FT_INT64 and FT_UINT64 add numerical values, rather than byte-array values, to the protocol tree, and add routines to add specified 64-bit integer values to the protocol tree. Use those routines in the RSVP dissector. svn path=/trunk/; revision=11796
2004-08-22 00:31:58 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr;
Add "tvb_get_ntoh64()" and "tvb_get_letoh64()" routines to fetch 64-bit integers. Make FT_INT64 and FT_UINT64 add numerical values, rather than byte-array values, to the protocol tree, and add routines to add specified 64-bit integer values to the protocol tree. Use those routines in the RSVP dissector. svn path=/trunk/; revision=11796
2004-08-22 00:31:58 +00:00
Apply yet another set of the optimization patches: - Use a fast path for the most common use of tvb_get_xxx functions: offset is >= 0 and tvb->real_data is set (this one is always true). - match_strval() is a linear search, put the most common protocols TCP/UDP/RDP first. - fix gtk1 g_strlcat declaration Use g_strlcat svn path=/trunk/; revision=23285
2007-10-27 14:44:29 +00:00
ptr = fast_ensure_contiguous(tvb, offset, sizeof(guint64));
Add "tvb_get_ntoh64()" and "tvb_get_letoh64()" routines to fetch 64-bit integers. Make FT_INT64 and FT_UINT64 add numerical values, rather than byte-array values, to the protocol tree, and add routines to add specified 64-bit integer values to the protocol tree. Use those routines in the RSVP dissector. svn path=/trunk/; revision=11796
2004-08-22 00:31:58 +00:00
return pntoh64(ptr);
}
Use Ashok's IEEE-float-to-long code as the basis for IEEE-float-to-native-float code, and use that as the basis for IEEE-double-to-native-double code. Use that code on VAXes. Eliminate "ieee-float.h", as we no longer use it; instead, we use the tvbuff routines for extracting IEEE floating-point numbers. svn path=/trunk/; revision=5243
2002-04-24 21:19:38 +00:00
/*
* Stuff for IEEE float handling on platforms that don't have IEEE
* format as the native floating-point format.
*
* For now, we treat only the VAX as such a platform.
*
* XXX - other non-IEEE boxes that can run UNIX include some Crays,
* and possibly other machines.
*
* It appears that the official Linux port to System/390 and
* zArchitecture uses IEEE format floating point (not a
* huge surprise).
*
* I don't know whether there are any other machines that
name change svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
* could run Wireshark and that don't use IEEE format.
Use Ashok's IEEE-float-to-long code as the basis for IEEE-float-to-native-float code, and use that as the basis for IEEE-double-to-native-double code. Use that code on VAXes. Eliminate "ieee-float.h", as we no longer use it; instead, we use the tvbuff routines for extracting IEEE floating-point numbers. svn path=/trunk/; revision=5243
2002-04-24 21:19:38 +00:00
* As far as I know, all of the main commercial microprocessor
name change svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
* families on which OSes that support Wireshark can run
Use Ashok's IEEE-float-to-long code as the basis for IEEE-float-to-native-float code, and use that as the basis for IEEE-double-to-native-double code. Use that code on VAXes. Eliminate "ieee-float.h", as we no longer use it; instead, we use the tvbuff routines for extracting IEEE floating-point numbers. svn path=/trunk/; revision=5243
2002-04-24 21:19:38 +00:00
* use IEEE format (x86, 68k, SPARC, MIPS, PA-RISC, Alpha,
* IA-64, and so on).
*/
#if defined(vax)
#include <math.h>
/*
* Single-precision.
*/
#define IEEE_SP_NUMBER_WIDTH 32 /* bits in number */
#define IEEE_SP_EXP_WIDTH 8 /* bits in exponent */
#define IEEE_SP_MANTISSA_WIDTH 23 /* IEEE_SP_NUMBER_WIDTH - 1 - IEEE_SP_EXP_WIDTH */
#define IEEE_SP_SIGN_MASK 0x80000000
#define IEEE_SP_EXPONENT_MASK 0x7F800000
#define IEEE_SP_MANTISSA_MASK 0x007FFFFF
#define IEEE_SP_INFINITY IEEE_SP_EXPONENT_MASK
#define IEEE_SP_IMPLIED_BIT (1 << IEEE_SP_MANTISSA_WIDTH)
#define IEEE_SP_INFINITE ((1 << IEEE_SP_EXP_WIDTH) - 1)
#define IEEE_SP_BIAS ((1 << (IEEE_SP_EXP_WIDTH - 1)) - 1)
static int
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
ieee_float_is_zero(const guint32 w)
Use Ashok's IEEE-float-to-long code as the basis for IEEE-float-to-native-float code, and use that as the basis for IEEE-double-to-native-double code. Use that code on VAXes. Eliminate "ieee-float.h", as we no longer use it; instead, we use the tvbuff routines for extracting IEEE floating-point numbers. svn path=/trunk/; revision=5243
2002-04-24 21:19:38 +00:00
{
return ((w & ~IEEE_SP_SIGN_MASK) == 0);
}
Use "gfloat" and "gdouble", rather than "float" and "double", as the return types of the tvbuff accessors for floating-point types, to more closely match the tvbuff accessors for integral types. Fix an error in the code for fetching doubles on VAXes, and get rid of unused union members on VAXes. svn path=/trunk/; revision=5245
2002-04-24 21:53:05 +00:00
static gfloat
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
get_ieee_float(const guint32 w)
Use Ashok's IEEE-float-to-long code as the basis for IEEE-float-to-native-float code, and use that as the basis for IEEE-double-to-native-double code. Use that code on VAXes. Eliminate "ieee-float.h", as we no longer use it; instead, we use the tvbuff routines for extracting IEEE floating-point numbers. svn path=/trunk/; revision=5243
2002-04-24 21:19:38 +00:00
{
long sign;
long exponent;
long mantissa;
sign = w & IEEE_SP_SIGN_MASK;
exponent = w & IEEE_SP_EXPONENT_MASK;
mantissa = w & IEEE_SP_MANTISSA_MASK;
if (ieee_float_is_zero(w)) {
/* number is zero, unnormalized, or not-a-number */
return 0.0;
}
#if 0
/*
* XXX - how to handle this?
*/
if (IEEE_SP_INFINITY == exponent) {
/*
* number is positive or negative infinity, or a special value
*/
return (sign? MINUS_INFINITY: PLUS_INFINITY);
}
#endif
exponent = ((exponent >> IEEE_SP_MANTISSA_WIDTH) - IEEE_SP_BIAS) -
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
IEEE_SP_MANTISSA_WIDTH;
Use Ashok's IEEE-float-to-long code as the basis for IEEE-float-to-native-float code, and use that as the basis for IEEE-double-to-native-double code. Use that code on VAXes. Eliminate "ieee-float.h", as we no longer use it; instead, we use the tvbuff routines for extracting IEEE floating-point numbers. svn path=/trunk/; revision=5243
2002-04-24 21:19:38 +00:00
mantissa |= IEEE_SP_IMPLIED_BIT;
if (sign)
return -mantissa * pow(2, exponent);
else
return mantissa * pow(2, exponent);
}
/*
* Double-precision.
* We assume that if you don't have IEEE floating-point, you have a
* compiler that understands 64-bit integral quantities.
*/
#define IEEE_DP_NUMBER_WIDTH 64 /* bits in number */
#define IEEE_DP_EXP_WIDTH 11 /* bits in exponent */
#define IEEE_DP_MANTISSA_WIDTH 52 /* IEEE_DP_NUMBER_WIDTH - 1 - IEEE_DP_EXP_WIDTH */
#define IEEE_DP_SIGN_MASK 0x8000000000000000LL
#define IEEE_DP_EXPONENT_MASK 0x7FF0000000000000LL
#define IEEE_DP_MANTISSA_MASK 0x000FFFFFFFFFFFFFLL
#define IEEE_DP_INFINITY IEEE_DP_EXPONENT_MASK
#define IEEE_DP_IMPLIED_BIT (1LL << IEEE_DP_MANTISSA_WIDTH)
#define IEEE_DP_INFINITE ((1 << IEEE_DP_EXP_WIDTH) - 1)
#define IEEE_DP_BIAS ((1 << (IEEE_DP_EXP_WIDTH - 1)) - 1)
static int
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
ieee_double_is_zero(const guint64 w)
Use Ashok's IEEE-float-to-long code as the basis for IEEE-float-to-native-float code, and use that as the basis for IEEE-double-to-native-double code. Use that code on VAXes. Eliminate "ieee-float.h", as we no longer use it; instead, we use the tvbuff routines for extracting IEEE floating-point numbers. svn path=/trunk/; revision=5243
2002-04-24 21:19:38 +00:00
{
return ((w & ~IEEE_SP_SIGN_MASK) == 0);
}
Use "gfloat" and "gdouble", rather than "float" and "double", as the return types of the tvbuff accessors for floating-point types, to more closely match the tvbuff accessors for integral types. Fix an error in the code for fetching doubles on VAXes, and get rid of unused union members on VAXes. svn path=/trunk/; revision=5245
2002-04-24 21:53:05 +00:00
static gdouble
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
get_ieee_double(const guint64 w)
Use Ashok's IEEE-float-to-long code as the basis for IEEE-float-to-native-float code, and use that as the basis for IEEE-double-to-native-double code. Use that code on VAXes. Eliminate "ieee-float.h", as we no longer use it; instead, we use the tvbuff routines for extracting IEEE floating-point numbers. svn path=/trunk/; revision=5243
2002-04-24 21:19:38 +00:00
{
gint64 sign;
gint64 exponent;
gint64 mantissa;
sign = w & IEEE_DP_SIGN_MASK;
exponent = w & IEEE_DP_EXPONENT_MASK;
mantissa = w & IEEE_DP_MANTISSA_MASK;
if (ieee_double_is_zero(w)) {
/* number is zero, unnormalized, or not-a-number */
return 0.0;
}
#if 0
/*
* XXX - how to handle this?
*/
if (IEEE_DP_INFINITY == exponent) {
/*
* number is positive or negative infinity, or a special value
*/
return (sign? MINUS_INFINITY: PLUS_INFINITY);
}
#endif
exponent = ((exponent >> IEEE_DP_MANTISSA_WIDTH) - IEEE_DP_BIAS) -
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
IEEE_DP_MANTISSA_WIDTH;
Use Ashok's IEEE-float-to-long code as the basis for IEEE-float-to-native-float code, and use that as the basis for IEEE-double-to-native-double code. Use that code on VAXes. Eliminate "ieee-float.h", as we no longer use it; instead, we use the tvbuff routines for extracting IEEE floating-point numbers. svn path=/trunk/; revision=5243
2002-04-24 21:19:38 +00:00
mantissa |= IEEE_DP_IMPLIED_BIT;
if (sign)
return -mantissa * pow(2, exponent);
else
return mantissa * pow(2, exponent);
}
#endif
Add (untested) routines to fetch IEEE single-precision and double-precision floating-point numbers, in big-endian and little-endian format (hopefully there aren't any middle-endian formats; if there are, we'll have to add them), from a tvbuff, and to return floats (for single-precision) and doubles (for double-precision). svn path=/trunk/; revision=5147
2002-04-12 23:25:24 +00:00
/*
* Fetches an IEEE single-precision floating-point number, in
* big-endian form, and returns a "float".
*
* XXX - should this be "double", in case there are IEEE single-
* precision numbers that won't fit in some platform's native
* "float" format?
*/
Use "gfloat" and "gdouble", rather than "float" and "double", as the return types of the tvbuff accessors for floating-point types, to more closely match the tvbuff accessors for integral types. Fix an error in the code for fetching doubles on VAXes, and get rid of unused union members on VAXes. svn path=/trunk/; revision=5245
2002-04-24 21:53:05 +00:00
gfloat
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_ntohieee_float(tvbuff_t *tvb, const int offset)
Add (untested) routines to fetch IEEE single-precision and double-precision floating-point numbers, in big-endian and little-endian format (hopefully there aren't any middle-endian formats; if there are, we'll have to add them), from a tvbuff, and to return floats (for single-precision) and doubles (for double-precision). svn path=/trunk/; revision=5147
2002-04-12 23:25:24 +00:00
{
#if defined(vax)
Use Ashok's IEEE-float-to-long code as the basis for IEEE-float-to-native-float code, and use that as the basis for IEEE-double-to-native-double code. Use that code on VAXes. Eliminate "ieee-float.h", as we no longer use it; instead, we use the tvbuff routines for extracting IEEE floating-point numbers. svn path=/trunk/; revision=5243
2002-04-24 21:19:38 +00:00
return get_ieee_float(tvb_get_ntohl(tvb, offset));
Add (untested) routines to fetch IEEE single-precision and double-precision floating-point numbers, in big-endian and little-endian format (hopefully there aren't any middle-endian formats; if there are, we'll have to add them), from a tvbuff, and to return floats (for single-precision) and doubles (for double-precision). svn path=/trunk/; revision=5147
2002-04-12 23:25:24 +00:00
#else
union {
Use "gfloat" and "gdouble", rather than "float" and "double", as the return types of the tvbuff accessors for floating-point types, to more closely match the tvbuff accessors for integral types. Fix an error in the code for fetching doubles on VAXes, and get rid of unused union members on VAXes. svn path=/trunk/; revision=5245
2002-04-24 21:53:05 +00:00
gfloat f;
Add (untested) routines to fetch IEEE single-precision and double-precision floating-point numbers, in big-endian and little-endian format (hopefully there aren't any middle-endian formats; if there are, we'll have to add them), from a tvbuff, and to return floats (for single-precision) and doubles (for double-precision). svn path=/trunk/; revision=5147
2002-04-12 23:25:24 +00:00
guint32 w;
} ieee_fp_union;
ieee_fp_union.w = tvb_get_ntohl(tvb, offset);
return ieee_fp_union.f;
#endif
}
/*
* Fetches an IEEE double-precision floating-point number, in
* big-endian form, and returns a "double".
*/
Use "gfloat" and "gdouble", rather than "float" and "double", as the return types of the tvbuff accessors for floating-point types, to more closely match the tvbuff accessors for integral types. Fix an error in the code for fetching doubles on VAXes, and get rid of unused union members on VAXes. svn path=/trunk/; revision=5245
2002-04-24 21:53:05 +00:00
gdouble
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_ntohieee_double(tvbuff_t *tvb, const int offset)
Add (untested) routines to fetch IEEE single-precision and double-precision floating-point numbers, in big-endian and little-endian format (hopefully there aren't any middle-endian formats; if there are, we'll have to add them), from a tvbuff, and to return floats (for single-precision) and doubles (for double-precision). svn path=/trunk/; revision=5147
2002-04-12 23:25:24 +00:00
{
#if defined(vax)
Use Ashok's IEEE-float-to-long code as the basis for IEEE-float-to-native-float code, and use that as the basis for IEEE-double-to-native-double code. Use that code on VAXes. Eliminate "ieee-float.h", as we no longer use it; instead, we use the tvbuff routines for extracting IEEE floating-point numbers. svn path=/trunk/; revision=5243
2002-04-24 21:19:38 +00:00
union {
guint32 w[2];
guint64 dw;
} ieee_fp_union;
Add (untested) routines to fetch IEEE single-precision and double-precision floating-point numbers, in big-endian and little-endian format (hopefully there aren't any middle-endian formats; if there are, we'll have to add them), from a tvbuff, and to return floats (for single-precision) and doubles (for double-precision). svn path=/trunk/; revision=5147
2002-04-12 23:25:24 +00:00
#else
union {
Use "gfloat" and "gdouble", rather than "float" and "double", as the return types of the tvbuff accessors for floating-point types, to more closely match the tvbuff accessors for integral types. Fix an error in the code for fetching doubles on VAXes, and get rid of unused union members on VAXes. svn path=/trunk/; revision=5245
2002-04-24 21:53:05 +00:00
gdouble d;
Add (untested) routines to fetch IEEE single-precision and double-precision floating-point numbers, in big-endian and little-endian format (hopefully there aren't any middle-endian formats; if there are, we'll have to add them), from a tvbuff, and to return floats (for single-precision) and doubles (for double-precision). svn path=/trunk/; revision=5147
2002-04-12 23:25:24 +00:00
guint32 w[2];
} ieee_fp_union;
Use Ashok's IEEE-float-to-long code as the basis for IEEE-float-to-native-float code, and use that as the basis for IEEE-double-to-native-double code. Use that code on VAXes. Eliminate "ieee-float.h", as we no longer use it; instead, we use the tvbuff routines for extracting IEEE floating-point numbers. svn path=/trunk/; revision=5243
2002-04-24 21:19:38 +00:00
#endif
Add (untested) routines to fetch IEEE single-precision and double-precision floating-point numbers, in big-endian and little-endian format (hopefully there aren't any middle-endian formats; if there are, we'll have to add them), from a tvbuff, and to return floats (for single-precision) and doubles (for double-precision). svn path=/trunk/; revision=5147
2002-04-12 23:25:24 +00:00
#ifdef WORDS_BIGENDIAN
ieee_fp_union.w[0] = tvb_get_ntohl(tvb, offset);
ieee_fp_union.w[1] = tvb_get_ntohl(tvb, offset+4);
#else
ieee_fp_union.w[0] = tvb_get_ntohl(tvb, offset+4);
ieee_fp_union.w[1] = tvb_get_ntohl(tvb, offset);
#endif
Use Ashok's IEEE-float-to-long code as the basis for IEEE-float-to-native-float code, and use that as the basis for IEEE-double-to-native-double code. Use that code on VAXes. Eliminate "ieee-float.h", as we no longer use it; instead, we use the tvbuff routines for extracting IEEE floating-point numbers. svn path=/trunk/; revision=5243
2002-04-24 21:19:38 +00:00
#if defined(vax)
Use "gfloat" and "gdouble", rather than "float" and "double", as the return types of the tvbuff accessors for floating-point types, to more closely match the tvbuff accessors for integral types. Fix an error in the code for fetching doubles on VAXes, and get rid of unused union members on VAXes. svn path=/trunk/; revision=5245
2002-04-24 21:53:05 +00:00
return get_ieee_double(ieee_fp_union.dw);
Use Ashok's IEEE-float-to-long code as the basis for IEEE-float-to-native-float code, and use that as the basis for IEEE-double-to-native-double code. Use that code on VAXes. Eliminate "ieee-float.h", as we no longer use it; instead, we use the tvbuff routines for extracting IEEE floating-point numbers. svn path=/trunk/; revision=5243
2002-04-24 21:19:38 +00:00
#else
Add (untested) routines to fetch IEEE single-precision and double-precision floating-point numbers, in big-endian and little-endian format (hopefully there aren't any middle-endian formats; if there are, we'll have to add them), from a tvbuff, and to return floats (for single-precision) and doubles (for double-precision). svn path=/trunk/; revision=5147
2002-04-12 23:25:24 +00:00
return ieee_fp_union.d;
#endif
}
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
guint16
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_letohs(tvbuff_t *tvb, const gint offset)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Apply yet another set of the optimization patches: - Use a fast path for the most common use of tvb_get_xxx functions: offset is >= 0 and tvb->real_data is set (this one is always true). - match_strval() is a linear search, put the most common protocols TCP/UDP/RDP first. - fix gtk1 g_strlcat declaration Use g_strlcat svn path=/trunk/; revision=23285
2007-10-27 14:44:29 +00:00
ptr = fast_ensure_contiguous(tvb, offset, sizeof(guint16));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
return pletohs(ptr);
}
If G_HAVE_GINT64 is defined, so that we can use "gint64" and "guint64" to refer to 64-bit integral quantities, add "pntohll()" and "phtonll()" macros, and "tvb_get_ntohll()" and "tvb_get_letohll()" routines, for fetching 64-bit integral quantities. (They're still a pain to *print*, as there's no standard "printf" format code for them - some systems use "%ll[dox]", some use "%q[dox]", and I think some use formats different from all of them.) svn path=/trunk/; revision=2243
2000-08-10 07:58:44 +00:00
guint32
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_letoh24(tvbuff_t *tvb, const gint offset)
If G_HAVE_GINT64 is defined, so that we can use "gint64" and "guint64" to refer to 64-bit integral quantities, add "pntohll()" and "phtonll()" macros, and "tvb_get_ntohll()" and "tvb_get_letohll()" routines, for fetching 64-bit integral quantities. (They're still a pain to *print*, as there's no standard "printf" format code for them - some systems use "%ll[dox]", some use "%q[dox]", and I think some use formats different from all of them.) svn path=/trunk/; revision=2243
2000-08-10 07:58:44 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr;
If G_HAVE_GINT64 is defined, so that we can use "gint64" and "guint64" to refer to 64-bit integral quantities, add "pntohll()" and "phtonll()" macros, and "tvb_get_ntohll()" and "tvb_get_letohll()" routines, for fetching 64-bit integral quantities. (They're still a pain to *print*, as there's no standard "printf" format code for them - some systems use "%ll[dox]", some use "%q[dox]", and I think some use formats different from all of them.) svn path=/trunk/; revision=2243
2000-08-10 07:58:44 +00:00
Apply yet another set of the optimization patches: - Use a fast path for the most common use of tvb_get_xxx functions: offset is >= 0 and tvb->real_data is set (this one is always true). - match_strval() is a linear search, put the most common protocols TCP/UDP/RDP first. - fix gtk1 g_strlcat declaration Use g_strlcat svn path=/trunk/; revision=23285
2007-10-27 14:44:29 +00:00
ptr = fast_ensure_contiguous(tvb, offset, 3);
If G_HAVE_GINT64 is defined, so that we can use "gint64" and "guint64" to refer to 64-bit integral quantities, add "pntohll()" and "phtonll()" macros, and "tvb_get_ntohll()" and "tvb_get_letohll()" routines, for fetching 64-bit integral quantities. (They're still a pain to *print*, as there's no standard "printf" format code for them - some systems use "%ll[dox]", some use "%q[dox]", and I think some use formats different from all of them.) svn path=/trunk/; revision=2243
2000-08-10 07:58:44 +00:00
return pletoh24(ptr);
}
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
guint32
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_letohl(tvbuff_t *tvb, const gint offset)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr;
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Apply yet another set of the optimization patches: - Use a fast path for the most common use of tvb_get_xxx functions: offset is >= 0 and tvb->real_data is set (this one is always true). - match_strval() is a linear search, put the most common protocols TCP/UDP/RDP first. - fix gtk1 g_strlcat declaration Use g_strlcat svn path=/trunk/; revision=23285
2007-10-27 14:44:29 +00:00
ptr = fast_ensure_contiguous(tvb, offset, sizeof(guint32));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
return pletohl(ptr);
}
Add accessors for 24-bit integers (which get returned as guint32's). svn path=/trunk/; revision=1961
2000-05-15 04:37:27 +00:00
Add tvb_get_[n|le]toh[40|48|56]() accessors. Addresses bug 5082. svn path=/trunk/; revision=35538
2011-01-14 19:02:38 +00:00
guint64
tvb_get_letoh40(tvbuff_t *tvb, const gint offset)
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr;
Add tvb_get_[n|le]toh[40|48|56]() accessors. Addresses bug 5082. svn path=/trunk/; revision=35538
2011-01-14 19:02:38 +00:00
ptr = fast_ensure_contiguous(tvb, offset, 5);
return pletoh40(ptr);
}
guint64
tvb_get_letoh48(tvbuff_t *tvb, const gint offset)
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr;
Add tvb_get_[n|le]toh[40|48|56]() accessors. Addresses bug 5082. svn path=/trunk/; revision=35538
2011-01-14 19:02:38 +00:00
ptr = fast_ensure_contiguous(tvb, offset, 6);
return pletoh48(ptr);
}
guint64
tvb_get_letoh56(tvbuff_t *tvb, const gint offset)
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr;
Add tvb_get_[n|le]toh[40|48|56]() accessors. Addresses bug 5082. svn path=/trunk/; revision=35538
2011-01-14 19:02:38 +00:00
ptr = fast_ensure_contiguous(tvb, offset, 7);
return pletoh56(ptr);
}
Add "tvb_get_ntoh64()" and "tvb_get_letoh64()" routines to fetch 64-bit integers. Make FT_INT64 and FT_UINT64 add numerical values, rather than byte-array values, to the protocol tree, and add routines to add specified 64-bit integer values to the protocol tree. Use those routines in the RSVP dissector. svn path=/trunk/; revision=11796
2004-08-22 00:31:58 +00:00
guint64
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_letoh64(tvbuff_t *tvb, const gint offset)
Add "tvb_get_ntoh64()" and "tvb_get_letoh64()" routines to fetch 64-bit integers. Make FT_INT64 and FT_UINT64 add numerical values, rather than byte-array values, to the protocol tree, and add routines to add specified 64-bit integer values to the protocol tree. Use those routines in the RSVP dissector. svn path=/trunk/; revision=11796
2004-08-22 00:31:58 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr;
Add "tvb_get_ntoh64()" and "tvb_get_letoh64()" routines to fetch 64-bit integers. Make FT_INT64 and FT_UINT64 add numerical values, rather than byte-array values, to the protocol tree, and add routines to add specified 64-bit integer values to the protocol tree. Use those routines in the RSVP dissector. svn path=/trunk/; revision=11796
2004-08-22 00:31:58 +00:00
Apply yet another set of the optimization patches: - Use a fast path for the most common use of tvb_get_xxx functions: offset is >= 0 and tvb->real_data is set (this one is always true). - match_strval() is a linear search, put the most common protocols TCP/UDP/RDP first. - fix gtk1 g_strlcat declaration Use g_strlcat svn path=/trunk/; revision=23285
2007-10-27 14:44:29 +00:00
ptr = fast_ensure_contiguous(tvb, offset, sizeof(guint64));
Add "tvb_get_ntoh64()" and "tvb_get_letoh64()" routines to fetch 64-bit integers. Make FT_INT64 and FT_UINT64 add numerical values, rather than byte-array values, to the protocol tree, and add routines to add specified 64-bit integer values to the protocol tree. Use those routines in the RSVP dissector. svn path=/trunk/; revision=11796
2004-08-22 00:31:58 +00:00
return pletoh64(ptr);
}
Add (untested) routines to fetch IEEE single-precision and double-precision floating-point numbers, in big-endian and little-endian format (hopefully there aren't any middle-endian formats; if there are, we'll have to add them), from a tvbuff, and to return floats (for single-precision) and doubles (for double-precision). svn path=/trunk/; revision=5147
2002-04-12 23:25:24 +00:00
/*
* Fetches an IEEE single-precision floating-point number, in
* little-endian form, and returns a "float".
*
* XXX - should this be "double", in case there are IEEE single-
* precision numbers that won't fit in some platform's native
* "float" format?
*/
Use "gfloat" and "gdouble", rather than "float" and "double", as the return types of the tvbuff accessors for floating-point types, to more closely match the tvbuff accessors for integral types. Fix an error in the code for fetching doubles on VAXes, and get rid of unused union members on VAXes. svn path=/trunk/; revision=5245
2002-04-24 21:53:05 +00:00
gfloat
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_letohieee_float(tvbuff_t *tvb, const int offset)
Add (untested) routines to fetch IEEE single-precision and double-precision floating-point numbers, in big-endian and little-endian format (hopefully there aren't any middle-endian formats; if there are, we'll have to add them), from a tvbuff, and to return floats (for single-precision) and doubles (for double-precision). svn path=/trunk/; revision=5147
2002-04-12 23:25:24 +00:00
{
#if defined(vax)
Use Ashok's IEEE-float-to-long code as the basis for IEEE-float-to-native-float code, and use that as the basis for IEEE-double-to-native-double code. Use that code on VAXes. Eliminate "ieee-float.h", as we no longer use it; instead, we use the tvbuff routines for extracting IEEE floating-point numbers. svn path=/trunk/; revision=5243
2002-04-24 21:19:38 +00:00
return get_ieee_float(tvb_get_letohl(tvb, offset));
Add (untested) routines to fetch IEEE single-precision and double-precision floating-point numbers, in big-endian and little-endian format (hopefully there aren't any middle-endian formats; if there are, we'll have to add them), from a tvbuff, and to return floats (for single-precision) and doubles (for double-precision). svn path=/trunk/; revision=5147
2002-04-12 23:25:24 +00:00
#else
union {
Use "gfloat" and "gdouble", rather than "float" and "double", as the return types of the tvbuff accessors for floating-point types, to more closely match the tvbuff accessors for integral types. Fix an error in the code for fetching doubles on VAXes, and get rid of unused union members on VAXes. svn path=/trunk/; revision=5245
2002-04-24 21:53:05 +00:00
gfloat f;
Add (untested) routines to fetch IEEE single-precision and double-precision floating-point numbers, in big-endian and little-endian format (hopefully there aren't any middle-endian formats; if there are, we'll have to add them), from a tvbuff, and to return floats (for single-precision) and doubles (for double-precision). svn path=/trunk/; revision=5147
2002-04-12 23:25:24 +00:00
guint32 w;
} ieee_fp_union;
ieee_fp_union.w = tvb_get_letohl(tvb, offset);
return ieee_fp_union.f;
#endif
}
/*
* Fetches an IEEE double-precision floating-point number, in
* little-endian form, and returns a "double".
*/
Use "gfloat" and "gdouble", rather than "float" and "double", as the return types of the tvbuff accessors for floating-point types, to more closely match the tvbuff accessors for integral types. Fix an error in the code for fetching doubles on VAXes, and get rid of unused union members on VAXes. svn path=/trunk/; revision=5245
2002-04-24 21:53:05 +00:00
gdouble
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_letohieee_double(tvbuff_t *tvb, const int offset)
Add (untested) routines to fetch IEEE single-precision and double-precision floating-point numbers, in big-endian and little-endian format (hopefully there aren't any middle-endian formats; if there are, we'll have to add them), from a tvbuff, and to return floats (for single-precision) and doubles (for double-precision). svn path=/trunk/; revision=5147
2002-04-12 23:25:24 +00:00
{
#if defined(vax)
Use Ashok's IEEE-float-to-long code as the basis for IEEE-float-to-native-float code, and use that as the basis for IEEE-double-to-native-double code. Use that code on VAXes. Eliminate "ieee-float.h", as we no longer use it; instead, we use the tvbuff routines for extracting IEEE floating-point numbers. svn path=/trunk/; revision=5243
2002-04-24 21:19:38 +00:00
union {
guint32 w[2];
guint64 dw;
} ieee_fp_union;
Add (untested) routines to fetch IEEE single-precision and double-precision floating-point numbers, in big-endian and little-endian format (hopefully there aren't any middle-endian formats; if there are, we'll have to add them), from a tvbuff, and to return floats (for single-precision) and doubles (for double-precision). svn path=/trunk/; revision=5147
2002-04-12 23:25:24 +00:00
#else
union {
Use "gfloat" and "gdouble", rather than "float" and "double", as the return types of the tvbuff accessors for floating-point types, to more closely match the tvbuff accessors for integral types. Fix an error in the code for fetching doubles on VAXes, and get rid of unused union members on VAXes. svn path=/trunk/; revision=5245
2002-04-24 21:53:05 +00:00
gdouble d;
Add (untested) routines to fetch IEEE single-precision and double-precision floating-point numbers, in big-endian and little-endian format (hopefully there aren't any middle-endian formats; if there are, we'll have to add them), from a tvbuff, and to return floats (for single-precision) and doubles (for double-precision). svn path=/trunk/; revision=5147
2002-04-12 23:25:24 +00:00
guint32 w[2];
} ieee_fp_union;
Use Ashok's IEEE-float-to-long code as the basis for IEEE-float-to-native-float code, and use that as the basis for IEEE-double-to-native-double code. Use that code on VAXes. Eliminate "ieee-float.h", as we no longer use it; instead, we use the tvbuff routines for extracting IEEE floating-point numbers. svn path=/trunk/; revision=5243
2002-04-24 21:19:38 +00:00
#endif
Add (untested) routines to fetch IEEE single-precision and double-precision floating-point numbers, in big-endian and little-endian format (hopefully there aren't any middle-endian formats; if there are, we'll have to add them), from a tvbuff, and to return floats (for single-precision) and doubles (for double-precision). svn path=/trunk/; revision=5147
2002-04-12 23:25:24 +00:00
#ifdef WORDS_BIGENDIAN
ieee_fp_union.w[0] = tvb_get_letohl(tvb, offset+4);
ieee_fp_union.w[1] = tvb_get_letohl(tvb, offset);
#else
ieee_fp_union.w[0] = tvb_get_letohl(tvb, offset);
ieee_fp_union.w[1] = tvb_get_letohl(tvb, offset+4);
#endif
Use Ashok's IEEE-float-to-long code as the basis for IEEE-float-to-native-float code, and use that as the basis for IEEE-double-to-native-double code. Use that code on VAXes. Eliminate "ieee-float.h", as we no longer use it; instead, we use the tvbuff routines for extracting IEEE floating-point numbers. svn path=/trunk/; revision=5243
2002-04-24 21:19:38 +00:00
#if defined(vax)
Use "gfloat" and "gdouble", rather than "float" and "double", as the return types of the tvbuff accessors for floating-point types, to more closely match the tvbuff accessors for integral types. Fix an error in the code for fetching doubles on VAXes, and get rid of unused union members on VAXes. svn path=/trunk/; revision=5245
2002-04-24 21:53:05 +00:00
return get_ieee_double(ieee_fp_union.dw);
Use Ashok's IEEE-float-to-long code as the basis for IEEE-float-to-native-float code, and use that as the basis for IEEE-double-to-native-double code. Use that code on VAXes. Eliminate "ieee-float.h", as we no longer use it; instead, we use the tvbuff routines for extracting IEEE floating-point numbers. svn path=/trunk/; revision=5243
2002-04-24 21:19:38 +00:00
#else
Add (untested) routines to fetch IEEE single-precision and double-precision floating-point numbers, in big-endian and little-endian format (hopefully there aren't any middle-endian formats; if there are, we'll have to add them), from a tvbuff, and to return floats (for single-precision) and doubles (for double-precision). svn path=/trunk/; revision=5147
2002-04-12 23:25:24 +00:00
return ieee_fp_union.d;
#endif
}
Add "tvb_get_ipv4()" and "tvb_get_ipv6()" addresses, to fetch IPv4 and IPv6 addresses. Use "tvb_get_ipv4()" in the WINS Replication dissector, so that it gets the right answer on little-endian *AND* big-endian machines. svn path=/trunk/; revision=15753
2005-09-10 19:43:41 +00:00
/* Fetch an IPv4 address, in network byte order.
* We do *not* convert them to host byte order; we leave them in
* network byte order. */
guint32
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_ipv4(tvbuff_t *tvb, const gint offset)
Add "tvb_get_ipv4()" and "tvb_get_ipv6()" addresses, to fetch IPv4 and IPv6 addresses. Use "tvb_get_ipv4()" in the WINS Replication dissector, so that it gets the right answer on little-endian *AND* big-endian machines. svn path=/trunk/; revision=15753
2005-09-10 19:43:41 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr;
guint32 addr;
Add "tvb_get_ipv4()" and "tvb_get_ipv6()" addresses, to fetch IPv4 and IPv6 addresses. Use "tvb_get_ipv4()" in the WINS Replication dissector, so that it gets the right answer on little-endian *AND* big-endian machines. svn path=/trunk/; revision=15753
2005-09-10 19:43:41 +00:00
Apply yet another set of the optimization patches: - Use a fast path for the most common use of tvb_get_xxx functions: offset is >= 0 and tvb->real_data is set (this one is always true). - match_strval() is a linear search, put the most common protocols TCP/UDP/RDP first. - fix gtk1 g_strlcat declaration Use g_strlcat svn path=/trunk/; revision=23285
2007-10-27 14:44:29 +00:00
ptr = fast_ensure_contiguous(tvb, offset, sizeof(guint32));
Add "tvb_get_ipv4()" and "tvb_get_ipv6()" addresses, to fetch IPv4 and IPv6 addresses. Use "tvb_get_ipv4()" in the WINS Replication dissector, so that it gets the right answer on little-endian *AND* big-endian machines. svn path=/trunk/; revision=15753
2005-09-10 19:43:41 +00:00
memcpy(&addr, ptr, sizeof addr);
return addr;
}
/* Fetch an IPv6 address. */
void
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_ipv6(tvbuff_t *tvb, const gint offset, struct e_in6_addr *addr)
Add "tvb_get_ipv4()" and "tvb_get_ipv6()" addresses, to fetch IPv4 and IPv6 addresses. Use "tvb_get_ipv4()" in the WINS Replication dissector, so that it gets the right answer on little-endian *AND* big-endian machines. svn path=/trunk/; revision=15753
2005-09-10 19:43:41 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr;
Add "tvb_get_ipv4()" and "tvb_get_ipv6()" addresses, to fetch IPv4 and IPv6 addresses. Use "tvb_get_ipv4()" in the WINS Replication dissector, so that it gets the right answer on little-endian *AND* big-endian machines. svn path=/trunk/; revision=15753
2005-09-10 19:43:41 +00:00
ptr = ensure_contiguous(tvb, offset, sizeof(*addr));
memcpy(addr, ptr, sizeof *addr);
}
new FT_GUID handling - big/little endian supported svn path=/trunk/; revision=17566
2006-03-10 11:58:22 +00:00
/* Fetch a GUID. */
void
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_ntohguid(tvbuff_t *tvb, const gint offset, e_guid_t *guid)
new FT_GUID handling - big/little endian supported svn path=/trunk/; revision=17566
2006-03-10 11:58:22 +00:00
{
ensure_contiguous(tvb, offset, sizeof(*guid));
guid->data1 = tvb_get_ntohl(tvb, offset);
guid->data2 = tvb_get_ntohs(tvb, offset + 4);
guid->data3 = tvb_get_ntohs(tvb, offset + 6);
tvb_memcpy(tvb, guid->data4, offset + 8, sizeof guid->data4);
}
void
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_letohguid(tvbuff_t *tvb, const gint offset, e_guid_t *guid)
new FT_GUID handling - big/little endian supported svn path=/trunk/; revision=17566
2006-03-10 11:58:22 +00:00
{
ensure_contiguous(tvb, offset, sizeof(*guid));
guid->data1 = tvb_get_letohl(tvb, offset);
guid->data2 = tvb_get_letohs(tvb, offset + 4);
guid->data3 = tvb_get_letohs(tvb, offset + 6);
tvb_memcpy(tvb, guid->data4, offset + 8, sizeof guid->data4);
}
Refer to the endianness arguments as "encoding" rather than "representation" - we already use "representation" to refer to the text representation of fields. Change some routines with an endianness argument to make it a representation argument instead; svn path=/trunk/; revision=32929
2010-05-24 06:06:17 +00:00
/*
* NOTE: to support code written when proto_tree_add_item() took a
* gboolean as its last argument, with FALSE meaning "big-endian"
* and TRUE meaning "little-endian", we treat any non-zero value of
* "representation" as meaning "little-endian".
*/
new FT_GUID handling - big/little endian supported svn path=/trunk/; revision=17566
2006-03-10 11:58:22 +00:00
void
Refer to the endianness arguments as "encoding" rather than "representation" - we already use "representation" to refer to the text representation of fields. Change some routines with an endianness argument to make it a representation argument instead; svn path=/trunk/; revision=32929
2010-05-24 06:06:17 +00:00
tvb_get_guid(tvbuff_t *tvb, const gint offset, e_guid_t *guid, const guint representation)
new FT_GUID handling - big/little endian supported svn path=/trunk/; revision=17566
2006-03-10 11:58:22 +00:00
{
Refer to the endianness arguments as "encoding" rather than "representation" - we already use "representation" to refer to the text representation of fields. Change some routines with an endianness argument to make it a representation argument instead; svn path=/trunk/; revision=32929
2010-05-24 06:06:17 +00:00
if (representation) {
new FT_GUID handling - big/little endian supported svn path=/trunk/; revision=17566
2006-03-10 11:58:22 +00:00
tvb_get_letohguid(tvb, offset, guid);
} else {
tvb_get_ntohguid(tvb, offset, guid);
}
}
From Mike Morrin: Fix for "The previous patch had an error and was returning too many bits." https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 From me: Correct the indentation to match the rest of the file. svn path=/trunk/; revision=41230
2012-02-28 20:32:42 +00:00
static const guint8 inverse_bit_mask8[] = {
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
0xff,
0x7f,
0x3f,
0x1f,
0x0f,
0x07,
0x03,
0x01
Add: proto_tree_add_bits_ret_val() tvb_get_bits() And modify proto_tree_add_bits() not to return a value. little endian is not yet implemented. svn path=/trunk/; revision=21607
2007-04-28 12:13:25 +00:00
};
From Mike Morrin: Fix for "The previous patch had an error and was returning too many bits." https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 From me: Correct the indentation to match the rest of the file. svn path=/trunk/; revision=41230
2012-02-28 20:32:42 +00:00
static const guint8 bit_mask8[] = {
0x00,
0x01,
0x03,
0x07,
0x0f,
0x1f,
0x3f,
0x7f,
0xff
};
Split tvb_get_bits64 into tvb_get_bits8 tvb_get_bits16 tvb_get_bits32 and tvb_get_bits64 and use them in proto_tree_add_bits_ret_val(). svn path=/trunk/; revision=21828
2007-05-18 16:46:35 +00:00
/* Get 1 - 8 bits */
guint8
Make bit_offset in _tvb_get_bits64 and related functions unsigned. This removes a potential buffer overflow and should fix a bunch of Coverity errors mentioned in bug 6878. We might want to do the same for no_of_bits. svn path=/trunk/; revision=41945
2012-04-04 21:54:22 +00:00
tvb_get_bits8(tvbuff_t *tvb, guint bit_offset, const gint no_of_bits)
Split tvb_get_bits64 into tvb_get_bits8 tvb_get_bits16 tvb_get_bits32 and tvb_get_bits64 and use them in proto_tree_add_bits_ret_val(). svn path=/trunk/; revision=21828
2007-05-18 16:46:35 +00:00
{
From Mike Morrin: Fix for "The previous patch had an error and was returning too many bits." https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 From me: Correct the indentation to match the rest of the file. svn path=/trunk/; revision=41230
2012-02-28 20:32:42 +00:00
return (guint8)_tvb_get_bits64(tvb, bit_offset, no_of_bits);
Split tvb_get_bits64 into tvb_get_bits8 tvb_get_bits16 tvb_get_bits32 and tvb_get_bits64 and use them in proto_tree_add_bits_ret_val(). svn path=/trunk/; revision=21828
2007-05-18 16:46:35 +00:00
}
From Mike Morrin: Overhaul of tvb_get_bitsxx() functions. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 svn path=/trunk/; revision=41226
2012-02-28 16:29:07 +00:00
/* Get 1 - 16 bits */
Add generic tvb_get_bits_buf() which accepts any no_of_bits. svn path=/trunk/; revision=37217
2011-05-17 22:20:14 +00:00
void
Make bit_offset in _tvb_get_bits64 and related functions unsigned. This removes a potential buffer overflow and should fix a bunch of Coverity errors mentioned in bug 6878. We might want to do the same for no_of_bits. svn path=/trunk/; revision=41945
2012-04-04 21:54:22 +00:00
tvb_get_bits_buf(tvbuff_t *tvb, guint bit_offset, gint no_of_bits, guint8 *buf, gboolean lsb0)
Add generic tvb_get_bits_buf() which accepts any no_of_bits. svn path=/trunk/; revision=37217
2011-05-17 22:20:14 +00:00
{
- Optimize tvb_get_bits_buf - Add lsb0 (read: least significant bit is 0) parameter to tvb_get_bits_buf() (not tested, might be buggy...) svn path=/trunk/; revision=37254
2011-05-18 18:49:33 +00:00
guint8 bit_mask, bit_shift;
Add generic tvb_get_bits_buf() which accepts any no_of_bits. svn path=/trunk/; revision=37217
2011-05-17 22:20:14 +00:00
/* Byte align offset */
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
gint offset = bit_offset >> 3;
Add generic tvb_get_bits_buf() which accepts any no_of_bits. svn path=/trunk/; revision=37217
2011-05-17 22:20:14 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
bit_offset = bit_offset & 0x7;
From Mike Morrin: Fix for "The previous patch had an error and was returning too many bits." https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 From me: Correct the indentation to match the rest of the file. svn path=/trunk/; revision=41230
2012-02-28 20:32:42 +00:00
bit_mask = (lsb0) ? 0xff : inverse_bit_mask8[bit_offset];
- Optimize tvb_get_bits_buf - Add lsb0 (read: least significant bit is 0) parameter to tvb_get_bits_buf() (not tested, might be buggy...) svn path=/trunk/; revision=37254
2011-05-18 18:49:33 +00:00
bit_shift = (lsb0) ? bit_offset : (8 - bit_offset);
Add generic tvb_get_bits_buf() which accepts any no_of_bits. svn path=/trunk/; revision=37217
2011-05-17 22:20:14 +00:00
if (G_LIKELY(bit_offset != 0)) {
- Optimize tvb_get_bits_buf - Add lsb0 (read: least significant bit is 0) parameter to tvb_get_bits_buf() (not tested, might be buggy...) svn path=/trunk/; revision=37254
2011-05-18 18:49:33 +00:00
guint16 value = (guint16) tvb_get_guint8(tvb, offset);
Add generic tvb_get_bits_buf() which accepts any no_of_bits. svn path=/trunk/; revision=37217
2011-05-17 22:20:14 +00:00
- Optimize tvb_get_bits_buf - Add lsb0 (read: least significant bit is 0) parameter to tvb_get_bits_buf() (not tested, might be buggy...) svn path=/trunk/; revision=37254
2011-05-18 18:49:33 +00:00
while (no_of_bits >= 8) {
Add generic tvb_get_bits_buf() which accepts any no_of_bits. svn path=/trunk/; revision=37217
2011-05-17 22:20:14 +00:00
offset++;
- Optimize tvb_get_bits_buf - Add lsb0 (read: least significant bit is 0) parameter to tvb_get_bits_buf() (not tested, might be buggy...) svn path=/trunk/; revision=37254
2011-05-18 18:49:33 +00:00
value = ((value & bit_mask) << 8) | tvb_get_guint8(tvb, offset);
Fix tvb_get_bits_buf for LSB. svn path=/trunk/; revision=37264
2011-05-18 21:33:05 +00:00
if (lsb0)
*buf++ = (guint8) (GUINT16_SWAP_LE_BE(value) >> bit_shift);
else
*buf++ = (guint8) (value >> bit_shift);
Add generic tvb_get_bits_buf() which accepts any no_of_bits. svn path=/trunk/; revision=37217
2011-05-17 22:20:14 +00:00
no_of_bits -= 8;
}
/* something left? */
- Optimize tvb_get_bits_buf - Add lsb0 (read: least significant bit is 0) parameter to tvb_get_bits_buf() (not tested, might be buggy...) svn path=/trunk/; revision=37254
2011-05-18 18:49:33 +00:00
if (no_of_bits > 0) {
guint8 tot_no_bits = bit_offset+no_of_bits;
/* Overlaps with next byte? Get next byte */
if (tot_no_bits > 8) {
offset++;
value = ((value & bit_mask) << 8) | tvb_get_guint8(tvb, offset);
}
if (lsb0) {
Fix tvb_get_bits_buf for LSB. svn path=/trunk/; revision=37264
2011-05-18 21:33:05 +00:00
if (tot_no_bits > 8)
From Mike Morrin: Fix for "The previous patch had an error and was returning too many bits." https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 From me: Correct the indentation to match the rest of the file. svn path=/trunk/; revision=41230
2012-02-28 20:32:42 +00:00
value = (GUINT16_SWAP_LE_BE(value) >> bit_offset) & (bit_mask8[no_of_bits]);
Fix tvb_get_bits_buf for LSB. svn path=/trunk/; revision=37264
2011-05-18 21:33:05 +00:00
else
From Mike Morrin: Fix for "The previous patch had an error and was returning too many bits." https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 From me: Correct the indentation to match the rest of the file. svn path=/trunk/; revision=41230
2012-02-28 20:32:42 +00:00
value = (value >> bit_offset) & (bit_mask8[no_of_bits]);
- Optimize tvb_get_bits_buf - Add lsb0 (read: least significant bit is 0) parameter to tvb_get_bits_buf() (not tested, might be buggy...) svn path=/trunk/; revision=37254
2011-05-18 18:49:33 +00:00
/* value = (value & ((1 << tot_no_bits)-1)) >> bit_offset; */
} else {
if (tot_no_bits > 8)
value = value >> (16 - tot_no_bits);
else
value = (value & bit_mask) >> (8-tot_no_bits);
}
*buf = (guint8) value;
}
Add generic tvb_get_bits_buf() which accepts any no_of_bits. svn path=/trunk/; revision=37217
2011-05-17 22:20:14 +00:00
} else {
/* fast code path for bit_offset == 0 */
while (no_of_bits >= 8) {
*buf++ = tvb_get_guint8(tvb, offset);
offset++;
no_of_bits -= 8;
}
/* something left? */
- Optimize tvb_get_bits_buf - Add lsb0 (read: least significant bit is 0) parameter to tvb_get_bits_buf() (not tested, might be buggy...) svn path=/trunk/; revision=37254
2011-05-18 18:49:33 +00:00
if (no_of_bits > 0) {
if (lsb0)
From Mike Morrin: Fix for "The previous patch had an error and was returning too many bits." https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 From me: Correct the indentation to match the rest of the file. svn path=/trunk/; revision=41230
2012-02-28 20:32:42 +00:00
*buf = tvb_get_guint8(tvb, offset) & bit_mask8[no_of_bits]; /* read: ((1 << no_of_bits)-1) */
- Optimize tvb_get_bits_buf - Add lsb0 (read: least significant bit is 0) parameter to tvb_get_bits_buf() (not tested, might be buggy...) svn path=/trunk/; revision=37254
2011-05-18 18:49:33 +00:00
else
*buf = tvb_get_guint8(tvb, offset) >> (8-no_of_bits);
}
Add generic tvb_get_bits_buf() which accepts any no_of_bits. svn path=/trunk/; revision=37217
2011-05-17 22:20:14 +00:00
}
}
guint8 *
Make bit_offset in _tvb_get_bits64 and related functions unsigned. This removes a potential buffer overflow and should fix a bunch of Coverity errors mentioned in bug 6878. We might want to do the same for no_of_bits. svn path=/trunk/; revision=41945
2012-04-04 21:54:22 +00:00
ep_tvb_get_bits(tvbuff_t *tvb, guint bit_offset, gint no_of_bits, gboolean lsb0)
Add generic tvb_get_bits_buf() which accepts any no_of_bits. svn path=/trunk/; revision=37217
2011-05-17 22:20:14 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
gint no_of_bytes;
Add generic tvb_get_bits_buf() which accepts any no_of_bits. svn path=/trunk/; revision=37217
2011-05-17 22:20:14 +00:00
guint8 *buf;
/* XXX, no_of_bits == -1 -> to end of tvb? */
Make bit_offset in _tvb_get_bits64 and related functions unsigned. This removes a potential buffer overflow and should fix a bunch of Coverity errors mentioned in bug 6878. We might want to do the same for no_of_bits. svn path=/trunk/; revision=41945
2012-04-04 21:54:22 +00:00
if (no_of_bits < 0) {
Add generic tvb_get_bits_buf() which accepts any no_of_bits. svn path=/trunk/; revision=37217
2011-05-17 22:20:14 +00:00
DISSECTOR_ASSERT_NOT_REACHED();
}
no_of_bytes = (no_of_bits >> 3) + ((no_of_bits & 0x7) != 0); /* ceil(no_of_bits / 8.0) */
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
buf = ep_alloc(no_of_bytes);
- Optimize tvb_get_bits_buf - Add lsb0 (read: least significant bit is 0) parameter to tvb_get_bits_buf() (not tested, might be buggy...) svn path=/trunk/; revision=37254
2011-05-18 18:49:33 +00:00
tvb_get_bits_buf(tvb, bit_offset, no_of_bits, buf, lsb0);
Add generic tvb_get_bits_buf() which accepts any no_of_bits. svn path=/trunk/; revision=37217
2011-05-17 22:20:14 +00:00
return buf;
}
Split tvb_get_bits64 into tvb_get_bits8 tvb_get_bits16 tvb_get_bits32 and tvb_get_bits64 and use them in proto_tree_add_bits_ret_val(). svn path=/trunk/; revision=21828
2007-05-18 16:46:35 +00:00
/* Get 9 - 16 bits */
guint16
Make bit_offset in _tvb_get_bits64 and related functions unsigned. This removes a potential buffer overflow and should fix a bunch of Coverity errors mentioned in bug 6878. We might want to do the same for no_of_bits. svn path=/trunk/; revision=41945
2012-04-04 21:54:22 +00:00
tvb_get_bits16(tvbuff_t *tvb, guint bit_offset, const gint no_of_bits,const guint encoding _U_)
Add: proto_tree_add_bits_ret_val() tvb_get_bits() And modify proto_tree_add_bits() not to return a value. little endian is not yet implemented. svn path=/trunk/; revision=21607
2007-04-28 12:13:25 +00:00
{
From Mike Morrin: Fix for "The previous patch had an error and was returning too many bits." https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 From me: Correct the indentation to match the rest of the file. svn path=/trunk/; revision=41230
2012-02-28 20:32:42 +00:00
/* note that encoding has no meaning here, as the tvb is considered to contain an octet array */
return (guint16)_tvb_get_bits64(tvb, bit_offset, no_of_bits);
Split tvb_get_bits64 into tvb_get_bits8 tvb_get_bits16 tvb_get_bits32 and tvb_get_bits64 and use them in proto_tree_add_bits_ret_val(). svn path=/trunk/; revision=21828
2007-05-18 16:46:35 +00:00
}
From Mike Morrin: Overhaul of tvb_get_bitsxx() functions. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 svn path=/trunk/; revision=41226
2012-02-28 16:29:07 +00:00
/* Get 1 - 32 bits */
Split tvb_get_bits64 into tvb_get_bits8 tvb_get_bits16 tvb_get_bits32 and tvb_get_bits64 and use them in proto_tree_add_bits_ret_val(). svn path=/trunk/; revision=21828
2007-05-18 16:46:35 +00:00
guint32
Make bit_offset in _tvb_get_bits64 and related functions unsigned. This removes a potential buffer overflow and should fix a bunch of Coverity errors mentioned in bug 6878. We might want to do the same for no_of_bits. svn path=/trunk/; revision=41945
2012-04-04 21:54:22 +00:00
tvb_get_bits32(tvbuff_t *tvb, guint bit_offset, const gint no_of_bits, const guint encoding _U_)
Split tvb_get_bits64 into tvb_get_bits8 tvb_get_bits16 tvb_get_bits32 and tvb_get_bits64 and use them in proto_tree_add_bits_ret_val(). svn path=/trunk/; revision=21828
2007-05-18 16:46:35 +00:00
{
From Mike Morrin: Fix for "The previous patch had an error and was returning too many bits." https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 From me: Correct the indentation to match the rest of the file. svn path=/trunk/; revision=41230
2012-02-28 20:32:42 +00:00
/* note that encoding has no meaning here, as the tvb is considered to contain an octet array */
return (guint32)_tvb_get_bits64(tvb, bit_offset, no_of_bits);
Split tvb_get_bits64 into tvb_get_bits8 tvb_get_bits16 tvb_get_bits32 and tvb_get_bits64 and use them in proto_tree_add_bits_ret_val(). svn path=/trunk/; revision=21828
2007-05-18 16:46:35 +00:00
}
Fixed check for no_of_bits in tvb_get_bits16(), tvb_get_bits32() and tvb_get_bits64(). svn path=/trunk/; revision=28658
2009-06-08 08:28:42 +00:00
From Mike Morrin: Overhaul of tvb_get_bitsxx() functions. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 svn path=/trunk/; revision=41226
2012-02-28 16:29:07 +00:00
/* Get 1 - 64 bits */
Split tvb_get_bits64 into tvb_get_bits8 tvb_get_bits16 tvb_get_bits32 and tvb_get_bits64 and use them in proto_tree_add_bits_ret_val(). svn path=/trunk/; revision=21828
2007-05-18 16:46:35 +00:00
guint64
Make bit_offset in _tvb_get_bits64 and related functions unsigned. This removes a potential buffer overflow and should fix a bunch of Coverity errors mentioned in bug 6878. We might want to do the same for no_of_bits. svn path=/trunk/; revision=41945
2012-04-04 21:54:22 +00:00
tvb_get_bits64(tvbuff_t *tvb, guint bit_offset, const gint no_of_bits, const guint encoding _U_)
Split tvb_get_bits64 into tvb_get_bits8 tvb_get_bits16 tvb_get_bits32 and tvb_get_bits64 and use them in proto_tree_add_bits_ret_val(). svn path=/trunk/; revision=21828
2007-05-18 16:46:35 +00:00
{
From Mike Morrin: Fix for "The previous patch had an error and was returning too many bits." https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 From me: Correct the indentation to match the rest of the file. svn path=/trunk/; revision=41230
2012-02-28 20:32:42 +00:00
/* note that encoding has no meaning here, as the tvb is considered to contain an octet array */
return _tvb_get_bits64(tvb, bit_offset, no_of_bits);
Add: proto_tree_add_bits_ret_val() tvb_get_bits() And modify proto_tree_add_bits() not to return a value. little endian is not yet implemented. svn path=/trunk/; revision=21607
2007-04-28 12:13:25 +00:00
}
From Mike Morrin: Overhaul of tvb_get_bitsxx() functions. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 svn path=/trunk/; revision=41226
2012-02-28 16:29:07 +00:00
/*
* This function will dissect a sequence of bits that does not need to be byte aligned; the bits
* set will be shown in the tree as ..10 10.. and the integer value returned if return_value is set.
* Offset should be given in bits from the start of the tvb.
* The function tolerates requests for more than 64 bits, but will only return the least significant 64 bits.
*/
Fix several messages of type: epan/tvbuff.c: In function ‘tvb_get_bits16’: epan/tvbuff.c:1736:82: error: unused parameter ‘encoding’ [-Werror=unused-parameter] Compilation still fails with: epan/tvbuff.c: In function ‘_tvb_get_bits64’: epan/tvbuff.c:1829:19: error: ‘value’ may be used uninitialized in this function [-Werror=uninitialized svn path=/trunk/; revision=41227
2012-02-28 17:44:49 +00:00
static guint64
Make bit_offset in _tvb_get_bits64 and related functions unsigned. This removes a potential buffer overflow and should fix a bunch of Coverity errors mentioned in bug 6878. We might want to do the same for no_of_bits. svn path=/trunk/; revision=41945
2012-04-04 21:54:22 +00:00
_tvb_get_bits64(tvbuff_t *tvb, guint bit_offset, const gint total_no_of_bits)
From Mike Morrin: Overhaul of tvb_get_bitsxx() functions. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 svn path=/trunk/; revision=41226
2012-02-28 16:29:07 +00:00
{
From Mike Morrin: Fix for "The previous patch had an error and was returning too many bits." https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 From me: Correct the indentation to match the rest of the file. svn path=/trunk/; revision=41230
2012-02-28 20:32:42 +00:00
guint64 value;
guint octet_offset = bit_offset >> 3;
guint8 required_bits_in_first_octet = 8 - (bit_offset % 8);
if(required_bits_in_first_octet > total_no_of_bits)
{
/* the required bits don't extend to the end of the first octet */
guint8 right_shift = required_bits_in_first_octet - total_no_of_bits;
Clamp a value as suggested by Mike Morrin in bug 6878. svn path=/trunk/; revision=41968
2012-04-06 00:32:26 +00:00
value = (tvb_get_guint8(tvb, octet_offset) >> right_shift) & bit_mask8[total_no_of_bits % 8];
From Mike Morrin: Fix for "The previous patch had an error and was returning too many bits." https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 From me: Correct the indentation to match the rest of the file. svn path=/trunk/; revision=41230
2012-02-28 20:32:42 +00:00
}
else
{
guint8 remaining_bit_length = total_no_of_bits;
/* get the bits up to the first octet boundary */
value = 0;
required_bits_in_first_octet %= 8;
if(required_bits_in_first_octet != 0)
{
value = tvb_get_guint8(tvb, octet_offset) & bit_mask8[required_bits_in_first_octet];
remaining_bit_length -= required_bits_in_first_octet;
octet_offset ++;
}
/* take the biggest words, shorts or octets that we can */
while (remaining_bit_length > 7)
{
switch (remaining_bit_length >> 4)
{
case 0:
/* 8 - 15 bits. (note that 0 - 7 would have dropped out of the while() loop) */
value <<= 8;
value += tvb_get_guint8(tvb, octet_offset);
remaining_bit_length -= 8;
octet_offset ++;
break;
case 1:
/* 16 - 31 bits */
value <<= 16;
value += tvb_get_ntohs(tvb, octet_offset);
remaining_bit_length -= 16;
octet_offset += 2;
break;
case 2:
case 3:
/* 32 - 63 bits */
value <<= 32;
value += tvb_get_ntohl(tvb, octet_offset);
remaining_bit_length -= 32;
octet_offset += 4;
break;
default:
/* 64 bits (or more???) */
value = tvb_get_ntoh64(tvb, octet_offset);
remaining_bit_length -= 64;
octet_offset += 8;
break;
}
}
/* get bits from any partial octet at the tail */
if(remaining_bit_length)
{
value <<= remaining_bit_length;
value += (tvb_get_guint8(tvb, octet_offset) >> (8 - remaining_bit_length));
}
}
return value;
From Mike Morrin: Overhaul of tvb_get_bitsxx() functions. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 svn path=/trunk/; revision=41226
2012-02-28 16:29:07 +00:00
}
/* Get 1 - 32 bits (should be deprecated as same as tvb_get_bits32??) */
From yy: About GSM system information type 2quater Modified to use newly defined tvb_get_bits() in tvbuff.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4219 svn path=/trunk/; revision=30962
2009-11-14 20:13:43 +00:00
guint32
Make bit_offset in _tvb_get_bits64 and related functions unsigned. This removes a potential buffer overflow and should fix a bunch of Coverity errors mentioned in bug 6878. We might want to do the same for no_of_bits. svn path=/trunk/; revision=41945
2012-04-04 21:54:22 +00:00
tvb_get_bits(tvbuff_t *tvb, const guint bit_offset, const gint no_of_bits, const guint encoding _U_)
From yy: About GSM system information type 2quater Modified to use newly defined tvb_get_bits() in tvbuff.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4219 svn path=/trunk/; revision=30962
2009-11-14 20:13:43 +00:00
{
From Mike Morrin: Fix for "The previous patch had an error and was returning too many bits." https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6878 From me: Correct the indentation to match the rest of the file. svn path=/trunk/; revision=41230
2012-02-28 20:32:42 +00:00
/* note that encoding has no meaning here, as the tvb is considered to contain an octet array */
return (guint32)_tvb_get_bits64(tvb, bit_offset, no_of_bits);
From yy: About GSM system information type 2quater Modified to use newly defined tvb_get_bits() in tvbuff.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4219 svn path=/trunk/; revision=30962
2009-11-14 20:13:43 +00:00
}
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
/* Find first occurence of needle in tvbuff, starting at offset. Searches
Allow "tvb_find_guint8()", "tvb_pbrk_guint8()", and "tvb_strnlen()" to take -1 as a "maxlength" value, meaning "to the end of the tvbuff". svn path=/trunk/; revision=2598
2000-11-10 09:15:57 +00:00
* at most maxlength number of bytes; if maxlength is -1, searches to
* end of tvbuff.
* Returns the offset of the found needle, or -1 if not found.
* Will not throw an exception, even if maxlength exceeds boundary of tvbuff;
* in that case, -1 will be returned if the boundary is reached before
* finding needle. */
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
gint
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_find_guint8(tvbuff_t *tvb, const gint offset, const gint maxlength, const guint8 needle)
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *result;
guint abs_offset, junk_length;
guint tvbufflen;
guint limit;
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
DISSECTOR_ASSERT(tvb && tvb->initialized);
check_offset_length(tvb->length, tvb->reported_length, offset, 0, &abs_offset, &junk_length);
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
/* Only search to end of tvbuff, w/o throwing exception. */
Allow "tvb_find_guint8()", "tvb_pbrk_guint8()", and "tvb_strnlen()" to take -1 as a "maxlength" value, meaning "to the end of the tvbuff". svn path=/trunk/; revision=2598
2000-11-10 09:15:57 +00:00
tvbufflen = tvb_length_remaining(tvb, abs_offset);
if (maxlength == -1) {
In "tvb_find_guint8()" and "tvb_pbrk_guint8()", correctly set the limit of the search if the caller-supplied limit goes past the end of the tvbuff - the limit should just be what remains in the tvbuff after the specified starting offset. In "tvb_find_line_end_unquoted()", after searching for the next interesting character, check the value we got back from that search, in "char_offset", not whatever happens to be in "cur_offset", to see if we found a character. svn path=/trunk/; revision=2719
2000-11-30 06:11:32 +00:00
/* No maximum length specified; search to end of tvbuff. */
Allow "tvb_find_guint8()", "tvb_pbrk_guint8()", and "tvb_strnlen()" to take -1 as a "maxlength" value, meaning "to the end of the tvbuff". svn path=/trunk/; revision=2598
2000-11-10 09:15:57 +00:00
limit = tvbufflen;
}
Fix some signed/unsigned comparison warnings. In the case of tvbuff.h, there were 2 functions which accepted 'maxlength' == -1, but the function prototypes had maxlength as a guint --- fixed. svn path=/trunk/; revision=4087
2001-10-26 17:29:12 +00:00
else if (tvbufflen < (guint) maxlength) {
In "tvb_find_guint8()" and "tvb_pbrk_guint8()", correctly set the limit of the search if the caller-supplied limit goes past the end of the tvbuff - the limit should just be what remains in the tvbuff after the specified starting offset. In "tvb_find_line_end_unquoted()", after searching for the next interesting character, check the value we got back from that search, in "char_offset", not whatever happens to be in "cur_offset", to see if we found a character. svn path=/trunk/; revision=2719
2000-11-30 06:11:32 +00:00
/* Maximum length goes past end of tvbuff; search to end
of tvbuff. */
limit = tvbufflen;
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
}
else {
In "tvb_find_guint8()" and "tvb_pbrk_guint8()", correctly set the limit of the search if the caller-supplied limit goes past the end of the tvbuff - the limit should just be what remains in the tvbuff after the specified starting offset. In "tvb_find_line_end_unquoted()", after searching for the next interesting character, check the value we got back from that search, in "char_offset", not whatever happens to be in "cur_offset", to see if we found a character. svn path=/trunk/; revision=2719
2000-11-30 06:11:32 +00:00
/* Maximum length doesn't go past end of tvbuff; search
to that value. */
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
limit = maxlength;
}
/* If we have real data, perform our search now. */
if (tvb->real_data) {
From Jakub Zawadzki: - use Glibc:s highly optimized memchr() svn path=/trunk/; revision=32584
2010-04-28 08:15:20 +00:00
result = memchr(tvb->real_data + abs_offset, needle, limit);
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
if (result == NULL) {
return -1;
}
else {
Make the "length" argument of the tvb_mem* functions a size_t since it's not uncommon to pass them the result of pointer arithmetic. Add size_t casts in other areas. svn path=/trunk/; revision=27941
2009-04-03 15:30:38 +00:00
return (gint) (result - tvb->real_data);
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
}
}
switch(tvb->type) {
case TVBUFF_REAL_DATA:
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT_NOT_REACHED();
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
case TVBUFF_SUBSET:
return tvb_find_guint8(tvb->tvbuffs.subset.tvb,
abs_offset - tvb->tvbuffs.subset.offset,
limit, needle);
case TVBUFF_COMPOSITE:
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT_NOT_REACHED();
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
/* XXX - return composite_find_guint8(tvb, offset, limit, needle); */
}
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT_NOT_REACHED();
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
return -1;
}
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
/* Find first occurence of any of the needles in tvbuff, starting at offset.
Allow "tvb_find_guint8()", "tvb_pbrk_guint8()", and "tvb_strnlen()" to take -1 as a "maxlength" value, meaning "to the end of the tvbuff". svn path=/trunk/; revision=2598
2000-11-10 09:15:57 +00:00
* Searches at most maxlength number of bytes; if maxlength is -1, searches
* to end of tvbuff.
* Returns the offset of the found needle, or -1 if not found.
* Will not throw an exception, even if maxlength exceeds boundary of tvbuff;
* in that case, -1 will be returned if the boundary is reached before
* finding needle. */
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
gint
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_pbrk_guint8(tvbuff_t *tvb, const gint offset, const gint maxlength, const guint8 *needles, guchar *found_needle)
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *result;
guint abs_offset, junk_length;
guint tvbufflen;
guint limit;
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
DISSECTOR_ASSERT(tvb && tvb->initialized);
check_offset_length(tvb->length, tvb->reported_length, offset, 0, &abs_offset, &junk_length);
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
/* Only search to end of tvbuff, w/o throwing exception. */
Allow "tvb_find_guint8()", "tvb_pbrk_guint8()", and "tvb_strnlen()" to take -1 as a "maxlength" value, meaning "to the end of the tvbuff". svn path=/trunk/; revision=2598
2000-11-10 09:15:57 +00:00
tvbufflen = tvb_length_remaining(tvb, abs_offset);
if (maxlength == -1) {
In "tvb_find_guint8()" and "tvb_pbrk_guint8()", correctly set the limit of the search if the caller-supplied limit goes past the end of the tvbuff - the limit should just be what remains in the tvbuff after the specified starting offset. In "tvb_find_line_end_unquoted()", after searching for the next interesting character, check the value we got back from that search, in "char_offset", not whatever happens to be in "cur_offset", to see if we found a character. svn path=/trunk/; revision=2719
2000-11-30 06:11:32 +00:00
/* No maximum length specified; search to end of tvbuff. */
Allow "tvb_find_guint8()", "tvb_pbrk_guint8()", and "tvb_strnlen()" to take -1 as a "maxlength" value, meaning "to the end of the tvbuff". svn path=/trunk/; revision=2598
2000-11-10 09:15:57 +00:00
limit = tvbufflen;
}
Fix some signed/unsigned comparison warnings. In the case of tvbuff.h, there were 2 functions which accepted 'maxlength' == -1, but the function prototypes had maxlength as a guint --- fixed. svn path=/trunk/; revision=4087
2001-10-26 17:29:12 +00:00
else if (tvbufflen < (guint) maxlength) {
In "tvb_find_guint8()" and "tvb_pbrk_guint8()", correctly set the limit of the search if the caller-supplied limit goes past the end of the tvbuff - the limit should just be what remains in the tvbuff after the specified starting offset. In "tvb_find_line_end_unquoted()", after searching for the next interesting character, check the value we got back from that search, in "char_offset", not whatever happens to be in "cur_offset", to see if we found a character. svn path=/trunk/; revision=2719
2000-11-30 06:11:32 +00:00
/* Maximum length goes past end of tvbuff; search to end
of tvbuff. */
limit = tvbufflen;
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
}
else {
In "tvb_find_guint8()" and "tvb_pbrk_guint8()", correctly set the limit of the search if the caller-supplied limit goes past the end of the tvbuff - the limit should just be what remains in the tvbuff after the specified starting offset. In "tvb_find_line_end_unquoted()", after searching for the next interesting character, check the value we got back from that search, in "char_offset", not whatever happens to be in "cur_offset", to see if we found a character. svn path=/trunk/; revision=2719
2000-11-30 06:11:32 +00:00
/* Maximum length doesn't go past end of tvbuff; search
to that value. */
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
limit = maxlength;
}
/* If we have real data, perform our search now. */
if (tvb->real_data) {
Make tvb_pbrk_guint8() return the found needle. svn path=/trunk/; revision=32144
2010-03-08 20:45:13 +00:00
result = guint8_pbrk(tvb->real_data + abs_offset, limit, needles, found_needle);
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
if (result == NULL) {
return -1;
}
else {
Make the "length" argument of the tvb_mem* functions a size_t since it's not uncommon to pass them the result of pointer arithmetic. Add size_t casts in other areas. svn path=/trunk/; revision=27941
2009-04-03 15:30:38 +00:00
return (gint) (result - tvb->real_data);
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
}
}
switch(tvb->type) {
case TVBUFF_REAL_DATA:
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT_NOT_REACHED();
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
case TVBUFF_SUBSET:
return tvb_pbrk_guint8(tvb->tvbuffs.subset.tvb,
abs_offset - tvb->tvbuffs.subset.offset,
Make tvb_pbrk_guint8() return the found needle. svn path=/trunk/; revision=32144
2010-03-08 20:45:13 +00:00
limit, needles, found_needle);
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
case TVBUFF_COMPOSITE:
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT_NOT_REACHED();
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
/* XXX - return composite_pbrk_guint8(tvb, offset, limit, needle); */
}
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT_NOT_REACHED();
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
return -1;
}
Add a new "tvb_strsize()" routine, which finds the size of a NUL-terminated string, starting at a given offset. The size includes the terminating NUL. If it doesn't find the terminating NUL, it throws the appropriate exception, as either there's no terminating NUL in the packet or there is but it's past the end of the captured data in the packet. Use that routine in the TFTP dissector. As it throws an exception if the string isn't NUL-terminated, we can just use "%s" to print option strings; we don't need to use "%.*s" with a string length. svn path=/trunk/; revision=2783
2000-12-25 23:48:16 +00:00
/* Find size of stringz (NUL-terminated string) by looking for terminating
* NUL. The size of the string includes the terminating NUL.
*
* If the NUL isn't found, it throws the appropriate exception.
*/
guint
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_strsize(tvbuff_t *tvb, const gint offset)
Add a new "tvb_strsize()" routine, which finds the size of a NUL-terminated string, starting at a given offset. The size includes the terminating NUL. If it doesn't find the terminating NUL, it throws the appropriate exception, as either there's no terminating NUL in the packet or there is but it's past the end of the captured data in the packet. Use that routine in the TFTP dissector. As it throws an exception if the string isn't NUL-terminated, we can just use "%s" to print option strings; we don't need to use "%.*s" with a string length. svn path=/trunk/; revision=2783
2000-12-25 23:48:16 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint abs_offset, junk_length;
gint nul_offset;
Add a new "tvb_strsize()" routine, which finds the size of a NUL-terminated string, starting at a given offset. The size includes the terminating NUL. If it doesn't find the terminating NUL, it throws the appropriate exception, as either there's no terminating NUL in the packet or there is but it's past the end of the captured data in the packet. Use that routine in the TFTP dissector. As it throws an exception if the string isn't NUL-terminated, we can just use "%s" to print option strings; we don't need to use "%.*s" with a string length. svn path=/trunk/; revision=2783
2000-12-25 23:48:16 +00:00
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
DISSECTOR_ASSERT(tvb && tvb->initialized);
check_offset_length(tvb->length, tvb->reported_length, offset, 0, &abs_offset, &junk_length);
Add a new "tvb_strsize()" routine, which finds the size of a NUL-terminated string, starting at a given offset. The size includes the terminating NUL. If it doesn't find the terminating NUL, it throws the appropriate exception, as either there's no terminating NUL in the packet or there is but it's past the end of the captured data in the packet. Use that routine in the TFTP dissector. As it throws an exception if the string isn't NUL-terminated, we can just use "%s" to print option strings; we don't need to use "%.*s" with a string length. svn path=/trunk/; revision=2783
2000-12-25 23:48:16 +00:00
nul_offset = tvb_find_guint8(tvb, abs_offset, -1, 0);
if (nul_offset == -1) {
/*
* OK, we hit the end of the tvbuff, so we should throw
* an exception.
*
* Did we hit the end of the captured data, or the end
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
* of the actual data? If there's less captured data
Add a new "tvb_strsize()" routine, which finds the size of a NUL-terminated string, starting at a given offset. The size includes the terminating NUL. If it doesn't find the terminating NUL, it throws the appropriate exception, as either there's no terminating NUL in the packet or there is but it's past the end of the captured data in the packet. Use that routine in the TFTP dissector. As it throws an exception if the string isn't NUL-terminated, we can just use "%s" to print option strings; we don't need to use "%.*s" with a string length. svn path=/trunk/; revision=2783
2000-12-25 23:48:16 +00:00
* than actual data, we presumably hit the end of the
* captured data, otherwise we hit the end of the actual
* data.
*/
if (tvb_length(tvb) < tvb_reported_length(tvb)) {
THROW(BoundsError);
} else {
THROW(ReportedBoundsError);
}
}
return (nul_offset - abs_offset) + 1;
}
Introduce new function called tvb_get_ephemeral_unicode_stringz(), which is a unicode (UTF-16) version of tvb_get_ephemeral_stringz(). It scans a tvbuff for a UTF-16 string and converts it to UTF-8 upon return. svn path=/trunk/; revision=35253
2010-12-23 17:59:34 +00:00
/* Unicode (UTF-16) version of tvb_strsize */
/* Returns number of *UTF-16 characters* (not bytes) excluding the null terminator */
guint
tvb_unicode_strsize(tvbuff_t *tvb, const gint offset)
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint i = 0;
gunichar2 uchar;
Introduce new function called tvb_get_ephemeral_unicode_stringz(), which is a unicode (UTF-16) version of tvb_get_ephemeral_stringz(). It scans a tvbuff for a UTF-16 string and converts it to UTF-8 upon return. svn path=/trunk/; revision=35253
2010-12-23 17:59:34 +00:00
DISSECTOR_ASSERT(tvb && tvb->initialized);
do {
/* Endianness doesn't matter when looking for null */
uchar = tvb_get_ntohs(tvb, offset + i);
i += 2;
} while(uchar != 0);
Add a couple more comments to new unicode function to remind us when a variable is counting UTF-16 characters vs. normal bytes. svn path=/trunk/; revision=35256
2010-12-23 18:26:25 +00:00
return i; /* Number of *UTF-16* characters */
Introduce new function called tvb_get_ephemeral_unicode_stringz(), which is a unicode (UTF-16) version of tvb_get_ephemeral_stringz(). It scans a tvbuff for a UTF-16 string and converts it to UTF-8 upon return. svn path=/trunk/; revision=35253
2010-12-23 17:59:34 +00:00
}
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
/* Find length of string by looking for end of string ('\0'), up to
Allow "tvb_find_guint8()", "tvb_pbrk_guint8()", and "tvb_strnlen()" to take -1 as a "maxlength" value, meaning "to the end of the tvbuff". svn path=/trunk/; revision=2598
2000-11-10 09:15:57 +00:00
* 'maxlength' characters'; if 'maxlength' is -1, searches to end
* of tvbuff.
* Returns -1 if 'maxlength' reached before finding EOS. */
Add return type for tvb_strneql() and add prototype in tvbuff.h svn path=/trunk/; revision=2395
2000-09-07 15:29:40 +00:00
gint
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_strnlen(tvbuff_t *tvb, const gint offset, const guint maxlength)
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
gint result_offset;
guint abs_offset, junk_length;
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
DISSECTOR_ASSERT(tvb && tvb->initialized);
check_offset_length(tvb->length, tvb->reported_length, offset, 0, &abs_offset, &junk_length);
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
result_offset = tvb_find_guint8(tvb, abs_offset, maxlength, 0);
if (result_offset == -1) {
return -1;
}
else {
Patch from Heikki Vatiainen to make "tvb_strnlen()" return the length of the string rather than the offset of the end of the string, plus a patch to "tvb_get_nstringz()" to treat the return value of "tvb_strnlen()" as a length rather than an end offset. svn path=/trunk/; revision=2502
2000-10-17 08:50:57 +00:00
return result_offset - abs_offset;
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
}
}
Add tvb_strneql routine for checking if a string is present in the tvb at the current offset. svn path=/trunk/; revision=2394
2000-09-07 13:00:12 +00:00
/*
* Implement strneql etc
*/
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
/*
* Call strncmp after checking if enough chars left, returning 0 if
* it returns 0 (meaning "equal") and -1 otherwise, otherwise return -1.
*/
Add return type for tvb_strneql() and add prototype in tvbuff.h svn path=/trunk/; revision=2395
2000-09-07 15:29:40 +00:00
gint
Make tvb_strneql()'s size parameter be a size_t. Remove some now-unnecessary casts. svn path=/trunk/; revision=34725
2010-10-30 18:18:12 +00:00
tvb_strneql(tvbuff_t *tvb, const gint offset, const gchar *str, const size_t size)
Add tvb_strneql routine for checking if a string is present in the tvb at the current offset. svn path=/trunk/; revision=2394
2000-09-07 13:00:12 +00:00
{
Constify a bunch of stuff. svn path=/trunk/; revision=10106
2004-02-19 05:19:10 +00:00
const guint8 *ptr;
Add tvb_strneql routine for checking if a string is present in the tvb at the current offset. svn path=/trunk/; revision=2394
2000-09-07 13:00:12 +00:00
Make tvb_strncaseeql()'s size parameter be a size_t. Cast the size to int before calling ensure_contiguous_no_exception() (also in tvb_strneql()). svn path=/trunk/; revision=34727
2010-10-30 18:53:31 +00:00
ptr = ensure_contiguous_no_exception(tvb, offset, (gint)size, NULL);
Add tvb_strneql routine for checking if a string is present in the tvb at the current offset. svn path=/trunk/; revision=2394
2000-09-07 13:00:12 +00:00
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
if (ptr) {
Constify a bunch of stuff. svn path=/trunk/; revision=10106
2004-02-19 05:19:10 +00:00
int cmp = strncmp((const char *)ptr, str, size);
Add tvb_strneql routine for checking if a string is present in the tvb at the current offset. svn path=/trunk/; revision=2394
2000-09-07 13:00:12 +00:00
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
/*
* Return 0 if equal, -1 otherwise.
*/
return (cmp == 0 ? 0 : -1);
} else {
/*
* Not enough characters in the tvbuff to match the
* string.
*/
return -1;
}
}
Add tvb_strneql routine for checking if a string is present in the tvb at the current offset. svn path=/trunk/; revision=2394
2000-09-07 13:00:12 +00:00
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
/*
strcasecmp(), strncasecmp(), g_strcasecmp(), and g_strncasecmp() delenda est. Use g_ascii_strcasecmp() and g_ascii_strncasecmp(), and supply our own versions if they're missing from GLib (as is the case with GLib 1.x). In the code to build the list of named fields for Diameter, don't use g_strdown(); do our own g_ascii_-style upper-case to lower-case mapping in the hash function and use g_ascii_strcasecmp() in the compare function. We do this because there is no guarantee that toupper(), tolower(), and functions that use them will, for example, map between "I" and "i" in all locales; in Turkish locales, for example, there are, in both upper case and lower case, versions of "i" with and without a dot, and the upper-case version of "i" is "I"-with-a-dot and the lower-case version of "I" is "i"-without-a-dot. This causes strings that should match not to match. This finishes fixing bug 2010 - an earlier checkin prevented the crash (as there are other ways to produce the same crash, e.g. a bogus dictionary.xml file), but didn't fix the case-insensitive string matching. svn path=/trunk/; revision=23623
2007-11-27 18:52:51 +00:00
* Call g_ascii_strncasecmp after checking if enough chars left, returning
* 0 if it returns 0 (meaning "equal") and -1 otherwise, otherwise return -1.
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
*/
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
gint
Make tvb_strncaseeql()'s size parameter be a size_t. Cast the size to int before calling ensure_contiguous_no_exception() (also in tvb_strneql()). svn path=/trunk/; revision=34727
2010-10-30 18:53:31 +00:00
tvb_strncaseeql(tvbuff_t *tvb, const gint offset, const gchar *str, const size_t size)
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
{
Constify a bunch of stuff. svn path=/trunk/; revision=10106
2004-02-19 05:19:10 +00:00
const guint8 *ptr;
Add tvb_strneql routine for checking if a string is present in the tvb at the current offset. svn path=/trunk/; revision=2394
2000-09-07 13:00:12 +00:00
Make tvb_strncaseeql()'s size parameter be a size_t. Cast the size to int before calling ensure_contiguous_no_exception() (also in tvb_strneql()). svn path=/trunk/; revision=34727
2010-10-30 18:53:31 +00:00
ptr = ensure_contiguous_no_exception(tvb, offset, (gint)size, NULL);
Add tvb_strneql routine for checking if a string is present in the tvb at the current offset. svn path=/trunk/; revision=2394
2000-09-07 13:00:12 +00:00
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
if (ptr) {
strcasecmp(), strncasecmp(), g_strcasecmp(), and g_strncasecmp() delenda est. Use g_ascii_strcasecmp() and g_ascii_strncasecmp(), and supply our own versions if they're missing from GLib (as is the case with GLib 1.x). In the code to build the list of named fields for Diameter, don't use g_strdown(); do our own g_ascii_-style upper-case to lower-case mapping in the hash function and use g_ascii_strcasecmp() in the compare function. We do this because there is no guarantee that toupper(), tolower(), and functions that use them will, for example, map between "I" and "i" in all locales; in Turkish locales, for example, there are, in both upper case and lower case, versions of "i" with and without a dot, and the upper-case version of "i" is "I"-with-a-dot and the lower-case version of "I" is "i"-without-a-dot. This causes strings that should match not to match. This finishes fixing bug 2010 - an earlier checkin prevented the crash (as there are other ways to produce the same crash, e.g. a bogus dictionary.xml file), but didn't fix the case-insensitive string matching. svn path=/trunk/; revision=23623
2007-11-27 18:52:51 +00:00
int cmp = g_ascii_strncasecmp((const char *)ptr, str, size);
Add tvb_strneql routine for checking if a string is present in the tvb at the current offset. svn path=/trunk/; revision=2394
2000-09-07 13:00:12 +00:00
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
/*
* Return 0 if equal, -1 otherwise.
*/
return (cmp == 0 ? 0 : -1);
} else {
/*
* Not enough characters in the tvbuff to match the
* string.
*/
return -1;
}
Add tvb_strneql routine for checking if a string is present in the tvb at the current offset. svn path=/trunk/; revision=2394
2000-09-07 13:00:12 +00:00
}
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
/*
* Call memcmp after checking if enough chars left, returning 0 if
* it returns 0 (meaning "equal") and -1 otherwise, otherwise return -1.
*/
gint
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_memeql(tvbuff_t *tvb, const gint offset, const guint8 *str, size_t size)
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
{
Constify a bunch of stuff. svn path=/trunk/; revision=10106
2004-02-19 05:19:10 +00:00
const guint8 *ptr;
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
Make the "length" argument of the tvb_mem* functions a size_t since it's not uncommon to pass them the result of pointer arithmetic. Add size_t casts in other areas. svn path=/trunk/; revision=27941
2009-04-03 15:30:38 +00:00
ptr = ensure_contiguous_no_exception(tvb, offset, (gint) size, NULL);
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
if (ptr) {
int cmp = memcmp(ptr, str, size);
/*
* Return 0 if equal, -1 otherwise.
*/
return (cmp == 0 ? 0 : -1);
} else {
/*
* Not enough characters in the tvbuff to match the
* string.
*/
return -1;
}
}
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
/* Convert a string from Unicode to ASCII. At the moment we fake it by
From Charles Levert: in "tvb_fake_unicode()", convert non-ASCII characters to '.'. svn path=/trunk/; revision=12515
2004-11-12 10:26:56 +00:00
* replacing all non-ASCII characters with a '.' )-: The caller must
* free the result returned. The len parameter is the number of guint16's
* to convert from Unicode. */
Mention that the fake tvb unicode functions have been superceded svn path=/trunk/; revision=35689
2011-01-28 20:01:01 +00:00
/* XXX - this function has been superceded by tvb_get_unicode_string() */
Rename "fake_unicode()" to "tvb_fake_unicode()" as it works on a tvbuff, give it a byte-order argument, and move it to "epan/tvbuff.c". Use it to handle UCS-2 strings in version 1 of the Service Location Protocol. In SRVLOC V1, use registered fields that are already there for SRVLOC V2, and add some as needed. Fix some field names. svn path=/trunk/; revision=7186
2003-02-24 01:22:30 +00:00
char *
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_fake_unicode(tvbuff_t *tvb, int offset, const int len, const gboolean little_endian)
Rename "fake_unicode()" to "tvb_fake_unicode()" as it works on a tvbuff, give it a byte-order argument, and move it to "epan/tvbuff.c". Use it to handle UCS-2 strings in version 1 of the Service Location Protocol. In SRVLOC V1, use registered fields that are already there for SRVLOC V2, and add some as needed. Fix some field names. svn path=/trunk/; revision=7186
2003-02-24 01:22:30 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
char *buffer;
int i;
guint16 character;
Rename "fake_unicode()" to "tvb_fake_unicode()" as it works on a tvbuff, give it a byte-order argument, and move it to "epan/tvbuff.c". Use it to handle UCS-2 strings in version 1 of the Service Location Protocol. In SRVLOC V1, use registered fields that are already there for SRVLOC V2, and add some as needed. Fix some field names. svn path=/trunk/; revision=7186
2003-02-24 01:22:30 +00:00
/* Make sure we have enough data before allocating the buffer,
Use "tvb_ensure_bytes_exist()" to check, in "tvb_fake_unicode()", to make sure we have the entire string, rather than fetching the last character. svn path=/trunk/; revision=7783
2003-06-04 21:45:49 +00:00
so we don't blow up if the length is huge. */
tvb_ensure_bytes_exist(tvb, offset, 2*len);
Rename "fake_unicode()" to "tvb_fake_unicode()" as it works on a tvbuff, give it a byte-order argument, and move it to "epan/tvbuff.c". Use it to handle UCS-2 strings in version 1 of the Service Location Protocol. In SRVLOC V1, use registered fields that are already there for SRVLOC V2, and add some as needed. Fix some field names. svn path=/trunk/; revision=7186
2003-02-24 01:22:30 +00:00
/* We know we won't throw an exception, so we don't have to worry
about leaking this buffer. */
buffer = g_malloc(len + 1);
for (i = 0; i < len; i++) {
character = little_endian ? tvb_get_letohs(tvb, offset)
: tvb_get_ntohs(tvb, offset);
From Charles Levert: in "tvb_fake_unicode()", convert non-ASCII characters to '.'. svn path=/trunk/; revision=12515
2004-11-12 10:26:56 +00:00
buffer[i] = character < 256 ? character : '.';
Rename "fake_unicode()" to "tvb_fake_unicode()" as it works on a tvbuff, give it a byte-order argument, and move it to "epan/tvbuff.c". Use it to handle UCS-2 strings in version 1 of the Service Location Protocol. In SRVLOC V1, use registered fields that are already there for SRVLOC V2, and add some as needed. Fix some field names. svn path=/trunk/; revision=7186
2003-02-24 01:22:30 +00:00
offset += 2;
}
buffer[len] = 0;
return buffer;
}
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
/* Convert a string from Unicode to ASCII. At the moment we fake it by
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
* replacing all non-ASCII characters with a '.' )-: The len parameter is
rename ep_tvb_fake_unicode() to tvb_get_ephemeral_faked_unicode() and update the README file. svn path=/trunk/; revision=15271
2005-08-10 13:56:34 +00:00
* the number of guint16's to convert from Unicode.
add an ep version of tvb_fake_unicode() svn path=/trunk/; revision=15128
2005-07-28 08:55:11 +00:00
*
* This function allocates memory from a buffer with packet lifetime.
* You do not have to free this buffer, it will be automatically freed
name change svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
* when wireshark starts decoding the next packet.
add an ep version of tvb_fake_unicode() svn path=/trunk/; revision=15128
2005-07-28 08:55:11 +00:00
*/
Add a comment about tvb_get_ephemeral_faked_unicode() has been replaced by tvb_get_ephemeral_unicode_string(). svn path=/trunk/; revision=39528
2011-10-23 22:02:56 +00:00
/* XXX: This has been replaced by tvb_get_ephemeral_unicode_string() */
add an ep version of tvb_fake_unicode() svn path=/trunk/; revision=15128
2005-07-28 08:55:11 +00:00
char *
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_ephemeral_faked_unicode(tvbuff_t *tvb, int offset, const int len, const gboolean little_endian)
add an ep version of tvb_fake_unicode() svn path=/trunk/; revision=15128
2005-07-28 08:55:11 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
char *buffer;
int i;
guint16 character;
add an ep version of tvb_fake_unicode() svn path=/trunk/; revision=15128
2005-07-28 08:55:11 +00:00
/* Make sure we have enough data before allocating the buffer,
so we don't blow up if the length is huge. */
tvb_ensure_bytes_exist(tvb, offset, 2*len);
/* We know we won't throw an exception, so we don't have to worry
about leaking this buffer. */
buffer = ep_alloc(len + 1);
for (i = 0; i < len; i++) {
character = little_endian ? tvb_get_letohs(tvb, offset)
: tvb_get_ntohs(tvb, offset);
buffer[i] = character < 256 ? character : '.';
offset += 2;
}
buffer[len] = 0;
return buffer;
}
Added tvb_format_text svn path=/trunk/; revision=2396
2000-09-08 06:16:58 +00:00
/*
* Format the data in the tvb from offset for length ...
*/
Change return type of tvb_format_text from guint8* to gchar*. Remove now unnecessary casts in two files. svn path=/trunk/; revision=9801
2004-01-23 09:40:38 +00:00
gchar *
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_format_text(tvbuff_t *tvb, const gint offset, const gint size)
Added tvb_format_text svn path=/trunk/; revision=2396
2000-09-08 06:16:58 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr;
gint len = size;
Added tvb_format_text svn path=/trunk/; revision=2396
2000-09-08 06:16:58 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
if ((ptr = ensure_contiguous(tvb, offset, size)) == NULL) {
len = tvb_length_remaining(tvb, offset);
ptr = ensure_contiguous(tvb, offset, len);
}
Added tvb_format_text svn path=/trunk/; revision=2396
2000-09-08 06:16:58 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
return format_text(ptr, len);
Added tvb_format_text svn path=/trunk/; revision=2396
2000-09-08 06:16:58 +00:00
}
New rutine tvb_format_text_wsp() which will change "whiite space" characters to space before output. svn path=/trunk/; revision=18519
2006-06-19 15:53:03 +00:00
/*
* Format the data in the tvb from offset for length ...
*/
gchar *
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_format_text_wsp(tvbuff_t *tvb, const gint offset, const gint size)
New rutine tvb_format_text_wsp() which will change "whiite space" characters to space before output. svn path=/trunk/; revision=18519
2006-06-19 15:53:03 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr;
gint len = size;
New rutine tvb_format_text_wsp() which will change "whiite space" characters to space before output. svn path=/trunk/; revision=18519
2006-06-19 15:53:03 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
if ((ptr = ensure_contiguous(tvb, offset, size)) == NULL) {
New rutine tvb_format_text_wsp() which will change "whiite space" characters to space before output. svn path=/trunk/; revision=18519
2006-06-19 15:53:03 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
len = tvb_length_remaining(tvb, offset);
ptr = ensure_contiguous(tvb, offset, len);
New rutine tvb_format_text_wsp() which will change "whiite space" characters to space before output. svn path=/trunk/; revision=18519
2006-06-19 15:53:03 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
}
New rutine tvb_format_text_wsp() which will change "whiite space" characters to space before output. svn path=/trunk/; revision=18519
2006-06-19 15:53:03 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
return format_text_wsp(ptr, len);
New rutine tvb_format_text_wsp() which will change "whiite space" characters to space before output. svn path=/trunk/; revision=18519
2006-06-19 15:53:03 +00:00
}
Use "tvb_format_text()" to display strings, so we handle non-printable characters. Some strings appear to be null-padded; add a "tvb_format_stringzpad()" routine to handle them, so that we don't show the padding characters as "\000". svn path=/trunk/; revision=10461
2004-03-23 18:06:29 +00:00
/*
* Like "tvb_format_text()", but for null-padded strings; don't show
* the null padding characters as "\000".
*/
gchar *
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_format_stringzpad(tvbuff_t *tvb, const gint offset, const gint size)
Use "tvb_format_text()" to display strings, so we handle non-printable characters. Some strings appear to be null-padded; add a "tvb_format_stringzpad()" routine to handle them, so that we don't show the padding characters as "\000". svn path=/trunk/; revision=10461
2004-03-23 18:06:29 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr, *p;
gint len = size;
gint stringlen;
Use "tvb_format_text()" to display strings, so we handle non-printable characters. Some strings appear to be null-padded; add a "tvb_format_stringzpad()" routine to handle them, so that we don't show the padding characters as "\000". svn path=/trunk/; revision=10461
2004-03-23 18:06:29 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
if ((ptr = ensure_contiguous(tvb, offset, size)) == NULL) {
Use "tvb_format_text()" to display strings, so we handle non-printable characters. Some strings appear to be null-padded; add a "tvb_format_stringzpad()" routine to handle them, so that we don't show the padding characters as "\000". svn path=/trunk/; revision=10461
2004-03-23 18:06:29 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
len = tvb_length_remaining(tvb, offset);
ptr = ensure_contiguous(tvb, offset, len);
Use "tvb_format_text()" to display strings, so we handle non-printable characters. Some strings appear to be null-padded; add a "tvb_format_stringzpad()" routine to handle them, so that we don't show the padding characters as "\000". svn path=/trunk/; revision=10461
2004-03-23 18:06:29 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
}
Use "tvb_format_text()" to display strings, so we handle non-printable characters. Some strings appear to be null-padded; add a "tvb_format_stringzpad()" routine to handle them, so that we don't show the padding characters as "\000". svn path=/trunk/; revision=10461
2004-03-23 18:06:29 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
for (p = ptr, stringlen = 0; stringlen < len && *p != '\0'; p++, stringlen++)
;
return format_text(ptr, stringlen);
Use "tvb_format_text()" to display strings, so we handle non-printable characters. Some strings appear to be null-padded; add a "tvb_format_stringzpad()" routine to handle them, so that we don't show the padding characters as "\000". svn path=/trunk/; revision=10461
2004-03-23 18:06:29 +00:00
}
Added tvb_format_stringzpad_wsp(). svn path=/trunk/; revision=28140
2009-04-24 08:08:37 +00:00
/*
* Like "tvb_format_text_wsp()", but for null-padded strings; don't show
* the null padding characters as "\000".
*/
gchar *
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_format_stringzpad_wsp(tvbuff_t *tvb, const gint offset, const gint size)
Added tvb_format_stringzpad_wsp(). svn path=/trunk/; revision=28140
2009-04-24 08:08:37 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const guint8 *ptr, *p;
gint len = size;
gint stringlen;
Added tvb_format_stringzpad_wsp(). svn path=/trunk/; revision=28140
2009-04-24 08:08:37 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
if ((ptr = ensure_contiguous(tvb, offset, size)) == NULL) {
Added tvb_format_stringzpad_wsp(). svn path=/trunk/; revision=28140
2009-04-24 08:08:37 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
len = tvb_length_remaining(tvb, offset);
ptr = ensure_contiguous(tvb, offset, len);
Added tvb_format_stringzpad_wsp(). svn path=/trunk/; revision=28140
2009-04-24 08:08:37 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
}
Added tvb_format_stringzpad_wsp(). svn path=/trunk/; revision=28140
2009-04-24 08:08:37 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
for (p = ptr, stringlen = 0; stringlen < len && *p != '\0'; p++, stringlen++)
;
return format_text_wsp(ptr, stringlen);
Added tvb_format_stringzpad_wsp(). svn path=/trunk/; revision=28140
2009-04-24 08:08:37 +00:00
}
Add new routines: tvb_get_string() - takes a tvbuff, an offset, and a length as arguments, allocates a buffer big enough to hold a string with the specified number of bytes plus an added null terminator (i.e., length+1), copies the specified number of bytes from the tvbuff, at the specified offset, to that buffer and puts in a null terminator, and returns a pointer to that buffer (or throws an exception before allocating the buffer if that many bytes aren't available in the tvbuff); tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to a "gint" as arguments, gets the size of the null-terminated string starting at the specified offset in the tvbuff (throwing an exception if the null terminator isn't found), allocates a buffer big enough to hold that string, copies the string to that buffer, and returns a pointer to that buffer and stores the length of the string (including the terminating null) in the variable pointed to by the "gint" pointer. Replace many pieces of code allocating a buffer and copying a string with calls to "tvb_get_string()" (for one thing, "tvb_get_string()" doesn't require you to remember that the argument to "tvb_get_nstringz0()" is the size of the buffer into which you're copying the string, which might be the length of the string to be copied *plus 1*). Don't use fixed-length buffers for null-terminated strings (even if the code that generates those packets has a #define to limit the length of the string). Use "tvb_get_stringz()", instead. In some cases where a value is fetched but is only used to pass an argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()" instead. svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
/*
* Given a tvbuff, an offset, and a length, allocate a buffer big enough
* to hold a non-null-terminated string of that length at that offset,
* plus a trailing '\0', copy the string into it, and return a pointer
* to the string.
*
* Throws an exception if the tvbuff ends before the string does.
*/
guint8 *
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_string(tvbuff_t *tvb, const gint offset, const gint length)
Add new routines: tvb_get_string() - takes a tvbuff, an offset, and a length as arguments, allocates a buffer big enough to hold a string with the specified number of bytes plus an added null terminator (i.e., length+1), copies the specified number of bytes from the tvbuff, at the specified offset, to that buffer and puts in a null terminator, and returns a pointer to that buffer (or throws an exception before allocating the buffer if that many bytes aren't available in the tvbuff); tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to a "gint" as arguments, gets the size of the null-terminated string starting at the specified offset in the tvbuff (throwing an exception if the null terminator isn't found), allocates a buffer big enough to hold that string, copies the string to that buffer, and returns a pointer to that buffer and stores the length of the string (including the terminating null) in the variable pointed to by the "gint" pointer. Replace many pieces of code allocating a buffer and copying a string with calls to "tvb_get_string()" (for one thing, "tvb_get_string()" doesn't require you to remember that the argument to "tvb_get_nstringz0()" is the size of the buffer into which you're copying the string, which might be the length of the string to be copied *plus 1*). Don't use fixed-length buffers for null-terminated strings (even if the code that generates those packets has a #define to limit the length of the string). Use "tvb_get_stringz()", instead. In some cases where a value is fetched but is only used to pass an argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()" instead. svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
{
Constify a bunch of stuff. svn path=/trunk/; revision=10106
2004-02-19 05:19:10 +00:00
const guint8 *ptr;
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint8 *strbuf = NULL;
In tvb_get_string(), throw an exception if our length is less than zero. Add a message block length check to the AIM dissector. svn path=/trunk/; revision=13955
2005-03-28 15:55:47 +00:00
Use tvb_ensure_bytes_exist() in tvb_get_string() instead of throwing an exception ourselves. Fixes bug 130. svn path=/trunk/; revision=14220
2005-04-28 18:07:40 +00:00
tvb_ensure_bytes_exist(tvb, offset, length);
Add new routines: tvb_get_string() - takes a tvbuff, an offset, and a length as arguments, allocates a buffer big enough to hold a string with the specified number of bytes plus an added null terminator (i.e., length+1), copies the specified number of bytes from the tvbuff, at the specified offset, to that buffer and puts in a null terminator, and returns a pointer to that buffer (or throws an exception before allocating the buffer if that many bytes aren't available in the tvbuff); tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to a "gint" as arguments, gets the size of the null-terminated string starting at the specified offset in the tvbuff (throwing an exception if the null terminator isn't found), allocates a buffer big enough to hold that string, copies the string to that buffer, and returns a pointer to that buffer and stores the length of the string (including the terminating null) in the variable pointed to by the "gint" pointer. Replace many pieces of code allocating a buffer and copying a string with calls to "tvb_get_string()" (for one thing, "tvb_get_string()" doesn't require you to remember that the argument to "tvb_get_nstringz0()" is the size of the buffer into which you're copying the string, which might be the length of the string to be copied *plus 1*). Don't use fixed-length buffers for null-terminated strings (even if the code that generates those packets has a #define to limit the length of the string). Use "tvb_get_stringz()", instead. In some cases where a value is fetched but is only used to pass an argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()" instead. svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
ptr = ensure_contiguous(tvb, offset, length);
Add new routines: tvb_get_string() - takes a tvbuff, an offset, and a length as arguments, allocates a buffer big enough to hold a string with the specified number of bytes plus an added null terminator (i.e., length+1), copies the specified number of bytes from the tvbuff, at the specified offset, to that buffer and puts in a null terminator, and returns a pointer to that buffer (or throws an exception before allocating the buffer if that many bytes aren't available in the tvbuff); tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to a "gint" as arguments, gets the size of the null-terminated string starting at the specified offset in the tvbuff (throwing an exception if the null terminator isn't found), allocates a buffer big enough to hold that string, copies the string to that buffer, and returns a pointer to that buffer and stores the length of the string (including the terminating null) in the variable pointed to by the "gint" pointer. Replace many pieces of code allocating a buffer and copying a string with calls to "tvb_get_string()" (for one thing, "tvb_get_string()" doesn't require you to remember that the argument to "tvb_get_nstringz0()" is the size of the buffer into which you're copying the string, which might be the length of the string to be copied *plus 1*). Don't use fixed-length buffers for null-terminated strings (even if the code that generates those packets has a #define to limit the length of the string). Use "tvb_get_stringz()", instead. In some cases where a value is fetched but is only used to pass an argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()" instead. svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
strbuf = g_malloc(length + 1);
In tvb_get_string(), throw an exception if our length is less than zero. Add a message block length check to the AIM dissector. svn path=/trunk/; revision=13955
2005-03-28 15:55:47 +00:00
if (length != 0) {
Add new routines: tvb_get_string() - takes a tvbuff, an offset, and a length as arguments, allocates a buffer big enough to hold a string with the specified number of bytes plus an added null terminator (i.e., length+1), copies the specified number of bytes from the tvbuff, at the specified offset, to that buffer and puts in a null terminator, and returns a pointer to that buffer (or throws an exception before allocating the buffer if that many bytes aren't available in the tvbuff); tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to a "gint" as arguments, gets the size of the null-terminated string starting at the specified offset in the tvbuff (throwing an exception if the null terminator isn't found), allocates a buffer big enough to hold that string, copies the string to that buffer, and returns a pointer to that buffer and stores the length of the string (including the terminating null) in the variable pointed to by the "gint" pointer. Replace many pieces of code allocating a buffer and copying a string with calls to "tvb_get_string()" (for one thing, "tvb_get_string()" doesn't require you to remember that the argument to "tvb_get_nstringz0()" is the size of the buffer into which you're copying the string, which might be the length of the string to be copied *plus 1*). Don't use fixed-length buffers for null-terminated strings (even if the code that generates those packets has a #define to limit the length of the string). Use "tvb_get_stringz()", instead. In some cases where a value is fetched but is only used to pass an argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()" instead. svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
memcpy(strbuf, ptr, length);
In tvb_get_string(), throw an exception if our length is less than zero. Add a message block length check to the AIM dissector. svn path=/trunk/; revision=13955
2005-03-28 15:55:47 +00:00
}
Add new routines: tvb_get_string() - takes a tvbuff, an offset, and a length as arguments, allocates a buffer big enough to hold a string with the specified number of bytes plus an added null terminator (i.e., length+1), copies the specified number of bytes from the tvbuff, at the specified offset, to that buffer and puts in a null terminator, and returns a pointer to that buffer (or throws an exception before allocating the buffer if that many bytes aren't available in the tvbuff); tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to a "gint" as arguments, gets the size of the null-terminated string starting at the specified offset in the tvbuff (throwing an exception if the null terminator isn't found), allocates a buffer big enough to hold that string, copies the string to that buffer, and returns a pointer to that buffer and stores the length of the string (including the terminating null) in the variable pointed to by the "gint" pointer. Replace many pieces of code allocating a buffer and copying a string with calls to "tvb_get_string()" (for one thing, "tvb_get_string()" doesn't require you to remember that the argument to "tvb_get_nstringz0()" is the size of the buffer into which you're copying the string, which might be the length of the string to be copied *plus 1*). Don't use fixed-length buffers for null-terminated strings (even if the code that generates those packets has a #define to limit the length of the string). Use "tvb_get_stringz()", instead. In some cases where a value is fetched but is only used to pass an argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()" instead. svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
strbuf[length] = '\0';
return strbuf;
}
Introduce two new functions for Unicode (UTF-16) string handling: tvb_get_unicode_string() tvb_get_ephemeral_unicode_string() These function like their counterparts, tvb_get_string and tvb_get_epemeral_string, for standard strings. Also update comment on what the first such function, tvb_get_ephemeral_unicode_stringz does regarding updating lengthp. svn path=/trunk/; revision=35344
2011-01-03 18:29:29 +00:00
/*
* Unicode (UTF-16) version of tvb_get_string()
Add ENC_UTF_16 and ENC_UCS_2. Note that UTF-16 and UCS-2 are not the same, and that the routines to get "Unicode" strings are really doing UCS-2 (and not doing anything about code values that aren't valid in UCS-2 strings). Have tvb_get_ephemeral_string_enc() separate cases for ASCII and UTF-8, even though they're *currently* treated the same. For FT_UINT_STRING, treat an encoding value of TRUE as meaning "little-endian ASCII"; pass all other encodings through to tvb_get_ephemeral_string_enc(). svn path=/trunk/; revision=42592
2012-05-11 23:55:54 +00:00
* XXX - this is UCS-2, not UTF-16, as it doesn't handle surrogate pairs
Introduce, and start using, tvb_get_const_stringz(). This function returns a pointer to a NULL-terminated string in the TVB. It is no safer than dissectors which call tvb_get_strsize() and then tvb_get_ptr() but it makes it clear that this usage of tvb_get_ptr() is safe. This function is slightly more efficient than tvb_get_ephemeral_stringz()--but only as long as we're not using composite TVBs. svn path=/trunk/; revision=35493
2011-01-12 02:25:08 +00:00
*
Introduce two new functions for Unicode (UTF-16) string handling: tvb_get_unicode_string() tvb_get_ephemeral_unicode_string() These function like their counterparts, tvb_get_string and tvb_get_epemeral_string, for standard strings. Also update comment on what the first such function, tvb_get_ephemeral_unicode_stringz does regarding updating lengthp. svn path=/trunk/; revision=35344
2011-01-03 18:29:29 +00:00
* Encoding paramter should be ENC_BIG_ENDIAN or ENC_LITTLE_ENDIAN
*
* Specify length in bytes
Introduce, and start using, tvb_get_const_stringz(). This function returns a pointer to a NULL-terminated string in the TVB. It is no safer than dissectors which call tvb_get_strsize() and then tvb_get_ptr() but it makes it clear that this usage of tvb_get_ptr() is safe. This function is slightly more efficient than tvb_get_ephemeral_stringz()--but only as long as we're not using composite TVBs. svn path=/trunk/; revision=35493
2011-01-12 02:25:08 +00:00
*
Introduce two new functions for Unicode (UTF-16) string handling: tvb_get_unicode_string() tvb_get_ephemeral_unicode_string() These function like their counterparts, tvb_get_string and tvb_get_epemeral_string, for standard strings. Also update comment on what the first such function, tvb_get_ephemeral_unicode_stringz does regarding updating lengthp. svn path=/trunk/; revision=35344
2011-01-03 18:29:29 +00:00
* Returns an UTF-8 string that must be freed by the caller
*/
gchar *
tvb_get_unicode_string(tvbuff_t *tvb, const gint offset, gint length, const guint encoding)
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
gchar *tmpbuf = NULL;
gunichar2 uchar;
gint i; /* Byte counter for tvbuff */
gint tmpbuf_len;
GString *strbuf = NULL;
Introduce two new functions for Unicode (UTF-16) string handling: tvb_get_unicode_string() tvb_get_ephemeral_unicode_string() These function like their counterparts, tvb_get_string and tvb_get_epemeral_string, for standard strings. Also update comment on what the first such function, tvb_get_ephemeral_unicode_stringz does regarding updating lengthp. svn path=/trunk/; revision=35344
2011-01-03 18:29:29 +00:00
strbuf = g_string_new(NULL);
for(i = 0; i < length; i += 2) {
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
if (encoding == ENC_BIG_ENDIAN)
Introduce two new functions for Unicode (UTF-16) string handling: tvb_get_unicode_string() tvb_get_ephemeral_unicode_string() These function like their counterparts, tvb_get_string and tvb_get_epemeral_string, for standard strings. Also update comment on what the first such function, tvb_get_ephemeral_unicode_stringz does regarding updating lengthp. svn path=/trunk/; revision=35344
2011-01-03 18:29:29 +00:00
uchar = tvb_get_ntohs(tvb, offset + i);
else
uchar = tvb_get_letohs(tvb, offset + i);
/* Calculate how much space is needed to store UTF-16 character
* in UTF-8 */
tmpbuf_len = g_unichar_to_utf8(uchar, NULL);
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tmpbuf = g_malloc(tmpbuf_len + 1); /* + 1 to make room for null
Introduce two new functions for Unicode (UTF-16) string handling: tvb_get_unicode_string() tvb_get_ephemeral_unicode_string() These function like their counterparts, tvb_get_string and tvb_get_epemeral_string, for standard strings. Also update comment on what the first such function, tvb_get_ephemeral_unicode_stringz does regarding updating lengthp. svn path=/trunk/; revision=35344
2011-01-03 18:29:29 +00:00
* terminator */
g_unichar_to_utf8(uchar, tmpbuf);
/* NULL terminate the tmpbuf so g_string_append knows where
* to stop */
tmpbuf[tmpbuf_len] = '\0';
g_string_append(strbuf, tmpbuf);
g_free(tmpbuf);
}
return g_string_free(strbuf, FALSE);
}
add ep_tvb_get_string that acts the same as tvb_get_string but the buffer returned need not be freed. svn path=/trunk/; revision=15024
2005-07-24 01:56:01 +00:00
/*
Add a tvb_get_ephemeral_string_enc() routine that's like tvb_get_ephemeral_string() but takes an ENC_ value for the character encoding. Use it in the MQ dissector to fetch strings to put, for example, into the Info column, so we properly handle EBCDIC strings there. svn path=/trunk/; revision=37876
2011-07-03 17:08:25 +00:00
* Given a tvbuff, an offset, a length, and an encoding, allocate a
* buffer big enough to hold a non-null-terminated string of that length
* at that offset, plus a trailing '\0', copy the string into it, and
* return a pointer to the string; if the encoding is EBCDIC, map
* the string from EBCDIC to ASCII.
add ep_tvb_get_string that acts the same as tvb_get_string but the buffer returned need not be freed. svn path=/trunk/; revision=15024
2005-07-24 01:56:01 +00:00
*
* Throws an exception if the tvbuff ends before the string does.
*
* This function allocates memory from a buffer with packet lifetime.
* You do not have to free this buffer, it will be automatically freed
name change svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
* when wireshark starts decoding the next packet.
add ep_tvb_get_string that acts the same as tvb_get_string but the buffer returned need not be freed. svn path=/trunk/; revision=15024
2005-07-24 01:56:01 +00:00
* Do not use this function if you want the allocated memory to be persistent
* after the current packet has been dissected.
*/
guint8 *
Add a tvb_get_ephemeral_string_enc() routine that's like tvb_get_ephemeral_string() but takes an ENC_ value for the character encoding. Use it in the MQ dissector to fetch strings to put, for example, into the Info column, so we properly handle EBCDIC strings there. svn path=/trunk/; revision=37876
2011-07-03 17:08:25 +00:00
tvb_get_ephemeral_string_enc(tvbuff_t *tvb, const gint offset,
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
const gint length, const gint encoding)
add ep_tvb_get_string that acts the same as tvb_get_string but the buffer returned need not be freed. svn path=/trunk/; revision=15024
2005-07-24 01:56:01 +00:00
{
const guint8 *ptr;
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint8 *strbuf = NULL;
add ep_tvb_get_string that acts the same as tvb_get_string but the buffer returned need not be freed. svn path=/trunk/; revision=15024
2005-07-24 01:56:01 +00:00
tvb_ensure_bytes_exist(tvb, offset, length);
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
ptr = ensure_contiguous(tvb, offset, length);
Add ENC_UTF_16 and ENC_UCS_2. Note that UTF-16 and UCS-2 are not the same, and that the routines to get "Unicode" strings are really doing UCS-2 (and not doing anything about code values that aren't valid in UCS-2 strings). Have tvb_get_ephemeral_string_enc() separate cases for ASCII and UTF-8, even though they're *currently* treated the same. For FT_UINT_STRING, treat an encoding value of TRUE as meaning "little-endian ASCII"; pass all other encodings through to tvb_get_ephemeral_string_enc(). svn path=/trunk/; revision=42592
2012-05-11 23:55:54 +00:00
switch (encoding & ENC_CHARENCODING_MASK) {
case ENC_ASCII:
default:
/*
* For now, we treat bogus values as meaning
* "ASCII" rather than reporting an error,
* for the benefit of old dissectors written
* when the last argument to proto_tree_add_item()
* was a gboolean for the byte order, not an
* encoding value, and passed non-zero values
* other than TRUE to mean "little-endian".
*
* XXX - should map all octets with the 8th bit
* not set to a "substitute" UTF-8 character.
*/
strbuf = ep_alloc(length + 1);
if (length != 0) {
memcpy(strbuf, ptr, length);
}
break;
case ENC_UTF_8:
/*
* XXX - should map all invalid UTF-8 sequences
* to a "substitute" UTF-8 character.
*/
strbuf = ep_alloc(length + 1);
if (length != 0) {
memcpy(strbuf, ptr, length);
}
break;
case ENC_UTF_16:
/*
* XXX - needs to handle surrogate pairs and to map
* invalid characters and sequences to a "substitute"
* UTF-8 character.
*/
strbuf = tvb_get_ephemeral_unicode_string(tvb, offset, length,
encoding & ENC_LITTLE_ENDIAN);
break;
case ENC_UCS_2:
/*
* XXX - needs to map values that are not valid UCS-2
* characters (such as, I think, values used as the
* components of a UTF-16 surrogate pair) to a
* "substitute" UTF-8 character.
*/
strbuf = tvb_get_ephemeral_unicode_string(tvb, offset, length,
encoding & ENC_LITTLE_ENDIAN);
break;
case ENC_EBCDIC:
/*
* XXX - do the copy and conversion in one pass.
*
* XXX - multiple "dialects" of EBCDIC?
*/
strbuf = ep_alloc(length + 1);
if (length != 0) {
memcpy(strbuf, ptr, length);
}
Add a tvb_get_ephemeral_string_enc() routine that's like tvb_get_ephemeral_string() but takes an ENC_ value for the character encoding. Use it in the MQ dissector to fetch strings to put, for example, into the Info column, so we properly handle EBCDIC strings there. svn path=/trunk/; revision=37876
2011-07-03 17:08:25 +00:00
EBCDIC_to_ASCII(strbuf, length);
Add ENC_UTF_16 and ENC_UCS_2. Note that UTF-16 and UCS-2 are not the same, and that the routines to get "Unicode" strings are really doing UCS-2 (and not doing anything about code values that aren't valid in UCS-2 strings). Have tvb_get_ephemeral_string_enc() separate cases for ASCII and UTF-8, even though they're *currently* treated the same. For FT_UINT_STRING, treat an encoding value of TRUE as meaning "little-endian ASCII"; pass all other encodings through to tvb_get_ephemeral_string_enc(). svn path=/trunk/; revision=42592
2012-05-11 23:55:54 +00:00
break;
}
add ep_tvb_get_string that acts the same as tvb_get_string but the buffer returned need not be freed. svn path=/trunk/; revision=15024
2005-07-24 01:56:01 +00:00
strbuf[length] = '\0';
return strbuf;
}
Add a tvb_get_ephemeral_string_enc() routine that's like tvb_get_ephemeral_string() but takes an ENC_ value for the character encoding. Use it in the MQ dissector to fetch strings to put, for example, into the Info column, so we properly handle EBCDIC strings there. svn path=/trunk/; revision=37876
2011-07-03 17:08:25 +00:00
guint8 *
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tvb_get_ephemeral_string(tvbuff_t *tvb, const gint offset, const gint length)
Add a tvb_get_ephemeral_string_enc() routine that's like tvb_get_ephemeral_string() but takes an ENC_ value for the character encoding. Use it in the MQ dissector to fetch strings to put, for example, into the Info column, so we properly handle EBCDIC strings there. svn path=/trunk/; revision=37876
2011-07-03 17:08:25 +00:00
{
return tvb_get_ephemeral_string_enc(tvb, offset, length, ENC_UTF_8|ENC_NA);
}
Introduce two new functions for Unicode (UTF-16) string handling: tvb_get_unicode_string() tvb_get_ephemeral_unicode_string() These function like their counterparts, tvb_get_string and tvb_get_epemeral_string, for standard strings. Also update comment on what the first such function, tvb_get_ephemeral_unicode_stringz does regarding updating lengthp. svn path=/trunk/; revision=35344
2011-01-03 18:29:29 +00:00
/*
* Unicode (UTF-16) version of tvb_get_ephemeral_string()
Add ENC_UTF_16 and ENC_UCS_2. Note that UTF-16 and UCS-2 are not the same, and that the routines to get "Unicode" strings are really doing UCS-2 (and not doing anything about code values that aren't valid in UCS-2 strings). Have tvb_get_ephemeral_string_enc() separate cases for ASCII and UTF-8, even though they're *currently* treated the same. For FT_UINT_STRING, treat an encoding value of TRUE as meaning "little-endian ASCII"; pass all other encodings through to tvb_get_ephemeral_string_enc(). svn path=/trunk/; revision=42592
2012-05-11 23:55:54 +00:00
* XXX - this is UCS-2, not UTF-16, as it doesn't handle surrogate pairs
Introduce, and start using, tvb_get_const_stringz(). This function returns a pointer to a NULL-terminated string in the TVB. It is no safer than dissectors which call tvb_get_strsize() and then tvb_get_ptr() but it makes it clear that this usage of tvb_get_ptr() is safe. This function is slightly more efficient than tvb_get_ephemeral_stringz()--but only as long as we're not using composite TVBs. svn path=/trunk/; revision=35493
2011-01-12 02:25:08 +00:00
*
Introduce two new functions for Unicode (UTF-16) string handling: tvb_get_unicode_string() tvb_get_ephemeral_unicode_string() These function like their counterparts, tvb_get_string and tvb_get_epemeral_string, for standard strings. Also update comment on what the first such function, tvb_get_ephemeral_unicode_stringz does regarding updating lengthp. svn path=/trunk/; revision=35344
2011-01-03 18:29:29 +00:00
* Encoding paramter should be ENC_BIG_ENDIAN or ENC_LITTLE_ENDIAN
*
* Specify length in bytes
Introduce, and start using, tvb_get_const_stringz(). This function returns a pointer to a NULL-terminated string in the TVB. It is no safer than dissectors which call tvb_get_strsize() and then tvb_get_ptr() but it makes it clear that this usage of tvb_get_ptr() is safe. This function is slightly more efficient than tvb_get_ephemeral_stringz()--but only as long as we're not using composite TVBs. svn path=/trunk/; revision=35493
2011-01-12 02:25:08 +00:00
*
Introduce two new functions for Unicode (UTF-16) string handling: tvb_get_unicode_string() tvb_get_ephemeral_unicode_string() These function like their counterparts, tvb_get_string and tvb_get_epemeral_string, for standard strings. Also update comment on what the first such function, tvb_get_ephemeral_unicode_stringz does regarding updating lengthp. svn path=/trunk/; revision=35344
2011-01-03 18:29:29 +00:00
* Returns an ep_ allocated UTF-8 string
*/
gchar *
tvb_get_ephemeral_unicode_string(tvbuff_t *tvb, const gint offset, gint length, const guint encoding)
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
gchar *tmpbuf = NULL;
gunichar2 uchar;
gint i; /* Byte counter for tvbuff */
gint tmpbuf_len;
Introduce two new functions for Unicode (UTF-16) string handling: tvb_get_unicode_string() tvb_get_ephemeral_unicode_string() These function like their counterparts, tvb_get_string and tvb_get_epemeral_string, for standard strings. Also update comment on what the first such function, tvb_get_ephemeral_unicode_stringz does regarding updating lengthp. svn path=/trunk/; revision=35344
2011-01-03 18:29:29 +00:00
emem_strbuf_t *strbuf = NULL;
strbuf = ep_strbuf_new(NULL);
for(i = 0; i < length; i += 2) {
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
if (encoding == ENC_BIG_ENDIAN)
Introduce two new functions for Unicode (UTF-16) string handling: tvb_get_unicode_string() tvb_get_ephemeral_unicode_string() These function like their counterparts, tvb_get_string and tvb_get_epemeral_string, for standard strings. Also update comment on what the first such function, tvb_get_ephemeral_unicode_stringz does regarding updating lengthp. svn path=/trunk/; revision=35344
2011-01-03 18:29:29 +00:00
uchar = tvb_get_ntohs(tvb, offset + i);
else
uchar = tvb_get_letohs(tvb, offset + i);
/* Calculate how much space is needed to store UTF-16 character
* in UTF-8 */
tmpbuf_len = g_unichar_to_utf8(uchar, NULL);
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tmpbuf = g_malloc(tmpbuf_len + 1); /* + 1 to make room for null
Introduce two new functions for Unicode (UTF-16) string handling: tvb_get_unicode_string() tvb_get_ephemeral_unicode_string() These function like their counterparts, tvb_get_string and tvb_get_epemeral_string, for standard strings. Also update comment on what the first such function, tvb_get_ephemeral_unicode_stringz does regarding updating lengthp. svn path=/trunk/; revision=35344
2011-01-03 18:29:29 +00:00
* terminator */
g_unichar_to_utf8(uchar, tmpbuf);
/* NULL terminate the tmpbuf so ep_strbuf_append knows where
* to stop */
tmpbuf[tmpbuf_len] = '\0';
ep_strbuf_append(strbuf, tmpbuf);
g_free(tmpbuf);
}
return strbuf->str;
}
Introduce two new functions: tvb_get_seasonal_string(); tvb_get_seasonal_stringz(); .. which work the same as the ephemeral versions of the functions, but use se_alloc() instead of ep_alloc(). svn path=/trunk/; revision=27868
2009-03-27 19:40:23 +00:00
/*
* Given a tvbuff, an offset, and a length, allocate a buffer big enough
* to hold a non-null-terminated string of that length at that offset,
* plus a trailing '\0', copy the string into it, and return a pointer
* to the string.
*
* Throws an exception if the tvbuff ends before the string does.
*
* This function allocates memory from a buffer with capture session lifetime.
* You do not have to free this buffer, it will be automatically freed
* when wireshark starts or opens a new capture.
*/
guint8 *
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_seasonal_string(tvbuff_t *tvb, const gint offset, const gint length)
Introduce two new functions: tvb_get_seasonal_string(); tvb_get_seasonal_stringz(); .. which work the same as the ephemeral versions of the functions, but use se_alloc() instead of ep_alloc(). svn path=/trunk/; revision=27868
2009-03-27 19:40:23 +00:00
{
const guint8 *ptr;
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint8 *strbuf = NULL;
Introduce two new functions: tvb_get_seasonal_string(); tvb_get_seasonal_stringz(); .. which work the same as the ephemeral versions of the functions, but use se_alloc() instead of ep_alloc(). svn path=/trunk/; revision=27868
2009-03-27 19:40:23 +00:00
tvb_ensure_bytes_exist(tvb, offset, length);
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
ptr = ensure_contiguous(tvb, offset, length);
Introduce two new functions: tvb_get_seasonal_string(); tvb_get_seasonal_stringz(); .. which work the same as the ephemeral versions of the functions, but use se_alloc() instead of ep_alloc(). svn path=/trunk/; revision=27868
2009-03-27 19:40:23 +00:00
strbuf = se_alloc(length + 1);
if (length != 0) {
memcpy(strbuf, ptr, length);
}
strbuf[length] = '\0';
return strbuf;
}
Add new routines: tvb_get_string() - takes a tvbuff, an offset, and a length as arguments, allocates a buffer big enough to hold a string with the specified number of bytes plus an added null terminator (i.e., length+1), copies the specified number of bytes from the tvbuff, at the specified offset, to that buffer and puts in a null terminator, and returns a pointer to that buffer (or throws an exception before allocating the buffer if that many bytes aren't available in the tvbuff); tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to a "gint" as arguments, gets the size of the null-terminated string starting at the specified offset in the tvbuff (throwing an exception if the null terminator isn't found), allocates a buffer big enough to hold that string, copies the string to that buffer, and returns a pointer to that buffer and stores the length of the string (including the terminating null) in the variable pointed to by the "gint" pointer. Replace many pieces of code allocating a buffer and copying a string with calls to "tvb_get_string()" (for one thing, "tvb_get_string()" doesn't require you to remember that the argument to "tvb_get_nstringz0()" is the size of the buffer into which you're copying the string, which might be the length of the string to be copied *plus 1*). Don't use fixed-length buffers for null-terminated strings (even if the code that generates those packets has a #define to limit the length of the string). Use "tvb_get_stringz()", instead. In some cases where a value is fetched but is only used to pass an argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()" instead. svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
/*
Add some additional routine variants that handle string encodings, and make FT_STRING and FT_UINT_STRING handle string encodings. Get rid of FT_EBCDIC in favor of FT_STRING with ENC_EBCDIC. Add some URLs for DRDA. Clean up some stuff in TN3270 and TN5250, including using ENC_ values for proto_tree_add_item(). svn path=/trunk/; revision=37909
2011-07-05 23:59:23 +00:00
* Given a tvbuff, an offset, and an encoding, with the offset assumed
* to refer to a null-terminated string, find the length of that string
* (and throw an exception if the tvbuff ends before we find the null),
* allocate a buffer big enough to hold the string, copy the string into
* it, and return a pointer to the string; if the encoding is EBCDIC, map
* the string from EBCDIC to ASCII. Also return the length of the
Add new routines: tvb_get_string() - takes a tvbuff, an offset, and a length as arguments, allocates a buffer big enough to hold a string with the specified number of bytes plus an added null terminator (i.e., length+1), copies the specified number of bytes from the tvbuff, at the specified offset, to that buffer and puts in a null terminator, and returns a pointer to that buffer (or throws an exception before allocating the buffer if that many bytes aren't available in the tvbuff); tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to a "gint" as arguments, gets the size of the null-terminated string starting at the specified offset in the tvbuff (throwing an exception if the null terminator isn't found), allocates a buffer big enough to hold that string, copies the string to that buffer, and returns a pointer to that buffer and stores the length of the string (including the terminating null) in the variable pointed to by the "gint" pointer. Replace many pieces of code allocating a buffer and copying a string with calls to "tvb_get_string()" (for one thing, "tvb_get_string()" doesn't require you to remember that the argument to "tvb_get_nstringz0()" is the size of the buffer into which you're copying the string, which might be the length of the string to be copied *plus 1*). Don't use fixed-length buffers for null-terminated strings (even if the code that generates those packets has a #define to limit the length of the string). Use "tvb_get_stringz()", instead. In some cases where a value is fetched but is only used to pass an argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()" instead. svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
* string (including the terminating null) through a pointer.
*/
guint8 *
Add some additional routine variants that handle string encodings, and make FT_STRING and FT_UINT_STRING handle string encodings. Get rid of FT_EBCDIC in favor of FT_STRING with ENC_EBCDIC. Add some URLs for DRDA. Clean up some stuff in TN3270 and TN5250, including using ENC_ values for proto_tree_add_item(). svn path=/trunk/; revision=37909
2011-07-05 23:59:23 +00:00
tvb_get_stringz_enc(tvbuff_t *tvb, const gint offset, gint *lengthp, gint encoding)
Add new routines: tvb_get_string() - takes a tvbuff, an offset, and a length as arguments, allocates a buffer big enough to hold a string with the specified number of bytes plus an added null terminator (i.e., length+1), copies the specified number of bytes from the tvbuff, at the specified offset, to that buffer and puts in a null terminator, and returns a pointer to that buffer (or throws an exception before allocating the buffer if that many bytes aren't available in the tvbuff); tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to a "gint" as arguments, gets the size of the null-terminated string starting at the specified offset in the tvbuff (throwing an exception if the null terminator isn't found), allocates a buffer big enough to hold that string, copies the string to that buffer, and returns a pointer to that buffer and stores the length of the string (including the terminating null) in the variable pointed to by the "gint" pointer. Replace many pieces of code allocating a buffer and copying a string with calls to "tvb_get_string()" (for one thing, "tvb_get_string()" doesn't require you to remember that the argument to "tvb_get_nstringz0()" is the size of the buffer into which you're copying the string, which might be the length of the string to be copied *plus 1*). Don't use fixed-length buffers for null-terminated strings (even if the code that generates those packets has a #define to limit the length of the string). Use "tvb_get_stringz()", instead. In some cases where a value is fetched but is only used to pass an argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()" instead. svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint size;
Add new routines: tvb_get_string() - takes a tvbuff, an offset, and a length as arguments, allocates a buffer big enough to hold a string with the specified number of bytes plus an added null terminator (i.e., length+1), copies the specified number of bytes from the tvbuff, at the specified offset, to that buffer and puts in a null terminator, and returns a pointer to that buffer (or throws an exception before allocating the buffer if that many bytes aren't available in the tvbuff); tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to a "gint" as arguments, gets the size of the null-terminated string starting at the specified offset in the tvbuff (throwing an exception if the null terminator isn't found), allocates a buffer big enough to hold that string, copies the string to that buffer, and returns a pointer to that buffer and stores the length of the string (including the terminating null) in the variable pointed to by the "gint" pointer. Replace many pieces of code allocating a buffer and copying a string with calls to "tvb_get_string()" (for one thing, "tvb_get_string()" doesn't require you to remember that the argument to "tvb_get_nstringz0()" is the size of the buffer into which you're copying the string, which might be the length of the string to be copied *plus 1*). Don't use fixed-length buffers for null-terminated strings (even if the code that generates those packets has a #define to limit the length of the string). Use "tvb_get_stringz()", instead. In some cases where a value is fetched but is only used to pass an argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()" instead. svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
guint8 *strptr;
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
size = tvb_strsize(tvb, offset);
Add new routines: tvb_get_string() - takes a tvbuff, an offset, and a length as arguments, allocates a buffer big enough to hold a string with the specified number of bytes plus an added null terminator (i.e., length+1), copies the specified number of bytes from the tvbuff, at the specified offset, to that buffer and puts in a null terminator, and returns a pointer to that buffer (or throws an exception before allocating the buffer if that many bytes aren't available in the tvbuff); tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to a "gint" as arguments, gets the size of the null-terminated string starting at the specified offset in the tvbuff (throwing an exception if the null terminator isn't found), allocates a buffer big enough to hold that string, copies the string to that buffer, and returns a pointer to that buffer and stores the length of the string (including the terminating null) in the variable pointed to by the "gint" pointer. Replace many pieces of code allocating a buffer and copying a string with calls to "tvb_get_string()" (for one thing, "tvb_get_string()" doesn't require you to remember that the argument to "tvb_get_nstringz0()" is the size of the buffer into which you're copying the string, which might be the length of the string to be copied *plus 1*). Don't use fixed-length buffers for null-terminated strings (even if the code that generates those packets has a #define to limit the length of the string). Use "tvb_get_stringz()", instead. In some cases where a value is fetched but is only used to pass an argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()" instead. svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
strptr = g_malloc(size);
tvb_memcpy(tvb, strptr, offset, size);
Add some additional routine variants that handle string encodings, and make FT_STRING and FT_UINT_STRING handle string encodings. Get rid of FT_EBCDIC in favor of FT_STRING with ENC_EBCDIC. Add some URLs for DRDA. Clean up some stuff in TN3270 and TN5250, including using ENC_ values for proto_tree_add_item(). svn path=/trunk/; revision=37909
2011-07-05 23:59:23 +00:00
if ((encoding & ENC_CHARENCODING_MASK) == ENC_EBCDIC)
EBCDIC_to_ASCII(strptr, size);
Make more output parameters optional. svn path=/trunk/; revision=31059
2009-11-23 22:02:12 +00:00
if (lengthp)
*lengthp = size;
add new function tvb_get_ephemeral_stringz() svn path=/trunk/; revision=15273
2005-08-10 14:25:59 +00:00
return strptr;
}
Add some additional routine variants that handle string encodings, and make FT_STRING and FT_UINT_STRING handle string encodings. Get rid of FT_EBCDIC in favor of FT_STRING with ENC_EBCDIC. Add some URLs for DRDA. Clean up some stuff in TN3270 and TN5250, including using ENC_ values for proto_tree_add_item(). svn path=/trunk/; revision=37909
2011-07-05 23:59:23 +00:00
guint8 *
tvb_get_stringz(tvbuff_t *tvb, const gint offset, gint *lengthp)
{
return tvb_get_stringz_enc(tvb, offset, lengthp, ENC_UTF_8|ENC_NA);
}
Introduce, and start using, tvb_get_const_stringz(). This function returns a pointer to a NULL-terminated string in the TVB. It is no safer than dissectors which call tvb_get_strsize() and then tvb_get_ptr() but it makes it clear that this usage of tvb_get_ptr() is safe. This function is slightly more efficient than tvb_get_ephemeral_stringz()--but only as long as we're not using composite TVBs. svn path=/trunk/; revision=35493
2011-01-12 02:25:08 +00:00
/*
* Given a tvbuff and an offset, with the offset assumed to refer to
* a null-terminated string, find the length of that string (and throw
* an exception if the tvbuff ends before we find the null), ensure that
* the TVB is flat, and return a pointer to the string (in the TVB).
* Also return the length of the string (including the terminating null)
* through a pointer.
*
* As long as we aren't using composite TVBs, this saves the cycles used
* (often unnecessariliy) in allocating a buffer and copying the string into
* it. (If we do start using composite TVBs, we may want to replace this
* function with the _ephemeral versoin.)
*/
const guint8 *
tvb_get_const_stringz(tvbuff_t *tvb, const gint offset, gint *lengthp)
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint size;
Introduce, and start using, tvb_get_const_stringz(). This function returns a pointer to a NULL-terminated string in the TVB. It is no safer than dissectors which call tvb_get_strsize() and then tvb_get_ptr() but it makes it clear that this usage of tvb_get_ptr() is safe. This function is slightly more efficient than tvb_get_ephemeral_stringz()--but only as long as we're not using composite TVBs. svn path=/trunk/; revision=35493
2011-01-12 02:25:08 +00:00
const guint8 *strptr;
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
size = tvb_strsize(tvb, offset);
There's no need to call tvb_get_ptr() in here: just call ensure_contiguous() directly. svn path=/trunk/; revision=35509
2011-01-12 20:25:36 +00:00
strptr = ensure_contiguous(tvb, offset, size);
Introduce, and start using, tvb_get_const_stringz(). This function returns a pointer to a NULL-terminated string in the TVB. It is no safer than dissectors which call tvb_get_strsize() and then tvb_get_ptr() but it makes it clear that this usage of tvb_get_ptr() is safe. This function is slightly more efficient than tvb_get_ephemeral_stringz()--but only as long as we're not using composite TVBs. svn path=/trunk/; revision=35493
2011-01-12 02:25:08 +00:00
if (lengthp)
*lengthp = size;
return strptr;
}
Add some additional routine variants that handle string encodings, and make FT_STRING and FT_UINT_STRING handle string encodings. Get rid of FT_EBCDIC in favor of FT_STRING with ENC_EBCDIC. Add some URLs for DRDA. Clean up some stuff in TN3270 and TN5250, including using ENC_ values for proto_tree_add_item(). svn path=/trunk/; revision=37909
2011-07-05 23:59:23 +00:00
add new function tvb_get_ephemeral_stringz() svn path=/trunk/; revision=15273
2005-08-10 14:25:59 +00:00
/*
* Given a tvbuff and an offset, with the offset assumed to refer to
* a null-terminated string, find the length of that string (and throw
* an exception if the tvbuff ends before we find the null), allocate
* a buffer big enough to hold the string, copy the string into it,
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
* and return a pointer to the string. Also return the length of the
add new function tvb_get_ephemeral_stringz() svn path=/trunk/; revision=15273
2005-08-10 14:25:59 +00:00
* string (including the terminating null) through a pointer.
*
* This function allocates memory from a buffer with packet lifetime.
* You do not have to free this buffer, it will be automatically freed
name change svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
* when wireshark starts decoding the next packet.
add new function tvb_get_ephemeral_stringz() svn path=/trunk/; revision=15273
2005-08-10 14:25:59 +00:00
* Do not use this function if you want the allocated memory to be persistent
* after the current packet has been dissected.
*/
guint8 *
Add some additional routine variants that handle string encodings, and make FT_STRING and FT_UINT_STRING handle string encodings. Get rid of FT_EBCDIC in favor of FT_STRING with ENC_EBCDIC. Add some URLs for DRDA. Clean up some stuff in TN3270 and TN5250, including using ENC_ values for proto_tree_add_item(). svn path=/trunk/; revision=37909
2011-07-05 23:59:23 +00:00
tvb_get_ephemeral_stringz_enc(tvbuff_t *tvb, const gint offset, gint *lengthp, gint encoding)
add new function tvb_get_ephemeral_stringz() svn path=/trunk/; revision=15273
2005-08-10 14:25:59 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint size;
add new function tvb_get_ephemeral_stringz() svn path=/trunk/; revision=15273
2005-08-10 14:25:59 +00:00
guint8 *strptr;
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
size = tvb_strsize(tvb, offset);
add new function tvb_get_ephemeral_stringz() svn path=/trunk/; revision=15273
2005-08-10 14:25:59 +00:00
strptr = ep_alloc(size);
tvb_memcpy(tvb, strptr, offset, size);
Add some additional routine variants that handle string encodings, and make FT_STRING and FT_UINT_STRING handle string encodings. Get rid of FT_EBCDIC in favor of FT_STRING with ENC_EBCDIC. Add some URLs for DRDA. Clean up some stuff in TN3270 and TN5250, including using ENC_ values for proto_tree_add_item(). svn path=/trunk/; revision=37909
2011-07-05 23:59:23 +00:00
if ((encoding & ENC_CHARENCODING_MASK) == ENC_EBCDIC)
EBCDIC_to_ASCII(strptr, size);
Make more output parameters optional. svn path=/trunk/; revision=31059
2009-11-23 22:02:12 +00:00
if (lengthp)
*lengthp = size;
Add new routines: tvb_get_string() - takes a tvbuff, an offset, and a length as arguments, allocates a buffer big enough to hold a string with the specified number of bytes plus an added null terminator (i.e., length+1), copies the specified number of bytes from the tvbuff, at the specified offset, to that buffer and puts in a null terminator, and returns a pointer to that buffer (or throws an exception before allocating the buffer if that many bytes aren't available in the tvbuff); tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to a "gint" as arguments, gets the size of the null-terminated string starting at the specified offset in the tvbuff (throwing an exception if the null terminator isn't found), allocates a buffer big enough to hold that string, copies the string to that buffer, and returns a pointer to that buffer and stores the length of the string (including the terminating null) in the variable pointed to by the "gint" pointer. Replace many pieces of code allocating a buffer and copying a string with calls to "tvb_get_string()" (for one thing, "tvb_get_string()" doesn't require you to remember that the argument to "tvb_get_nstringz0()" is the size of the buffer into which you're copying the string, which might be the length of the string to be copied *plus 1*). Don't use fixed-length buffers for null-terminated strings (even if the code that generates those packets has a #define to limit the length of the string). Use "tvb_get_stringz()", instead. In some cases where a value is fetched but is only used to pass an argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()" instead. svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
return strptr;
}
Add some additional routine variants that handle string encodings, and make FT_STRING and FT_UINT_STRING handle string encodings. Get rid of FT_EBCDIC in favor of FT_STRING with ENC_EBCDIC. Add some URLs for DRDA. Clean up some stuff in TN3270 and TN5250, including using ENC_ values for proto_tree_add_item(). svn path=/trunk/; revision=37909
2011-07-05 23:59:23 +00:00
guint8 *
tvb_get_ephemeral_stringz(tvbuff_t *tvb, const gint offset, gint *lengthp)
{
return tvb_get_ephemeral_stringz_enc(tvb, offset, lengthp, ENC_UTF_8|ENC_NA);
}
Introduce new function called tvb_get_ephemeral_unicode_stringz(), which is a unicode (UTF-16) version of tvb_get_ephemeral_stringz(). It scans a tvbuff for a UTF-16 string and converts it to UTF-8 upon return. svn path=/trunk/; revision=35253
2010-12-23 17:59:34 +00:00
/*
* Unicode (UTF-16) version of tvb_get_ephemeral_stringz()
Introduce, and start using, tvb_get_const_stringz(). This function returns a pointer to a NULL-terminated string in the TVB. It is no safer than dissectors which call tvb_get_strsize() and then tvb_get_ptr() but it makes it clear that this usage of tvb_get_ptr() is safe. This function is slightly more efficient than tvb_get_ephemeral_stringz()--but only as long as we're not using composite TVBs. svn path=/trunk/; revision=35493
2011-01-12 02:25:08 +00:00
*
Introduce new function called tvb_get_ephemeral_unicode_stringz(), which is a unicode (UTF-16) version of tvb_get_ephemeral_stringz(). It scans a tvbuff for a UTF-16 string and converts it to UTF-8 upon return. svn path=/trunk/; revision=35253
2010-12-23 17:59:34 +00:00
* Encoding paramter should be ENC_BIG_ENDIAN or ENC_LITTLE_ENDIAN
*
Introduce two new functions for Unicode (UTF-16) string handling: tvb_get_unicode_string() tvb_get_ephemeral_unicode_string() These function like their counterparts, tvb_get_string and tvb_get_epemeral_string, for standard strings. Also update comment on what the first such function, tvb_get_ephemeral_unicode_stringz does regarding updating lengthp. svn path=/trunk/; revision=35344
2011-01-03 18:29:29 +00:00
* Returns an ep_ allocated UTF-8 string and updates lengthp pointer with length of string (in bytes)
Introduce new function called tvb_get_ephemeral_unicode_stringz(), which is a unicode (UTF-16) version of tvb_get_ephemeral_stringz(). It scans a tvbuff for a UTF-16 string and converts it to UTF-8 upon return. svn path=/trunk/; revision=35253
2010-12-23 17:59:34 +00:00
*/
gchar *
tvb_get_ephemeral_unicode_stringz(tvbuff_t *tvb, const gint offset, gint *lengthp, const guint encoding)
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
gchar *tmpbuf = NULL;
gunichar2 uchar;
gint size; /* Number of UTF-16 characters */
gint i; /* Byte counter for tvbuff */
gint tmpbuf_len;
Introduce new function called tvb_get_ephemeral_unicode_stringz(), which is a unicode (UTF-16) version of tvb_get_ephemeral_stringz(). It scans a tvbuff for a UTF-16 string and converts it to UTF-8 upon return. svn path=/trunk/; revision=35253
2010-12-23 17:59:34 +00:00
emem_strbuf_t *strbuf = NULL;
strbuf = ep_strbuf_new(NULL);
size = tvb_unicode_strsize(tvb, offset);
Remove comment to myself that I forgot to remove before commiting r35253 and change comments to fit within 80 column display. svn path=/trunk/; revision=35255
2010-12-23 18:24:39 +00:00
for(i = 0; i < size; i += 2) {
Introduce new function called tvb_get_ephemeral_unicode_stringz(), which is a unicode (UTF-16) version of tvb_get_ephemeral_stringz(). It scans a tvbuff for a UTF-16 string and converts it to UTF-8 upon return. svn path=/trunk/; revision=35253
2010-12-23 17:59:34 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
if (encoding == ENC_BIG_ENDIAN)
Introduce new function called tvb_get_ephemeral_unicode_stringz(), which is a unicode (UTF-16) version of tvb_get_ephemeral_stringz(). It scans a tvbuff for a UTF-16 string and converts it to UTF-8 upon return. svn path=/trunk/; revision=35253
2010-12-23 17:59:34 +00:00
uchar = tvb_get_ntohs(tvb, offset + i);
else
uchar = tvb_get_letohs(tvb, offset + i);
Remove comment to myself that I forgot to remove before commiting r35253 and change comments to fit within 80 column display. svn path=/trunk/; revision=35255
2010-12-23 18:24:39 +00:00
/* Calculate how much space is needed to store UTF-16 character
* in UTF-8 */
Introduce new function called tvb_get_ephemeral_unicode_stringz(), which is a unicode (UTF-16) version of tvb_get_ephemeral_stringz(). It scans a tvbuff for a UTF-16 string and converts it to UTF-8 upon return. svn path=/trunk/; revision=35253
2010-12-23 17:59:34 +00:00
tmpbuf_len = g_unichar_to_utf8(uchar, NULL);
Remove comment to myself that I forgot to remove before commiting r35253 and change comments to fit within 80 column display. svn path=/trunk/; revision=35255
2010-12-23 18:24:39 +00:00
tmpbuf = g_malloc(tmpbuf_len + 1); /* + 1 to make room for null
* terminator */
Introduce new function called tvb_get_ephemeral_unicode_stringz(), which is a unicode (UTF-16) version of tvb_get_ephemeral_stringz(). It scans a tvbuff for a UTF-16 string and converts it to UTF-8 upon return. svn path=/trunk/; revision=35253
2010-12-23 17:59:34 +00:00
g_unichar_to_utf8(uchar, tmpbuf);
Remove comment to myself that I forgot to remove before commiting r35253 and change comments to fit within 80 column display. svn path=/trunk/; revision=35255
2010-12-23 18:24:39 +00:00
/* NULL terminate the tmpbuf so ep_strbuf_append knows where
* to stop */
Introduce new function called tvb_get_ephemeral_unicode_stringz(), which is a unicode (UTF-16) version of tvb_get_ephemeral_stringz(). It scans a tvbuff for a UTF-16 string and converts it to UTF-8 upon return. svn path=/trunk/; revision=35253
2010-12-23 17:59:34 +00:00
tmpbuf[tmpbuf_len] = '\0';
ep_strbuf_append(strbuf, tmpbuf);
g_free(tmpbuf);
}
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
if (lengthp)
Add a couple more comments to new unicode function to remind us when a variable is counting UTF-16 characters vs. normal bytes. svn path=/trunk/; revision=35256
2010-12-23 18:26:25 +00:00
*lengthp = i; /* Number of *bytes* processed */
Introduce new function called tvb_get_ephemeral_unicode_stringz(), which is a unicode (UTF-16) version of tvb_get_ephemeral_stringz(). It scans a tvbuff for a UTF-16 string and converts it to UTF-8 upon return. svn path=/trunk/; revision=35253
2010-12-23 17:59:34 +00:00
return strbuf->str;
}
Introduce two new functions: tvb_get_seasonal_string(); tvb_get_seasonal_stringz(); .. which work the same as the ephemeral versions of the functions, but use se_alloc() instead of ep_alloc(). svn path=/trunk/; revision=27868
2009-03-27 19:40:23 +00:00
/*
* Given a tvbuff and an offset, with the offset assumed to refer to
* a null-terminated string, find the length of that string (and throw
* an exception if the tvbuff ends before we find the null), allocate
* a buffer big enough to hold the string, copy the string into it,
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
* and return a pointer to the string. Also return the length of the
Introduce two new functions: tvb_get_seasonal_string(); tvb_get_seasonal_stringz(); .. which work the same as the ephemeral versions of the functions, but use se_alloc() instead of ep_alloc(). svn path=/trunk/; revision=27868
2009-03-27 19:40:23 +00:00
* string (including the terminating null) through a pointer.
*
* This function allocates memory from a buffer with capture session lifetime.
* You do not have to free this buffer, it will be automatically freed
* when wireshark starts or opens a new capture.
*/
guint8 *
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_seasonal_stringz(tvbuff_t *tvb, const gint offset, gint *lengthp)
Introduce two new functions: tvb_get_seasonal_string(); tvb_get_seasonal_stringz(); .. which work the same as the ephemeral versions of the functions, but use se_alloc() instead of ep_alloc(). svn path=/trunk/; revision=27868
2009-03-27 19:40:23 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint size;
Introduce two new functions: tvb_get_seasonal_string(); tvb_get_seasonal_stringz(); .. which work the same as the ephemeral versions of the functions, but use se_alloc() instead of ep_alloc(). svn path=/trunk/; revision=27868
2009-03-27 19:40:23 +00:00
guint8 *strptr;
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
size = tvb_strsize(tvb, offset);
Introduce two new functions: tvb_get_seasonal_string(); tvb_get_seasonal_stringz(); .. which work the same as the ephemeral versions of the functions, but use se_alloc() instead of ep_alloc(). svn path=/trunk/; revision=27868
2009-03-27 19:40:23 +00:00
strptr = se_alloc(size);
tvb_memcpy(tvb, strptr, offset, size);
Make more output parameters optional. svn path=/trunk/; revision=31059
2009-11-23 22:02:12 +00:00
if (lengthp)
*lengthp = size;
Introduce two new functions: tvb_get_seasonal_string(); tvb_get_seasonal_stringz(); .. which work the same as the ephemeral versions of the functions, but use se_alloc() instead of ep_alloc(). svn path=/trunk/; revision=27868
2009-03-27 19:40:23 +00:00
return strptr;
}
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
/* Looks for a stringz (NUL-terminated string) in tvbuff and copies
Modify tvb_get_nstringz*() to behave more like snprintf(). Make changes where necessary to reflect the new behavior. svn path=/trunk/; revision=7607
2003-04-30 02:35:28 +00:00
* no more than bufsize number of bytes, including terminating NUL, to buffer.
* Returns length of string (not including terminating NUL), or -1 if the string was
* truncated in the buffer due to not having reached the terminating NUL.
snprintf -> g_snprintf svn path=/trunk/; revision=15398
2005-08-17 23:10:28 +00:00
* In this way, it acts like g_snprintf().
tvb_get_nstringz() needs to terminate a string with a NUL if the end of the tvbuff is reached before the maximum_length passed by the caller is reached and before a terminating NUL is found. In this case, tvb_get_nstringz() returns a -1, but if the string is not artificially terminated with a NUL by tvb_get_nstringz(), the caller has no idea where the string should end because 1) the return value "-1" gives the impression that the string ends at the end of the buffer but 2) the string does not end at the end of the buffer, but somewhere in the middle, due to the packet being shorter than expected. tvb_get_nstringz() and tvb_get_nstringz0() were both modified. The FT_STRINGZ case in proto_tree_add_item() is made simpler. During regression testing, when investigating a regression that I later corrected, I discovered that strings added through proto_tree_add_item (FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double allocation of the string. The proto_tree_add_string*() functions do not leak memory, since they only copy the string once. The memory leak was fixed by adding another argument to the static function proto_tree_set_string() to let the string ftype code know to g_strdup() the string or not. svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
*
A bufsize of 0 makes no sense in either "tvb_get_nstringz()" or "tvb_get_nstringz0()", as it means there's no room even for the terminating NUL; abort if "_tvb_get_nstringz()" is passed a bufsize of 0. Don't throw an exception in "tvb_get_nstringz0()" if "_tvb_get_nstringz()" returns 0 - that just means we have an empty string. svn path=/trunk/; revision=8150
2003-08-08 08:19:50 +00:00
* bufsize MUST be greater than 0.
*
tvb_get_nstringz() needs to terminate a string with a NUL if the end of the tvbuff is reached before the maximum_length passed by the caller is reached and before a terminating NUL is found. In this case, tvb_get_nstringz() returns a -1, but if the string is not artificially terminated with a NUL by tvb_get_nstringz(), the caller has no idea where the string should end because 1) the return value "-1" gives the impression that the string ends at the end of the buffer but 2) the string does not end at the end of the buffer, but somewhere in the middle, due to the packet being shorter than expected. tvb_get_nstringz() and tvb_get_nstringz0() were both modified. The FT_STRINGZ case in proto_tree_add_item() is made simpler. During regression testing, when investigating a regression that I later corrected, I discovered that strings added through proto_tree_add_item (FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double allocation of the string. The proto_tree_add_string*() functions do not leak memory, since they only copy the string once. The memory leak was fixed by adding another argument to the static function proto_tree_set_string() to let the string ftype code know to g_strdup() the string or not. svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
* When processing a packet where the remaining number of bytes is less
Modify tvb_get_nstringz*() to behave more like snprintf(). Make changes where necessary to reflect the new behavior. svn path=/trunk/; revision=7607
2003-04-30 02:35:28 +00:00
* than bufsize, an exception is not thrown if the end of the packet
tvb_get_nstringz() needs to terminate a string with a NUL if the end of the tvbuff is reached before the maximum_length passed by the caller is reached and before a terminating NUL is found. In this case, tvb_get_nstringz() returns a -1, but if the string is not artificially terminated with a NUL by tvb_get_nstringz(), the caller has no idea where the string should end because 1) the return value "-1" gives the impression that the string ends at the end of the buffer but 2) the string does not end at the end of the buffer, but somewhere in the middle, due to the packet being shorter than expected. tvb_get_nstringz() and tvb_get_nstringz0() were both modified. The FT_STRINGZ case in proto_tree_add_item() is made simpler. During regression testing, when investigating a regression that I later corrected, I discovered that strings added through proto_tree_add_item (FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double allocation of the string. The proto_tree_add_string*() functions do not leak memory, since they only copy the string once. The memory leak was fixed by adding another argument to the static function proto_tree_set_string() to let the string ftype code know to g_strdup() the string or not. svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
* is reached before the NUL is found. If no NUL is found before reaching
* the end of the short packet, -1 is still returned, and the string
Modify tvb_get_nstringz*() to behave more like snprintf(). Make changes where necessary to reflect the new behavior. svn path=/trunk/; revision=7607
2003-04-30 02:35:28 +00:00
* is truncated with a NUL, albeit not at buffer[bufsize - 1], but
tvb_get_nstringz() needs to terminate a string with a NUL if the end of the tvbuff is reached before the maximum_length passed by the caller is reached and before a terminating NUL is found. In this case, tvb_get_nstringz() returns a -1, but if the string is not artificially terminated with a NUL by tvb_get_nstringz(), the caller has no idea where the string should end because 1) the return value "-1" gives the impression that the string ends at the end of the buffer but 2) the string does not end at the end of the buffer, but somewhere in the middle, due to the packet being shorter than expected. tvb_get_nstringz() and tvb_get_nstringz0() were both modified. The FT_STRINGZ case in proto_tree_add_item() is made simpler. During regression testing, when investigating a regression that I later corrected, I discovered that strings added through proto_tree_add_item (FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double allocation of the string. The proto_tree_add_string*() functions do not leak memory, since they only copy the string once. The memory leak was fixed by adding another argument to the static function proto_tree_set_string() to let the string ftype code know to g_strdup() the string or not. svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
* at the correct spot, terminating the string.
*
* *bytes_copied will contain the number of bytes actually copied,
* including the terminating-NUL.
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
*/
Have "tvb_ensure_length_remaining()" directly call "compute_offset_length()", and throw the exception it returns, rather than calling "tvb_length_remaining()" and throw BoundsError if it returns -1; this allows us to add additional exceptions without having to change "tvb_ensure_length_remaining()". Make "_tvb_get_nstringz()" static, as it's not used outside "tvbuff.c". svn path=/trunk/; revision=5397
2002-05-05 21:07:52 +00:00
static gint
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
_tvb_get_nstringz(tvbuff_t *tvb, const gint offset, const guint bufsize, guint8* buffer, gint *bytes_copied)
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
gint stringlen;
guint abs_offset, junk_length;
gint limit, len;
tvb_get_nstringz() needs to terminate a string with a NUL if the end of the tvbuff is reached before the maximum_length passed by the caller is reached and before a terminating NUL is found. In this case, tvb_get_nstringz() returns a -1, but if the string is not artificially terminated with a NUL by tvb_get_nstringz(), the caller has no idea where the string should end because 1) the return value "-1" gives the impression that the string ends at the end of the buffer but 2) the string does not end at the end of the buffer, but somewhere in the middle, due to the packet being shorter than expected. tvb_get_nstringz() and tvb_get_nstringz0() were both modified. The FT_STRINGZ case in proto_tree_add_item() is made simpler. During regression testing, when investigating a regression that I later corrected, I discovered that strings added through proto_tree_add_item (FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double allocation of the string. The proto_tree_add_string*() functions do not leak memory, since they only copy the string once. The memory leak was fixed by adding another argument to the static function proto_tree_set_string() to let the string ftype code know to g_strdup() the string or not. svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
gboolean decreased_max = FALSE;
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
check_offset_length(tvb->length, tvb->reported_length, offset, 0, &abs_offset, &junk_length);
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
A bufsize of 0 makes no sense in either "tvb_get_nstringz()" or "tvb_get_nstringz0()", as it means there's no room even for the terminating NUL; abort if "_tvb_get_nstringz()" is passed a bufsize of 0. Don't throw an exception in "tvb_get_nstringz0()" if "_tvb_get_nstringz()" returns 0 - that just means we have an empty string. svn path=/trunk/; revision=8150
2003-08-08 08:19:50 +00:00
/* There must at least be room for the terminating NUL. */
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT(bufsize != 0);
A bufsize of 0 makes no sense in either "tvb_get_nstringz()" or "tvb_get_nstringz0()", as it means there's no room even for the terminating NUL; abort if "_tvb_get_nstringz()" is passed a bufsize of 0. Don't throw an exception in "tvb_get_nstringz0()" if "_tvb_get_nstringz()" returns 0 - that just means we have an empty string. svn path=/trunk/; revision=8150
2003-08-08 08:19:50 +00:00
/* If there's no room for anything else, just return the NUL. */
if (bufsize == 1) {
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
buffer[0] = 0;
Fix several buffer and integer overflow issues discovered by Timo Sirainen. tvbuff.c: Lots of existing code assumes that you can safely do the following: #define MAX_BUF 64 guint8 *buf[MAX_BUF]; ... tvb_get_nstringz0 (tvb, offset, MAX_BUF, buf, &bytes_copied); In reality, tvb_get_nstringz*() can potentially write one byte past "buf". Modify _tvb_get_nstringz() not to do that. packet-ppp.c: Check for a valid BAP suboption length. packet-mount.c: Fix a possible integer overflow in dissect_group(). svn path=/trunk/; revision=7590
2003-04-28 04:03:26 +00:00
*bytes_copied = 1;
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
return 0;
}
tvb_get_nstringz() needs to terminate a string with a NUL if the end of the tvbuff is reached before the maximum_length passed by the caller is reached and before a terminating NUL is found. In this case, tvb_get_nstringz() returns a -1, but if the string is not artificially terminated with a NUL by tvb_get_nstringz(), the caller has no idea where the string should end because 1) the return value "-1" gives the impression that the string ends at the end of the buffer but 2) the string does not end at the end of the buffer, but somewhere in the middle, due to the packet being shorter than expected. tvb_get_nstringz() and tvb_get_nstringz0() were both modified. The FT_STRINGZ case in proto_tree_add_item() is made simpler. During regression testing, when investigating a regression that I later corrected, I discovered that strings added through proto_tree_add_item (FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double allocation of the string. The proto_tree_add_string*() functions do not leak memory, since they only copy the string once. The memory leak was fixed by adding another argument to the static function proto_tree_set_string() to let the string ftype code know to g_strdup() the string or not. svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
/* Only read to end of tvbuff, w/o throwing exception. */
Fix some signed/unsigned comparison warnings. In the case of tvbuff.h, there were 2 functions which accepted 'maxlength' == -1, but the function prototypes had maxlength as a guint --- fixed. svn path=/trunk/; revision=4087
2001-10-26 17:29:12 +00:00
len = tvb_length_remaining(tvb, abs_offset);
tvb_get_nstringz() needs to terminate a string with a NUL if the end of the tvbuff is reached before the maximum_length passed by the caller is reached and before a terminating NUL is found. In this case, tvb_get_nstringz() returns a -1, but if the string is not artificially terminated with a NUL by tvb_get_nstringz(), the caller has no idea where the string should end because 1) the return value "-1" gives the impression that the string ends at the end of the buffer but 2) the string does not end at the end of the buffer, but somewhere in the middle, due to the packet being shorter than expected. tvb_get_nstringz() and tvb_get_nstringz0() were both modified. The FT_STRINGZ case in proto_tree_add_item() is made simpler. During regression testing, when investigating a regression that I later corrected, I discovered that strings added through proto_tree_add_item (FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double allocation of the string. The proto_tree_add_string*() functions do not leak memory, since they only copy the string once. The memory leak was fixed by adding another argument to the static function proto_tree_set_string() to let the string ftype code know to g_strdup() the string or not. svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
/* check_offset_length() won't throw an exception if we're
* looking at the byte immediately after the end of the tvbuff. */
if (len == 0) {
THROW(ReportedBoundsError);
}
/* This should not happen because check_offset_length() would
Fix several buffer and integer overflow issues discovered by Timo Sirainen. tvbuff.c: Lots of existing code assumes that you can safely do the following: #define MAX_BUF 64 guint8 *buf[MAX_BUF]; ... tvb_get_nstringz0 (tvb, offset, MAX_BUF, buf, &bytes_copied); In reality, tvb_get_nstringz*() can potentially write one byte past "buf". Modify _tvb_get_nstringz() not to do that. packet-ppp.c: Check for a valid BAP suboption length. packet-mount.c: Fix a possible integer overflow in dissect_group(). svn path=/trunk/; revision=7590
2003-04-28 04:03:26 +00:00
* have already thrown an exception if 'offset' were out-of-bounds.
*/
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT(len != -1);
Fix some signed/unsigned comparison warnings. In the case of tvbuff.h, there were 2 functions which accepted 'maxlength' == -1, but the function prototypes had maxlength as a guint --- fixed. svn path=/trunk/; revision=4087
2001-10-26 17:29:12 +00:00
Fix several buffer and integer overflow issues discovered by Timo Sirainen. tvbuff.c: Lots of existing code assumes that you can safely do the following: #define MAX_BUF 64 guint8 *buf[MAX_BUF]; ... tvb_get_nstringz0 (tvb, offset, MAX_BUF, buf, &bytes_copied); In reality, tvb_get_nstringz*() can potentially write one byte past "buf". Modify _tvb_get_nstringz() not to do that. packet-ppp.c: Check for a valid BAP suboption length. packet-mount.c: Fix a possible integer overflow in dissect_group(). svn path=/trunk/; revision=7590
2003-04-28 04:03:26 +00:00
/*
Modify tvb_get_nstringz*() to behave more like snprintf(). Make changes where necessary to reflect the new behavior. svn path=/trunk/; revision=7607
2003-04-30 02:35:28 +00:00
* If we've been passed a negative number, bufsize will
Fix several buffer and integer overflow issues discovered by Timo Sirainen. tvbuff.c: Lots of existing code assumes that you can safely do the following: #define MAX_BUF 64 guint8 *buf[MAX_BUF]; ... tvb_get_nstringz0 (tvb, offset, MAX_BUF, buf, &bytes_copied); In reality, tvb_get_nstringz*() can potentially write one byte past "buf". Modify _tvb_get_nstringz() not to do that. packet-ppp.c: Check for a valid BAP suboption length. packet-mount.c: Fix a possible integer overflow in dissect_group(). svn path=/trunk/; revision=7590
2003-04-28 04:03:26 +00:00
* be huge.
*/
as tvb functions are frequently used by a lot of dissectors, use DISSECTOR_ASSERT() like instead of g_assert throughout tvbuff, so a malicious dissector won't crash Ethereal (at least at the ways we can detect it) of course this won't catch e.g. NULL pointers, but far better than nothing ... svn path=/trunk/; revision=15980
2005-09-23 18:27:30 +00:00
DISSECTOR_ASSERT(bufsize <= G_MAXINT);
Fix several buffer and integer overflow issues discovered by Timo Sirainen. tvbuff.c: Lots of existing code assumes that you can safely do the following: #define MAX_BUF 64 guint8 *buf[MAX_BUF]; ... tvb_get_nstringz0 (tvb, offset, MAX_BUF, buf, &bytes_copied); In reality, tvb_get_nstringz*() can potentially write one byte past "buf". Modify _tvb_get_nstringz() not to do that. packet-ppp.c: Check for a valid BAP suboption length. packet-mount.c: Fix a possible integer overflow in dissect_group(). svn path=/trunk/; revision=7590
2003-04-28 04:03:26 +00:00
Modify tvb_get_nstringz*() to behave more like snprintf(). Make changes where necessary to reflect the new behavior. svn path=/trunk/; revision=7607
2003-04-30 02:35:28 +00:00
if ((guint)len < bufsize) {
tvb_get_nstringz() needs to terminate a string with a NUL if the end of the tvbuff is reached before the maximum_length passed by the caller is reached and before a terminating NUL is found. In this case, tvb_get_nstringz() returns a -1, but if the string is not artificially terminated with a NUL by tvb_get_nstringz(), the caller has no idea where the string should end because 1) the return value "-1" gives the impression that the string ends at the end of the buffer but 2) the string does not end at the end of the buffer, but somewhere in the middle, due to the packet being shorter than expected. tvb_get_nstringz() and tvb_get_nstringz0() were both modified. The FT_STRINGZ case in proto_tree_add_item() is made simpler. During regression testing, when investigating a regression that I later corrected, I discovered that strings added through proto_tree_add_item (FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double allocation of the string. The proto_tree_add_string*() functions do not leak memory, since they only copy the string once. The memory leak was fixed by adding another argument to the static function proto_tree_set_string() to let the string ftype code know to g_strdup() the string or not. svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
limit = len;
decreased_max = TRUE;
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
}
else {
Modify tvb_get_nstringz*() to behave more like snprintf(). Make changes where necessary to reflect the new behavior. svn path=/trunk/; revision=7607
2003-04-30 02:35:28 +00:00
limit = bufsize;
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
}
Modify tvb_get_nstringz*() to behave more like snprintf(). Make changes where necessary to reflect the new behavior. svn path=/trunk/; revision=7607
2003-04-30 02:35:28 +00:00
stringlen = tvb_strnlen(tvb, abs_offset, limit - 1);
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
/* If NUL wasn't found, copy the data and return -1 */
Patch from Heikki Vatiainen to make "tvb_strnlen()" return the length of the string rather than the offset of the end of the string, plus a patch to "tvb_get_nstringz()" to treat the return value of "tvb_strnlen()" as a length rather than an end offset. svn path=/trunk/; revision=2502
2000-10-17 08:50:57 +00:00
if (stringlen == -1) {
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
tvb_memcpy(tvb, buffer, abs_offset, limit);
tvb_get_nstringz() needs to terminate a string with a NUL if the end of the tvbuff is reached before the maximum_length passed by the caller is reached and before a terminating NUL is found. In this case, tvb_get_nstringz() returns a -1, but if the string is not artificially terminated with a NUL by tvb_get_nstringz(), the caller has no idea where the string should end because 1) the return value "-1" gives the impression that the string ends at the end of the buffer but 2) the string does not end at the end of the buffer, but somewhere in the middle, due to the packet being shorter than expected. tvb_get_nstringz() and tvb_get_nstringz0() were both modified. The FT_STRINGZ case in proto_tree_add_item() is made simpler. During regression testing, when investigating a regression that I later corrected, I discovered that strings added through proto_tree_add_item (FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double allocation of the string. The proto_tree_add_string*() functions do not leak memory, since they only copy the string once. The memory leak was fixed by adding another argument to the static function proto_tree_set_string() to let the string ftype code know to g_strdup() the string or not. svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
if (decreased_max) {
buffer[limit] = 0;
/* Add 1 for the extra NUL that we set at buffer[limit],
* pretending that it was copied as part of the string. */
*bytes_copied = limit + 1;
}
else {
*bytes_copied = limit;
}
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
return -1;
}
/* Copy the string to buffer */
tvb_memcpy(tvb, buffer, abs_offset, stringlen + 1);
tvb_get_nstringz() needs to terminate a string with a NUL if the end of the tvbuff is reached before the maximum_length passed by the caller is reached and before a terminating NUL is found. In this case, tvb_get_nstringz() returns a -1, but if the string is not artificially terminated with a NUL by tvb_get_nstringz(), the caller has no idea where the string should end because 1) the return value "-1" gives the impression that the string ends at the end of the buffer but 2) the string does not end at the end of the buffer, but somewhere in the middle, due to the packet being shorter than expected. tvb_get_nstringz() and tvb_get_nstringz0() were both modified. The FT_STRINGZ case in proto_tree_add_item() is made simpler. During regression testing, when investigating a regression that I later corrected, I discovered that strings added through proto_tree_add_item (FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double allocation of the string. The proto_tree_add_string*() functions do not leak memory, since they only copy the string once. The memory leak was fixed by adding another argument to the static function proto_tree_set_string() to let the string ftype code know to g_strdup() the string or not. svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
*bytes_copied = stringlen + 1;
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
return stringlen;
}
tvb_get_nstringz() needs to terminate a string with a NUL if the end of the tvbuff is reached before the maximum_length passed by the caller is reached and before a terminating NUL is found. In this case, tvb_get_nstringz() returns a -1, but if the string is not artificially terminated with a NUL by tvb_get_nstringz(), the caller has no idea where the string should end because 1) the return value "-1" gives the impression that the string ends at the end of the buffer but 2) the string does not end at the end of the buffer, but somewhere in the middle, due to the packet being shorter than expected. tvb_get_nstringz() and tvb_get_nstringz0() were both modified. The FT_STRINGZ case in proto_tree_add_item() is made simpler. During regression testing, when investigating a regression that I later corrected, I discovered that strings added through proto_tree_add_item (FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double allocation of the string. The proto_tree_add_string*() functions do not leak memory, since they only copy the string once. The memory leak was fixed by adding another argument to the static function proto_tree_set_string() to let the string ftype code know to g_strdup() the string or not. svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
/* Looks for a stringz (NUL-terminated string) in tvbuff and copies
Modify tvb_get_nstringz*() to behave more like snprintf(). Make changes where necessary to reflect the new behavior. svn path=/trunk/; revision=7607
2003-04-30 02:35:28 +00:00
* no more than bufsize number of bytes, including terminating NUL, to buffer.
* Returns length of string (not including terminating NUL), or -1 if the string was
* truncated in the buffer due to not having reached the terminating NUL.
snprintf -> g_snprintf svn path=/trunk/; revision=15398
2005-08-17 23:10:28 +00:00
* In this way, it acts like g_snprintf().
tvb_get_nstringz() needs to terminate a string with a NUL if the end of the tvbuff is reached before the maximum_length passed by the caller is reached and before a terminating NUL is found. In this case, tvb_get_nstringz() returns a -1, but if the string is not artificially terminated with a NUL by tvb_get_nstringz(), the caller has no idea where the string should end because 1) the return value "-1" gives the impression that the string ends at the end of the buffer but 2) the string does not end at the end of the buffer, but somewhere in the middle, due to the packet being shorter than expected. tvb_get_nstringz() and tvb_get_nstringz0() were both modified. The FT_STRINGZ case in proto_tree_add_item() is made simpler. During regression testing, when investigating a regression that I later corrected, I discovered that strings added through proto_tree_add_item (FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double allocation of the string. The proto_tree_add_string*() functions do not leak memory, since they only copy the string once. The memory leak was fixed by adding another argument to the static function proto_tree_set_string() to let the string ftype code know to g_strdup() the string or not. svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
*
* When processing a packet where the remaining number of bytes is less
Modify tvb_get_nstringz*() to behave more like snprintf(). Make changes where necessary to reflect the new behavior. svn path=/trunk/; revision=7607
2003-04-30 02:35:28 +00:00
* than bufsize, an exception is not thrown if the end of the packet
tvb_get_nstringz() needs to terminate a string with a NUL if the end of the tvbuff is reached before the maximum_length passed by the caller is reached and before a terminating NUL is found. In this case, tvb_get_nstringz() returns a -1, but if the string is not artificially terminated with a NUL by tvb_get_nstringz(), the caller has no idea where the string should end because 1) the return value "-1" gives the impression that the string ends at the end of the buffer but 2) the string does not end at the end of the buffer, but somewhere in the middle, due to the packet being shorter than expected. tvb_get_nstringz() and tvb_get_nstringz0() were both modified. The FT_STRINGZ case in proto_tree_add_item() is made simpler. During regression testing, when investigating a regression that I later corrected, I discovered that strings added through proto_tree_add_item (FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double allocation of the string. The proto_tree_add_string*() functions do not leak memory, since they only copy the string once. The memory leak was fixed by adding another argument to the static function proto_tree_set_string() to let the string ftype code know to g_strdup() the string or not. svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
* is reached before the NUL is found. If no NUL is found before reaching
* the end of the short packet, -1 is still returned, and the string
Modify tvb_get_nstringz*() to behave more like snprintf(). Make changes where necessary to reflect the new behavior. svn path=/trunk/; revision=7607
2003-04-30 02:35:28 +00:00
* is truncated with a NUL, albeit not at buffer[bufsize - 1], but
tvb_get_nstringz() needs to terminate a string with a NUL if the end of the tvbuff is reached before the maximum_length passed by the caller is reached and before a terminating NUL is found. In this case, tvb_get_nstringz() returns a -1, but if the string is not artificially terminated with a NUL by tvb_get_nstringz(), the caller has no idea where the string should end because 1) the return value "-1" gives the impression that the string ends at the end of the buffer but 2) the string does not end at the end of the buffer, but somewhere in the middle, due to the packet being shorter than expected. tvb_get_nstringz() and tvb_get_nstringz0() were both modified. The FT_STRINGZ case in proto_tree_add_item() is made simpler. During regression testing, when investigating a regression that I later corrected, I discovered that strings added through proto_tree_add_item (FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double allocation of the string. The proto_tree_add_string*() functions do not leak memory, since they only copy the string once. The memory leak was fixed by adding another argument to the static function proto_tree_set_string() to let the string ftype code know to g_strdup() the string or not. svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
* at the correct spot, terminating the string.
*/
gint
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_nstringz(tvbuff_t *tvb, const gint offset, const guint bufsize, guint8* buffer)
tvb_get_nstringz() needs to terminate a string with a NUL if the end of the tvbuff is reached before the maximum_length passed by the caller is reached and before a terminating NUL is found. In this case, tvb_get_nstringz() returns a -1, but if the string is not artificially terminated with a NUL by tvb_get_nstringz(), the caller has no idea where the string should end because 1) the return value "-1" gives the impression that the string ends at the end of the buffer but 2) the string does not end at the end of the buffer, but somewhere in the middle, due to the packet being shorter than expected. tvb_get_nstringz() and tvb_get_nstringz0() were both modified. The FT_STRINGZ case in proto_tree_add_item() is made simpler. During regression testing, when investigating a regression that I later corrected, I discovered that strings added through proto_tree_add_item (FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double allocation of the string. The proto_tree_add_string*() functions do not leak memory, since they only copy the string once. The memory leak was fixed by adding another argument to the static function proto_tree_set_string() to let the string ftype code know to g_strdup() the string or not. svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
{
gint bytes_copied;
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
DISSECTOR_ASSERT(tvb && tvb->initialized);
Modify tvb_get_nstringz*() to behave more like snprintf(). Make changes where necessary to reflect the new behavior. svn path=/trunk/; revision=7607
2003-04-30 02:35:28 +00:00
return _tvb_get_nstringz(tvb, offset, bufsize, buffer, &bytes_copied);
tvb_get_nstringz() needs to terminate a string with a NUL if the end of the tvbuff is reached before the maximum_length passed by the caller is reached and before a terminating NUL is found. In this case, tvb_get_nstringz() returns a -1, but if the string is not artificially terminated with a NUL by tvb_get_nstringz(), the caller has no idea where the string should end because 1) the return value "-1" gives the impression that the string ends at the end of the buffer but 2) the string does not end at the end of the buffer, but somewhere in the middle, due to the packet being shorter than expected. tvb_get_nstringz() and tvb_get_nstringz0() were both modified. The FT_STRINGZ case in proto_tree_add_item() is made simpler. During regression testing, when investigating a regression that I later corrected, I discovered that strings added through proto_tree_add_item (FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double allocation of the string. The proto_tree_add_string*() functions do not leak memory, since they only copy the string once. The memory leak was fixed by adding another argument to the static function proto_tree_set_string() to let the string ftype code know to g_strdup() the string or not. svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
}
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
/* Like tvb_get_nstringz(), but never returns -1. The string is guaranteed to
* have a terminating NUL. If the string was truncated when copied into buffer,
* a NUL is placed at the end of buffer to terminate it.
*/
gint
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_get_nstringz0(tvbuff_t *tvb, const gint offset, const guint bufsize, guint8* buffer)
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
{
tvb_get_nstringz() needs to terminate a string with a NUL if the end of the tvbuff is reached before the maximum_length passed by the caller is reached and before a terminating NUL is found. In this case, tvb_get_nstringz() returns a -1, but if the string is not artificially terminated with a NUL by tvb_get_nstringz(), the caller has no idea where the string should end because 1) the return value "-1" gives the impression that the string ends at the end of the buffer but 2) the string does not end at the end of the buffer, but somewhere in the middle, due to the packet being shorter than expected. tvb_get_nstringz() and tvb_get_nstringz0() were both modified. The FT_STRINGZ case in proto_tree_add_item() is made simpler. During regression testing, when investigating a regression that I later corrected, I discovered that strings added through proto_tree_add_item (FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double allocation of the string. The proto_tree_add_string*() functions do not leak memory, since they only copy the string once. The memory leak was fixed by adding another argument to the static function proto_tree_set_string() to let the string ftype code know to g_strdup() the string or not. svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
gint len, bytes_copied;
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
DISSECTOR_ASSERT(tvb && tvb->initialized);
Modify tvb_get_nstringz*() to behave more like snprintf(). Make changes where necessary to reflect the new behavior. svn path=/trunk/; revision=7607
2003-04-30 02:35:28 +00:00
len = _tvb_get_nstringz(tvb, offset, bufsize, buffer, &bytes_copied);
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
if (len == -1) {
Modify tvb_get_nstringz*() to behave more like snprintf(). Make changes where necessary to reflect the new behavior. svn path=/trunk/; revision=7607
2003-04-30 02:35:28 +00:00
buffer[bufsize - 1] = 0;
tvb_get_nstringz() needs to terminate a string with a NUL if the end of the tvbuff is reached before the maximum_length passed by the caller is reached and before a terminating NUL is found. In this case, tvb_get_nstringz() returns a -1, but if the string is not artificially terminated with a NUL by tvb_get_nstringz(), the caller has no idea where the string should end because 1) the return value "-1" gives the impression that the string ends at the end of the buffer but 2) the string does not end at the end of the buffer, but somewhere in the middle, due to the packet being shorter than expected. tvb_get_nstringz() and tvb_get_nstringz0() were both modified. The FT_STRINGZ case in proto_tree_add_item() is made simpler. During regression testing, when investigating a regression that I later corrected, I discovered that strings added through proto_tree_add_item (FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double allocation of the string. The proto_tree_add_string*() functions do not leak memory, since they only copy the string once. The memory leak was fixed by adding another argument to the static function proto_tree_set_string() to let the string ftype code know to g_strdup() the string or not. svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
return bytes_copied - 1;
Add FT_STRINGZ type. NCP dissector is only one that uses it right now. Remove tvb_get_stringz from quake dissector and add tvb_get_nstringz, tvb_get_nstringz0, and tvb_strnlen to tvbuff.c. Remove multiple definitions of pntohl and friends from various places (except for wiretap) and put into pint.h Consolidate duplicate code for turning FT_* enums into strings (ala the glossary). svn path=/trunk/; revision=2382
2000-08-30 02:50:18 +00:00
}
else {
return len;
}
}
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
/*
* Given a tvbuff, an offset into the tvbuff, and a length that starts
* at that offset (which may be -1 for "all the way to the end of the
* tvbuff"), find the end of the (putative) line that starts at the
* specified offset in the tvbuff, going no further than the specified
* length.
*
* Return the length of the line (not counting the line terminator at
Add an extra argument to "tvb_find_line_end()", which specifies what it should do if it doesn't find an EOL; if FALSE, it behaves as before, returning values that treat the line as ending at the end of the tvbuff, and if TRUE, it returns -1, so its caller can do segment reassembly until it gets the EOL. Add an option to the SMTP dissector to do segment reassembly, and do segment reassembly of the first line. svn path=/trunk/; revision=5891
2002-07-17 06:55:29 +00:00
* the end), or, if we don't find a line terminator:
*
* if "deseg" is true, return -1;
*
* if "deseg" is false, return the amount of data remaining in
* the buffer.
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
*
* Set "*next_offset" to the offset of the character past the line
* terminator, or past the end of the buffer if we don't find a line
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
* terminator. (It's not set if we return -1.)
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
*/
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
gint
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tvb_find_line_end(tvbuff_t *tvb, const gint offset, int len, gint *next_offset, const gboolean desegment)
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
gint eob_offset;
gint eol_offset;
int linelen;
Make tvb_pbrk_guint8() return the found needle. svn path=/trunk/; revision=32144
2010-03-08 20:45:13 +00:00
guchar found_needle = 0;
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
if (len == -1)
len = tvb_length_remaining(tvb, offset);
/*
* XXX - what if "len" is still -1, meaning "offset is past the
* end of the tvbuff"?
*/
eob_offset = offset + len;
Make "tvb_find_line_end()" and "tvb_find_line_end_unquoted()" treat CR by itself as a line ending, as well as treating CR LF and LF as line endings. Tweak the Telnet dissector to treat LF and CR NUL as line endings, but not to treat CR by itself as a line ending (that's not exactly what the NVT specification in the Telnet RFC specifies, but the resulting output may be a bit more readable that way). svn path=/trunk/; revision=2613
2000-11-12 00:59:09 +00:00
/*
* Look either for a CR or an LF.
*/
Fix some: 'cast discards qualifiers from pointer target type' warnings - Add const qualifier - Remove some strange casts svn path=/trunk/; revision=42131
2012-04-18 12:35:36 +00:00
eol_offset = tvb_pbrk_guint8(tvb, offset, len, "\r\n", &found_needle);
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
if (eol_offset == -1) {
/*
Make "tvb_find_line_end()" and "tvb_find_line_end_unquoted()" treat CR by itself as a line ending, as well as treating CR LF and LF as line endings. Tweak the Telnet dissector to treat LF and CR NUL as line endings, but not to treat CR by itself as a line ending (that's not exactly what the NVT specification in the Telnet RFC specifies, but the resulting output may be a bit more readable that way). svn path=/trunk/; revision=2613
2000-11-12 00:59:09 +00:00
* No CR or LF - line is presumably continued in next packet.
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
*/
Add an extra argument to "tvb_find_line_end()", which specifies what it should do if it doesn't find an EOL; if FALSE, it behaves as before, returning values that treat the line as ending at the end of the tvbuff, and if TRUE, it returns -1, so its caller can do segment reassembly until it gets the EOL. Add an option to the SMTP dissector to do segment reassembly, and do segment reassembly of the first line. svn path=/trunk/; revision=5891
2002-07-17 06:55:29 +00:00
if (desegment) {
/*
* Tell our caller we saw no EOL, so they can
* try to desegment and get the entire line
* into one tvbuff.
*/
return -1;
} else {
/*
* Pretend the line runs to the end of the tvbuff.
*/
linelen = eob_offset - offset;
Make more output parameters optional. svn path=/trunk/; revision=31059
2009-11-23 22:02:12 +00:00
if (next_offset)
*next_offset = eob_offset;
Add an extra argument to "tvb_find_line_end()", which specifies what it should do if it doesn't find an EOL; if FALSE, it behaves as before, returning values that treat the line as ending at the end of the tvbuff, and if TRUE, it returns -1, so its caller can do segment reassembly until it gets the EOL. Add an option to the SMTP dissector to do segment reassembly, and do segment reassembly of the first line. svn path=/trunk/; revision=5891
2002-07-17 06:55:29 +00:00
}
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
} else {
/*
* Find the number of bytes between the starting offset
Make "tvb_find_line_end()" and "tvb_find_line_end_unquoted()" treat CR by itself as a line ending, as well as treating CR LF and LF as line endings. Tweak the Telnet dissector to treat LF and CR NUL as line endings, but not to treat CR by itself as a line ending (that's not exactly what the NVT specification in the Telnet RFC specifies, but the resulting output may be a bit more readable that way). svn path=/trunk/; revision=2613
2000-11-12 00:59:09 +00:00
* and the CR or LF.
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
*/
linelen = eol_offset - offset;
/*
Make "tvb_find_line_end()" and "tvb_find_line_end_unquoted()" treat CR by itself as a line ending, as well as treating CR LF and LF as line endings. Tweak the Telnet dissector to treat LF and CR NUL as line endings, but not to treat CR by itself as a line ending (that's not exactly what the NVT specification in the Telnet RFC specifies, but the resulting output may be a bit more readable that way). svn path=/trunk/; revision=2613
2000-11-12 00:59:09 +00:00
* Is it a CR?
Make tvb_strneql()'s size parameter be a size_t. Remove some now-unnecessary casts. svn path=/trunk/; revision=34725
2010-10-30 18:18:12 +00:00
*/
Make tvb_pbrk_guint8() return the found needle. svn path=/trunk/; revision=32144
2010-03-08 20:45:13 +00:00
if (found_needle == '\r') {
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
/*
Make "tvb_find_line_end()" and "tvb_find_line_end_unquoted()" treat CR by itself as a line ending, as well as treating CR LF and LF as line endings. Tweak the Telnet dissector to treat LF and CR NUL as line endings, but not to treat CR by itself as a line ending (that's not exactly what the NVT specification in the Telnet RFC specifies, but the resulting output may be a bit more readable that way). svn path=/trunk/; revision=2613
2000-11-12 00:59:09 +00:00
* Yes - is it followed by an LF?
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
*/
Add an extra argument to "tvb_find_line_end()", which specifies what it should do if it doesn't find an EOL; if FALSE, it behaves as before, returning values that treat the line as ending at the end of the tvbuff, and if TRUE, it returns -1, so its caller can do segment reassembly until it gets the EOL. Add an option to the SMTP dissector to do segment reassembly, and do segment reassembly of the first line. svn path=/trunk/; revision=5891
2002-07-17 06:55:29 +00:00
if (eol_offset + 1 >= eob_offset) {
/*
* Dunno - the next byte isn't in this
* tvbuff.
*/
if (desegment) {
/*
* We'll return -1, although that
* runs the risk that if the line
* really *is* terminated with a CR,
* we won't properly dissect this
* tvbuff.
*
* It's probably more likely that
* the line ends with CR-LF than
* that it ends with CR by itself.
*/
return -1;
}
} else {
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
/*
Add an extra argument to "tvb_find_line_end()", which specifies what it should do if it doesn't find an EOL; if FALSE, it behaves as before, returning values that treat the line as ending at the end of the tvbuff, and if TRUE, it returns -1, so its caller can do segment reassembly until it gets the EOL. Add an option to the SMTP dissector to do segment reassembly, and do segment reassembly of the first line. svn path=/trunk/; revision=5891
2002-07-17 06:55:29 +00:00
* Well, we can at least look at the next
* byte.
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
*/
Add an extra argument to "tvb_find_line_end()", which specifies what it should do if it doesn't find an EOL; if FALSE, it behaves as before, returning values that treat the line as ending at the end of the tvbuff, and if TRUE, it returns -1, so its caller can do segment reassembly until it gets the EOL. Add an option to the SMTP dissector to do segment reassembly, and do segment reassembly of the first line. svn path=/trunk/; revision=5891
2002-07-17 06:55:29 +00:00
if (tvb_get_guint8(tvb, eol_offset + 1) == '\n') {
/*
* It's an LF; skip over the CR.
*/
eol_offset++;
}
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
}
}
/*
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
* Return the offset of the character after the last
Make "tvb_find_line_end()" and "tvb_find_line_end_unquoted()" treat CR by itself as a line ending, as well as treating CR LF and LF as line endings. Tweak the Telnet dissector to treat LF and CR NUL as line endings, but not to treat CR by itself as a line ending (that's not exactly what the NVT specification in the Telnet RFC specifies, but the resulting output may be a bit more readable that way). svn path=/trunk/; revision=2613
2000-11-12 00:59:09 +00:00
* character in the line, skipping over the last character
* in the line terminator.
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
*/
Make more output parameters optional. svn path=/trunk/; revision=31059
2009-11-23 22:02:12 +00:00
if (next_offset)
*next_offset = eol_offset + 1;
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
}
return linelen;
}
/*
* Given a tvbuff, an offset into the tvbuff, and a length that starts
* at that offset (which may be -1 for "all the way to the end of the
* tvbuff"), find the end of the (putative) line that starts at the
* specified offset in the tvbuff, going no further than the specified
* length.
*
* However, treat quoted strings inside the buffer specially - don't
* treat newlines in quoted strings as line terminators.
*
* Return the length of the line (not counting the line terminator at
* the end), or the amount of data remaining in the buffer if we don't
* find a line terminator.
*
* Set "*next_offset" to the offset of the character past the line
* terminator, or past the end of the buffer if we don't find a line
* terminator.
*/
gint
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
tvb_find_line_end_unquoted(tvbuff_t *tvb, const gint offset, int len, gint *next_offset)
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
gint cur_offset, char_offset;
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
gboolean is_quoted;
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guchar c = 0;
gint eob_offset;
int linelen;
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
if (len == -1)
len = tvb_length_remaining(tvb, offset);
/*
* XXX - what if "len" is still -1, meaning "offset is past the
* end of the tvbuff"?
*/
eob_offset = offset + len;
cur_offset = offset;
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
is_quoted = FALSE;
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
for (;;) {
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
/*
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
* Is this part of the string quoted?
*/
if (is_quoted) {
/*
* Yes - look only for the terminating quote.
*/
char_offset = tvb_find_guint8(tvb, cur_offset, len,
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
'"');
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
} else {
/*
Make "tvb_find_line_end()" and "tvb_find_line_end_unquoted()" treat CR by itself as a line ending, as well as treating CR LF and LF as line endings. Tweak the Telnet dissector to treat LF and CR NUL as line endings, but not to treat CR by itself as a line ending (that's not exactly what the NVT specification in the Telnet RFC specifies, but the resulting output may be a bit more readable that way). svn path=/trunk/; revision=2613
2000-11-12 00:59:09 +00:00
* Look either for a CR, an LF, or a '"'.
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
*/
Fix some: 'cast discards qualifiers from pointer target type' warnings - Add const qualifier - Remove some strange casts svn path=/trunk/; revision=42131
2012-04-18 12:35:36 +00:00
char_offset = tvb_pbrk_guint8(tvb, cur_offset, len, "\r\n\"", &c);
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
}
In "tvb_find_guint8()" and "tvb_pbrk_guint8()", correctly set the limit of the search if the caller-supplied limit goes past the end of the tvbuff - the limit should just be what remains in the tvbuff after the specified starting offset. In "tvb_find_line_end_unquoted()", after searching for the next interesting character, check the value we got back from that search, in "char_offset", not whatever happens to be in "cur_offset", to see if we found a character. svn path=/trunk/; revision=2719
2000-11-30 06:11:32 +00:00
if (char_offset == -1) {
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
/*
* Not found - line is presumably continued in
* next packet.
* We pretend the line runs to the end of the tvbuff.
*/
linelen = eob_offset - offset;
Make more output parameters optional. svn path=/trunk/; revision=31059
2009-11-23 22:02:12 +00:00
if (next_offset)
*next_offset = eob_offset;
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
break;
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6116
2002-08-28 20:41:00 +00:00
Make "tvb_find_line_end()" and "tvb_find_line_end_unquoted()" treat CR by itself as a line ending, as well as treating CR LF and LF as line endings. Tweak the Telnet dissector to treat LF and CR NUL as line endings, but not to treat CR by itself as a line ending (that's not exactly what the NVT specification in the Telnet RFC specifies, but the resulting output may be a bit more readable that way). svn path=/trunk/; revision=2613
2000-11-12 00:59:09 +00:00
if (is_quoted) {
/*
* We're processing a quoted string.
* We only looked for ", so we know it's a ";
* as we're processing a quoted string, it's a
* closing quote.
*/
is_quoted = FALSE;
} else {
/*
* OK, what is it?
*/
if (c == '"') {
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
/*
Make "tvb_find_line_end()" and "tvb_find_line_end_unquoted()" treat CR by itself as a line ending, as well as treating CR LF and LF as line endings. Tweak the Telnet dissector to treat LF and CR NUL as line endings, but not to treat CR by itself as a line ending (that's not exactly what the NVT specification in the Telnet RFC specifies, but the resulting output may be a bit more readable that way). svn path=/trunk/; revision=2613
2000-11-12 00:59:09 +00:00
* Un-quoted "; it begins a quoted
* string.
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
*/
Make "tvb_find_line_end()" and "tvb_find_line_end_unquoted()" treat CR by itself as a line ending, as well as treating CR LF and LF as line endings. Tweak the Telnet dissector to treat LF and CR NUL as line endings, but not to treat CR by itself as a line ending (that's not exactly what the NVT specification in the Telnet RFC specifies, but the resulting output may be a bit more readable that way). svn path=/trunk/; revision=2613
2000-11-12 00:59:09 +00:00
is_quoted = TRUE;
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
} else {
/*
Make "tvb_find_line_end()" and "tvb_find_line_end_unquoted()" treat CR by itself as a line ending, as well as treating CR LF and LF as line endings. Tweak the Telnet dissector to treat LF and CR NUL as line endings, but not to treat CR by itself as a line ending (that's not exactly what the NVT specification in the Telnet RFC specifies, but the resulting output may be a bit more readable that way). svn path=/trunk/; revision=2613
2000-11-12 00:59:09 +00:00
* It's a CR or LF; we've found a line
* terminator.
*
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
* Find the number of bytes between the
Make "tvb_find_line_end()" and "tvb_find_line_end_unquoted()" treat CR by itself as a line ending, as well as treating CR LF and LF as line endings. Tweak the Telnet dissector to treat LF and CR NUL as line endings, but not to treat CR by itself as a line ending (that's not exactly what the NVT specification in the Telnet RFC specifies, but the resulting output may be a bit more readable that way). svn path=/trunk/; revision=2613
2000-11-12 00:59:09 +00:00
* starting offset and the CR or LF.
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
*/
linelen = char_offset - offset;
/*
Make "tvb_find_line_end()" and "tvb_find_line_end_unquoted()" treat CR by itself as a line ending, as well as treating CR LF and LF as line endings. Tweak the Telnet dissector to treat LF and CR NUL as line endings, but not to treat CR by itself as a line ending (that's not exactly what the NVT specification in the Telnet RFC specifies, but the resulting output may be a bit more readable that way). svn path=/trunk/; revision=2613
2000-11-12 00:59:09 +00:00
* Is it a CR?
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
*/
Make "tvb_find_line_end()" and "tvb_find_line_end_unquoted()" treat CR by itself as a line ending, as well as treating CR LF and LF as line endings. Tweak the Telnet dissector to treat LF and CR NUL as line endings, but not to treat CR by itself as a line ending (that's not exactly what the NVT specification in the Telnet RFC specifies, but the resulting output may be a bit more readable that way). svn path=/trunk/; revision=2613
2000-11-12 00:59:09 +00:00
if (c == '\r') {
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
/*
Make "tvb_find_line_end()" and "tvb_find_line_end_unquoted()" treat CR by itself as a line ending, as well as treating CR LF and LF as line endings. Tweak the Telnet dissector to treat LF and CR NUL as line endings, but not to treat CR by itself as a line ending (that's not exactly what the NVT specification in the Telnet RFC specifies, but the resulting output may be a bit more readable that way). svn path=/trunk/; revision=2613
2000-11-12 00:59:09 +00:00
* Yes; is it followed by an LF?
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
*/
Make "tvb_find_line_end()" and "tvb_find_line_end_unquoted()" treat CR by itself as a line ending, as well as treating CR LF and LF as line endings. Tweak the Telnet dissector to treat LF and CR NUL as line endings, but not to treat CR by itself as a line ending (that's not exactly what the NVT specification in the Telnet RFC specifies, but the resulting output may be a bit more readable that way). svn path=/trunk/; revision=2613
2000-11-12 00:59:09 +00:00
if (char_offset + 1 < eob_offset &&
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
tvb_get_guint8(tvb, char_offset + 1)
== '\n') {
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
/*
Make "tvb_find_line_end()" and "tvb_find_line_end_unquoted()" treat CR by itself as a line ending, as well as treating CR LF and LF as line endings. Tweak the Telnet dissector to treat LF and CR NUL as line endings, but not to treat CR by itself as a line ending (that's not exactly what the NVT specification in the Telnet RFC specifies, but the resulting output may be a bit more readable that way). svn path=/trunk/; revision=2613
2000-11-12 00:59:09 +00:00
* Yes; skip over the CR.
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
*/
Make "tvb_find_line_end()" and "tvb_find_line_end_unquoted()" treat CR by itself as a line ending, as well as treating CR LF and LF as line endings. Tweak the Telnet dissector to treat LF and CR NUL as line endings, but not to treat CR by itself as a line ending (that's not exactly what the NVT specification in the Telnet RFC specifies, but the resulting output may be a bit more readable that way). svn path=/trunk/; revision=2613
2000-11-12 00:59:09 +00:00
char_offset++;
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
}
}
/*
* Return the offset of the character after
Make "tvb_find_line_end()" and "tvb_find_line_end_unquoted()" treat CR by itself as a line ending, as well as treating CR LF and LF as line endings. Tweak the Telnet dissector to treat LF and CR NUL as line endings, but not to treat CR by itself as a line ending (that's not exactly what the NVT specification in the Telnet RFC specifies, but the resulting output may be a bit more readable that way). svn path=/trunk/; revision=2613
2000-11-12 00:59:09 +00:00
* the last character in the line, skipping
* over the last character in the line
* terminator, and quit.
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
*/
Make more output parameters optional. svn path=/trunk/; revision=31059
2009-11-23 22:02:12 +00:00
if (next_offset)
*next_offset = char_offset + 1;
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
break;
}
}
/*
* Step past the character we found.
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
*/
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
cur_offset = char_offset + 1;
if (cur_offset >= eob_offset) {
/*
* The character we found was the last character
* in the tvbuff - line is presumably continued in
* next packet.
* We pretend the line runs to the end of the tvbuff.
*/
linelen = eob_offset - offset;
Make more output parameters optional. svn path=/trunk/; revision=31059
2009-11-23 22:02:12 +00:00
if (next_offset)
*next_offset = eob_offset;
Tvbuffify the SAP and SDP dissectors. Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector; get rid of "find_line_end_unquoted()" as nobody uses it any more. Add "tvb_pbrk_guint8()" for the benefit of "tvb_find_line_end_unquoted()"; it searches for any of a number of characters, unlike "tvb_find_guint8()" which searches for only one. svn path=/trunk/; revision=2595
2000-11-10 06:50:37 +00:00
break;
}
Tvbuffify the HTTP, NNTP, RSH, RTSP, and Telnet dissectors. Add "tvb_find_line_end()", to find a CR and/or LF-terminated line in a tvbuff and return its length and the offset of the character after the line end, for the use of those dissectors. Add "tvb_strncaseeql()", which is like "tvb_strneql()" except that it does a case-insensitive comparison. svn path=/trunk/; revision=2590
2000-11-09 10:56:33 +00:00
}
return linelen;
}
Move "bytes_to_str()" to "strutil.c" from "packet.c" - it's just a string formatter, like "format_text()", and, as "tvbuff.c" now calls it (*vide infra*), we don't want to have to make "tvbuff.c" drag "packet.h" in just to declare "bytes_to_str()". It's now declared in "strutil.h", so include it in modules that use "bytes_to_str()" and weren't already including it. Add a "tvb_bytes_to_str()" wrapper that calls "tvb_get_ptr()" to get a pointer to a chunk of N bytes at a given offset in a tvbuff and then hands that chunk to "bytes_to_str()". Convert the code that was doing that to use "tvb_bytes_to_str()" instead (which caught what I suspect is a bug in the Q.2931 dissector, where it was handing an offset of 0 to "tvb_get_ptr()" - a cut-and-pasteo, I think). Tvbuffify the ARP dissector. svn path=/trunk/; revision=2634
2000-11-13 07:19:37 +00:00
Move the routines tvb_skip_wsp() to tvbuff.c svn path=/trunk/; revision=23818
2007-12-09 17:41:16 +00:00
/*
* Copied from the mgcp dissector. (This function should be moved to /epan )
* tvb_skip_wsp - Returns the position in tvb of the first non-whitespace
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
* character following offset or offset + maxlength -1 whichever
* is smaller.
Move the routines tvb_skip_wsp() to tvbuff.c svn path=/trunk/; revision=23818
2007-12-09 17:41:16 +00:00
*
* Parameters:
* tvb - The tvbuff in which we are skipping whitespace.
* offset - The offset in tvb from which we begin trying to skip whitespace.
* maxlength - The maximum distance from offset that we may try to skip
* whitespace.
*
* Returns: The position in tvb of the first non-whitespace
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
* character following offset or offset + maxlength -1 whichever
* is smaller.
Move the routines tvb_skip_wsp() to tvbuff.c svn path=/trunk/; revision=23818
2007-12-09 17:41:16 +00:00
*/
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
gint
tvb_skip_wsp(tvbuff_t* tvb, const gint offset, const gint maxlength)
Move the routines tvb_skip_wsp() to tvbuff.c svn path=/trunk/; revision=23818
2007-12-09 17:41:16 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
gint counter = offset;
gint end, tvb_len;
Move the routines tvb_skip_wsp() to tvbuff.c svn path=/trunk/; revision=23818
2007-12-09 17:41:16 +00:00
guint8 tempchar;
/* Get the length remaining */
tvb_len = tvb_length(tvb);
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
end = offset + maxlength;
Move the routines tvb_skip_wsp() to tvbuff.c svn path=/trunk/; revision=23818
2007-12-09 17:41:16 +00:00
if (end >= tvb_len)
{
end = tvb_len;
}
/* Skip past spaces, tabs, CRs and LFs until run out or meet something else */
for (counter = offset;
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
counter < end &&
((tempchar = tvb_get_guint8(tvb,counter)) == ' ' ||
tempchar == '\t' || tempchar == '\r' || tempchar == '\n');
counter++);
Move the routines tvb_skip_wsp() to tvbuff.c svn path=/trunk/; revision=23818
2007-12-09 17:41:16 +00:00
return (counter);
}
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
gint
tvb_skip_wsp_return(tvbuff_t* tvb, const gint offset) {
gint counter = offset;
gint end;
Move the routines tvb_skip_wsp() to tvbuff.c svn path=/trunk/; revision=23818
2007-12-09 17:41:16 +00:00
guint8 tempchar;
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
end = 0;
Move the routines tvb_skip_wsp() to tvbuff.c svn path=/trunk/; revision=23818
2007-12-09 17:41:16 +00:00
for(counter = offset; counter > end &&
((tempchar = tvb_get_guint8(tvb,counter)) == ' ' ||
tempchar == '\t' || tempchar == '\n' || tempchar == '\r'); counter--);
counter++;
return (counter);
}
Add a "tvb_bytes_to_str_punct()" routine, which wraps "bytes_to_str_punct()", and use it instead of extracting the bytes and formatting them by hand. svn path=/trunk/; revision=12876
2004-12-30 23:47:52 +00:00
/*
* Format a bunch of data from a tvbuff as bytes, returning a pointer
* to the string with the formatted data, with "punct" as a byte
* separator.
*/
gchar *
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_bytes_to_str_punct(tvbuff_t *tvb, const gint offset, const gint len, const gchar punct)
Add a "tvb_bytes_to_str_punct()" routine, which wraps "bytes_to_str_punct()", and use it instead of extracting the bytes and formatting them by hand. svn path=/trunk/; revision=12876
2004-12-30 23:47:52 +00:00
{
There's no need to call tvb_get_ptr() in here: just call ensure_contiguous() directly. svn path=/trunk/; revision=35509
2011-01-12 20:25:36 +00:00
return bytes_to_str_punct(ensure_contiguous(tvb, offset, len), len, punct);
Add a "tvb_bytes_to_str_punct()" routine, which wraps "bytes_to_str_punct()", and use it instead of extracting the bytes and formatting them by hand. svn path=/trunk/; revision=12876
2004-12-30 23:47:52 +00:00
}
Add tvb_bcd_dig_to_ep_str() /* * Given a tvbuff, an offset into the tvbuff, and a length that starts * at that offset (which may be -1 for "all the way to the end of the * tvbuff"), fetch BCD encoded digits from a tvbuff starting from either * the low or high half byte, formating the digits according to an input digit set, * if NUll a default digit set of 0-9 returning "?" for overdecadic digits will be used. * A pointer to the EP allocated string will be returned. * Note a tvbuff content of 0xf is considered a 'filler' and will end the conversion. */ svn path=/trunk/; revision=35286
2010-12-28 12:36:26 +00:00
/*
* Given a tvbuff, an offset into the tvbuff, and a length that starts
* at that offset (which may be -1 for "all the way to the end of the
Introduce, and start using, tvb_get_const_stringz(). This function returns a pointer to a NULL-terminated string in the TVB. It is no safer than dissectors which call tvb_get_strsize() and then tvb_get_ptr() but it makes it clear that this usage of tvb_get_ptr() is safe. This function is slightly more efficient than tvb_get_ephemeral_stringz()--but only as long as we're not using composite TVBs. svn path=/trunk/; revision=35493
2011-01-12 02:25:08 +00:00
* tvbuff"), fetch BCD encoded digits from a tvbuff starting from either
* the low or high half byte, formating the digits according to an input digit set,
Add tvb_bcd_dig_to_ep_str() /* * Given a tvbuff, an offset into the tvbuff, and a length that starts * at that offset (which may be -1 for "all the way to the end of the * tvbuff"), fetch BCD encoded digits from a tvbuff starting from either * the low or high half byte, formating the digits according to an input digit set, * if NUll a default digit set of 0-9 returning "?" for overdecadic digits will be used. * A pointer to the EP allocated string will be returned. * Note a tvbuff content of 0xf is considered a 'filler' and will end the conversion. */ svn path=/trunk/; revision=35286
2010-12-28 12:36:26 +00:00
* if NUll a default digit set of 0-9 returning "?" for overdecadic digits will be used.
* A pointer to the EP allocated string will be returned.
* Note a tvbuff content of 0xf is considered a 'filler' and will end the conversion.
*/
static dgt_set_t Dgt1_9_bcd = {
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
{
/* 0 1 2 3 4 5 6 7 8 9 a b c d e */
'0','1','2','3','4','5','6','7','8','9','?','?','?','?','?'
}
Add tvb_bcd_dig_to_ep_str() /* * Given a tvbuff, an offset into the tvbuff, and a length that starts * at that offset (which may be -1 for "all the way to the end of the * tvbuff"), fetch BCD encoded digits from a tvbuff starting from either * the low or high half byte, formating the digits according to an input digit set, * if NUll a default digit set of 0-9 returning "?" for overdecadic digits will be used. * A pointer to the EP allocated string will be returned. * Note a tvbuff content of 0xf is considered a 'filler' and will end the conversion. */ svn path=/trunk/; revision=35286
2010-12-28 12:36:26 +00:00
};
Squelch some compiler warnings. svn path=/trunk/; revision=37685
2011-06-16 18:34:17 +00:00
const gchar *
Add tvb_bcd_dig_to_ep_str() /* * Given a tvbuff, an offset into the tvbuff, and a length that starts * at that offset (which may be -1 for "all the way to the end of the * tvbuff"), fetch BCD encoded digits from a tvbuff starting from either * the low or high half byte, formating the digits according to an input digit set, * if NUll a default digit set of 0-9 returning "?" for overdecadic digits will be used. * A pointer to the EP allocated string will be returned. * Note a tvbuff content of 0xf is considered a 'filler' and will end the conversion. */ svn path=/trunk/; revision=35286
2010-12-28 12:36:26 +00:00
tvb_bcd_dig_to_ep_str(tvbuff_t *tvb, const gint offset, const gint len, dgt_set_t *dgt, gboolean skip_first)
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
int length;
guint8 octet;
int i = 0;
char *digit_str;
gint t_offset = offset;
Add tvb_bcd_dig_to_ep_str() /* * Given a tvbuff, an offset into the tvbuff, and a length that starts * at that offset (which may be -1 for "all the way to the end of the * tvbuff"), fetch BCD encoded digits from a tvbuff starting from either * the low or high half byte, formating the digits according to an input digit set, * if NUll a default digit set of 0-9 returning "?" for overdecadic digits will be used. * A pointer to the EP allocated string will be returned. * Note a tvbuff content of 0xf is considered a 'filler' and will end the conversion. */ svn path=/trunk/; revision=35286
2010-12-28 12:36:26 +00:00
if (!dgt)
dgt = &Dgt1_9_bcd;
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
if (len == -1) {
Add tvb_bcd_dig_to_ep_str() /* * Given a tvbuff, an offset into the tvbuff, and a length that starts * at that offset (which may be -1 for "all the way to the end of the * tvbuff"), fetch BCD encoded digits from a tvbuff starting from either * the low or high half byte, formating the digits according to an input digit set, * if NUll a default digit set of 0-9 returning "?" for overdecadic digits will be used. * A pointer to the EP allocated string will be returned. * Note a tvbuff content of 0xf is considered a 'filler' and will end the conversion. */ svn path=/trunk/; revision=35286
2010-12-28 12:36:26 +00:00
length = tvb_length(tvb);
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
if (length < offset) {
Add tvb_bcd_dig_to_ep_str() /* * Given a tvbuff, an offset into the tvbuff, and a length that starts * at that offset (which may be -1 for "all the way to the end of the * tvbuff"), fetch BCD encoded digits from a tvbuff starting from either * the low or high half byte, formating the digits according to an input digit set, * if NUll a default digit set of 0-9 returning "?" for overdecadic digits will be used. * A pointer to the EP allocated string will be returned. * Note a tvbuff content of 0xf is considered a 'filler' and will end the conversion. */ svn path=/trunk/; revision=35286
2010-12-28 12:36:26 +00:00
return "";
}
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
} else {
Add tvb_bcd_dig_to_ep_str() /* * Given a tvbuff, an offset into the tvbuff, and a length that starts * at that offset (which may be -1 for "all the way to the end of the * tvbuff"), fetch BCD encoded digits from a tvbuff starting from either * the low or high half byte, formating the digits according to an input digit set, * if NUll a default digit set of 0-9 returning "?" for overdecadic digits will be used. * A pointer to the EP allocated string will be returned. * Note a tvbuff content of 0xf is considered a 'filler' and will end the conversion. */ svn path=/trunk/; revision=35286
2010-12-28 12:36:26 +00:00
length = offset + len;
}
digit_str = ep_alloc((length - offset)*2+1);
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
while (t_offset < length) {
Add tvb_bcd_dig_to_ep_str() /* * Given a tvbuff, an offset into the tvbuff, and a length that starts * at that offset (which may be -1 for "all the way to the end of the * tvbuff"), fetch BCD encoded digits from a tvbuff starting from either * the low or high half byte, formating the digits according to an input digit set, * if NUll a default digit set of 0-9 returning "?" for overdecadic digits will be used. * A pointer to the EP allocated string will be returned. * Note a tvbuff content of 0xf is considered a 'filler' and will end the conversion. */ svn path=/trunk/; revision=35286
2010-12-28 12:36:26 +00:00
octet = tvb_get_guint8(tvb,t_offset);
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
if (!skip_first) {
Introduce, and start using, tvb_get_const_stringz(). This function returns a pointer to a NULL-terminated string in the TVB. It is no safer than dissectors which call tvb_get_strsize() and then tvb_get_ptr() but it makes it clear that this usage of tvb_get_ptr() is safe. This function is slightly more efficient than tvb_get_ephemeral_stringz()--but only as long as we're not using composite TVBs. svn path=/trunk/; revision=35493
2011-01-12 02:25:08 +00:00
digit_str[i] = dgt->out[octet & 0x0f];
Add tvb_bcd_dig_to_ep_str() /* * Given a tvbuff, an offset into the tvbuff, and a length that starts * at that offset (which may be -1 for "all the way to the end of the * tvbuff"), fetch BCD encoded digits from a tvbuff starting from either * the low or high half byte, formating the digits according to an input digit set, * if NUll a default digit set of 0-9 returning "?" for overdecadic digits will be used. * A pointer to the EP allocated string will be returned. * Note a tvbuff content of 0xf is considered a 'filler' and will end the conversion. */ svn path=/trunk/; revision=35286
2010-12-28 12:36:26 +00:00
i++;
}
skip_first = FALSE;
/*
* unpack second value in byte
*/
octet = octet >> 4;
if (octet == 0x0f) /* odd number bytes - hit filler */
break;
Introduce, and start using, tvb_get_const_stringz(). This function returns a pointer to a NULL-terminated string in the TVB. It is no safer than dissectors which call tvb_get_strsize() and then tvb_get_ptr() but it makes it clear that this usage of tvb_get_ptr() is safe. This function is slightly more efficient than tvb_get_ephemeral_stringz()--but only as long as we're not using composite TVBs. svn path=/trunk/; revision=35493
2011-01-12 02:25:08 +00:00
digit_str[i] = dgt->out[octet & 0x0f];
Add tvb_bcd_dig_to_ep_str() /* * Given a tvbuff, an offset into the tvbuff, and a length that starts * at that offset (which may be -1 for "all the way to the end of the * tvbuff"), fetch BCD encoded digits from a tvbuff starting from either * the low or high half byte, formating the digits according to an input digit set, * if NUll a default digit set of 0-9 returning "?" for overdecadic digits will be used. * A pointer to the EP allocated string will be returned. * Note a tvbuff content of 0xf is considered a 'filler' and will end the conversion. */ svn path=/trunk/; revision=35286
2010-12-28 12:36:26 +00:00
i++;
t_offset++;
}
digit_str[i]= '\0';
return digit_str;
}
Move "bytes_to_str()" to "strutil.c" from "packet.c" - it's just a string formatter, like "format_text()", and, as "tvbuff.c" now calls it (*vide infra*), we don't want to have to make "tvbuff.c" drag "packet.h" in just to declare "bytes_to_str()". It's now declared in "strutil.h", so include it in modules that use "bytes_to_str()" and weren't already including it. Add a "tvb_bytes_to_str()" wrapper that calls "tvb_get_ptr()" to get a pointer to a chunk of N bytes at a given offset in a tvbuff and then hands that chunk to "bytes_to_str()". Convert the code that was doing that to use "tvb_bytes_to_str()" instead (which caught what I suspect is a bug in the Q.2931 dissector, where it was handing an offset of 0 to "tvb_get_ptr()" - a cut-and-pasteo, I think). Tvbuffify the ARP dissector. svn path=/trunk/; revision=2634
2000-11-13 07:19:37 +00:00
/*
* Format a bunch of data from a tvbuff as bytes, returning a pointer
* to the string with the formatted data.
*/
gchar *
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_bytes_to_str(tvbuff_t *tvb, const gint offset, const gint len)
Move "bytes_to_str()" to "strutil.c" from "packet.c" - it's just a string formatter, like "format_text()", and, as "tvbuff.c" now calls it (*vide infra*), we don't want to have to make "tvbuff.c" drag "packet.h" in just to declare "bytes_to_str()". It's now declared in "strutil.h", so include it in modules that use "bytes_to_str()" and weren't already including it. Add a "tvb_bytes_to_str()" wrapper that calls "tvb_get_ptr()" to get a pointer to a chunk of N bytes at a given offset in a tvbuff and then hands that chunk to "bytes_to_str()". Convert the code that was doing that to use "tvb_bytes_to_str()" instead (which caught what I suspect is a bug in the Q.2931 dissector, where it was handing an offset of 0 to "tvb_get_ptr()" - a cut-and-pasteo, I think). Tvbuffify the ARP dissector. svn path=/trunk/; revision=2634
2000-11-13 07:19:37 +00:00
{
There's no need to call tvb_get_ptr() in here: just call ensure_contiguous() directly. svn path=/trunk/; revision=35509
2011-01-12 20:25:36 +00:00
return bytes_to_str(ensure_contiguous(tvb, offset, len), len);
Move "bytes_to_str()" to "strutil.c" from "packet.c" - it's just a string formatter, like "format_text()", and, as "tvbuff.c" now calls it (*vide infra*), we don't want to have to make "tvbuff.c" drag "packet.h" in just to declare "bytes_to_str()". It's now declared in "strutil.h", so include it in modules that use "bytes_to_str()" and weren't already including it. Add a "tvb_bytes_to_str()" wrapper that calls "tvb_get_ptr()" to get a pointer to a chunk of N bytes at a given offset in a tvbuff and then hands that chunk to "bytes_to_str()". Convert the code that was doing that to use "tvb_bytes_to_str()" instead (which caught what I suspect is a bug in the Q.2931 dissector, where it was handing an offset of 0 to "tvb_get_ptr()" - a cut-and-pasteo, I think). Tvbuffify the ARP dissector. svn path=/trunk/; revision=2634
2000-11-13 07:19:37 +00:00
}
Changes required to support multiple named data sources. Tvbuffers changed to added the data source name, GUI and printing code changed to support these changes and display the multiple hex views. svn path=/trunk/; revision=3165
2001-03-23 14:44:04 +00:00
Add a "contains" operator for byte-strings, strings, and tvbuffs (protocols). The search uses a naive approach; more work is required to add a Boyer-Moore Search algorithm. svn path=/trunk/; revision=8280
2003-08-27 15:23:11 +00:00
/* Find a needle tvbuff within a haystack tvbuff. */
gint
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_find_tvb(tvbuff_t *haystack_tvb, tvbuff_t *needle_tvb, const gint haystack_offset)
Add a "contains" operator for byte-strings, strings, and tvbuffs (protocols). The search uses a naive approach; more work is required to add a Boyer-Moore Search algorithm. svn path=/trunk/; revision=8280
2003-08-27 15:23:11 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint haystack_abs_offset, haystack_abs_length;
const guint8 *haystack_data;
const guint8 *needle_data;
const guint needle_len = needle_tvb->length;
const guint8 *location;
Add a "contains" operator for byte-strings, strings, and tvbuffs (protocols). The search uses a naive approach; more work is required to add a Boyer-Moore Search algorithm. svn path=/trunk/; revision=8280
2003-08-27 15:23:11 +00:00
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
DISSECTOR_ASSERT(haystack_tvb && haystack_tvb->initialized);
Make tvb_find_tvb() return -1 if either tvb length is 0. Otherwise, an assertion happens 'xxxx contains ""'. svn path=/trunk/; revision=8450
2003-09-10 21:19:47 +00:00
if (haystack_tvb->length < 1 || needle_tvb->length < 1) {
return -1;
}
Add a "contains" operator for byte-strings, strings, and tvbuffs (protocols). The search uses a naive approach; more work is required to add a Boyer-Moore Search algorithm. svn path=/trunk/; revision=8280
2003-08-27 15:23:11 +00:00
/* Get pointers to the tvbuffs' data. */
There's no need to call tvb_get_ptr() in here: just call ensure_contiguous() directly. svn path=/trunk/; revision=35509
2011-01-12 20:25:36 +00:00
haystack_data = ensure_contiguous(haystack_tvb, 0, -1);
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
needle_data = ensure_contiguous(needle_tvb, 0, -1);
Add a "contains" operator for byte-strings, strings, and tvbuffs (protocols). The search uses a naive approach; more work is required to add a Boyer-Moore Search algorithm. svn path=/trunk/; revision=8280
2003-08-27 15:23:11 +00:00
Make some of the check_XXX functions accept the length/reported length of the tvbuff as arguments instead the tvbuff. We'll need this feature in order to remove the non-thread usage of the 'last_tvb' variable in tvb_new_subset() svn path=/trunk/; revision=29442
2009-08-16 08:18:17 +00:00
check_offset_length(haystack_tvb->length, haystack_tvb->reported_length, haystack_offset, -1,
Add a "contains" operator for byte-strings, strings, and tvbuffs (protocols). The search uses a naive approach; more work is required to add a Boyer-Moore Search algorithm. svn path=/trunk/; revision=8280
2003-08-27 15:23:11 +00:00
&haystack_abs_offset, &haystack_abs_length);
location = epan_memmem(haystack_data + haystack_abs_offset, haystack_abs_length,
needle_data, needle_len);
if (location) {
Make the "length" argument of the tvb_mem* functions a size_t since it's not uncommon to pass them the result of pointer arithmetic. Add size_t casts in other areas. svn path=/trunk/; revision=27941
2009-04-03 15:30:38 +00:00
return (gint) (location - haystack_data);
Add a "contains" operator for byte-strings, strings, and tvbuffs (protocols). The search uses a naive approach; more work is required to add a Boyer-Moore Search algorithm. svn path=/trunk/; revision=8280
2003-08-27 15:23:11 +00:00
}
return -1;
}
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
#ifdef HAVE_LIBZ
/*
* Uncompresses a zlib compressed packet inside a message of tvb at offset with
* length comprlen. Returns an uncompressed tvbuffer if uncompression
* succeeded or NULL if uncompression failed.
*/
From Jerry Talkington: speed up tvb_uncompress() by increasing the minimal and default uncompression buffer. svn path=/trunk/; revision=10839
2004-05-10 22:14:07 +00:00
#define TVB_Z_MIN_BUFSIZ 32768
#define TVB_Z_MAX_BUFSIZ 1048576 * 10
/* #define TVB_Z_DEBUG 1 */
#undef TVB_Z_DEBUG
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
tvbuff_t *
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_uncompress(tvbuff_t *tvb, const int offset, int comprlen)
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
{
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
gint err = Z_OK;
guint bytes_out = 0;
guint8 *compr = NULL;
guint8 *uncompr = NULL;
tvbuff_t *uncompr_tvb = NULL;
z_streamp strm = NULL;
Bytef *strmbuf = NULL;
guint inits_done = 0;
gint wbits = MAX_WBITS;
guint8 *next = NULL;
guint bufsiz = TVB_Z_MIN_BUFSIZ;
From Jerry Talkington: speed up tvb_uncompress() by increasing the minimal and default uncompression buffer. svn path=/trunk/; revision=10839
2004-05-10 22:14:07 +00:00
#ifdef TVB_Z_DEBUG
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
guint inflate_passes = 0;
guint bytes_in = tvb_length_remaining(tvb, offset);
From Jerry Talkington: speed up tvb_uncompress() by increasing the minimal and default uncompression buffer. svn path=/trunk/; revision=10839
2004-05-10 22:14:07 +00:00
#endif
if (tvb == NULL) {
return NULL;
}
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
compr = tvb_memdup(tvb, offset, comprlen);
Delay allocation of z_stream svn path=/trunk/; revision=30275
2009-10-04 06:20:32 +00:00
if (!compr)
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
return NULL;
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
/*
From Jerry Talkington: speed up tvb_uncompress() by increasing the minimal and default uncompression buffer. svn path=/trunk/; revision=10839
2004-05-10 22:14:07 +00:00
* Assume that the uncompressed data is at least twice as big as
* the compressed size.
*/
bufsiz = tvb_length_remaining(tvb, offset) * 2;
Use GLibs CLAMP(). The current inlined implementation seems to be wrong: } else if (bufsiz > TVB_Z_MAX_BUFSIZ) { bufsiz = TVB_Z_MIN_BUFSIZ; } This should probably have been 'bufsiz = TVB_Z_MAX_BUFSIZ;' svn path=/trunk/; revision=30276
2009-10-04 06:28:50 +00:00
bufsiz = CLAMP(bufsiz, TVB_Z_MIN_BUFSIZ, TVB_Z_MAX_BUFSIZ);
From Jerry Talkington: speed up tvb_uncompress() by increasing the minimal and default uncompression buffer. svn path=/trunk/; revision=10839
2004-05-10 22:14:07 +00:00
#ifdef TVB_Z_DEBUG
printf("bufsiz: %u bytes\n", bufsiz);
#endif
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
next = compr;
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
strm = g_new0(z_stream, 1);
strm->next_in = next;
strm->avail_in = comprlen;
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
strmbuf = g_malloc0(bufsiz);
strm->next_out = strmbuf;
From Jerry Talkington: speed up tvb_uncompress() by increasing the minimal and default uncompression buffer. svn path=/trunk/; revision=10839
2004-05-10 22:14:07 +00:00
strm->avail_out = bufsiz;
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
err = inflateInit2(strm, wbits);
inits_done = 1;
if (err != Z_OK) {
Add some inflateEnd() calls to free up stuff associated with a stream before freeing the stream; bug 659 mentioned one of them, but there appear to be others. svn path=/trunk/; revision=16973
2006-01-07 03:36:37 +00:00
inflateEnd(strm);
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
g_free(strm);
g_free(compr);
From Jerry Talkington: speed up tvb_uncompress() by increasing the minimal and default uncompression buffer. svn path=/trunk/; revision=10839
2004-05-10 22:14:07 +00:00
g_free(strmbuf);
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
return NULL;
}
while (1) {
From Jerry Talkington: speed up tvb_uncompress() by increasing the minimal and default uncompression buffer. svn path=/trunk/; revision=10839
2004-05-10 22:14:07 +00:00
memset(strmbuf, '\0', bufsiz);
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
strm->next_out = strmbuf;
From Jerry Talkington: speed up tvb_uncompress() by increasing the minimal and default uncompression buffer. svn path=/trunk/; revision=10839
2004-05-10 22:14:07 +00:00
strm->avail_out = bufsiz;
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
err = inflate(strm, Z_SYNC_FLUSH);
if (err == Z_OK || err == Z_STREAM_END) {
From Jerry Talkington: speed up tvb_uncompress() by increasing the minimal and default uncompression buffer. svn path=/trunk/; revision=10839
2004-05-10 22:14:07 +00:00
guint bytes_pass = bufsiz - strm->avail_out;
#ifdef TVB_Z_DEBUG
++inflate_passes;
#endif
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
if (uncompr == NULL) {
Make bit_offset in _tvb_get_bits64 and related functions unsigned. This removes a potential buffer overflow and should fix a bunch of Coverity errors mentioned in bug 6878. We might want to do the same for no_of_bits. svn path=/trunk/; revision=41945
2012-04-04 21:54:22 +00:00
/*
Fix for bug #6480 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6480) Yay, first commit since r37883 (almost 9months). svn path=/trunk/; revision=41869
2012-03-31 12:33:10 +00:00
* This is ugly workaround for bug #6480
* (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6480)
*
* g_memdup(..., 0) returns NULL (g_malloc(0) also)
Make bit_offset in _tvb_get_bits64 and related functions unsigned. This removes a potential buffer overflow and should fix a bunch of Coverity errors mentioned in bug 6878. We might want to do the same for no_of_bits. svn path=/trunk/; revision=41945
2012-04-04 21:54:22 +00:00
* when uncompr is NULL logic below doesn't create tvb
Fix for bug #6480 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6480) Yay, first commit since r37883 (almost 9months). svn path=/trunk/; revision=41869
2012-03-31 12:33:10 +00:00
* which is later interpreted as decompression failed.
*/
These buffers in tvb_uncompress() can't ovelaps, so use optimized memcpy(). svn path=/trunk/; revision=41870
2012-03-31 12:35:07 +00:00
uncompr = (bytes_pass || err != Z_STREAM_END) ?
Fix for bug #6480 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6480) Yay, first commit since r37883 (almost 9months). svn path=/trunk/; revision=41869
2012-03-31 12:33:10 +00:00
g_memdup(strmbuf, bytes_pass) :
g_strdup("");
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
} else {
g_malloc0() doesn't return NULL so remove NULL error paths svn path=/trunk/; revision=30274
2009-10-04 06:12:31 +00:00
guint8 *new_data = g_malloc0(bytes_out + bytes_pass);
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
These buffers in tvb_uncompress() can't ovelaps, so use optimized memcpy(). svn path=/trunk/; revision=41870
2012-03-31 12:35:07 +00:00
memcpy(new_data, uncompr, bytes_out);
memcpy(new_data + bytes_out, strmbuf, bytes_pass);
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
g_free(uncompr);
uncompr = new_data;
}
bytes_out += bytes_pass;
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
if (err == Z_STREAM_END) {
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
inflateEnd(strm);
g_free(strm);
From Jerry Talkington: speed up tvb_uncompress() by increasing the minimal and default uncompression buffer. svn path=/trunk/; revision=10839
2004-05-10 22:14:07 +00:00
g_free(strmbuf);
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
break;
}
} else if (err == Z_BUF_ERROR) {
/*
* It's possible that not enough frames were captured
* to decompress this fully, so return what we've done
* so far, if any.
*/
Add some inflateEnd() calls to free up stuff associated with a stream before freeing the stream; bug 659 mentioned one of them, but there appear to be others. svn path=/trunk/; revision=16973
2006-01-07 03:36:37 +00:00
inflateEnd(strm);
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
g_free(strm);
From Jerry Talkington: speed up tvb_uncompress() by increasing the minimal and default uncompression buffer. svn path=/trunk/; revision=10839
2004-05-10 22:14:07 +00:00
g_free(strmbuf);
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
if (uncompr != NULL) {
break;
} else {
g_free(compr);
return NULL;
}
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
} else if (err == Z_DATA_ERROR && inits_done == 1
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
&& uncompr == NULL && (*compr == 0x1f) &&
(*(compr + 1) == 0x8b)) {
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
/*
* inflate() is supposed to handle both gzip and deflate
* streams automatically, but in reality it doesn't
* seem to handle either (at least not within the
* context of an HTTP response.) We have to try
* several tweaks, depending on the type of data and
* version of the library installed.
*/
/*
* Gzip file format. Skip past the header, since the
* fix to make it work (setting windowBits to 31)
* doesn't work with all versions of the library.
*/
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
Bytef *c = compr + 2;
Bytef flags = 0;
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
if (*c == Z_DEFLATED) {
c++;
} else {
Add some inflateEnd() calls to free up stuff associated with a stream before freeing the stream; bug 659 mentioned one of them, but there appear to be others. svn path=/trunk/; revision=16973
2006-01-07 03:36:37 +00:00
inflateEnd(strm);
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
g_free(strm);
g_free(compr);
From Jerry Talkington: speed up tvb_uncompress() by increasing the minimal and default uncompression buffer. svn path=/trunk/; revision=10839
2004-05-10 22:14:07 +00:00
g_free(strmbuf);
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
return NULL;
}
flags = *c;
/* Skip past the MTIME, XFL, and OS fields. */
c += 7;
Most developers have only 10 fingers, not 16. :-) svn path=/trunk/; revision=11581
2004-08-02 18:58:19 +00:00
if (flags & (1 << 2)) {
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
/* An Extra field is present. */
gint xsize = (gint)(*c |
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
(*(c + 1) << 8));
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
c += xsize;
}
Most developers have only 10 fingers, not 16. :-) svn path=/trunk/; revision=11581
2004-08-02 18:58:19 +00:00
if (flags & (1 << 3)) {
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
/* A null terminated filename */
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2649 by adding some length checks to two while loops in tvb_uncompress() svn path=/trunk/; revision=25677
2008-07-08 20:04:11 +00:00
while ((c - compr) < comprlen && *c != '\0') {
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
c++;
}
c++;
}
Most developers have only 10 fingers, not 16. :-) svn path=/trunk/; revision=11581
2004-08-02 18:58:19 +00:00
if (flags & (1 << 4)) {
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
/* A null terminated comment */
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2649 by adding some length checks to two while loops in tvb_uncompress() svn path=/trunk/; revision=25677
2008-07-08 20:04:11 +00:00
while ((c - compr) < comprlen && *c != '\0') {
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
c++;
}
c++;
}
inflateReset(strm);
next = c;
strm->next_in = next;
When trying to handle gzip-compressed data, don't seek past the end of our compressed data buffer. Fixes bug 288. svn path=/trunk/; revision=14981
2005-07-21 21:40:57 +00:00
if (c - compr > comprlen) {
Add some inflateEnd() calls to free up stuff associated with a stream before freeing the stream; bug 659 mentioned one of them, but there appear to be others. svn path=/trunk/; revision=16973
2006-01-07 03:36:37 +00:00
inflateEnd(strm);
When trying to handle gzip-compressed data, don't seek past the end of our compressed data buffer. Fixes bug 288. svn path=/trunk/; revision=14981
2005-07-21 21:40:57 +00:00
g_free(strm);
g_free(compr);
g_free(strmbuf);
return NULL;
}
Make the "length" argument of the tvb_mem* functions a size_t since it's not uncommon to pass them the result of pointer arithmetic. Add size_t casts in other areas. svn path=/trunk/; revision=27941
2009-04-03 15:30:38 +00:00
comprlen -= (int) (c - compr);
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
Add some inflateEnd() calls to free up stuff associated with a stream before freeing the stream; bug 659 mentioned one of them, but there appear to be others. svn path=/trunk/; revision=16973
2006-01-07 03:36:37 +00:00
inflateEnd(strm);
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang svn path=/trunk/; revision=40473
2012-01-13 16:36:07 +00:00
inflateInit2(strm, wbits);
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
inits_done++;
} else if (err == Z_DATA_ERROR && uncompr == NULL &&
Remove 'type' formal parameter from tvb_new_with_subset() svn path=/trunk/; revision=29988
2009-09-20 07:35:39 +00:00
inits_done <= 3) {
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
/*
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
* Re-init the stream with a negative
* MAX_WBITS. This is necessary due to
* some servers (Apache) not sending
* the deflate header with the
* content-encoded response.
*/
wbits = -MAX_WBITS;
inflateReset(strm);
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
strm->next_in = next;
strm->avail_in = comprlen;
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
Add a inflateEnd() call to free up the stream in the re-init block. svn path=/trunk/; revision=24559
2008-03-04 22:56:26 +00:00
inflateEnd(strm);
From Jerry Talkington: speed up tvb_uncompress() by increasing the minimal and default uncompression buffer. svn path=/trunk/; revision=10839
2004-05-10 22:14:07 +00:00
memset(strmbuf, '\0', bufsiz);
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
strm->next_out = strmbuf;
From Jerry Talkington: speed up tvb_uncompress() by increasing the minimal and default uncompression buffer. svn path=/trunk/; revision=10839
2004-05-10 22:14:07 +00:00
strm->avail_out = bufsiz;
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
err = inflateInit2(strm, wbits);
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
inits_done++;
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
if (err != Z_OK) {
g_free(strm);
From Jerry Talkington: speed up tvb_uncompress() by increasing the minimal and default uncompression buffer. svn path=/trunk/; revision=10839
2004-05-10 22:14:07 +00:00
g_free(strmbuf);
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
g_free(compr);
g_free(uncompr);
return NULL;
}
} else {
Add some inflateEnd() calls to free up stuff associated with a stream before freeing the stream; bug 659 mentioned one of them, but there appear to be others. svn path=/trunk/; revision=16973
2006-01-07 03:36:37 +00:00
inflateEnd(strm);
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
g_free(strm);
From Jerry Talkington: speed up tvb_uncompress() by increasing the minimal and default uncompression buffer. svn path=/trunk/; revision=10839
2004-05-10 22:14:07 +00:00
g_free(strmbuf);
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
if (uncompr == NULL) {
Fix double free. compr is also freed outside loop. So free it only when returning. Might be related with bug #5908, but I don't have access to that bug ;-) svn path=/trunk/; revision=37081
2011-05-12 16:31:42 +00:00
g_free(compr);
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
return NULL;
}
break;
}
}
From Jerry Talkington: speed up tvb_uncompress() by increasing the minimal and default uncompression buffer. svn path=/trunk/; revision=10839
2004-05-10 22:14:07 +00:00
#ifdef TVB_Z_DEBUG
printf("inflate() total passes: %u\n", inflate_passes);
printf("bytes in: %u\nbytes out: %u\n\n", bytes_in, bytes_out);
#endif
Make our tvb exists before we try to dereference it. Fixes some of the current fuzz errors. svn path=/trunk/; revision=18665
2006-07-05 18:47:21 +00:00
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
if (uncompr != NULL) {
(Trivial) Indentation, whitespace & formatting cleanup. svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
uncompr_tvb = tvb_new_real_data((guint8*) uncompr, bytes_out, bytes_out);
Memory management of tvb_uncompress() needs tvb_set_free_cb(). svn path=/trunk/; revision=10817
2004-05-07 18:15:24 +00:00
tvb_set_free_cb(uncompr_tvb, g_free);
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
}
g_free(compr);
return uncompr_tvb;
}
#else
tvbuff_t *
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
tvb_uncompress(tvbuff_t *tvb _U_, const int offset _U_, int comprlen _U_)
From Jerry Talkington: - Helper functions for uncompressing compressed tvbuffers. - Compressed content coding dissection in HTTP. svn path=/trunk/; revision=10799
2004-05-05 06:55:09 +00:00
{
return NULL;
}
#endif
Make TVBs opaque for most users. Convert TVB_RAW_OFFSET() and TVB_GET_DS_TVB() into functions. svn path=/trunk/; revision=37422
2011-05-27 03:06:50 +00:00
tvbuff_t *
tvb_child_uncompress(tvbuff_t *parent, tvbuff_t *tvb, const int offset, int comprlen)
Add to new functions from the optimization patch: tvb_child_uncompress() tvb_new_child_real_data() svn path=/trunk/; revision=27924
2009-04-01 16:22:51 +00:00
{
tvbuff_t *new_tvb = tvb_uncompress(tvb, offset, comprlen);
if (new_tvb)
tvb_set_child_real_data_tvbuff (parent, new_tvb);
return new_tvb;
}
Make TVBs opaque for most users. Convert TVB_RAW_OFFSET() and TVB_GET_DS_TVB() into functions. svn path=/trunk/; revision=37422
2011-05-27 03:06:50 +00:00
gint
tvb_raw_offset(tvbuff_t *tvb)
{
return ((tvb->raw_offset==-1)?(tvb->raw_offset = tvb_offset_from_real_beginning(tvb)):tvb->raw_offset);
}
struct tvbuff *
tvb_get_ds_tvb(tvbuff_t *tvb)
{
return(tvb->ds_tvb);
}