diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-05-26 10:17:08 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-05-26 10:17:08 +0000 |
| commit | 292543bc1cf207377fd130e972c3107d9235c330 (patch) | |
| tree | 72226b0abd41a4c123fc925cbf4e0f82c1211b4c /plugins | |
| parent | b30369bd096a22df22b76a939bdfdee4d81d7027 (diff) | |
Missing bits and fixes to get the buildbot green again.
svn path=/trunk/; revision=21952
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/m2m/moduleinfo.nmake | 28 | ||||
| -rw-r--r-- | plugins/m2m/packet-m2m.c | 24 | ||||
| -rw-r--r-- | plugins/m2m/plugin.rc.in | 34 |
3 files changed, 74 insertions, 12 deletions
diff --git a/plugins/m2m/moduleinfo.nmake b/plugins/m2m/moduleinfo.nmake new file mode 100644 index 0000000000..5003cd4930 --- /dev/null +++ b/plugins/m2m/moduleinfo.nmake @@ -0,0 +1,28 @@ +# +# $Id$ +# + +# The name +PACKAGE=m2m + +# The version +MODULE_VERSION_MAJOR=0 +MODULE_VERSION_MINOR=0 +MODULE_VERSION_MICRO=1 +MODULE_VERSION_EXTRA=0 + +# +# The RC_VERSION should be comma-separated, not dot-separated, +# as per Graham Bloice's message in +# +# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html +# +# "The RC_VERSION variable in config.nmake should be comma separated. +# This allows the resources to be built correctly and the version +# number to be correctly displayed in the explorer properties dialog +# for the executables, and XP's tooltip, rather than 0.0.0.0." +# + +MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA) +RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA) + diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c index a12a6b2abf..a61f227024 100644 --- a/plugins/m2m/packet-m2m.c +++ b/plugins/m2m/packet-m2m.c @@ -367,6 +367,18 @@ m2m_defragment_init(void) fragment_table_init(&pdu_frag_table); } +/* Register Wimax Mac to Mac Protocol handler */ +void proto_reg_handoff_m2m(void) +{ + static int Initialized = FALSE; + + if (!Initialized) + { + m2m_handle = create_dissector_handle(dissect_m2m, proto_m2m); + dissector_add("ethertype", WMX_M2M, m2m_handle); + } +} + /* Register Wimax Mac to Mac Protocol */ void proto_register_m2m(void) { @@ -392,18 +404,6 @@ void proto_register_m2m(void) /* Add new protocols here */ } -/* Register Wimax Mac to Mac Protocol handler */ -void proto_reg_handoff_m2m(void) -{ - static int Initialized = FALSE; - - if (!Initialized) - { - m2m_handle = create_dissector_handle(dissect_m2m, proto_m2m); - dissector_add("ethertype", WMX_M2M, m2m_handle); - } -} - /* WiMax MAC to MAC protocol dissector */ static void dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { diff --git a/plugins/m2m/plugin.rc.in b/plugins/m2m/plugin.rc.in new file mode 100644 index 0000000000..72b4de0775 --- /dev/null +++ b/plugins/m2m/plugin.rc.in @@ -0,0 +1,34 @@ +#include "winver.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION @RC_MODULE_VERSION@ + PRODUCTVERSION @RC_VERSION@,0 + FILEFLAGSMASK 0x0L +#ifdef _DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG +#else + FILEFLAGS VS_FF_PRERELEASE +#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", "Build with @MSVC_VARIANT@\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END |