sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: modules/lcr: simplified db handling

by Juha Heinanen

Module: sip-router Branch: master Commit: 1ecf1d2c81e4dd5ae7049b28955a19af3a4379a9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ecf1d2… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Apr 3 14:06:50 2010 +0300 modules/lcr: simplified db handling - Use higher level db functions and globally defined handle. - No need for children to keep db connections open because of rpc interface. --- modules/lcr/lcr_mod.c | 59 +++++++++++++++--------------------------------- 1 files changed, 19 insertions(+), 40 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index cd05b06..847e53b 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -363,6 +363,10 @@ static int lcr_db_init(const str* db_url) LM_CRIT("null lcr_dbf\n"); goto error; } + if (dbh) { + LM_ERR("database is already connected\n"); + goto error; + } dbh=lcr_dbf.init(db_url); if (dbh==0){ LM_ERR("unable to connect to the database\n"); @@ -402,7 +406,7 @@ static void lcr_db_close(void) static int mi_child_init(void) { - return lcr_db_init(&db_url); + return 0; } @@ -415,12 +419,11 @@ static int mod_init(void) str s; unsigned short avp_flags; unsigned int i; - db1_con_t* dbh; - if(register_mi_mod(exports.name, mi_cmds)!=0) + if(register_mi_mod(exports.name, mi_cmds)!=0) { - LM_ERR("failed to register MI commands\n"); - return -1; + LM_ERR("failed to register MI commands\n"); + return -1; } #ifdef RPC_SUPPORT if (rpc_register_array(lcr_rpc)!=0) @@ -573,12 +576,7 @@ static int mod_init(void) } /* Check table version */ - if (lcr_dbf.init==0){ - LM_CRIT("unbound database\n"); - return -1; - } - dbh=lcr_dbf.init(&db_url); - if (dbh == NULL){ + if (lcr_db_init(&db_url) < 0) { LM_ERR("unable to open database connection\n"); return -1; } @@ -587,10 +585,10 @@ static int mod_init(void) (db_check_table_version(&lcr_dbf, dbh, &lcr_table, LCR_TABLE_VERSION) < 0)) { LM_ERR("error during table version check\n"); - lcr_dbf.close(dbh); + lcr_db_close(); goto err; } - lcr_dbf.close(dbh); + lcr_db_close(); /* Allocate gw related shared memory */ /* gw table pointer table, index 0 points to temp gw table */ @@ -667,20 +665,7 @@ err: /* Module initialization function called in each child separately */ static int child_init(int rank) { -#ifdef RPC_SUPPORT - /* do nothing for the main process, tcp main process or timer */ - if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN || - rank==PROC_TIMER) - return 0; - /* init db for the rest of the processes: - - we need it for PROC_RPC and PROC_FIFO if we want db access from - RPC accessed via the ctl module - - we need it from all the ser tcp or tls processes if we want - db access from RPC via the xmlrpc module */ - return lcr_db_init(&db_url); -#else - return 0; -#endif /* RPC_SUPPORT */ + return 0; } @@ -956,7 +941,6 @@ int reload_gws_and_lcrs(int lcr_id) struct in_addr ip_addr; uri_type scheme; uri_transport transport; - db1_con_t* dbh; char *ip_string, *hostname, *tag, *prefix, *from_uri; db1_res_t* res = NULL; db_row_t* row; @@ -997,12 +981,7 @@ int reload_gws_and_lcrs(int lcr_id) gws = gwtp[0]; - if (lcr_dbf.init == 0) { - LM_CRIT("unbound database\n"); - return -1; - } - dbh = lcr_dbf.init(&db_url); - if (dbh == 0) { + if (lcr_db_init(&db_url) < 0) { LM_ERR("unable to open database connection\n"); return -1; } @@ -1014,7 +993,7 @@ int reload_gws_and_lcrs(int lcr_id) if (lcr_dbf.query(dbh, key_cols, op, vals, gw_cols, 1, 11, 0, &res) < 0) { LM_ERR("failed to query gw data\n"); - lcr_dbf.close(dbh); + lcr_db_close(); return -1; } @@ -1217,19 +1196,19 @@ int reload_gws_and_lcrs(int lcr_id) if (DB_CAPABILITY(lcr_dbf, DB_CAP_FETCH)) { if (lcr_dbf.query(dbh, key_cols, op, vals, lcr_cols, 1, 4, 0, 0) < 0) { LM_ERR("db query on lcr table failed\n"); - lcr_dbf.close(dbh); + lcr_db_close(); return -1; } if (lcr_dbf.fetch_result(dbh, &res, fetch_rows_param) < 0) { LM_ERR("failed to fetch rows from lcr table\n"); - lcr_dbf.close(dbh); + lcr_db_close(); return -1; } } else { if (lcr_dbf.query(dbh, key_cols, op, vals, lcr_cols, 1, 4, 0, &res) < 0) { LM_ERR("db query on lcr table failed\n"); - lcr_dbf.close(dbh); + lcr_db_close(); return -1; } } @@ -1322,7 +1301,7 @@ int reload_gws_and_lcrs(int lcr_id) } while (RES_ROW_N(res) > 0); lcr_dbf.free_result(dbh, res); - lcr_dbf.close(dbh); + lcr_db_close(); /* Swap gw and lcr hash table with index id with temporary table */ gwtp_tmp = gwtp[lcr_id]; @@ -1339,7 +1318,7 @@ int reload_gws_and_lcrs(int lcr_id) gw_err: lcr_dbf.free_result(dbh, res); - lcr_dbf.close(dbh); + lcr_db_close(); return -1; }

14 years, 10 months

git:master: modules/dialplan: fixed reloading of db data

by Juha Heinanen

Module: sip-router Branch: master Commit: 14aaf32dd20252ee92c97dc3d3811c20b615222c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14aaf32… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Apr 3 13:20:38 2010 +0300 modules/dialplan: fixed reloading of db data - Open and close db connection each time rules are (re)loaded from database. --- modules/dialplan/dialplan.c | 22 +++++++++++----------- modules/dialplan/dp_db.c | 9 +++++++-- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c index af090a3..ad740b4 100644 --- a/modules/dialplan/dialplan.c +++ b/modules/dialplan/dialplan.c @@ -197,8 +197,6 @@ static int mod_init(void) static int child_init(int rank) { - if(rank>0) - return dp_connect_db(); return 0; } @@ -215,15 +213,12 @@ static void mod_destroy(void) attr_pvar = NULL; } destroy_data(); - - /*close database connection*/ - dp_disconnect_db(); } static int mi_child_init(void) { - return dp_connect_db(); + return 0; } @@ -328,7 +323,6 @@ static int dp_translate_f(struct sip_msg* msg, char* str1, char* str2) LM_ERR("no dpid value\n"); return -1; } - LM_DBG("dpid is %i\n", dpid); if ((idp = select_dpid(dpid)) ==0 ){ LM_DBG("no information available for dpid %i\n", dpid); @@ -467,11 +461,19 @@ static struct mi_root * mi_reload_rules(struct mi_root *cmd_tree, void *param) { struct mi_root* rpl_tree= NULL; + if (dp_connect_db() < 0) { + LM_ERR("failed to reload rules fron database (db connect)\n"); + return 0; + } + if(dp_load_db() != 0){ - LM_ERR("failed to reload database data\n"); - return 0; + LM_ERR("failed to reload rules fron database (db load)\n"); + dp_disconnect_db(); + return 0; } + dp_disconnect_db(); + rpl_tree = init_mi_tree( 200, MI_OK_S, MI_OK_LEN); if (rpl_tree==0) return 0; @@ -532,8 +534,6 @@ static struct mi_root * mi_translate(struct mi_root *cmd, void *param) return init_mi_tree(404, "Empty input parameter", 21); } - LM_DBG("input is %.*s\n", input.len, input.s); - if (translate(NULL, input, &output, idp, &attrs)!=0){ LM_DBG("could not translate %.*s with dpid %i\n", input.len, input.s, idp->dp_id); diff --git a/modules/dialplan/dp_db.c b/modules/dialplan/dp_db.c index 0fab800..3f50e78 100644 --- a/modules/dialplan/dp_db.c +++ b/modules/dialplan/dp_db.c @@ -119,8 +119,13 @@ error: int dp_connect_db(void) { + if (dp_dbf.init==0){ + LM_CRIT("null dp_dbf\n"); + return -1; + } + if(dp_db_handle){ - LM_CRIT("BUG: connection to DB already open\n"); + LM_CRIT("BUG: connection to database already open\n"); return -1; } @@ -207,7 +212,7 @@ int dp_load_db(void) } if (dp_dbf.use_table(dp_db_handle, &dp_table_name) < 0){ - LM_ERR("error in use_table\n"); + LM_ERR("error in use_table %.*s\n", dp_table_name.len, dp_table_name.s); return -1; }

14 years, 10 months

mi dp_translate fails

by jh＠tutpro.com

while trying to figure out, why 'mi dp_reload' does not work, i also noticed that 'mi dp_translate' fails too (for another reason) if input starts with 0. for example, mi dp_translate 1001 03456 does not match to match_exp ^03. the reason is that mi operation strips 0 from 03456 giving to dp translate function this: Apr 3 10:56:21 localhost /usr/sbin/sip-proxy[31822]: INFO: dialplan [dp_repl.c:292]: input 3456 if i try with string mi dp_translate 1001 "03456" translate fails too, because now also quotes are included in the input: Apr 3 10:57:11 localhost /usr/sbin/sip-proxy[31822]: INFO: dialplan [dialplan.c:540]: input is "03456" any suggestions on how to fix this? -- juha

14 years, 10 months

git:master: lib/kcore/km_crc.c Fixed wrong computation of crc32

by Marius Zbihlei

Module: sip-router Branch: master Commit: a6a01a9e8345f1bbec02715e10e31b540b7f1368 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a6a01a9… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Apr 2 15:03:09 2010 +0300 lib/kcore/km_crc.c Fixed wrong computation of crc32 The final result was not bitwise complemented, yeilding an incorrect result --- lib/kcore/km_crc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/kcore/km_crc.c b/lib/kcore/km_crc.c index 0950f4e..95ca201 100644 --- a/lib/kcore/km_crc.c +++ b/lib/kcore/km_crc.c @@ -25,6 +25,6 @@ void crc32_uint (str *source_string, unsigned int *hash_ret) hash = crc_32_tab[((unsigned char)hash) ^ *data] ^ (hash >> 8); } - *hash_ret = hash; + *hash_ret = ~hash; }

14 years, 10 months

SF.net SVN: openser:[5999] branches/1.4/crc.c

by Marius Zbihlei

Revision: 5999 http://openser.svn.sourceforge.net/openser/?rev=5999&view=rev Author: mariuszbihlei Date: 2010-04-02 11:50:11 +0000 (Fri, 02 Apr 2010) Log Message: ----------- core:crc.c Fixed wrong computation of crc32 hash. The final result was not bitwise negated, yeilding an incorrect result Modified Paths: -------------- branches/1.4/crc.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 10 months

SF.net SVN: openser:[5998] branches/1.5/crc.c

by Marius Zbihlei

Revision: 5998 http://openser.svn.sourceforge.net/openser/?rev=5998&view=rev Author: mariuszbihlei Date: 2010-04-02 11:34:56 +0000 (Fri, 02 Apr 2010) Log Message: ----------- core/crc.c Fixed wrong computation of crc32. Using the reverted polinom, the result must also be reverted (a ~ operation). Modified Paths: -------------- branches/1.5/crc.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 10 months

mi_fifo dp_reload fails

by jh＠tutpro.com

i noticed that mi_fifo dp_reload command fails, but if i give the same command using xmlrpc, it works. i have not yet been able to figure out why. sip-proxy_ctl> mi_fifo dp_reload error: 500 - execution failed sip-proxy_ctl> Apr 2 13:07:21 localhost /usr/sbin/sip-proxy[13359]: ERROR: <core> [db.c:421]: invalid parameter value Apr 2 13:07:21 localhost /usr/sbin/sip-proxy[13359]: ERROR: dialplan [dp_db.c:210]: error in use_table dialplan Apr 2 13:07:21 localhost /usr/sbin/sip-proxy[13359]: ERROR: dialplan [dialplan.c:471]: failed to reload database data looks like dp_db_handle parameter is not initialized properly: int dp_load_db(void) ... if (dp_dbf.use_table(dp_db_handle, &dp_table_name) < 0){ LM_ERR("error in use_table %.*s\n", dp_table_name.len, dp_table_name.s); return -1; } -- juha

14 years, 10 months

kamctl and sercmd unification proposal

by marius zbihlei

Hello, As kamailio and ser get more and more unified, sharing common modules and core, one of the last remaining points is the intermixed usage of kamctl and sercmd to setup specific parameters. One example is the cfg framework changes (from ser) that Kamailio 3.1.0 will bring, that will require the use of "sercmd" on setting specific module config params. The issue is that the documentation also references the "kamctl" utility to specify reload actions etc. What I suggest is that we strip kamctl with its fifo capabilities and leave it only with DB, ACL management and such(that sercmd doesn't provide), and use only sercmd on examples in the documentation files. This will require no changes to code (well some features from kamctl will be deprecated), but only documentation changes. This will ensure that documentation is kept well organized and coherent across modules. These are the modules required to use sercmd (based on functionality), the 4th case being the one that I am mostly interested (offers full access to Kamailio commands) 1. basic (required for every case - basic ser commands) : modules/ctl/ctl.so 2. configuration framework change : modules/cfg_rpc/cfg_rpc.so 3. fifo comands (kamctl fifo) : modules/mi_rpc/mi_rpc.so (does not require modules_k/mi_fifo/mi_fifo.so) In this case no kamailio core commands are available (like kamctl debug, kamctl uptime, kamctl which) Because readline is based on the which command (lists all available commands), no tab completion is available 4. all K commands : along with mi_rpc, module_k/kex/kex.so is required. In this case sercmd has tab completion (because core commands like which are available) Of course the removal of kamctl fifo commands will mean that module_k/mi_fifo/mi_fifo.so module will not be required anymore(But I strongly suggest that we keep it to allow backwards compatibility) Suggestions?! Cheers Marius

14 years, 10 months

git:master: modules_k/nathelper: handle_uri_alias() documentation improvements

by Juha Heinanen

Module: sip-router Branch: master Commit: 7e19a002d0d8e8c4c3ed2636cd43015366ca0a90 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7e19a00… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Apr 2 10:46:40 2010 +0300 modules_k/nathelper: handle_uri_alias() documentation improvements --- modules_k/nathelper/README | 52 ++++++++++++++------------ modules_k/nathelper/doc/nathelper_admin.xml | 13 +++++-- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/modules_k/nathelper/README b/modules_k/nathelper/README index 11bb23c..be45e23 100644 --- a/modules_k/nathelper/README +++ b/modules_k/nathelper/README @@ -20,11 +20,11 @@ Edited by Juha Heinanen - Copyright � 2003-2008 Sippy Software, Inc. + Copyright © 2003-2008 Sippy Software, Inc. - Copyright � 2005 voice-system.ro + Copyright © 2005 voice-system.ro - Copyright � 2009 TuTPro Inc. + Copyright © 2009 TuTPro Inc. Revision History Revision $Revision$ $Date$ __________________________________________________________________ @@ -201,9 +201,9 @@ Chapter 1. Admin Guide Note: fix_nated_contact changes the Contact header, thus it breaks the RFC. Although usually this is not an issue, it may cause problems with - strict SIP clients. There is an alternative approach by using - add_contact_alias() that together with handle_ruri_alias() is standard - conform and also supports reuse of TCP/TLS connections. + strict SIP clients. An alternative is to use add_contact_alias() that + together with handle_ruri_alias() is standards conforming and also + supports reuse of TCP/TLS connections. Known devices that get along over NATs with nathelper are ATAs (as clients) and Cisco Gateways (since 12.2(T)) as servers. See @@ -239,7 +239,7 @@ Chapter 1. Admin Guide load-balancing will be performed over a set and the user has the ability to choose what set should be used. The set is selected via its id - the id being defined along with the set. Refer to the - "rtpproxy_sock" module parameter definition for syntax description. + “rtpproxy_sock” module parameter definition for syntax description. The balancing inside a set is done automatically by the module based on the weight of each rtpproxy from the set. @@ -309,7 +309,7 @@ modparam("nathelper", "natping_interval", 10) 5.2. ping_nated_only (integer) - If this variable is set then only contacts that have "behind_NAT" flag + If this variable is set then only contacts that have “behind_NAT” flag in user location database set will get ping. Default value is 0. @@ -369,7 +369,7 @@ modparam("nathelper", "received_avp", "$avp(i:42)") Definition of socket(s) used to connect to (a set) RTPProxy. It may specify a UNIX socket or an IPv4/IPv6 UDP socket. - Default value is "NONE" (disabled). + Default value is “NONE” (disabled). Example 1.6. Set rtpproxy_sock parameter ... @@ -391,7 +391,7 @@ modparam("nathelper", "rtpproxy_sock", will not attempt to establish communication to RTPProxy for rtpproxy_disable_tout seconds. - Default value is "60". + Default value is “60”. Example 1.7. Set rtpproxy_disable_tout parameter ... @@ -402,7 +402,7 @@ modparam("nathelper", "rtpproxy_disable_tout", 20) Timeout value in waiting for reply from RTPProxy. - Default value is "1". + Default value is “1”. Example 1.8. Set rtpproxy_tout parameter ... @@ -414,7 +414,7 @@ modparam("nathelper", "rtpproxy_tout", 2) How many times nathelper should retry to send and receive after timeout was generated. - Default value is "5". + Default value is “5”. Example 1.9. Set rtpproxy_retr parameter ... @@ -426,7 +426,7 @@ modparam("nathelper", "rtpproxy_retr", 2) Socket to be forced in communicating to RTPProxy. It makes sense only for UDP communication. If no one specified, the OS will choose. - Default value is "NULL". + Default value is “NULL”. Example 1.10. Set force_socket parameter ... @@ -453,7 +453,7 @@ modparam("nathelper", "sipping_bflag", 7) feature, you have to set this parameter. The SIP request pinging will be used only for requests marked so. - Default value is "NULL". + Default value is “NULL”. Example 1.12. Set sipping_from parameter ... @@ -465,7 +465,7 @@ modparam("nathelper", "sipping_from", "sip:pinger@siphub.net") The parameter sets the SIP method to be used in generating the SIP requests for NAT ping purposes. - Default value is "OPTIONS". + Default value is “OPTIONS”. Example 1.13. Set sipping_method parameter ... @@ -483,7 +483,7 @@ Note The string must be a complete SDP line, including the EOH (\r\n). - Default value is "a=nortpproxy:yes\r\n". + Default value is “a=nortpproxy:yes\r\n”. Example 1.14. Set nortpproxy_str parameter ... @@ -525,15 +525,15 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; 6.2. fix_nated_sdp(flags [, ip_address]) Alters the SDP information in orer to facilitate NAT traversal. What - changes to be performed may be controled via the "flags" parameter. + changes to be performed may be controled via the “flags” parameter. Meaning of the parameters is as follows: * flags - the value may be a bitwise OR of the following flags: - + 0x01 - adds "a=direction:active" SDP line; + + 0x01 - adds “a=direction:active” SDP line; + 0x02 - rewrite media IP address (c=) with source address of the message or the provided IP address (the provide IP address take precedence over the source address). - + 0x04 - adds "a=nortpproxy:yes" SDP line; + + 0x04 - adds “a=nortpproxy:yes” SDP line; + 0x08 - rewrite IP from origin description (o=) with source address of the message or the provided IP address (the provide IP address take precedence over the source address). @@ -589,7 +589,7 @@ force_rtp_proxy(); * flags - flags to turn on some features. + a - flags that UA from which message is received doesn't support symmetric RTP. (automatically sets the 'r' flag) - + l - force "lookup", that is, only rewrite SDP when + + l - force “lookup”, that is, only rewrite SDP when corresponding session is already exists in the RTP proxy. By default is on when the session is to be completed (reply in non-swap or ACK in swap mode). @@ -874,11 +874,15 @@ start_recording(); Checks if Request URI has alias param and if so, removes it and sets $du based on its value. Note that this means that routing of request is - based on alias parameter value of Request URI rather than Request URI + based on ;alias parameter value of Request URI rather than Request URI itself. If you call handle_ruri_alias() on a request, make thus sure that you screen alias parameter value of Request URI the same way as you would screen Request URI itself. + Returns 1 if ;alias param was found and $du was set and $ru rewritten, + 2 if alias param was not found and nothing was done, or -1 in case of + error. + This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, and LOCAL_ROUTE. @@ -979,16 +983,16 @@ $ kamctl fifo nh_show_rtpp Chapter 2. Frequently Asked Questions - 2.1. What happend with "rtpproxy_disable" parameter? + 2.1. What happend with “rtpproxy_disable” parameter? 2.2. Where can I find more about Kamailio? 2.3. Where can I post a question about this module? 2.4. How can I report a bug? 2.1. - What happend with "rtpproxy_disable" parameter? + What happend with “rtpproxy_disable” parameter? - It was removed as it became obsolete - now "rtpproxy_sock" can take + It was removed as it became obsolete - now “rtpproxy_sock” can take empty value to disable the rtpproxy functionality. 2.2. diff --git a/modules_k/nathelper/doc/nathelper_admin.xml b/modules_k/nathelper/doc/nathelper_admin.xml index be083b0..9605f37 100644 --- a/modules_k/nathelper/doc/nathelper_admin.xml +++ b/modules_k/nathelper/doc/nathelper_admin.xml @@ -33,9 +33,9 @@ <para> Note: fix_nated_contact changes the Contact header, thus it breaks the RFC. Although usually this is not an issue, it may cause problems with strict - SIP clients. There is an alternative approach by using add_contact_alias() that - together with handle_ruri_alias() is standard conform and also supports reuse - of TCP/TLS connections. + SIP clients. An alternative is to use add_contact_alias() that + together with handle_ruri_alias() is standards + conforming and also supports reuse of TCP/TLS connections. </para> <para> Known devices that get along over &nat;s with nathelper are ATAs @@ -1050,7 +1050,7 @@ start_recording(); <para> Checks if Request URI has alias param and if so, removes it and sets $du based on its value. Note that this - means that routing of request is based on alias + means that routing of request is based on ;alias parameter value of Request URI rather than Request URI itself. If you call handle_ruri_alias() on a request, make thus sure that you screen alias parameter value of @@ -1058,6 +1058,11 @@ start_recording(); Request URI itself. </para> <para> + Returns 1 if ;alias param was found and $du was set and + $ru rewritten, 2 if alias param was not found and + nothing was done, or -1 in case of error. + </para> + <para> This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, and LOCAL_ROUTE. </para>

14 years, 10 months

git:kamailio_3.0: modules_k/nathelper: handle_ruri_alias() fix

by Juha Heinanen

Module: sip-router Branch: kamailio_3.0 Commit: f2969f4fbc8c74f46d1f43f1f8553efc2e910d1a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f2969f4… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Apr 2 10:19:55 2010 +0300 modules_k/nathelper: handle_ruri_alias() fix - Look for ;alias parameter in parsed_uri.sip_params field instead of parsed_uri.params field. (cherry picked from commit ba7e942b819cea6c6d71651a37cfd9f73a9ddd48) --- modules_k/nathelper/nathelper.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 3e66ee4..5f73031 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -1504,12 +1504,12 @@ handle_ruri_alias_f(struct sip_msg* msg, char* str1, char* str2) unsigned int len, rest_len, val_len, alias_len, proto_type, cur_uri_len, ip_port_len; - if ((msg->parsed_uri_ok == 0) && (parse_sip_msg_uri(msg) < 0)) { + if (parse_sip_msg_uri(msg) < 0) { LM_ERR("while parsing Request-URI\n"); return -1; } - rest = msg->parsed_uri.params.s; - rest_len = msg->parsed_uri.params.len; + rest = msg->parsed_uri.sip_params.s; + rest_len = msg->parsed_uri.sip_params.len; if (rest_len == 0) { LM_DBG("no params\n"); return 2;

14 years, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev