Commit graph

18394 commits

Author SHA1 Message Date
Anders Broman
bb08a70594 Set SVN properties.
svn path=/trunk/; revision=42882
2012-05-28 15:30:09 +00:00
Anders Broman
136ad63adf Set SVN properties.
svn path=/trunk/; revision=42881
2012-05-28 15:29:36 +00:00
Anders Broman
14eb5154ac From Erwin Rol:
Artnet, RDM and DMX dissector updates

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

svn path=/trunk/; revision=42880
2012-05-28 15:24:54 +00:00
Anders Broman
55261641d9 Extend the switch statement.
svn path=/trunk/; revision=42879
2012-05-28 15:09:33 +00:00
Anders Broman
d52a12c60e Move defenition of rlc_mode.
svn path=/trunk/; revision=42878
2012-05-28 14:50:54 +00:00
Anders Broman
2a412f000b Try to pacify the Ubuntu buildbot.
svn path=/trunk/; revision=42877
2012-05-28 13:53:33 +00:00
Anders Broman
d8ddd39c3d Enhance CHANNEL_HSDSCH dissection.
svn path=/trunk/; revision=42876
2012-05-28 13:38:40 +00:00
Ronnie Sahlberg
4baba1c684 Sometimes you might have plaintext LDAP for a SASL LDAP connection if the handshake never occured.
Observed with exchange in some configurations.

From Matthieu Patou <mat@matws.net>


svn path=/trunk/; revision=42875
2012-05-28 09:40:54 +00:00
Gerald Combs
7e5bc5d6ca [Automatic manuf, services and enterprise-numbers update for 2012-05-27]
svn path=/trunk/; revision=42862
2012-05-27 14:03:33 +00:00
Gerald Combs
3e24d3bbce Add a null check to fix Coverity CID 280210. It doesn't look like we'd
run into this in the wild.

svn path=/trunk/; revision=42853
2012-05-25 18:25:31 +00:00
Chris Maynard
cd7c8f671b Fix Coverity CID 700177 Unused pointer value.
svn path=/trunk/; revision=42849
2012-05-25 02:51:23 +00:00
Chris Maynard
22415dc211 The rest of the fix for Coverity CID's 280507 and 280508. (There were multiple occurrences grouped into the 2 CID's, but I hadn't noticed them all.)
svn path=/trunk/; revision=42848
2012-05-25 02:43:39 +00:00
Chris Maynard
c0b55e486a tvb_length_remaining() can return a negative number, so be sure to handle it. Fixes Coverity CID's 280507 and 280508.
svn path=/trunk/; revision=42847
2012-05-25 02:18:49 +00:00
Chris Maynard
973b45c401 Add a "fallthrough" comment to avoid a missing break report from Coverity. Fixes Coverity CID 702382 Missing break in switch.
svn path=/trunk/; revision=42845
2012-05-25 01:49:49 +00:00
Chris Maynard
814682d0d8 Fix Coverity CID 701035: Dereference after null check of hfinfo.
svn path=/trunk/; revision=42843
2012-05-25 01:14:29 +00:00
Chris Maynard
3445d93bf2 Fix Coverity CID 700201: Dereference after null check, by ensuring "decoder" is not NULL before passing it to ssl_decrypt_record().
svn path=/trunk/; revision=42842
2012-05-25 00:54:49 +00:00
Chris Maynard
8fd9342f7d tvb_length_remaining() can return a negative number, so be sure to handle it. Fixes Coverity CID 281367.
svn path=/trunk/; revision=42840
2012-05-25 00:29:46 +00:00
Chris Maynard
0c49176411 tvb_length_remaining() can return a negative number, so be sure to handle it. Fixes Coverity CID's 280233-280235.
svn path=/trunk/; revision=42839
2012-05-24 23:35:23 +00:00
Chris Maynard
b7e5cce721 Update asn1-generated dissector.
svn path=/trunk/; revision=42838
2012-05-24 23:31:38 +00:00
Chris Maynard
06606bb68f tvb_reported_length_remaining() can return a negative number. In dissect_gadu_gadu_userlist80_compressed(), bail out if it does. Fixes Coverity CID 703085. In dissect_gadu_gadu_stringz_cp1250(), be sure to compare against its return value as being only positve rather than non-zero. Also, fixed a couple of typos.
svn path=/trunk/; revision=42837
2012-05-24 23:14:30 +00:00
Jakub Zawadzki
c09a95a0e3 Fix bug #7283
When Engine ID is 128 we should only break when we know the enterprise id.

svn path=/trunk/; revision=42825
2012-05-24 12:26:34 +00:00
Anders Broman
d40cb34ba9 From Martin Kaiser:
RVALS() needs BASE_RANGE_STRING 

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

svn path=/trunk/; revision=42823
2012-05-24 09:17:11 +00:00
Anders Broman
a51cd8a036 From Mayuresh Raut.
Addition of DDMAP TLV and Downstream FEC stack change sub-TLV to DDMAP [RFC 6424]

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

svn path=/trunk/; revision=42819
2012-05-24 06:55:18 +00:00
Pascal Quantin
25e70c04d7 From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7275 :
iso7816: dissect ATR (answer to reset)

svn path=/trunk/; revision=42814
2012-05-23 20:51:38 +00:00
Jakub Zawadzki
401dba8987 Fix bug #7277
Check tvb length before fetching data.

svn path=/trunk/; revision=42812
2012-05-23 12:20:15 +00:00
Anders Broman
551dcff815 Dissect MAC and RLC for CHANNEL_FACH_FDD
svn path=/trunk/; revision=42811
2012-05-23 10:47:52 +00:00
Anders Broman
714705bfe8 Add conv_id.h
svn path=/trunk/; revision=42810
2012-05-23 07:27:35 +00:00
Anders Broman
33794c58a0 Add file missing from http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=42806
svn path=/trunk/; revision=42809
2012-05-23 07:13:43 +00:00
Anders Broman
0832853fa8 From Robert Bullen:
The Wireshark and tshark TCP conversations stats tables aggregate reused connections into a single line item

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

svn path=/trunk/; revision=42806
2012-05-23 06:36:47 +00:00
Anders Broman
a6deef666c Fix a typo
svn path=/trunk/; revision=42805
2012-05-23 06:26:46 +00:00
Anders Broman
ab58c26ff3 From Jim Wright:
Enhance the DTN dissector so that it understands ECOS blocks (Extended Class of Service)

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

svn path=/trunk/; revision=42804
2012-05-23 06:25:00 +00:00
Bill Meier
8f5f906146 All:
- whitespace cleanup;
   - Remove redundant code;

   packet-ymsg.c:
   - Check if bytes available before doing tvb fetch for heuristic check;
   - Required tcp pdu "fixed part length" is 10 (not 8);
   - Use val_to_str_const() as appropriate;
   - Remove some unneeded initializations.

svn path=/trunk/; revision=42802
2012-05-23 03:26:35 +00:00
Bill Meier
e72c6574ef From Evan Huus: "Fix Potential padding issues in Yahoo dissectors"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7276

svn path=/trunk/; revision=42801
2012-05-23 03:22:51 +00:00
Chris Maynard
509917229b Fix Coverity CID 703086: Dereference after null check in decode_tcp_ports().
svn path=/trunk/; revision=42798
2012-05-23 00:56:15 +00:00
Jeff Morriss
a59aa64da4 Fix: packet-gsm_a_gm.c:3965:6: error: comparison is always true due to limited range of data type [-Werror=type-limits]
svn path=/trunk/; revision=42797
2012-05-22 23:59:41 +00:00
Guy Harris
dba158c167 Suppress a (legitimate) compiler warning for now, and leave a comment
indicating that we should do *something* about nanoseconds values >= 1
billion.

svn path=/trunk/; revision=42796
2012-05-22 23:57:54 +00:00
Jakub Zawadzki
261fb63ec4 nflog dissector:
- dissect NFULA_TIMESTAMP as 16B time.
 - fix byte_order_types (selecting BE selected little endian)

svn path=/trunk/; revision=42793
2012-05-22 22:34:57 +00:00
Anders Broman
4e7d87caa2 Fix PCH dissection
svn path=/trunk/; revision=42791
2012-05-22 21:12:59 +00:00
pascal
9746c22630 Dissect Operator Specific Use container in Protocol Configuration Options IE
Put protocol and container ID in a subtree

svn path=/trunk/; revision=42790
2012-05-22 20:34:20 +00:00
Anders Broman
e460267b82 Set paging indication and start fixing TFI list.
svn path=/trunk/; revision=42783
2012-05-22 15:39:12 +00:00
Jeff Morriss
913455d3b3 Get rid of non-ASCII chars. Remove a few trailing commas.
svn path=/trunk/; revision=42782
2012-05-22 14:00:19 +00:00
Anders Broman
ec5ec34f1f Collect and use E-DCH data.
svn path=/trunk/; revision=42779
2012-05-22 11:53:12 +00:00
Ronnie Sahlberg
2a2dc8c5f3 TCP: Some protocols running ontop of TCP needs the PDUs to be delivered in order. for example decryption of DCERPCoverHTTP.
For such protocols, hte state gets out of sync of for example the same PDU is invoked twice in a row, which sometimes can happen if there is tcp retransmission and we see the same PDU twice. First for hte original segment and a second time for the tcp retransmission.
These protocols might lack an easy way to detect that a PDU is seen twice or out of order.

To handle this a little better, offer a TCP option that defaults to being disabled but when enabled skips invoking any subdissector for retransmitted or out of order packets.
(For some virtualization environments it sometimes becomes VERY common to see false tcp retransmissions due to segments being captured twice making this even worse)


We dont want this option to default to ON because for most cases we do want the current behaviour where the subdissector is called twice, or more, for any PDU that is retrasnmitted on the TPC layer.
For example, assume a SMB response packet is retransmitted on the TCP level.
This may result in a capture file that looks like
1 -> SMB request
2 <- SMB response to 1  
... 1 second ...
3 <- SMB response to 1   TCP retransmission

For this case we definitely want packet 3 to be passed to the SMB layer so that 
the request/respons ematching will detect that the response time for this transaction was > 1.0 second
We want smb.time to indicate the delta betwenn packets 1 and 3
as well as the SMB Service Response Time to indicate that this command took very long.





svn path=/trunk/; revision=42774
2012-05-22 07:51:12 +00:00
Ronnie Sahlberg
7e0c167eb0 HTTP: RPC/HTTP do a better detection and parsing of RPC over HTTP
From Matthieu Patou <mat@matws.net>

svn path=/trunk/; revision=42773
2012-05-22 06:23:36 +00:00
Ronnie Sahlberg
b3bfefd03c packet-smb2: dissect the channel sequence in the SMB 2.2 header
From Stefan Metzmacher <metze@samba.org>

svn path=/trunk/; revision=42772
2012-05-22 05:56:39 +00:00
Ronnie Sahlberg
ba54127556 SMB: Add dissection of TRANS2_REQUEST_TRANSPORT_ENCRYPTION messages
From Stefan Metzmacher <metze@samba.org>

svn path=/trunk/; revision=42771
2012-05-22 05:55:05 +00:00
Ronnie Sahlberg
50b992d139 SMB: Dissect TRANS2_SET_FS_INFORMATION infolevel
From Stefan Metzmacher <metze@samba.org>

svn path=/trunk/; revision=42770
2012-05-22 05:53:28 +00:00
Ronnie Sahlberg
920b760f15 SMB: Call dissect_nt_quota() via a new dissect_sfsi_request/response()
From Stefan Metzmacher <metze@samba.org>


svn path=/trunk/; revision=42769
2012-05-22 05:51:16 +00:00
Ronnie Sahlberg
4ded3c7fe0 SMB2: Add dissection of the encrypted SMB2 headers
From Matthieu Patou <mat@matws.net>


svn path=/trunk/; revision=42768
2012-05-22 05:48:55 +00:00
Ronnie Sahlberg
cf0a6d0b96 SMB2: Add support for the "encrypted" flag for shares
From Michael Adam <obnox@samba.org>

svn path=/trunk/; revision=42767
2012-05-22 05:46:47 +00:00
Ronnie Sahlberg
0882a858c4 SMB2: Fix, the flag is called PERSISTENT_HANDLES, not LARGE_MTU
From Michael Adam <obnox@samba.org>


svn path=/trunk/; revision=42766
2012-05-22 05:45:30 +00:00
Ronnie Sahlberg
b5b00d5654 SMB2: Add support for SMB2_GLOBAL_CAP_ENCRYPTION flag
From Michael Adam <obnox@samba.org>


svn path=/trunk/; revision=42765
2012-05-22 05:44:07 +00:00
pascal
a65518fe55 Fix indentation
svn path=/trunk/; revision=42760
2012-05-21 21:49:11 +00:00
pascal
6a1470ffc9 From gyanesh via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7267 :
Add dissector function for SPB link metric sub tlv (type 29)

svn path=/trunk/; revision=42759
2012-05-21 20:51:22 +00:00
pascal
0ba1ab2909 Display Element ID in hexadecimal (like in 3GPP specs)
Display EPS bearer ID in decimal

svn path=/trunk/; revision=42755
2012-05-21 19:27:38 +00:00
Bill Meier
bc55ee0616 Fix "Function call argument is an uninitialized value" issue found by scan-build.
(It seems to me that this issue would rarely, if ever, actually occur).

Also:
- Use val_to_str_const() as appropriate;
- Localize some variables;
- Remove unneeded initializers;
- Do some parenthesizing;
- Use a consistent formatting style;
- Do whitespace cleanup.

svn path=/trunk/; revision=42754
2012-05-21 18:25:29 +00:00
Bill Meier
b2b8fae93c Init a pointer to prevent a (not actually valid) scan-build "Function call argument is an uninitialized value" msg
Also:
 - #if 0 out some unused hf[] entries;
 - use val_to_str_const() in a few places;
 - remove some unneeded initializers;
 - do col_set_str()/col_clear() before referencing tvb;
 - reformat hf[] entries;
 - Fix whitespace (4-space tabs, etc).

svn path=/trunk/; revision=42746
2012-05-21 15:06:24 +00:00
Bill Meier
78f3be74bf Additional cleanup:
- use #if 0/#endif to comment out code(instead of /* ...*/
- remove unused #define
- replace col_clear()/col_add() by col_set()

svn path=/trunk/; revision=42745
2012-05-21 14:25:27 +00:00
Bill Meier
6718bfd047 From Evan Huus: Unused Prefs registration;
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7273

From me: whitespace cleanup;

svn path=/trunk/; revision=42744
2012-05-21 14:02:40 +00:00
Jakub Zawadzki
1d510f0616 Improve Gadu-Gadu dissector (part III)
svn path=/trunk/; revision=42742
2012-05-21 13:07:33 +00:00
pascal
d6381b4123 From Evan Huus via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7271 :
Remove useless null check

svn path=/trunk/; revision=42741
2012-05-21 09:37:58 +00:00
pascal
f09a30ea93 Add packet-sync.c to epan\CMakeLists.txt
svn path=/trunk/; revision=42740
2012-05-21 09:18:39 +00:00
Anders Broman
26d431148c From David Wei:
fix for Higher bitrates than 16 Mbps flag.

svn path=/trunk/; revision=42739
2012-05-21 08:21:26 +00:00
Anders Broman
fec821f303 From Evan Huus:
Fix Three memory leaks and a bad if-condition, as caught by CppCheck.

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

svn path=/trunk/; revision=42738
2012-05-21 07:42:09 +00:00
Anders Broman
35dd3b052e Use new_register_dissector.
svn path=/trunk/; revision=42737
2012-05-21 07:34:20 +00:00
Anders Broman
36cd403381 From Michael Mann:
Check for enabled XML dissecto.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6625
xmpp decoder crashes when xml is disabled

svn path=/trunk/; revision=42736
2012-05-21 07:28:13 +00:00
Anders Broman
4684cb30f4 From David Wei:
New dissector for MBMS synchronisation protocol.

svn path=/trunk/; revision=42735
2012-05-21 07:11:36 +00:00
Bill Meier
7d3f69262d Whitespace cleanup;
svn path=/trunk/; revision=42734
2012-05-21 02:20:53 +00:00
Bill Meier
e3ea682270 General cleanup:
- 4-space tabs, trailing whitespace, etc
- use a consistent formatting style
- ...

svn path=/trunk/; revision=42733
2012-05-21 02:13:49 +00:00
Bill Meier
ca4a51873e Prevent (what seems to me to be) a possible null pointer dereference.
svn path=/trunk/; revision=42732
2012-05-21 01:00:12 +00:00
Jörg Mayer
d40cea2e7b Two cases where gcc has problems to detect that a specific specific
variable may not be used uninitialized.

svn path=/trunk/; revision=42731
2012-05-21 00:23:13 +00:00
Bill Meier
0b6c88942b Fix 'unused parameter' warning.
svn path=/trunk/; revision=42730
2012-05-21 00:20:09 +00:00
Anders Broman
c5d3f8c2ba Set up conversations for more channel types
svn path=/trunk/; revision=42729
2012-05-20 21:24:18 +00:00
pascal
254fcdfe19 Upgrade NAS dissector to Release 10 (v10.6.1)
svn path=/trunk/; revision=42728
2012-05-20 20:56:42 +00:00
Jakub Zawadzki
42ec0ca701 Revert r35131 fix bug #5738
g_unichar_isprint() is for *wide characters*.
For UTF-8 multibyte characters we could 
use g_utf8_validate() and g_utf8_next_char(),
but IMHO format_text_* should be ASCII-only.

We rather need to store encoding of FT_STRING[Z]
and in proto_item_fill_label() call appropiate
function.
For ENC_ASCII use format_text(),
for unicode (ENC_UTF*, ENC_UCS*) use format_text_utf(),
etc..

svn path=/trunk/; revision=42727
2012-05-20 18:32:44 +00:00
Gerald Combs
feeed92f95 [Automatic manuf, services and enterprise-numbers update for 2012-05-20]
svn path=/trunk/; revision=42724
2012-05-20 14:03:32 +00:00
Michael Tüxen
2250389193 Make the compiler happy.
svn path=/trunk/; revision=42723
2012-05-20 10:57:12 +00:00
pascal
774748914f Upgrade NAS EPS dissector to Release 10 (10.6.1)
svn path=/trunk/; revision=42722
2012-05-20 09:50:34 +00:00
pascal
acc2a3706b Fix RVALS() macro usage
svn path=/trunk/; revision=42720
2012-05-19 19:05:36 +00:00
Bill Meier
12ba85a2a4 Rework proto_registrar_dump_protocols() to prevent a Clang scan-build "de-reference of a null poiunter" warning
(In practice, bug would not actually occur).

svn path=/trunk/; revision=42717
2012-05-19 16:07:50 +00:00
pascal
cf0d560849 Use col_append_sep_str instead of col_append_str
svn path=/trunk/; revision=42716
2012-05-19 16:06:12 +00:00
Bill Meier
91e5923458 Fix some "warning: Value stored to '...' is never read" clang scan-build warnings.
Also; Do some whitespace cleanup in a few cases.

svn path=/trunk/; revision=42715
2012-05-19 14:20:55 +00:00
pascal
7bbbb88068 From Thomas Loockx via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7269 :
Add BGP MDT-SAFI dissection (RFC6037)

svn path=/trunk/; revision=42713
2012-05-19 12:32:10 +00:00
pascal
20793cc947 From gyanesh via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7262 :
Digest details display issue in SPB Digest subtlv (ISIS hello pdu)

svn path=/trunk/; revision=42712
2012-05-19 10:35:43 +00:00
Jakub Zawadzki
aaa9b34c86 Improve Gadu-Gadu dissector and fix some comments.
svn path=/trunk/; revision=42711
2012-05-19 07:57:45 +00:00
Anders Broman
8499bf8b8e Fix the DCH data collection for conversation setup
svn path=/trunk/; revision=42710
2012-05-19 06:20:05 +00:00
Jakub Zawadzki
3bb88a972b Improve Gadu-Gadu dissector.
svn path=/trunk/; revision=42709
2012-05-18 17:43:48 +00:00
Jeff Morriss
5c0dfb9e8e There's no need to include Custom.common here; it gets pulled in by Makefile.common
svn path=/trunk/; revision=42708
2012-05-18 17:19:50 +00:00
Jeff Morriss
af87b31852 Allow custom dissectors in automake too.
svn path=/trunk/; revision=42707
2012-05-18 16:20:36 +00:00
pascal
b3dec16072 Tabs -> spaces
svn path=/trunk/; revision=42691
2012-05-17 21:24:48 +00:00
pascal
8f789f7ee2 From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7255 :
dissector for generic ISO 7816 messages (atr and apdus)

svn path=/trunk/; revision=42689
2012-05-17 21:11:22 +00:00
Bill Meier
b315490d01 Fix an "unused variable" warning....
svn path=/trunk/; revision=42686
2012-05-17 20:41:46 +00:00
Bill Meier
e332a8de56 Fix the fix ....
svn path=/trunk/; revision=42685
2012-05-17 20:36:23 +00:00
Bill Meier
47828c3170 Silence a "may be used uninitialiuzed" warning.....
svn path=/trunk/; revision=42684
2012-05-17 20:30:59 +00:00
Bill Meier
bab856a504 General cleanup including as appropriate:
- Remove unneeded #include files (string.h, addr_resolv.h);
 - Remove unneeded 'if(!initialized){...}' in proto_reg_handoff();
 - Reformat hf[] entries;
 - Remove unneeded variable initializations;
 - "localize" some variables;
 - Whitespace/indentation/long lines/formatting
(in one case: re-order code slightly to not do col_set_str() & etc until
              after initial "frame acceptance testing" by dissector.

svn path=/trunk/; revision=42683
2012-05-17 20:13:22 +00:00
Jakub Zawadzki
b4624651e9 Fix copy&paste: hf variable name in hfi->abbrev
svn path=/trunk/; revision=42682
2012-05-17 19:41:19 +00:00
Michael Tüxen
24fa3fb59a No leading whitespaces in the INFO column.
svn path=/trunk/; revision=42679
2012-05-17 15:31:15 +00:00
Bill Meier
6fbb09d50b General Cleanup including:
- Remove unneeded #include <stdlib.h>;
- Remove "README.developer" comments;
- Reformat hf[] entries;
- Remove unneeded variable initialization;
- "localize" some variables;
- Whitespace/indentation/long lines/formatting
- (In one case) proto_tree_add_uint returns a proto_item* (not a proto_tree *);

svn path=/trunk/; revision=42678
2012-05-17 14:35:11 +00:00
Michael Tüxen
6526ea3751 Add support for specifying an SCTP port number.
svn path=/trunk/; revision=42677
2012-05-17 14:34:09 +00:00
Jakub Zawadzki
91690d8a28 Fix string buffer overflow (bug #7029)
g_strlcpy() always return the size of strlen(src), so in case of truncation it could happen that offset_r > size or offset_e > size.
Fix it by adding new function protoo_strlcpy() which returns how many bytes was copied to dest buffer.


svn path=/trunk/; revision=42676
2012-05-17 10:18:53 +00:00
pascal
b607964f1f Fix spice.common_cap_byte1 filter I changed by mistake in r42664
svn path=/trunk/; revision=42675
2012-05-17 08:22:34 +00:00
Gerald Combs
9e3487a953 Use BASE_DEC for spice.common_cap_byte1. (Hopefully that's correct.)
svn path=/trunk/; revision=42668
2012-05-16 22:05:47 +00:00
pascal
4a1de290f8 From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7264 :
Enhance the Spice dissector to deal with sized data streams and playback data
From me: fix a few hf entries

svn path=/trunk/; revision=42664
2012-05-16 21:20:16 +00:00
pascal
f400e647b8 From Pontus Andersson via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7259 :
GTP Extension headers are dissected incorrectly

svn path=/trunk/; revision=42663
2012-05-16 20:59:56 +00:00
Chris Maynard
ff667657e8 Largely, whitespace and formatting changes. Added modelines to match.
Other misc. changes:
-> Delete useless, duplicate assignment of offset to 0 in dissect_vsnp().
-> Change short seq # display filter so it's not the same as the seq # filter.
-> pppoe.dump.gz looks to be malformed, so remove unnecessary "remlen" code in
   dissect_cp() and let the packets be displayed as malformed since they are.
-> Remove if (check_col()) checks.
-> Fix copy-and-paste of filter name for ipcp.opt.max_header.

svn path=/trunk/; revision=42661
2012-05-16 19:55:49 +00:00
Jeff Morriss
ef756b397c Fix the *test_install targets so they put the test tools in the right directory (wireshark-gtk2 is one dir up from here).
svn path=/trunk/; revision=42659
2012-05-16 16:36:32 +00:00
Gerald Combs
bdb614e264 Fix a bunch of uninitialized variables found by Coverity Scan. CIDs
702403, 702404, 702405, 702406, 702407, 702408, 702409, 702410, 702411,
and 702412.

svn path=/trunk/; revision=42658
2012-05-16 16:29:12 +00:00
Anders Broman
46e202503a se_allocate and store per packet data.
svn path=/trunk/; revision=42657
2012-05-16 14:56:34 +00:00
pascal
e5f3a74723 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7186 :
Link together access-request and access-challenge messages

svn path=/trunk/; revision=42656
2012-05-16 13:24:10 +00:00
Anders Broman
3e2ea7b812 Handle DCH information in RadioLinkReconfigurationPrepareFDD
svn path=/trunk/; revision=42655
2012-05-16 13:05:27 +00:00
Anders Broman
dc8224653e Only do HS-DSCH Control frames for now as something is broken.
svn path=/trunk/; revision=42653
2012-05-16 08:35:53 +00:00
Anders Broman
e65a6548bf From David Wei:
Corrected info column for piggybacked GTPv2 messages.

svn path=/trunk/; revision=42652
2012-05-16 07:47:15 +00:00
Anders Broman
7918984efc Bug fixes and add HSDSCH
svn path=/trunk/; revision=42650
2012-05-16 05:58:30 +00:00
Anders Broman
ce6e224b5b Bug fixes and add HSDSCH
svn path=/trunk/; revision=42649
2012-05-16 05:57:41 +00:00
Jeff Morriss
6a4b07bb55 Store a copy of the default preferences (e_prefs; the dissectors' default
preference values have been stored for a while now).

If a preference has not been changed from its default value, comment it out
when writing the preferences file.  That way you won't get warnings about
some new "gui.*" (or other non-dissector) preference when switching between
SVN Wireshark and some older version.


Also fix some ommissions in copy_prefs() (preferences that were not copied).


(All these non-dissector preferences seem to require an awful lot of code;
it would be very nice to have a non-dissector preference registration API that
the GUI and core could use so we could eliminate a lot of this code.)

svn path=/trunk/; revision=42648
2012-05-16 03:06:08 +00:00
Bill Meier
2ed4baea4f all:
Merge .h files into .c files since .h files unused elsewhere;
     Do whitespace, indentation & formatting cleanup.
packet-acn.c:
     Fix 2 minor bugs wherein subtree not displayed in packet-details
     because tree variable used in proto_tree_add_text() always NULL.

svn path=/trunk/; revision=42647
2012-05-16 01:41:03 +00:00
Jeff Morriss
2071275974 Most dissectors don't register their preferences in subtrees, so don't allocate the submodules pe_tree until it's needed.
svn path=/trunk/; revision=42646
2012-05-16 01:20:55 +00:00
Chris Maynard
bf0f73f6be Call dissect_osinlcp_opt_type_len() to dissect the OSINLCP option type and length, unintentionally omitted. I guess this is what happens without enough packet captures to test against and a compiler that doesn't warn enough about unused functions. Anyone know how to get MSVC compilers to complain about such things like the other compilers do?
svn path=/trunk/; revision=42644
2012-05-15 23:44:23 +00:00
Jeff Morriss
6f2b6538eb ifdef out dissect_osinlcp_opt_type_len since it's not used--should it be?
svn path=/trunk/; revision=42643
2012-05-15 23:39:06 +00:00
Gerald Combs
63a5845486 Remove a bonus semicolon (CID 702424).
svn path=/trunk/; revision=42641
2012-05-15 22:19:51 +00:00
Bill Meier
a4e0dee6db Merge packet-cimd.h into packet-cimd.c (packet-cimd.h not used elsewhere);
Remove unneeded #includes;
Reformat hf[] entries;
Do minor code rework & whitespace cleanup.

svn path=/trunk/; revision=42640
2012-05-15 22:07:00 +00:00
Chris Maynard
4d7b302a6c PPP OSINLCP improvements. Note that the protocol name has been changed from OSICP to OSINLCP, which matches RFC1377 and IANA terminology from http://www.iana.org/assignments/ppp-numbers
svn path=/trunk/; revision=42639
2012-05-15 22:02:57 +00:00
Gerald Combs
21b3256918 Assign some variables that scan-build was complaining about.
svn path=/trunk/; revision=42638
2012-05-15 21:56:02 +00:00
pascal
101e304d4e Spaces -> tabs
svn path=/trunk/; revision=42637
2012-05-15 21:18:39 +00:00
pascal
96e21ee3f7 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7261 :
Add some sanity checks when dissecting SQ_TYPE_NULL

svn path=/trunk/; revision=42636
2012-05-15 21:16:06 +00:00
Chris Maynard
cf5eae2806 PPP IPCP improvements.
svn path=/trunk/; revision=42635
2012-05-15 21:01:52 +00:00
Bill Meier
b869cb0bc5 Remove unneeded includes (ctype.h, stdio.h);
In one case, define our own size for a string buffer
 (instead of using a magic constant 'BUFSIZ');
In a few cases: do some whitespace, indentation & reformatting cleanup.

svn path=/trunk/; revision=42634
2012-05-15 20:57:21 +00:00
pascal
d5aa739fd0 From Alexander Lüders & Frank Lahm via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7254 :
Enhancements for FPSpotlightRPC AFP function

svn path=/trunk/; revision=42633
2012-05-15 19:25:33 +00:00
Bill Meier
d53320919a Remove unneeded #includes (stdlib, stdio, ctypes, time);
In a few cases: do some whitespace, indentation cleanup & reformatting.

svn path=/trunk/; revision=42632
2012-05-15 19:23:35 +00:00
Gerald Combs
3e4b3756fd From Evan Huus via bug 6805:
Look before we loop

Check the value of various key count parameters against the size of their
parent tag *before* we start looping on them.

Stick an expert error on the field and bound the loop at a sane point if the
count is bogus.

svn path=/trunk/; revision=42631
2012-05-15 19:13:10 +00:00
Gerald Combs
691ea690c8 Fix a few scan-build warnings along with some whitespace.
svn path=/trunk/; revision=42630
2012-05-15 19:11:08 +00:00
Anders Broman
ba39b783d8 Remove more unfinished code.
svn path=/trunk/; revision=42629
2012-05-15 15:46:15 +00:00
Anders Broman
e134cca032 Use converstaion info to dissect FP DCH flows. Revert unfinished code.
svn path=/trunk/; revision=42628
2012-05-15 15:00:52 +00:00
Guy Harris
1c2a67f348 Make the encoding argument uniformly guint rather than gint.
Put the code that's currently common to the ENC_ASCII and ENC_UTF_8
cases in tvb_get_ephemeral_string_enc() into tvb_get_ephemeral_string(),
and call tvb_get_ephemeral_string() in those cases.  Skip the
tvb_ensure_bytes_exist() and ensure_contiguous() calls in the ENC_UTF_16
and ENC_UCS_2 cases, as they're unnecessary there.

Update the comment for tvb_get_ephemeral_string_enc().

Make tvb_get_ephemeral_stringz_enc() handle the encodings that
tvb_get_ephemeral_string_enc() does.

svn path=/trunk/; revision=42627
2012-05-15 05:42:58 +00:00
Guy Harris
1ec0629c1b Make the "idl-light"-to-dissector generator handle hex (and octal)
values in enums (and, while we're at it, add some error checking for
valid values).  (The regenerated dissectors don't differ usefully from
the fixed dissectors, so we don't check them in.)

svn path=/trunk/; revision=42626
2012-05-14 23:19:13 +00:00
Guy Harris
953a5c3fff Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

Change the "idl-light"-to-dissector generator to use ENC_NA for
structures and ENC_LITTLE_ENDIAN for bitmasks (are they always
little-endian, or should they check the data representation?).  Also
change it to properly set the display format for FT_ABSOLUTE_TIME fields
(it now specifies whether to show local time, UTC, or UTC with a
1-origin day-of-year).

Change one routine in the template for the DRSUAPI dissector to use
ENC_UTF_16|ENC_LITTLE_ENDIAN with proto_tree_add_item() (the field it
dissects is known to be a string, so there's no need to check its data
type).

Regenerate the BUDB, BUTC, and DRSUAPI dissectors.  (The generated BUTC
dissector handles pointers differently - either the old dissector was
wrong, or the generator is wrong, or the IDL for the protocol is wrong,
or the difference doesn't actually affect dissection.)

The generator doesn't currently handle hex values in enums correctly;
manually fix packet-dcerpc-drsuapi.h.

svn path=/trunk/; revision=42625
2012-05-14 23:05:28 +00:00
pascal
05cfd1c391 From Frank Lahm via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7256 :
Fix subquery_count loop variable updating

svn path=/trunk/; revision=42624
2012-05-14 21:46:02 +00:00
Jakub Zawadzki
0f1a21aaa9 tvb_unicode_strsize() returns number of bytes, NOT number of UCS-2 characters.
svn path=/trunk/; revision=42622
2012-05-14 06:32:16 +00:00
Guy Harris
14b616c35d Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

Add new "add_packet_field" method to the TreeItem class, taking a
protocol field (*not* a protocol), TvbRange, and encoding value as
arguments.

Add the ENC_ values to init.lua.  Make them all hex #defines so
make-init-lua.pl can easily extract them.

Export tvb_unicode_strsize() for use by Lua (and elsewhere as desired). 
Note that it handles UTF-16 and UTF-8, and fix the comment to note that
its count of hexadectets *does* include the null terminator (that's what
the code does).

svn path=/trunk/; revision=42621
2012-05-14 00:49:05 +00:00
pascal
723b213c89 From Frank Lahm via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7246 :
Patch adding dissection of time data

svn path=/trunk/; revision=42620
2012-05-13 21:02:42 +00:00
pascal
2845705252 Revert 42618 (in 3GPP vocabulary multirat means multi radio access technology)
svn path=/trunk/; revision=42619
2012-05-13 19:03:48 +00:00
Chris Maynard
7cd17ae0b3 More typos: Multirat -> Multirate.
svn path=/trunk/; revision=42618
2012-05-13 18:01:35 +00:00
Chris Maynard
21863ad163 Convert tabs to spaces. Fix some typos.
svn path=/trunk/; revision=42617
2012-05-13 17:55:06 +00:00
Anders Broman
82ba410214 Tabs spelling
svn path=/trunk/; revision=42616
2012-05-13 16:34:53 +00:00
Bill Meier
f9a08c84d5 General cleanup:
- whitespace;
- formatting (including long lines & hf[] entries).

svn path=/trunk/; revision=42614
2012-05-13 14:53:26 +00:00
Gerald Combs
6c1dd6f0de [Automatic manuf, services and enterprise-numbers update for 2012-05-13]
svn path=/trunk/; revision=42612
2012-05-13 14:03:29 +00:00
Anders Broman
6d757a2083 Renove redundant code
svn path=/trunk/; revision=42611
2012-05-13 14:00:10 +00:00
Anders Broman
09c5089ebc Fix de_rr_cell_opt_sacch decoding the DTX cell options wrongly, by using proto_tree_add_split_bits_item_ret_val https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7253
svn path=/trunk/; revision=42610
2012-05-13 13:58:10 +00:00
Guy Harris
f354e31304 A routine that processes a struct_XXX() won't necessarily use its
encoding argument; mark it as (potentially) unused.

svn path=/trunk/; revision=42609
2012-05-12 23:00:15 +00:00
Guy Harris
13095234ad "byte_order" is an encoding value, so it should be guint.
svn path=/trunk/; revision=42608
2012-05-12 22:56:46 +00:00