obnox/wireshark/wip.git
9 years agoIntroduce preferences to set the strictness of Invoke/response
etxrab [Fri, 4 Feb 2011 16:12:59 +0000 (16:12 +0000)]
Introduce preferences to set the strictness of Invoke/response
tracking.

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

9 years agoMark a parameter as unused.
morriss [Fri, 4 Feb 2011 15:19:46 +0000 (15:19 +0000)]
Mark a parameter as unused.

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

9 years agoMark some parameters as unused.
morriss [Fri, 4 Feb 2011 15:19:27 +0000 (15:19 +0000)]
Mark some parameters as unused.

Add a format string to some proto_tree_add_text()s.

Add a cast.

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

9 years agoErlang Port Mapper Daemon protocol updated and Erlang Distribution Protocol implemented
kukosa [Fri, 4 Feb 2011 14:10:37 +0000 (14:10 +0000)]
Erlang Port Mapper Daemon protocol updated and Erlang Distribution Protocol implemented

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

9 years agoFrom Samu Varjonen:
etxrab [Fri, 4 Feb 2011 12:30:42 +0000 (12:30 +0000)]
From Samu Varjonen:
Bug fix: Incorrect presentation of Domain Identifier type and length in HIP dissector

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

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

9 years agoFix Bug 5500 - failed assertion in ISAKMP dissector (proto.c:4002)
etxrab [Fri, 4 Feb 2011 12:16:26 +0000 (12:16 +0000)]
Fix  Bug 5500 - failed assertion in ISAKMP dissector (proto.c:4002)
By reinseringt the check in proto_tree_move_item() if tree vissible
removed in http://anonsvn.wireshark.org/viewvc?view=rev&revision=32443
Hopefully not breaking tshark again.

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

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

9 years agoFrom Alexis La Goutte:
etxrab [Fri, 4 Feb 2011 11:52:50 +0000 (11:52 +0000)]
From Alexis La Goutte:
Patch to fix a typo error....

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

9 years agoShow some top-level info about PDCP frame in protocol root.
martinm [Fri, 4 Feb 2011 11:47:38 +0000 (11:47 +0000)]
Show some top-level info about PDCP frame in protocol root.
Especially useful when PDCP is called from RLC.

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

9 years agoFrom Václav Horčák:
etxrab [Fri, 4 Feb 2011 11:45:37 +0000 (11:45 +0000)]
From Václav Horčák:
Fix keeps  parser function in scope of current transactions, allowing multiple
transaction in one packet.

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

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

9 years agoClean up indentation.
guy [Fri, 4 Feb 2011 10:23:22 +0000 (10:23 +0000)]
Clean up indentation.

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

9 years agoFrom Alexis La Goutte:
etxrab [Fri, 4 Feb 2011 10:04:50 +0000 (10:04 +0000)]
From Alexis La Goutte:
Cleanup 802.11 Dissector : Start Header Field by hf_80211_*

Part 10 - 15
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5647

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

9 years agoSet the error code and additional information string in more cases.
guy [Fri, 4 Feb 2011 09:45:39 +0000 (09:45 +0000)]
Set the error code and additional information string in more cases.

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

9 years agoIf ENBname is text, append the text.
etxrab [Fri, 4 Feb 2011 09:38:36 +0000 (09:38 +0000)]
If ENBname is text, append the text.

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

9 years agoSet *err before *err_info - that's how it's done in most other modules.
guy [Fri, 4 Feb 2011 08:10:08 +0000 (08:10 +0000)]
Set *err before *err_info - that's how it's done in most other modules.

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

9 years agoSet *err before *err_info - that's how it's done in most other modules.
guy [Fri, 4 Feb 2011 08:09:35 +0000 (08:09 +0000)]
Set *err before *err_info - that's how it's done in most other modules.

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

9 years agoSet *err before *err_info - that's how it's done in most other modules.
guy [Fri, 4 Feb 2011 08:09:17 +0000 (08:09 +0000)]
Set *err before *err_info - that's how it's done in most other modules.

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

9 years agoFix indentation.
guy [Fri, 4 Feb 2011 08:07:50 +0000 (08:07 +0000)]
Fix indentation.

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

9 years agoPut more data into the "additional error information" messages.
guy [Fri, 4 Feb 2011 02:24:33 +0000 (02:24 +0000)]
Put more data into the "additional error information" messages.

Get rid of debugging printouts that are equivalent to the "additional
error information" messages.

Return additional error info for all WTAP_ERR_BAD_RECORD errors.

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

9 years ago(As in the Windows builds) don't have checkapi check the 'abort' group in wiretap.
morriss [Fri, 4 Feb 2011 02:10:15 +0000 (02:10 +0000)]
(As in the Windows builds) don't have checkapi check the 'abort' group in wiretap.

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

9 years agoUse g_strdup() instead of strdup()
morriss [Fri, 4 Feb 2011 02:08:47 +0000 (02:08 +0000)]
Use g_strdup() instead of strdup()

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

9 years agoFrom David Carne:
jake [Thu, 3 Feb 2011 23:17:31 +0000 (23:17 +0000)]
From David Carne:
col_set_str simply stores the pointer passed to it, and luaL_checkstring
returns a temporary pointer. Changing col_set_str to col_add_str in
Columns_newindex seems to fix the issue.

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

9 years agoFrom Huzaifa Sidhpurwala of the Red Hat Security Response Team: Don't
gerald [Thu, 3 Feb 2011 22:50:49 +0000 (22:50 +0000)]
From Huzaifa Sidhpurwala of the Red Hat Security Response Team: Don't
free uninitialized memory.

See also: bug 5652.

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

9 years agoStore the result of tvb_get_ntohs() in a guint16 instead of a guint8 to avoid a
morriss [Thu, 3 Feb 2011 22:04:19 +0000 (22:04 +0000)]
Store the result of tvb_get_ntohs() in a guint16 instead of a guint8 to avoid a
compiler warning.  (It looks like the only expected values will fit in 8 bits,
but it also appears that the code really is expecting 'of_code' to be stored in
16 bits on the wire.)

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

9 years agoFrom Roberto Morro:
jake [Thu, 3 Feb 2011 20:14:38 +0000 (20:14 +0000)]
From Roberto Morro:
- add PATH-KEY object, PKSv4 and PKSv6 subobjects in ERO (RFC5520)
- new METRIC types, Objective Function (OF) object and TLV (RFC5541)
- new RP object Flags
- restructured PCEP_ERROR object dissection (easier to add new
  error_types, error_values)

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

9 years agoFix: Cygwin make fails after updating to bash v 4.1.9.2
wmeier [Thu, 3 Feb 2011 19:33:48 +0000 (19:33 +0000)]
Fix: Cygwin make fails after updating to bash v 4.1.9.2

Extracts from the cygwin Bash 4.1.9.2 release announcement:

4a. For a single affected script, add this line just after the she-bang:
 (set -o igncr) 2>/dev/null && set -o igncr; # comment is needed

4e. bash-4.1.9-1 dropped support for 'shopt -s igncr';

I'm assuming this is backwards compatible; If not, we'll know quite shortly :)

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

9 years agoInclude packet-tetra.h in the source distribution.
morriss [Thu, 3 Feb 2011 19:01:19 +0000 (19:01 +0000)]
Include packet-tetra.h in the source distribution.

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

9 years agoUse the right proto_tree * variable.
guy [Thu, 3 Feb 2011 18:15:56 +0000 (18:15 +0000)]
Use the right proto_tree * variable.

Clean up indentation.

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

9 years agoDissect Erroneous message.
etxrab [Thu, 3 Feb 2011 17:45:17 +0000 (17:45 +0000)]
Dissect Erroneous message.

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

9 years agoDisable error substring controls when show errors checkbox is disabled.
martinm [Thu, 3 Feb 2011 17:41:45 +0000 (17:41 +0000)]
Disable error substring controls when show errors checkbox is disabled.

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

9 years agoFrom Alexis La Goutte:
etxrab [Thu, 3 Feb 2011 17:35:16 +0000 (17:35 +0000)]
From Alexis La Goutte:
Cleanup 802.11 Dissector : Start Header Field by hf_80211_*

Part 6 - 9
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5647

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

9 years ago- Use the right tree for IE's
etxrab [Thu, 3 Feb 2011 16:36:22 +0000 (16:36 +0000)]
- Use the right tree for IE's
- Dissect MME and VLR name
- Add strings to some IE's

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

9 years agoHope fully this will be the correct set of files - finally.
etxrab [Thu, 3 Feb 2011 16:17:10 +0000 (16:17 +0000)]
Hope fully this will be the correct set of files - finally.

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

9 years agoJust use g_strdup_printf(), rather than doing it ourselves.
guy [Thu, 3 Feb 2011 08:31:04 +0000 (08:31 +0000)]
Just use g_strdup_printf(), rather than doing it ourselves.

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

9 years agoGet rid of extra blank line at the end of the file.
guy [Thu, 3 Feb 2011 08:16:08 +0000 (08:16 +0000)]
Get rid of extra blank line at the end of the file.

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

9 years agoAdd a forgotten file
etxrab [Thu, 3 Feb 2011 08:06:54 +0000 (08:06 +0000)]
Add a forgotten file

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

9 years agoFrom Samu Varjonen:
jake [Thu, 3 Feb 2011 06:32:35 +0000 (06:32 +0000)]
From Samu Varjonen:
This patch fixes four issues with the Host Identity Protocol (HIP dissector:

1. The incorrect parsing of the "type 1" locator of HIP.
2. Updates the comments to reflect the approval of RFC 5770.
3. Cosmetic change (uppercase SPI)
4. Change in the checksum dissection
   (when the HIP packet is UDP encapsulated 0 checksum is correct).

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

9 years agoAdded default svn:ignore list.
stig [Thu, 3 Feb 2011 06:23:36 +0000 (06:23 +0000)]
Added default svn:ignore list.

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

9 years agoAllow PDCP dissector to be called for complete SDUs from UM RLC PDUs.
martinm [Wed, 2 Feb 2011 23:23:07 +0000 (23:23 +0000)]
Allow PDCP dissector to be called for complete SDUs from UM RLC PDUs.

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

9 years agoAdd and use accessors to get/set per-packet data for LTE MAC.
martinm [Wed, 2 Feb 2011 23:21:16 +0000 (23:21 +0000)]
Add and use accessors to get/set per-packet data for LTE MAC.
This will allow plugins to use the dissector.

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

9 years agoStart to prettify TimeStamp(to be continued).
etxrab [Wed, 2 Feb 2011 23:12:34 +0000 (23:12 +0000)]
Start to prettify TimeStamp(to be continued).

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

9 years agoFrom Alexis La Goutte:
etxrab [Wed, 2 Feb 2011 23:09:41 +0000 (23:09 +0000)]
From Alexis La Goutte:
A series of patch to enhance 802.11 Dissector : Start all Header field by hf_80211_*
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5647

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

9 years agoFrom njohnkev:
jake [Wed, 2 Feb 2011 22:49:40 +0000 (22:49 +0000)]
From njohnkev:
Add support for LAPD data link type.

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

9 years agoRemove duplicate 'asn1/gprscdr/Makefile' entry
wmeier [Wed, 2 Feb 2011 22:02:53 +0000 (22:02 +0000)]
Remove duplicate 'asn1/gprscdr/Makefile' entry

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

9 years agoWarning: packet-tetra.c does not have an SVN Id tag.
etxrab [Wed, 2 Feb 2011 21:06:51 +0000 (21:06 +0000)]
Warning: packet-tetra.c does not have an SVN Id tag.
Error: the blurb for field "Carrier Number" ("tetra.carrier") matches the field name in packet-tetra.c
Error: the blurb for field "PDU" ("tetra.pdu") matches the field name in packet-tetra.c
Error: Found deprecated APIs in packet-tetra.c: dissector_add

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

9 years agoFrom Alexis La Goutte:
etxrab [Wed, 2 Feb 2011 20:21:18 +0000 (20:21 +0000)]
From Alexis La Goutte:
Cleanup renaming hf 80211 Part7.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5609

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

9 years agoFrom Alexis La Goutte:
etxrab [Wed, 2 Feb 2011 20:19:02 +0000 (20:19 +0000)]
From Alexis La Goutte:
Cleanup renaming hf 80211 Part 8 and 9.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5609

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

9 years agoIntegrate and build the tetra dissector.
etxrab [Wed, 2 Feb 2011 20:11:02 +0000 (20:11 +0000)]
Integrate and build the tetra dissector.

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

9 years agoAdd the gprscdr Makefile to the list of Makefiles to be generated.
guy [Wed, 2 Feb 2011 20:06:05 +0000 (20:06 +0000)]
Add the gprscdr Makefile to the list of Makefiles to be generated.

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

9 years agoFrom Alexis La Goutte:
etxrab [Wed, 2 Feb 2011 19:54:14 +0000 (19:54 +0000)]
From Alexis La Goutte:
Fix checkhf error (hf_ieee80211_ff_mesh_mgt_ie_id) and enhance dissect Mesh ID
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5636

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

9 years agoUse gprscdr to dissect CDRs.
etxrab [Wed, 2 Feb 2011 17:51:00 +0000 (17:51 +0000)]
Use gprscdr to dissect CDRs.

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

9 years agoMove gprscdr to dissectors with warnings.
etxrab [Wed, 2 Feb 2011 17:50:12 +0000 (17:50 +0000)]
Move gprscdr to dissectors with warnings.

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

9 years agoBuild gsmcdr.
etxrab [Wed, 2 Feb 2011 17:16:29 +0000 (17:16 +0000)]
Build gsmcdr.

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

9 years agoAdd packet-gprcdr.[ch] to SVN.
etxrab [Wed, 2 Feb 2011 17:15:27 +0000 (17:15 +0000)]
Add packet-gprcdr.[ch] to SVN.

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

9 years agoAdd GTK 2.22 deprecated functions
etxrab [Wed, 2 Feb 2011 17:11:26 +0000 (17:11 +0000)]
Add GTK 2.22 deprecated functions

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

9 years agoAdd gsmcdr to the makefiles.
etxrab [Wed, 2 Feb 2011 17:10:31 +0000 (17:10 +0000)]
Add gsmcdr to the makefiles.

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

9 years agoExport more functions.
etxrab [Wed, 2 Feb 2011 17:09:05 +0000 (17:09 +0000)]
Export more functions.

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

9 years agoRoutines to dissect GPRS CDR's tranported in GTP'
etxrab [Wed, 2 Feb 2011 17:00:19 +0000 (17:00 +0000)]
Routines to dissect GPRS CDR's tranported in GTP'

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

9 years agoAdd the local makefiles.
etxrab [Wed, 2 Feb 2011 06:48:58 +0000 (06:48 +0000)]
Add the local makefiles.

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

9 years agoFrom Holger Freyther:
etxrab [Wed, 2 Feb 2011 06:41:16 +0000 (06:41 +0000)]
From Holger Freyther:
- Code Cleanups and preparation to call code from gsmtap
- Fix a bug in the asn1 file, Bug found with traces from OsmocomTETRA

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

9 years agoThe Beijing Institute of Technology (BIT) and associate professor LI Hai has created...
etxrab [Wed, 2 Feb 2011 06:35:08 +0000 (06:35 +0000)]
The Beijing Institute of Technology (BIT) and associate professor LI Hai has created a TETRA decoder for wireshark,
they made the decision to use the ASN1 infrastructure for creating the dissector and were kind enough to send the
GPLed sourcecode to us(The Osmocom Group). This group is using a protocol provided by their equipment.

This is an initial checkin of the code from BIT, it is not fit for inclusion in Wireshark in this state. Further patches are expected
before the code can be integrated by being added to the makefiles.

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

9 years agomakefile.nmake => Makefile.nmake
jake [Wed, 2 Feb 2011 06:14:27 +0000 (06:14 +0000)]
makefile.nmake => Makefile.nmake

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

9 years agoFrom Alexis La Goutte:
etxrab [Wed, 2 Feb 2011 06:04:19 +0000 (06:04 +0000)]
From Alexis La Goutte:
Fix and enhance WSIE
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5636

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

9 years agomakefile.nmake => Makefile.nmake
wmeier [Wed, 2 Feb 2011 02:52:53 +0000 (02:52 +0000)]
makefile.nmake => Makefile.nmake

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

9 years agoA bit more indentation cleanup
wmeier [Wed, 2 Feb 2011 02:44:14 +0000 (02:44 +0000)]
A bit more indentation cleanup

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

9 years agoUse $(WARNINGS_ARE_ERRORS) (defined in config.nmake) iso -WX
wmeier [Wed, 2 Feb 2011 02:10:24 +0000 (02:10 +0000)]
Use $(WARNINGS_ARE_ERRORS) (defined in config.nmake) iso -WX

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

9 years agoA bit of Windows makefiles rework and cleanup:
wmeier [Wed, 2 Feb 2011 01:19:53 +0000 (01:19 +0000)]
A bit of Windows makefiles rework and cleanup:
- Define macros for certain CFLAGS in config.nmake iso of having defs in each makefile;
  a. -DHAVE_CONFIG_H and -D_U_="" are now part of a macro named STANDARD_CFLAGS;
  b. -WX has been replaced by WARNINGS_ARE_ERRORS (defined as -WX in config.nmake)
      (This allows disabling "Warnings as Errors" by just changing config.nmake)
  c. CVARSDLL definitions (not usage) have been removed from the various makefiles.
     XXX: It appears the usage of CVARSDLL can also be removed (not yet done) since:
     -DWIN32 and -DNULL=0 do not appear to be needed (any more);
     -D_MT and _D_DLL  are not needed since /MP causes these definitions.
  d. Define a macro WARNINGS_CFLAGS with additional specific compiler (level4) warnings to be enabled.
     E.G., 4295: array is too small to include a terminating null character
- config.nmake: reformat some long lines for readability;
- plugins\Makefile.nmake: clean-deps does nothing: remove it (and usage in top-level makefile);
- dissectors/Makefile.nmake: test to enable packet-rrc.obj target needs to include MSVC2010 ...

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

9 years agoGet rid of unused variable warnings.
guy [Wed, 2 Feb 2011 00:04:18 +0000 (00:04 +0000)]
Get rid of unused variable warnings.

Clean up indentation.

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

9 years agoWIN32 ==> _WIN32
wmeier [Tue, 1 Feb 2011 23:02:54 +0000 (23:02 +0000)]
WIN32 ==> _WIN32

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

9 years agoDissect a bit more of data records.
etxrab [Tue, 1 Feb 2011 22:47:12 +0000 (22:47 +0000)]
Dissect a bit more of data records.

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

9 years agoFurther restructure the DECT dissector:
jake [Tue, 1 Feb 2011 22:46:30 +0000 (22:46 +0000)]
Further restructure the DECT dissector:
- Refactor capture info, A field, B field dissection.
- Clean up dissection, removing private A field, B field structures.
- Added standard references.

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

9 years agoFrom John Thacker via bug #5644: Can't include expert.h in C++ code
sfisher [Tue, 1 Feb 2011 21:03:29 +0000 (21:03 +0000)]
From John Thacker via bug #5644: Can't include expert.h in C++ code

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

9 years ago Use {'0', ...} type initializer for fixed length character arrays.
wmeier [Tue, 1 Feb 2011 14:30:24 +0000 (14:30 +0000)]
 Use {'0', ...} type initializer for fixed length character arrays.

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

9 years agoReplace a couple of deprecated functions # ifdef:ed with the GTK version they are...
etxrab [Tue, 1 Feb 2011 07:15:14 +0000 (07:15 +0000)]
Replace a couple of deprecated functions # ifdef:ed with the GTK version they are deprecated in.

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

9 years agoFix compilation error: gsm_a_dir_of_ver_speed_vals is a VALS not a TFS.
sfisher [Tue, 1 Feb 2011 00:46:59 +0000 (00:46 +0000)]
Fix compilation error: gsm_a_dir_of_ver_speed_vals is a VALS not a TFS.

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

9 years agopacket-bssgp.c:10020: warning: 'bssgp_perform_loc_response' defined but not used
etxrab [Mon, 31 Jan 2011 23:00:11 +0000 (23:00 +0000)]
packet-bssgp.c:10020: warning: 'bssgp_perform_loc_response' defined but not used

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

9 years agoFrom Johan Kristell:
jake [Mon, 31 Jan 2011 22:31:05 +0000 (22:31 +0000)]
From Johan Kristell:
In the standard 802.3at-2009 the PoE+ TLVs are 12 bytes long, but in the
earlier version 802.3bc-2009, they are 7 bytes long (the power type/
source/priority, and the requested and allocated fields are lacking).
Not respecting the length of the TLV leads to wireshark displaying garbage
data and could lead to reading outside of buffer.

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

9 years agoMore IE dissection.
etxrab [Mon, 31 Jan 2011 22:25:19 +0000 (22:25 +0000)]
More IE dissection.

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

9 years agoUse {'0', ...} type initializer for fixed length character arrays.
wmeier [Mon, 31 Jan 2011 21:45:16 +0000 (21:45 +0000)]
Use {'0', ...} type initializer for fixed length character arrays.

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

9 years agoUse tvb_bytes_to_str() iso home-grown hex output fcn.
wmeier [Mon, 31 Jan 2011 21:35:48 +0000 (21:35 +0000)]
Use tvb_bytes_to_str() iso home-grown hex output fcn.

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

9 years agoClean up dissector code. Pass data block to data dissector.
jake [Mon, 31 Jan 2011 21:23:49 +0000 (21:23 +0000)]
Clean up dissector code. Pass data block to data dissector.

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

9 years agoFix minor bug lookups of certain "peer ids" would fail.
wmeier [Mon, 31 Jan 2011 21:23:35 +0000 (21:23 +0000)]
Fix minor bug lookups of certain "peer ids" would fail.

The  issue (in essence)
 For:
  char foo[][4] = {"abc", "defg", "hij"};

strlen(foo[1]) will be 7 and not 4 as expected;

Detected via msvc level 4 warning: "array is too small to include a terminating null character"

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

9 years agoClean up the whitespace in script.
jake [Mon, 31 Jan 2011 21:16:20 +0000 (21:16 +0000)]
Clean up the whitespace in script.

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

9 years agoJack up the Lua reference entries one level to make it segmented.
jake [Mon, 31 Jan 2011 21:15:27 +0000 (21:15 +0000)]
Jack up the Lua reference entries one level to make it segmented.

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

9 years agoAdd a Manual entry to the Lua menu.
jake [Mon, 31 Jan 2011 21:13:20 +0000 (21:13 +0000)]
Add a Manual entry to the Lua menu.

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

9 years agoReplace some blurbs with NULL
morriss [Mon, 31 Jan 2011 21:09:28 +0000 (21:09 +0000)]
Replace some blurbs with NULL

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

9 years agoChange a bunch of value and tfs strings to not be prefixed by hf_ but ieee8021. Based...
etxrab [Mon, 31 Jan 2011 20:37:17 +0000 (20:37 +0000)]
Change a bunch of value and tfs strings to not be prefixed by hf_ but ieee8021. Based on Alexis La Gouttes patch.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5636

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

9 years agoFix two cases of 'if (x = y)' which should be 'if (x == y)'.
wmeier [Mon, 31 Jan 2011 18:58:38 +0000 (18:58 +0000)]
Fix two cases of 'if (x = y)'  which should be 'if (x == y)'.

Found by reviewing msvc level 4 warnings "assignment within conditional expression".

(Unfortunately most of the warnings are false positives so this warning can't be enabled)

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

9 years ago#include <stdio.h>, #include <stdlib.h> not req'd;
wmeier [Mon, 31 Jan 2011 17:09:58 +0000 (17:09 +0000)]
#include <stdio.h>, #include <stdlib.h> not req'd;
Make a global variable static (since it's apparently not used elsewhere);
Whitespace changes (indentation, trailing, etc).

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

9 years agoReturn a string (even though abort is called first) to pacify gcc.
martinm [Mon, 31 Jan 2011 16:38:40 +0000 (16:38 +0000)]
Return a string (even though abort is called first) to pacify gcc.

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

9 years agoAdd dissection of Evolved Allocation/Retention Priority I IE.
etxrab [Mon, 31 Jan 2011 16:25:26 +0000 (16:25 +0000)]
Add dissection of Evolved Allocation/Retention Priority I IE.

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

9 years agoFrom Roberto Morro: Fix for Bug #5628
wmeier [Mon, 31 Jan 2011 15:27:26 +0000 (15:27 +0000)]
From Roberto Morro: Fix for Bug #5628

This patch (against revision 35716) resolves the following bug:
[introduced in patch attached to Bug #5518]
"Dissector bug, protocol RSVP, in packet 78:
More than 1000000 items in the tree -- possible infinite loop"

Actually the bug is resolved by the "return" statement that was erased by
mistake. The patch fixes another issue: the code didn't take care of the fact
that TLVs must be padded to a length multiple of 4.

See:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5518
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5628

From me:
 Change two bytestring_to_str(tvb_get_ptr(...),...) to tvb_bytes_to_str(tvb,...)

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

9 years agoDissect more IE's in PERFORM-LOCATION-REQUEST.
etxrab [Mon, 31 Jan 2011 15:16:45 +0000 (15:16 +0000)]
Dissect more IE's in PERFORM-LOCATION-REQUEST.

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

9 years agoOnly define view_menu_auto_scroll_live_cb if HAVE_LIBPCAP
etxrab [Mon, 31 Jan 2011 13:58:36 +0000 (13:58 +0000)]
Only define view_menu_auto_scroll_live_cb if HAVE_LIBPCAP

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

9 years agoTry to fix previous commit.
etxrab [Mon, 31 Jan 2011 13:52:32 +0000 (13:52 +0000)]
Try to fix previous commit.
- menu.h commited by mistake
- new_packet_list.c missing

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

9 years agoFrom Cal Turney:
etxrab [Mon, 31 Jan 2011 12:19:15 +0000 (12:19 +0000)]
From Cal Turney:
Bug 5621 - With String in Packet details searches, highlight row in tree
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5621

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

9 years agoAdded filter autocomplete to "Edit Column Details".
stig [Mon, 31 Jan 2011 07:42:13 +0000 (07:42 +0000)]
Added filter autocomplete to "Edit Column Details".

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

9 years agoPut back a 'return' statement so GCC doesn't generate a warning...
wmeier [Mon, 31 Jan 2011 04:23:46 +0000 (04:23 +0000)]
Put back a 'return' statement so GCC doesn't generate a warning...

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

9 years agoDescribe in more detail some of the fields that may be filled in for an LTE MAC frame.
martinm [Mon, 31 Jan 2011 00:28:22 +0000 (00:28 +0000)]
Describe in more detail some of the fields that may be filled in for an LTE MAC frame.

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

9 years agoClean up white space.
guy [Mon, 31 Jan 2011 00:12:21 +0000 (00:12 +0000)]
Clean up white space.

Use the bssgp_perform_loc_request() routine for PERFORM-LOCATION-REQUEST
(fixes a "defined, but not used" warning).

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

9 years agoFix various instances of "unreachable code".
wmeier [Sun, 30 Jan 2011 23:27:57 +0000 (23:27 +0000)]
Fix various instances of "unreachable code".

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