X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2Fdolmod.c;h=14181744a5a47c5caff7ee6740399b5821afbfbd;hb=48cff6fe16a5fa6579da7d035322a431ce52711c;hp=eb2c405defaa546209ec9478f3722cf760132883;hpb=12383d48e624213114482f29af819ff77aef70fa;p=doldaconnect.git diff --git a/lib/python/dolmod.c b/lib/python/dolmod.c index eb2c405..1418174 100644 --- a/lib/python/dolmod.c +++ b/lib/python/dolmod.c @@ -1,6 +1,6 @@ /* * Dolda Connect - Modular multiuser Direct Connect-style client - * Copyright (C) 2004 Fredrik Tolf (fredrik@dolda2000.com) + * Copyright (C) 2004 Fredrik Tolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -189,11 +189,11 @@ static PyObject *mod_select(PyObject *self, PyObject *args) return(NULL); } if(((pfd.revents & POLLIN) && dc_handleread()) || ((pfd.revents & POLLOUT) && dc_handlewrite())) { - if(errno == 0) { - fd = -1; + fd = -1; + if(errno == 0) Py_RETURN_FALSE; - } PyErr_SetFromErrno(PyExc_OSError); + return(NULL); } if(ret > 0) Py_RETURN_TRUE; @@ -267,13 +267,13 @@ static PyObject *mod_qcmd(PyObject *self, PyObject *args, PyObject *kwargs) if(PyMapping_HasKeyString(kwargs, "cb")) { cb = PyMapping_GetItemString(kwargs, "cb"); if(PyCallable_Check(cb)) { - ret = PyInt_FromLong(dc_queuecmd(qcmd_cb, cb, cmd, L"%%a", toks, NULL)); + ret = PyInt_FromLong(dc_queuecmd(qcmd_cb, cb, cmd, L"%a", toks, NULL)); } else { PyErr_SetString(PyExc_TypeError, "Callback must be callable"); Py_DECREF(cb); } } else { - ret = PyInt_FromLong(dc_queuecmd(NULL, NULL, cmd, L"%%a", toks, NULL)); + ret = PyInt_FromLong(dc_queuecmd(NULL, NULL, cmd, L"%a", toks, NULL)); } out: @@ -389,6 +389,26 @@ static PyObject *mod_wantwrite(PyObject *self) Py_RETURN_FALSE; } +static PyObject *mod_checkproto(PyObject *self, PyObject *args) +{ + PyObject *tmp; + struct respobj *resp; + int version; + + version = DC_LATEST; + if(!PyArg_ParseTuple(args, "O|i", &tmp, &version)) + return(NULL); + if(!PyObject_TypeCheck(tmp, &resptype)) { + PyErr_SetString(PyExc_TypeError, "first argument must be a response object"); + return(NULL); + } + resp = (struct respobj *)tmp; + if(dc_checkprotocol(resp->resp, version)) + Py_RETURN_FALSE; + else + Py_RETURN_TRUE; +} + static PyMethodDef methods[] = { {"connect", mod_connect, METH_VARARGS, "Connect to a Dolda Connect server"}, @@ -408,6 +428,8 @@ static PyMethodDef methods[] = { "Use a standard algorithm to lex a search expression"}, {"wantwrite", (PyCFunction)mod_wantwrite, METH_NOARGS, "Return a boolean indicating whether there is output to be fed to the server"}, + {"checkproto", (PyCFunction)mod_checkproto, METH_VARARGS, + "Check so that the connect stanza returned by the server indicates support for the correct revision of the protocol"}, {NULL, NULL, 0, NULL} }; @@ -420,5 +442,6 @@ PyMODINIT_FUNC initdolmod(void) m = Py_InitModule("dolmod", methods); Py_INCREF(&resptype); PyModule_AddObject(m, "Response", (PyObject *)&resptype); + PyModule_AddObject(m, "latest", Py_BuildValue("i", DC_LATEST)); dc_init(); }