Skip to content
Snippets Groups Projects
Commit 41f696a3 authored by Dmitriy A. Gerasimov's avatar Dmitriy A. Gerasimov
Browse files

[*] dap_chain_node_cli -> dap_app_cli_server

parent 1d329e90
No related branches found
No related tags found
1 merge request!26Support 3689
#ifndef _WRAPPING_DAP_CHAIN_NET_NODE_CLI_ #pragma once
#define _WRAPPING_DAP_CHAIN_NET_NODE_CLI_
#include <Python.h> #include <Python.h>
#include "dap_config.h" #include "dap_config.h"
...@@ -8,14 +7,10 @@ ...@@ -8,14 +7,10 @@
#include "wrapping_dap_chain_common.h" #include "wrapping_dap_chain_common.h"
#include "wrapping_dap_chain_net_node.h" #include "wrapping_dap_chain_net_node.h"
#ifdef __cplusplus typedef struct PyDapAppCliServer{
extern "C"{
#endif
typedef struct PyDapChainNodeCli{
PyObject_HEAD PyObject_HEAD
cmdfunc_t *func; cmdfunc_t *func;
}PyDapChainNodeCliObject; }PyDapAppCliServerObject;
static PyObject *binded_object_cmdfunc = NULL; static PyObject *binded_object_cmdfunc = NULL;
int dap_chain_node_cli_init_py(dap_config_t *g_config); int dap_chain_node_cli_init_py(dap_config_t *g_config);
...@@ -29,16 +24,16 @@ PyObject *dap_chain_node_cli_set_reply_text_py(PyObject *self, PyObject *args); ...@@ -29,16 +24,16 @@ PyObject *dap_chain_node_cli_set_reply_text_py(PyObject *self, PyObject *args);
PyObject *dap_chain_node_addr_get_by_alias_py(PyObject *self, PyObject *args); PyObject *dap_chain_node_addr_get_by_alias_py(PyObject *self, PyObject *args);
static PyMethodDef DapChainNodeCliMethods[] = { static PyMethodDef DapChainNodeCliMethods[] = {
{"cmdItemCreate", dap_chain_node_cli_cmd_item_create_py, METH_VARARGS, ""}, {"cmdItemCreate", dap_chain_node_cli_cmd_item_create_py, METH_VARARGS| METH_STATIC, ""},
{"setReplyText", dap_chain_node_cli_set_reply_text_py, METH_VARARGS, ""}, {"setReplyText", dap_chain_node_cli_set_reply_text_py, METH_VARARGS| METH_STATIC, ""},
{"getByAlias", dap_chain_node_addr_get_by_alias_py, METH_VARARGS | METH_STATIC, ""}, {"getByAlias", dap_chain_node_addr_get_by_alias_py, METH_VARARGS | METH_STATIC, ""},
{NULL, NULL, 0, NULL} {NULL, NULL, 0, NULL}
}; };
static PyTypeObject DapChainNodeCliObject_DapChainNodeCliObjectType = { static PyTypeObject DapChainNodeCliObject_DapChainNodeCliObjectType = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"CellFrame.Chain.Node.cli", /* tp_name */ "AppCliServer", /* tp_name */
sizeof(PyDapChainNodeCliObject), /* tp_basicsize */ sizeof(PyDapAppCliServerObject), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
0, /* tp_dealloc */ 0, /* tp_dealloc */
0, /* tp_print */ 0, /* tp_print */
...@@ -79,9 +74,3 @@ static PyTypeObject DapChainNodeCliObject_DapChainNodeCliObjectType = { ...@@ -79,9 +74,3 @@ static PyTypeObject DapChainNodeCliObject_DapChainNodeCliObjectType = {
char **PyListToString(PyObject *list); char **PyListToString(PyObject *list);
PyObject *stringToPyList(char **list); PyObject *stringToPyList(char **list);
#ifdef __cplusplus
}
#endif
#endif //_WRAPPING_DAP_CHAIN_NET_NODE_CLI_
#include "wrapping_dap_chain_net_node_cli.h" #include "wrapping_dap_app_cli_server.h"
#define LOG_TAG "wrapping_dap_app_cli_server"
int dap_chain_node_cli_init_py(dap_config_t *g_config){ int dap_chain_node_cli_init_py(dap_config_t *g_config){
log_it(L_DEBUG, "Init app cli server");
dap_chain_node_cli_init(g_config); dap_chain_node_cli_init(g_config);
} }
void dap_chain_node_cli_delete_py(void){ void dap_chain_node_cli_delete_py(void){
...@@ -26,7 +29,7 @@ static int wrapping_cmdfunc(int argc, char **argv, char **str_reply){ ...@@ -26,7 +29,7 @@ static int wrapping_cmdfunc(int argc, char **argv, char **str_reply){
} }
PyObject *DapChainNodeCliObject_new(PyTypeObject *type_object, PyObject *args, PyObject *kwds){ PyObject *DapChainNodeCliObject_new(PyTypeObject *type_object, PyObject *args, PyObject *kwds){
PyDapChainNodeCliObject *obj = (PyDapChainNodeCliObject*)PyType_GenericNew(type_object, args, kwds); PyDapAppCliServerObject *obj = (PyDapAppCliServerObject*)PyType_GenericNew(type_object, args, kwds);
obj->func = wrapping_cmdfunc; obj->func = wrapping_cmdfunc;
return (PyObject *)obj; return (PyObject *)obj;
} }
...@@ -35,7 +38,7 @@ PyObject *dap_chain_node_cli_cmd_item_create_py(PyObject *a_self, PyObject *a_ar ...@@ -35,7 +38,7 @@ PyObject *dap_chain_node_cli_cmd_item_create_py(PyObject *a_self, PyObject *a_ar
(void) a_self; (void) a_self;
const char *name, *doc, *doc_ex; const char *name, *doc, *doc_ex;
PyObject *obj_cmdfunc; PyObject *obj_cmdfunc;
if (!PyArg_ParseTuple(a_args, "s|O:set_callback|s|s", &name, &obj_cmdfunc, &doc, &doc_ex)){ if (!PyArg_ParseTuple(a_args, "s|O:cmdCallback|s|s", &name, &obj_cmdfunc, &doc, &doc_ex)){
return NULL; return NULL;
} else { } else {
if (!PyCallable_Check(obj_cmdfunc)){ if (!PyCallable_Check(obj_cmdfunc)){
...@@ -46,11 +49,12 @@ PyObject *dap_chain_node_cli_cmd_item_create_py(PyObject *a_self, PyObject *a_ar ...@@ -46,11 +49,12 @@ PyObject *dap_chain_node_cli_cmd_item_create_py(PyObject *a_self, PyObject *a_ar
Py_XINCREF(obj_cmdfunc); Py_XINCREF(obj_cmdfunc);
Py_XDECREF(binded_object_cmdfunc); Py_XDECREF(binded_object_cmdfunc);
binded_object_cmdfunc = obj_cmdfunc; binded_object_cmdfunc = obj_cmdfunc;
dap_chain_node_cli_cmd_item_create(name, ((PyDapChainNodeCliObject*)obj_cmdfunc)->func, doc, doc_ex); dap_chain_node_cli_cmd_item_create(name, ((PyDapAppCliServerObject*)obj_cmdfunc)->func, doc, doc_ex);
return PyLong_FromLong(0); return PyLong_FromLong(0);
} }
PyObject *dap_chain_node_cli_set_reply_text_py(PyObject *self, PyObject *args){ PyObject *dap_chain_node_cli_set_reply_text_py(PyObject *self, PyObject *args){
(void) self;
PyObject *obj_str_reply_list; PyObject *obj_str_reply_list;
const char *str_list; const char *str_list;
if (!PyArg_ParseTuple(args, "O|O", &obj_str_reply_list)) if (!PyArg_ParseTuple(args, "O|O", &obj_str_reply_list))
...@@ -61,6 +65,7 @@ PyObject *dap_chain_node_cli_set_reply_text_py(PyObject *self, PyObject *args){ ...@@ -61,6 +65,7 @@ PyObject *dap_chain_node_cli_set_reply_text_py(PyObject *self, PyObject *args){
} }
PyObject *dap_chain_node_addr_get_by_alias_py(PyObject *self, PyObject *args){ PyObject *dap_chain_node_addr_get_by_alias_py(PyObject *self, PyObject *args){
(void) self;
PyObject *chain_net; PyObject *chain_net;
const char *alias; const char *alias;
if (!PyArg_ParseTuple(args, "O|s", &chain_net, &alias)) if (!PyArg_ParseTuple(args, "O|s", &chain_net, &alias))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment