diff options
Diffstat (limited to 'src/debug/jdwp/sets/list.c')
| -rw-r--r-- | src/debug/jdwp/sets/list.c | 86 |
1 files changed, 76 insertions, 10 deletions
diff --git a/src/debug/jdwp/sets/list.c b/src/debug/jdwp/sets/list.c index 0dad1e8..84c6ac0 100644 --- a/src/debug/jdwp/sets/list.c +++ b/src/debug/jdwp/sets/list.c @@ -2,7 +2,7 @@ /* OpenIDA - Outil d'analyse de fichiers binaires * list.c - ensemble des jeux de commandes de JDWP * - * Copyright (C) 2010 Cyrille Bagard + * Copyright (C) 2010-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -27,12 +27,15 @@ #include <stddef.h> +#include "thread.h" #include "vm.h" +/* Consitue un contenu binaire à partir d'une charge utile. */ +typedef bool (* set_jdwp_payload_fc) (const jdwp_payload *, const jdwp_cmd_vm_id_sizes_reply *, bin_t *, off_t *); /* Reconstitue une charge utile à partir d'un contenu binaire. */ -typedef bool (* get_jdwp_payload_fc) (const bin_t *, off_t, jdwp_payload *); +typedef bool (* get_jdwp_payload_fc) (const bin_t *, off_t, const jdwp_cmd_vm_id_sizes_reply *, jdwp_payload *); /* Libère le contenu d'une charge utile. */ typedef void (* free_jdwp_payload_fc) (jdwp_payload *); @@ -41,8 +44,10 @@ typedef void (* free_jdwp_payload_fc) (jdwp_payload *); /* Commandes JDWP */ typedef struct _jdwp_command { + set_jdwp_payload_fc set_payload; /* Constitution du binaire */ + free_jdwp_payload_fc free_set_payload; /* Libération de la mémoire */ get_jdwp_payload_fc get_payload; /* Constitution de la charge */ - free_jdwp_payload_fc free_payload; /* Libération de la mémoire */ + free_jdwp_payload_fc free_got_payload; /* Libération de la mémoire */ } jdwp_command; @@ -53,16 +58,38 @@ static jdwp_command _commands[][256] = { [JDWP_CST_VIRTUAL_MACHINE] = { [JDWP_CMD_VM_VERSION] = { + .set_payload = (set_jdwp_payload_fc)NULL, + .free_set_payload = (free_jdwp_payload_fc)NULL, .get_payload = (get_jdwp_payload_fc)get_jdwp_vm_version, - .free_payload = (free_jdwp_payload_fc)free_jdwp_vm_version + .free_got_payload = (free_jdwp_payload_fc)free_jdwp_vm_version }, + [JDWP_CMD_VM_ALL_THREADS] = { + .set_payload = (set_jdwp_payload_fc)NULL, + .free_set_payload = (free_jdwp_payload_fc)NULL, + .get_payload = (get_jdwp_payload_fc)get_jdwp_vm_all_threads, + .free_got_payload = (free_jdwp_payload_fc)free_jdwp_all_threads + }, - + [JDWP_CMD_VM_ID_SIZES] = { + .set_payload = (set_jdwp_payload_fc)NULL, + .free_set_payload = (free_jdwp_payload_fc)NULL, + .get_payload = (get_jdwp_payload_fc)get_jdwp_vm_id_sizes, + .free_got_payload = (free_jdwp_payload_fc)NULL + } }, + [JDWP_CST_THREAD_REFERENCE] = { + + [JDWP_CMD_THREAD_NAME] = { + .set_payload = (set_jdwp_payload_fc)set_jdwp_thread_name, + .free_set_payload = (free_jdwp_payload_fc)NULL, + .get_payload = (get_jdwp_payload_fc)get_jdwp_thread_name, + .free_got_payload = (free_jdwp_payload_fc)free_jdwp_thread_name_reply + } + } }; @@ -70,10 +97,40 @@ static jdwp_command _commands[][256] = { /****************************************************************************** * * +* Paramètres : payload = charge utile à transcrire. * +* set = jeu de commandes concerné. * +* cmd = identifiant d'une commande donnée. * +* sizes = références pour la valeur des tailles dynamiques. * +* blob = futures données binaires brutes. [OUT] * +* len = quantité de données valides. [OUT] * +* * +* Description : Reconstitue un contenu binaire à partir d'une charge utile. * +* * +* Retour : Bilan de l'opération. * +* * +* Remarques : - * +* * +******************************************************************************/ + +bool set_jdwp_payload(const jdwp_payload *payload, uint8_t set, uint8_t cmd, const jdwp_cmd_vm_id_sizes_reply *sizes, bin_t *blob, off_t *len) +{ + bool result; /* Bilan à retourner */ + + if (_commands[set][cmd].set_payload == NULL) result = false; + else result = _commands[set][cmd].set_payload(payload, sizes, blob, len); + + return result; + +} + + +/****************************************************************************** +* * * Paramètres : blob = ensemble de données binaires brutes. * * len = quantité de données valides. * * set = jeu de commandes concerné. * * cmd = identifiant d'une commande donnée. * +* sizes = références pour la valeur des tailles dynamiques. * * payload = charge utile à reconstituer. [OUT] * * * * Description : Reconstitue une charge utile à partir d'un contenu binaire. * @@ -84,12 +141,12 @@ static jdwp_command _commands[][256] = { * * ******************************************************************************/ -bool get_jdwp_payload(const bin_t *blob, off_t len, uint8_t set, uint8_t cmd, jdwp_payload *payload) +bool get_jdwp_payload(const bin_t *blob, off_t len, uint8_t set, uint8_t cmd, const jdwp_cmd_vm_id_sizes_reply *sizes, jdwp_payload *payload) { bool result; /* Bilan à retourner */ if (_commands[set][cmd].get_payload == NULL) result = false; - else result = _commands[set][cmd].get_payload(blob, len, payload); + else result = _commands[set][cmd].get_payload(blob, len, sizes, payload); return result; @@ -99,6 +156,7 @@ bool get_jdwp_payload(const bin_t *blob, off_t len, uint8_t set, uint8_t cmd, jd /****************************************************************************** * * * Paramètres : payload = charge utile à supprimer de la mémoire. * +* got = type de charge utile à traiter. * * set = jeu de commandes concerné. * * cmd = identifiant d'une commande donnée. * * * @@ -110,9 +168,17 @@ bool get_jdwp_payload(const bin_t *blob, off_t len, uint8_t set, uint8_t cmd, jd * * ******************************************************************************/ -void free_jdwp_payload(jdwp_payload *payload, uint8_t set, uint8_t cmd) +void free_jdwp_payload(jdwp_payload *payload, bool got, uint8_t set, uint8_t cmd) { - if (_commands[set][cmd].free_payload != NULL) - _commands[set][cmd].free_payload(payload); + if (got) + { + if (_commands[set][cmd].free_got_payload != NULL) + _commands[set][cmd].free_got_payload(payload); + } + else + { + if (_commands[set][cmd].free_set_payload != NULL) + _commands[set][cmd].free_set_payload(payload); + } } |