summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-05-16wth->priv is always set in the open routine; no need to check that it'sGuy Harris1-15/+0
non-null. svn path=/trunk/; revision=49338
2013-05-16Pull all the post-processing for a parsed line into a common routine,Guy Harris1-122/+88
used in both the seek and seek_read routines. (And, yes, the time stamp *is* supposed to be filled in by seek_read routines.) Pull some now-used-only-once routines into the new routine. svn path=/trunk/; revision=49335
2013-05-16From Weston Schmidt via ↵Pascal Quantin1-2/+2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8689: csids wiretap heuristic overriding mp2t svn path=/trunk/; revision=49334
2013-05-16Only add one "New from Global" entry in the profiles menu.Stig Bjørlykke1-11/+11
(someone removed this when rewriting the code) svn path=/trunk/; revision=49333
2013-05-16Treat invalid checksum of 0x0000 no different than any other invalid checksum.Chris Maynard1-18/+4
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8629 #BACKPORT (1.10, 1.8, 1.6) svn path=/trunk/; revision=49332
2013-05-16Add partial dissection of IR packet with IP profilePascal Quantin1-10/+23
svn path=/trunk/; revision=49331
2013-05-16From Michal Labedzki via ↵Jeff Morriss2-0/+5
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8662 : I want to add last four colours to Profile Bluetooth. This should significantly improve readability - rule is one colour for one protocol/profile. Also take responsibility (in the AUTHORS file) for first three dissectors. svn path=/trunk/; revision=49330
2013-05-16Restore a line accidentally deleted in r49297.Jeff Morriss1-0/+2
svn path=/trunk/; revision=49329
2013-05-16Updated the Kerberos ASN.1 dissector to the point I believe it can replace ↵Michael Mann5-343/+1049
the "hand made" one. Bug 8649 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8649) Letting the more experienced ASN.1 developers tweak it a little more before the "generated" dissector is accepted (which is why it's not included here) svn path=/trunk/; revision=49328
2013-05-16From Dirk:Anders Broman2-17/+52
improve PKCS12 SSL certificate load. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8641 svn path=/trunk/; revision=49327
2013-05-16From Neil Piercy:Anders Broman1-2/+2
AMR Frame Type uses wrong Value String. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8681 Applied by hand, patch not against trunk? svn path=/trunk/; revision=49326
2013-05-16Make the rtmpt max packet size that Jeff just halved a preference, so thatEvan Huus1-13/+17
people who really want it can set it higher again. svn path=/trunk/; revision=49322
2013-05-16Temporarily lower the max packet size for this dissector in order to silenceJeff Morriss1-2/+5
the fuzz bot (see https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6898 and all of its duplicates--and the bugs marked as duplicates of those duplicates). Halving the packet size seems to work for most of the captures I've tried; we'll see if the buildbot agrees. If someone can figure out a good way to control the memory usage of this dissector then the limit could be increased again. svn path=/trunk/; revision=49321
2013-05-15Use file_selection_run() for dialogs created with file_selection_new().Guy Harris6-392/+243
svn path=/trunk/; revision=49320
2013-05-15If 'svn merge' doesn't work show what applying the patch manually wouldGerald Combs1-4/+15
do. svn path=/trunk/; revision=49319
2013-05-15Remove an unused variable.Gerald Combs1-1/+0
svn path=/trunk/; revision=49318
2013-05-15Un-shadow a couple of variables.Gerald Combs3-6/+6
svn path=/trunk/; revision=49317
2013-05-15Merge some of the changes to rtp player from ↵Anders Broman1-44/+43
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893 by hand. svn path=/trunk/; revision=49316
2013-05-15- packet-sip.c adds per-packet data twice only add new packet data if no ↵Anders Broman1-6/+9
previous data exists. - Use the key as SIP can occure more than once in a frame. svn path=/trunk/; revision=49315
2013-05-15SDP adds per-packet-data twice, refactor to not use per-packet data.Anders Broman1-10/+9
svn path=/trunk/; revision=49314
2013-05-15- Use the key for comparison of per_proto_data.Anders Broman4-6/+38
- Show the number of per-packet-data entries and which protocol has made entries in the frame. svn path=/trunk/; revision=49313
2013-05-15Export CellGlobalIdOrServiceAreaIdOrLAI.Anders Broman3-52/+55
svn path=/trunk/; revision=49312
2013-05-15Put the correct attributes on avp name="3GPP2-BSID" code="9010".Anders Broman1-1/+1
svn path=/trunk/; revision=49311
2013-05-15Fix copy/paste error introduced in r49259Pascal Quantin1-3/+3
svn path=/trunk/; revision=49310
2013-05-15gtk_file_chooser_dialog_new() makes the file chooser dialog a transientGuy Harris4-11/+0
window for the specified parent; we don't have to do that ourselves. svn path=/trunk/; revision=49309
2013-05-14Give file_selection_new() an argument to specify the parent window ofGuy Harris11-160/+81
the file selection dialog. Call gtk_file_chooser_set_do_overwrite_confirmation() in file_selection_new() for FILE_SELECTION_SAVE file selection dialogs, rather than doing it in the individual callers of file_selection_new(). Use gtk_dialog_set_alternative_button_order() in file_selection_new() to set the alternative button order, rather than using #ifdefs. Use file_selection_new() and file_selection_run() in the graph analysis code. (We should clean up other code that uses file_selection_new() to use file_selection_run(), and clean up other code that uses gtk_file_chooser_dialog_new() to use file_selection_new() and file_selection_run().) svn path=/trunk/; revision=49308
2013-05-14Fix copy/paste errorsPascal Quantin1-2/+2
svn path=/trunk/; revision=49306
2013-05-14Suppress warnings when using Apple's C compiler.Michael Tüxen1-2/+4
svn path=/trunk/; revision=49305
2013-05-14Display Command Qualifier in case of Open Channel (broken in r48862)Pascal Quantin1-0/+1
svn path=/trunk/; revision=49301
2013-05-14Fix up indentation and a comment.Jeff Morriss1-207/+209
svn path=/trunk/; revision=49299
2013-05-14Add a tag for original frame number.Anders Broman4-1/+38
svn path=/trunk/; revision=49298
2013-05-14Fix up a comment and some indentation.Jeff Morriss1-19/+18
svn path=/trunk/; revision=49297
2013-05-14Don't try to decode an IPv6 address if it looks like we've been handed theJeff Morriss1-2/+17
(obsolete) Server-Assignment-Type AVP (which conflicts with the newer 3GPP-SGSN-IPv6-Address AVP). This allows users to not see malformed packets (which look completely correct) if they choose to use the AVP values from imscxdx.xml instead of those from TGPPGmb.xml. svn path=/trunk/; revision=49296
2013-05-14Fix indentation.Guy Harris1-1/+1
svn path=/trunk/; revision=49295
2013-05-14Upate to spec. 11.0.0Anders Broman9-72/+695
- fix problem with extension dissection. svn path=/trunk/; revision=49294
2013-05-14Pull dnd_merge_files() into dnd_open_file_cmd(); the resulting code is aGuy Harris1-72/+26
bit simpler. Don't bother popping up a window saying "you dragged more than one file, so we're merging"; presumably that's what they had in mind when they dragged multiple files. (If that's not what they had in mind, the window should at least offer a choice to cancel.) svn path=/trunk/; revision=49293
2013-05-14Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
svn path=/trunk/; revision=49287
2013-05-14Merge capture_start_confirmed() into capture_start_cb().Guy Harris1-49/+31
svn path=/trunk/; revision=49286
2013-05-14Add comments on the experimental state of this feature.Anders Broman1-0/+6
svn path=/trunk/; revision=49285
2013-05-14Use gtk_dialog_set_alternative_button_order() to set the "alternative"Guy Harris2-75/+35
button order (that order is what's used on Windows). Put the affirmative answer on the right by default. svn path=/trunk/; revision=49284
2013-05-14Make the dialog a child of the color filters dialog, not the top-levelGuy Harris1-1/+1
window. svn path=/trunk/; revision=49283
2013-05-14Use a modal GTK+ message dialog to ask the user whether to nuke theirGuy Harris1-21/+37
personal color settings. svn path=/trunk/; revision=49282
2013-05-13Don't fill in err_str if we're not going to use it.Guy Harris1-1/+1
(This helps flag capture_interface_list() calls that should perhaps be checked to see whether an error should be reported if they fail.) svn path=/trunk/; revision=49281
2013-05-13Fix indentation.Guy Harris1-1/+1
svn path=/trunk/; revision=49280
2013-05-13Clean up indentation.Guy Harris1-1/+1
svn path=/trunk/; revision=49279
2013-05-13Eliminate some includes of ui/simple_dialog.h by files that don't useGuy Harris2-2/+0
anything from it. svn path=/trunk/; revision=49278
2013-05-13Eliminate some includes of ui/simple_dialog.h by files that don't useGuy Harris18-22/+0
anything from it. svn path=/trunk/; revision=49277
2013-05-13Get rid of declaration of no-longer-defined-or-used routine.Guy Harris1-6/+0
svn path=/trunk/; revision=49276
2013-05-13Add wmem_test to .git(bzr)ignoreAlexis La Goutte1-0/+1
svn path=/trunk/; revision=49275
2013-05-13Add abi stuff to .git(bzr)ignore (files generated by CMake)Alexis La Goutte1-0/+9
svn path=/trunk/; revision=49274