X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2Fdolmod.c;h=fd026fa57a08d7ca944ecb7657a084a7703b6380;hb=32a93257286826206a956dc4b15a9542c5c608f5;hp=a015b57541a61ec22dcec0889c84ab1954e79a77;hpb=277c2137ba836c540009b6290dfe91d587100515;p=doldaconnect.git

diff --git a/lib/python/dolmod.c b/lib/python/dolmod.c
index a015b57..fd026fa 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 <fredrik@dolda2000.com>
  *  
  *  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
@@ -90,6 +90,9 @@ static PyObject *resp_intresp(struct respobj *self)
 	    case 3:
 		PyList_SetItem(sl, i, PyFloat_FromDouble(ires->argv[i].val.flnum));
 		break;
+	    case 4:
+		PyList_SetItem(sl, i, PyLong_FromLongLong(ires->argv[i].val.lnum));
+		break;
 	    }
 	}
 	dc_freeires(ires);
@@ -134,14 +137,13 @@ static struct respobj *makeresp(struct dc_response *resp)
 static PyObject *mod_connect(PyObject *self, PyObject *args)
 {
     char *host;
-    int port;
     
-    port = -1;
-    if(!PyArg_ParseTuple(args, "s|i", &host, &port))
+    host = NULL;
+    if(!PyArg_ParseTuple(args, "|s", &host))
 	return(NULL);
     if(fd >= 0)
 	dc_disconnect();
-    if((fd = dc_connect(host, port)) < 0) {
+    if((fd = dc_connect(host)) < 0) {
 	PyErr_SetFromErrno(PyExc_OSError);
 	return(NULL);
     }
@@ -190,11 +192,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;
@@ -268,13 +270,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:
@@ -382,6 +384,34 @@ static PyObject *mod_lexsexpr(PyObject *self, PyObject *args)
     return(ret);
 }
 
+static PyObject *mod_wantwrite(PyObject *self)
+{
+    if(dc_wantwrite())
+	Py_RETURN_TRUE;
+    else
+	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"},
@@ -399,6 +429,10 @@ static PyMethodDef methods[] = {
      "Perform an asynchronous login procedure"},
     {"lexsexpr", mod_lexsexpr, METH_VARARGS,
      "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}
 };
 
@@ -411,5 +445,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();
 }