Commit graph

37298 commits

Author SHA1 Message Date
Chris Maynard
e3779631d6 Some whitespace cleanup. FALSE -> ENC_BIG_ENDIAN. Remove most check_col()'s.
svn path=/trunk/; revision=39159
2011-09-26 20:34:33 +00:00
Guy Harris
a15d409cbf Use ENC_ values in proto_tree_add_item() calls.
Get rid of the code that attempts to deal with the FCS; if the
link-layer dissector hasn't removed the FCS, either:

	1) the link-layer dissector is buggy and should be fixed;

or

	2) the link-layer dissector doesn't know whether there's an FCS
	   and you have to tell it by setting a preference (and if there
	   is no such preference, one needs to be added).

The code in question was causing errors when the link-layer dissector
was removing the FCS when it's known to be present, as it should do.

Get rid of 4-space tabs in favor of spaces.

svn path=/trunk/; revision=39158
2011-09-26 20:33:35 +00:00
Chris Maynard
744a6639fa Fix modeline.
svn path=/trunk/; revision=39157
2011-09-26 20:31:52 +00:00
Stephen Fisher
5ee76e40d4 From Thomas Morin via bug #6395: Improve display for IGMP
svn path=/trunk/; revision=39156
2011-09-26 19:24:47 +00:00
Anders Broman
f54cc3fcb7 Another bug fix from Pascal.
svn path=/trunk/; revision=39155
2011-09-26 18:56:27 +00:00
Chris Maynard
94f51b09cc Make buildbots happy by adding back closing brace.
svn path=/trunk/; revision=39154
2011-09-26 18:24:17 +00:00
Anders Broman
14fbabcb26 Get rid of check_col() and use ENC.
svn path=/trunk/; revision=39153
2011-09-26 17:50:54 +00:00
Anders Broman
75b86a9cd4 From Pascal Quantin:
When building the last byte, the remaining number of bits isn't masked.

svn path=/trunk/; revision=39152
2011-09-26 17:19:54 +00:00
Anders Broman
03a6c7fe7d Get rid of check_col() and use ENC.
svn path=/trunk/; revision=39151
2011-09-26 17:18:10 +00:00
Anders Broman
5f76488f0a Move tvb_new_octet_aligned() to tvbuff.c and use it.
svn path=/trunk/; revision=39150
2011-09-26 15:11:14 +00:00
Anders Broman
b87f9143e4 Get rid of check_col, while at it set ENC.
svn path=/trunk/; revision=39149
2011-09-26 14:50:59 +00:00
Anders Broman
ab901be153 Get rid of check_col, while at it set ENC.
svn path=/trunk/; revision=39148
2011-09-26 11:33:10 +00:00
Anders Broman
fc447d3377 Get rid of check_col, while at it set ENC.
svn path=/trunk/; revision=39147
2011-09-26 09:01:17 +00:00
Anders Broman
4b952c1324 Get rid of check_col, while at it set ENC.
svn path=/trunk/; revision=39146
2011-09-26 08:25:18 +00:00
Anders Broman
d06af0f771 Make it build again.
svn path=/trunk/; revision=39145
2011-09-26 06:13:27 +00:00
Anders Broman
fc63c35843 Get rid of check_col() and use ENC_BIG_ENDIAN.
svn path=/trunk/; revision=39144
2011-09-26 05:52:58 +00:00
Anders Broman
69bfd68ac4 From Martin Kaiser:
Implement the content control resource from the CI+
specification 1.2.

From me:
Change ENC_NA to ENC_BIG_ENDIAN as i suppose this is a big endian protocol and ENC_NA was erroneously used for irems bigger than i byte in some cases.

svn path=/trunk/; revision=39143
2011-09-26 05:17:57 +00:00
Anders Broman
6905d73180 Put in "#if 0":s to make it compile, these widgets are not vissible on my system so I have no idea what the GUI looks like with these changes.
svn path=/trunk/; revision=39142
2011-09-26 04:56:24 +00:00
Jörg Mayer
da0bb6b044 gkvumeter got removed, don't try to build it.
svn path=/trunk/; revision=39141
2011-09-25 22:20:41 +00:00
Bill Meier
0a1ab095ac From Sylvain Munaut: Fix Bug #6351 (Buildbot fuzztest crash);
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6351


svn path=/trunk/; revision=39140
2011-09-25 22:01:50 +00:00
Jörg Mayer
684195abc9 Remove gtkvumeter.[hc]
This may cause windows builds to fail. If nobody picks up the task
of getting it to compile again I'll start doing that tomorrow morning
with the help of the buildbot.

svn path=/trunk/; revision=39139
2011-09-25 21:54:04 +00:00
Jörg Mayer
576ab168c9 Get rid of (hopefully) all configure options to enable MAIN_MENU_USE_UIMANAGER
as it is the only option left.

svn path=/trunk/; revision=39138
2011-09-25 21:27:19 +00:00
Jörg Mayer
420acb2fba We now always build with MAIN_MENU_USE_UIMANAGER, so remove all code using
the old ways except the proto_help.c file, which is kept for now in case someone
is willing to reimplement the help menus using non-deprecated methods.

svn path=/trunk/; revision=39137
2011-09-25 21:19:45 +00:00
Bill Meier
c3d02e4b57 vlan dissector has been restored;
pref "eth.qinq_ethertype" has been moved(restored) to "vlan.qinq_ethertype".

svn path=/trunk/; revision=39136
2011-09-25 21:10:04 +00:00
Jörg Mayer
0d4abaa59c Fix for
/home/jmayer/work/wireshark/svn/trunk/gtk/capture_if_dlg.c:522:3: error: ISO C90 forbids mixed declarations and code


svn path=/trunk/; revision=39135
2011-09-25 19:56:42 +00:00
Bill Meier
f5ff1c5001 Do some cleanup related to the reversion of SVN #34848 donr in SVN #39100.
1. Revert SVN #35830 (See Bug #5645);
   This patch is no longer needed given the reversion.

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

   http://anonsvn.wireshark.org/viewvc?revision=39100&view=revision

2. Restore 'col_set_str(pinfo->cinfo, COL_INFO, "Ethernet II");' just to
       be safe (altho it's possible that this line is not needed).

3. Remove several lines of no longer needed code.

svn path=/trunk/; revision=39134
2011-09-25 19:28:07 +00:00
Stig Bjørlykke
7d00e6b88f Added Glenn Matthews.
svn path=/trunk/; revision=39133
2011-09-25 18:11:38 +00:00
Stig Bjørlykke
81d78db6e5 Try fixing the signed/unsigned mismatch issues.
svn path=/trunk/; revision=39132
2011-09-25 17:30:29 +00:00
Stig Bjørlykke
5be0ca9150 From Glenn Matthews via bug 6319:
Add dissector for XMCP protocol.

From me:
- Fixed an obvious bug setting transaction_id_key[2].key = NULL,
  where transaction_id_key is defined with only 2 elements.
- Only register heur_dissector once.
- Only find media_type_dissector_table once.
- Added packet-xmcp.c to CMakeLists.txt

svn path=/trunk/; revision=39131
2011-09-25 16:31:14 +00:00
Bill Meier
1d113b0dc8 Fix a compile error.
svn path=/trunk/; revision=39130
2011-09-25 15:25:33 +00:00
Bill Meier
f740787546 Minor cleanup:
- Fix two cases of "set but unused" as reported by GCC 4.6;
- remove _U_ from parameters which are actually used;
- printf --> REPORT_DISSECTOR_BUG;
- define a function as static;

svn path=/trunk/; revision=39129
2011-09-25 15:09:44 +00:00
Gerald Combs
6c560b876a [Automatic manuf, services and enterprise-numbers update for 2011-09-25]
svn path=/trunk/; revision=39126
2011-09-25 14:03:26 +00:00
Graeme Lunt
0cdfb11c2f Bug 6369:
Unprotected array write. 


svn path=/trunk/; revision=39125
2011-09-25 07:02:57 +00:00
Michael Tüxen
d884982138 Fix syntax...
svn path=/trunk/; revision=39124
2011-09-24 16:26:49 +00:00
Michael Tüxen
92752916ad Don't consider remote airpcap devices as airpcap devices, but as remote devices.
This makes the GUI consistent.

svn path=/trunk/; revision=39123
2011-09-24 16:24:09 +00:00
Michael Tüxen
6d46e5d01b Use the new remote capturing icon also in the interfaces dialog box.
svn path=/trunk/; revision=39122
2011-09-24 14:16:37 +00:00
Alexis La Goutte
88b162f565 Make buildbot happy
svn path=/trunk/; revision=39121
2011-09-24 13:42:53 +00:00
Alexis La Goutte
c22e483238 Fix a typo in RD offset
svn path=/trunk/; revision=39120
2011-09-24 13:36:51 +00:00
Alexis La Goutte
b5d6b2c1d8 From Abhik Sarkar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2384
SMPP+ which is customized by Huawei company can't be decoded

From me :
Convert "space tabs" to spaces

svn path=/trunk/; revision=39119
2011-09-24 13:27:58 +00:00
Michael Tüxen
66517c8e57 Use one of the new icons for remote interfaces.
svn path=/trunk/; revision=39118
2011-09-24 12:39:09 +00:00
Guy Harris
8a0e6dbaf0 Mark the "adjustment" argument to scroll callbacks as unused. (Is
redrawing sufficient?  Could the adjustment be used to optimize what's
drawn?)

svn path=/trunk/; revision=39117
2011-09-24 00:26:58 +00:00
Gerald Combs
522ab13c8a Network icons from Elliott Aldrich.
svn path=/trunk/; revision=39116
2011-09-24 00:13:32 +00:00
Guy Harris
5d096579e5 Get rid of duplicate call.
svn path=/trunk/; revision=39115
2011-09-23 23:56:21 +00:00
Gerald Combs
44332d7279 Change the case of "sNMPv2-Trap" to match RFC 3416. Reported by Qiyao.
svn path=/trunk/; revision=39114
2011-09-23 22:44:28 +00:00
Chris Maynard
e5c0fb44f8 The -D, -L and -S options are mutually exclusive, so change "and" to "or".
svn path=/trunk/; revision=39113
2011-09-23 21:24:22 +00:00
Anders Broman
c936cbebe8 Grr make it work if GTK < 2.22
svn path=/trunk/; revision=39112
2011-09-23 17:33:04 +00:00
Anders Broman
2dfabbf7f1 Redraw when vertical scroll is used.
svn path=/trunk/; revision=39111
2011-09-23 17:29:01 +00:00
Martin Mathieson
85fdc1e62d Use val_to_str_const().
svn path=/trunk/; revision=39110
2011-09-23 17:10:08 +00:00
Martin Mathieson
5aeb03334c Use val_to_str_const().
svn path=/trunk/; revision=39109
2011-09-23 17:02:56 +00:00
Bill Meier
3c89035568 dissector_(add|delete) ==> dissector_(add|delete)_uint: fixes checkapi error.
svn path=/trunk/; revision=39108
2011-09-23 15:36:26 +00:00