Changeset 640:237cf6339546 in freeDiameter for extensions/dbg_interactive/peers.i

Timestamp:

Dec 20, 2010, 7:36:40 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

dbg_interactive almost complete

File:

• extensions/dbg_interactive/peers.i (modified) (2 diffs)

extensions/dbg_interactive/peers.i

@@ -67 +67 @@
 
 %extend peer_info {
+        peer_info () {
+                struct peer_info *np = (struct peer_info *)calloc(1, sizeof(struct peer_info));
+                if (!np) {
+                        DI_ERROR_MALLOC;
+                        return NULL;
+                }
+                
+                fd_list_init(&np->pi_endpoints, NULL);
+                
+                return np;
+        }
+
         /* Wrapper around fd_peer_add to allow calling the python callback */
+        %delobject add;
         void add(PyObject * PyCb=NULL) {
                 int ret;
@@ -81 +94 @@
                 }
         }
-
-        /* Add an endpoint */
-        void add_endpoint(char * endpoint) {
-                fd_log_debug("What is the best way in python to pass an endpoint? (ip + port)");
-        }
-
-}
+}
+
+%inline %{
+static struct peer_hdr * peer_search(char *diamid) {
+        struct peer_hdr *r = NULL;
+        int ret = fd_peer_getbyid( diamid, &r );
+        if (ret) {
+                DI_ERROR(ret, NULL, NULL);
+                return NULL;
+        }
+        return r;
+}
+%}
+
+%{
+static PyObject * validate_cb_py = NULL;
+static PyObject * validate_cb2_py = NULL;
+
+/* C wrapper that calls validate_cb2_py */
+int call_the_python_validate_callback2(struct peer_info * info) {
+        PyObject *PyInfo;
+        PyObject *result = NULL;
+        int ret = 0;
+        
+        if (!validate_cb2_py) {
+                fd_log_debug("Internal error: missing the callback2!\n");
+                return ENOTSUP;
+        }
+        
+        SWIG_PYTHON_THREAD_BEGIN_BLOCK;
+        /* Convert the arguments */
+        PyInfo  = SWIG_NewPointerObj((void *)info,     SWIGTYPE_p_peer_info,     0 );
+        
+        /* Call the function */
+        result = PyEval_CallFunction(validate_cb2_py, "(O)", PyInfo);
+        
+        /* The result is an integer */
+        if ((result == NULL) || !SWIG_IsOK(SWIG_AsVal_int(result, &ret))) {
+                fd_log_debug("Error: The Python callback did not return an integer.\n");
+                ret = EINVAL;
+                goto out;
+        }
+        
+out:    
+        Py_XDECREF(result);
+        SWIG_PYTHON_THREAD_END_BLOCK;
+        return ret;
+}
+
+/* C wrapper that calls validate_cb_py */
+int call_the_python_validate_callback(struct peer_info * info, int * auth, int (**cb2)(struct peer_info *)) {
+        PyObject *PyInfo;
+        PyObject *result = NULL;
+        int ret = 0;
+        
+        if (!validate_cb_py) {
+                fd_log_debug("Internal error: missing the callback!\n");
+                return ENOTSUP;
+        }
+        
+        SWIG_PYTHON_THREAD_BEGIN_BLOCK;
+        /* Convert the arguments */
+        PyInfo  = SWIG_NewPointerObj((void *)info,     SWIGTYPE_p_peer_info,     0 );
+        
+        /* Call the function */
+        result = PyEval_CallFunction(validate_cb_py, "(O)", PyInfo);
+        
+        /* The result is supposedly -1, 1, or a cb2 */
+        if (result == NULL) {
+                fd_log_debug("Error: The Python callback did not return a value.\n");
+                ret = EINVAL;
+                goto out;
+        }
+        
+        if (PyCallable_Check(result)) {
+                if (cb2) {
+                        if (validate_cb2_py && (validate_cb2_py != result)) {
+                                fd_log_debug("Only 1 register callback2 is supported currently\n");
+                                ret = ENOTSUP;
+                                goto out;
+                        }
+                        validate_cb2_py = result;
+                        *cb2 = call_the_python_validate_callback2;
+                        *auth = 1;
+                        goto out_nodec;
+                } else {
+                        *auth = 1;
+                        goto out; /* ignore the callback since it won't be used */
+                }
+        } else { /* In this case, the return value must be -1, 0, or 1 */
+                if (!SWIG_IsOK(SWIG_AsVal_int(result, auth))) {
+                        fd_log_debug("Error: Cannot convert the return value to integer.\n");
+                        ret = EINVAL;
+                        goto out;
+                }
+        }
+        
+out:    
+        Py_XDECREF(result);
+out_nodec:      
+        SWIG_PYTHON_THREAD_END_BLOCK;
+        TRACE_DEBUG(FULL, "ret=%d, *auth=%d, cb2=%p, *cb2=%p", ret, *auth, cb2, cb2 ? *cb2 : NULL);
+        return ret;
+}
+
+%}
+
+%inline %{
+static void peer_validate_register(PyObject * PyCb) {
+        int ret ;
+        
+        if (!PyCb) {
+                DI_ERROR(EINVAL, NULL, "The callback must be provided");
+                return;
+        }
+        
+        if (validate_cb_py) {
+                if (PyCb != validate_cb_py) {
+                        DI_ERROR(ENOTSUP, PyExc_RuntimeError, "Only 1 register callback is supported currently");
+                        return;
+                }
+        } else {
+                validate_cb_py = PyCb;
+                Py_XINCREF(PyCb);
+        }
+        
+        ret = fd_peer_validate_register ( call_the_python_validate_callback );
+        if (ret) {
+                DI_ERROR(ret, NULL, NULL);
+        }
+}
+%}