Commit Graph

42292 Commits

Author SHA1 Message Date
Jakub Zawadzki 2ec7c89c33 Fix memleak.
svn path=/trunk/; revision=44697
2012-08-29 22:14:55 +00:00
Michael Mann e5e09f7016 Fix Bug 7348 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7348)
svn path=/trunk/; revision=44696
2012-08-29 21:23:07 +00:00
Chris Maynard b840ba44b4 Trivial typo fix and duplicate word removal.
svn path=/trunk/; revision=44695
2012-08-29 17:05:38 +00:00
Chris Maynard cc3c9ba3e5 Allow wpa-psk decryption keys to be successfully entered.
Problems reported on ask.wireshark.org here:
1) http://ask.wireshark.org/questions/13951/invalid-key-format-wireshark-182
2) http://ask.wireshark.org/questions/13688/error-updating-record-invalid-key-format

#BACKPORT (to 1.8)

svn path=/trunk/; revision=44694
2012-08-29 16:15:01 +00:00
Guy Harris d0f32eea23 At least with the version of Xcode that comes with Leopard,
/usr/include/ffi/fficonfig.h doesn't define MACOSX, which causes the
build of GLib to fail.  If we don't find "#define.*MACOSX" in
/usr/include/ffi/fficonfig.h, explictly define it.

svn path=/trunk/; revision=44693
2012-08-29 10:31:29 +00:00
Pascal Quantin a5c0d49ac2 Remove useless include (GeoIP initialization was removed from epan_init() in r43604)
svn path=/trunk/; revision=44692
2012-08-28 15:14:30 +00:00
Jakub Zawadzki 0e382b6668 Yet another case of bug #7316 (r42989) and bug #7668 (r44688)
Use correct field type for ccp.opt.oui

svn path=/trunk/; revision=44689
2012-08-28 09:10:34 +00:00
Jakub Zawadzki d35ef03b15 Fix bug #7668
Use correct field type for lcp.opt.oui

svn path=/trunk/; revision=44688
2012-08-28 08:44:41 +00:00
Evan Huus cb5a320d22 Fix a dead store and a few duplicate 'break' statements as caught by
clang and cppcheck.

svn path=/trunk/; revision=44687
2012-08-28 02:08:42 +00:00
Evan Huus f3ca6e55ef Remove variadic macro that accidentally made it in a while back.
svn path=/trunk/; revision=44686
2012-08-28 02:01:25 +00:00
Bill Meier 99173bf797 Fix 2 memory leaks;
Essentially: 'fid' & 'fragment' hash tables can be global (i.e., need not be 'per call')
               thus removing g_malloc'd storage never freed because it was pointed to in
               se_alloc'd structs.

  Fixes Bug #4134: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4134

  Also: fix a compile error when compiling with '#define DEBUG_DESEGMENT'

svn path=/trunk/; revision=44685
2012-08-27 16:17:38 +00:00
Pascal Quantin 74a43c3ada Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7622 :
Fix dissection of a few TDS fields (line number in ERR and MSG token, user type in RESULTS token, row count in DONE token) when the TDS version is >= 7.2.
Add a mechanism to memorize the TDS 7.X version in the conversation based on the TDS version found in LOGIN ACK token. This version is used for dissection when a TDS version is not set in preferences (TDS protocol type set to "not specified").

svn path=/trunk/; revision=44684
2012-08-27 11:47:37 +00:00
Jörg Mayer df49549abf Infrastructure for tcp decoding - nothing done to actually
decode the contents

svn path=/trunk/; revision=44683
2012-08-27 07:46:23 +00:00
Bill Meier cbd2a8ff25 Fix two minor memory leaks.
svn path=/trunk/; revision=44682
2012-08-26 23:44:25 +00:00
Bill Meier 89c5e9796f Fix 'Warn Dissector bug, protocol IAX2, in packet 62: proto.c:4406: failed assertion "fixed_item->parent == tree"'
svn path=/trunk/; revision=44681
2012-08-26 23:24:27 +00:00
Anders Broman 2aa9312c14 From Ilarion Ishkulov Multisegment PDUs are not reassembled properly with TCP dissector https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7544
svn path=/trunk/; revision=44680
2012-08-26 16:39:11 +00:00
Gerald Combs d0c229641f [Automatic manuf, services and enterprise-numbers update for 2012-08-26]
svn path=/trunk/; revision=44676
2012-08-26 14:03:31 +00:00
Jörg Mayer 15ee8b256a Extend a comment.
svn path=/trunk/; revision=44675
2012-08-26 03:17:53 +00:00
Pascal Quantin 1c76cb5fef From Sylvain Munaut via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7664 :
packet-gmr1_bcch: Add guards in the SI1/2 choice of segment

Although the CSN1 dissector itself will just stop if there is
no matching segment, it will leave the choice field uninitizalized
and so when we use it to fill some other text, it crashes ...

To protect against that, we put a last choice entry that will always
match. As a bonus, it triggers an explicit error in CSN so you
know something is wrong.

svn path=/trunk/; revision=44674
2012-08-25 21:31:29 +00:00
Pascal Quantin f783da2d6d From Sylvain Munaut via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7664 :
packet-gmr1_bcch: Whitespaces fixes

svn path=/trunk/; revision=44673
2012-08-25 21:19:47 +00:00
Pascal Quantin 6c12a7ffdc From Sylvain Munaut via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7664 :
packet-gmr1_rr: Add support for "Assignment Command 1" messages

svn path=/trunk/; revision=44672
2012-08-25 21:16:08 +00:00
Pascal Quantin 88911f9102 From Sylvain Munaut via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7664 :
packet-gsmtap: Call GMR-1 RACH dissector when appropriate

svn path=/trunk/; revision=44671
2012-08-25 21:09:49 +00:00
Pascal Quantin cd1ceaa04a From Sylvain Munaut via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7664 :
Add GMR-1 RACH dissection

svn path=/trunk/; revision=44670
2012-08-25 21:04:48 +00:00
Evan Huus 5e4108c347 Have CMake also consider the include path "lua5.2" (note the dot),
since that is where it can be found on recent Ubuntus, and without it
you get a mix of 5.1 includes and 5.2 libraries, which breaks the build.

svn path=/trunk/; revision=44669
2012-08-25 19:12:03 +00:00
Pascal Quantin 502b9b06c5 Update protocol name to match the changes done in r44661
svn path=/trunk/; revision=44668
2012-08-25 13:54:39 +00:00
Pascal Quantin 7da4784b25 Following r44648, revert part of r44162 and followups so as to have a top level gsm_a filter name
svn path=/trunk/; revision=44667
2012-08-25 13:32:41 +00:00
Bill Meier 5452b8a20c Extern (and use) extended value string instead of the associated value string array.
svn path=/trunk/; revision=44665
2012-08-25 01:20:32 +00:00
Michael Mann 030604ec29 cleanup g_malloc memory leaks
svn path=/trunk/; revision=44664
2012-08-25 00:55:46 +00:00
Bill Meier 2c32d31858 value_sring fixes;
- fix dup: use correct value for an entry (typo);
 - comment out 2nd entry of a dup pair: 2 cases

svn path=/trunk/; revision=44663
2012-08-25 00:54:04 +00:00
Michael Mann c7cbfac88d cleanup some unnecessary g_malloc calls
svn path=/trunk/; revision=44662
2012-08-25 00:39:17 +00:00
Michael Mann 95d14df10a effectively revert r44161, having the display filters favor '.' over '_'
svn path=/trunk/; revision=44661
2012-08-24 23:27:24 +00:00
Bill Meier 0fbdec6d83 Fix a trivial typo.
svn path=/trunk/; revision=44660
2012-08-24 20:56:23 +00:00
Bill Meier 0035a9076b Force extended value string linear search (not binary search) in one case:
Fixed: { -2, -1, 0, 1, 3} (note gap) used a binary search (which would fail);

 Note:  { -2, -1, 0, 1, 2 ,3 } (no gap) allowed; will still do a direct access;

Also: Add a comment to README.developer extended value string section.

svn path=/trunk/; revision=44659
2012-08-24 20:44:33 +00:00
Bill Meier 7d891022e6 Minor update to tcp_dissect_pdus() section.
svn path=/trunk/; revision=44658
2012-08-24 20:22:48 +00:00
Bill Meier 478199f349 Replace dup value_string array entry with correct entry; (dup was typo)
svn path=/trunk/; revision=44657
2012-08-24 20:07:52 +00:00
Bill Meier 4794f67904 Allow extended value string binary search (istead of linear search): re-order value_srring array entries slightly.
svn path=/trunk/; revision=44656
2012-08-24 19:49:53 +00:00
Gerald Combs 5f2783de05 Revert r44644 and 44645. g_source_*, g_timeout_, and g_io_* all depend
on the GLib main loop which isn't portable (unless you want to want to
manage the main loop yourself).

svn path=/trunk/; revision=44655
2012-08-24 15:25:42 +00:00
Michael Mann 64d81e7477 Check for PFNAME #define as it is a common substitute for a literal string for the proto filter name and consider it the proto filter name.
Ignore "duplicates" that are generated because a display filter is prefixed by a #define (which checkfiltername.pl is not smart enough to handle), causing an empty string

svn path=/trunk/; revision=44654
2012-08-24 03:05:05 +00:00
Michael Mann 6f8f3fdd42 match display filter prefix for all filters
svn path=/trunk/; revision=44653
2012-08-24 02:48:36 +00:00
Michael Mann 49ae61370e Adding period to proto filter name for being part of the "diameter" grouping.
svn path=/trunk/; revision=44652
2012-08-24 02:17:42 +00:00
Michael Mann 4d80811c3e minor display filter field typos
svn path=/trunk/; revision=44651
2012-08-24 02:04:10 +00:00
Michael Mann 14f3f8c55a Add period separator for "base" proto filter name.
svn path=/trunk/; revision=44650
2012-08-24 02:02:22 +00:00
Michael Mann 8242949ebc Allow proto filter names to have a period in them and allow display filter names to use any period separated value as a prefix. For example "gmr1.foo.bar" would allow "gmr1", "gmr1.foo" and "gmr1.foo.bar" as valid prefixes. Otherwise it will be flagged as a possible error.
Also added a "FILE TYPE" for proto filter names with a period so that they can be verified.  Presumably only "large", possibly "meta" protocols (probably spanning multiple dissector files) will be allowed to use a period in the proto filter name.

svn path=/trunk/; revision=44648
2012-08-23 21:31:20 +00:00
Jeff Morriss 64fa3d4036 Don't call dissect_custom_message() when it's not initialized.
svn path=/trunk/; revision=44646
2012-08-23 19:07:24 +00:00
Gerald Combs 8f7de2ba4e Fix compilation on Windows.
svn path=/trunk/; revision=44645
2012-08-23 18:51:24 +00:00
Gerald Combs 5adc43f597 Move the pipe input routines to the common UI directory.
svn path=/trunk/; revision=44644
2012-08-23 18:42:48 +00:00
Gerald Combs 6b26e33c60 Allow focus in the task list, which in turn allows keyboard navigation.
svn path=/trunk/; revision=44643
2012-08-23 17:42:02 +00:00
Bill Meier c591c6dd56 Comment out all but first value_string array entries with dup values:
kept: first dup since that's the one which would
       be found with a linear search.

svn path=/trunk/; revision=44642
2012-08-23 17:30:42 +00:00
Gerald Combs a04d6e4690 Fill in some missing functionality. Rename some variables and rearrange
a few things.

svn path=/trunk/; revision=44641
2012-08-23 17:29:05 +00:00
Bill Meier 7cd408ebf4 Replace dup value (typo ?) with what seems to be the correct value.
svn path=/trunk/; revision=44640
2012-08-23 17:24:46 +00:00