obnox/wireshark/wip.git
13 years agoFrom Roland Knall:
etxrab [Wed, 16 Mar 2011 06:21:56 +0000 (06:21 +0000)]
From Roland Knall:
Patch, which removes both EPL and EPLv1 .h files, as well as adding a heuristic dissector hook to EPL (v1 is nearly nowhere in use anymore, therefore not needed)

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

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

13 years agoTry to fix checkApi script.
martinm [Tue, 15 Mar 2011 22:55:53 +0000 (22:55 +0000)]
Try to fix checkApi script.

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

13 years agoFix calling of LTE dissectors for R9 DCT protocols.
martinm [Tue, 15 Mar 2011 17:30:00 +0000 (17:30 +0000)]
Fix calling of LTE dissectors for R9 DCT protocols.

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

13 years agoAdd dissection of
etxrab [Tue, 15 Mar 2011 06:03:58 +0000 (06:03 +0000)]
Add dissection of
- MBMS-SESSION-STOP-REQUEST
- MBMS-SESSION-STOP-RESPONSE
- MBMS-SESSION-UPDATE-REQUEST
- MBMS-SESSION-UPDATE-RESPONSE
- PS-HANDOVER-COMPLETE
- PS-HANDOVER-CANCEL
- PS-HANDOVER-COMPLETE-ACK

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

13 years agoAdd expert info to UDP dissector for showing possible (Unix-style)
sfisher [Mon, 14 Mar 2011 22:01:49 +0000 (22:01 +0000)]
Add expert info to UDP dissector for showing possible (Unix-style)
traceroute packets: if the port number range is 33434 to 33434 + 30.

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

13 years agoDon't verify the checksum of an ICMP packet when it the payload of an
sfisher [Mon, 14 Mar 2011 19:58:02 +0000 (19:58 +0000)]
Don't verify the checksum of an ICMP packet when it the payload of an
error packet (pinfo->in_error_pkt), such as an ICMP destination
unreachable, because we probably don't have the whole original packet.

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

13 years agoProperly initialize our filter counters.
gerald [Mon, 14 Mar 2011 16:00:51 +0000 (16:00 +0000)]
Properly initialize our filter counters.

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

13 years agoExport
etxrab [Mon, 14 Mar 2011 14:05:51 +0000 (14:05 +0000)]
Export
tvb_new_composite
tvb_composite_finalize
tvb_composite_append

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

13 years agoFix for bug 3933:
jake [Mon, 14 Mar 2011 07:49:05 +0000 (07:49 +0000)]
Fix for bug 3933:
Decode TCP port 2443 as Secure Skinny (SCCPS).

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

13 years agoAdd dissection of
etxrab [Mon, 14 Mar 2011 07:15:25 +0000 (07:15 +0000)]
Add dissection of
- MBMS-SESSION-START-REQUEST
- MBMS-SESSION-START-RESPONSE

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

13 years ago[Automatic manuf, services and enterprise-numbers update for 2011-03-13]
gerald [Sun, 13 Mar 2011 15:03:43 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-03-13]

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

13 years ago../../../epan/dissectors/packet-gtp.c:5607: error: unused variable ‘length’
etxrab [Sun, 13 Mar 2011 09:33:45 +0000 (09:33 +0000)]
../../../epan/dissectors/packet-gtp.c:5607: error: unused variable ‘length’

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

13 years agoAdd sub dissection of AVP MBMS Service Area.
etxrab [Sat, 12 Mar 2011 23:26:55 +0000 (23:26 +0000)]
Add sub dissection of AVP MBMS Service Area.

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

13 years agoFix bug #5189: Wireshark crashes when cancelling a large sort operation.
wmeier [Sat, 12 Mar 2011 19:02:24 +0000 (19:02 +0000)]
Fix bug #5189: Wireshark crashes when cancelling a large sort operation.
Essentially: Don't try to sort if the pre-requisite "columnization" step is stopped
             via the progressbar dialog window before the step completes.
Also: Fix a (very) minor bug wherein the sort-indicator not always cleared on the
      "previous column" when "No Sorting" was selected from a column context menu.
Also: Do minor code, comments & whitespace cleanup.

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

13 years agoUse TRUE/FALSE for encoding_info to make it build.
stig [Sat, 12 Mar 2011 12:09:52 +0000 (12:09 +0000)]
Use TRUE/FALSE for encoding_info to make it build.

Added packet-mndp.c to Makefile build.

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

13 years agoImprove r36177 per Guy's suggestion at bug #5746 to always call the
sfisher [Sat, 12 Mar 2011 02:06:25 +0000 (02:06 +0000)]
Improve r36177 per Guy's suggestion at bug #5746 to always call the
PPP-over-HDLC dissector since it will do the check for us to see if
the HDLC framing is present or not.

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

13 years agoHandle PPP in HDLC framing. Fixes bug 5746.
cmaynard [Sat, 12 Mar 2011 01:32:35 +0000 (01:32 +0000)]
Handle PPP in HDLC framing.  Fixes bug 5746.

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

13 years agoAdd emem_tree_lookup32_array_le. Resolves bug 5744.
cmaynard [Wed, 9 Mar 2011 17:20:29 +0000 (17:20 +0000)]
Add emem_tree_lookup32_array_le.  Resolves bug 5744.

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

13 years agoUpdate/correct some TLVs
jmayer [Wed, 9 Mar 2011 13:27:13 +0000 (13:27 +0000)]
Update/correct some TLVs

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

13 years agoCheck that imported private key is RSA; Prevents a crash.
wmeier [Wed, 9 Mar 2011 00:43:49 +0000 (00:43 +0000)]
Check that imported private key is RSA; Prevents a crash.

Fixes Bug #5662

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

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

13 years agoDisplay a console warning instead of a simple_dialog for invalid color filters.
cmaynard [Tue, 8 Mar 2011 21:21:48 +0000 (21:21 +0000)]
Display a console warning instead of a simple_dialog for invalid color filters.

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

13 years agoA little more old packet list cleanup
sfisher [Tue, 8 Mar 2011 20:23:48 +0000 (20:23 +0000)]
A little more old packet list cleanup

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

13 years agoW -> E for g_clist funktions.
etxrab [Tue, 8 Mar 2011 19:55:22 +0000 (19:55 +0000)]
W -> E for g_clist funktions.

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

13 years agoAdd support for Mikrotiks Neigbor Discovery Protocol (MNDP).
jmayer [Tue, 8 Mar 2011 19:10:46 +0000 (19:10 +0000)]
Add support for Mikrotiks Neigbor Discovery Protocol (MNDP).
Sample capture at
http://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=get&target=mndp.pcap

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

13 years agoDon't bother creating/finding conversations if we're encapsulated within an
cmaynard [Tue, 8 Mar 2011 18:52:12 +0000 (18:52 +0000)]
Don't bother creating/finding conversations if we're encapsulated within an
error packet, such as an ICMP destination unreachable.  Prior to this change,
I had captures that showed such encapsulated requests with responses indicated
in other frames, which obviously can't be true.

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

13 years agoConversation tracking must be handled whether "tree" is NULL or not.
cmaynard [Tue, 8 Mar 2011 18:33:45 +0000 (18:33 +0000)]
Conversation tracking must be handled whether "tree" is NULL or not.

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

13 years agoAdd support for the pre-rfc DAE port 1700
jmayer [Tue, 8 Mar 2011 18:29:30 +0000 (18:29 +0000)]
Add support for the pre-rfc DAE port 1700

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

13 years agoAllow <variance> to be successfully sscanf'd no matter the locale for the
cmaynard [Tue, 8 Mar 2011 14:57:38 +0000 (14:57 +0000)]
Allow <variance> to be successfully sscanf'd no matter the locale for the
decimal symbol.  Same change and reason as for revision 36160.

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

13 years agoRemove the 'NEW_PACKET_LIST' defines & etc (since the code no longer supports the...
wmeier [Tue, 8 Mar 2011 14:55:07 +0000 (14:55 +0000)]
Remove the 'NEW_PACKET_LIST' defines & etc (since the code no longer supports the old packet list)

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

13 years agoRemove the --enable-new-packet-list option (since the code no longer supports the...
morriss [Tue, 8 Mar 2011 14:41:12 +0000 (14:41 +0000)]
Remove the --enable-new-packet-list option (since the code no longer supports the old packet list)

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

13 years agoFrom Martin Kaiser: initialize hdr_tag with NO_TAG
wmeier [Tue, 8 Mar 2011 13:52:16 +0000 (13:52 +0000)]
From Martin Kaiser: initialize hdr_tag with NO_TAG

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

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

13 years agoFix for bug 5743 : tshark incorrectly calculates tcp stream for SYN packets when...
sake [Tue, 8 Mar 2011 11:26:34 +0000 (11:26 +0000)]
Fix for bug 5743 : tshark incorrectly calculates tcp stream for SYN packets when port numbers are re-used

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

13 years agoRemoval of the old packet-list in favor of the new packet list.
sake [Tue, 8 Mar 2011 01:52:25 +0000 (01:52 +0000)]
Removal of the old packet-list in favor of the new packet list.
It compiles with "./configure without options" on my Mac. Let's see what the buildbots have to say about it :-)

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

13 years agoAllow <interval> to be successfully sscanf'd no matter the locale for the
cmaynard [Mon, 7 Mar 2011 21:58:30 +0000 (21:58 +0000)]
Allow <interval> to be successfully sscanf'd no matter the locale for the
decimal symbol.  Similar to the fix made to tap-iostat.c to resolve bug 2880.

Motivated by the discussion started from this thread on the user list:
http://www.wireshark.org/lists/wireshark-users/201103/msg00018.html

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

13 years agoDon't pass retransmitted chunks to subdissectors. Instead just mark them as
morriss [Mon, 7 Mar 2011 19:23:55 +0000 (19:23 +0000)]
Don't pass retransmitted chunks to subdissectors.  Instead just mark them as
retranmissions (in COL_INFO).  (Obviously this only works if TSN analysis is
enabled.)

This should make it more obvious to users which chunks are retransmissions and
will help avoid confusing the subdissector(s).

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

13 years agoFrom Alexis La Goutte:
etxrab [Mon, 7 Mar 2011 17:46:30 +0000 (17:46 +0000)]
From Alexis La Goutte:
enhance tag Power Constraint/Capability, TPC Request/Report, Supported Channel, csa
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5660

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

13 years agoSquelch compiler warning:
sfisher [Mon, 7 Mar 2011 17:01:55 +0000 (17:01 +0000)]
Squelch compiler warning:

packet-dvbci.c: In function 'dissect_dvbci_lpdu':
packet-dvbci.c:1153: warning: 'hdr_tag' may be used uninitialized in this function
packet-dvbci.c:1153: note: 'hdr_tag' was declared here

By setting hdr_tag = 0, but see question on bug #5654 on whether 0 is a
good default value or not.

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

13 years agoFrom Stefan Metzmacher: smb2 multi-credit / large mtu support
wmeier [Mon, 7 Mar 2011 16:43:55 +0000 (16:43 +0000)]
From Stefan Metzmacher: smb2 multi-credit / large mtu support
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5729

From me: Update a comment re the "epoch" field: It's now called "credit charge".

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

13 years agoRemove a no longer needed struct.
etxrab [Mon, 7 Mar 2011 12:31:49 +0000 (12:31 +0000)]
Remove a no longer needed struct.

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

13 years agoRemove more obsolete code.
etxrab [Mon, 7 Mar 2011 11:56:21 +0000 (11:56 +0000)]
Remove more obsolete code.

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

13 years agoFix packet-bssgp.c:125: warning: 'hf_bssgp_tmsi_ptmsi' defined but not used
etxrab [Mon, 7 Mar 2011 10:01:24 +0000 (10:01 +0000)]
Fix packet-bssgp.c:125: warning: 'hf_bssgp_tmsi_ptmsi' defined but not used

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

13 years agoRemove the old code.
etxrab [Mon, 7 Mar 2011 09:36:24 +0000 (09:36 +0000)]
Remove the old code.

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

13 years agoFix compiler error on Windows 64: cast strlen() to (int);
wmeier [Mon, 7 Mar 2011 03:10:51 +0000 (03:10 +0000)]
Fix compiler error on Windows 64: cast strlen() to (int);
Also: Apparently the length of an address of type AT_STRINGZ must include the NULL.

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

13 years agoSet properties
wmeier [Mon, 7 Mar 2011 02:44:38 +0000 (02:44 +0000)]
Set properties

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

13 years agoFrom Martin Kaiser: dissector for DVB-CI (Common Interface)
wmeier [Mon, 7 Mar 2011 02:22:48 +0000 (02:22 +0000)]
From Martin Kaiser: dissector for DVB-CI (Common Interface)

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

From me:
- Entry for DVBCI added to wtap.c encap_table_base[];
- Some code simplification with respect to the use of col_...() for COL_INFO;
- Certain tests for "enough bytes available" not really needed;
- (Other minor tweaks);
- #include<stdio.h> not req'd;
- Minor reformatting and whitespace cleanup;

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

13 years agoRemove some instances of _U_ where the parameter is now used.
martinm [Sun, 6 Mar 2011 23:10:28 +0000 (23:10 +0000)]
Remove some instances of _U_ where the parameter is now used.

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

13 years agoImprove expert info output when detect Scheduling Request 'state machine' problem.
martinm [Sun, 6 Mar 2011 22:52:33 +0000 (22:52 +0000)]
Improve expert info output when detect Scheduling Request 'state machine' problem.

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

13 years agoMark value_string_ext bssgp_cause_vals_ext as WS_VAR_IMPORT.
stig [Sun, 6 Mar 2011 16:37:21 +0000 (16:37 +0000)]
Mark value_string_ext bssgp_cause_vals_ext as WS_VAR_IMPORT.

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

13 years ago[Automatic manuf, services and enterprise-numbers update for 2011-03-06]
gerald [Sun, 6 Mar 2011 16:03:46 +0000 (16:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-03-06]

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

13 years agoPrepare to remove old bssgp code by changing exports.
etxrab [Sun, 6 Mar 2011 09:42:41 +0000 (09:42 +0000)]
Prepare to remove old bssgp code by changing exports.

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

13 years agoFrom Alexis La Goutte:
etxrab [Fri, 4 Mar 2011 17:40:32 +0000 (17:40 +0000)]
From Alexis La Goutte:
Enhance tag fh_hopping_.., tclas, tspec, challenge_text...

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

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

13 years agoFrom Stefan Metzmacher: Patch that fixes false positives and allows large smb1/2...
wmeier [Fri, 4 Mar 2011 15:09:29 +0000 (15:09 +0000)]
From Stefan Metzmacher: Patch that fixes false positives and allows large smb1/2 pdus

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

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

13 years agoFix warning
kukosa [Fri, 4 Mar 2011 14:36:27 +0000 (14:36 +0000)]
Fix warning

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

13 years agoCheck only first 14 digits of GeneralizedTime which are fixed, next parts are optional
kukosa [Fri, 4 Mar 2011 14:01:57 +0000 (14:01 +0000)]
Check only first 14 digits of GeneralizedTime which are fixed, next parts are optional

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

13 years agoAll messages converted to the "GSM style" dissection.
etxrab [Fri, 4 Mar 2011 12:57:55 +0000 (12:57 +0000)]
All messages converted to the "GSM style" dissection.

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

13 years agoChange descriptions of NTP Reference Identifier Codes for stratum 1
sfisher [Fri, 4 Mar 2011 00:25:56 +0000 (00:25 +0000)]
Change descriptions of NTP Reference Identifier Codes for stratum 1
servers to match IANA assignment / RFC 5905.  A number of codes already
in Wireshark that aren't assigned were left intact.

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

13 years agoCorrect the usage of tvb_memeql() after r35558: it doesn't return true
sfisher [Fri, 4 Mar 2011 00:17:01 +0000 (00:17 +0000)]
Correct the usage of tvb_memeql() after r35558: it doesn't return true
if the values are the same; we have to check for "== 0" to see if they
are the same.

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

13 years agoChange "Reference Clock ID" to "Reference ID" to match RFC5905 (also
sfisher [Thu, 3 Mar 2011 23:48:56 +0000 (23:48 +0000)]
Change "Reference Clock ID" to "Reference ID" to match RFC5905 (also
mention this RFC in the comments).

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

13 years agoClarify / add explanations for the fields
sfisher [Thu, 3 Mar 2011 23:47:05 +0000 (23:47 +0000)]
Clarify / add explanations for the fields

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

13 years agoAdd more duplicate fragment tests.
morriss [Thu, 3 Mar 2011 23:28:32 +0000 (23:28 +0000)]
Add more duplicate fragment tests.

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

13 years agoWhen reassembling fragments, don't stop looking at fragments just because the
morriss [Thu, 3 Mar 2011 20:22:45 +0000 (20:22 +0000)]
When reassembling fragments, don't stop looking at fragments just because the
current fragment pushes us past the reassembled size: it may be that the
current fragment is a duplicate/retransmission and will be ignored.

Also, if we detect a conflict between a previous and the current fragment,
flag the current (conflicting) fragment as FD_OVERLAPCONFLICT.  Do *not* flag
the fragment that got us into the reassembly routine (probably the final
fragment): it is not (may not be) the guilty fragment.

Clean up some spacing.

Also add reassembly tests for duplicate/retransmitted fragments.

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

13 years agoExport SONtransferRequestContaine, SONtransferResponseContainerand and Global-ENB-ID
etxrab [Thu, 3 Mar 2011 07:20:34 +0000 (07:20 +0000)]
Export SONtransferRequestContaine, SONtransferResponseContainerand and Global-ENB-ID

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

13 years agoThere's no need to pass the result of tvb_get_ptr() as the 'value' in
morriss [Thu, 3 Mar 2011 03:28:38 +0000 (03:28 +0000)]
There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().

Use tvb_ether_to_str().

Remove some unnecessary includes.

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

13 years agoThere's no need to pass the result of tvb_get_ptr() as the 'value' in
morriss [Thu, 3 Mar 2011 03:09:21 +0000 (03:09 +0000)]
There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().

Use tvb_ether_to_str().

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

13 years agoUse tvb_memcpy() instead of tvb_get_ptr() + memcpy().
morriss [Thu, 3 Mar 2011 03:02:03 +0000 (03:02 +0000)]
Use tvb_memcpy() instead of tvb_get_ptr() + memcpy().

Remove a few unnecessary includes.

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

13 years agoUse tvb_ether_to_str().
morriss [Thu, 3 Mar 2011 02:41:22 +0000 (02:41 +0000)]
Use tvb_ether_to_str().

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

13 years agoUse tvb_get_guint8() instead of tvb_get_ptr().
morriss [Thu, 3 Mar 2011 02:32:18 +0000 (02:32 +0000)]
Use tvb_get_guint8() instead of tvb_get_ptr().

Remove a few unnecessary includes.

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

13 years agoUse tvb_ether_to_str().
morriss [Thu, 3 Mar 2011 02:24:44 +0000 (02:24 +0000)]
Use tvb_ether_to_str().

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

13 years agoMake the _to_str() functions in here take a pointer to a TVB and an offset
morriss [Thu, 3 Mar 2011 02:18:57 +0000 (02:18 +0000)]
Make the _to_str() functions in here take a pointer to a TVB and an offset
rather than (generally) a pointer into the TVB.

Replace some tabs with spaces (for consistency).

Remove a couple unnecessary includes.

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

13 years agoAs suggested by Anders: when we detect non-ASCII characters, print the line
morriss [Wed, 2 Mar 2011 17:18:34 +0000 (17:18 +0000)]
As suggested by Anders: when we detect non-ASCII characters, print the line
number on which we found them.

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

13 years agoFix Error: Found non-ASCII characters in packet-ieee80211.c
etxrab [Wed, 2 Mar 2011 16:25:33 +0000 (16:25 +0000)]
Fix Error: Found non-ASCII characters in packet-ieee80211.c

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

13 years agoFrom Alexis La Goutte:
etxrab [Wed, 2 Mar 2011 15:23:38 +0000 (15:23 +0000)]
From Alexis La Goutte:
* Add 802.11 Standard Reference
* Reorder IE (Information Element) and define in decimal (the standard use
decimal...)

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

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

13 years agoAllow linking back to previous UL tx 32 ms ago.
martinm [Wed, 2 Mar 2011 11:33:46 +0000 (11:33 +0000)]
Allow linking back to previous UL tx 32 ms ago.

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

13 years agoDon't overwrite isPhyRetx field for UL frames with DL check.
martinm [Wed, 2 Mar 2011 11:16:28 +0000 (11:16 +0000)]
Don't overwrite isPhyRetx field for UL frames with DL check.

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

13 years agoUpdate some of the "Details" properties in the installer. Remove the
gerald [Tue, 1 Mar 2011 19:40:51 +0000 (19:40 +0000)]
Update some of the "Details" properties in the installer. Remove the
32-bit BMPs from the installer icon; they don't appear to render properly.

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

13 years agoMake HAVE_PCAP_REMOTE and HAVE_PCAP_SETSAMPLING independent
tuexen [Tue, 1 Mar 2011 17:29:09 +0000 (17:29 +0000)]
Make HAVE_PCAP_REMOTE and HAVE_PCAP_SETSAMPLING independent
as in other places of the code. Such that this is consistently
used. While there, clean up some whitespaces.

This fix was provided by Irene Ruengeler which testing
remote capturing (with multiple interfaces).

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

13 years agoAfter SR failure, allow for another attempt in SR state machine (presumably with...
martinm [Tue, 1 Mar 2011 14:58:51 +0000 (14:58 +0000)]
After SR failure, allow for another attempt in SR state machine (presumably with a subsequent RACH happening in-between...)

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

13 years agoQSIG: decoding of PSS1InformationElement
kukosa [Tue, 1 Mar 2011 13:01:26 +0000 (13:01 +0000)]
QSIG: decoding of PSS1InformationElement

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

13 years agoTweak the way we setup FP R8 info.
martinm [Tue, 1 Mar 2011 10:54:57 +0000 (10:54 +0000)]
Tweak the way we setup FP R8 info.

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

13 years agoWas reading F in mac-is descriptors the wrong way around...
martinm [Tue, 1 Mar 2011 10:53:58 +0000 (10:53 +0000)]
Was reading F in mac-is descriptors the wrong way around...

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

13 years agoIf we encounter an excessively long filter string or one with too many
gerald [Tue, 1 Mar 2011 00:50:17 +0000 (00:50 +0000)]
If we encounter an excessively long filter string or one with too many
elements, add an expert item and throw a ReportedBoundsError. We may
want to handle this more cleanly in the future but this avoids
allocating a huge amount of memory.

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

13 years agoDefine some globals as static; Remove uneeded #includes; Whitespace cleanup.
wmeier [Mon, 28 Feb 2011 23:50:01 +0000 (23:50 +0000)]
Define some globals as static; Remove uneeded #includes; Whitespace cleanup.

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

13 years agoRemove unneeded #includes; Add #includes to packet-gsm_rlcmac.c
wmeier [Mon, 28 Feb 2011 23:46:07 +0000 (23:46 +0000)]
Remove unneeded #includes; Add #includes to packet-gsm_rlcmac.c

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

13 years agoDefine global vars as static; Whitespace cleanup.
wmeier [Mon, 28 Feb 2011 23:09:02 +0000 (23:09 +0000)]
Define global vars as static; Whitespace cleanup.

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

13 years agoDisplay the NTP version in COL_INFO so tshark output (without -V) looks
sfisher [Mon, 28 Feb 2011 18:00:34 +0000 (18:00 +0000)]
Display the NTP version in COL_INFO so tshark output (without -V) looks
more like tcpdump.

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

13 years agoClose UAT file after loading.
stig [Mon, 28 Feb 2011 16:11:20 +0000 (16:11 +0000)]
Close UAT file after loading.

Open files may prevent deleting a used profile with UAT files.

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

13 years agoFrom Pascal Quantin:
etxrab [Mon, 28 Feb 2011 15:42:58 +0000 (15:42 +0000)]
From Pascal Quantin:
the attached patch should hopefully please the buildbots

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

13 years agoFrom Pascal Quantin:
etxrab [Mon, 28 Feb 2011 14:54:22 +0000 (14:54 +0000)]
From Pascal Quantin:
patch to fix the various issues

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

13 years ago- RE apply checkapi patch.
etxrab [Mon, 28 Feb 2011 14:17:52 +0000 (14:17 +0000)]
- RE apply checkapi patch.
- Mark unused parameters (From Pascal Quantin).

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

13 years agoFrom Vincent Helfre:
etxrab [Mon, 28 Feb 2011 13:55:47 +0000 (13:55 +0000)]
From Vincent Helfre:
I change the void * descr field as an union to either store a pointer or a value.

Hope it solves the problem.

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

13 years agoWhen doing sequence analysis, allow for the first SN to be seen not to be 0.
martinm [Mon, 28 Feb 2011 12:26:26 +0000 (12:26 +0000)]
When doing sequence analysis, allow for the first SN to be seen not to be 0.
This will happen if the capture doesn't include the start of this channel.

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

13 years agoMake UL retx use warning, rather than error, expert level.
martinm [Mon, 28 Feb 2011 12:24:45 +0000 (12:24 +0000)]
Make UL retx use warning, rather than error, expert level.

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

13 years agoAdd private extensions under the right tree.
etxrab [Mon, 28 Feb 2011 11:34:59 +0000 (11:34 +0000)]
Add private extensions under the right tree.

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

13 years agoFix checkapi detected errors.
etxrab [Mon, 28 Feb 2011 11:33:27 +0000 (11:33 +0000)]
Fix checkapi detected errors.

Missing log message:
From Vincent Helfre:
GSM RLC MAC dissector

There are 2 things remaining to do:

-  Update to Rel 8 the control messages such as Packet Measurement Order, Packet Measurement Report, Packet Cell Change Order, Packet Cell Change Notification…

-  Improve the display by replacing the strings describing the type by a hf field

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

13 years agogit-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36087 f5534014-38df-0310...
etxrab [Mon, 28 Feb 2011 09:43:22 +0000 (09:43 +0000)]
git-svn-id: anonsvn.wireshark.org/wireshark/trunk@36087 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoExport:
etxrab [Sun, 27 Feb 2011 21:55:35 +0000 (21:55 +0000)]
Export:
SONtransferRequestContainer
SONtransferResponseContainer
SONtransferCause

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

13 years agoAdd miisng file from
etxrab [Sun, 27 Feb 2011 19:41:34 +0000 (19:41 +0000)]
Add miisng file from
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=36079

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

13 years agoAdd dissection of SonTransfer-IEs.
etxrab [Sun, 27 Feb 2011 19:40:30 +0000 (19:40 +0000)]
Add dissection of SonTransfer-IEs.

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

13 years agoExport SourceCellID.
etxrab [Sun, 27 Feb 2011 19:39:07 +0000 (19:39 +0000)]
Export SourceCellID.

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

13 years ago[Automatic manuf, services and enterprise-numbers update for 2011-02-27]
gerald [Sun, 27 Feb 2011 16:03:40 +0000 (16:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-02-27]

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