sr-dev August 2011

sr-dev@lists.kamailio.org

33 participants
291 discussions

by Jijo

Hi All, The function parse_content_type_hdr() is failing in decode_mime_type() when Content-Type parameter "boundary" has value comma as below. The error message is "ERROR:parse_content_type_hdr: CONTENT_TYPE hdr contains " "more then one mime type :-(! Content Type Header is as below, It works fine if the boundary value is without comma. Content-Type: multipart/mixed;boundary="*,*AW" The parse_content_type_hdr() is failing in the following code, ret = decode_mime_type(msg->content_type->body.s, end , &mime); if (ret==0) goto error; if (ret!=end) { LOG(L_INFO,"ERROR:parse_content_type_hdr: CONTENT_TYPE hdr contains " "more then one mime type :-(!\n"); goto error ; } I thought of fixing this issue by commenting the code for condition ret !=end. I'm not sure why we we need that check, as mime variable has the information to process the content. Please let me know if you see any impact. Thanks Jijo

13 years, 3 months

compilation warnings

by Juha Heinanen

i just compiled master, and got these warnings: CC (cc) [M db_mysql.so] km_db_mysql.o km_db_mysql.c: In function ‘kam_mysql_mod_init’: km_db_mysql.c:93: warning: implicit declaration of function ‘db_mysql_alloc_buffer’ CC (cc) [M rls.so] resource_notify.o resource_notify.c:51:1: warning: "CONT_COPY" redefined In file included from rls.h:37, from resource_notify.c:38: ../presence/hash.h:52:1: warning: this is the location of the previous definition CC (cc) [M xcap_server.so] xcap_server.o xcap_server.c:422: warning: ‘xcaps_str_appsexml’ defined but not used especially the first one sounds dangerous. -- juha

13 years, 3 months

git:master: modules_k/dispatcher: removed recently added modparams and added event_routes

by Peter Dunkley

Module: sip-router Branch: master Commit: 390ec4355fb0b4990cdff3e037e5256babc5f3fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=390ec43… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Aug 17 17:00:51 2011 +0100 modules_k/dispatcher: removed recently added modparams and added event_routes - As per Daniel's suggestion, the module now uses libkcore/faked_msg and instead of parameters to specify routes when a destination goes up/down the module now calls the event_route[dispatcher:dst-up] and event_route[dispatcher:dst-down]. --- modules_k/dispatcher/Makefile | 1 + modules_k/dispatcher/README | 103 +++++++++++-------------- modules_k/dispatcher/dispatch.c | 68 ++++++++++------- modules_k/dispatcher/dispatch.h | 3 - modules_k/dispatcher/dispatcher.c | 94 ---------------------- modules_k/dispatcher/doc/dispatcher_admin.xml | 104 ++++++++++--------------- 6 files changed, 128 insertions(+), 245 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=390…

13 years, 3 months

git:master: modules_k/dialog: Provider helper get_valid_msg() to retrieve

by Timo Reimann

Module: sip-router Branch: master Commit: a5498b52e9a3bbef63e4ce4212cc05124f428cd2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5498b5… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Aug 17 13:12:24 2011 +0200 modules_k/dialog: Provider helper get_valid_msg() to retrieve valid SIP message from given dialog callback parameter structure. (Useful due to interface change committed in c02155941.) --- modules_k/dialog/dlg_cb.c | 21 +++++++++++++++++++++ modules_k/dialog/dlg_cb.h | 7 +++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_cb.c b/modules_k/dialog/dlg_cb.c index 3f2f2cd..df8c3cb 100644 --- a/modules_k/dialog/dlg_cb.c +++ b/modules_k/dialog/dlg_cb.c @@ -260,3 +260,24 @@ void run_dlg_callbacks( int type , } return; } + + +struct sip_msg *get_valid_msg(struct dlg_cb_params *cb_params) +{ + struct sip_msg *msg; + + if (cb_params == NULL) { + LM_ERR("no dialog parameters given\n"); + return NULL; + } + + msg = cb_params->req; + if (msg == NULL) { + msg = cb_params->rpl; + if (msg == NULL || msg == FAKED_REPLY) { + return NULL; + } + } + + return msg; +} diff --git a/modules_k/dialog/dlg_cb.h b/modules_k/dialog/dlg_cb.h index 80eae7b..f8bcadc 100644 --- a/modules_k/dialog/dlg_cb.h +++ b/modules_k/dialog/dlg_cb.h @@ -111,4 +111,11 @@ void run_dlg_callbacks( int type , void run_load_callbacks( void ); +/*! + * \brief Function that returns valid SIP message from given dialog callback parameter struct + * \param cb_params dialog callback parameter struct + * \return pointer to valid SIP message if existent, NULL otherwise + */ +struct sip_msg *get_valid_msg(struct dlg_cb_params *cb_params); + #endif

13 years, 3 months

git:master: modules_k/dialog: Prefix get_valid_msg() function name with " dlg_"

by Timo Reimann

Module: sip-router Branch: master Commit: 3b7a97f8f463dae560de2a371ada379c99c4db47 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3b7a97f… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Aug 17 17:25:14 2011 +0200 modules_k/dialog: Prefix get_valid_msg() function name with "dlg_" and turn static inline to enable usage when the dialog module is not linked in. - modules_k/pua_dialoginfo: Use changed function name. --- modules_k/dialog/dlg_cb.c | 21 --------------------- modules_k/dialog/dlg_cb.h | 20 +++++++++++++++++++- modules_k/pua_dialoginfo/pua_dialoginfo.c | 2 +- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/modules_k/dialog/dlg_cb.c b/modules_k/dialog/dlg_cb.c index df8c3cb..3f2f2cd 100644 --- a/modules_k/dialog/dlg_cb.c +++ b/modules_k/dialog/dlg_cb.c @@ -260,24 +260,3 @@ void run_dlg_callbacks( int type , } return; } - - -struct sip_msg *get_valid_msg(struct dlg_cb_params *cb_params) -{ - struct sip_msg *msg; - - if (cb_params == NULL) { - LM_ERR("no dialog parameters given\n"); - return NULL; - } - - msg = cb_params->req; - if (msg == NULL) { - msg = cb_params->rpl; - if (msg == NULL || msg == FAKED_REPLY) { - return NULL; - } - } - - return msg; -} diff --git a/modules_k/dialog/dlg_cb.h b/modules_k/dialog/dlg_cb.h index f8bcadc..8d364ba 100644 --- a/modules_k/dialog/dlg_cb.h +++ b/modules_k/dialog/dlg_cb.h @@ -116,6 +116,24 @@ void run_load_callbacks( void ); * \param cb_params dialog callback parameter struct * \return pointer to valid SIP message if existent, NULL otherwise */ -struct sip_msg *get_valid_msg(struct dlg_cb_params *cb_params); +static inline struct sip_msg *dlg_get_valid_msg(struct dlg_cb_params *cb_params) +{ + struct sip_msg *msg; + + if (cb_params == NULL) { + LM_ERR("no dialog parameters given\n"); + return NULL; + } + + msg = cb_params->req; + if (msg == NULL) { + msg = cb_params->rpl; + if (msg == NULL || msg == FAKED_REPLY) { + return NULL; + } + } + + return msg; +}; #endif diff --git a/modules_k/pua_dialoginfo/pua_dialoginfo.c b/modules_k/pua_dialoginfo/pua_dialoginfo.c index 792e3b0..947f90d 100644 --- a/modules_k/pua_dialoginfo/pua_dialoginfo.c +++ b/modules_k/pua_dialoginfo/pua_dialoginfo.c @@ -130,7 +130,7 @@ __dialog_cbtest(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) } if (type != DLGCB_DESTROY) { - msg = get_valid_msg(_params); + msg = dlg_get_valid_msg(_params); if (!msg) { LM_ERR("no SIP message available in callback parameters\n"); return;

13 years, 3 months

git:master: modules_k/presence, modules_k/presence_xml: Added new exported functions to enable the online status of a user to be checked

by Peter Dunkley

Module: sip-router Branch: master Commit: bd598ce945d8e5db910ea1a12795c5cdd7d580cf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd598ce… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Aug 17 15:01:26 2011 +0100 modules_k/presence, modules_k/presence_xml: Added new exported functions to enable the online status of a user to be checked - Exported two new API functions from presence (get_presentity() and free_presentity()). These functions are used by the new exported functions. - Added two new exported functions to presence_xml. pres_check_basic() enables you to find out whether a users basic status matches the string you provide. pres_check_activities() enables you to find out whether any of a users listed activities matches the string you provide. pres_check_basic() effectively lets you tell whether a user is online or offline (based on presence). pres_check_activities() lets you see what a user is currently doing (for example, is the user too busy to take a call?). The results from these exported functions can be used to make routing decisions. For example, you can choose not to route calls to users who are away or busy. --- modules_k/presence/README | 31 +++ modules_k/presence/bind_presence.c | 3 + modules_k/presence/bind_presence.h | 4 + modules_k/presence/doc/presence_devel.xml | 45 +++++ modules_k/presence/notify.c | 64 ++---- modules_k/presence/notify.h | 2 + modules_k/presence_xml/README | 60 ++++++- modules_k/presence_xml/doc/presence_xml_admin.xml | 88 ++++++++- modules_k/presence_xml/pres_check.c | 220 +++++++++++++++++++++ modules_k/presence_xml/pres_check.h | 32 +++ modules_k/presence_xml/presence_xml.c | 14 ++- 11 files changed, 515 insertions(+), 48 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=bd5…

13 years, 3 months

git:master: modules_k/dialog When hash_size was smaller then 1, consider this as a value(1 == 2^0)

by Marius Zbihlei

Module: sip-router Branch: master Commit: 11033b05be673593a87afdc2a1d8a2c887fb9ab7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11033b0… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Aug 17 15:00:00 2011 +0300 modules_k/dialog When hash_size was smaller then 1, consider this as a value(1 == 2^0) The 1<<(n-1) check for the power of two smaller than the given number doesn't work for n == 0 (undefined behavior), so values of dlg_hash_size smaller than 1 where not checked correctly. --- modules_k/dialog/dialog.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index d31135a..6711732 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -603,11 +603,18 @@ static int mod_init(void) return -1; } + /* sanitize dlg_hash_zie */ + if (dlg_hash_size < 1){ + LM_WARN("hash_size is smaller " + "then 1 -> rounding from %d to 1\n", + dlg_hash_size); + dlg_hash_size = 1; + } /* initialized the hash table */ for( n=0 ; n<(8*sizeof(n)) ; n++) { if (dlg_hash_size==(1<<n)) break; - if (dlg_hash_size<(1<<n)) { + if (n && dlg_hash_size<(1<<n)) { LM_WARN("hash_size is not a power " "of 2 as it should be -> rounding from %d to %d\n", dlg_hash_size, 1<<(n-1));

13 years, 3 months

git:master: modules_k/ uac In case uuid was not found in the case of remore registration, do not crash when jumping to label

by Marius Zbihlei

Module: sip-router Branch: master Commit: a925dbd9e1aa6d45d2ce1dbbb1b6e40f318e3c61 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a925dbd… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Aug 17 14:44:52 2011 +0300 modules_k/uac In case uuid was not found in the case of remore registration, do not crash when jumping to label --- modules_k/uac/uac_reg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/uac/uac_reg.c b/modules_k/uac/uac_reg.c index 253cc14..c25712f 100644 --- a/modules_k/uac/uac_reg.c +++ b/modules_k/uac/uac_reg.c @@ -628,7 +628,7 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) } done: - ri->flags &= ~UAC_REG_ONGOING; + if(ri) ri->flags &= ~UAC_REG_ONGOING; shm_free(uuid); }

13 years, 3 months

Master branch compilation error

by Jon Bonilla

Hi all Nightly builds for debian and ubuntu have failed for "master" branch. Here's the compilation log: LD (gcc) [M pua_bla.so] pua_bla.so CC (gcc) [M pua_dialoginfo.so] dialog_publish.o CC (gcc) [M pua_dialoginfo.so] pua_dialoginfo.o pua_dialoginfo.c: In function ‘__dialog_sendpublish’: pua_dialoginfo.c:231: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c:231: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c:231: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c:234: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c:235: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c:236: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c:239: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c:243: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c:243: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c:243: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c:248: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c: In function ‘__dialog_created’: pua_dialoginfo.c:284: error: ‘struct dlg_cb_params’ has no member named ‘msg’ make[2]: *** [pua_dialoginfo.o] Error 1 make[1]: *** [modules_k] Error 1 make[1]: se sale del directorio `/usr/src/kamailio/kamailiogitsrc-master' make: *** [build-stamp] Error 2 dpkg-buildpackage: fallo: debian/rules build devolvió un estado de salida de error 2 cheers, Jon

13 years, 3 months

git:master: Adapt multiple modules relying on the dialog module to latest

by Timo Reimann

Module: sip-router Branch: master Commit: 934adcfb97f2e92e8bde695538e0e0b289ba3614 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=934adcf… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Aug 17 13:35:53 2011 +0200 Adapt multiple modules relying on the dialog module to latest dialog changes. - modules_k/nat_traversal: Register for DLGCB_CONFIRMED_NA (formerly called DLGCB_CONFIRMED; see commit e1068cb0ab4 for details). - modules_k/pua_dialoginfo: * In __dialog_cbtest(), make sure that valid SIP message is used. * In __dialog_cbtest(), print details for callback on DLGCB_CONFIRMED_NA too. * In __dialog_created(), register to DLGCB_CONFIRMED_NA in normal case and additionally to DLGCB_CONFIRMED_NA in debug case (PUA_DIALOGINFO_DEBUG enabled). - modules_k/sst: * Use reply message from dialog callback parameters in sst_dialog_confirmed_CB(). * Register to DLGCB_CONFIRMED_NA instead of DLGCB_CONFIRMED. --- modules_k/nat_traversal/nat_traversal.c | 2 +- modules_k/pua_dialoginfo/pua_dialoginfo.c | 44 +++++++++++++++++----------- modules_k/sst/sst_handlers.c | 4 +- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/modules_k/nat_traversal/nat_traversal.c b/modules_k/nat_traversal/nat_traversal.c index cc65354..62227e4 100644 --- a/modules_k/nat_traversal/nat_traversal.c +++ b/modules_k/nat_traversal/nat_traversal.c @@ -1248,7 +1248,7 @@ __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) if (dlg_api.register_dlgcb(dlg, DLGCB_EARLY, __dialog_early, param, NULL) != 0) LM_ERR("cannot register callback for dialog early replies\n"); - if (dlg_api.register_dlgcb(dlg, DLGCB_CONFIRMED, __dialog_confirmed, param, NULL) != 0) + if (dlg_api.register_dlgcb(dlg, DLGCB_CONFIRMED_NA, __dialog_confirmed, param, NULL) != 0) LM_ERR("cannot register callback for dialog confirmation\n"); if ((request->msg_flags & FL_DO_KEEPALIVE) == 0) diff --git a/modules_k/pua_dialoginfo/pua_dialoginfo.c b/modules_k/pua_dialoginfo/pua_dialoginfo.c index f2731c0..792e3b0 100644 --- a/modules_k/pua_dialoginfo/pua_dialoginfo.c +++ b/modules_k/pua_dialoginfo/pua_dialoginfo.c @@ -120,6 +120,7 @@ static void __dialog_cbtest(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) { str tag; + struct sip_msg *msg; LM_ERR("dialog callback received, from=%.*s, to=%.*s\n", dlg->from_uri.len, dlg->from_uri.s, dlg->to_uri.len, dlg->to_uri.s); if (dlg->tag[0].len && dlg->tag[0].s ) { LM_ERR("dialog callback: tag[0] = %.*s", dlg->tag[0].len, dlg->tag[0].s); @@ -129,24 +130,30 @@ __dialog_cbtest(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) } if (type != DLGCB_DESTROY) { + msg = get_valid_msg(_params); + if (!msg) { + LM_ERR("no SIP message available in callback parameters\n"); + return; + } + /* get to tag*/ - if ( !_params->msg->to) { + if ( !msg->to) { // to header not defined, parse to header LM_ERR("to header not defined, parse to header\n"); - if (parse_headers(_params->msg, HDR_TO_F,0)<0) { + if (parse_headers(msg, HDR_TO_F,0)<0) { //parser error LM_ERR("parsing of to-header failed\n"); tag.s = 0; tag.len = 0; - } else if (!_params->msg->to) { + } else if (!msg->to) { // to header still not defined LM_ERR("no to although to-header is parsed: bad reply or missing TO hdr :-/\n"); tag.s = 0; tag.len = 0; } else - tag = get_to(_params->msg)->tag_value; + tag = get_to(msg)->tag_value; } else { - tag = get_to(_params->msg)->tag_value; + tag = get_to(msg)->tag_value; if (tag.s==0 || tag.len==0) { LM_ERR("missing TAG param in TO hdr :-/\n"); tag.s = 0; @@ -154,7 +161,7 @@ if (type != DLGCB_DESTROY) { } } if (tag.s) { - LM_ERR("dialog callback: _params->msg->to->parsed->tag_value = %.*s", tag.len, tag.s); + LM_ERR("dialog callback: msg->to->parsed->tag_value = %.*s", tag.len, tag.s); } } @@ -162,6 +169,9 @@ if (type != DLGCB_DESTROY) { case DLGCB_FAILED: LM_ERR("dialog callback type 'DLGCB_FAILED' received, from=%.*s\n", dlg->from_uri.len, dlg->from_uri.s); break; + case DLGCB_CONFIRMED_NA: + LM_ERR("dialog callback type 'DLGCB_CONFIRMED_NA' received, from=%.*s\n", dlg->from_uri.len, dlg->from_uri.s); + break; case DLGCB_CONFIRMED: LM_ERR("dialog callback type 'DLGCB_CONFIRMED' received, from=%.*s\n", dlg->from_uri.len, dlg->from_uri.s); break; @@ -228,24 +238,24 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para LM_DBG("dialog is early, from=%.*s\n", dlginfo->from_uri.len, dlginfo->from_uri.s); if (include_tags) { /* get remotetarget */ - if ( !_params->msg->contact && ((parse_headers(_params->msg, HDR_CONTACT_F,0)<0) || !_params->msg->contact) ) { + if ( !_params->rpl->contact && ((parse_headers(_params->rpl, HDR_CONTACT_F,0)<0) || !_params->rpl->contact) ) { LM_ERR("bad reply or missing CONTACT hdr\n"); } else { - if ( parse_contact(_params->msg->contact)<0 || - ((contact_body_t *)_params->msg->contact->parsed)->contacts==NULL || - ((contact_body_t *)_params->msg->contact->parsed)->contacts->next!=NULL ) { + if ( parse_contact(_params->rpl->contact)<0 || + ((contact_body_t *)_params->rpl->contact->parsed)->contacts==NULL || + ((contact_body_t *)_params->rpl->contact->parsed)->contacts->next!=NULL ) { LM_ERR("Malformed CONTACT hdr\n"); } else { - target = ((contact_body_t *)_params->msg->contact->parsed)->contacts->uri; + target = ((contact_body_t *)_params->rpl->contact->parsed)->contacts->uri; } } /* get to tag*/ - if ( !_params->msg->to && ((parse_headers(_params->msg, HDR_TO_F,0)<0) || !_params->msg->to) ) { + if ( !_params->rpl->to && ((parse_headers(_params->rpl, HDR_TO_F,0)<0) || !_params->rpl->to) ) { LM_ERR("bad reply or missing TO hdr :-/\n"); tag.s = 0; tag.len = 0; } else { - tag = get_to(_params->msg)->tag_value; + tag = get_to(_params->rpl)->tag_value; if (tag.s==0 || tag.len==0) { LM_ERR("missing TAG param in TO hdr :-/\n"); tag.s = 0; @@ -281,7 +291,7 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para static void __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) { - struct sip_msg *request = _params->msg; + struct sip_msg *request = _params->req; struct dlginfo_cell *dlginfo; int len; @@ -329,7 +339,7 @@ __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) /* register dialog callbacks which triggers sending PUBLISH */ if (dlg_api.register_dlgcb(dlg, - DLGCB_FAILED| DLGCB_CONFIRMED | DLGCB_TERMINATED | DLGCB_EXPIRED | + DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_TERMINATED | DLGCB_EXPIRED | DLGCB_REQ_WITHIN | DLGCB_EARLY, __dialog_sendpublish, dlginfo, free_dlginfo_cell) != 0) { LM_ERR("cannot register callback for interesting dialog types\n"); @@ -339,8 +349,8 @@ __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) #ifdef PUA_DIALOGINFO_DEBUG /* dialog callback testing (registered last to be executed frist) */ if (dlg_api.register_dlgcb(dlg, - DLGCB_FAILED| DLGCB_CONFIRMED | DLGCB_REQ_WITHIN | DLGCB_TERMINATED | DLGCB_EXPIRED | - DLGCB_EARLY | DLGCB_RESPONSE_FWDED | DLGCB_RESPONSE_WITHIN | + DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_CONFIRMED | DLGCB_REQ_WITHIN | DLGCB_TERMINATED | + DLGCB_EXPIRED | DLGCB_EARLY | DLGCB_RESPONSE_FWDED | DLGCB_RESPONSE_WITHIN | DLGCB_MI_CONTEXT | DLGCB_DESTROY, __dialog_cbtest, NULL, NULL) != 0) { LM_ERR("cannot register callback for all dialog types\n"); diff --git a/modules_k/sst/sst_handlers.c b/modules_k/sst/sst_handlers.c index fb3351f..c7778a1 100644 --- a/modules_k/sst/sst_handlers.c +++ b/modules_k/sst/sst_handlers.c @@ -365,7 +365,7 @@ void sst_dialog_created_CB(struct dlg_cell *did, int type, static void sst_dialog_confirmed_CB(struct dlg_cell *did, int type, struct dlg_cb_params * params) { - struct sip_msg* msg = params->msg; + struct sip_msg* msg = params->rpl; LM_DBG("confirmed dialog CB %p\n", did); DLOGMSG(msg); @@ -944,7 +944,7 @@ static void setup_dialog_callbacks(struct dlg_cell *did, sst_info_t *info) #ifdef USE_CONFIRM_CALLBACK LM_DBG("Adding callback DLGCB_CONFIRMED\n"); dlg_binds->register_dlgcb(did, - DLGCB_CONFIRMED, sst_dialog_confirmed_CB, info, NULL); + DLGCB_CONFIRMED_NA, sst_dialog_confirmed_CB, info, NULL); #endif /* USE_CONFIRM_CALLBACK */ LM_DBG("Adding callback "

13 years, 3 months

← Newer
1
...
11
12
13
14
15
16
17
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2011