obnox/wireshark/wip.git
13 years agoRewrite: strcpy -> g_strlcpy.
stig [Sun, 2 May 2010 20:21:39 +0000 (20:21 +0000)]
Rewrite: strcpy -> g_strlcpy.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32637 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRewrite: gtk_combo_new -> gtk_combo_box_entry_new_text.
stig [Sun, 2 May 2010 19:50:44 +0000 (19:50 +0000)]
Rewrite: gtk_combo_new -> gtk_combo_box_entry_new_text.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32636 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix:
etxrab [Sun, 2 May 2010 17:02:11 +0000 (17:02 +0000)]
Fix:
packet-ip.c:1311: warning: 'field_tree' may be used uninitialized in this function

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32635 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Jakub Zawadzki:
etxrab [Sun, 2 May 2010 15:37:23 +0000 (15:37 +0000)]
From Jakub Zawadzki:
Fix copy&paste error + add support for proto_tree_add_bits API
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4413

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32634 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Jakub Zawadzki:
etxrab [Sun, 2 May 2010 15:36:44 +0000 (15:36 +0000)]
From Jakub Zawadzki:
patch for ip.flags (using proto_tree_add_bits_item).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4413

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32633 f5534014-38df-0310-8fa8-9805f1628bb7

13 years ago[Automatic manuf and enterprise-numbers update for 2010-05-02]
gerald [Sun, 2 May 2010 15:03:30 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-05-02]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32630 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't type prune the data_ptr pointer for UAT.
stig [Sun, 2 May 2010 13:50:52 +0000 (13:50 +0000)]
Don't type prune the data_ptr pointer for UAT.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32629 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't type prune the data_ptr pointer for UAT.
stig [Sun, 2 May 2010 13:50:19 +0000 (13:50 +0000)]
Don't type prune the data_ptr pointer for UAT.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32628 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Hitoshi Irino:
jake [Sun, 2 May 2010 12:50:54 +0000 (12:50 +0000)]
From Hitoshi Irino:
The function "dissect_v9_pdu" of "epan/dissectors/packet-netflow.c" decodes
NetFlow v9 packets and IPFIX packets with same logic. But, the "scope field" is
different between NetFlow v9 and IPFIX. NetFlow v9 has only 5 kind of scopes.
On the other hand, many Information Elements can be used as scope fields in
IPFIX packets.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32627 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix for bug 4723:
jake [Sun, 2 May 2010 12:32:52 +0000 (12:32 +0000)]
Fix for bug 4723:
Don't type prune the data_ptr pointer for UAT.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32626 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdded some more dissecting.
stig [Sun, 2 May 2010 10:03:08 +0000 (10:03 +0000)]
Added some more dissecting.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32625 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDisable ok button when no name entered.
stig [Sun, 2 May 2010 10:01:54 +0000 (10:01 +0000)]
Disable ok button when no name entered.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32624 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdded tooltips for UAT column headers.
stig [Sun, 2 May 2010 09:59:02 +0000 (09:59 +0000)]
Added tooltips for UAT column headers.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32623 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDissect 3GPP AVP 5 3GPP-GPRS Negotiated QoS profile.
etxrab [Sat, 1 May 2010 14:58:03 +0000 (14:58 +0000)]
Dissect 3GPP AVP 5 3GPP-GPRS Negotiated QoS profile.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32622 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoReplace GtkClist in uat_gui.c with GtkTreeView+GtkListStore. Pop up the
gerald [Fri, 30 Apr 2010 22:33:51 +0000 (22:33 +0000)]
Replace GtkClist in uat_gui.c with GtkTreeView+GtkListStore. Pop up the
edit window when an item is double-clicked. Add a couple of convenience
routines to gui_utils.c.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32621 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRevert rev 32519 for now: it is making the dissector bug a little too obvious. It...
morriss [Fri, 30 Apr 2010 22:00:05 +0000 (22:00 +0000)]
Revert rev 32519 for now: it is making the dissector bug a little too obvious.  It may make sense to put the check back in once the bug (tracked via 4698) is fixed.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32620 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoPick up other check from the almost-identical routine in
guy [Fri, 30 Apr 2010 21:55:42 +0000 (21:55 +0000)]
Pick up other check from the almost-identical routine in
epan/dfilter/scanner.l.

(The common code should be in a utility routine.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32619 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix comment.
guy [Fri, 30 Apr 2010 21:51:47 +0000 (21:51 +0000)]
Fix comment.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32618 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix up indentation a bit
morriss [Fri, 30 Apr 2010 21:40:57 +0000 (21:40 +0000)]
Fix up indentation a bit

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32617 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1696 :
morriss [Fri, 30 Apr 2010 21:40:39 +0000 (21:40 +0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1696 :

The change put in with rev 11382 meant that, on 64-bit systems, we could not
parse negative numbers into integers (since -1 taken as an unsigned 64-bit
number is (significantly) larger than G_MAX_UINT32).

To fix this, split the val_from_unparsed() routine for integers into two
routines: one for signed and one for unsigned; each routine can then do the
appropriate "is this bigger than what fits in a *32?" test.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32616 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd a catch-all if statement for column formats that are filled in by
gerald [Fri, 30 Apr 2010 20:49:41 +0000 (20:49 +0000)]
Add a catch-all if statement for column formats that are filled in by
dissectors. Fixes bug 4732.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32615 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Chris Maynard: Fix Bug #1292: "Win32: confusing setup target warning if cl.exe...
wmeier [Fri, 30 Apr 2010 20:15:27 +0000 (20:15 +0000)]
From Chris Maynard: Fix Bug #1292: "Win32: confusing setup target warning if cl.exe is not in path"
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1292

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32614 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix a gcc -Wshadow warning.
wmeier [Fri, 30 Apr 2010 18:19:47 +0000 (18:19 +0000)]
Fix a gcc -Wshadow warning.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32613 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix a gcc -Wshadow warning.
wmeier [Fri, 30 Apr 2010 17:47:23 +0000 (17:47 +0000)]
Fix a gcc -Wshadow warning.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32612 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoTrivial: Update AUTHORS entry, remove out-of-date comments, minor formatting
martinm [Fri, 30 Apr 2010 17:15:59 +0000 (17:15 +0000)]
Trivial: Update AUTHORS entry, remove out-of-date comments, minor formatting

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32611 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoClean up some calls to use the same offset as the call to put the parent
guy [Fri, 30 Apr 2010 08:26:12 +0000 (08:26 +0000)]
Clean up some calls to use the same offset as the call to put the parent
into the protocol tree.

Put the cases for various Radiotap data items into numerical order by
the bit number.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32610 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoSeveral dissectors fill in custom custom data in the source and
gerald [Thu, 29 Apr 2010 23:53:57 +0000 (23:53 +0000)]
Several dissectors fill in custom custom data in the source and
destination address columns. Don't clobber it in the new packet list.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32609 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoTerminate a string so that strchr doesn't wander off. Hopefully fixes bugs
gerald [Thu, 29 Apr 2010 22:36:40 +0000 (22:36 +0000)]
Terminate a string so that strchr doesn't wander off. Hopefully fixes bugs
4725 and 4728.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32608 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove an unused variable.
gerald [Thu, 29 Apr 2010 22:35:00 +0000 (22:35 +0000)]
Remove an unused variable.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32607 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Mike Morrin:
etxrab [Thu, 29 Apr 2010 20:45:53 +0000 (20:45 +0000)]
From Mike Morrin:
Dissection of BSSMAP IEs: Old BSS to New BSS Info and New BSS to Old BSS Info
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4712

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32606 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoForgot a //
etxrab [Thu, 29 Apr 2010 20:41:35 +0000 (20:41 +0000)]
Forgot a //

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32605 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoSimplify dissect_sip_authorization_item().
etxrab [Thu, 29 Apr 2010 20:02:14 +0000 (20:02 +0000)]
Simplify dissect_sip_authorization_item().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32604 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4308 :
morriss [Thu, 29 Apr 2010 19:30:54 +0000 (19:30 +0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4308 :

Make a function that checks if the user is running as root or if npf.sys isn't
loaded (on Windows) and call it *after* showing the main window so that the
popup (if any) shows up above the main window.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32603 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDo the header matching on lower case.
etxrab [Thu, 29 Apr 2010 19:11:48 +0000 (19:11 +0000)]
Do the header matching on lower case.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32602 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoMake the indentation consistent.
morriss [Thu, 29 Apr 2010 18:17:29 +0000 (18:17 +0000)]
Make the indentation consistent.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32601 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoautentification info gives malformed packet if no space before "="
etxrab [Thu, 29 Apr 2010 16:08:14 +0000 (16:08 +0000)]
autentification info gives malformed packet if no space before "="

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32600 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoMake a variable a guint8* instead of a char* since it a) holds TVB data and b) matche...
morriss [Thu, 29 Apr 2010 15:23:10 +0000 (15:23 +0000)]
Make a variable a guint8* instead of a char* since it a) holds TVB data and b) matches what tvb_new_child_real_data() wants for its 2nd argument.  This cleans up a warning from the Sun compiler.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32599 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoMake a variable a guint8* instead of a char* since it a) holds TVB data and b) matche...
morriss [Thu, 29 Apr 2010 14:58:22 +0000 (14:58 +0000)]
Make a variable a guint8* instead of a char* since it a) holds TVB data and b) matches what tvb_new_child_real_data() wants for its 2nd argument.  This cleans up a warning from the Sun compiler.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32598 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUse strchr() instead of index()--Windows doesn't appear to have the latter.
morriss [Thu, 29 Apr 2010 14:38:26 +0000 (14:38 +0000)]
Use strchr() instead of index()--Windows doesn't appear to have the latter.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32597 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoFrom Michael Speck via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4726 :
morriss [Thu, 29 Apr 2010 13:12:54 +0000 (13:12 +0000)]
From Michael Speck via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4726 :

If "Help -> About Wireshark" is selected from Wireshark's main menu an error
message pops up:

Could not open file "<DevelopmentPath>\Wireshark_Source\wireshark-gtk2\COPYING":
No such file or directory

The attached patch handles this situation by looking for COPYING.txt instead of
COPYING on windows systems.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32596 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoIt is becomming more common that iscsi vendors use iscsi-redirectors and redirect
sahlberg [Thu, 29 Apr 2010 08:41:23 +0000 (08:41 +0000)]
It is becomming more common that iscsi vendors use iscsi-redirectors and redirect
initiators to a different host/port and thus often redirect to non-3260.

The heuristics to detect iscsi is quite weak since there is very little
in the average iscsi header that can be used to semi-reliably identify
something as iscsi and not random data/something else.
As such, the heuristics also use/rely on the port being 3260 in order
to reduce the otherwise massive numbver of false positives that would arise.

Add decoding of the text key/value pairs and trigger on TargetAddress.
This field would describe a address/port where we can quite reliably
assume that this traffic is indeed iscsi and not something else.

When seeing the iscsi redirect/TargetAddress, use this as a signalling hint
and register a conversation dissector for TCP to that address/port so that
any future packet to/from this port is sent to the iscsi dissector.

If the signalling/redirect is not in the capture, wireshark will not detect
the traffic as iscsi and the user will have to use DecodeAs.  and manually
\set it to iscsi.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32595 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoAdd snaplen to capinfos output. Idea from Chris Maynard on -dev.
sfisher [Thu, 29 Apr 2010 06:29:51 +0000 (06:29 +0000)]
Add snaplen to capinfos output.  Idea from Chris Maynard on -dev.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32594 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoDelay starting the resolv_update_cb until the main window has been displayed
morriss [Thu, 29 Apr 2010 00:09:01 +0000 (00:09 +0000)]
Delay starting the resolv_update_cb until the main window has been displayed
This avoids this error:

(lt-wireshark:16779): Gdk-CRITICAL **: gdk_window_invalidate_rect: assertion `window != NULL' failed

before the main window has been drawn if you've got a personal hosts file.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32593 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoUse proto_add_item() and clean up the code a bit.
etxrab [Wed, 28 Apr 2010 21:20:57 +0000 (21:20 +0000)]
Use proto_add_item() and clean up the code a bit.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32592 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoAltho no tabs, use tab-width=8 anyway.
wmeier [Wed, 28 Apr 2010 16:38:21 +0000 (16:38 +0000)]
Altho no tabs, use tab-width=8 anyway.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32591 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoUse consistent indentation;
wmeier [Wed, 28 Apr 2010 16:37:25 +0000 (16:37 +0000)]
Use consistent indentation;
Altho no tabs use tab-width=8 anyway.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32590 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoReplace GtkCList by GtkTreeView.
jake [Wed, 28 Apr 2010 16:29:01 +0000 (16:29 +0000)]
Replace GtkCList by GtkTreeView.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32589 f5534014-38df-0310-8fa8-9805f1628bb7

14 years ago Let's not use tabs with tab-width=4; Convert tabs to spaces (with indent=4).
wmeier [Wed, 28 Apr 2010 16:23:53 +0000 (16:23 +0000)]
 Let's not use tabs with tab-width=4; Convert tabs to spaces (with indent=4).
 Also: use consistent indentation & remove any trailing blanks.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32588 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoRemove trailing blanks; Also: Altho tabs expanded, use tab-width=8 anyway.
wmeier [Wed, 28 Apr 2010 16:09:25 +0000 (16:09 +0000)]
Remove trailing blanks; Also: Altho tabs expanded, use tab-width=8 anyway.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32587 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoLet's not use tabs with tab-width=4; Converts tabs to spaces (with indent=4).
wmeier [Wed, 28 Apr 2010 16:03:47 +0000 (16:03 +0000)]
Let's not use tabs with tab-width=4; Converts tabs to spaces (with indent=4).
Also: use consistent indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32586 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoFrom jmmikkel:
jake [Wed, 28 Apr 2010 08:19:39 +0000 (08:19 +0000)]
From jmmikkel:
Set the sequence number for the next PDU if the current frame contains both the finish of the previous and the complete next one.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32585 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoFrom Jakub Zawadzki:
etxrab [Wed, 28 Apr 2010 08:15:20 +0000 (08:15 +0000)]
From Jakub Zawadzki:
 - use Glibc:s  highly optimized memchr()

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32584 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoFrom Jakub Zawadzki:
etxrab [Wed, 28 Apr 2010 07:58:59 +0000 (07:58 +0000)]
From Jakub Zawadzki:
 - optimize guint8_pbrk().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32583 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoFrom Michael Lum:
etxrab [Wed, 28 Apr 2010 04:54:25 +0000 (04:54 +0000)]
From Michael Lum:
EVRC packet bundling not handled correctly.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4718

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32582 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoFix a gcc -Wshadow warning; Fix a comment;
wmeier [Tue, 27 Apr 2010 22:46:39 +0000 (22:46 +0000)]
Fix a gcc -Wshadow warning; Fix a comment;
Use consistent indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32581 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoFix a typo in a comment
morriss [Tue, 27 Apr 2010 18:08:03 +0000 (18:08 +0000)]
Fix a typo in a comment

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32580 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoAdd some more strings.
jake [Tue, 27 Apr 2010 16:29:37 +0000 (16:29 +0000)]
Add some more strings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32579 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoCorrect two comments.
jake [Tue, 27 Apr 2010 16:18:06 +0000 (16:18 +0000)]
Correct two comments.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32578 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoAdd some information about how/why this dissector is (partially) machine-generated...
morriss [Tue, 27 Apr 2010 13:50:43 +0000 (13:50 +0000)]
Add some information about how/why this dissector is (partially) machine-generated and what that means to Wireshark maintainers.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32577 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoFrom Jakub Zawadzki:
etxrab [Tue, 27 Apr 2010 12:38:49 +0000 (12:38 +0000)]
From Jakub Zawadzki:
 - use function pointers instead of switch.
 - initalize ->match_type during first use of match_str() func.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32576 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoWhitespace changes.
etxrab [Tue, 27 Apr 2010 10:35:12 +0000 (10:35 +0000)]
Whitespace changes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32575 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoFrom Jakub Zawadzki:
etxrab [Tue, 27 Apr 2010 10:32:34 +0000 (10:32 +0000)]
From Jakub Zawadzki:
Itroduce value_string_ext for faster value matching in value_strings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32574 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoExport add_ip_name_from_string from epan.
stig [Tue, 27 Apr 2010 07:41:34 +0000 (07:41 +0000)]
Export add_ip_name_from_string from epan.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32573 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoSquelch some compiler complaints.
guy [Tue, 27 Apr 2010 07:41:28 +0000 (07:41 +0000)]
Squelch some compiler complaints.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32572 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoAdded Manual IP address resolve functions.
stig [Tue, 27 Apr 2010 06:51:16 +0000 (06:51 +0000)]
Added Manual IP address resolve functions.

This can later be extended with ethernet and probably other addresses.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32571 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoFrom David Bond: TRILL (TRansparent Interconnection of Lots of Links) dissector
wmeier [Tue, 27 Apr 2010 00:06:35 +0000 (00:06 +0000)]
From David Bond: TRILL (TRansparent Interconnection of Lots of Links) dissector

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32570 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoMove proto_reg_handoff... to the end of the file.
wmeier [Mon, 26 Apr 2010 22:19:34 +0000 (22:19 +0000)]
Move proto_reg_handoff... to the end of the file.
Whitespace cleanup: remove trailing spaces from a few lines.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32569 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoMove proto_reg_handoff... to the end of the file.
wmeier [Mon, 26 Apr 2010 22:12:48 +0000 (22:12 +0000)]
Move proto_reg_handoff... to the end of the file.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32568 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoVarious:
wmeier [Mon, 26 Apr 2010 21:50:09 +0000 (21:50 +0000)]
Various:
 - Fix bugs which caused incorrect packet-bytes highlighting for certain fields;
 - Display all "extended services" fields;
 - Minor code cleanup in several places;
 - Whitespace: Tabs ==> spaces.
(More changes yet to come to handle multiple PDUs in a single packet).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32567 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoReindent a bunch
morriss [Mon, 26 Apr 2010 20:48:13 +0000 (20:48 +0000)]
Reindent a bunch

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32566 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoRemove some boilerplate text; Shorten a few long lines.
wmeier [Mon, 26 Apr 2010 15:30:00 +0000 (15:30 +0000)]
Remove some boilerplate text; Shorten a few long lines.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32565 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoDocument ESS Category Attributes UAT.
stig [Mon, 26 Apr 2010 12:19:04 +0000 (12:19 +0000)]
Document ESS Category Attributes UAT.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32564 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoClean up properly if we get an error after allocating the private data
guy [Mon, 26 Apr 2010 02:26:22 +0000 (02:26 +0000)]
Clean up properly if we get an error after allocating the private data
structure.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32563 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoThe comment here suggests fields should have abbreviations but previously we only...
morriss [Mon, 26 Apr 2010 00:31:06 +0000 (00:31 +0000)]
The comment here suggests fields should have abbreviations but previously we only checked if a string (even an empty string) was given.  Try putting out a warning if a field has an empty string for an abbreviation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32562 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoMake the OpcUa plugin's fields filterable (by giving them abbreviations).
morriss [Mon, 26 Apr 2010 00:15:30 +0000 (00:15 +0000)]
Make the OpcUa plugin's fields filterable (by giving them abbreviations).
(Thank you, sed, for doing the 90% of the work for me.)

Note that two of these files says "do not modify" implying that they are
machine generated but AFAIK we don't have the means to rebuild them.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32561 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoAdd dissection of Class Based Flow Control Pause frames.
wmeier [Sun, 25 Apr 2010 21:46:18 +0000 (21:46 +0000)]
Add dissection of Class Based Flow Control Pause frames.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32560 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoEmpty strings are not very useful abbreviations. Even if it seems unlikely someone...
morriss [Sun, 25 Apr 2010 17:38:46 +0000 (17:38 +0000)]
Empty strings are not very useful abbreviations.  Even if it seems unlikely someone would want to filter on a specific field, we should give the user the option.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32559 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoSlightly reword the preference text about CCSDS packets.
wmeier [Sun, 25 Apr 2010 17:34:32 +0000 (17:34 +0000)]
Slightly reword the preference text about CCSDS packets.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32558 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoReapply SVN #27273 which was lost when SSVN #27768 was aspplied.
wmeier [Sun, 25 Apr 2010 16:37:08 +0000 (16:37 +0000)]
Reapply SVN #27273 which was lost when SSVN #27768 was aspplied.
"http://stationpayloads.jsc.nasa.gov/J-reference/documents/ssp57002B.pdf
is a dead link; supply another link, to a document that describes *some*
of this."

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32557 f5534014-38df-0310-8fa8-9805f1628bb7

14 years ago[Automatic manuf and enterprise-numbers update for 2010-04-25]
gerald [Sun, 25 Apr 2010 15:03:30 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-04-25]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32554 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoChange copyright date in sample dissector code to 201x from 200x for the
sfisher [Sun, 25 Apr 2010 08:23:12 +0000 (08:23 +0000)]
Change copyright date in sample dissector code to 201x from 200x for the
new decade.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32553 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoMake the absolute_time_display_e enum start at 1000 to avoid overlapping with
morriss [Sat, 24 Apr 2010 19:07:21 +0000 (19:07 +0000)]
Make the absolute_time_display_e enum start at 1000 to avoid overlapping with
the base_display_e enum.

Fix a couple of dissectors that were still using FT_ABSOLUTE_TIME with
BASE_NONE.  (The time format chosen is based only on an attempt to not change
the behavior.  I don't know that it's right.)  One of these is built by Pidl.
I'll send a patch upstream too.

When checking hfinfos, display the absolute_time_display_e values too.
Display "bit count: X" instead of "unknown" when the display value doesn't
match one of the enumerated values.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32552 f5534014-38df-0310-8fa8-9805f1628bb7

14 years ago64-bit integers take the same FIELDDISPLAY as shorter integers
morriss [Sat, 24 Apr 2010 14:53:30 +0000 (14:53 +0000)]
64-bit integers take the same FIELDDISPLAY as shorter integers

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32551 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoDissectors aren't allowed to call g_assert()
morriss [Sat, 24 Apr 2010 14:13:37 +0000 (14:13 +0000)]
Dissectors aren't allowed to call g_assert()

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32550 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoWhen checking the header_field_infos, use g_error() to give the developer a
morriss [Sat, 24 Apr 2010 03:08:08 +0000 (03:08 +0000)]
When checking the header_field_infos, use g_error() to give the developer a
(hopefully useful) explanation of what's wrong with his/her hfinfo field
rather than just asserting out.

So now instead of just getting a message saying aborted(core dumped), you can
get, for example:

22:31:54          Err  Field 'Message in frame' (sccp.assoc.msg) is an FT_FRAMENUM and is BASE_DEC instead of BASE_NONE

*and* an abort(core dumped) (for those who want it).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32549 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoTell, in the version info, if we were compiled 32- or 64-bit.
morriss [Sat, 24 Apr 2010 02:04:14 +0000 (02:04 +0000)]
Tell, in the version info, if we were compiled 32- or 64-bit.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32548 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoFrom Alexis La Goutte:
jake [Fri, 23 Apr 2010 21:58:05 +0000 (21:58 +0000)]
From Alexis La Goutte:
Enhancements ISAKMP Vendor ID.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32547 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoInterpret international point codes according to Q.708; white space edits
dimeg [Fri, 23 Apr 2010 21:24:32 +0000 (21:24 +0000)]
Interpret international point codes according to Q.708; white space edits

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32546 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoFrom Vincenzo Condoleo via bug 3724:
gerald [Fri, 23 Apr 2010 21:21:11 +0000 (21:21 +0000)]
From Vincenzo Condoleo via bug 3724:

Update the compare stats documentation.

From me: Add a screen shot and editorial updates. Change some lables to
better match the IP and TCP dissectors.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32545 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoRevert r31529. Timing out while waiting for the pcap file header causes
gerald [Fri, 23 Apr 2010 17:22:51 +0000 (17:22 +0000)]
Revert r31529. Timing out while waiting for the pcap file header causes
more problems than it solves.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32544 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoAdded a decoding table for ESS Security Category Attributes.
stig [Fri, 23 Apr 2010 12:43:14 +0000 (12:43 +0000)]
Added a decoding table for ESS Security Category Attributes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32543 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoAdded initial support for Dropbox LAN sync Protocol.
stig [Fri, 23 Apr 2010 06:13:34 +0000 (06:13 +0000)]
Added initial support for Dropbox LAN sync Protocol.

This is mostly to recognize the packets and a start to reverse engineer
the currently undocumented protocol.  It's very far from complete/correct!

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32542 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoFrom Artem Tamazof via bug 3653:
gerald [Thu, 22 Apr 2010 22:18:56 +0000 (22:18 +0000)]
From Artem Tamazof via bug 3653:

MDS dissector works improperly in some corner cases.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32541 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoManifests are not needed when building with VC10.
wmeier [Thu, 22 Apr 2010 19:35:47 +0000 (19:35 +0000)]
Manifests are not needed when building with VC10.
So: don't run mt program ("manifest-tool") when building Wireshark & etc with VC10.
See: http://msdn.microsoft.com/en-us/library/dd293574.aspx

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32540 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoSet TA control element expert info based on improved understanding of spec.
martinm [Thu, 22 Apr 2010 17:46:12 +0000 (17:46 +0000)]
Set TA control element expert info based on improved understanding of spec.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32539 f5534014-38df-0310-8fa8-9805f1628bb7

14 years ago- Lower severity on expert items about Timing Advance if <= 31
martinm [Thu, 22 Apr 2010 13:54:30 +0000 (13:54 +0000)]
- Lower severity on expert items about Timing Advance if <= 31
- Detect original frame for DL HARQ retx also 9 SFs ago (have even seen 10...)
- Getting ready to log 'grant subframe' for UL frames (only interesting for TDD)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32538 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoA bit more information.
guy [Thu, 22 Apr 2010 04:50:55 +0000 (04:50 +0000)]
A bit more information.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32537 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoMore updates to reflect all the hairy details of Linux USB capture.
guy [Thu, 22 Apr 2010 04:38:48 +0000 (04:38 +0000)]
More updates to reflect all the hairy details of Linux USB capture.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32536 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoUpdate a comment to reflect recent changes and to reflect behavior of
guy [Thu, 22 Apr 2010 00:10:17 +0000 (00:10 +0000)]
Update a comment to reflect recent changes and to reflect behavior of
later Linux kernels.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32535 f5534014-38df-0310-8fa8-9805f1628bb7

14 years agoFrom Chris Maynard:
guy [Wed, 21 Apr 2010 20:51:22 +0000 (20:51 +0000)]
From Chris Maynard:

Support PPP-over-USB.

Don't remove the USB pseudo-header from the packet data for
Linux USB packets, just byte-swap it if necessary and have the
USB dissector fetch the pseudo-header from the raw packet data.

Update USB language ID values.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32534 f5534014-38df-0310-8fa8-9805f1628bb7