diff options
| -rw-r--r-- | ChangeLog | 22 | ||||
| -rw-r--r-- | plugins/pychrysa/Makefile.am | 1 | ||||
| -rw-r--r-- | plugins/pychrysa/gui/panels/Makefile.am | 1 | ||||
| -rw-r--r-- | plugins/pychrysa/gui/panels/log.c | 190 | ||||
| -rw-r--r-- | plugins/pychrysa/gui/panels/log.h (renamed from plugins/pychrysa/py_log.h) | 16 | ||||
| -rw-r--r-- | plugins/pychrysa/gui/panels/module.c | 2 | ||||
| -rw-r--r-- | plugins/pychrysa/py_log.c | 344 | ||||
| -rw-r--r-- | plugins/pychrysa/pychrysa.c | 5 |
8 files changed, 226 insertions, 355 deletions
@@ -1,3 +1,25 @@ +13-01-21 Cyrille Bagard <nocbos@gmail.com> + + * plugins/pychrysa/gui/panels/log.c: + * plugins/pychrysa/gui/panels/log.h: + New entries: restore a fully functional access to the log panel. + + * plugins/pychrysa/gui/panels/Makefile.am: + Add the 'log.[ch]' files to libpychrysaguipanels_la_SOURCES. + + * plugins/pychrysa/gui/panels/module.c: + Register the function allowing to log messages. + + * plugins/pychrysa/Makefile.am: + Remove the 'py_log.[ch]' files from pychrysa_la_SOURCES. + + * plugins/pychrysa/pychrysa.c: + Update code. + + * plugins/pychrysa/py_log.c: + * plugins/pychrysa/py_log.h: + Moved entries. + 13-01-20 Cyrille Bagard <nocbos@gmail.com> * src/arch/dalvik/operands/args.c: diff --git a/plugins/pychrysa/Makefile.am b/plugins/pychrysa/Makefile.am index 25074cb..4fe8a4e 100644 --- a/plugins/pychrysa/Makefile.am +++ b/plugins/pychrysa/Makefile.am @@ -4,7 +4,6 @@ pkglib_LTLIBRARIES = pychrysa.la pychrysa_la_SOURCES = \ helpers.h helpers.c \ plugin.h plugin.c \ - py_log.h py_log.c \ pychrysa.h pychrysa.c \ quirks.h quirks.c diff --git a/plugins/pychrysa/gui/panels/Makefile.am b/plugins/pychrysa/gui/panels/Makefile.am index b383293..20e7f66 100644 --- a/plugins/pychrysa/gui/panels/Makefile.am +++ b/plugins/pychrysa/gui/panels/Makefile.am @@ -2,6 +2,7 @@ noinst_LTLIBRARIES = libpychrysaguipanels.la libpychrysaguipanels_la_SOURCES = \ + log.h log.c \ module.h module.c \ panel.h panel.c diff --git a/plugins/pychrysa/gui/panels/log.c b/plugins/pychrysa/gui/panels/log.c new file mode 100644 index 0000000..5822c85 --- /dev/null +++ b/plugins/pychrysa/gui/panels/log.c @@ -0,0 +1,190 @@ + +/* OpenIDA - Outil d'analyse de fichiers binaires + * log.c - équivalent Python du fichier "gui/panels/log.c" + * + * Copyright (C) 2009-2013 Cyrille Bagard + * + * This file is part of OpenIDA. + * + * OpenIDA 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 3 of the License, or + * (at your option) any later version. + * + * OpenIDA 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#include "log.h" + + + +#include <pygobject.h> + + +#include "../../quirks.h" + + + +/* Affiche un message dans le journal des messages système. */ +static PyObject *py_log_panel_log_message(PyObject *, PyObject *); + +/* Définit les constantes pour les types de message. */ +static bool define_python_log_constants(PyObject *); + + + +/****************************************************************************** +* * +* Paramètres : self = classe assurant le lien avec l'éditeur de messages. * +* args = arguments fournis à l'appel. * +* * +* Description : Affiche un message dans le journal des messages système. * +* * +* Retour : Rien en équivalent Python. * +* * +* Remarques : - * +* * +******************************************************************************/ + +static PyObject *py_log_panel_log_message(PyObject *self, PyObject *args) +{ + PyObject *result; /* Bilan à retourner */ + LogMessageType type; /* Espèce du message */ + const char *msg; /* Contenu du message */ + + if (!PyArg_ParseTuple(args, "ls", &type, &msg)) + return NULL; + + switch (type) + { + case LMT_INFO: + case LMT_BAD_BINARY: + case LMT_PROCESS: + case LMT_ERROR: + case LMT_WARNING: + log_simple_message(type, msg); + result = Py_None; + Py_INCREF(result); + break; + + default: + PyErr_SetString(PyExc_ValueError, + _("Invalid type of message")); + result = NULL; + break; + + } + + return result; + +} + + +/****************************************************************************** +* * +* Paramètres : dict = dictionnaire à compléter. * +* * +* Description : Définit les constantes pour les types de message. * +* * +* Retour : true en cas de succès de l'opération, false sinon. * +* * +* Remarques : - * +* * +******************************************************************************/ + +static bool define_python_log_constants(PyObject *dict) +{ + int ret; /* Bilan d'un ajout */ + + ret = PyDict_SetItemString(dict, "LMT_INFO", PyInt_FromLong(LMT_INFO)); + if (ret == -1) return false; + + ret = PyDict_SetItemString(dict, "LMT_BAD_BINARY", PyInt_FromLong(LMT_BAD_BINARY)); + if (ret == -1) return false; + + ret = PyDict_SetItemString(dict, "LMT_PROCESS", PyInt_FromLong(LMT_PROCESS)); + if (ret == -1) return false; + + ret = PyDict_SetItemString(dict, "LMT_ERROR", PyInt_FromLong(LMT_ERROR)); + if (ret == -1) return false; + + ret = PyDict_SetItemString(dict, "LMT_WARNING", PyInt_FromLong(LMT_WARNING)); + if (ret == -1) return false; + + return true; + +} + + +/****************************************************************************** +* * +* Paramètres : module = module dont la définition est à compléter. * +* * +* Description : Prend en charge l'objet 'pychrysalide.gui.panels.LogPanel'. * +* * +* Retour : Bilan de l'opération. * +* * +* Remarques : - * +* * +******************************************************************************/ + +bool register_python_log_panel(PyObject *module) +{ + //PyObject *parent_mod; /* Module Python-EditorItem */ + int ret; /* Bilan d'un appel */ + + static PyMethodDef py_log_panel_methods[] = { + { + "log_message", (PyCFunction)py_log_panel_log_message, + METH_VARARGS | METH_STATIC, + "Display a message in the log window." + }, + { NULL } + }; + + static PyGetSetDef py_log_panel_getseters[] = { + { NULL } + }; + + static PyTypeObject py_log_panel_type = { + + PyObject_HEAD_INIT(NULL) + + .tp_name = "pychrysalide.gui.panels.LogPanel", + .tp_basicsize = sizeof(PyObject), + + .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, + + .tp_doc = "PyChrysalide log panel", + + .tp_methods = py_log_panel_methods, + .tp_getset = py_log_panel_getseters, + + }; + /* + parent_mod = PyImport_ImportModule("pychrysalide.gui.panels"); + if (parent_mod == NULL) return false; + + py_log_panel_type.tp_base = (PyTypeObject *)PyObject_GetAttrString(parent_mod, "PanelItem"); + Py_DECREF(parent_mod); + */ + if (PyType_Ready(&py_log_panel_type) < 0) + return false; + + if (!define_python_log_constants(py_log_panel_type.tp_dict)) + return false; + + Py_INCREF(&py_log_panel_type); + ret = PyModule_AddObject(module, "LogPanel", (PyObject *)&py_log_panel_type); + + return (ret == 0); + +} diff --git a/plugins/pychrysa/py_log.h b/plugins/pychrysa/gui/panels/log.h index 5274428..80aea31 100644 --- a/plugins/pychrysa/py_log.h +++ b/plugins/pychrysa/gui/panels/log.h @@ -1,8 +1,8 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * py_log.h - prototypes pour l'intermédiaire du panneau de messages pour Python + * log.h - prototypes pour l'équivalent Python du fichier "gui/panels/log.h" * - * Copyright (C) 2009 Cyrille Bagard + * Copyright (C) 2009-2013 Cyrille Bagard * * This file is part of OpenIDA. * @@ -22,18 +22,20 @@ */ -#ifndef _PLUGINS_PYOIDA_PY_LOG_H -#define _PLUGINS_PYOIDA_PY_LOG_H +#ifndef _PLUGINS_PYCHRYSA_GUI_PANELS_LOG_H +#define _PLUGINS_PYCHRYSA_GUI_PANELS_LOG_H #include <Python.h> #include <stdbool.h> +#include <gui/panels/log.h> -/* Ajoute l'objet 'log' au module Python. */ -bool add_log_to_python_module(PyObject *); +/* Prend en charge l'objet 'pychrysalide.gui.panels.LogPanel'. */ +bool register_python_log_panel(PyObject *module); -#endif /* _PLUGINS_PYOIDA_PY_LOG_H */ + +#endif /* _PLUGINS_PYCHRYSA_GUI_PANELS_LOG_H */ diff --git a/plugins/pychrysa/gui/panels/module.c b/plugins/pychrysa/gui/panels/module.c index 9427f22..4ddab1c 100644 --- a/plugins/pychrysa/gui/panels/module.c +++ b/plugins/pychrysa/gui/panels/module.c @@ -25,6 +25,7 @@ #include "module.h" +#include "log.h" #include "panel.h" @@ -62,6 +63,7 @@ bool add_gui_panels_module_to_python_module(PyObject *super) if (ret != 0) /* ... */; result &= register_python_panel_item(module); + result &= register_python_log_panel(module); return true; diff --git a/plugins/pychrysa/py_log.c b/plugins/pychrysa/py_log.c deleted file mode 100644 index fde7ae5..0000000 --- a/plugins/pychrysa/py_log.c +++ /dev/null @@ -1,344 +0,0 @@ - -/* OpenIDA - Outil d'analyse de fichiers binaires - * py_log.c - intermédiaire du panneau de messages pour Python - * - * Copyright (C) 2009-2012 Cyrille Bagard - * - * This file is part of OpenIDA. - * - * OpenIDA 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 3 of the License, or - * (at your option) any later version. - * - * OpenIDA 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#include "py_log.h" - -#include <structmember.h> - - -#include "../../src/gui/panels/log.h" - - -typedef struct { - PyObject_HEAD - PyObject *first; - PyObject *last; - int number; -} pylog; - - -#define _(str) str - - - - -/* Définit les constantes pour les types de message. */ -bool pylog_define_constants(PyObject *); - -/* Affiche un message dans le journal des messages système. */ -PyObject *pylog_simple_message(PyObject *, PyObject *); - - - - -/****************************************************************************** -* * -* Paramètres : dict = dictionnaire à compléter. * -* * -* Description : Définit les constantes pour les types de message. * -* * -* Retour : - * -* * -* Remarques : - * -* * -******************************************************************************/ - -bool pylog_define_constants(PyObject *dict) -{ - int ret; /* Bilan d'un ajout */ - - ret = PyDict_SetItemString(dict, "LMT_INFO", PyInt_FromLong(LMT_INFO)); - if (ret == -1) return false; - - ret = PyDict_SetItemString(dict, "LMT_BAD_BINARY", PyInt_FromLong(LMT_BAD_BINARY)); - if (ret == -1) return false; - - ret = PyDict_SetItemString(dict, "LMT_PROCESS", PyInt_FromLong(LMT_PROCESS)); - if (ret == -1) return false; - - return true; - -} - - -/****************************************************************************** -* * -* Paramètres : self = classe assurant le lien avec l'éditeur de messages. * -* args = arguments fournis à l'appel. * -* * -* Description : Affiche un message dans le journal des messages système. * -* * -* Retour : Rien en équivalent Python. * -* * -* Remarques : - * -* * -******************************************************************************/ - -PyObject *pylog_simple_message(PyObject *self, PyObject *args) -{ - PyObject *result; /* Bilan à retourner */ - LogMessageType type; /* Espèce du message */ - const char *msg; /* Contenu du message */ - - if (!PyArg_ParseTuple(args, "is", &type, &msg)) - return NULL; - - switch (type) - { - case LMT_INFO: - case LMT_BAD_BINARY: - case LMT_PROCESS: - log_simple_message(type, msg); - result = Py_None; - break; - - default: - PyErr_SetString(PyExc_ValueError, - _("Invalid type of message")); - result = NULL; - break; - - } - - return result; - -} - - - - - - - - - - -static void -pylog_dealloc(pylog* self) -{ - Py_XDECREF(self->first); - Py_XDECREF(self->last); - - - //printf("dealloc\n"); - -#if PY_VERSION_HEX < 0x03000000 - self->ob_type->tp_free((PyObject*)self); -#else - Py_TYPE(self)->tp_free((PyObject*)self); -#endif - - //printf("dealloc::end\n"); - -} - -static PyObject * -pylog_new(PyTypeObject *type, PyObject *args, PyObject *kwds) -{ - pylog *self; - - self = (pylog *)type->tp_alloc(type, 0); - if (self != NULL) { - self->first = PyString_FromString("");//PyUnicode_FromString(""); - if (self->first == NULL) - { - Py_DECREF(self); - return NULL; - } - - self->last = PyString_FromString("");//PyUnicode_FromString(""); - if (self->last == NULL) - { - Py_DECREF(self); - return NULL; - } - - self->number = 0; - } - - return (PyObject *)self; -} - -static int -pylog_init(pylog *self, PyObject *args, PyObject *kwds) -{ - PyObject *first=NULL, *last=NULL, *tmp; - - static char *kwlist[] = {"first", "last", "number", NULL}; - - printf("pylog_init\n"); - - if (! PyArg_ParseTupleAndKeywords(args, kwds, "|SSi", kwlist, - &first, &last, - &self->number)) - return -1; - - if (first) { - tmp = self->first; - Py_INCREF(first); - self->first = first; - Py_DECREF(tmp); - } - - if (last) { - tmp = self->last; - Py_INCREF(last); - self->last = last; - Py_DECREF(tmp); - } - - return 0; -} - -static PyMemberDef pylog_members[] = { - {"number", T_INT, offsetof(pylog, number), 0, - "noddy number"}, - {NULL} /* Sentinel */ -}; - - - - - - - - - - -static PyObject * -pylog_name(pylog* self) -{ - static PyObject *format = NULL; - PyObject *args, *result; - - if (format == NULL) { - format = PyString_FromString("%s %s");//PyUnicode_FromString("%s %s"); - if (format == NULL) - return NULL; - } - - args = Py_BuildValue("OO", self->first, self->last); - if (args == NULL) - return NULL; - - result = PyUnicode_Format(format, args); - Py_DECREF(args); - - return result; -} - -static PyMethodDef pylog_methods[] = { - {"name", (PyCFunction)pylog_name, METH_NOARGS, - "Return the name, combining the first and last name" - }, - { "log_simple_message", (PyCFunction)pylog_simple_message, METH_VARARGS | METH_STATIC, - "Return the name, combining the first and last name" - }, - {NULL} /* Sentinel */ -}; - - -static PyTypeObject pylog_type = { - - PyObject_HEAD_INIT(NULL) - -#if PY_VERSION_HEX < 0x03000000 - 0, /*ob_size*/ -#endif - - "noddy.pylog", /* tp_name */ - sizeof(pylog), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)pylog_dealloc, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_reserved / tp_compare */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/ - "pylog objects", /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - pylog_methods, /* tp_methods */ - pylog_members, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)pylog_init, /* tp_init */ - 0, /* tp_alloc */ - pylog_new, /* tp_new */ -}; - - -/****************************************************************************** -* * -* Paramètres : module = module dont la définition est à compléter. * -* * -* Description : Ajoute l'objet 'log' au module Python. * -* * -* Retour : - * -* * -* Remarques : - * -* * -******************************************************************************/ - -bool add_log_to_python_module(PyObject *module) -{ - int ret; /* Bilan d'un appel */ - - if (PyType_Ready(&pylog_type) < 0) - return; - - printf("Adding log type\n"); - - - pylog_define_constants(pylog_type.tp_dict); - - - - - Py_INCREF(&pylog_type); - PyModule_AddObject(module, "logger", (PyObject *)&pylog_type); - - - return true; /* FIXME */ - - -} diff --git a/plugins/pychrysa/pychrysa.c b/plugins/pychrysa/pychrysa.c index 980c073..e7491ce 100644 --- a/plugins/pychrysa/pychrysa.c +++ b/plugins/pychrysa/pychrysa.c @@ -48,7 +48,6 @@ #include "analysis/py_line_code.h" #include "analysis/roptions.h" */ -#include "py_log.h" #include "../../src/common/environment.h" #include "../../src/common/extstr.h" #include "../../src/plugins/plugin-int.h" @@ -130,8 +129,8 @@ bool init_plugin(GPluginModule *plugin, GObject *ref) Py_Initialize(); - //pychrysalide_set_gc_threshold(10000, 10000, 10000); pychrysalide_set_gc_threshold(INT_MAX, INT_MAX, INT_MAX); + //pychrysalide_set_gc_threshold(1, 1, 1); initpychrysa(); @@ -157,6 +156,7 @@ bool init_plugin(GPluginModule *plugin, GObject *ref) ret = readdir_r(dir, &entry, &next)) { if (entry.d_name[0] == '.') continue; + //if (strcmp(entry.d_name, "test") != 0) continue; filename = strdup(entry.d_name); filename = stradd(filename, "."); @@ -297,7 +297,6 @@ PyMODINIT_FUNC initpychrysa(void) add_gtkext_module_to_python_module(module); add_gui_module_to_python_module(module); - //add_log_to_python_module(module); add_plugin_to_python_module(module); } |