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
Anders Broman
3d03e94cba
Update the draw area as well.
...
svn path=/trunk/; revision=39107
2011-09-23 14:55:26 +00:00
Bill Meier
c74f88547a
Uh, "Fix the fix (in SVN #39105 )" so it compiles.
...
svn path=/trunk/; revision=39106
2011-09-23 14:47:18 +00:00
Bill Meier
f409a21b13
Correction for SVN #39100:"Revert Revision 34838";
...
Fixes buildbot compile error.
svn path=/trunk/; revision=39105
2011-09-23 14:39:23 +00:00
Bill Meier
f5d82ee873
Add packet-vlan.c
...
svn path=/trunk/; revision=39104
2011-09-23 14:15:49 +00:00
Bill Meier
1ec5777439
Put packet-vlan back into Makefile.common (to go with SVN #39100 )
...
svn path=/trunk/; revision=39103
2011-09-23 14:10:52 +00:00
Anders Broman
4fd46f6f0b
Remove duplicated code.
...
svn path=/trunk/; revision=39102
2011-09-23 11:35:37 +00:00
Anders Broman
d150a694cb
Remove code commited by misstake.
...
svn path=/trunk/; revision=39101
2011-09-23 11:22:48 +00:00
Anders Broman
7c0741ad15
Revert Revision 34838 "Resolve bug #2254 : Migrate the 802.1q VLAN dissector into the Ethernet II."
...
as this causes a lot of problems.
See
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5680
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6305
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6366
Original bug:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2254
svn path=/trunk/; revision=39100
2011-09-23 11:01:13 +00:00
Alexis La Goutte
5d51177ad8
Convert "space tabs" to spaces
...
Add modeline information
svn path=/trunk/; revision=39099
2011-09-23 09:03:26 +00:00
Alexis La Goutte
93e7484c63
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=39098
2011-09-23 08:44:53 +00:00
Alexis La Goutte
d70a78c152
From https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6128 : Wireshark doesn't decode BGP.MP_REACH_NLRI.NLRI when RD type is 2(defined in RFC4364:4.2)
...
Fix a wrong offset of RD Type 2 and display AS4 in asdot+ notation (Add a pref to chose the type of display for AS4 ?)
svn path=/trunk/; revision=39097
2011-09-23 08:41:23 +00:00
Anders Broman
8ee02b09e0
Tighten the check on wheter a message really is chipered or not.
...
svn path=/trunk/; revision=39096
2011-09-23 06:55:10 +00:00
Anders Broman
920bdf12f1
From Daniel:
...
Add support for the osmo extension header to IP.a
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6371
While we are there
- Use ENC_BIG_ENDIAN
svn path=/trunk/; revision=39095
2011-09-23 06:19:47 +00:00
Chris Maynard
ff43c0d39f
Trivial: Consistently use 2 spaces after a period terminating a sentence.
...
svn path=/trunk/; revision=39094
2011-09-23 04:33:07 +00:00
Chris Maynard
a202fefaee
Trivial: Fix typo.
...
svn path=/trunk/; revision=39093
2011-09-23 04:17:16 +00:00
Chris Maynard
cbb015b882
Fix a couple of typos and use 2 spaces consistently after a period.
...
svn path=/trunk/; revision=39092
2011-09-23 02:00:50 +00:00
Chris Maynard
a554b48063
Trivial: Add missing <interval> in one case of tshark -z io,stat usage.
...
svn path=/trunk/; revision=39091
2011-09-23 01:23:42 +00:00
Stig Bjørlykke
155de63f73
Add an option -d to specify display filter from the command line.
...
This was requested in bug 2463.
svn path=/trunk/; revision=39090
2011-09-22 18:39:29 +00:00
Bill Meier
231f36be53
(Trivial) Fix a typo in a comment.
...
svn path=/trunk/; revision=39089
2011-09-22 15:57:41 +00:00
Martin Mathieson
4a3d86e46c
Be careful about reporting number of missing SNs when wrapping around SN range.
...
svn path=/trunk/; revision=39088
2011-09-22 15:28:46 +00:00
Anders Broman
86878844b6
Show if per packet info is missing.
...
svn path=/trunk/; revision=39087
2011-09-22 08:59:24 +00:00
Anders Broman
ded5c901fa
Store a pointer to frame_data rather than the time.
...
svn path=/trunk/; revision=39086
2011-09-22 08:46:09 +00:00
Guy Harris
fd2f818353
Use ENC_ values in proto_tree_add_item() calls.
...
In the AgentX dissector, make the "flags" arguments guint8, to match
what's passed in.
In the AIM dissector, use val_to_str() in col_add_str() calls - it gives
the same result if there's a match, and puts a note in the Info column
if there isn't, and is less complicated.
In the AJP13 dissector:
update the URL for the protocol documentation;
add #defines for message types, and use them;
for "enumerated data type" fields, make the fields numerical
rather than strings and give them the value_string tables;
get rid of col_check() calls;
make a Boolean item an FT_BOOLEAN.
svn path=/trunk/; revision=39085
2011-09-22 03:10:30 +00:00