return retval;
}
-/* get a tuple with all users in it */
+PyDoc_STRVAR(emb_get_users__doc__,
+ "get_users() -> tuple with user nicks");
+
static PyObject*
emb_get_users(UNUSED_ARG(PyObject *self), PyObject *args) {
if (!PyArg_ParseTuple(args, ""))
return pyobj_from_dict_t(clients);
}
-/* get a tuple with all channels in it */
+PyDoc_STRVAR(emb_get_channels__doc__,
+ "get_channels() -> tuple with channel names");
+
static PyObject*
emb_get_channels(UNUSED_ARG(PyObject* self), PyObject* args) {
if (!PyArg_ParseTuple(args, ""))
return pyobj_from_dict_t(channels);
}
+PyDoc_STRVAR(emb_get_servers__doc__,
+ "get_servers() -> tuple with server names");
+
static PyObject*
emb_get_servers(UNUSED_ARG(PyObject* self), PyObject* args) {
if (!PyArg_ParseTuple(args, ""))
return pyobj_from_dict_t(servers);
}
+PyDoc_STRVAR(emb_get_accounts__doc__,
+ "get_accounts() -> tuple with all nickserv account names");
+
static PyObject*
emb_get_accounts(UNUSED_ARG(PyObject* self), PyObject* args) {
if (!PyArg_ParseTuple(args, ""))
return pyobj_from_dict_t(nickserv_handle_dict);
}
+PyDoc_STRVAR(emb_dump__doc__,
+ "dump(dump) -> an integer detailing success\n\n"
+ "Dumps a string to the server socket for propagation to other servers.\n\n"
+ "Return value is 1 on success and 0 on failure.\n");
+
static PyObject*
emb_dump(UNUSED_ARG(PyObject *self), PyObject *args)
{
return Py_BuildValue("i", ret);
}
+PyDoc_STRVAR(emb_send_target_privmsg__doc__,
+ "send_target_privmsg(servicenick, target, message) -> amount of message sent");
+
static PyObject*
emb_send_target_privmsg(UNUSED_ARG(PyObject *self), PyObject *args)
{
return Py_BuildValue("i", ret);
}
+PyDoc_STRVAR(emb_send_target_notice__doc__,
+ "send_target_notice(servicenick, target, message) -> amount of message sent");
+
static PyObject*
emb_send_target_notice(UNUSED_ARG(PyObject *self), PyObject *args)
{
return NULL;
}
+PyDoc_STRVAR(emb_get_user__doc__,
+ "get_user(nick) -> dict with user information\n\n"
+ "Updating the returned dictionary will not be reflected in the user's\n"
+ "information.");
+
static PyObject*
emb_get_user(UNUSED_ARG(PyObject *self), PyObject *args)
{
return NULL;
}
+PyDoc_STRVAR(emb_get_server__doc__,
+ "get_server(name) -> dict with information\n\n"
+ "Changes made to the returned dictionary will not reflect in the server's\n"
+ "information.");
+
static PyObject*
emb_get_server(UNUSED_ARG(PyObject* self), PyObject* args) {
struct server* srv;
}
static PyObject*
-emb_get_channel(UNUSED_ARG(PyObject *self), PyObject *args)
-{
- /* Returns a python dict object with all sorts of info about a channel.
- usage: _svc.get_channel(<name>)
- */
- char *name;
- struct chanNode *channel;
+pyobj_from_channode(struct chanNode* channel) {
PyObject *pChannelMembers = NULL;
PyObject *pChannelBans = NULL;
PyObject *pChannelExempts = NULL;
PyObject *retval = NULL;
-
- if(!PyArg_ParseTuple(args, "s", &name))
- return NULL;
-
- if(!(channel = GetChannel(name))) {
- PyErr_SetString(PyExc_Exception, "unknown channel");
- return NULL;
- }
-
/* build tuple of nicks in channel */
pChannelMembers = pyobj_from_modelist(&channel->members);
if (pChannelMembers == NULL)
return NULL;
}
+PyDoc_STRVAR(emb_get_channel__doc__,
+ "get_channel(channel) -> dict with channel information\n\n"
+ "Updates made to the returned dictionary does not reflect in the channel\n"
+ "information.");
+
+static PyObject*
+emb_get_channel(UNUSED_ARG(PyObject *self), PyObject *args)
+{
+ /* Returns a python dict object with all sorts of info about a channel.
+ usage: _svc.get_channel(<name>)
+ */
+ char *name;
+ struct chanNode *channel;
+
+ if(!PyArg_ParseTuple(args, "s", &name))
+ return NULL;
+
+ if(!(channel = GetChannel(name))) {
+ PyErr_SetString(PyExc_Exception, "unknown channel");
+ return NULL;
+ }
+
+ return pyobj_from_channode(channel);
+}
+
+PyDoc_STRVAR(emb_get_account__doc__,
+ "get_account(account) -> dict with account information\n\n"
+ "Changes made to the returned dictionary will not be reflected in the\n"
+ "account's information.");
+
static PyObject*
emb_get_account(UNUSED_ARG(PyObject *self), PyObject *args)
{
);
}
+PyDoc_STRVAR(emb_get_info__doc__,
+ "get_info() -> dict with general service setup information\n\n"
+ "The dictionary contains the nicks of the different services.");
+
static PyObject*
emb_get_info(UNUSED_ARG(PyObject *self), UNUSED_ARG(PyObject *args))
{
"spamserv", spamserv?spamserv->nick : "SpamServ");
}
+PyDoc_STRVAR(emb_log_module__doc__,
+ "log_module(level, message)\n\n"
+ "Logs a message in the PY_LOG subsystem given a severity level and a message.");
+
static PyObject*
emb_log_module(UNUSED_ARG(PyObject *self), PyObject *args)
{
* for now, all logs go to the PY_LOG log. In the future this will change.
*/
char *message;
- int ret = 0;
int level;
-
if(!PyArg_ParseTuple(args, "is", &level, &message))
return NULL;
log_module(PY_LOG, level, "%s", message);
- return Py_BuildValue("i", ret);
+ Py_INCREF(Py_None);
+ return Py_None;
}
+PyDoc_STRVAR(emb_kill__doc__,
+ "kill(servicenick, target, message)\n\n"
+ "Kills a given user.");
+
static PyObject*
emb_kill(UNUSED_ARG(PyObject* self), PyObject* args) {
char const* from_nick, *target_nick, *message;
Py_DECREF(extra->arg);
}
+PyDoc_STRVAR(emb_timeq_add__doc__,
+ "timeq_add(when, function, args)\n\n"
+ "Adds a callback to the service timer system.\n\n"
+ "The specific function must be callable, and the specified arguments must be\n"
+ "a tuple with the arguments that the function expects.");
+
static PyObject*
emb_timeq_add(UNUSED_ARG(PyObject* self), PyObject* args) {
time_t when;
return Py_None;
}
+PyDoc_STRVAR(emb_timeq_del__doc__,
+ "timeq_del(when)\n\n"
+ "This function deletes all python-added callbacks registered to run at the\n"
+ "given time, regardless of their data. This is due to the unnecessary extra\n"
+ "burden it would require to get the same data for multiple runs.");
+
static PyObject*
emb_timeq_del(UNUSED_ARG(PyObject* self), PyObject* args) {
- /* NOTE:
- * This function will delete all python-added callbacks registered
- * to run at the given time, regardless of their data. This is due to
- * the unnecessary extra burden it would require to get the same data for
- * multiple runs.
- */
time_t when;
if (!PyArg_ParseTuple(args, "l", &when))
return 0;
}
+PyDoc_STRVAR(emb_get_config__doc__,
+ "get_config() -> dict with config elements and values\n\n"
+ "Updates to the returned dictionary will not reflect in the service's\n"
+ "configuration.");
+
static PyObject*
emb_get_config(UNUSED_ARG(PyObject* self), PyObject* args) {
PyObject* dict;
return dict;
}
+PyDoc_STRVAR(emb_kick__doc__,
+ "kick(who, target, message)\n\n"
+ "Kicks a given target as if the who user kicked them using the given message.");
+
static PyObject* emb_kick(UNUSED_ARG(PyObject* self), PyObject* args) {
struct userNode* who, *target;
struct chanNode* channel;
return Py_None;
}
+PyDoc_STRVAR(emb_channel_mode__doc__,
+ "channel_mode(who, channel, modes)\n\n"
+ "Lets a current server's user set a specified channel's modes as specified.");
+
static PyObject* emb_channel_mode(UNUSED_ARG(PyObject* self_), PyObject* args) {
struct userNode* who;
struct chanNode* channel;
return Py_None;
}
+PyDoc_STRVAR(emb_user_mode__doc__,
+ "user_mode(target, modes)\n\n"
+ "Sets target's modes as specified. The modes are in normal +f-n syntax.");
+
static PyObject* emb_user_mode(UNUSED_ARG(PyObject* self), PyObject* args) {
struct userNode* target;
char const* modes;
return Py_None;
}
+PyDoc_STRVAR(emb_fakehost__doc__,
+ "fakehost(target, host)\n\n"
+ "Sets the fakehost of a given user to the specified host.");
+
static PyObject* emb_fakehost(UNUSED_ARG(PyObject* self), PyObject* args) {
struct userNode* target;
char const* host;
return Py_None;
}
+PyDoc_STRVAR(emb_svsnick__doc__,
+ "svsnick(from, target, newnick)\n\n"
+ "The from nick must be on the service server.");
+
+static PyObject*
+emb_svsnick(UNUSED_ARG(PyObject* self_), PyObject* args) {
+ struct userNode* from, *target;
+ const char* newnick;
+
+ const char* from_s, *target_s;
+
+ if (!PyArg_ParseTuple(args, "sss", &from_s, &target_s, &newnick))
+ return NULL;
+
+ if ((from = GetUserH(from_s)) == NULL) {
+ PyErr_SetString(PyExc_Exception, "unknown from user");
+ return NULL;
+ }
+
+ if ((target = GetUserH(target_s)) == NULL) {
+ PyErr_SetString(PyExc_Exception, "unknown target user");
+ return NULL;
+ }
+
+ if (from->uplink != self) {
+ PyErr_SetString(PyExc_Exception, "from user is not on service server");
+ return NULL;
+ }
+
+ irc_svsnick(from, target, newnick);
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+PyDoc_STRVAR(emb_svsquit__doc__,
+ "svsquit(from, target, reason)\n\n"
+ "The from user must be on the service server.");
+
+static PyObject*
+emb_svsquit(UNUSED_ARG(PyObject* self_), PyObject* args) {
+ struct userNode* from, *target;
+ char const* reason;
+
+ char const* from_s, *target_s;
+
+ if (!PyArg_ParseTuple(args, "sss", &from_s, &target_s, &reason))
+ return NULL;
+
+ if ((from = GetUserH(from_s)) == NULL) {
+ PyErr_SetString(PyExc_Exception, "unknown from user");
+ return NULL;
+ }
+
+ if (from->uplink != self) {
+ PyErr_SetString(PyExc_Exception, "from user is not on service server");
+ return NULL;
+ }
+
+ if ((target = GetUserH(target_s)) == NULL) {
+ PyErr_SetString(PyExc_Exception, "unknown target user");
+ return NULL;
+ }
+
+ irc_svsquit(from, target, reason);
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+PyDoc_STRVAR(emb_svsjoin__doc__,
+ "svsjoin(from, target, to)\n\n"
+ "From user from must a user on the service server.\n"
+ "To must be an existing channel name.");
+
+static PyObject*
+emb_svsjoin(UNUSED_ARG(PyObject* self_), PyObject* args) {
+ struct userNode* from, *target;
+ struct chanNode* to;
+
+ const char* from_s, *target_s, *to_s;
+
+ if (!PyArg_ParseTuple(args, "sss", &from_s, &target_s, &to_s))
+ return NULL;
+
+ if ((from = GetUserH(from_s)) == NULL) {
+ PyErr_SetString(PyExc_Exception, "unknown from user");
+ return NULL;
+ }
+
+ if (from->uplink != self) {
+ PyErr_SetString(PyExc_Exception, "from user is not on service server");
+ return NULL;
+ }
+
+ if ((target = GetUserH(target_s)) == NULL) {
+ PyErr_SetString(PyExc_Exception, "unknown target user");
+ return NULL;
+ }
+
+ if ((to = GetChannel(to_s)) == NULL)
+ to = AddChannel(to_s, now, NULL, NULL, NULL);
+
+ irc_svsjoin(from, target, to);
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+PyDoc_STRVAR(emb_adduser__doc__,
+ "adduser(nick, ident, hostname, description, modes) -> dict with user information\n\n"
+ "Adds a new local user with the given information.");
+
+static PyObject*
+emb_adduser(UNUSED_ARG(PyObject* self_), PyObject* args) {
+ char const* nick, *ident, *hostname, *desc, *modes;
+ struct userNode* user;
+ PyObject* retval;
+
+ if (!PyArg_ParseTuple(args, "sssss", &nick, &ident, &hostname, &desc, &modes))
+ return NULL;
+
+ user = AddLocalUser(nick, ident, hostname, desc, modes);
+
+ retval = pyobj_from_usernode(user);
+
+ return retval;
+}
+
+/* TODO: Add the rest of the service members to the dict */
+static PyObject*
+pyobj_from_service(struct service* serv) {
+ PyObject* bot, *retval;
+
+ bot = pyobj_from_usernode(serv->bot);
+ if (bot == NULL)
+ goto cleanup;
+
+ retval = Py_BuildValue("{s:O,s:c,s:I}",
+ "bot", bot,
+ "trigger", serv->trigger,
+ "privileged", serv->privileged);
+ if (retval == NULL)
+ goto cleanup;
+
+ return retval;
+
+cleanup:
+ Py_XDECREF(bot);
+ return NULL;
+}
+
+PyDoc_STRVAR(emb_service_register__doc__,
+ "service_register(nick)\n\n"
+ "Registers nick as a service. The specified nick must be on the local server.");
+
+static PyObject*
+emb_service_register(UNUSED_ARG(PyObject* self_), PyObject* args) {
+ struct userNode* user;
+ char const* user_s;
+
+ if (!PyArg_ParseTuple(args, "s", &user_s))
+ return NULL;
+
+ if ((user = GetUserH(user_s)) == NULL) {
+ PyErr_SetString(PyExc_Exception, "unknown user");
+ return NULL;
+ }
+
+ if (user->uplink != self) {
+ PyErr_SetString(PyExc_Exception, "user is not on service server");
+ return NULL;
+ }
+
+ return pyobj_from_service(service_register(user));
+}
+
+size_t logs_size = 0;
+static struct log_type **logs_list = NULL;
+
+PyDoc_STRVAR(emb_log_register_type__doc__,
+ "registers a log source to write event data to.");
+static PyObject* emb_log_register_type(UNUSED_ARG(PyObject *self), PyObject* args) {
+ const char* logName;
+ const char* defaultLog;
+ struct log_type* log;
+ struct log_type** newlogs;
+
+ if (!PyArg_ParseTuple(args, "ss", &logName, &defaultLog))
+ return NULL;
+
+ newlogs = realloc(logs_list, (logs_size+1)*sizeof(struct log_type*));
+ if (newlogs == NULL) {
+ PyErr_SetString(PyExc_Exception, "unable to allocate memory for log structures. aborting.");
+ return NULL;
+ }
+ logs_list = newlogs;
+
+ log = log_register_type(logName, defaultLog);
+ if (log == NULL) {
+ PyErr_SetString(PyExc_Exception, "unable to register log");
+ return NULL;
+ }
+
+ logs_list[logs_size++] = log;
+
+ return Py_BuildValue("O", PyCObject_FromVoidPtr(log, NULL));
+}
+
+PyDoc_STRVAR(emb_module_register__doc__, "registers a module");
+PyObject* emb_module_register(UNUSED_ARG(PyObject* self), PyObject* args) {
+ PyObject* pylog;
+ char const *name, *helpfile;
+ struct log_type* log;
+ struct module* mod;
+
+ if (!PyArg_ParseTuple(args, "sOs", &name, &pylog, &helpfile))
+ return NULL;
+
+ log = PyCObject_AsVoidPtr(pylog);
+
+ mod = module_register(name, log, helpfile, NULL);
+
+ if (mod == NULL) {
+ PyErr_SetString(PyExc_Exception, "unable to register module");
+ return NULL;
+ }
+
+ return Py_BuildValue("O", PyCObject_FromVoidPtr(mod, NULL));
+}
+
static PyMethodDef EmbMethods[] = {
/* Communication methods */
- {"dump", emb_dump, METH_VARARGS, "Dump raw P10 line to server"},
- {"send_target_privmsg", emb_send_target_privmsg, METH_VARARGS, "Send a message to somewhere"},
- {"send_target_notice", emb_send_target_notice, METH_VARARGS, "Send a notice to somewhere"},
- {"log_module", emb_log_module, METH_VARARGS, "Log something using the X3 log subsystem"},
+ {"dump", emb_dump, METH_VARARGS, emb_dump__doc__},
+ {"send_target_privmsg", emb_send_target_privmsg, METH_VARARGS, emb_send_target_privmsg__doc__},
+ {"send_target_notice", emb_send_target_notice, METH_VARARGS, emb_send_target_notice__doc__},
+ {"log_module", emb_log_module, METH_VARARGS, emb_log_module__doc__},
//TODO: {"exec_cmd", emb_exec_cmd, METH_VARARGS, "execute x3 command provided"},
// This should use environment from "python command" call to pass in, if available
- {"kill", emb_kill, METH_VARARGS, "Kill someone"},
- {"fakehost", emb_fakehost, METH_VARARGS, "Set a user's fakehost"},
-//TODO: svsnick, svsquit, svsjoin, svsmode, svsident, nick, quit, join, part, ident, vhost
+ {"kill", emb_kill, METH_VARARGS, emb_kill__doc__},
+ {"fakehost", emb_fakehost, METH_VARARGS, emb_fakehost__doc__},
+ {"svsnick", emb_svsnick, METH_VARARGS, emb_svsnick__doc__},
+ {"svsquit", emb_svsquit, METH_VARARGS, emb_svsquit__doc__},
+ {"svsjoin", emb_svsjoin, METH_VARARGS, emb_svsjoin__doc__},
+ {"adduser", emb_adduser, METH_VARARGS, emb_adduser__doc__},
+ {"service_register", emb_service_register, METH_VARARGS, emb_service_register__doc__},
+//TODO: svsmode, svsident, nick, quit, join, part, ident, vhost
//TODO: {"shun"
//TODO: {"unshun"
//TODO: {"gline", emb_gline, METH_VARARGS, "gline a mask"},
//TODO: {"ungline", emb_ungline, METH_VARARGS, "remove a gline"},
- {"kick", emb_kick, METH_VARARGS, "kick someone from a channel"},
- {"channel_mode", emb_channel_mode, METH_VARARGS, "set modes on a channel"},
- {"user_mode", emb_user_mode, METH_VARARGS, "Have x3 set usermodes on one of its own nicks"},
+ {"kick", emb_kick, METH_VARARGS, emb_kick__doc__},
+ {"channel_mode", emb_channel_mode, METH_VARARGS, emb_channel_mode__doc__},
+ {"user_mode", emb_user_mode, METH_VARARGS, emb_user_mode__doc__},
//
- {"get_config", emb_get_config, METH_VARARGS, "get x3.conf settings into a nested dict"},
+ {"get_config", emb_get_config, METH_VARARGS, emb_get_config__doc__},
//TODO: {"config_set", emb_config_set, METH_VARARGS, "change a config setting 'on-the-fly'."},
//
- {"timeq_add", emb_timeq_add, METH_VARARGS, "add function to callback to the event system"},
- {"timeq_del", emb_timeq_del, METH_VARARGS, "remove function to callback from the event system"},
+ {"timeq_add", emb_timeq_add, METH_VARARGS, emb_timeq_add__doc__},
+ {"timeq_del", emb_timeq_del, METH_VARARGS, emb_timeq_del__doc__},
+
+ /* module registration methods */
+ {"log_register_type", emb_log_register_type, METH_VARARGS,
+ emb_log_register_type__doc__},
+ {"module_register", emb_module_register, METH_VARARGS,
+ emb_module_register__doc__},
/* Information gathering methods */
- {"get_user", emb_get_user, METH_VARARGS, "Get details about a nickname"},
- {"get_users", emb_get_users, METH_VARARGS, "Get all connected users"},
- {"get_channel", emb_get_channel, METH_VARARGS, "Get details about a channel"},
- {"get_channels", emb_get_channels, METH_VARARGS, "Get all channels"},
- {"get_server", emb_get_server, METH_VARARGS, "Get details about a server"},
- {"get_servers", emb_get_servers, METH_VARARGS, "Get all server names"},
- {"get_account", emb_get_account, METH_VARARGS, "Get details about an account"},
- {"get_accounts", emb_get_accounts, METH_VARARGS, "Get all nickserv accounts"},
- {"get_info", emb_get_info, METH_VARARGS, "Get various misc info about x3"},
+ {"get_user", emb_get_user, METH_VARARGS, emb_get_user__doc__},
+ {"get_users", emb_get_users, METH_VARARGS, emb_get_users__doc__},
+ {"get_channel", emb_get_channel, METH_VARARGS, emb_get_channel__doc__},
+ {"get_channels", emb_get_channels, METH_VARARGS, emb_get_channels__doc__},
+ {"get_server", emb_get_server, METH_VARARGS, emb_get_server__doc__},
+ {"get_servers", emb_get_servers, METH_VARARGS, emb_get_servers__doc__},
+ {"get_account", emb_get_account, METH_VARARGS, emb_get_account__doc__},
+ {"get_accounts", emb_get_accounts, METH_VARARGS, emb_get_accounts__doc__},
+ {"get_info", emb_get_info, METH_VARARGS, emb_get_info__doc__},
/* null terminator */
{NULL, NULL, 0, NULL}
};
it first? We will start by doing it every time.
*/
static int
-python_handle_join(struct modeNode *mNode)
+python_handle_join(struct modeNode *mNode, UNUSED_ARG(void *extra))
{
/* callback for handle_join events.
*/
}
static int
-python_handle_server_link(struct server *server)
+python_handle_server_link(struct server *server, UNUSED_ARG(void *extra))
{
- log_module(PY_LOG, LOG_INFO, "python module handle_server_link");
- if(!server) {
- log_module(PY_LOG, LOG_WARNING, "Python code got server link without server!");
- return 0;
+ PyObject* srv = NULL;
+ PyObject* funcname = NULL;
+ PyObject* retval = NULL;
+ char const* err = NULL;
+ int i = 0;
+
+ if (handler_object == NULL) {
+ err = "No Python handler is allocated. Ignoring python_handle_server_link.";
+ goto cleanup;
}
- else {
- char *args[] = {server->name, server->description};
- return python_call_handler("server_link", args, 2, "", "", "");
+
+ if (server == NULL) {
+ err = "Python code got server link without server!";
+ goto cleanup;
}
+
+ if ((srv = pyobj_from_server(server)) == NULL) {
+ err = "Python code unable to get PyObject with server!";
+ goto cleanup;
+ }
+
+ funcname = PyString_FromString("server_link");
+ if (funcname == NULL) {
+ err = "Unable to allocate memory";
+ goto cleanup;
+ }
+
+ retval = PyObject_CallMethodObjArgs(handler_object, funcname, srv, NULL);
+ if (retval == NULL) {
+ err = "Error calling server_link handler";
+ goto cleanup;
+ }
+
+cleanup:
+ Py_XDECREF(srv);
+ Py_XDECREF(funcname);
+
+ if (retval != NULL && PyInt_Check(retval))
+ i = (int)PyInt_AsLong(retval);
+
+ Py_XDECREF(retval);
+
+ if (err != NULL)
+ log_module(PY_LOG, LOG_WARNING, "%s", err);
+
+ return i;
}
static int
-python_handle_new_user(struct userNode *user)
+python_handle_new_user(struct userNode *user, UNUSED_ARG(void *extra))
{
- log_module(PY_LOG, LOG_INFO, "Python module handle_new_user");
+ PyObject* name = NULL;
+ PyObject* usr = NULL;
+ PyObject* retval = NULL;
+ int i = 0;
+ const char* err = NULL;
+
+ if (handler_object == NULL) {
+ err = "No Python handler is allocated. Ignoring python_handle_server_link.";
+ goto cleanup;
+ }
+
if(!user) {
log_module(PY_LOG, LOG_WARNING, "Python code got new_user without the user");
return 0;
}
- else {
- char *args[] = {user->nick, user->ident, user->hostname, user->info};
- return python_call_handler("new_user", args, 4, "", "", "");
+
+ if ((usr = pyobj_from_usernode(user)) == NULL) {
+ err = "unable to allocate python user information";
+ goto cleanup;
+ }
+
+ name = PyString_FromString("new_user");
+ if (name == NULL) {
+ err = "unable to allocate memory for handler function name";
+ goto cleanup;
}
+
+ if ((retval = PyObject_CallMethodObjArgs(handler_object, name, usr, NULL)) == NULL) {
+ err = "error calling new_user handler";
+ goto cleanup;
+ }
+
+cleanup:
+ Py_XDECREF(usr);
+ Py_XDECREF(name);
+
+ if (retval != NULL && PyInt_Check(retval))
+ i = (int)PyInt_AsLong(retval);
+
+ Py_XDECREF(retval);
+
+ if (err != NULL)
+ log_module(PY_LOG, LOG_WARNING, "%s", err);
+
+ return i;
}
static void
-python_handle_nick_change(struct userNode *user, const char *old_nick)
+python_handle_nick_change(struct userNode *user, const char *old_nick, UNUSED_ARG(void *extra))
{
- log_module(PY_LOG, LOG_INFO, "Python module handle_nick_change");
- if(!user) {
- log_module(PY_LOG, LOG_WARNING, "Python code got nick_change without the user!");
+ PyObject* usr = NULL;
+ PyObject* name = NULL;
+ PyObject* oldnick = NULL;
+ PyObject* retval = NULL;
+ char const* err = NULL;
+
+ if (handler_object == NULL) {
+ err = "No Python handler is allocated. Ignoring python_handle_server_link.";
+ goto cleanup;
}
- else {
- char *args[] = {user->nick, (char *)old_nick};
- python_call_handler("nick_change", args, 2, "", "", "");
+
+ if (user == NULL) {
+ err = "Python code got nick_change without the user!";
+ goto cleanup;
+ }
+
+ if ((usr = pyobj_from_usernode(user)) == NULL) {
+ err = "unable to allocate Python usernode";
+ goto cleanup;
+ }
+
+ name = PyString_FromString("nick_change");
+ if (name == NULL) {
+ err = "unable to allocate memory for handler function name";
+ goto cleanup;
+ }
+
+ oldnick = PyString_FromString(old_nick);
+
+ retval = PyObject_CallMethodObjArgs(handler_object, name, usr, oldnick, NULL);
+ if (retval == NULL) {
+ err = "error calling nick_change handler";
+ goto cleanup;
+ }
+
+cleanup:
+ Py_XDECREF(usr);
+ Py_XDECREF(name);
+ Py_XDECREF(oldnick);
+ Py_XDECREF(retval);
+
+ if (err != NULL)
+ log_module(PY_LOG, LOG_WARNING, "%s", err);
+}
+
+void python_handle_del_user(struct userNode *user, struct userNode *killer, const char *why, UNUSED_ARG(void *extra)) {
+ PyObject *usr = NULL, *killr = NULL, *name = NULL;
+ PyObject *reason = NULL, *retval = NULL;
+ char const* err = NULL;
+
+ if (handler_object == NULL) {
+ err = "No Python handler is allocated. Ignoring python_handle_server_link.";
+ goto cleanup;
+ }
+
+ if (user == NULL) {
+ Py_INCREF(Py_None);
+ usr = Py_None;
+ } else {
+ usr = pyobj_from_usernode(user);
+ if (usr == NULL) {
+ err = "unable to allocate usernode for user";
+ goto cleanup;
+ }
+ }
+
+ if (killer == NULL) {
+ Py_INCREF(Py_None);
+ killr = Py_None;
+ } else {
+ killr = pyobj_from_usernode(killer);
+ if (killr == NULL) {
+ err = "unable to allocate usernode for killer";
+ goto cleanup;
+ }
}
+
+ if (why == NULL) {
+ Py_INCREF(Py_None);
+ reason = Py_None;
+ } else {
+ reason = PyString_FromString(why);
+ if (reason == NULL) {
+ err = "unable to allocate memory for reason";
+ goto cleanup;
+ }
+ }
+
+ name = PyString_FromString("del_user");
+ if (name == NULL) {
+ err = "unable to allocate memory for handler function name";
+ goto cleanup;
+ }
+
+ retval = PyObject_CallMethodObjArgs(handler_object, name, usr, killr, reason, NULL);
+ if (retval == NULL) {
+ err = "error calling del_user handler";
+ goto cleanup;
+ }
+
+cleanup:
+ Py_XDECREF(usr);
+ Py_XDECREF(killr);
+ Py_XDECREF(name);
+ Py_XDECREF(reason);
+ Py_XDECREF(retval);
+
+ if (err != NULL)
+ log_module(PY_LOG, LOG_WARNING, "%s", err);
}
+int python_handle_topic(struct userNode *who, struct chanNode *chan, const char *old_topic, UNUSED_ARG(void *extra)) {
+ PyObject* pwho = NULL, *pchan = NULL, *oldtopic = NULL;
+ PyObject* name = NULL, *retval = NULL;
+ const char* err = NULL;
+ int i = 0;
+
+ if (who == NULL) {
+ Py_INCREF(Py_None);
+ pwho = Py_None;
+ } else {
+ if ((pwho = pyobj_from_usernode(who)) == NULL) {
+ err = "unable to allocate usernode";
+ goto cleanup;
+ }
+ }
+
+ if ((pchan = pyobj_from_channode(chan)) == NULL) {
+ err = "unable to allocate channode";
+ goto cleanup;
+ }
+
+ if (old_topic == NULL) {
+ Py_INCREF(Py_None);
+ oldtopic = Py_None;
+ } else {
+ oldtopic = PyString_FromString(old_topic);
+ if (oldtopic == NULL) {
+ err = "unable to allocate memory for old topic string";
+ goto cleanup;
+ }
+ }
+
+ name = PyString_FromString("topic");
+ if (name == NULL) {
+ err = "unable to allocate memory for topic handler function name";
+ goto cleanup;
+ }
+
+ retval = PyObject_CallMethodObjArgs(handler_object, name, pwho, pchan, oldtopic, NULL);
+ if (retval == NULL) {
+ err = "error calling topic handler";
+ goto cleanup;
+ }
+
+cleanup:
+ Py_XDECREF(pwho);
+ Py_XDECREF(pchan);
+ Py_XDECREF(oldtopic);
+ Py_XDECREF(name);
+
+ if (retval != NULL && PyInt_Check(retval))
+ i = (int)PyInt_AsLong(retval);
+
+ Py_XDECREF(retval);
+
+ if (err != NULL)
+ log_module(PY_LOG, LOG_WARNING, "%s", err);
+
+ return i;
+}
/* ----------------------------------------------------------------------------- */
}
static void
-python_cleanup(void) {
+python_cleanup(UNUSED_ARG(void *extra)) {
/* Called on shutdown of the python module (or before reloading)
*/
log_module(PY_LOG, LOG_INFO, "python module cleanup");
+
+ Py_XDECREF(handler_object);
+ handler_object = NULL;
+
if (PyErr_Occurred())
PyErr_Clear();
Py_Finalize(); /* Shut down python enterpreter */
+
+ log_module(PY_LOG, LOG_INFO, "python module cleanup done");
}
/* ---------------------------------------------------------------------------------- *
/* reload the python system completely
*/
log_module(PY_LOG, LOG_INFO, "Shutting python down");
- python_cleanup();
+ python_cleanup(NULL);
log_module(PY_LOG, LOG_INFO, "Loading python stuff");
if(python_load()) {
reply("PYMSG_RELOAD_SUCCESS");
return 1;
}
-static char* format_python_error(int space_nls) {
- PyObject* extype = NULL, *exvalue = NULL, *extraceback = NULL;
- PyObject* pextypestr = NULL, *pexvaluestr = NULL;
- char* extypestr = NULL, *exvaluestr = NULL;
- size_t retvallen = 0;
- char* retval = NULL, *tmp;
-
- PyErr_Fetch(&extype, &exvalue, &extraceback);
- if (!extype)
- goto cleanup;
-
- pextypestr = PyObject_Str(extype);
- if (!pextypestr)
- goto cleanup;
- extypestr = PyString_AsString(pextypestr);
- if (!extypestr)
- goto cleanup;
-
- pexvaluestr = PyObject_Str(exvalue);
- if (pexvaluestr)
- exvaluestr = PyString_AsString(pexvaluestr);
-
- retvallen = strlen(extypestr) + (exvaluestr ? strlen(exvaluestr) + 2 : 0) + 1;
- retval = (char*)malloc(retvallen);
- if (exvaluestr)
- snprintf(retval, retvallen, "%s: %s", extypestr, exvaluestr);
- else
- strncpy(retval, extypestr, retvallen);
-
- if (space_nls) {
- tmp = retval;
- while (*tmp) {
- if (*tmp == '\n')
- *tmp = ' ';
- ++tmp;
- }
- }
-
-cleanup:
- if (PyErr_Occurred())
- PyErr_Clear(); /* ignore errors caused by formatting */
- Py_XDECREF(extype);
- Py_XDECREF(exvalue);
- Py_XDECREF(extraceback);
- Py_XDECREF(pextypestr);
- Py_XDECREF(pexvaluestr);
-
- if (retval)
- return retval;
-
- return strdup("unknown exception");
-}
-
static MODCMD_FUNC(cmd_run) {
/* this method allows running arbitrary python commands.
* use with care.
// Please help us by implementing any of the callbacks listed as TODO below. They already exist
// in x3, they just need handle_ bridges implemented. (see python_handle_join for an example)
- reg_server_link_func(python_handle_server_link);
- reg_new_user_func(python_handle_new_user);
- reg_nick_change_func(python_handle_nick_change);
-//TODO: reg_del_user_func(python_handle_del_user);
+ reg_server_link_func(python_handle_server_link, NULL);
+ reg_new_user_func(python_handle_new_user, NULL);
+ reg_nick_change_func(python_handle_nick_change, NULL);
+ reg_del_user_func(python_handle_del_user, NULL);
//TODO: reg_account_func(python_handle_account); /* stamping of account name to the ircd */
//TODO: reg_handle_rename_func(python_handle_handle_rename); /* handle used to ALSO mean account name */
//TODO: reg_failpw_func(python_handle_failpw);
//
//TODO: reg_oper_func(python_handle_oper);
//TODO: reg_new_channel_func(python_handle_new_channel);
- reg_join_func(python_handle_join);
+ reg_join_func(python_handle_join, NULL);
//TODO: reg_del_channel_func(python_handle_del_channel);
//TODO: reg_part_func(python_handle_part);
//TODO: reg_kick_func(python_handle_kick);
-//TODO: reg_topic_func(python_handle_topic);
+ reg_topic_func(python_handle_topic, NULL);
//TODO: reg_channel_mode_func(python_handle_channel_mode);
//TODO: reg_privmsg_func(python_handle_privmsg);
//TODO: reg_allchanmsg_func
//TODO: reg_user_mode_func
- reg_exit_func(python_cleanup);
+ reg_exit_func(python_cleanup, NULL);
python_load();
return 1;
projects / irc / evilnet / x3.git / blobdiff