Commit Graph

42540 Commits

Author SHA1 Message Date
Jeff Morriss 06499e6dd0 Put back the part of the regexp's that avoids finding function prototypes.
svn path=/trunk/; revision=44955
2012-09-17 21:56:52 +00:00
Jeff Morriss 211f791c6c Rather than reading the dissectors line by line and searching for the
registration and handoff routines in each line, read the whole file into
memory and then do one findall() search. Store the matches in sets to avoid
duplication.

(This also simplifies the number of regexps we're looking for.)

This speeds up the generation of register.c (when there is no cache)
significantly (on my system the time taken drops from ~32 seconds to ~5
seconds).

svn path=/trunk/; revision=44954
2012-09-17 21:30:24 +00:00
Jeff Morriss eb08c40b09 There is no proto_reg_handoff_data() so don't prototype it. Remove unnecessary include (glib.h).
svn path=/trunk/; revision=44953
2012-09-17 21:26:19 +00:00
Jeff Morriss 73c0fa86f9 Unique-ify the list of dissector registration and handoff functions while we
sort them.  Avoids the double registration problem discussed on -dev today.

Note: the sorted() call requires Python 2.4+ but I think that's OK now.

svn path=/trunk/; revision=44952
2012-09-17 20:37:39 +00:00
Bill Meier cc4e2d3566 #include <epan/prefs.h> not req'd.
svn path=/trunk/; revision=44951
2012-09-17 18:05:21 +00:00
Bill Meier 8a82b7a361 Cleanup:
- fix two cases of potential infinite loop while dissecting;
   [for (guint8 i; i <= guint8 end; i++)]
 - col_...() fcns should not be called under 'if (tree)'
 - remove unneeded initializers;
 - move proto_reg_handoff...() to the end of the file as per convention;
 - remove some boilerplate comments;
 - use consistent indentation and whitespace style;
 - remove some trailing whitespace.

svn path=/trunk/; revision=44950
2012-09-17 17:47:43 +00:00
Bill Meier b29ae79cf6 Cleanup:
- fix several instances of a potential infinte loop while dissecting TLVs;
  (it would be nice to have a valid capture file so this dissector can be fuzz-tested)
- move proto_reg_handoff...() to the end of the file as per convention;
- do find_dissector() only once in proto_reg_handoff...();
- reformat some long lines;
- replace some tabs by spaces and do other whitespace changes.

svn path=/trunk/; revision=44949
2012-09-17 16:05:43 +00:00
Pascal Quantin d530983a67 Update dissection of Request type IE
svn path=/trunk/; revision=44948
2012-09-17 16:04:36 +00:00
Anders Broman d3334cb21d Handle SDP_CRYPTO optional parameters better.
svn path=/trunk/; revision=44946
2012-09-17 15:37:28 +00:00
Alexis La Goutte 31c1f7d11d From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Enhance DNS : make DNSKEY type filterable

svn path=/trunk/; revision=44945
2012-09-17 15:19:18 +00:00
Alexis La Goutte e057832c84 From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Enhance DNS : make RRSIG type filterable

svn path=/trunk/; revision=44944
2012-09-17 15:18:54 +00:00
Alexis La Goutte 0002fd11b5 From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Enhance DNS : make TXT, SPF type filterable

svn path=/trunk/; revision=44943
2012-09-17 15:18:32 +00:00
Alexis La Goutte 9e5e7b75df From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Enhance DNS : make MX filtereable

svn path=/trunk/; revision=44942
2012-09-17 15:17:48 +00:00
Alexis La Goutte c5826e292a From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Enhance DNS : make HINFO filtereable

svn path=/trunk/; revision=44941
2012-09-17 15:16:34 +00:00
Anders Broman d41c249f91 callsinfo->stop_fd not set in all branches for UNISTIM.
svn path=/trunk/; revision=44940
2012-09-17 14:51:08 +00:00
Anders Broman 8e74cd8d16 Fix errors in the packet length checks.
svn path=/trunk/; revision=44939
2012-09-17 12:13:34 +00:00
Anders Broman 9db969ded1 Add IPv6 heuristic.
svn path=/trunk/; revision=44938
2012-09-17 10:46:56 +00:00
Evan Huus b87393b7df Add eol-style and keywords to SVN properties.
svn path=/trunk/; revision=44936
2012-09-17 02:22:23 +00:00
Evan Huus 2aaa543505 Make it compile with GCC.
svn path=/trunk/; revision=44935
2012-09-17 02:05:49 +00:00
Michael Mann 5db8e408f0 Add IETF ForCES(Forwarding and Control Element Separation) dissector (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3534)
svn path=/trunk/; revision=44934
2012-09-17 01:38:52 +00:00
Bill Meier 724df1c0d3 Minor cleanup:
- remove unneeded gtk_table_resize() [in prep for using gtk_grid for GTK3];
- use g_hash_table)_full() to specify function to free 'value'
- Fix some whitespace.

svn path=/trunk/; revision=44933
2012-09-17 00:42:22 +00:00
Bill Meier 3f04e5b7d0 Minor cleanup:
- simplify code related to use of GHashTables;
- use consistent whitespace and formatting style.

svn path=/trunk/; revision=44932
2012-09-17 00:03:19 +00:00
Bill Meier fa2c82bb7b Cleanup:
- remove unneeded gtk_table_resize() [in prep for using GtkGrid for GTK3];
- simplify code relating to use of a GHashTable;
- add comment about use of !! magic !! numeric constants;
- do some additional whitespace cleanup.

svn path=/trunk/; revision=44931
2012-09-16 23:02:07 +00:00
Bill Meier 707e1767fd Trivial cleanup:
- Remove unneeded #includes;
- Use consistent whitespace and formatting style.

svn path=/trunk/; revision=44930
2012-09-16 19:06:42 +00:00
Bill Meier f58dafe947 (trivial) fix a typo
svn path=/trunk/; revision=44929
2012-09-16 18:00:56 +00:00
Evan Huus b6423a84c8 Add packet-interlink to CMake build to maintain parity with automake as of
revision 44927.

svn path=/trunk/; revision=44928
2012-09-16 17:57:15 +00:00
Bill Meier d7b7757a1c Complete process of moving packet-interlink to a built-in dissector:
- Add packet-interlink.c to Makefile.common
   (Not included in SVN #37610-37612);
   See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6005
- Also: update signature for dissect_interlink_heur() (as per recent changes).

svn path=/trunk/; revision=44927
2012-09-16 17:26:49 +00:00
Gerald Combs 704eb29ad4 [Automatic manuf, services and enterprise-numbers update for 2012-09-16]
svn path=/trunk/; revision=44924
2012-09-16 14:03:36 +00:00
Anders Broman 055736b655 Compile and install schemas if GTK3 is used, nsis needs update too
svn path=/trunk/; revision=44923
2012-09-16 09:55:44 +00:00
Guy Harris 8e10fa73d5 Work around Solaris 11's pkg-config being in /usr/ccs/bin but its
aclocal directory apparently being in /usr/share/aclocal rather than the
non-existent /usr/ccs/share/aclocal.  (/usr/ccs is sort of an extension
of /usr for developers; I'm not sure why they stuck the pkg-config stuff
under /usr/share rather than /usr/ccs/share given that it's of interest
only to developers.)

svn path=/trunk/; revision=44922
2012-09-16 01:49:59 +00:00
Evan Huus 826bba705b From Pontus Fuchs via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7728
Make right-click + apply-as-filter work in the packet list for non-ethernet
frames (such as ieee 802.11 frames).

svn path=/trunk/; revision=44921
2012-09-15 20:16:14 +00:00
Evan Huus 37f0380998 Add support for bzr checkouts (similar to git checkouts) to make-version.pl.
Also, add modelines.

svn path=/trunk/; revision=44920
2012-09-15 16:09:07 +00:00
Bill Meier 201c4c45bf Trivial whitespace formatting cleanup;
svn path=/trunk/; revision=44919
2012-09-15 14:46:13 +00:00
Bill Meier 4889fb0443 Minor cleanup:
- Remove unneeded #includes;
- Remove unused function [which uses deprecated gtk_table...()];
- Use consistent whitespace formatting style.

svn path=/trunk/; revision=44918
2012-09-15 14:20:20 +00:00
Bill Meier b69bbdf6ac Trivial cleanup;
Remove a few unneeded initializers;
  Fix a few typos in comments;
  Use consistent formatting style.

svn path=/trunk/; revision=44917
2012-09-15 14:08:48 +00:00
Evan Huus dd01cc0490 From Niels Widger via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7725
Add get_filter method to Wireshark's Lua interface (to correspond with the
already-exposed set_filter method).

svn path=/trunk/; revision=44916
2012-09-15 13:58:57 +00:00
Evan Huus 5a7af5d6d9 Avoid a stack-smash when decoding the new DNS option field if the length is
malformed.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7730

svn path=/trunk/; revision=44915
2012-09-15 13:49:27 +00:00
Anders Broman 5164694d0f Don't redefine WIRESHARK_UI_SRC
svn path=/trunk/; revision=44914
2012-09-15 10:01:21 +00:00
Guy Harris bd16652c90 text_import_scanner_lex.h and text_import_scanner.c are now part of
libui, not libgtkui.

svn path=/trunk/; revision=44913
2012-09-15 08:43:27 +00:00
Guy Harris e5cd850d56 *Do* use DIRTY_GENERATED_C_FILES, as it's defined; sadly, flex doesn't
generate warning-free files.

svn path=/trunk/; revision=44911
2012-09-15 08:19:39 +00:00
Guy Harris 366489a085 DIRTY_GENERATED_C_FILES is empty, and isn't used by ui/gtk/Makefile.am,
so get rid of it, and stop using it in ui/gtk/Makefile.make; we don't
want to encourage people to create source files that get warnings.

svn path=/trunk/; revision=44910
2012-09-15 08:18:57 +00:00
Guy Harris 5a551d6b63 Nobody uses DIRTY_GENERATED_C_FILES, so get rid of it; we don't want to
encourage people to create source files that get warnings.

svn path=/trunk/; revision=44909
2012-09-15 08:17:53 +00:00
Evan Huus 01f1afd5d3 Update CMakeLists to respect the recent libui changes so that wireshark and
qtshark build again.

(Also, first commit trying to use bzr as an svn client, so apologies if
 something unexpected breaks)

svn path=/trunk/; revision=44908
2012-09-15 02:52:29 +00:00
Gerald Combs f6c7b3e533 libgtkui_dirty → libui_dirty.
svn path=/trunk/; revision=44907
2012-09-14 21:06:26 +00:00
Gerald Combs fe6816d7fd More fixes for the text import move.
svn path=/trunk/; revision=44906
2012-09-14 20:55:11 +00:00
Gerald Combs 9bcb9561fc Deletions from the last commit didn't make it for some reason.
svn path=/trunk/; revision=44905
2012-09-14 20:47:55 +00:00
Gerald Combs 762e5ac93f Create a common libui using CMake similar to what we do with Autotools.
Move the GTK+ text import code to the common UI directory. Create
wtap_encap_requires_phdr() from code in file_import_dlg.c.

svn path=/trunk/; revision=44904
2012-09-14 20:23:18 +00:00
Jeff Morriss 670dff46e4 Fix up the (#if'd out) sequence number analysis debug code so that it compiles and is easier to read. Also fix up some white space.
svn path=/trunk/; revision=44903
2012-09-14 18:20:59 +00:00
Bill Meier dd7a2708be Use consistent indentation and formatting style;
Fix a few typos; Fix long line.

svn path=/trunk/; revision=44902
2012-09-14 15:19:15 +00:00
Anders Broman ebda6f06b7 Try to make the buildbot happy.
svn path=/trunk/; revision=44901
2012-09-14 14:40:47 +00:00