git:andrei/rve_f_params: app_python: use sr31_cmd_export_t - sr-dev

4 Aug 2010

Module: sip-router
Branch: andrei/rve_f_params
Commit: 5ffba901df81196ab4999a97fbe6008269545cb5
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ffba901...
Author: Andrei Pelinescu-Onciul andrei@iptel.org
Committer: Andrei Pelinescu-Onciul andrei@iptel.org
Date:   Wed Aug  4 15:49:14 2010 +0200
app_python: use sr31_cmd_export_t
Use the new command export interface when trying to call other
modules functions.
---
modules/app_python/python_msgobj.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/app_python/python_msgobj.c b/modules/app_python/python_msgobj.c
index 830cfdb..debaa8b 100644
--- a/modules/app_python/python_msgobj.c
+++ b/modules/app_python/python_msgobj.c
@@ -190,7 +190,7 @@ msg_call_function(msgobject *self, PyObject *args)
 {
     int i, rval;
     char *fname, *arg1, *arg2;
-    union cmd_export_u* fexport;
+    sr31_cmd_export_t* fexport;
     struct action *act;
     struct run_act_ctx ra_ctx;
     unsigned mod_ver;
@@ -233,9 +233,9 @@ msg_call_function(msgobject *self, PyObject *args)
         return Py_None;
     }
-    if (fexport->v1.fixup != NULL) {
+    if (fexport->fixup != NULL) {
         if (i >= 3) {
-            rval = fexport->v1.fixup(&(act->val[2].u.data), 2);
+            rval = fexport->fixup(&(act->val[2].u.data), 2);
             if (rval < 0) {
                 PyErr_SetString(PyExc_RuntimeError, "Error in fixup (2)");
                 Py_INCREF(Py_None);
@@ -244,7 +244,7 @@ msg_call_function(msgobject *self, PyObject *args)
             act->val[2].type = MODFIXUP_ST;
         }
         if (i >= 2) {
-            rval = fexport->v1.fixup(&(act->val[1].u.data), 1);
+            rval = fexport->fixup(&(act->val[1].u.data), 1);
             if (rval < 0) {
                 PyErr_SetString(PyExc_RuntimeError, "Error in fixup (1)");
                 Py_INCREF(Py_None);
@@ -253,7 +253,7 @@ msg_call_function(msgobject *self, PyObject *args)
             act->val[1].type = MODFIXUP_ST;
         }
         if (i == 1) {
-            rval = fexport->v1.fixup(0, 0);
+            rval = fexport->fixup(0, 0);
             if (rval < 0) {
                 PyErr_SetString(PyExc_RuntimeError, "Error in fixup (0)");
                 Py_INCREF(Py_None);

    