summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-01-15Fix a typo in a comment ....Bill Meier1-1/+1
svn path=/trunk/; revision=40527
2012-01-15The name of the target for ui/gtk/libui.lib is "gtk", not "ui\gtk".Guy Harris1-1/+1
svn path=/trunk/; revision=40526
2012-01-15cd ../gtk ==> cd ../ui/gtkBill Meier1-1/+1
svn path=/trunk/; revision=40525
2012-01-15Missed another .. -> ../.. caseJörg Mayer1-1/+1
svn path=/trunk/; revision=40524
2012-01-15More .. -> ../.. changes after gtk/ moveJörg Mayer9-71/+71
svn path=/trunk/; revision=40523
2012-01-15More .. -> ../.. changes after gtk/ moveJörg Mayer1-12/+12
svn path=/trunk/; revision=40522
2012-01-15Clean up after gtk/ move: Makefile.am.inc is now at ../..Jörg Mayer1-1/+1
svn path=/trunk/; revision=40521
2012-01-15Add back revision 40517 which got lost during gtk/ moveJörg Mayer1-18/+12
svn path=/trunk/; revision=40520
2012-01-15Remove gtk-dirJörg Mayer0-0/+0
svn path=/trunk/; revision=40519
2012-01-15Move gtk to ui/gtk.Jörg Mayer322-1271/+1279
This looses the last checkin to gtk, will add this manually back. svn path=/trunk/; revision=40518
2012-01-15Have the time field in the Graph Analyzis windos use the same time format as ↵Anders Broman1-18/+12
used to view the trace. svn path=/trunk/; revision=40517
2012-01-15The warning fix overdid things: It removed functionality.Jörg Mayer2-12/+6
Now I only remove the variable ft and everything looks good. svn path=/trunk/; revision=40516
2012-01-15[Automatic manuf, services and enterprise-numbers update for 2012-01-15]Gerald Combs3-21/+245
svn path=/trunk/; revision=40513
2012-01-15The last commit failed to check in the deleted filesJörg Mayer12-2916/+0
svn path=/trunk/; revision=40512
2012-01-15Rename crypt-xxx to xxxJörg Mayer32-48/+2964
svn path=/trunk/; revision=40511
2012-01-15Accidentally checked in Makefile.inJörg Mayer1-635/+0
svn path=/trunk/; revision=40510
2012-01-15Shuffle the ett[] array elements around a bit, and add blank lines, toGuy Harris1-2/+6
match their definitions; add two missing elements that turned up. That should fix bug 6736. svn path=/trunk/; revision=40509
2012-01-14wth->phdr.pkt_encap isn't set on a seek-and-read; pass the encapsulationGuy Harris1-4/+4
directly to k12text_set_pseudo_header(), so that it's passed the right encapsulation for seek-and-read as well as for read. Fixes the "malformed frames when reading some K12 text files" problem for which we're using bug 6735. svn path=/trunk/; revision=40508
2012-01-14Remove obsolete comments referring to mem_chunks.Bill Meier10-26/+18
svn path=/trunk/; revision=40507
2012-01-14Several minor changes:Bill Meier1-210/+211
- use consistent indentation; - use tvb_reported_length_remaining() in one case; - reformat a long line. svn path=/trunk/; revision=40506
2012-01-14Minor updates:Bill Meier1-29/+33
- checkcol() not req'd in a few cases; - Add an XXX comment about the (mis?)use of tvb_length(); - lenght -> length; svn path=/trunk/; revision=40505
2012-01-14Use REPORT_DISSECTOR_BUG() instead of g_print(); Other minor cleanup.Bill Meier1-16/+17
svn path=/trunk/; revision=40504
2012-01-14check_col() not req'd and other minor cleanups ....Bill Meier3-799/+783
svn path=/trunk/; revision=40503
2012-01-14Maybe adding $(GNUTLS_CFLAGS) will fix the build problem.Jörg Mayer1-2/+2
svn path=/trunk/; revision=40502
2012-01-14commit 40500 missed the asn1 directoryJörg Mayer8-0/+2283
svn path=/trunk/; revision=40501
2012-01-14Ed Beroset <beroset@mindspring.com> via bug 5531Jörg Mayer10-2/+2274
The ANSI C12.22 protocol is a smart grid protocol for utility meters, including gas, water and electric. The dissector implemented in the patch file includes full support for all EPSEM (Extended Protocol Specification for Electricity Metering) services and includes a full implementation of the C12.22 security modes. [...] To decrypt the attached sample file, you need to set up the key table in the preferences to include key 0 with a value of 6624C7E23034E4036FE5CB3A8B5DAB44. Me: Fixes for: [ 64%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-c1222.c.o ../../asn1/c1222/packet-c1222-template.c: In function ‘dissect_epsem’: ../../asn1/c1222/packet-c1222-template.c:860:15: error: variable ‘ft’ set but not used [-Werror=unused-but-set-variable] [ 5%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-c1222.c.o ../../asn1/c1222/packet-c1222-template.c:103:19: error: ‘c1222_flags’ defined but not used [-Werror=unused-variable] svn path=/trunk/; revision=40500
2012-01-14Fix unused parameter warningsAnders Broman1-3/+3
svn path=/trunk/; revision=40499
2012-01-14Optionally build cmake, document why we need xzJörg Mayer1-3/+20
svn path=/trunk/; revision=40498
2012-01-14Add another warning (-Warray-bounds) to sync with cmakeJörg Mayer1-0/+1
svn path=/trunk/; revision=40497
2012-01-14This seams to leave fewer graphical artefacts.Anders Broman1-9/+16
svn path=/trunk/; revision=40496
2012-01-14NetMon 1.x format does *not* support per-packet encapsulation.Guy Harris3-4/+17
svn path=/trunk/; revision=40495
2012-01-14In the list of supported file types, put the file type of the file beingGuy Harris1-27/+55
saved at the beginning of the list, if it's supported (it might not be if we don't support writing that file format). If that happens to be pcap, put pcap-NG right after it (if we can write something out as pcap, we can always write it out as pcap-NG); if it happens to be pcap-NG, put pcap right after it if it's supported (if it has per-packet encapsulation, pcap won't be supported). svn path=/trunk/; revision=40494
2012-01-14Get rid of unused WTAP_FILE_WTAP file type.Guy Harris2-23/+18
Move pcap-NG right after standard pcap in the list of file types, so that it shows up early in the list of output file types in the "Save As..." dialog box (if, that is, it's supported; if not, neither is pcap, as they use the same link-layer header type values). svn path=/trunk/; revision=40493
2012-01-14WTAP_ENCAP_UNKNOWN should never appear as an actual encapsulation type,Guy Harris1-2/+0
and can't be supported as an output encapsulation in any case. svn path=/trunk/; revision=40492
2012-01-14Get rid of some unused #defines.Guy Harris1-18/+13
Use surface_height for various heights, and set it. svn path=/trunk/; revision=40491
2012-01-14Remove obsolete GLIB_CHECK_VERSION(2,10,0) checksJörg Mayer2-72/+1
svn path=/trunk/; revision=40490
2012-01-14Add some debugging output to help track down an intermittent problem onGerald Combs1-1/+5
one of the buildbots. svn path=/trunk/; revision=40489
2012-01-14Initial status bar functionality. Promote the main window's status barGerald Combs17-153/+607
to a MainStatusBar. Add a "LabelStack" widget, which MainStatusBar uses to duplicate features in GtkStatusbar. Make the protocol tree a full-blown ProtoTree widget. Move main_cf_callback from main to WiresharkApplication. Duplicate a lot of the cf callbacks as signals and slots. Use Q_UNUSED in a few places. svn path=/trunk/; revision=40488
2012-01-13In all these cases, i is a guint32, so if c_match is <= i, c_match fitsGuy Harris1-4/+4
in a guint32; cast it to one to squelch compiler warnings. svn path=/trunk/; revision=40487
2012-01-13Minor cleanup:Bill Meier1-48/+46
- Move a global var to be local to a fcn; - Remove an unneeded forward declaration; - Do some minor reformatting. svn path=/trunk/; revision=40486
2012-01-13Minor cleanup:Bill Meier1-73/+72
- Remove set but unused variable; - Fix indentation to match that specified by the Editor Modelines svn path=/trunk/; revision=40485
2012-01-13dfs and mapi do create warnings. move them back to dirtyJörg Mayer2-4/+4
svn path=/trunk/; revision=40484
2012-01-13Fix Bug #6276: "Find Packet" Bug:Bill Meier1-14/+39
'The search query e.g. (ASCII or hex) "abac" doesn't find the packet(s) containing the string "ababac".' https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6726 svn path=/trunk/; revision=40483
2012-01-13Introduce a dissector table to be used for proprietary tags.Anders Broman1-4/+22
svn path=/trunk/; revision=40482
2012-01-13Fix a copy paste error.Anders Broman1-2/+2
svn path=/trunk/; revision=40481
2012-01-13Eliminate duplicate entries created by a merging errorJörg Mayer1-2/+0
svn path=/trunk/; revision=40480
2012-01-13Only one instance of packet-dcerpc-mapi.c and packet-dcerpc-mapi.h,Guy Harris2-6/+4
please. Move some generated DCERPC dissectors back to the clean list; if they actually *do* generate warnings, move them back. svn path=/trunk/; revision=40479
2012-01-13Sync filelists between autofoo and cmake.Jörg Mayer5-139/+152
Move some dissectors that throw warnings to DIRTY_ Whitespace cleanups svn path=/trunk/; revision=40478
2012-01-13Add comment about possible expert itemJörg Mayer1-0/+2
svn path=/trunk/; revision=40477
2012-01-13Update ISAKMP to last IANA Parameters (2011-11-07)Alexis La Goutte1-3/+45
Add new ISAKMP Attribut of RFC6407 and new IKE type (GAP ID 22) svn path=/trunk/; revision=40476