aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-sflow.c
AgeCommit message (Collapse)AuthorFilesLines
2010-12-20Rename the routines that handle dissector tables with unsigned integerguy1-2/+2
keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35224 f5534014-38df-0310-8fa8-9805f1628bb7
2010-12-06Fix various typos and spelling errors.wmeier1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35126 f5534014-38df-0310-8fa8-9805f1628bb7
2010-11-12Getting wrong addr_type from the packet is not a dissector bug.stig1-2/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34847 f5534014-38df-0310-8fa8-9805f1628bb7
2010-11-11From Andrew Feren:etxrab1-143/+131
sflow decode error for some extended formats. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5379 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34840 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-08Restore pinfo->private_data after an exception was thrown by a subdissector.morriss1-22/+21
This is necessary in case a subdissector had changed it but was unable to restore it (due to the exception). Remove check_col(). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34436 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-24(Refining the regexp...) Replace blurbs that match the name (case ↵morriss1-2/+2
insensitive) with NULL. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34230 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-23Replace blurbs that match the name (case insensitive) with NULL.morriss1-34/+34
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34227 f5534014-38df-0310-8fa8-9805f1628bb7
2010-02-16Various relatively small changes:wmeier1-82/+63
- #include stdio, stdlib, string not req'd. - Use less generic macro names for a few defines. - Fix some gcc -Wshadow warnings. - Use the "standard idiom" for handling port preferences; (Doing port add/delete via a registered_init routine is not req'd). - fix a typo. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31900 f5534014-38df-0310-8fa8-9805f1628bb7
2010-02-10Add SVN Id tagmorriss1-6/+8
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31855 f5534014-38df-0310-8fa8-9805f1628bb7
2010-02-09Don't trust the length field in a V5 sample to be valid.guy1-0/+2
This appears to fix bug 4473. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31846 f5534014-38df-0310-8fa8-9805f1628bb7
2010-02-09Do all the missing dissectors the same way.guy1-9/+20
Oh, and there's no dissector registered as "atm" - and, if there were, it probably wouldn't be able to handle AAL5 packets by themselves, as you'd probably have to supply pseudo-header information (where does the VPI/VCI come from, for example?). This fixes bug 4471. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31845 f5534014-38df-0310-8fa8-9805f1628bb7
2010-02-09Another BASE_NONE.etxrab1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31839 f5534014-38df-0310-8fa8-9805f1628bb7
2010-02-08Terminate a value_string, and get rid of a non-ASCII character.guy1-1/+2
(No ligatures, please.) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31837 f5534014-38df-0310-8fa8-9805f1628bb7
2010-02-08flag two unusued arguments with _U_ to prevent a compiler warningsahlberg1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31836 f5534014-38df-0310-8fa8-9805f1628bb7
2010-02-08Fix field base.etxrab1-6/+6
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31833 f5534014-38df-0310-8fa8-9805f1628bb7
2010-02-08From Yi Yu:etxrab1-1963/+3281
Enhanced sFlow dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3543 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31832 f5534014-38df-0310-8fa8-9805f1628bb7
2010-01-03Use different abbrev for IPv4 and IPv6 address.stig1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31433 f5534014-38df-0310-8fa8-9805f1628bb7
2009-08-09Don't guard col_set_str (COL_PROTOCOL) with col_checkkrj1-2/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29340 f5534014-38df-0310-8fa8-9805f1628bb7
2009-06-30Add some length checks. Fixes bug 3567.gerald1-4/+22
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28897 f5534014-38df-0310-8fa8-9805f1628bb7
2009-06-18From Kovarththanan Rajaratnam via bug 3548:stig1-11/+11
(1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28770 f5534014-38df-0310-8fa8-9805f1628bb7
2009-05-01From Reinhard Speyerer:jake1-1/+1
This patch fixes several misspellings/typos in Wireshark SVN revision 28201. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28225 f5534014-38df-0310-8fa8-9805f1628bb7
2009-04-07Use some default true_false_string's.wmeier1-6/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27983 f5534014-38df-0310-8fa8-9805f1628bb7
2009-03-08From Peter (bug 3314):stig1-4/+4
Fixed some 'longjmp' issues. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27654 f5534014-38df-0310-8fa8-9805f1628bb7
2009-01-13Minor changes related to reg_handoff_ & proto_register_wmeier1-4/+5
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27225 f5534014-38df-0310-8fa8-9805f1628bb7
2008-12-02From Jim Young (bug 3092):stig1-1/+1
The attached patch changes the label for the sflow.fs.seqno from "Sequence number:" to "Sample sequence number:". This change helps differentiate this particular item from the sflow.sequence_number which also uses the label of "Sequence number:". git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26902 f5534014-38df-0310-8fa8-9805f1628bb7
2008-12-02- Make sure we hanlde arrays with length 0 correctly.jmayer1-11/+18
- Trivial warning (shadowed variable) fix. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26900 f5534014-38df-0310-8fa8-9805f1628bb7
2008-12-01Initialize sample_enterprise.stig1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26895 f5534014-38df-0310-8fa8-9805f1628bb7
2008-12-01- Add some detail infos to the parent treesjmayer1-39/+63
- Improve decoding of the enterprise/type field - Remove some unused code git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26894 f5534014-38df-0310-8fa8-9805f1628bb7
2008-12-01Attempt to fix build errors.stig1-21/+23
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26892 f5534014-38df-0310-8fa8-9805f1628bb7
2008-12-01The good:jmayer1-504/+1084
- Implement the beginnings of sflow5 support. - Get rid if the inconsistencies regarding return values: Always return the offset. - Make more elements filterable - Make the naming of elements more consistent (not finished) - To see what's missing have a look at the TODO section at the beginning of the file and search for XXX in the code. The not so good: - Only tested with a single sample trace. No extended/expanded data in that trace. - This patch hopefully doesn't break sflow4 support, but I didn't have any traces to test with, so please test. - The names of many filters have changed to make things more consistent. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26891 f5534014-38df-0310-8fa8-9805f1628bb7
2008-09-02Minor cleanup (mostly related to proto_reg_handoff...)wmeier1-6/+3
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26121 f5534014-38df-0310-8fa8-9805f1628bb7
2008-07-09From Motonori Shindo:jake1-0/+100
Currently, sFlow dissector only recongnizes "Header" as the packet data type. This patch enhances it to support "IPv4" and "IPv6" packet data type. This patch seems to work well against sFlow packets exported from AlaxalA switch. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25688 f5534014-38df-0310-8fa8-9805f1628bb7
2008-04-12From Andrew Ferren (big 2434):sake1-1/+1
While borrowing code from an other dissector I have worked on I realized I previously "borrowed" a comment and typo. Here's a fix. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24928 f5534014-38df-0310-8fa8-9805f1628bb7
2008-03-05From Andrew Feren :etxrab1-25/+203
Decoding extended gateway information not implemented for sFlow git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24565 f5534014-38df-0310-8fa8-9805f1628bb7
2008-02-07Removed even more "statement not reached" warnings.stig1-3/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24286 f5534014-38df-0310-8fa8-9805f1628bb7
2007-10-19From Andrew Feren:sake1-17/+93
sFlow datagrams can contain sampled headers from conversations on the network. Often it is convenient to have wireshark dissect these payload headers, but doing so can also have undesirable side effects. Dissected payload headers may match filters looking for header fields that also happen to occur in the payload. This can cause surprising results. Also TCP analysis will almost always flag errors on sampled headers. They are, after all, just a sample and many sequence numbers are sure to be missing. There is probably a more general way to resolve these issues, but adding preferences to enable/disable tcp analysis and dissection of sampled headers will be a good start. This will make it possible to examine the details of sampled headers if desired or to disable dissection if the side effects of dissecting sampled headers cause issues. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23230 f5534014-38df-0310-8fa8-9805f1628bb7
2007-10-11From Andrew Feren:stig1-12/+89
Add preference to allow user to configure the port(s) to use when identifying sFlow. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23153 f5534014-38df-0310-8fa8-9805f1628bb7
2006-12-21From Taisuke SASAKI:jake1-2/+2
I found a misdecoding in dissect_sflow_extended_switch() in epan/dissector/packet-sflow.c and fixed it. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20187 f5534014-38df-0310-8fa8-9805f1628bb7
2006-05-21change a whole bunch of ethereal into wiresharksahlberg1-3/+3
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18196 f5534014-38df-0310-8fa8-9805f1628bb7
2005-08-18Get rid of a no-longer-used variable.guy1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15400 f5534014-38df-0310-8fa8-9805f1628bb7
2005-08-16In packet-sflow.c, don't pass a NULL value pointer togerald1-18/+28
proto_tree_add_ipv6(). Add tree items for the extended router source and dest mask, and fix offsets. These changes appear to be correct, but I don't have a valid capture with extended router data. In proto.c, throw a dissector error if we try to pass a NULL value to various proto_tree_set_*() routines. Fixes bug 356. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15375 f5534014-38df-0310-8fa8-9805f1628bb7
2005-08-08various code cleanup:ulfl1-4/+0
-use g_snprintf instead of sprintf and snprintf -use g_strdup_printf where appropriate -remove #include "snprintf.h" (as only g_snprintf should be used) -replace some more alloc/realloc/calloc/free with their glib pendants git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15264 f5534014-38df-0310-8fa8-9805f1628bb7
2005-05-05Change 802.11f -> F, 802.1d -> D, 802.1x -> X, 802.1q -Q, 802.1P -> pjmayer1-4/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@14321 f5534014-38df-0310-8fa8-9805f1628bb7
2005-03-13Handle the packet headeer for sFlow V5, put in a stub dissector for V5guy1-24/+64
samples, and give the URL of the V5 spec and some hints about how to handle the private enterprise code in those samples. For subtrees that cover structures, make the tree cover the entire structure, not just the first field. Add the flow sample type and extended data type to the protocol tree. Set the protocol column name to capitalize "sFlow" the conventional way, and remove the redundant "sFlow" from the Info column. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13744 f5534014-38df-0310-8fa8-9805f1628bb7
2005-03-11Fix the offset for the system uptime field.guy1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13712 f5534014-38df-0310-8fa8-9805f1628bb7
2005-03-11We don't have an SMDS dissector, and it's not clear what dissectorguy1-1/+14
should be used for ATM, so just use the data dissector for now. The X.25 dissector registers itself as "x.25", not "x25". git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13711 f5534014-38df-0310-8fa8-9805f1628bb7
2004-11-24Export two versions of the Ethereal dissector, for use with encapsulatedguy1-3/+3
Ethernet frames, one for encapsulated frames that include an FCS and one for encapsulated frames that don't include an FCS. Use the appropriate versions. In the ISL dissector, do the same sort of processing we do in the Ethernet dissector to figure out whether the frame has a trailer or not and whether it has an FCS or not. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12593 f5534014-38df-0310-8fa8-9805f1628bb7
2004-07-18Move dissectors to epan/dissectors directory.gram1-0/+1068
Also move ncp222.py, x11-fields, process-x11-fields.pl, make-reg-dotc, and make-reg-dotc.py. Adjust #include lines in files that include packet-*.h files. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11410 f5534014-38df-0310-8fa8-9805f1628bb7
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 19:45:03 +0000