Commit Graph

11704 Commits

Author SHA1 Message Date
Bill Meier 7d8633af66 Don't assign to a proto_item* if the value won't be used: Coverity 852,854;
Add a hidden item to the correct subtree: Coverity 853.

svn path=/trunk/; revision=36334
2011-03-25 21:09:28 +00:00
Jeff Morriss 38b9f1cfbd As suggested by Didier in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3055 :
Apply rev 25869 to some more dissectors.

svn path=/trunk/; revision=36333
2011-03-25 20:04:54 +00:00
Jeff Morriss cc6fc23812 From Didier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3055 :
Apply rev 25869 to most of the rest of the TCP-desegmenting dissectors.
(The SSL dissector was already updated in one of two spots with bug 4535/rev
32456.)

A couple of the patches had to be manually applied.

From me: Fix the comments to match the change (including in the TCP and SSL
dissectors.)

svn path=/trunk/; revision=36332
2011-03-25 19:02:18 +00:00
Chris Maynard 28ef67fb39 Change urb_type from FT_STRING to FT_UINT8. This fixes the display filtering
for this field.  This change was prompted because of the following query:
    http://ask.wireshark.org/questions/3113/usburb_type-values

Also, remove 2 unused fields found by running tools/checkhf.pl.

svn path=/trunk/; revision=36331
2011-03-25 18:51:12 +00:00
Jeff Morriss 2c8e2564f6 Fix the problem reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3785#c14 :
If we thought we finished reassembly (and called the subdissector) only to find
out that the subdissector asked for more data, handle the case where the
subdissector asked for DESEGMENT_UNTIL_FIN.  Previously we only handled the
possibility that the subdissector would ask for a specific number of bytes or
DESEGMENT_ONE_MORE_SEGMENT.

svn path=/trunk/; revision=36330
2011-03-25 15:45:37 +00:00
Ronnie Sahlberg f4a8e83704 remove two unused assignments
coverity 1050


svn path=/trunk/; revision=36329
2011-03-25 07:26:17 +00:00
Ronnie Sahlberg 79e0b02dcd use the newly created tree to store the new items instead of the parent tree
coverity 842


svn path=/trunk/; revision=36328
2011-03-25 07:22:23 +00:00
Ronnie Sahlberg b48b51293d remove unused variable
coverity 229


svn path=/trunk/; revision=36327
2011-03-25 07:19:15 +00:00
Ronnie Sahlberg 8d93bec973 remove an unused variable
coverity 1044


svn path=/trunk/; revision=36326
2011-03-25 07:15:48 +00:00
Ronnie Sahlberg d8f7b6f1ae remove assignment of an unused value
coverity 1178

svn path=/trunk/; revision=36324
2011-03-25 03:07:05 +00:00
Gerald Combs 2ea9b63ee7 If a segment looks like a retransmission, don't mark it out-of-order.
svn path=/trunk/; revision=36323
2011-03-25 00:28:47 +00:00
Bill Meier e402e91dd1 Don't assign to a proto_item* if the value won't be used:
Also: Fix a bug wherein PPP_RTP_CUD8 was being registered
 to "ppp.protocol" with the cudp16 handle rather than the cudp8 handle.

Coverity 1004-1013

svn path=/trunk/; revision=36322
2011-03-24 23:34:13 +00:00
Bill Meier 845612e450 Fix a compile warning: unused variable
svn path=/trunk/; revision=36320
2011-03-24 23:05:36 +00:00
Bill Meier 57833dc778 Don't assign to a proto_item* if the value won't be used: Coverity 942-951
Also: minor Code & Whitespace cleanup.

svn path=/trunk/; revision=36317
2011-03-24 22:27:20 +00:00
Stephen Fisher df50d409fb Only display the 3 digits of precision after the decimal that we have
from the ICMP conversation response time tracking. 


svn path=/trunk/; revision=36316
2011-03-24 21:22:07 +00:00
Bill Meier 78dda7cc7e Don't assign to a proto_item* if the value won't be used: Coverity 1124-1128;
Also: minorwhitespace cleanup.


svn path=/trunk/; revision=36314
2011-03-24 20:17:22 +00:00
Chris Maynard 9493ebe8e9 Display the value of the ICMP echo request/reply response time in milliseconds.
svn path=/trunk/; revision=36313
2011-03-24 18:05:10 +00:00
Jeff Morriss 01ec42762f From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5768 :
Patch 3 :
Enhance MySQL : Request/Response sub-dissector/function 
(white space changes, use ENC_NA when appropriate, use
proto_tree_add_item()...)

Patch 4 :
Enhance MySQL : packet_ok, server, capa sub-dissector/function (white space
changes, use ENC_NA when appropriate, use proto_tree_add_item()...)

Split mysql_dissect_caps in mysql_dissect_caps_client and
mysql_dissect_caps_server

Rename mysql_dissect_ext_caps to mysql_dissect_ext_caps_client

svn path=/trunk/; revision=36309
2011-03-24 15:31:52 +00:00
Anders Broman db3a34973a Beutify IMEISV IE output.
svn path=/trunk/; revision=36308
2011-03-24 10:36:39 +00:00
Anders Broman d11e6439cd Fix Checkapi errors
Error: the name for field " N32" ("gsm_rlcmac_dl.n32") has leading space in packet-gsm_rlcmac.c
Error: the name for field " N51" ("gsm_rlcmac_dl.n51") has leading space in packet-gsm_rlcmac.c
Error: the name for field " N26" ("gsm_rlcmac_dl.n26") has leading space in packet-gsm_rlcmac.c

svn path=/trunk/; revision=36307
2011-03-24 10:35:29 +00:00
Anders Broman 4cd37afb6c From Vincent Helfre:
I updated again the csn1 dissector to associate hf_field to each element.

svn path=/trunk/; revision=36306
2011-03-24 09:20:14 +00:00
Jeff Morriss bb61772be7 From Dirk: fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2930 :
Make the image (png, gif, jfif) dissectors "new style" so that they don't
dissect data that does not belong to them.

Modify the HTTP dissector to call heuristic dissectors on the body if the
registered subdissector does not accept/dissect the data.

From me: don't use assert() and don't add a preference to the HTTP dissector
for this behavior: it makes sense to behave like that by default.

svn path=/trunk/; revision=36305
2011-03-24 02:49:05 +00:00
Jeff Morriss 8c73d0c6f4 If we've already seen a segment which starts a multi-segment pdu (i.e., it's
a retransmission), don't add it to the list (tree) of multi-segment pdus.

Otherwise, if we'd already seen the rest of the pdu and the other segments
were not retransmitted, the retransmission would break dissection of the pdu
because lookups for the segment would find the retransmission (to which the
other segments were not attached).

Since we know this segment is a retransmission, don't bother handing it off
to the subdissector either.

Use PINFO_FD_VISITED().
Add some white space in the desegmentation routine to improve readability.

Apply the same changes to the SSL dissector.

svn path=/trunk/; revision=36304
2011-03-24 02:10:04 +00:00
Ronnie Sahlberg 5f502a5bfb remove a conditional that can never be true
coverity 247


svn path=/trunk/; revision=36301
2011-03-23 21:17:29 +00:00
Chris Maynard 276e9cced3 Add ICMP echo request/reply conversation tracking. Closes bug 5770.
svn path=/trunk/; revision=36298
2011-03-23 20:20:40 +00:00
Jeff Morriss e7a6230eca From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5768 :
Patch 1 :
Enhance MySQL : Reorder hf and Proto_reg

Patch 2 :
Enhance MySQL : white space changes, use ENC_NA when appropriate, use
proto_tree_add_item()

svn path=/trunk/; revision=36296
2011-03-23 19:12:24 +00:00
Bill Meier 95402cf9de Fix bug: 'if ((octet & 0x80) == 80)' ==> 'if ((octet & 0x80) == 0x80)'
Coverity 345

svn path=/trunk/; revision=36293
2011-03-23 15:21:18 +00:00
Bill Meier ae465d5d39 Fix bugs: 'if ((flags & 0x2) == 1)' ==> 'if ((flags & 0x2) != 0)'
Coverity 346 & 347

svn path=/trunk/; revision=36292
2011-03-23 15:15:02 +00:00
Bill Meier fc11b62891 Fix bug: 'guint8 |=0x8000'.
Coverity 350

svn path=/trunk/; revision=36289
2011-03-23 14:51:40 +00:00
Jeff Morriss 50c8f0f80a Don't use C++/C99-style comments.
svn path=/trunk/; revision=36288
2011-03-23 13:18:38 +00:00
Martin Mathieson d620640a70 Remove some unncessary assignments to proto_item pointers.
Coverity 904 & 905.

svn path=/trunk/; revision=36287
2011-03-23 11:35:03 +00:00
Martin Mathieson b47c36a4bd Don't assign proto_item pointers that are not used.
Coverity CIDs 1021 & 1022.

svn path=/trunk/; revision=36286
2011-03-23 10:58:24 +00:00
Martin Mathieson 473b578880 Remove static that was added to appease Coverity 753. 2016 bytes isn't too much to put on the stack.
svn path=/trunk/; revision=36285
2011-03-23 10:12:35 +00:00
Anders Broman fd782e736c From Vincent Helfre:
- added documentation in packet-csn1.h
- fixed a bug in packet-csn1.c
- fixed a BSIC description in packet-gsm_a_rr.c
- removed the "_v" suffix in packet-gsm_rlcmac element description

svn path=/trunk/; revision=36284
2011-03-23 09:14:50 +00:00
Stig Bjørlykke aca69d699a Removed "comparing an array to null", with no effect.
Coverity 532.

svn path=/trunk/; revision=36279
2011-03-23 07:25:08 +00:00
Ronnie Sahlberg 0832de6b8e value&0x03 does not need to be shifted to the right by two.
cut-n-paste bug from a few lines above where value&0x0c do need to be shifted by two
before printing as a value

coverity 342


svn path=/trunk/; revision=36278
2011-03-23 06:50:09 +00:00
Anders Broman 691c566900 CID 453,454
Missing break

svn path=/trunk/; revision=36277
2011-03-23 05:48:58 +00:00
Ronnie Sahlberg 89d3156883 Shift the correct number of steps when masking the UAAERP bit to 0/1
coverity 348

svn path=/trunk/; revision=36274
2011-03-23 04:55:22 +00:00
Ronnie Sahlberg 24eb2e7b6e The NSG bits in the login pdu are 0x0c not 0xc0
coverity 344


svn path=/trunk/; revision=36273
2011-03-23 04:50:17 +00:00
Ronnie Sahlberg feaf55330e Coverity 989
Remove some item=  assignments we dont need since we never use the value
of the created item.


svn path=/trunk/; revision=36269
2011-03-22 20:48:36 +00:00
Bill Meier 1f5bfa75b1 Remove two tests for fail return from g_malloc(); Fixes Coverity #424 "FORWARD_NULL"
svn path=/trunk/; revision=36267
2011-03-22 19:27:48 +00:00
Stig Bjørlykke fac93b08b2 Allocate correct size of nwk_keyring.
Coverity 715.

svn path=/trunk/; revision=36265
2011-03-22 19:16:19 +00:00
Stig Bjørlykke 41d5c9b750 Allocate correct size of hash_key.
Coverity 713.

svn path=/trunk/; revision=36264
2011-03-22 19:13:48 +00:00
Stig Bjørlykke f51139e659 Allocate correct size of reload_frame.
Coverity 714.

svn path=/trunk/; revision=36263
2011-03-22 19:13:05 +00:00
Stig Bjørlykke 2cc2403a33 Initialize al_cto before usage.
Coverity 808.

svn path=/trunk/; revision=36260
2011-03-22 18:42:02 +00:00
Bill Meier fda538056f Fix potential array overrun: Coverity CID #565.
svn path=/trunk/; revision=36258
2011-03-22 18:26:36 +00:00
Martin Mathieson 46857df13e Fix mask when extracting FACH Indicator.
Coverity CID 349.

svn path=/trunk/; revision=36257
2011-03-22 18:24:38 +00:00
Martin Mathieson 0370a7977d Remove redundant comparison.
Coverity CID 361.

svn path=/trunk/; revision=36256
2011-03-22 18:06:58 +00:00
Martin Mathieson 034820599a Make a struct static to avoid growing the stack too much.
Coverity CID 753.

svn path=/trunk/; revision=36255
2011-03-22 17:46:59 +00:00
Martin Mathieson bed50222ac Don't assign top_ti - delete it for now.
Coverity CID 862

svn path=/trunk/; revision=36254
2011-03-22 17:37:47 +00:00
Stephen Fisher b494b86514 From Dirk via bug #5771: Add heuristic dissector for images and HTTP
Also add to AUTHORS file.


svn path=/trunk/; revision=36253
2011-03-22 16:43:16 +00:00
Martin Mathieson 4611533752 There can be up to 15 DL HARQ processes (depending upon TDD config index).
svn path=/trunk/; revision=36250
2011-03-22 14:39:02 +00:00
Stig Bjørlykke 9ec9b1ccb9 Pass pointers to structs instead of struct values to create_ntlmssp_v2_key.
Coverity 567.

svn path=/trunk/; revision=36248
2011-03-22 12:12:04 +00:00
Stig Bjørlykke bdf603c403 Close fp in error case in ssl_parse_key_list to avoid leakage.
Coverity 597.

svn path=/trunk/; revision=36246
2011-03-22 11:40:15 +00:00
Stig Bjørlykke a07fff3b15 Corrected hack for TAPA by checking for "not IPv4".
Coverity 343.

svn path=/trunk/; revision=36244
2011-03-22 10:12:07 +00:00
Ronnie Sahlberg ff04f85940 Coverity 512
Check if we ran out of bytes in the tvb and return NULL
instead of trying to pass it to the decryption routines.



svn path=/trunk/; revision=36241
2011-03-22 09:35:26 +00:00
Anders Broman 1ab6930388 - Add 9.4.5 IMEISV IE dissection
- UE Time Zone is TLV
- Cell Global Identity  PDU type is SGSAP_PDU_TYPE

svn path=/trunk/; revision=36239
2011-03-22 09:06:42 +00:00
Bill Meier bdd6f7f692 Re-arrange code so Coverity Prevent doesn't falsely report several INFINITE_LOOPs: Coverity 427-429 (run 617)
svn path=/trunk/; revision=36233
2011-03-22 00:38:55 +00:00
Bill Meier 56bea38672 Fix an "infinite loop" defect reported by Coverity Prevent (Coverity 430 (run 616)).
svn path=/trunk/; revision=36231
2011-03-21 19:33:19 +00:00
Chris Maynard 1dd51f1e15 From Alexis La Goutte submitted in bug 5759: Use ENC_NA where appropriate.
From me:  Remove unused header fields found by checkhf.pl.  One more ENC_NA.

svn path=/trunk/; revision=36211
2011-03-18 20:02:45 +00:00
Chris Maynard 704838106e All fields are little-endian. Fixes bug 5759 reported by Tang Fulin.
svn path=/trunk/; revision=36210
2011-03-17 20:17:09 +00:00
Martin Mathieson f69a54705c Respond to most of the clang warnings for this dissector.
svn path=/trunk/; revision=36208
2011-03-17 16:00:13 +00:00
Chris Maynard 92377b21df From Jakub Zawadzki: Simpler patch to resolve bug 5755 to properly display all
strings in dissect_octet_string() without having to allocate extra memory.

svn path=/trunk/; revision=36207
2011-03-17 15:37:28 +00:00
Jeff Morriss 8588676679 As per bug 5751, these header files are no longer needed/used.
svn path=/trunk/; revision=36206
2011-03-17 13:27:23 +00:00
Martin Mathieson b138ffa9e7 Avoid some unnecessary assignments (as reported by clang).
svn path=/trunk/; revision=36204
2011-03-16 23:18:59 +00:00
Martin Mathieson c1d824c46c Don't increment after reading last outheader value (as reported by clang).
svn path=/trunk/; revision=36203
2011-03-16 23:01:33 +00:00
Martin Mathieson 46f9b98003 2 VS Code Analyzer warnings were bogus. Avoid one and add a comment about the second one.
svn path=/trunk/; revision=36201
2011-03-16 22:51:45 +00:00
Chris Maynard d40ddf49c6 From Fulko Hew via bug 5755: Fix dissect_octet_string() so it properly displays
strings of any length.

svn path=/trunk/; revision=36199
2011-03-16 14:51:53 +00:00
Anders Broman 9486d7dcc2 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

svn path=/trunk/; revision=36198
2011-03-16 06:21:56 +00:00
Martin Mathieson da45af3980 Try to fix checkApi script.
svn path=/trunk/; revision=36197
2011-03-15 22:55:53 +00:00
Martin Mathieson 2e7a9893c3 Fix calling of LTE dissectors for R9 DCT protocols.
svn path=/trunk/; revision=36196
2011-03-15 17:30:00 +00:00
Anders Broman 23400cd7a3 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

svn path=/trunk/; revision=36195
2011-03-15 06:03:58 +00:00
Stephen Fisher 55b1e9a877 Add expert info to UDP dissector for showing possible (Unix-style)
traceroute packets: if the port number range is 33434 to 33434 + 30.


svn path=/trunk/; revision=36194
2011-03-14 22:01:49 +00:00
Stephen Fisher 1fc46d7c4d 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.


svn path=/trunk/; revision=36193
2011-03-14 19:58:02 +00:00
Gerald Combs 670d38ec71 Properly initialize our filter counters.
svn path=/trunk/; revision=36190
2011-03-14 16:00:51 +00:00
Jaap Keuter 15a032af98 Fix for bug 3933:
Decode TCP port 2443 as Secure Skinny (SCCPS).

svn path=/trunk/; revision=36187
2011-03-14 07:49:05 +00:00
Anders Broman 338f238746 Add dissection of
- MBMS-SESSION-START-REQUEST
- MBMS-SESSION-START-RESPONSE

svn path=/trunk/; revision=36186
2011-03-14 07:15:25 +00:00
Anders Broman 5b60867fc6 ../../../epan/dissectors/packet-gtp.c:5607: error: unused variable ‘length’
svn path=/trunk/; revision=36182
2011-03-13 09:33:45 +00:00
Anders Broman 285513860c Add sub dissection of AVP MBMS Service Area.
svn path=/trunk/; revision=36181
2011-03-12 23:26:55 +00:00
Stig Bjørlykke d3cff4643b Use TRUE/FALSE for encoding_info to make it build.
Added packet-mndp.c to Makefile build.

svn path=/trunk/; revision=36179
2011-03-12 12:09:52 +00:00
Stephen Fisher a8a7de17ea 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.


svn path=/trunk/; revision=36178
2011-03-12 02:06:25 +00:00
Chris Maynard ebe492525f Handle PPP in HDLC framing. Fixes bug 5746.
svn path=/trunk/; revision=36177
2011-03-12 01:32:35 +00:00
Jörg Mayer df9543e3a1 Update/correct some TLVs
svn path=/trunk/; revision=36175
2011-03-09 13:27:13 +00:00
Bill Meier ff6cd61a00 Check that imported private key is RSA; Prevents a crash.
Fixes Bug #5662

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

svn path=/trunk/; revision=36174
2011-03-09 00:43:49 +00:00
Jörg Mayer 3fc5ee8f53 Add support for Mikrotiks Neigbor Discovery Protocol (MNDP).
Sample capture at
http://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=get&target=mndp.pcap

svn path=/trunk/; revision=36170
2011-03-08 19:10:46 +00:00
Chris Maynard 2cc88f04a1 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.

svn path=/trunk/; revision=36169
2011-03-08 18:52:12 +00:00
Chris Maynard 4d20bdd60d Conversation tracking must be handled whether "tree" is NULL or not.
svn path=/trunk/; revision=36168
2011-03-08 18:33:45 +00:00
Jörg Mayer cf8c877d0d Add support for the pre-rfc DAE port 1700
svn path=/trunk/; revision=36167
2011-03-08 18:29:30 +00:00
Bill Meier d9beb8fcb0 From Martin Kaiser: initialize hdr_tag with NO_TAG
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5654

svn path=/trunk/; revision=36163
2011-03-08 13:52:16 +00:00
Sake Blok f28084f772 Fix for bug 5743 : tshark incorrectly calculates tcp stream for SYN packets when port numbers are re-used
svn path=/trunk/; revision=36162
2011-03-08 11:26:34 +00:00
Jeff Morriss e6ce1793e2 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).

svn path=/trunk/; revision=36159
2011-03-07 19:23:55 +00:00
Anders Broman aac7fca686 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

svn path=/trunk/; revision=36158
2011-03-07 17:46:30 +00:00
Stephen Fisher 664916ad64 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.


svn path=/trunk/; revision=36157
2011-03-07 17:01:55 +00:00
Bill Meier 523d4d1cbe 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".

svn path=/trunk/; revision=36156
2011-03-07 16:43:55 +00:00
Anders Broman 24133413b9 Remove a no longer needed struct.
svn path=/trunk/; revision=36155
2011-03-07 12:31:49 +00:00
Anders Broman 840b816f05 Remove more obsolete code.
svn path=/trunk/; revision=36154
2011-03-07 11:56:21 +00:00
Anders Broman 6c47c809ef Fix packet-bssgp.c:125: warning: 'hf_bssgp_tmsi_ptmsi' defined but not used
svn path=/trunk/; revision=36153
2011-03-07 10:01:24 +00:00
Anders Broman a7e379499d Remove the old code.
svn path=/trunk/; revision=36152
2011-03-07 09:36:24 +00:00
Bill Meier 3e92ea5c2f 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.

svn path=/trunk/; revision=36151
2011-03-07 03:10:51 +00:00
Bill Meier 16b528aaf1 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;


svn path=/trunk/; revision=36149
2011-03-07 02:22:48 +00:00
Martin Mathieson 4d3d029e09 Remove some instances of _U_ where the parameter is now used.
svn path=/trunk/; revision=36148
2011-03-06 23:10:28 +00:00
Martin Mathieson d36178cd5d Improve expert info output when detect Scheduling Request 'state machine' problem.
svn path=/trunk/; revision=36147
2011-03-06 22:52:33 +00:00
Stig Bjørlykke 3e261511ab Mark value_string_ext bssgp_cause_vals_ext as WS_VAR_IMPORT.
svn path=/trunk/; revision=36144
2011-03-06 16:37:21 +00:00
Anders Broman b4941ca580 Prepare to remove old bssgp code by changing exports.
svn path=/trunk/; revision=36142
2011-03-06 09:42:41 +00:00
Anders Broman 9a7ad380af From Alexis La Goutte:
Enhance tag fh_hopping_.., tclas, tspec, challenge_text...

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

svn path=/trunk/; revision=36141
2011-03-04 17:40:32 +00:00
Bill Meier f7be370643 From Stefan Metzmacher: Patch that fixes false positives and allows large smb1/2 pdus
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4914



svn path=/trunk/; revision=36140
2011-03-04 15:09:29 +00:00
Tomas Kukosa 0b9c645150 Fix warning
svn path=/trunk/; revision=36139
2011-03-04 14:36:27 +00:00
Tomas Kukosa 3f8b9e87a9 Check only first 14 digits of GeneralizedTime which are fixed, next parts are optional
svn path=/trunk/; revision=36138
2011-03-04 14:01:57 +00:00
Anders Broman 7e17176c39 All messages converted to the "GSM style" dissection.
svn path=/trunk/; revision=36137
2011-03-04 12:57:55 +00:00
Stephen Fisher eec3e70821 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.


svn path=/trunk/; revision=36136
2011-03-04 00:25:56 +00:00
Stephen Fisher 47b9a1235e 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. 


svn path=/trunk/; revision=36135
2011-03-04 00:17:01 +00:00
Stephen Fisher ed9de27ba1 Change "Reference Clock ID" to "Reference ID" to match RFC5905 (also
mention this RFC in the comments).


svn path=/trunk/; revision=36134
2011-03-03 23:48:56 +00:00
Stephen Fisher 4c6e0d3604 Clarify / add explanations for the fields
svn path=/trunk/; revision=36133
2011-03-03 23:47:05 +00:00
Anders Broman 675d79871e Export SONtransferRequestContaine, SONtransferResponseContainerand and Global-ENB-ID
svn path=/trunk/; revision=36130
2011-03-03 07:20:34 +00:00
Jeff Morriss 2ea51a7ad2 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.

svn path=/trunk/; revision=36129
2011-03-03 03:28:38 +00:00
Jeff Morriss ad99181031 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().

svn path=/trunk/; revision=36128
2011-03-03 03:09:21 +00:00
Jeff Morriss 609b1b1e1f Use tvb_memcpy() instead of tvb_get_ptr() + memcpy().
Remove a few unnecessary includes.

svn path=/trunk/; revision=36127
2011-03-03 03:02:03 +00:00
Jeff Morriss 559c1e0d53 Use tvb_ether_to_str().
svn path=/trunk/; revision=36126
2011-03-03 02:41:22 +00:00
Jeff Morriss 212a0274f7 Use tvb_get_guint8() instead of tvb_get_ptr().
Remove a few unnecessary includes.

svn path=/trunk/; revision=36125
2011-03-03 02:32:18 +00:00
Jeff Morriss 26789f5d00 Use tvb_ether_to_str().
svn path=/trunk/; revision=36124
2011-03-03 02:24:44 +00:00
Jeff Morriss ab2b947088 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.

svn path=/trunk/; revision=36123
2011-03-03 02:18:57 +00:00
Anders Broman 6db5c9387b Fix Error: Found non-ASCII characters in packet-ieee80211.c
svn path=/trunk/; revision=36121
2011-03-02 16:25:33 +00:00
Anders Broman 3ccb1950a4 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

svn path=/trunk/; revision=36120
2011-03-02 15:23:38 +00:00
Martin Mathieson 2f6486166f Allow linking back to previous UL tx 32 ms ago.
svn path=/trunk/; revision=36119
2011-03-02 11:33:46 +00:00
Martin Mathieson c5c0195362 Don't overwrite isPhyRetx field for UL frames with DL check.
svn path=/trunk/; revision=36118
2011-03-02 11:16:28 +00:00
Martin Mathieson 3fac9089cb After SR failure, allow for another attempt in SR state machine (presumably with a subsequent RACH happening in-between...)
svn path=/trunk/; revision=36109
2011-03-01 14:58:51 +00:00
Tomas Kukosa 16bdcb2fbe QSIG: decoding of PSS1InformationElement
svn path=/trunk/; revision=36108
2011-03-01 13:01:26 +00:00
Martin Mathieson 0b2e755182 Tweak the way we setup FP R8 info.
svn path=/trunk/; revision=36107
2011-03-01 10:54:57 +00:00
Martin Mathieson aa9102b72f Was reading F in mac-is descriptors the wrong way around...
svn path=/trunk/; revision=36106
2011-03-01 10:53:58 +00:00
Gerald Combs 91fe31c9b4 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.

svn path=/trunk/; revision=36101
2011-03-01 00:50:17 +00:00
Bill Meier 16097406f4 Define some globals as static; Remove uneeded #includes; Whitespace cleanup.
svn path=/trunk/; revision=36100
2011-02-28 23:50:01 +00:00
Bill Meier ef997f2290 Remove unneeded #includes; Add #includes to packet-gsm_rlcmac.c
svn path=/trunk/; revision=36099
2011-02-28 23:46:07 +00:00
Bill Meier 093e8f25c4 Define global vars as static; Whitespace cleanup.
svn path=/trunk/; revision=36098
2011-02-28 23:09:02 +00:00
Stephen Fisher 191f6622e1 Display the NTP version in COL_INFO so tshark output (without -V) looks
more like tcpdump.


svn path=/trunk/; revision=36097
2011-02-28 18:00:34 +00:00
Anders Broman 9a7dbb4182 From Pascal Quantin:
the attached patch should hopefully please the buildbots

svn path=/trunk/; revision=36095
2011-02-28 15:42:58 +00:00
Anders Broman 4c26d6ccb3 From Pascal Quantin:
patch to fix the various issues

svn path=/trunk/; revision=36094
2011-02-28 14:54:22 +00:00
Anders Broman 6eaae55c79 - RE apply checkapi patch.
- Mark unused parameters (From Pascal Quantin).

svn path=/trunk/; revision=36093
2011-02-28 14:17:52 +00:00
Anders Broman 7f604b779d 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.

svn path=/trunk/; revision=36092
2011-02-28 13:55:47 +00:00
Martin Mathieson ee5202f2d8 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.

svn path=/trunk/; revision=36091
2011-02-28 12:26:26 +00:00
Martin Mathieson 93333d8fa1 Make UL retx use warning, rather than error, expert level.
svn path=/trunk/; revision=36090
2011-02-28 12:24:45 +00:00
Anders Broman e761ed7206 Add private extensions under the right tree.
svn path=/trunk/; revision=36089
2011-02-28 11:34:59 +00:00
Anders Broman 6820a81354 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

svn path=/trunk/; revision=36088
2011-02-28 11:33:27 +00:00
Anders Broman eec32e9cbc svn path=/trunk/; revision=36087 2011-02-28 09:43:22 +00:00
Anders Broman 8ec8d3fcc3 Export:
SONtransferRequestContainer
SONtransferResponseContainer
SONtransferCause

svn path=/trunk/; revision=36086
2011-02-27 21:55:35 +00:00
Anders Broman da8918838e Add dissection of SonTransfer-IEs.
svn path=/trunk/; revision=36084
2011-02-27 19:40:30 +00:00
Anders Broman a1e94e7e68 Export SourceCellID.
svn path=/trunk/; revision=36083
2011-02-27 19:39:07 +00:00
Anders Broman f9a0795e3a Export dissect_gsm_map_ISDN_AddressString_PDU();
svn path=/trunk/; revision=36079
2011-02-27 14:54:26 +00:00
Ronnie Sahlberg 2c7c20667d iSCSI REJECT PDU contains the full header of the offending command as payload.
Add dissection of this header.


svn path=/trunk/; revision=36078
2011-02-27 01:11:24 +00:00
Anders Broman 2ea4267951 - Add a dissector table for Private Extensions.
- Use ENC_BIG_ENDIAN.

svn path=/trunk/; revision=36075
2011-02-26 09:37:43 +00:00
Bill Meier bec1c07788 From Herbert Oppmann: Fix "RTMP dissector unknown audio codec"
"
The [...] variable rtmpt_audio_codecs should be enhanced.

According to [Flash Developer's Guide]
10 = HE-AAC and 11 = Speex are missing.

There is also [Adobe "RTMP Specification V1.0]
which additionally lists 3 = INTEL (not used), 7 = G711A, 8 = G711U
and 9 = NellyMoser 16kHz.
"

From me: All but 'Intel (not used)' added to the list of audio codecs


svn path=/trunk/; revision=36073
2011-02-25 19:17:17 +00:00
Anders Broman ff2bbd35b2 Revert file commited by misstake.
svn path=/trunk/; revision=36070
2011-02-25 15:14:12 +00:00
Anders Broman 1b02abc1eb Verify tools fails if wireshark-win32-libs does not exist.
svn path=/trunk/; revision=36068
2011-02-25 15:09:05 +00:00
Anders Broman 527942b05a Add exports.
svn path=/trunk/; revision=36049
2011-02-24 15:06:16 +00:00
Jeff Morriss f91b39b686 From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5724 :
Fix a possible bug/crash with rev 36045.

svn path=/trunk/; revision=36048
2011-02-24 14:49:10 +00:00
Jeff Morriss f2cd4937bc Initialize option_len to avoid a (false positive) unitialized variable warning.
svn path=/trunk/; revision=36047
2011-02-24 14:40:01 +00:00
Jaap Keuter f75eaab39f From Wade Hennessey:
Add support for new header options in the KDP protocol.

svn path=/trunk/; revision=36045
2011-02-24 06:46:47 +00:00
Jaap Keuter 39d38636d1 From Håkon Nessjøen
Additions:
  More correct way of checking direction of packets
  Support for two new packet types: ping, pingreply

svn path=/trunk/; revision=36042
2011-02-24 06:22:52 +00:00
Bill Meier 74bc83a85a Fix Bug #5624: "Unknown MMS multipart media is shown in the wrong subtree"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5624

Do ti = proto_tree_add_text(...,...); yyy=proto_item_add_subtree(ti,...) in the usual manner.

svn path=/trunk/; revision=36039
2011-02-24 03:46:30 +00:00
Gerald Combs 3de62b03c6 Forward port r36036 from trunk-1.4: Make sure we ep_allocate enough
memory.

svn path=/trunk/; revision=36037
2011-02-23 22:49:59 +00:00
Jeff Morriss 2f82a2ee2c From Stephen Donnelly via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5708 :
The ERF record format defines several error flags.

This patch exposes ERF error flags using 'Expert Infos' for highlighting and
counting.

svn path=/trunk/; revision=36035
2011-02-23 17:54:00 +00:00
Jeff Morriss cd99f0aef8 From Fulko Hew via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5709 :
When Wireshark receives an AgentX Ping-PDU that contains a zero length
'context' identifier it emits the following warning:

14:30:20          Warn Dissector bug, protocol AgentX, in packet 1066:
tvbuff.c:2571: failed assertion "bufsize != 0"


The attached patch prevents the warning message from appearing under that
circumstance.  Note:  This patch will also prevent the warning under all other
conditions where a zero length string is specified anywhere in the protocol
dissector.

svn path=/trunk/; revision=36034
2011-02-23 17:45:03 +00:00
Jeff Morriss d8a2cf3c4d From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5713 :
Enhance RIPng
* Replace tvb_memcpy/proto_tree_add_text by proto_tree_add_item
* Remove dependency to packet-ipv6.h
* Remove packet-ripng.h (not needed)

Also update AUTHORS file

From me:
Put a check_col() back and reword (shorten) a couple of the new blurbs.

svn path=/trunk/; revision=36033
2011-02-23 17:31:03 +00:00
Jeff Morriss 02d491eed9 From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5713 :
Enhance PIM 
* Replace struct ip6_hdr/tvb_m by tvb_ip6_to_str
* Remove dependency to packet-ipv6.h

svn path=/trunk/; revision=36032
2011-02-23 17:00:20 +00:00
Anders Broman ed66081a4d From Alexis La Goutte:
Cleanup packet-ipv6.h and dependency.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5713

svn path=/trunk/; revision=36031
2011-02-23 13:51:49 +00:00
Gerald Combs 4783795690 Split get_dns_name() into get_dns_name() and expand_dns_name().
In dissect_ms_compressed_string() dissect_mscldap_string() simply call
expand_dns_name() instead of using duplicate (and insecure) code. This
*might* break CLDAP and SMB dissection. If that's the case we should
probably revert get_dns_name() and simplify expand_dns_name().

Fixes infinite recursion errors found by joernchen of Phenoelit.

svn path=/trunk/; revision=36029
2011-02-23 00:51:02 +00:00
Jaap Keuter 740c1c4aeb Fix for bug 5702:
In RFC 5102 (for IPFIX), id=128 is defined as "bgpNextAdjacentAsNumber" which
is DST_AS_PEER and id=129 as "bgpPrevAdjacentAsNumber" which is SRC_AS_PEER.

svn path=/trunk/; revision=36028
2011-02-22 21:19:13 +00:00
Anders Broman a469849210 From Pascal Quantin:
[3GPP protocols] Prettify the display of Mandatory Value information elements

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

svn path=/trunk/; revision=36026
2011-02-22 11:56:10 +00:00
Stig Bjørlykke d9ef8f9ad1 Ensure we always have a valid top_tree for p1.content. This fixes a problem
with other dissectors using p1.content, such as p7.

Reset global content_type_id so this will be correct in more cases.
This is still not a good solution, because ContentType and Content are
generic objects which may occur individual in P7.

Indicate when to report invalid content-type.

svn path=/trunk/; revision=36025
2011-02-22 10:23:44 +00:00
Jaap Keuter af7e7f1004 From Yaniv Kaul:
This one parses the extended desktop size pseudo-encoding, as specified in
http://www.tigervnc.com/cgi-bin/rfbproto#extendeddesktopsize-pseudo-encoding

svn path=/trunk/; revision=36022
2011-02-21 21:12:21 +00:00
Martin Mathieson 1660ed63ab Previous UL frame may be 8 OR 16 subframes ago.
svn path=/trunk/; revision=36020
2011-02-21 14:43:16 +00:00
Stig Bjørlykke 4428535e56 Added enclosure_item_flags assignment cast.
svn path=/trunk/; revision=36019
2011-02-21 11:36:50 +00:00
Stig Bjørlykke 0803f27f23 Added reassembly of segmented SES packages.
X.225 7.37.1 states that an end SSDU may or may not contain User Data.

This is a fix for bug 5678.

svn path=/trunk/; revision=36018
2011-02-21 11:00:19 +00:00
Anders Broman c51faaa9c6 From: Holger Hans Peter Freyther
The protocol has a simple addition to provide the InService and
OutOfService notification for a MTPL2 link inside the protocol. This
patch adds these types to the type field, stops handing empty packages
to the MTPL3 dissector and fills out the COL_INFO with the type of
the packet.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5706

svn path=/trunk/; revision=36017
2011-02-20 18:56:52 +00:00
Anders Broman 84a712d07a From Alexis La Goutte:
Patch 3 : 

Enhance "Header" Tag Element (replace value_string tag_num_vals[] by
range_string tag_num_vals[]...)
Enhance TIM, IBSS, Country Info, (Q)BSS Load, FH Hopping Parameter...



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

svn path=/trunk/; revision=36016
2011-02-20 18:51:59 +00:00
Stig Bjørlykke 5868c7d026 Renamed x411 to p1, x420 to p22 and s4406 to p772 to be consistent
on the naming policy for X.400 protocols.

svn path=/trunk/; revision=36013
2011-02-20 17:03:29 +00:00
Stig Bjørlykke 393a8d83fb Capitalize protocol name.
svn path=/trunk/; revision=36011
2011-02-20 16:02:59 +00:00
Stig Bjørlykke 2025f2e5f5 Add changes in r35546 to template and conformation file.
svn path=/trunk/; revision=36010
2011-02-20 15:05:21 +00:00
Stig Bjørlykke 632dcd0d77 Add changes in r35384 to template file.
svn path=/trunk/; revision=36009
2011-02-20 15:03:09 +00:00
Gerald Combs 46865581e5 Fix Visual C++ code analysis warnings.
svn path=/trunk/; revision=36007
2011-02-19 00:05:12 +00:00
Gerald Combs a6bbdaa849 Fix some dead code and zero division issues found by Clang scan-build.
In convert_string_case() use g_utf8_strup() instead of converting each
character by hand. Hopefully this won't cause any unexpected changes in
behavior.

svn path=/trunk/; revision=36006
2011-02-18 22:43:48 +00:00
Gerald Combs aaeca955a5 Try to fix more Clang scan-build warnings.
svn path=/trunk/; revision=36005
2011-02-18 21:44:06 +00:00
Stephen Fisher e1afac1b89 From Roberto Morro via bug #5701: Change the PCEP dissector's port
from 1010 to the IANA assigned value of 4189.  From me: Add RFC 5440
to the list of references.


svn path=/trunk/; revision=36004
2011-02-18 20:48:49 +00:00
Anders Broman 0e6aa74d54 From Pascal Quantin:
NAS EPS] Fix display of Authentication (Failure) Parameter IEs

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

svn path=/trunk/; revision=36001
2011-02-18 18:40:29 +00:00
Jeff Morriss 34dc101fcb #if out some (currently) unused functions.
svn path=/trunk/; revision=36000
2011-02-18 17:38:46 +00:00
Jaap Keuter 133cbe7581 From Ivan Lawrow:
The Final CAP Slot field "wpan.cap" in the Superframe Specification for a
beacon is always displayed as zero.

svn path=/trunk/; revision=35999
2011-02-18 08:02:53 +00:00
Anders Broman 29ddaec6a6 Add more MSG dissection.
svn path=/trunk/; revision=35998
2011-02-18 07:00:03 +00:00
Guy Harris eef8820ab6 Nope, the __declspec(noreturn) didn't suffice - either abort() isn't
declared as a noreturn function or declaring except_throw() as a
noreturn function isn't good enough.

svn path=/trunk/; revision=35997
2011-02-18 02:49:46 +00:00
Guy Harris ed86bc8023 Just for fun, see whether using __declspec(noreturn) on the exception
routines is sufficient to convince the Visual Studio code analyzer that
REPORT_DISSECTOR_BUG() never returns.  (That would probably require that
abort() be tagged with __declspec(noreturn); let's hope Microsoft did
the right thing there.)

svn path=/trunk/; revision=35996
2011-02-18 01:28:18 +00:00
Gerald Combs c223ebe718 Fix more Visual C++ analysis errors.
svn path=/trunk/; revision=35995
2011-02-18 01:18:44 +00:00
Gerald Combs dae5200002 Fix some Visual C++ analysis warnings.
svn path=/trunk/; revision=35988
2011-02-17 23:00:34 +00:00
Gerald Combs da198b3083 Fix gcc compilation errors.
svn path=/trunk/; revision=35986
2011-02-17 20:31:11 +00:00
Gerald Combs 1b0516a27e Fix various Visual C++ analysis warnings.
svn path=/trunk/; revision=35985
2011-02-17 19:43:16 +00:00
Gerald Combs 51e5e75373 Don't allocate a bunch of memory on the stack for strings that will be
fed to col_append_fstr; columns have a maximum length of 240 characters
(ITEM_LABEL_LENGTH). Make sure our column text is properly formatted.

svn path=/trunk/; revision=35984
2011-02-17 19:28:30 +00:00
Stig Bjørlykke 17485dbd86 Fixed no_sua_assoc init.
svn path=/trunk/; revision=35980
2011-02-17 11:00:54 +00:00
Anders Broman 31f1c264fb - Introduce association tracking(might not work well with multihoming).
- prefix hf variables with sua ( hf_sua...)

svn path=/trunk/; revision=35979
2011-02-17 10:13:05 +00:00
Jaap Keuter 3884e987b6 From Alexis La Goutte :
A patch to add Vendor ID of VIA Client & Remote AP (from Aruba Networks)
Also add ett_ value for rohc, ike & ike2.

svn path=/trunk/; revision=35974
2011-02-17 08:03:48 +00:00
Gerald Combs 7b254f46fb Fix some Visual C++ static analyzer complaints.
svn path=/trunk/; revision=35971
2011-02-17 01:11:05 +00:00
Stephen Fisher 64666812e9 Change protocol column from "IEEE 802.11" to "802.11" so it fits in
the default column width.


svn path=/trunk/; revision=35969
2011-02-16 21:56:28 +00:00
Guy Harris ae86d3b411 Put the "MCS known information" field into the protocol tree; yes, it's
somewhat redundant, as items aren't displayed if they're not known, but
it can make it a little clearer to people who aren't familiar with the
gory details of radiotap (which people just looking at network traffic
might not be).

Clean up some capitalization of field names.

svn path=/trunk/; revision=35968
2011-02-16 21:08:40 +00:00
Stig Bjørlykke d3051fa55d Generate correct type (FT_OID) for "x420.compression_algorithm_id".
I suspect this should have been fixed in asn2wrs...

svn path=/trunk/; revision=35965
2011-02-16 11:04:28 +00:00
Jeff Morriss edb9220dee Make swap_mac_addr() take a pointer to a TVB and an offset rather than
(generally) a pointer into the TVB.

svn path=/trunk/; revision=35964
2011-02-16 03:36:49 +00:00
Jeff Morriss 45f7c05411 Use tvb_ether_to_str()
svn path=/trunk/; revision=35963
2011-02-16 03:30:59 +00:00
Jeff Morriss feeafce765 Use tvb_ether_to_str().
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().

svn path=/trunk/; revision=35962
2011-02-16 03:26:57 +00:00
Jeff Morriss 66b6391c6b Use tvb_ip_to_str() when it can eliminate a tvb_get_ptr() call.
svn path=/trunk/; revision=35961
2011-02-16 03:08:45 +00:00
Jeff Morriss fb99707fa5 Use tvb_ether_to_str() when it can eliminate a tvb_get_ptr() call.
svn path=/trunk/; revision=35960
2011-02-16 03:05:13 +00:00
Jeff Morriss deabd5ce3a Use tvb_ether_to_str()
svn path=/trunk/; revision=35959
2011-02-16 03:01:19 +00:00
Jeff Morriss 76edd1b8f5 Rename the _to_str() functions in this dissector to tvb_*_to_str() and make
the functions take a pointer to a TVB and an offset rather than (generally)
a pointer into a TVB.

Use NULL as the value_ptr in proto_tree_add_bytes_format() since the bytes are
coming straight from the TVB anyway.

Remove unnecessary include file.

svn path=/trunk/; revision=35958
2011-02-16 02:55:58 +00:00
Jörg Mayer 77047f4ea4 Previously 1 byte TCP payload to port 2000 got interpreted as malformed Skinny
svn path=/trunk/; revision=35950
2011-02-15 12:06:39 +00:00
Jaap Keuter bc1832599b From Ania:
Patch enables decoding CM 7.1(3b) messages and CM5 CallInfoMessage (0x14A).

svn path=/trunk/; revision=35948
2011-02-14 22:52:14 +00:00
Jaap Keuter fdca1ea223 Make sure RTP conversations are created.
svn path=/trunk/; revision=35947
2011-02-14 20:51:40 +00:00
Stig Bjørlykke 0ac8e7cc8d Put error messages and expert info for illegal UTCTime elements as a
subtree on the UTCTime element.

svn path=/trunk/; revision=35945
2011-02-14 10:18:03 +00:00
Jaap Keuter 3c54ea00a9 From Fulko Hew:
The 'upper bound field is not being displayed in Register and Unregister PDU's.

svn path=/trunk/; revision=35943
2011-02-13 21:19:26 +00:00
Anders Broman f9b379bab5 Advance offsets in the "default" branch to avoid infinite loops.
** (tshark.exe:4392): WARNING **: Dissector bug, protocol GSM BSSMAP, in packet
194520: More than 1000000 items in the tree -- possible infinite loop
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5688

svn path=/trunk/; revision=35939
2011-02-13 15:43:17 +00:00
Anders Broman fcec56cd31 Register BICC by name.
svn path=/trunk/; revision=35938
2011-02-13 15:01:34 +00:00
Anders Broman d8a87d589b Update standard references.
svn path=/trunk/; revision=35937
2011-02-13 13:56:30 +00:00
Guy Harris adfedf3600 Use the p2p_dir names for the direction values, and also list
P2P_DIR_UNKNOWN as "Unspecified" (to distinguish it from "Unknown" as in
"I don't know what that value means").

svn path=/trunk/; revision=35936
2011-02-12 20:59:43 +00:00
Anders Broman 35bde0d589 Update dissection of
3.2.2.103 Speech Codec List
3.2.2.104 Speech Codec
to 3GPP TS 48.008 version 9.4.0 Release 9.

svn path=/trunk/; revision=35935
2011-02-12 20:17:47 +00:00
Guy Harris 38c6d248e8 When generating the Info column, don't assume the direction is either
P2P_DIR_SENT or P2P_DIR_RECV - it might be unknown.

Use some #defines for SDP data element IDs, and rename the routine that
gets data elements tor reflect what it does.

svn path=/trunk/; revision=35934
2011-02-12 20:08:47 +00:00
Guy Harris a595f69ce4 The lack of _WITH_PHDR in WTAP_ENCAP_BLUETOOTH_H4 means there's no
pseudo-header, and hence there's no direction indication. Don't set
pinfo->p2p_dir for it.  Use WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR, not
WTAP_ENCAP_BLUETOOTH_H4, for capture files where we have the direction.

Don't assume pinfo->p2p_dir is either P2P_DIR_SENT or P2P_DIR_RECV when
setting the info column in various Bluetooth dissectors; it might be
unknown.

In the HCI H4 dissector, put the direction into the info column
regardless of whether we have a type match or not; the dissectors for
HCI packet types appear to assume it's been set (as they put a blank at
the beginning of the stuff they append to the direction).

svn path=/trunk/; revision=35933
2011-02-12 19:59:41 +00:00
Jeff Morriss ba3f31d873 Register an ett_ variable.
svn path=/trunk/; revision=35928
2011-02-12 03:52:05 +00:00
Jeff Morriss 21cf6ff3ce Remove an unused ett_ variable.
svn path=/trunk/; revision=35927
2011-02-12 03:51:12 +00:00
Jeff Morriss e92dd56b71 Register a bunch of ett_ variables.
Use gint (instead of int) for ett_ variables (for consistency only).

svn path=/trunk/; revision=35922
2011-02-11 21:27:46 +00:00
Anders Broman 5fbe65d670 Update 8.12 Indication IE to 3GPP TS 29.274 version 9.4.0 Release 9
svn path=/trunk/; revision=35921
2011-02-11 21:21:45 +00:00
Jeff Morriss 947ca59731 Register a couple of ett_ variables.
Move the declaration of all the ett_ variables after the hf_ variables
(instead of in between some of them).

svn path=/trunk/; revision=35920
2011-02-11 21:15:41 +00:00
Jeff Morriss fc45d04c22 Register a couple ett_ variables. Declare all the ett_ variables together.
svn path=/trunk/; revision=35919
2011-02-11 21:13:38 +00:00
Guy Harris ab15a35f65 Don't assume we're on port 631.
svn path=/trunk/; revision=35916
2011-02-11 09:28:05 +00:00
Jaap Keuter ff7eeffdb9 From Joe McEachern:
Add support the 6RD DHCP option defined in RFC 5969.

svn path=/trunk/; revision=35915
2011-02-11 08:00:21 +00:00
Guy Harris 0d9152e782 Register for the media type "application/ipp", so *any* HTTP request or
response with that content type will be dissected as IPP.

svn path=/trunk/; revision=35914
2011-02-11 05:54:34 +00:00
Jeff Morriss be81bc949a Rename arphrdaddr_to_str() to tvb_arphrdaddr_to_str() and make it take a pointer a TVB
and an offset instead of (generally) a pointer into a TVB.

svn path=/trunk/; revision=35913
2011-02-11 03:33:11 +00:00
Jeff Morriss 0f59bc7c45 Rename vines_to_str() to tvb_vines_to_str() and make it take a pointer a TVB
and an offset instead of (generally) a pointer into a TVB.

Move most of the contents of packet-vines.h into packet-vines.c: the moved
content is only needed in that file.

svn path=/trunk/; revision=35912
2011-02-11 03:13:24 +00:00
Jeff Morriss d8659693ef Check for places where tvb_bytes_to_str() or tvb_get_bytes_to_str_punct()
should be used (instead of the non-tvb functions with a call to tvb_get_ptr()).

Use those functions in a bunch of places.

svn path=/trunk/; revision=35911
2011-02-11 02:43:07 +00:00
Martin Mathieson f30d00e00a Show subheaders summary in subheader root item.
svn path=/trunk/; revision=35908
2011-02-11 00:29:40 +00:00
Jeff Morriss b1d4ef8851 Use tvb_ip_to_str() and tvb_ether_to_str().
svn path=/trunk/; revision=35905
2011-02-10 22:14:05 +00:00
Jeff Morriss b58b5b5c67 Pass NULL as the value_ptr to proto_tree_add_bytes_format().
Simplify the code a bit since tvb_ensure_bytes_exist() was already throwing
an exception if all the bytes weren't there.

Use tvb_ether_to_str().

svn path=/trunk/; revision=35904
2011-02-10 22:07:29 +00:00
Anders Broman 61515ab830 From Alexis La Goutte:
Cleanup 802.11 Dissector :Enhance SSID, Supported Rates, DS, FH, CFP.. Information Element sub dissector 

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

svn path=/trunk/; revision=35903
2011-02-10 21:45:36 +00:00
Chris Maynard 8d47cebd00 Declare ett's as gint, not guint.
svn path=/trunk/; revision=35902
2011-02-10 20:55:26 +00:00
Jeff Morriss 50e1634f4c Modify proto_tree_add_bytes_format() and proto_tree_add_bytes_format_value()
so that if the start_ptr is NULL the bytes are extracted from the given TVB
using the given offset and length.

Replace a bunch of:

proto_tree_add_bytes_format*(tree, hf, tvb, offset, length, tvb_get_ptr(tvb, offset, length), [...])

with:

proto_tree_add_bytes_format*(tree, hf, tvb, offset, length, NULL, [...])

svn path=/trunk/; revision=35896
2011-02-10 16:31:00 +00:00
Michael Tüxen 7154ed5689 Obtained from Thomas Dreibholz: Update SCTP PPIDs.
svn path=/trunk/; revision=35895
2011-02-10 12:54:20 +00:00
Stig Bjørlykke 1ba57f4c04 Added a dissector table for AttributeId localForm.
Use correct object identifier in ModificationList.

svn path=/trunk/; revision=35894
2011-02-10 10:11:38 +00:00
Anders Broman 60297df554 - Add message name to info col in case of SERVICE REQUEST.
- Get rid of check_col
- proto_tree_add_item -> ENC_BIG_ENDIAN

svn path=/trunk/; revision=35893
2011-02-10 08:28:18 +00:00
Jeff Morriss a67d2b9bf7 Use tvb_bytes_to_str_punct() instead of a homegrown version.
svn path=/trunk/; revision=35892
2011-02-09 22:43:06 +00:00
Jeff Morriss 685c29d386 Use tvb_bytes_to_str_punct() instead of bytestring_to_str(tvb_get_ptr(), ...)
svn path=/trunk/; revision=35891
2011-02-09 22:37:26 +00:00
Jeff Morriss 1d396a69e0 Register ett_gtp_bcm.
Replace some tabs with spaces.


svn path=/trunk/; revision=35890
2011-02-09 18:45:32 +00:00
Jaap Keuter 4ac0559b63 From Grzegorz Szczytowski:
Update of packet-e212.c dissector according to local national regulatory 
MNC assignment document.
www.uke.gov.pl/uke/redir.jsp?place=galleryStats&id=24439

svn path=/trunk/; revision=35889
2011-02-09 08:46:21 +00:00
Jeff Morriss 13d8e41e0f A couple of dissectors have/need an NTP-to-nstime routine, so put it in
packet-ntp and export it to the other dissectors.

Move some macros (now) only used in packet-ntp.c into that file.

svn path=/trunk/; revision=35887
2011-02-09 03:24:12 +00:00
Jeff Morriss 92cd49b4c2 Rename ntp_fmt_ts() to tvb_ntp_fmt_ts() and make it take a pointer to a TVB and
an offset instead of (generally) a pointer into the TVB. Then use the standard
accessor functions to get data out of the TVB.


svn path=/trunk/; revision=35886
2011-02-09 03:00:51 +00:00
Jeff Morriss 5d3a4a06bc Rewrite this dissector's NTP-to-nstime routine to take a TVB and an offset
instead of a pointer into the TVB.  Then use the standard accessor functions
to get data out of the TVB.


svn path=/trunk/; revision=35885
2011-02-09 02:54:12 +00:00
Jeff Morriss a527fa4b49 Add NTP times using proto_tree_add_item().
Replace a couple not-very-descriptive blurbs with NULL.

svn path=/trunk/; revision=35883
2011-02-09 02:27:41 +00:00
Anders Broman 87aaac83ce From Holger Freyther:
Fix the GSMTAP to TETRA table

GSMTAP has the BSCH at 1... this means the table needs to have 9 entries, the
first being 0. 


--------------------------------------------------------------------------------

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

svn path=/trunk/; revision=35882
2011-02-08 22:01:33 +00:00
Anders Broman 771445d49a from Václav Horčák:
Bug 5663 - [PATCH] Fix for MEGACO dissector context tracking.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5663

svn path=/trunk/; revision=35880
2011-02-08 12:33:34 +00:00