osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
47,003 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

47003 Commits

Author SHA1 Message Date
Chris Maynard f655e90d8b Remove col_headings_cb from print_cmd_toggle_detail() altogether. It's not needed since if summary isn't printed, neither are column headings anyway. 
svn path=/trunk/; revision=50051
 2013-06-19 18:44:42 +00:00
Evan Huus 50da1aacf9 Try and keep r50047 and still fix 
print_dlg.c:916: warning: value computed is not used

svn path=/trunk/; revision=50050
 2013-06-19 18:38:52 +00:00
Jeff Morriss f3dfe6b4df One of the unused hf's commented out in r47389 was not used due to a 
cut-n-pasteo.  Fix that cut-n-pasteo and reinstate the hf.

svn path=/trunk/; revision=50049
 2013-06-19 18:38:41 +00:00
Jörg Mayer b77119aca7 Remove traling whitespace. 
svn path=/trunk/; revision=50048
 2013-06-19 18:33:49 +00:00
Jörg Mayer 95a68da158 Fix for 
Building C object ui/gtk/CMakeFiles/gtkui.dir/print_dlg.c.o
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/print_dlg.c: In function ‘print_cmd_toggle_detail’:
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/print_dlg.c:910:38: error: variable ‘col_headings_cb’ set but not used [-Werror=unused-but-set-variable]
   GtkWidget *print_bt, *summary_cb, *col_headings_cb, *details_cb;
                                      ^
cc1: all warnings being treated as errors

No idea wether the fix is correct. Compile tested only.

svn path=/trunk/; revision=50047
 2013-06-19 18:30:04 +00:00
Evan Huus e13d73e038 Rework wmem scoping limits so that users can still get a handle to a pool when 
it is out of scope, they just can't *allocate* in the pool. This is necessary
because file-scope trees (migrating from emem) are set up on program
initialization when there is no file in scope - they need to initialize with the
handle, they just won't use it until a file is actually in scope.

svn path=/trunk/; revision=50046
 2013-06-19 18:28:13 +00:00
Jörg Mayer 7670683e3b Explain how to enter a \ in an snmp field. 
svn path=/trunk/; revision=50045
 2013-06-19 18:20:59 +00:00
Martin Kaiser d8c2f03573 revert the extended size box changes for now, 
this needs some more work to make things portable

svn path=/trunk/; revision=50044
 2013-06-19 18:10:41 +00:00
Martin Mathieson b49fbad27d Add a couple of missing lines from the usage output. 
svn path=/trunk/; revision=50043
 2013-06-19 18:06:46 +00:00
Martin Kaiser df74ddb9e3 explicitly use 64bit variables, g(u)int is not 64bit everywhere 
svn path=/trunk/; revision=50042
 2013-06-19 17:51:59 +00:00
Evan Huus 451e4b878b Convert DNS dissector to wmem, including first actual usage of wmem's red-black 
tree.

svn path=/trunk/; revision=50041
 2013-06-19 17:40:33 +00:00
Martin Kaiser 86c30e2abe support extended size boxes, general cleanup 
svn path=/trunk/; revision=50040
 2013-06-19 17:34:43 +00:00
Evan Huus a17358cf3f Add wmem_strbuf_new_label as just a sized new for label lengths. 
svn path=/trunk/; revision=50039
 2013-06-19 17:34:24 +00:00
Martin Mathieson 608ad7b5b6 Add a comment about how it would nice for display filter macro fields 
to use auto-completion, but that it won't work because the string
contains the $1, etc placeholders...

svn path=/trunk/; revision=50038
 2013-06-19 17:11:55 +00:00
Chris Maynard c621a6dbf1 Trivial: add a missing word, "to". 
svn path=/trunk/; revision=50037
 2013-06-19 15:24:14 +00:00
Chris Maynard 909d2eb309 Allow for column headers not to be printed in order to make it possible to export packets as plain text in a format that could then have a chance of being imported again (assuming other factors such as packet bytes were printed, etc.) in order to recover the original pcap file. 
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1636

svn path=/trunk/; revision=50036
 2013-06-19 15:22:56 +00:00
Martin Kaiser 54d58d66f7 etypes.h needs value_string.h 
svn path=/trunk/; revision=50035
 2013-06-19 14:56:11 +00:00
Pascal Quantin 2eec913a4d Fet rid of a global variable 
svn path=/trunk/; revision=50034
 2013-06-19 07:16:14 +00:00
Evan Huus f4e5a62325 Clean up wmem_strsplit to remove a bunch of weird switch statements and 
unnecessary continue statements. Should fix the coverity issues Joerg pointed
out as well.

svn path=/trunk/; revision=50033
 2013-06-19 06:48:08 +00:00
Pascal Quantin 830ebed406 Get rid of global variables 
svn path=/trunk/; revision=50032
 2013-06-19 06:44:39 +00:00
Pascal Quantin 7a0245d747 Regenerate dissector 
svn path=/trunk/; revision=50031
 2013-06-19 06:23:51 +00:00
Jörg Mayer 32b98e8524 Fix CID 1033205: Dead default in switch (DEADCODE) 
svn path=/trunk/; revision=50030
 2013-06-19 03:30:06 +00:00
Jörg Mayer d9b5210c61 Fix CID 712341: Dereference null return value (NULL_RETURNS) 
Well, not really. Just catch that case and error out.

svn path=/trunk/; revision=50029
 2013-06-19 03:23:31 +00:00
Jörg Mayer 2bb61fc8ce Fix CID 1034293: Missing break in switch (MISSING_BREAK) 
svn path=/trunk/; revision=50028
 2013-06-19 02:54:45 +00:00
Guy Harris 52e9ee89fd Clarify (a V1.0 file might have a single zero byte at the end of the 
page, which doesn't look like an "unused space" record because there
aren't two bytes of record type, just one byte).

svn path=/trunk/; revision=50027
 2013-06-19 00:02:22 +00:00
Guy Harris 953d1bfd72 Slight stylistic cleanup - most routines, when defined, have no space 
between the routine name and the opening parenthesis, so remove it from
the definition of the seek-read routine.

svn path=/trunk/; revision=50026
 2013-06-18 23:47:50 +00:00
Guy Harris 81b9276b24 Note that NetScaler trace files are page-oriented, with records not 
split across page boundaries, rather than being a byte stream, and that
the last page may be short.

Fix some comments.

svn path=/trunk/; revision=50025
 2013-06-18 23:37:30 +00:00
Martin Mathieson b4c6e0eb1c Add an option (switched off) to decode the Contention Resolution body as 
an RRC UL CCCH PDU.

svn path=/trunk/; revision=50024
 2013-06-18 23:36:35 +00:00
Jeff Morriss e872569fde From Anders: Fix the highlighted length, add PDU description as a comment. 
svn path=/trunk/; revision=50023
 2013-06-18 23:33:00 +00:00
Pascal Quantin d09ffee44e Add ability to export decrypted IPsec PDUs 
svn path=/trunk/; revision=50022
 2013-06-18 23:01:46 +00:00
Martin Mathieson 2cf27a92a6 Set PDCP SN length for DRBs for separate RRC element. 
svn path=/trunk/; revision=50021
 2013-06-18 22:38:54 +00:00
Evan Huus 8e060a2ad5 Update READMEs. 
svn path=/trunk/; revision=50020
 2013-06-18 21:47:18 +00:00
Martin Mathieson 868f74d628 Also signal value of PDCP SN (only used if enabled by RLC preferences). 
svn path=/trunk/; revision=50019
 2013-06-18 21:44:48 +00:00
Evan Huus 8ec8f94db7 Resurrect wmem_memdup in its own misc. utilities group. Emem provides it, so we 
need to provide an analogue at least for now.

svn path=/trunk/; revision=50018
 2013-06-18 21:42:54 +00:00
Evan Huus d487bba75f Add wmem_alloc_array, wmem_strsplit, wmem_strconcat. 
svn path=/trunk/; revision=50017
 2013-06-18 21:25:37 +00:00
Martin Mathieson ece132a5ce Configure MAC LCID -> RLC channel settings from RRC. 
svn path=/trunk/; revision=50016
 2013-06-18 21:02:00 +00:00
Jakub Zawadzki f60dd85784 Pass hfinfo and not hfindex to internal proto functions. 
svn path=/trunk/; revision=50015
 2013-06-18 20:52:31 +00:00
Michael Mann a7043bf787 Update "TTL low or unexpected" coloring rule to ignore vrrp, carp and MulticastDNS all of which intentionally use TTL 255. Bug 5010 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5010) 
Add carp to routing protocols while we're at it.

svn path=/trunk/; revision=50014
 2013-06-18 20:48:42 +00:00
Evan Huus da6d99e2c9 Refactor insert32 to use lookup_or_insert32 with the right flags. 
svn path=/trunk/; revision=50013
 2013-06-18 19:55:29 +00:00
Evan Huus 4313d778f0 Refactor lookup_or_insert32 to remove a bunch of continue and break statements 
as well as a confusing while(TRUE).

svn path=/trunk/; revision=50012
 2013-06-18 19:43:18 +00:00
Evan Huus 8610601f60 Simplify node structure. Use a boolean for whether or not it's a subtree, and an 
enum for the color (red/black). Don't use bitfields since they don't save us
much (if anything) in terms of space and don't nest the fields in their own
anonymous struct.

svn path=/trunk/; revision=50011
 2013-06-18 19:32:40 +00:00
Evan Huus 02752f3161 Factor function for node creation out and use it in several places. 
svn path=/trunk/; revision=50010
 2013-06-18 19:19:21 +00:00
Evan Huus 881845a555 Scrap wmem_memdup, it's not actually as useful as I thought it would be. 
svn path=/trunk/; revision=50009
 2013-06-18 19:01:01 +00:00
Evan Huus 115eb9c727 Factor common code for red-black tree array lookups into a helper function and 
use it for both direct lookups and less-than-or-equal-to lookups.

svn path=/trunk/; revision=50008
 2013-06-18 18:57:28 +00:00
Evan Huus 7fd970ac45 Remove wmem_tree_create_subtree, it does nothing we can't do with 
wmem_tree_new.

svn path=/trunk/; revision=50007
 2013-06-18 17:48:04 +00:00
Evan Huus d0c1d89cd6 Factor string-packing code into a common function to use in both insert_string 
and lookup_string.

svn path=/trunk/; revision=50006
 2013-06-18 17:39:15 +00:00
Jörg Mayer 99e1ad5443 Fix compile error: 
[ 79%] Building C object CMakeFiles/text2pcap.dir/text2pcap.c.o
In file included from /usr/include/glib-2.0/glib/galloca.h:34:0,
                 from /usr/include/glib-2.0/glib.h:32,
                 from /home/jmayer/work/wireshark/svn/trunk/wsutil/file_util.h:34,
                 from /home/jmayer/work/wireshark/svn/trunk/text2pcap.c:116:
/home/jmayer/work/wireshark/svn/trunk/text2pcap.c: In function ‘write_current_packet’:
/usr/include/glib-2.0/glib/gtypes.h:186:22: error: declaration of ‘__v’ shadows a previous local [-Werror=shadow]
  ({ register guint16 __v, __x = ((guint16) (val)); \
                      ^
/usr/include/glib-2.0/glib/gtypes.h:237:38: note: in expansion of macro ‘GUINT16_SWAP_LE_BE_IA32’
 #    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_IA32 (val))
                                      ^
/usr/lib/glib-2.0/include/glibconfig.h:192:29: note: in expansion of macro ‘GUINT16_SWAP_LE_BE’
 #define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val))
                             ^
/usr/include/glib-2.0/glib/gtypes.h:359:23: note: in expansion of macro ‘GUINT16_TO_BE’
 #define g_htons(val) (GUINT16_TO_BE (val))
                       ^
/home/jmayer/work/wireshark/svn/trunk/text2pcap.c:705:35: note: in expansion of macro ‘g_htons’
             pseudoh.length      = g_htons(length - g_ntohs(HDR_IPv6.ip6_ctlun.ip6_un1.ip6_un1_plen) + sizeof(HDR_UDP));
                                   ^
/usr/include/glib-2.0/glib/gtypes.h:237:38: note: in expansion of macro ‘GUINT16_SWAP_LE_BE_IA32’
 #    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_IA32 (val))
                                      ^
/usr/lib/glib-2.0/include/glibconfig.h:192:29: note: in expansion of macro ‘GUINT16_SWAP_LE_BE’
 #define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val))
                             ^
/usr/include/glib-2.0/glib/gtypes.h:327:31: note: in expansion of macro ‘GUINT16_TO_BE’
 #define GUINT16_FROM_BE(val) (GUINT16_TO_BE (val))
                               ^
/usr/include/glib-2.0/glib/gtypes.h:357:23: note: in expansion of macro ‘GUINT16_FROM_BE’
 #define g_ntohs(val) (GUINT16_FROM_BE (val))
                       ^
/home/jmayer/work/wireshark/svn/trunk/text2pcap.c:705:52: note: in expansion of macro ‘g_ntohs’
             pseudoh.length      = g_htons(length - g_ntohs(HDR_IPv6.ip6_ctlun.ip6_un1.ip6_un1_plen) + sizeof(HDR_UDP));
                                                    ^
/usr/include/glib-2.0/glib/gtypes.h:186:22: error: shadowed declaration is here [-Werror=shadow]
  ({ register guint16 __v, __x = ((guint16) (val)); \
                      ^
/usr/include/glib-2.0/glib/gtypes.h:237:38: note: in expansion of macro ‘GUINT16_SWAP_LE_BE_IA32’
 #    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_IA32 (val))
                                      ^
/usr/lib/glib-2.0/include/glibconfig.h:192:29: note: in expansion of macro ‘GUINT16_SWAP_LE_BE’
 #define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val))
                             ^
/usr/include/glib-2.0/glib/gtypes.h:359:23: note: in expansion of macro ‘GUINT16_TO_BE’
 #define g_htons(val) (GUINT16_TO_BE (val))
                       ^
/home/jmayer/work/wireshark/svn/trunk/text2pcap.c:705:35: note: in expansion of macro ‘g_htons’
             pseudoh.length      = g_htons(length - g_ntohs(HDR_IPv6.ip6_ctlun.ip6_un1.ip6_un1_plen) + sizeof(HDR_UDP));
                                   ^
/usr/include/glib-2.0/glib/gtypes.h:186:27: error: declaration of ‘__x’ shadows a previous local [-Werror=shadow]
  ({ register guint16 __v, __x = ((guint16) (val)); \
                           ^
/usr/include/glib-2.0/glib/gtypes.h:237:38: note: in expansion of macro ‘GUINT16_SWAP_LE_BE_IA32’
 #    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_IA32 (val))
                                      ^
/usr/lib/glib-2.0/include/glibconfig.h:192:29: note: in expansion of macro ‘GUINT16_SWAP_LE_BE’
 #define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val))
                             ^
/usr/include/glib-2.0/glib/gtypes.h:359:23: note: in expansion of macro ‘GUINT16_TO_BE’
 #define g_htons(val) (GUINT16_TO_BE (val))
                       ^
/home/jmayer/work/wireshark/svn/trunk/text2pcap.c:705:35: note: in expansion of macro ‘g_htons’
             pseudoh.length      = g_htons(length - g_ntohs(HDR_IPv6.ip6_ctlun.ip6_un1.ip6_un1_plen) + sizeof(HDR_UDP));
                                   ^
/usr/include/glib-2.0/glib/gtypes.h:237:38: note: in expansion of macro ‘GUINT16_SWAP_LE_BE_IA32’
 #    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_IA32 (val))
                                      ^
/usr/lib/glib-2.0/include/glibconfig.h:192:29: note: in expansion of macro ‘GUINT16_SWAP_LE_BE’
 #define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val))
                             ^
/usr/include/glib-2.0/glib/gtypes.h:327:31: note: in expansion of macro ‘GUINT16_TO_BE’
 #define GUINT16_FROM_BE(val) (GUINT16_TO_BE (val))
                               ^
/usr/include/glib-2.0/glib/gtypes.h:357:23: note: in expansion of macro ‘GUINT16_FROM_BE’
 #define g_ntohs(val) (GUINT16_FROM_BE (val))
                       ^
/home/jmayer/work/wireshark/svn/trunk/text2pcap.c:705:52: note: in expansion of macro ‘g_ntohs’
             pseudoh.length      = g_htons(length - g_ntohs(HDR_IPv6.ip6_ctlun.ip6_un1.ip6_un1_plen) + sizeof(HDR_UDP));
                                                    ^
/usr/include/glib-2.0/glib/gtypes.h:186:27: error: shadowed declaration is here [-Werror=shadow]
  ({ register guint16 __v, __x = ((guint16) (val)); \
                           ^
/usr/include/glib-2.0/glib/gtypes.h:237:38: note: in expansion of macro ‘GUINT16_SWAP_LE_BE_IA32’
 #    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_IA32 (val))
                                      ^
/usr/lib/glib-2.0/include/glibconfig.h:192:29: note: in expansion of macro ‘GUINT16_SWAP_LE_BE’
 #define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val))
                             ^
/usr/include/glib-2.0/glib/gtypes.h:359:23: note: in expansion of macro ‘GUINT16_TO_BE’
 #define g_htons(val) (GUINT16_TO_BE (val))
                       ^
/home/jmayer/work/wireshark/svn/trunk/text2pcap.c:705:35: note: in expansion of macro ‘g_htons’
             pseudoh.length      = g_htons(length - g_ntohs(HDR_IPv6.ip6_ctlun.ip6_un1.ip6_un1_plen) + sizeof(HDR_UDP));
                                   ^
cc1: all warnings being treated as errors
make[2]: *** [CMakeFiles/text2pcap.dir/text2pcap.c.o] Error 1


Feel free to choose a less offensive variable name

svn path=/trunk/; revision=50005
 2013-06-18 12:22:40 +00:00
Evan Huus 701fb00afa Add test block for wmem_tree_lookup32_array_le(), fix other tests where certain 
random seeds would cause collisions and false failures.

svn path=/trunk/; revision=50004
 2013-06-18 06:22:47 +00:00
Evan Huus 54959c293d Wmem tree tests with non-trivial keys. 
svn path=/trunk/; revision=50003
 2013-06-18 05:41:16 +00:00
Evan Huus 7c99d55773 Re-port a bunch of the red-black tree code from wmem with fewer modifications, 
and enable the tests.

Lesson: make it work, *then* refactor it into sanity.

svn path=/trunk/; revision=50002
 2013-06-18 05:31:12 +00:00