Commit Graph

29 Commits

Author SHA1 Message Date
AndersBroman 1d1730fc56 Update some soft-deprecated APIs.
Change-Id: I0e255e72dd4cd9a94a4f92af409c4b34c0a266ed
Reviewed-on: https://code.wireshark.org/review/1491
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-04 19:23:05 +00:00
Francesco Fondelli e60ed4fc30 IANA assigned port number 6653 to OpenFlow. However, applications
(e.g. opendaylight, nox, openvswitch, etc) still use legacy port
numbers.  The most common are 6633 and 6634.  This patch adds a
simple heuristic logic and uses the current uint preference as
additional input.  In most cases no user intervention is needed and
OpenFlow is automatically detected/dissected.

Change-Id: Iebf09b7b870efe9d52421b9acc238208d25d4565
Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com>
Reviewed-on: https://code.wireshark.org/review/921
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-06 17:21:20 +00:00
Alexis La Goutte 296591399f Remove all $Id$ from top of file
(Using sed : sed -i '/^ \* \$Id\$/,+1 d')

Fix manually some typo (in export_object_dicom.c and crc16-plain.c)

Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8
Reviewed-on: https://code.wireshark.org/review/497
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04 14:27:33 +00:00
Anders Broman adc82b16ba From Zoltán Lajos Kis:
Start of OpenFlow 1.4 dissector.

svn path=/trunk/; revision=53405
2013-11-18 06:24:27 +00:00
Anders Broman c9bafe237d From Zoltán Lajos Kis:
Move OpenFlow v1.0 dissector out from main OpenFlow dissector.

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

svn path=/trunk/; revision=53217
2013-11-10 10:46:13 +00:00
Michael Mann 8081cf1d90 Add data parameter to tcp_dissect_pdus() as well as convert it to using "new" style dissectors.
Now that "bytes consumed" can be determined, should tcp_dissect_pdus() take advantage of that?

Should tcp_dissect_pdus return length (bytes consumed)?  There are many dissectors that just call tcp_dissect_pdus() then return tvb_length(tvb).  Seems like that could all be rolled into one.

svn path=/trunk/; revision=53198
2013-11-09 17:46:28 +00:00
Michael Mann f9e5c14dde Add Zoltan Lajos Kis as author
svn path=/trunk/; revision=53119
2013-11-06 22:07:04 +00:00
Anders Broman 99b598baf1 From Zoltán Lajos Kis:
use tcp_dissect_pdus to properly dissect messages.

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

svn path=/trunk/; revision=53091
2013-11-05 19:36:09 +00:00
Bill Meier 0ad98563a2 From didier gautheron: remove redundant or use faster col_xxx functions
- when the text parameter is constant col_add_str() and col_set_str() are equivalent but col_set_str() is faster.
- same for  replace col_append_fstr and col_append_str
- remove col_clear() when it's redundant:
    + before a col_set/col_add if the dissector can't throw an exception.
- replace col_append() after a col_clear() with faster col_add... or col_set

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


svn path=/trunk/; revision=52948
2013-10-29 14:09:20 +00:00
Anders Broman 3f0bbe7669 Fix warnings.
svn path=/trunk/; revision=52803
2013-10-23 20:54:17 +00:00
Bill Meier 80b5c92af0 Remove trailing blanks; Fix some indentation;
Add editor modelines.

svn path=/trunk/; revision=52653
2013-10-16 20:35:08 +00:00
Anders Broman a361571bce As requested by Zoltán Lajos Kis, split the openflow dissector int one file per protocol version.
svn path=/trunk/; revision=52593
2013-10-13 21:25:19 +00:00
Alexis La Goutte fe92d7a217 Fix indent (use 4 spaces)
svn path=/trunk/; revision=52286
2013-09-30 09:02:56 +00:00
Alexis La Goutte 2f3a181f67 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=52285
2013-09-30 09:02:44 +00:00
Anders Broman 8157963907 Start dissect multipart messages.
svn path=/trunk/; revision=52237
2013-09-28 08:58:06 +00:00
Jörg Mayer 703dad7c53 Fix:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-openflow.c: In function ‘dissect_openflow_v_1_3’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-openflow.c:1125:18: error: variable ‘version’ set but not used [-Werror=unused-but-set-variable]
     guint8 type, version;

Remove some trailing whitespace.

svn path=/trunk/; revision=52228
2013-09-27 08:06:44 +00:00
Anders Broman 1662d89793 Fix:
packet-openflow.c:577:31: error: "/*" within comment
packet-openflow.c:655:24: error: "/*" within comment
cc1: warnings being treated as errors
packet-openflow.c: In function 'dissect_openflow_features_reply_v1_3':
packet-openflow.c:671: warning: unused parameter 'pinfo'
packet-openflow.c:671: warning: unused parameter 'length'
packet-openflow.c: In function 'dissect_openflow_multipart_request_v1_3':
packet-openflow.c:809: warning: unused parameter 'pinfo'
packet-openflow.c:809: warning: unused parameter 'length'
packet-openflow.c: At top level:
packet-openflow.c:1033: warning: return type defaults to 'int'
packet-openflow.c:1119: warning: return type defaults to 'int'

svn path=/trunk/; revision=52226
2013-09-26 21:21:54 +00:00
Anders Broman a8a0450aa7 Start refactoring to dissect each version separatly.
svn path=/trunk/; revision=52223
2013-09-26 21:05:04 +00:00
Anders Broman 79352919a6 Fix "malformed packet" and tidy up a bit.
svn path=/trunk/; revision=51740
2013-09-03 19:04:13 +00:00
Alexis La Goutte dc1477b79b Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51737
2013-09-03 18:44:42 +00:00
Alexis La Goutte e070841f5f Fix compilation with Linux packet-openflow.c: In function 'dissect_openflow_pkt_out': packet-openflow.c:663:13: error: variable 'actions_len' set but not used [-Werror=unused-but-set-variable]
And make fix-encoding-args happy

svn path=/trunk/; revision=51651
2013-09-02 23:04:16 +00:00
Anders Broman 2cddd61a48 Fix
packet-openflow.c:318: warning: return type defaults to 'int'
packet-openflow.c: In function 'dissect_openflow_ofp_match_v_1_0':
packet-openflow.c:350: warning: control reaches end of non-void function

svn path=/trunk/; revision=51650
2013-09-02 21:45:09 +00:00
Anders Broman a768180b30 Dissect more of openflow.
svn path=/trunk/; revision=51649
2013-09-02 20:02:49 +00:00
Anders Broman aca2dd29da dissect OFPT_PACKET_IN.
svn path=/trunk/; revision=51633
2013-09-01 19:59:48 +00:00
Alexis La Goutte c55d2bc057 Fix warnings found by fix-encoding-args tools.(and remove some tabs also)
svn path=/trunk/; revision=50623
2013-07-15 18:04:43 +00:00
Alexis La Goutte 3dd52ea2da Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50621
2013-07-15 18:04:23 +00:00
Anders Broman e9872cf077 Update dissection.
svn path=/trunk/; revision=50604
2013-07-15 04:50:42 +00:00
Guy Harris 0f003babb3 Fix cut-and-pasteo found by a compiler warning.
Mark an unused parameter as unused.

svn path=/trunk/; revision=50515
2013-07-11 21:54:23 +00:00
Anders Broman 614194e61f The beginning of an openflow dissector.
svn path=/trunk/; revision=50513
2013-07-11 21:13:27 +00:00