forked from osmocom/wireshark
Unsplit "m2m" plugin (wimax mac-to-mac encapsulation)
... not to be confused with "machine-to-machine". M2M seems to be a simple Wimax encapsulation protocol developed by Intel. It's not documented publicly anywhere that I can find. The boilerplate to code ratio is huge and it even includes a complete source file from the Wimax dissector (yuck). Put it in the Wimax plugin instead. Minor version number bump for wimax plugin. Change-Id: I2694339dfe89be334093b257a5b34d1577f4dc20 Reviewed-on: https://code.wireshark.org/review/23790 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
parent
e155e91599
commit
6e24d5f690
|
@ -1385,7 +1385,6 @@ if(ENABLE_PLUGINS)
|
|||
plugins/ethercat
|
||||
plugins/gryphon
|
||||
plugins/irda
|
||||
plugins/m2m
|
||||
plugins/mate
|
||||
plugins/opcua
|
||||
plugins/profinet
|
||||
|
|
|
@ -357,7 +357,6 @@ plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
|
|||
-dlopen plugins/ethercat/ethercat.la \
|
||||
-dlopen plugins/gryphon/gryphon.la \
|
||||
-dlopen plugins/irda/irda.la \
|
||||
-dlopen plugins/m2m/m2m.la \
|
||||
-dlopen plugins/mate/mate.la \
|
||||
-dlopen plugins/opcua/opcua.la \
|
||||
-dlopen plugins/profinet/profinet.la \
|
||||
|
|
|
@ -3030,7 +3030,6 @@ AC_CONFIG_FILES(
|
|||
plugins/ethercat/Makefile
|
||||
plugins/gryphon/Makefile
|
||||
plugins/irda/Makefile
|
||||
plugins/m2m/Makefile
|
||||
plugins/mate/Makefile
|
||||
plugins/opcua/Makefile
|
||||
plugins/profinet/Makefile
|
||||
|
|
|
@ -484,9 +484,6 @@ plugin_src = \
|
|||
../plugins/irda/packet-irda.c \
|
||||
../plugins/irda/packet-sir.c \
|
||||
../plugins/irda/plugin.c \
|
||||
../plugins/m2m/packet-m2m.c \
|
||||
../plugins/m2m/plugin.c \
|
||||
../plugins/m2m/wimax_tlv.c \
|
||||
../plugins/Makefile.am.inc \
|
||||
../plugins/mate/mate_grammar.c \
|
||||
../plugins/mate/mate_parser.c \
|
||||
|
|
|
@ -1014,7 +1014,6 @@ File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\docsis.dll"
|
|||
File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\ethercat.dll"
|
||||
File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\gryphon.dll"
|
||||
File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\irda.dll"
|
||||
File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\m2m.dll"
|
||||
File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\opcua.dll"
|
||||
File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\profinet.dll"
|
||||
File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\unistim.dll"
|
||||
|
|
|
@ -16,9 +16,6 @@
|
|||
<Component Id="cmpIrda_dll" Guid="*">
|
||||
<File Id="filIrda_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\irda.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpM2m_dll" Guid="*">
|
||||
<File Id="filM2m_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\m2m.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpOpcua_dll" Guid="*">
|
||||
<File Id="filOpcua_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\opcua.dll" />
|
||||
</Component>
|
||||
|
|
|
@ -26,7 +26,6 @@ SUBDIRS = $(_CUSTOM_SUBDIRS_) \
|
|||
ethercat \
|
||||
gryphon \
|
||||
irda \
|
||||
m2m \
|
||||
mate \
|
||||
opcua \
|
||||
profinet \
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
Authors:
|
||||
Lu Pan <lu.pan@intel.com>
|
||||
Michael Harvey <michael.harvey@intel.com>
|
||||
John Underwood <junderx@yahoo.com>
|
||||
Steve Lo <steve.lo@intel.com>
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
# CMakeLists.txt
|
||||
#
|
||||
# Wireshark - Network traffic analyzer
|
||||
# By Gerald Combs <gerald@wireshark.org>
|
||||
# Copyright 1998 Gerald Combs
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
|
||||
include(WiresharkPlugin)
|
||||
|
||||
# Plugin name and version info (major minor micro extra)
|
||||
set_module_info(m2m 1 1 0 0)
|
||||
|
||||
set(DISSECTOR_SRC
|
||||
packet-m2m.c
|
||||
)
|
||||
|
||||
set(DISSECTOR_SUPPORT_SRC
|
||||
wimax_tlv.c
|
||||
)
|
||||
|
||||
set(PLUGIN_FILES
|
||||
plugin.c
|
||||
${DISSECTOR_SRC}
|
||||
${DISSECTOR_SUPPORT_SRC}
|
||||
)
|
||||
|
||||
set(CLEAN_FILES
|
||||
${PLUGIN_FILES}
|
||||
)
|
||||
|
||||
set_source_files_properties(
|
||||
${CLEAN_FILES}
|
||||
PROPERTIES
|
||||
COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
|
||||
)
|
||||
|
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
register_dissector_files(plugin.c
|
||||
plugin
|
||||
${DISSECTOR_SRC}
|
||||
${DISSECTOR_SUPPORT_SRC}
|
||||
)
|
||||
|
||||
add_plugin_library(m2m)
|
||||
|
||||
install(TARGETS m2m
|
||||
LIBRARY DESTINATION ${PLUGIN_INSTALL_LIBDIR} NAMELINK_SKIP
|
||||
RUNTIME DESTINATION ${PLUGIN_INSTALL_LIBDIR}
|
||||
ARCHIVE DESTINATION ${PLUGIN_INSTALL_LIBDIR}
|
||||
)
|
||||
|
||||
file(GLOB DISSECTOR_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h")
|
||||
CHECKAPI(
|
||||
NAME
|
||||
m2m
|
||||
SWITCHES
|
||||
-g abort -g termoutput -build
|
||||
SOURCES
|
||||
${DISSECTOR_SRC}
|
||||
${DISSECTOR_SUPPORT_SRC}
|
||||
${DISSECTOR_HEADERS}
|
||||
)
|
||||
|
||||
#
|
||||
# Editor modelines - http://www.wireshark.org/tools/modelines.html
|
||||
#
|
||||
# Local variables:
|
||||
# c-basic-offset: 8
|
||||
# tab-width: 8
|
||||
# indent-tabs-mode: t
|
||||
# End:
|
||||
#
|
||||
# vi: set shiftwidth=8 tabstop=8 noexpandtab:
|
||||
# :indentSize=8:tabSize=8:noTabs=false:
|
||||
#
|
|
@ -1,340 +0,0 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Library General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Program's
|
||||
source code as you receive it, in any medium, provided that you
|
||||
conspicuously and appropriately publish on each copy an appropriate
|
||||
copyright notice and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Program
|
||||
specifies a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||
REPAIR OR CORRECTION.
|
||||
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Library General
|
||||
Public License instead of this License.
|
|
@ -1,3 +0,0 @@
|
|||
Splited the code into two plugins: wimax and m2m.
|
||||
wimax contains all the WiMax Protocol related dissectors
|
||||
m2m contains only the WiMax MAC to MAC Protocol TLV packet dissector.
|
|
@ -1,63 +0,0 @@
|
|||
# Makefile.am
|
||||
#
|
||||
# Wireshark - Network traffic analyzer
|
||||
# By Gerald Combs <gerald@wireshark.org>
|
||||
# Copyright 1998 Gerald Combs
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
include $(top_srcdir)/Makefile.am.inc
|
||||
include ../Makefile.am.inc
|
||||
|
||||
# the name of the plugin
|
||||
PLUGIN_NAME = m2m
|
||||
|
||||
# the dissector sources (without any helpers)
|
||||
# Non-generated sources to be scanned for registration routines
|
||||
NONGENERATED_REGISTER_C_FILES = \
|
||||
packet-m2m.c
|
||||
|
||||
# Non-generated sources
|
||||
NONGENERATED_C_FILES = \
|
||||
$(NONGENERATED_REGISTER_C_FILES) \
|
||||
wimax_tlv.c
|
||||
|
||||
plugin_LTLIBRARIES = m2m.la
|
||||
|
||||
m2m_la_SOURCES = \
|
||||
plugin.c \
|
||||
moduleinfo.h \
|
||||
$(SRC_FILES) \
|
||||
$(HEADER_FILES)
|
||||
|
||||
m2m_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS)
|
||||
|
||||
m2m_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS)
|
||||
|
||||
m2m_la_LDFLAGS = $(PLUGIN_LDFLAGS)
|
||||
|
||||
CLEANFILES = \
|
||||
m2m \
|
||||
*~
|
||||
|
||||
DISTCLEANFILES = \
|
||||
plugin.c
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in
|
||||
|
||||
EXTRA_DIST = \
|
||||
plugin.rc.in \
|
||||
CMakeLists.txt
|
|
@ -1,50 +0,0 @@
|
|||
/* moduleinfo.h
|
||||
*
|
||||
* Copyright (c) 2007 by Intel Corporation.
|
||||
*
|
||||
* Author: Lu Pan
|
||||
*
|
||||
* Wireshark - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@wireshark.org>
|
||||
* Copyright 1999 Gerald Combs
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
/* Included *after* config.h, in order to re-define these macros */
|
||||
|
||||
#ifdef PACKAGE
|
||||
#undef PACKAGE
|
||||
#endif
|
||||
|
||||
/* Name of package */
|
||||
#define PACKAGE "m2m"
|
||||
|
||||
|
||||
#ifdef VERSION
|
||||
#undef VERSION
|
||||
#endif
|
||||
|
||||
/* Version number of package */
|
||||
|
||||
#define stringiz1(x) #x
|
||||
#define stringize(x) stringiz1(x)
|
||||
|
||||
#ifndef BUILD_NUMBER
|
||||
#define BUILD_NUMBER 0
|
||||
#endif
|
||||
|
||||
#define VERSION "1.1." stringize(BUILD_NUMBER)
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
#include "winver.h"
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION @RC_MODULE_VERSION@
|
||||
PRODUCTVERSION @RC_VERSION@
|
||||
FILEFLAGSMASK 0x0L
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS VS_FF_DEBUG
|
||||
#else
|
||||
FILEFLAGS 0
|
||||
#endif
|
||||
FILEOS VOS_NT_WINDOWS32
|
||||
FILETYPE VFT_DLL
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904b0"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0"
|
||||
VALUE "FileDescription", "@PACKAGE@ dissector\0"
|
||||
VALUE "FileVersion", "@MODULE_VERSION@\0"
|
||||
VALUE "InternalName", "@PACKAGE@ @MODULE_VERSION@\0"
|
||||
VALUE "LegalCopyright", "Copyright © 1998 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
|
||||
VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0"
|
||||
VALUE "ProductName", "Wireshark\0"
|
||||
VALUE "ProductVersion", "@VERSION@\0"
|
||||
VALUE "Comments", "Built with @MSVC_VARIANT@\0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1200
|
||||
END
|
||||
END
|
|
@ -1,195 +0,0 @@
|
|||
/* wimax_tlv.c
|
||||
* WiMax TLV handling functions
|
||||
*
|
||||
* Copyright (c) 2007 by Intel Corporation.
|
||||
*
|
||||
* Author: Lu Pan <lu.pan@intel.com>
|
||||
*
|
||||
* Wireshark - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@wireshark.org>
|
||||
* Copyright 1999 Gerald Combs
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
/*************************************************************/
|
||||
/* ----------------------- NOTE ------------------------- */
|
||||
/* There is an identical copy of this file, wimax_tlv.c, in */
|
||||
/* both .../plugins/m2m and .../plugins/wimax. If either */
|
||||
/* one needs to be modified, please be sure to copy the file */
|
||||
/* to the sister directory and check it in there also. */
|
||||
/*************************************************************/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <plugins/wimax/wimax_tlv.h>
|
||||
|
||||
/*************************************************************/
|
||||
/* init_tlv_info() */
|
||||
/* retrive the tlv information from specified tvb and offset */
|
||||
/* parameter: */
|
||||
/* info - pointer of a tlv information data structure */
|
||||
/* return: */
|
||||
/* 0-success */
|
||||
/* !=0-the invalid size of the TLV length (failed) */
|
||||
/*************************************************************/
|
||||
gint init_tlv_info(tlv_info_t *info, tvbuff_t *tvb, gint offset)
|
||||
{
|
||||
guint tlv_len;
|
||||
|
||||
/* get TLV type */
|
||||
info->type = (guint8)tvb_get_guint8( tvb, offset );
|
||||
/* get TLV length */
|
||||
tlv_len = (guint)tvb_get_guint8( tvb, (offset + 1) );
|
||||
/* set the TLV value offset */
|
||||
info->value_offset = 2;
|
||||
/* adjust for multiple-byte TLV length */
|
||||
if((tlv_len & WIMAX_TLV_EXTENDED_LENGTH_MASK) != 0)
|
||||
{ /* multiple bytes TLV length */
|
||||
info->length_type = 1;
|
||||
/* get the size of the TLV length */
|
||||
tlv_len = (tlv_len & WIMAX_TLV_LENGTH_MASK);
|
||||
info->size_of_length = tlv_len;
|
||||
/* update the TLV value offset */
|
||||
info->value_offset += tlv_len;
|
||||
switch (tlv_len)
|
||||
{
|
||||
case 0:
|
||||
info->length = 0; /* no length */
|
||||
break;
|
||||
case 1:
|
||||
info->length = (gint32)tvb_get_guint8( tvb, (offset + 2) ); /* 8 bit */
|
||||
break;
|
||||
case 2:
|
||||
info->length = (gint32)tvb_get_ntohs( tvb, (offset + 2) ); /* 16 bit */
|
||||
break;
|
||||
case 3:
|
||||
info->length = (gint32)tvb_get_ntoh24( tvb, (offset + 2) ); /* 24 bit */
|
||||
break;
|
||||
case 4:
|
||||
info->length = (gint32)tvb_get_ntohl( tvb, (offset + 2) ); /* 32 bit */
|
||||
break;
|
||||
default:
|
||||
/* mark invalid tlv */
|
||||
info->valid = 0;
|
||||
/* failed, return the invalid size of the tlv length */
|
||||
return (gint)tlv_len;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else /* single byte length */
|
||||
{
|
||||
info->length_type = 0;
|
||||
info->size_of_length = 0;
|
||||
info->length = (gint32)tlv_len;
|
||||
}
|
||||
/* mark valid tlv */
|
||||
info->valid = 1;
|
||||
/* success */
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*************************************************************/
|
||||
/* get_tlv_type() */
|
||||
/* get the tlv type of the specified tlv information */
|
||||
/* parameter: */
|
||||
/* info - pointer of a tlv information data structure */
|
||||
/* return: */
|
||||
/* >=0 - TLV type */
|
||||
/* =-1 - invalid tlv info */
|
||||
/*************************************************************/
|
||||
gint get_tlv_type(tlv_info_t *info)
|
||||
{
|
||||
if(info->valid)
|
||||
return (gint)info->type;
|
||||
return -1;
|
||||
}
|
||||
|
||||
/**************************************************************/
|
||||
/* get_tlv_size_of_length() */
|
||||
/* get the size of tlv length of the specified tlv information*/
|
||||
/* parameter: */
|
||||
/* info - pointer of a tlv information data structure */
|
||||
/* return: */
|
||||
/* >=0 - the size of TLV length */
|
||||
/* =-1 - invalid tlv info */
|
||||
/**************************************************************/
|
||||
gint get_tlv_size_of_length(tlv_info_t *info)
|
||||
{
|
||||
if(info->valid)
|
||||
return (gint)info->size_of_length;
|
||||
return -1;
|
||||
}
|
||||
|
||||
/*************************************************************/
|
||||
/* get_tlv_length() */
|
||||
/* get the tlv length of the specified tlv information */
|
||||
/* parameter: */
|
||||
/* info - pointer of a tlv information data structure */
|
||||
/* return: */
|
||||
/* >=0 - TLV length */
|
||||
/* =-1 - invalid tlv info */
|
||||
/*************************************************************/
|
||||
gint32 get_tlv_length(tlv_info_t *info)
|
||||
{
|
||||
if(info->valid)
|
||||
return (gint32)info->length;
|
||||
return -1;
|
||||
}
|
||||
|
||||
/*************************************************************/
|
||||
/* get_tlv_value_offset() */
|
||||
/* get the tlv value offset of the specified tlv information */
|
||||
/* parameter: */
|
||||
/* info - pointer of a tlv information data structure */
|
||||
/* return: */
|
||||
/* >0 - TLV value offset in byte */
|
||||
/* =-1 - invalid tlv info */
|
||||
/*************************************************************/
|
||||
gint get_tlv_value_offset(tlv_info_t *info)
|
||||
{
|
||||
if(info->valid)
|
||||
return (gint)info->value_offset;
|
||||
return -1;
|
||||
}
|
||||
|
||||
/*************************************************************/
|
||||
/* get_tlv_length_type() */
|
||||
/* get the tlv length type of the specified tlv information */
|
||||
/* parameter: */
|
||||
/* info - pointer of a tlv information data structure */
|
||||
/* return: */
|
||||
/* 0 - single byte TLV length */
|
||||
/* 1 - multiple bytes TLV length */
|
||||
/*************************************************************/
|
||||
gint get_tlv_length_type(tlv_info_t *info)
|
||||
{
|
||||
if(info->valid)
|
||||
return (gint)info->length_type;
|
||||
return -1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
||||
*
|
||||
* Local variables:
|
||||
* c-basic-offset: 8
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: t
|
||||
* End:
|
||||
*
|
||||
* vi: set shiftwidth=8 tabstop=8 noexpandtab:
|
||||
* :indentSize=8:tabSize=8:noTabs=false:
|
||||
*/
|
|
@ -22,9 +22,10 @@
|
|||
include(WiresharkPlugin)
|
||||
|
||||
# Plugin name and version info (major minor micro extra)
|
||||
set_module_info(wimax 1 1 0 0)
|
||||
set_module_info(wimax 1 2 0 0)
|
||||
|
||||
set(DISSECTOR_SRC
|
||||
packet-m2m.c
|
||||
packet-wmx.c
|
||||
)
|
||||
|
||||
|
|
|
@ -26,7 +26,8 @@ PLUGIN_NAME = wimax
|
|||
|
||||
# Non-generated sources to be scanned for registration routines
|
||||
NONGENERATED_REGISTER_C_FILES = \
|
||||
packet-wmx.c \
|
||||
packet-m2m.c \
|
||||
packet-wmx.c \
|
||||
wimax_cdma_code_decoder.c \
|
||||
wimax_compact_dlmap_ie_decoder.c \
|
||||
wimax_compact_ulmap_ie_decoder.c \
|
||||
|
|
|
@ -11,8 +11,8 @@ dissectors will be called by the Wireshark because there is no any
|
|||
packet type hookup to the plugin. However, it is very simple to add
|
||||
the WiMax Protocol decoding capability into any of the packet decoder
|
||||
by searching and calling the WiMax Protocol dissectors since they are
|
||||
registered to Wireshark already. m2m plugin is an example that uses
|
||||
the wimax plugin to decode the WiMax MAC to MAC Protocol TLV packet.
|
||||
registered to Wireshark already (see WiMAX M2M Encapsulation Protocol
|
||||
for an example).
|
||||
|
||||
|
||||
WiMax Protocol dissector list
|
||||
|
|
|
@ -44,5 +44,5 @@
|
|||
#define BUILD_NUMBER 0
|
||||
#endif
|
||||
|
||||
#define VERSION "1.1." stringize(BUILD_NUMBER)
|
||||
#define VERSION "1.2." stringize(BUILD_NUMBER)
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include <epan/reassemble.h>
|
||||
#include <epan/etypes.h>
|
||||
#include <epan/expert.h>
|
||||
#include <plugins/wimax/wimax_tlv.h>
|
||||
#include "wimax_tlv.h"
|
||||
|
||||
/* forward reference */
|
||||
void proto_reg_handoff_m2m(void);
|
|
@ -24,14 +24,6 @@
|
|||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
/*************************************************************/
|
||||
/* ----------------------- NOTE ------------------------- */
|
||||
/* There is an identical copy of this file, wimax_tlv.c, in */
|
||||
/* both .../plugins/m2m and .../plugins/wimax. If either */
|
||||
/* one needs to be modified, please be sure to copy the file */
|
||||
/* to the sister directory and check it in there also. */
|
||||
/*************************************************************/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include "wimax_tlv.h"
|
||||
|
|
Loading…
Reference in New Issue