Navigation

Changeset 639:95a784729cac in freeDiameter for extensions


Ignore:
Timestamp:
Dec 20, 2010, 1:07:06 PM (13 years ago)
Author:
Sebastien Decugis <sdecugis@nict.go.jp>
Branch:
default
Phase:
public
Message:

Added new opaque pointer to fd_sess_handler_create and fd_disp_register for usability. Bumped API version number.

Location:
extensions
Files:
28 edited

Legend:

Unmodified
Added
Removed

  • extensions/app_acct/app_acct.c

    r403 r639  
    4646
    4747/* Callback for incoming Base Accounting Accounting-Request messages */
    48 static int acct_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act)
     48static int acct_cb( struct msg ** msg, struct avp * avp, struct session * sess, void * opaque, enum disp_action * act)
    4949{
    5050        struct msg * m;
    … …  
    135135        CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_APPLICATION, APPLICATION_BY_NAME, "Diameter Base Accounting", &data.app, ENOENT) );
    136136        CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_COMMAND, CMD_BY_NAME, "Accounting-Request", &data.command, ENOENT) );
    137         CHECK_FCT( fd_disp_register( acct_cb, DISP_HOW_CC, &data, NULL ) );
     137        CHECK_FCT( fd_disp_register( acct_cb, DISP_HOW_CC, &data, NULL, NULL ) );
    138138       
    139139        /* Advertise the support for the Diameter Base Accounting application in the peer */

  • extensions/app_diameap/diameap_server.c

    r610 r639  
    8585
    8686
    87 void diameap_cli_sess_cleanup(void * arg, char * sid)
     87void diameap_cli_sess_cleanup(void * arg, char * sid, void * opaque)
    8888{
    8989
    … …  
    30603060
    30613061static int diameap_server_callback(struct msg ** rmsg, struct avp * ravp,
    3062                 struct session * sess, enum disp_action * action)
     3062                struct session * sess, void * opaque, enum disp_action * action)
    30633063{
    30643064        TRACE_ENTRY("%p %p %p %p", rmsg, ravp, sess, action);
    … …  
    33893389
    33903390        /*create handler for sessions */
    3391         CHECK_FCT(fd_sess_handler_create(&diameap_server_reg, diameap_cli_sess_cleanup));
     3391        CHECK_FCT(fd_sess_handler_create(&diameap_server_reg, diameap_cli_sess_cleanup, NULL));
    33923392
    33933393        /* Register the callback */
    … …  
    33973397
    33983398        /* Register the callback for EAP Application */
    3399         CHECK_FCT(fd_disp_register(diameap_server_callback, DISP_HOW_CC, &when,
     3399        CHECK_FCT(fd_disp_register(diameap_server_callback, DISP_HOW_CC, &when, NULL,
    34003400                                        &handle));
    34013401
    … …  
    34103410int diameap_stop_server(void)
    34113411{
    3412         CHECK_FCT(fd_sess_handler_destroy(&diameap_server_reg));
    3413         CHECK_FCT(fd_disp_unregister(&handle));
     3412        CHECK_FCT(fd_sess_handler_destroy(&diameap_server_reg, NULL));
     3413        CHECK_FCT(fd_disp_unregister(&handle, NULL));
    34143414
    34153415        return 0;

  • extensions/app_radgw/rgwx_acct.c

    r564 r639  
    173173        memset(new, 0, sizeof(struct rgwp_config));
    174174       
    175         CHECK_FCT( fd_sess_handler_create( &new->sess_hdl, free ) );
     175        CHECK_FCT( fd_sess_handler_create( &new->sess_hdl, free, NULL ) );
    176176        new->confstr = conffile;
    177177       
    … …  
    284284        TRACE_ENTRY("%p", state);
    285285        CHECK_PARAMS_DO( state, return );
    286         CHECK_FCT_DO( fd_sess_handler_destroy( &state->sess_hdl ),  );
     286        CHECK_FCT_DO( fd_sess_handler_destroy( &state->sess_hdl, NULL ),  );
    287287        free(state);
    288288        return;

  • extensions/app_radgw/rgwx_auth.c

    r532 r639  
    139139        memset(new, 0, sizeof(struct rgwp_config));
    140140       
    141         CHECK_FCT( fd_sess_handler_create( &new->sess_hdl, free ) );
     141        CHECK_FCT( fd_sess_handler_create( &new->sess_hdl, free, NULL ) );
    142142        new->confstr = confstr;
    143143       
    … …  
    225225        TRACE_ENTRY("%p", state);
    226226        CHECK_PARAMS_DO( state, return );
    227         CHECK_FCT_DO( fd_sess_handler_destroy( &state->sess_hdl ),  );
     227        CHECK_FCT_DO( fd_sess_handler_destroy( &state->sess_hdl, NULL ),  );
    228228        free(state);
    229229        return;

  • extensions/app_radgw/rgwx_echodrop.c

    r403 r639  
    3939
    4040/* If a session is destroyed, empty the list of ed_saved_attribute */
    41 static void state_delete(void * arg, char * sid) {
     41static void state_delete(void * arg, char * sid, void * opaque) {
    4242        struct fd_list * list = (struct fd_list *)arg;
    4343       
    … …  
    6969       
    7070        /* Create the session handler */
    71         CHECK_FCT( fd_sess_handler_create( &new->sess_hdl, state_delete ) );
     71        CHECK_FCT( fd_sess_handler_create( &new->sess_hdl, state_delete, NULL ) );
    7272       
    7373        /* Parse the configuration file */
    … …  
    107107        TRACE_ENTRY("%p", state);
    108108        CHECK_PARAMS_DO( state, return );
    109         CHECK_FCT_DO( fd_sess_handler_destroy( &state->sess_hdl ),  );
     109        CHECK_FCT_DO( fd_sess_handler_destroy( &state->sess_hdl, NULL ),  );
    110110        while (! FD_IS_LIST_EMPTY(&state->attributes) ) {
    111111                struct fd_list * li = state->attributes.next;

  • extensions/app_radgw/rgwx_sip.c

    r584 r639  
    262262        memset(new, 0, sizeof(struct rgwp_config));
    263263       
    264         CHECK_FCT( fd_sess_handler_create( &new->sess_hdl, free ) );
     264        CHECK_FCT( fd_sess_handler_create( &new->sess_hdl, free, NULL ) );
    265265        new->confstr = conffile;
    266266       
    … …  
    316316        CHECK_PARAMS_DO( state, return );
    317317       
    318         CHECK_FCT_DO( fd_sess_handler_destroy( &state->sess_hdl ),  );
     318        CHECK_FCT_DO( fd_sess_handler_destroy( &state->sess_hdl, NULL ),  );
    319319       
    320320        nonce_deletelistnonce(state);

  • extensions/app_sip/app_sip.c

    r433 r639  
    5959struct app_sip_dict sip_dict;
    6060
    61 int app_sip_default_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act)
    62 {
    63         TRACE_ENTRY("%p %p %p %p", msg, avp, sess, act);
     61int app_sip_default_cb( struct msg ** msg, struct avp * avp, struct session * sess, void * opaque, enum disp_action * act)
     62{
     63        TRACE_ENTRY("%p %p %p %p %p", msg, avp, sess, opaque, act);
    6464       
    6565        return 0;
    … …  
    179179        if(as_conf->mode==1)
    180180        {
    181           //**Command Codes
     181          // **Command Codes
    182182          //MAR
    183183          CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_COMMAND, CMD_BY_NAME, "Multimedia-Auth-Request", &data.command, ENOENT) );
    184           CHECK_FCT( fd_disp_register( app_sip_MAR_cb, DISP_HOW_CC, &data, &app_sip_MAR_hdl ) );
     184          CHECK_FCT( fd_disp_register( app_sip_MAR_cb, DISP_HOW_CC, &data, NULL, &app_sip_MAR_hdl ) );
    185185          //RTA
    186186          CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_COMMAND, CMD_BY_NAME, "Registration-Termination-Answer", &data.command, ENOENT) );
    187           CHECK_FCT( fd_disp_register( app_sip_RTA_cb, DISP_HOW_CC, &data, &app_sip_RTA_hdl ) );
     187          CHECK_FCT( fd_disp_register( app_sip_RTA_cb, DISP_HOW_CC, &data, NULL, &app_sip_RTA_hdl ) );
    188188          //PPA
    189189          CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_COMMAND, CMD_BY_NAME, "Push-Profile-Answer", &data.command, ENOENT) );
    190           CHECK_FCT( fd_disp_register( app_sip_PPA_cb, DISP_HOW_CC, &data, &app_sip_PPA_hdl ) );
     190          CHECK_FCT( fd_disp_register( app_sip_PPA_cb, DISP_HOW_CC, &data, NULL, &app_sip_PPA_hdl ) );
    191191          //LIR
    192192          CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_COMMAND, CMD_BY_NAME, "Location-Info-Request", &data.command, ENOENT) );
    193           CHECK_FCT( fd_disp_register( app_sip_LIR_cb, DISP_HOW_CC, &data, &app_sip_LIR_hdl ) );
     193          CHECK_FCT( fd_disp_register( app_sip_LIR_cb, DISP_HOW_CC, &data, NULL, &app_sip_LIR_hdl ) );
    194194          //UAR
    195195          CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_COMMAND, CMD_BY_NAME, "User-Authorization-Request", &data.command, ENOENT) );
    196           CHECK_FCT( fd_disp_register( app_sip_UAR_cb, DISP_HOW_CC, &data, &app_sip_UAR_hdl ) );
     196          CHECK_FCT( fd_disp_register( app_sip_UAR_cb, DISP_HOW_CC, &data, NULL, &app_sip_UAR_hdl ) );
    197197          //SAR
    198198          CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_COMMAND, CMD_BY_NAME, "Server-Assignment-Request", &data.command, ENOENT) );
    199           CHECK_FCT( fd_disp_register( app_sip_SAR_cb, DISP_HOW_CC, &data, &app_sip_SAR_hdl ) );
     199          CHECK_FCT( fd_disp_register( app_sip_SAR_cb, DISP_HOW_CC, &data, NULL, &app_sip_SAR_hdl ) );
    200200        }
    201201        if(as_conf->mode==2)
    … …  
    203203          //LIR
    204204          CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_COMMAND, CMD_BY_NAME, "Location-Info-Request", &data.command, ENOENT) );
    205           CHECK_FCT( fd_disp_register( app_sip_SL_LIR_cb, DISP_HOW_CC, &data, &app_sip_SL_LIR_hdl ) );
     205          CHECK_FCT( fd_disp_register( app_sip_SL_LIR_cb, DISP_HOW_CC, &data, NULL, &app_sip_SL_LIR_hdl ) );
    206206        }
    207207        //Callback for unexpected messages
    208         CHECK_FCT( fd_disp_register( app_sip_default_cb, DISP_HOW_APPID, &data, &app_sip_default_hdl ) );
     208        CHECK_FCT( fd_disp_register( app_sip_default_cb, DISP_HOW_APPID, &data, NULL, &app_sip_default_hdl ) );
    209209       
    210210       
    … …  
    213213                return EINVAL;
    214214       
    215         CHECK_FCT(fd_sess_handler_create(&ds_sess_hdl, free));
     215        CHECK_FCT(fd_sess_handler_create(&ds_sess_hdl, free, NULL));
    216216       
    217217        //Creation of thread for Registration Termination       
    … …  
    237237        //TODO:unregister other callbacks
    238238       
    239         (void) fd_disp_unregister(&app_sip_MAR_hdl);
    240         CHECK_FCT_DO( fd_sess_handler_destroy(&ds_sess_hdl),return);
     239        (void) fd_disp_unregister(&app_sip_MAR_hdl, NULL);
     240        CHECK_FCT_DO( fd_sess_handler_destroy(&ds_sess_hdl, NULL),return);
    241241       
    242242       

  • extensions/app_sip/app_sip.h

    r468 r639  
    140140int ds_entry();
    141141void fd_ext_fini(void);
    142 int app_sip_default_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act);
    143 int app_sip_MAR_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act);
    144 int app_sip_RTA_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act);
    145 int app_sip_PPA_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act);
    146 int app_sip_LIR_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act);
    147 int app_sip_UAR_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act);
    148 int app_sip_SAR_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act);
     142int app_sip_default_cb( struct msg ** msg, struct avp * avp, struct session * sess, void * opaque, enum disp_action * act);
     143int app_sip_MAR_cb( struct msg ** msg, struct avp * avp, struct session * sess, void * opaque, enum disp_action * act);
     144int app_sip_RTA_cb( struct msg ** msg, struct avp * avp, struct session * sess, void * opaque, enum disp_action * act);
     145int app_sip_PPA_cb( struct msg ** msg, struct avp * avp, struct session * sess, void * opaque, enum disp_action * act);
     146int app_sip_LIR_cb( struct msg ** msg, struct avp * avp, struct session * sess, void * opaque, enum disp_action * act);
     147int app_sip_UAR_cb( struct msg ** msg, struct avp * avp, struct session * sess, void * opaque, enum disp_action * act);
     148int app_sip_SAR_cb( struct msg ** msg, struct avp * avp, struct session * sess, void * opaque, enum disp_action * act);
    149149
    150150//Suscriber Locator
    151 int app_sip_SL_LIR_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, enum disp_action * act);
    152 //int app_sip_SL_SAR_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, enum disp_action * act);
     151int app_sip_SL_LIR_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, void * opaque, enum disp_action * act);
     152//int app_sip_SL_SAR_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, void * opaque, enum disp_action * act);
    153153
    154154#define SQL_GETPASSWORD "SELECT `password` FROM ds_users WHERE `username` ='%s'"

  • extensions/app_sip/locationinfo.c

    r433 r639  
    3737
    3838
    39 int app_sip_LIR_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, enum disp_action * act)
     39int app_sip_LIR_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, void * opaque, enum disp_action * act)
    4040{
    4141        TRACE_ENTRY("%p %p %p %p", msg, paramavp, sess, act);

  • extensions/app_sip/locationinfosl.c

    r433 r639  
    3737
    3838//This callback is specific to SUSCRIBER LOCATOR. We must look for the "serving" SIP server
    39 int app_sip_SL_LIR_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, enum disp_action * act)
     39int app_sip_SL_LIR_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, void * opaque, enum disp_action * act)
    4040{
    4141        TRACE_ENTRY("%p %p %p %p", msg, paramavp, sess, act);

  • extensions/app_sip/multimediaauth.c

    r433 r639  
    3737
    3838
    39 int app_sip_MAR_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, enum disp_action * act)
     39int app_sip_MAR_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, void * opaque, enum disp_action * act)
    4040{
    4141        struct msg *ans, *qry;

  • extensions/app_sip/pushprofile.c

    r440 r639  
    255255
    256256//Called when an PPA arrive
    257 int app_sip_PPA_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, enum disp_action * act)
     257int app_sip_PPA_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, void * opaque, enum disp_action * act)
    258258{
    259259        //TODO: PPA reception

  • extensions/app_sip/registrationtermination.c

    r440 r639  
    258258
    259259//Called when an RTA arrive
    260 int app_sip_RTA_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, enum disp_action * act)
     260int app_sip_RTA_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, void * opaque, enum disp_action * act)
    261261{
    262262        //TODO: RTA reception

  • extensions/app_sip/serverassignment.c

    r433 r639  
    3737
    3838
    39 int app_sip_SAR_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, enum disp_action * act)
     39int app_sip_SAR_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, void * opaque, enum disp_action * act)
    4040{
    4141        TRACE_ENTRY("%p %p %p %p", msg, paramavp, sess, act);

  • extensions/app_sip/userauthorization.c

    r433 r639  
    3737
    3838
    39 int app_sip_UAR_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, enum disp_action * act)
     39int app_sip_UAR_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, void * opaque, enum disp_action * act)
    4040{
    4141        TRACE_ENTRY("%p %p %p %p", msg, paramavp, sess, act);

  • extensions/dbg_interactive/dbg_interactive.c

    r625 r639  
    6767       
    6868end:   
    69         /* Upon exit, issue the order of terminating to fD */
    70         CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
     69        /* Upon exit, issue the order of terminating to fD, if the interpreter was started without a file */
     70        if (!arg) {
     71                CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
     72        }
    7173
    7274        return NULL;

  • extensions/dbg_interactive/dispatch.i

    r638 r639  
    4040
    4141%{
    42 /* store the python callback function here */
    43 static PyObject * py_dispatch_cb = NULL;
    44 static int        py_dispatch_cb_n = 0;
    4542/* call it (will be called from a different thread than the interpreter, when message arrives) */
    46 static int call_the_python_dispatch_callback(struct msg **msg, struct avp *avp, struct session *session, enum disp_action *action) {
     43static int call_the_python_dispatch_callback(struct msg **msg, struct avp *avp, struct session *session, void * pycb, enum disp_action *action) {
    4744        PyObject *PyMsg, *PyAvp, *PySess;
    48         PyObject *result = NULL;
     45        PyObject *cb, *result = NULL;
    4946        int ret = 0;
    5047       
    51         if (!py_dispatch_cb)
     48        if (!pycb) {
     49                fd_log_debug("Internal error: missing the callback!\n");
    5250                return ENOTSUP;
     51        }
     52        cb = pycb;
    5353       
    5454        SWIG_PYTHON_THREAD_BEGIN_BLOCK;
    … …  
    5959       
    6060        /* Call the function */
    61         result = PyEval_CallFunction(py_dispatch_cb, "(OOO)", PyMsg, PyAvp, PySess);
     61        result = PyEval_CallFunction(cb, "(OOO)", PyMsg, PyAvp, PySess);
    6262       
    6363        /* The result is supposedly composed of: [ ret, *msg, *action ] */
    … …  
    108108                struct disp_hdl * hdl = NULL;
    109109                int ret;
    110                 if (py_dispatch_cb && (py_dispatch_cb != PyCb)) {
    111                         DI_ERROR(EINVAL, PyExc_SyntaxError, "Only one dispatch callback is supported at the moment in this extension\n.");
    112                         return NULL;
    113                 }
    114                 py_dispatch_cb = PyCb;
    115                 py_dispatch_cb_n += 1;
    116                 Py_XINCREF(py_dispatch_cb);
    117110               
    118                 ret = fd_disp_register ( call_the_python_dispatch_callback, how, when, &hdl );
     111                Py_XINCREF(PyCb);
     112               
     113                ret = fd_disp_register ( call_the_python_dispatch_callback, how, when, PyCb, &hdl );
    119114                if (ret != 0) {
    120115                        DI_ERROR(ret, NULL, NULL);
    … …  
    125120        ~disp_hdl() {
    126121                struct disp_hdl * hdl = self;
    127                 int ret = fd_disp_unregister(&hdl);
     122                PyObject * cb = NULL;
     123                int ret = fd_disp_unregister(&hdl, (void *)&cb);
    128124                if (ret != 0) {
    129125                        DI_ERROR(ret, NULL, NULL);
    130126                }
    131                 /* Now free the callback */
    132                 Py_XDECREF(py_dispatch_cb);
    133                 py_dispatch_cb_n -= 1;
    134                 if (!py_dispatch_cb_n)
    135                         py_dispatch_cb = NULL;
     127                Py_XDECREF(cb);
    136128                return;
    137129        }

  • extensions/dbg_interactive/sessions.i

    r638 r639  
    3939
    4040%{
    41 /* store the python callback function here */
    42 static PyObject * py_cleanup_cb = NULL;
    4341/* call it (might be called from a different thread than the interpreter, when session times out) */
    44 static void call_the_python_cleanup_callback(session_state * state, char * sid) {
     42static void call_the_python_cleanup_callback(session_state * state, char * sid, void * cb) {
    4543        PyObject *result;
    46         if (!py_cleanup_cb)
     44        if (!cb) {
     45                fd_log_debug("Internal error: missing callback object!\n");
    4746                return;
     47        }
    4848       
    4949        /* Call the function */
    5050        SWIG_PYTHON_THREAD_BEGIN_BLOCK;
    51         result = PyEval_CallFunction(py_cleanup_cb, "(Os)", state, sid);
     51        result = PyEval_CallFunction((PyObject *)cb, "(Os)", state, sid);
    5252        Py_XDECREF(result);
    5353        SWIG_PYTHON_THREAD_END_BLOCK;
    … …  
    6464                struct session_handler * hdl = NULL;
    6565                int ret;
    66                 if (py_cleanup_cb) {
    67                         DI_ERROR(EINVAL, PyExc_SyntaxError, "Only one session handler at a time is supported at the moment in this extension\n.");
    68                         return NULL;
    69                 }
    70                 py_cleanup_cb = PyCb;
    71                 Py_XINCREF(py_cleanup_cb);
    7266               
    73                 ret = fd_sess_handler_create_internal ( &hdl, call_the_python_cleanup_callback );
     67                Py_XINCREF(PyCb);
     68               
     69                ret = fd_sess_handler_create_internal ( &hdl, call_the_python_cleanup_callback, PyCb );
    7470                if (ret != 0) {
    7571                        DI_ERROR(ret, NULL, NULL);
    … …  
    8076        ~session_handler() {
    8177                struct session_handler * hdl = self;
    82                 int ret = fd_sess_handler_destroy(&hdl);
     78                PyObject * cb = NULL;
     79               
     80                int ret = fd_sess_handler_destroy(&hdl, (void *)&cb);
    8381                if (ret != 0) {
    8482                        DI_ERROR(ret, NULL, NULL);
    8583                }
    8684                /* Now free the callback */
    87                 Py_XDECREF(py_cleanup_cb);
    88                 py_cleanup_cb = NULL;
     85                Py_XDECREF(cb);
    8986                return;
    9087        }

  • extensions/test_app/ta_cli.c

    r406 r639  
    234234int ta_cli_init(void)
    235235{
    236         CHECK_FCT( fd_sess_handler_create(&ta_cli_reg, free) );
     236        CHECK_FCT( fd_sess_handler_create(&ta_cli_reg, free, NULL) );
    237237       
    238238        CHECK_FCT( fd_sig_register(ta_conf->signal, "test_app.cli", ta_cli_test_message ) );
    … …  
    245245        CHECK_FCT_DO( fd_sig_unregister(ta_conf->signal), /* continue */ );
    246246       
    247         CHECK_FCT_DO( fd_sess_handler_destroy(&ta_cli_reg), /* continue */ );
     247        CHECK_FCT_DO( fd_sess_handler_destroy(&ta_cli_reg, NULL), /* continue */ );
    248248       
    249249        return;

  • extensions/test_app/ta_serv.c

    r575 r639  
    4242
    4343/* Default callback for the application. */
    44 static int ta_fb_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act)
     44static int ta_fb_cb( struct msg ** msg, struct avp * avp, struct session * sess, void * opaque, enum disp_action * act)
    4545{
    4646        /* This CB should never be called */
    … …  
    5353
    5454/* Callback for incoming Test-Request messages */
    55 static int ta_tr_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act)
     55static int ta_tr_cb( struct msg ** msg, struct avp * avp, struct session * sess, void * opaque, enum disp_action * act)
    5656{
    5757        struct msg *ans, *qry;
    … …  
    120120       
    121121        /* fallback CB if command != Test-Request received */
    122         CHECK_FCT( fd_disp_register( ta_fb_cb, DISP_HOW_APPID, &data, &ta_hdl_fb ) );
     122        CHECK_FCT( fd_disp_register( ta_fb_cb, DISP_HOW_APPID, &data, NULL, &ta_hdl_fb ) );
    123123       
    124124        /* Now specific handler for Test-Request */
    125         CHECK_FCT( fd_disp_register( ta_tr_cb, DISP_HOW_CC, &data, &ta_hdl_tr ) );
     125        CHECK_FCT( fd_disp_register( ta_tr_cb, DISP_HOW_CC, &data, NULL, &ta_hdl_tr ) );
    126126       
    127127        return 0;
    … …  
    131131{
    132132        if (ta_hdl_fb) {
    133                 (void) fd_disp_unregister(&ta_hdl_fb);
     133                (void) fd_disp_unregister(&ta_hdl_fb, NULL);
    134134        }
    135135        if (ta_hdl_tr) {
    136                 (void) fd_disp_unregister(&ta_hdl_tr);
     136                (void) fd_disp_unregister(&ta_hdl_tr, NULL);
    137137        }
    138138       

  • extensions/test_sip/locationinfo.c

    r430 r639  
    125125}
    126126
    127 int test_sip_LIA_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, enum disp_action * act)
     127int test_sip_LIA_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, void * opaque, enum disp_action * act)
    128128{
    129129       

  • extensions/test_sip/locationinfosl.c

    r430 r639  
    127127}
    128128
    129 int test_sipSL_LIA_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, enum disp_action * act)
     129int test_sipSL_LIA_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, void * opaque, enum disp_action * act)
    130130{
    131131       

  • extensions/test_sip/multimediaauth.c

    r409 r639  
    3737
    3838
    39 int test_sip_MAA_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, enum disp_action * act)
     39int test_sip_MAA_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, void * opaque, enum disp_action * act)
    4040{
    4141/*

  • extensions/test_sip/registrationtermination.c

    r409 r639  
    3737
    3838
    39 int test_sip_RTR_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, enum disp_action * act)
     39int test_sip_RTR_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, void * opaque, enum disp_action * act)
    4040{
    4141       

  • extensions/test_sip/serverassignment.c

    r432 r639  
    168168}
    169169
    170 int test_sip_SAA_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, enum disp_action * act)
     170int test_sip_SAA_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, void * opaque, enum disp_action * act)
    171171{
    172172       

  • extensions/test_sip/test_sip.c

    r448 r639  
    6464struct sip_dict sip_dict;
    6565
    66 int test_sip_default_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act)
     66int test_sip_default_cb( struct msg ** msg, struct avp * avp, struct session * sess, void * opaque, enum disp_action * act)
    6767{
    6868        TRACE_ENTRY("%p %p %p %p", msg, avp, sess, act);
    … …  
    187187        //MAA
    188188        CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_COMMAND, CMD_BY_NAME, "Multimedia-Auth-Answer", &data.command, ENOENT) );
    189         CHECK_FCT( fd_disp_register( test_sip_MAA_cb, DISP_HOW_CC, &data, &test_sip_MAA_hdl ) );
     189        CHECK_FCT( fd_disp_register( test_sip_MAA_cb, DISP_HOW_CC, &data, NULL, &test_sip_MAA_hdl ) );
    190190       
    191191        //UAA
    192192        CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_COMMAND, CMD_BY_NAME, "User-Authorization-Answer", &data.command, ENOENT) );
    193         CHECK_FCT( fd_disp_register( test_sip_UAA_cb, DISP_HOW_CC, &data, &test_sip_UAA_hdl ) );
     193        CHECK_FCT( fd_disp_register( test_sip_UAA_cb, DISP_HOW_CC, &data, NULL, &test_sip_UAA_hdl ) );
    194194       
    195195        //RTR
    196196        CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_COMMAND, CMD_BY_NAME, "Registration-Termination-Request", &data.command, ENOENT) );
    197         CHECK_FCT( fd_disp_register( test_sip_RTR_cb, DISP_HOW_CC, &data, &test_sip_RTR_hdl ) );
     197        CHECK_FCT( fd_disp_register( test_sip_RTR_cb, DISP_HOW_CC, &data, NULL, &test_sip_RTR_hdl ) );
    198198       
    199199        //LIA
    200200        CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_COMMAND, CMD_BY_NAME, "Location-Info-Answer", &data.command, ENOENT) );
    201         CHECK_FCT( fd_disp_register( test_sip_LIA_cb, DISP_HOW_CC, &data, &test_sip_LIA_hdl ) );
     201        CHECK_FCT( fd_disp_register( test_sip_LIA_cb, DISP_HOW_CC, &data, NULL, &test_sip_LIA_hdl ) );
    202202       
    203203        //LIA
    204204        CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_COMMAND, CMD_BY_NAME, "Server-Assignment-Answer", &data.command, ENOENT) );
    205         CHECK_FCT( fd_disp_register( test_sip_SAA_cb, DISP_HOW_CC, &data, &test_sip_SAA_hdl ) );
     205        CHECK_FCT( fd_disp_register( test_sip_SAA_cb, DISP_HOW_CC, &data, NULL, &test_sip_SAA_hdl ) );
    206206       
    207207        //Callback for unexpected messages
    208         CHECK_FCT( fd_disp_register( test_sip_default_cb, DISP_HOW_APPID, &data, &test_sip_default_hdl ) );
     208        CHECK_FCT( fd_disp_register( test_sip_default_cb, DISP_HOW_APPID, &data, NULL, &test_sip_default_hdl ) );
    209209       
    210210        /*
    … …  
    214214        */
    215215       
    216         CHECK_FCT(fd_sess_handler_create(&ts_sess_hdl, free));
     216        CHECK_FCT(fd_sess_handler_create(&ts_sess_hdl, free, NULL));
    217217        //CHECK_FCT( fd_sig_register(30, "test_sip", (void *)test_sipSL_LIR_cb ) );
    218218        CHECK_FCT( fd_sig_register(30, "test_sip", (void *)test_sip_SAR_cb ) );

  • extensions/test_sip/test_sip.h

    r427 r639  
    115115int test_sipSL_LIR_cb();
    116116
    117 int test_sip_default_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act);
    118 int test_sip_MAA_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act);
    119 int test_sip_RTR_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act);
    120 int test_sip_UAA_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act);
    121 int test_sip_LIA_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act);
    122 int test_sip_SAA_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act);
    123 int test_sipSL_LIA_cb( struct msg ** msg, struct avp * avp, struct session * sess, enum disp_action * act);
     117int test_sip_default_cb( struct msg ** msg, struct avp * avp, struct session * sess, void * opaque, enum disp_action * act);
     118int test_sip_MAA_cb( struct msg ** msg, struct avp * avp, struct session * sess, void * opaque, enum disp_action * act);
     119int test_sip_RTR_cb( struct msg ** msg, struct avp * avp, struct session * sess, void * opaque, enum disp_action * act);
     120int test_sip_UAA_cb( struct msg ** msg, struct avp * avp, struct session * sess, void * opaque, enum disp_action * act);
     121int test_sip_LIA_cb( struct msg ** msg, struct avp * avp, struct session * sess, void * opaque, enum disp_action * act);
     122int test_sip_SAA_cb( struct msg ** msg, struct avp * avp, struct session * sess, void * opaque, enum disp_action * act);
     123int test_sipSL_LIA_cb( struct msg ** msg, struct avp * avp, struct session * sess, void * opaque, enum disp_action * act);

  • extensions/test_sip/userauthorization.c

    r430 r639  
    159159}
    160160
    161 int test_sip_UAA_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, enum disp_action * act)
     161int test_sip_UAA_cb( struct msg ** msg, struct avp * paramavp, struct session * sess, void * opaque, enum disp_action * act)
    162162{
    163163       
Note: See TracChangeset for help on using the changeset viewer.