Commit graph

33 commits

Author SHA1 Message Date
Anders Broman
f355d35acf From Eliot:
Patch wspy_dissector.py to use dissector_add_uint
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6448

svn path=/trunk/; revision=39375
2011-10-11 19:24:19 +00:00
Anders Broman
8e964a9da0 From Eliot:
Patch homeplug.py wspython sample to not conflict with built in homeplug

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

svn path=/trunk/; revision=39374
2011-10-11 19:16:15 +00:00
Stig Bjørlykke
64c2355b67 Removed the protocol registration updates in the splash screen for Python
dissectors, because it does not work as expected and causes an assert.

Added generic splash updates for python register and handoff instead.

This should fix bug 5431.

svn path=/trunk/; revision=39221
2011-10-02 16:19:55 +00:00
Stig Bjørlykke
73df12fdcc Cleanup and indent in Makefile.
svn path=/trunk/; revision=38071
2011-07-17 17:56:57 +00:00
Stig Bjørlykke
23142d46bc Check for a valid wspy_dissectors disectory to avoid a warning if missing.
svn path=/trunk/; revision=38070
2011-07-17 17:56:42 +00:00
Jeff Morriss
9cb00ac9fc Fix one of the complaints in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5818 :
Create the wspy_dissectors data directory (by installing the one example
dissector).  This dissector won't be loaded (its name doesn't match the regexp)
but it forces the presence of the directory (so people will know where to put
their dissectors).

svn path=/trunk/; revision=36923
2011-04-28 01:53:40 +00:00
Jeff Morriss
39d326a77c Don't dump core if Python was not able to load the dissector registration file
(e.g., due to a syntax error).

svn path=/trunk/; revision=36922
2011-04-28 01:45:23 +00:00
Jeff Morriss
b798f159bf My version of Python (2.5.2) core dumps if PySequence_Check is called with a
NULL pointer (because no dissectors were registered).  Don't call that function
with a NULL pointer.

Also update the output when no dissectors are registered.  Not sure if we
should be printing *anything* in this situation, but for now make the output
interesting.

svn path=/trunk/; revision=36917
2011-04-27 22:15:42 +00:00
Jeff Morriss
90a78c635a Fix part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4878 :
Put our one python example in the source distribution.

svn path=/trunk/; revision=36915
2011-04-27 21:26:38 +00:00
Bill Meier
d3efa3ed9f A bit of Windows makefiles rework and cleanup:
- Define macros for certain CFLAGS in config.nmake iso of having defs in each makefile;
  a. -DHAVE_CONFIG_H and -D_U_="" are now part of a macro named STANDARD_CFLAGS;
  b. -WX has been replaced by WARNINGS_ARE_ERRORS (defined as -WX in config.nmake)
      (This allows disabling "Warnings as Errors" by just changing config.nmake)
  c. CVARSDLL definitions (not usage) have been removed from the various makefiles.
     XXX: It appears the usage of CVARSDLL can also be removed (not yet done) since:
     -DWIN32 and -DNULL=0 do not appear to be needed (any more);
     -D_MT and _D_DLL  are not needed since /MP causes these definitions.
  d. Define a macro WARNINGS_CFLAGS with additional specific compiler (level4) warnings to be enabled.
     E.G., 4295: array is too small to include a terminating null character
- config.nmake: reformat some long lines for readability;
- plugins\Makefile.nmake: clean-deps does nothing: remove it (and usage in top-level makefile);
- dissectors/Makefile.nmake: test to enable packet-rrc.obj target needs to include MSVC2010 ...

svn path=/trunk/; revision=35747
2011-02-02 01:19:53 +00:00
Stig Bjørlykke
0b5251be12 Use python comments in python code.
Reported by Emil Wojak in bug 5389.

svn path=/trunk/; revision=34848
2010-11-12 13:32:04 +00:00
Gerald Combs
607b228df6 Add ws_load_library and ws_module_open, which respectively call
LoadLibrary and g_module_open only for the program directory and system
directory on Windows. Use them to replace a bunch of LoadLibrary and
g_module_open calls. Use the extension ".dll" for all the DLLs that we
load. Add comments about DLL loading in Python.

svn path=/trunk/; revision=33924
2010-08-25 20:30:59 +00:00
Gerald Combs
fe79af8f42 From Kovarththanan Rajaratnam via bug 3500:
Sébastien's initial commit [1] didn't contain support for embedding Python on
Windows.

[1] http://anonsvn.wireshark.org/viewvc?view=rev&revision=28529


From me:

Comment out PYTHON_EMBED for now.

Start a list of known Python+CRT versions.

Add get_wspython_dir to libwireshark.def.

svn path=/trunk/; revision=33036
2010-06-01 22:20:15 +00:00
Jörg Mayer
e37e3ba26a Remaining fixes for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4788
- Compile the python code directly into epan - don't link it in as
  a static lib.
- Call make-init-lua.pl with the top level directory instead of the
  current directory. Change make-init-lua.pl accordingly.

svn path=/trunk/; revision=33009
2010-05-28 11:48:29 +00:00
Jeff Morriss
54082c6ed0 Add Cmake stuff to the source distribution so more people can try it out.
svn path=/trunk/; revision=32807
2010-05-14 16:27:03 +00:00
Bill Meier
2b75413d3a Set svn:executable property for some .py and .pl files
svn path=/trunk/; revision=32287
2010-03-25 22:22:45 +00:00
Jörg Mayer
96779de920 cmake changes:
- Add checking for linker flags
- Install plugins with the name including the Wireshark version.
  This will make it easier to find matching plugin versions if
  files get just copied over.


svn path=/trunk/; revision=32231
2010-03-18 10:27:17 +00:00
Jörg Mayer
9ee31d1d0e cmake will now honor -Werror if configured (default: on)
svn path=/trunk/; revision=30852
2009-11-07 10:07:00 +00:00
Stig Bjørlykke
8ec95312b7 Corrected hfinfo.ref_count -> hfinfo.ref_type.
(how did this ever compile?)

svn path=/trunk/; revision=30218
2009-09-30 15:03:39 +00:00
Stig Bjørlykke
2a0e507747 Mark unused argument instead of assigning to an unused variable.
svn path=/trunk/; revision=30204
2009-09-29 19:40:21 +00:00
Stig Bjørlykke
b8ae6ea510 Don't include config.h in header files.
svn path=/trunk/; revision=30203
2009-09-29 19:30:42 +00:00
Stig Bjørlykke
6b4aefe2c7 Use correct prototypes when having no arguments.
Made some functions static.
Removed C++ comments.

svn path=/trunk/; revision=30194
2009-09-29 11:50:07 +00:00
Jörg Mayer
53acec3427 wslua now builds, links and installs.
Enable it by default.

svn path=/trunk/; revision=30142
2009-09-25 14:53:56 +00:00
Jörg Mayer
cf326e0304 More fixes for OSX - might work now :-)
svn path=/trunk/; revision=30093
2009-09-23 15:56:44 +00:00
Jaap Keuter
c09c7fd7cd Fix for bug 4034:
Fix for missing register file and cleanup of code in register_all_py_protocols_func().

svn path=/trunk/; revision=30058
2009-09-21 21:28:11 +00:00
Jaap Keuter
f78265be26 Set svn properties and fix Id keyword.
svn path=/trunk/; revision=30057
2009-09-21 21:25:23 +00:00
Jörg Mayer
95182116aa CMake:
- Add opcua to the list of plugins to build
- Link the gtk stuff statically into wireshark
- Beginnings of "make install"
- Change a few things about install paths

svn path=/trunk/; revision=30029
2009-09-21 00:19:07 +00:00
Gerald Combs
3996953787 Add some missing files to the distribution.
svn path=/trunk/; revision=29973
2009-09-17 16:39:23 +00:00
Jörg Mayer
9250a69a99 Update to add the last missing detection stuff.
Some of it is untested, kerberos is currently a hack.
Apart from that, package detection should be complete.

svn path=/trunk/; revision=29838
2009-09-10 07:04:54 +00:00
Stig Bjørlykke
221225e0f3 From Kovarththanan Rajaratnam via bug 3719:
This patch optimizes proto_tree_prime_hfid() + friends and
plugs a memleak in the process.

From me:
Removed unused hfindex in proto_tree_new_item()
Fixed ref_count entry in struct header_field_info.

svn path=/trunk/; revision=29137
2009-07-18 20:10:14 +00:00
Stig Bjørlykke
95f5427287 Added the wspython Makefile.nmake from bug 3500 to satisfy the
Ubuntu buildbot.

svn path=/trunk/; revision=28570
2009-06-01 18:09:07 +00:00
Sebastien Tandel
7f0d2951c6 python binding update :
* adding pydoc documentation to doc/README.python
    * possible to access directly libwireshark via libhandle and raw_<tvb|pinfo|tree>
    * transform some methods into properties
    * update sample to reflect changes/features
    * adding comments!!!


svn path=/trunk/; revision=28532
2009-05-30 13:37:02 +00:00
Sebastien Tandel
52cc5fb1e8 python binding for wireshark (first commit)
* ability to write dissectors with python for wireshark.
        documentation (http://wiki.wireshark.org/Python)


svn path=/trunk/; revision=28529
2009-05-29 21:10:40 +00:00