sr-dev February 2013

sr-dev@lists.kamailio.org

45 participants
200 discussions

git:jason.penton/ims_ro_interface: modules/dialog_ng: some code formatting fixes

by Jason Penton

Module: sip-router Branch: jason.penton/ims_ro_interface Commit: 0cecd3801eb3287a8460e2e15db2581ca1e6b1ea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0cecd38… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Fri Feb 22 15:25:01 2013 +0200 modules/dialog_ng: some code formatting fixes --- modules/dialog_ng/dlg_load.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/dialog_ng/dlg_load.h b/modules/dialog_ng/dlg_load.h index 9c6ec4d..80e97d6 100644 --- a/modules/dialog_ng/dlg_load.h +++ b/modules/dialog_ng/dlg_load.h @@ -39,12 +39,12 @@ typedef int (*terminate_dlg_f)(str *callid, str *ftag, str *ttag, str *hdrs, str typedef time_t (*get_dlg_expires_f)(str *callid, str *ftag, str *ttag); struct dlg_binds { - register_dlgcb_f register_dlgcb; - register_dlgcb_nodlg_f register_dlgcb_nodlg; - terminate_dlg_f terminate_dlg; - set_dlg_variable_f set_dlg_var; - get_dlg_variable_f get_dlg_var; - get_dlg_expires_f get_dlg_expires; + register_dlgcb_f register_dlgcb; + register_dlgcb_nodlg_f register_dlgcb_nodlg; + terminate_dlg_f terminate_dlg; + set_dlg_variable_f set_dlg_var; + get_dlg_variable_f get_dlg_var; + get_dlg_expires_f get_dlg_expires; };

11 years, 9 months

[tracker] Task opened: db_postgres: Prepared statements do not work (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Markus Bucher (MarkCDSys) Attached to Project - sip-router Summary - db_postgres: Prepared statements do not work Task Type - Improvement Category - Module Status - Unconfirmed Assigned To - Operating System - Linux Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Hi, I recently tried to do some DB-Queries from my PostgreSQL-DB using modules db_postgres and db2_ops, finding out that queries using parameters did not work. E.g.: modparam("db2_ops", "declare_query", "sel1=select uid from sip_user where number=$1/%(a)from.uri.user"); I looked at the sources and saw that this has not been implemented, yet (PQprepare() is always called with 0 as number of parameters). Using db_mysql as a draft, I created the attached patch, which fixes the issue for me (tested with PostgreSQL 8.4.16). Notice that with PostgreSQL the parameters are marked within the SQL-query using '$1', '$2', etc. instead of '?' like it is in MySQL. This should be mentioned in db2_ops' documentation. It would be nice if you would consider using my patch. Best Regards, Markus One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=272 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 9 months

git:pd/outbound: modules/registrar: RFC 5626 section 6 support

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: 65dc9c8cf35fc3e631380d65e8c99e8f84d465cc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65dc9c8… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Feb 28 14:40:41 2013 +0000 modules/registrar: RFC 5626 section 6 support - Behaviour when outbound in use but first edge proxy does not support it. --- modules/registrar/reply.c | 11 ++++-- modules/registrar/rerrno.h | 3 +- modules/registrar/save.c | 79 ++++++++++++++++++++++++++++++++++++-------- 3 files changed, 75 insertions(+), 18 deletions(-) diff --git a/modules/registrar/reply.c b/modules/registrar/reply.c index 4b05aa7..129e7d6 100644 --- a/modules/registrar/reply.c +++ b/modules/registrar/reply.c @@ -375,6 +375,7 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) #define MSG_400 "Bad Request" #define MSG_420 "Bad Extension" #define MSG_421 "Extension Required" +#define MSG_439 "First Hop Lacks Outbound Support" #define MSG_500 "Server Internal Error" #define MSG_503 "Service Unavailable" @@ -410,6 +411,7 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) #define EI_R_PATH_UNSUP "No support for found Path indicated" /* R_PATH_UNSUP */ #define EI_R_OB_UNSUP "No support for Outbound indicated" /* R_OB_UNSUP */ #define EI_R_OB_REQD "No support for Outbound on server" /* R_OB_REQD */ +#define EI_R_OB_UNSUP_EDGE "No support for Outbound on edge proxy" /* R_OB_UNSUP_EDGE */ str error_info[] = { @@ -444,7 +446,8 @@ str error_info[] = { {EI_R_PARSE_PATH, sizeof(EI_R_PARSE_PATH) - 1}, {EI_R_PATH_UNSUP, sizeof(EI_R_PATH_UNSUP) - 1}, {EI_R_OB_UNSUP, sizeof(EI_R_OB_UNSUP) - 1}, - {EI_R_OB_REQD, sizeof(EI_R_OB_REQD) - 1}, + {EI_R_OB_REQD, sizeof(EI_R_OB_REQD) - 1}, + {EI_R_OB_UNSUP_EDGE, sizeof(EI_R_OB_UNSUP_EDGE) - 1}, }; int codes[] = { @@ -479,7 +482,8 @@ int codes[] = { 400, /* R_PARSE_PATH */ 420, /* R_PATH_UNSUP */ 421, /* R_OB_UNSUP */ - 420 /* R_OB_REQD */ + 420, /* R_OB_REQD */ + 439, /* R_OB_UNSUP_EDGE */ }; @@ -700,7 +704,8 @@ int reg_send_reply(struct sip_msg* _m) case 200: msg.s = MSG_200; msg.len = sizeof(MSG_200)-1;break; case 400: msg.s = MSG_400; msg.len = sizeof(MSG_400)-1;break; case 420: msg.s = MSG_420; msg.len = sizeof(MSG_420)-1;break; - case 421: msg.s = MSG_420; msg.len = sizeof(MSG_421)-1;break; + case 421: msg.s = MSG_421; msg.len = sizeof(MSG_421)-1;break; + case 439: msg.s = MSG_439; msg.len = sizeof(MSG_439)-1;break; case 500: msg.s = MSG_500; msg.len = sizeof(MSG_500)-1;break; case 503: msg.s = MSG_503; msg.len = sizeof(MSG_503)-1;break; } diff --git a/modules/registrar/rerrno.h b/modules/registrar/rerrno.h index 9bc9338..535be04 100644 --- a/modules/registrar/rerrno.h +++ b/modules/registrar/rerrno.h @@ -65,7 +65,8 @@ typedef enum rerr { R_PARSE_PATH, /*!< Error while parsing Path */ R_PATH_UNSUP, /*!< Path not supported by UAC */ R_OB_UNSUP, /*!< Outbound not supported by UAC */ - R_OB_REQD /*!< Outbound required by UAC but not supported on server */ + R_OB_REQD, /*!< Outbound required by UAC but not supported on server */ + R_OB_UNSUP_EDGE, /*!< Outbound needed for this registration but not supported on edge proxy */ } rerr_t; diff --git a/modules/registrar/save.c b/modules/registrar/save.c index b7a4035..d568334 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -50,6 +50,7 @@ #include "../../parser/parse_allow.h" #include "../../parser/parse_methods.h" #include "../../parser/msg_parser.h" +#include "../../parser/parse_rr.h" #include "../../parser/parse_to.h" #include "../../parser/parse_uri.h" #include "../../dprint.h" @@ -217,8 +218,7 @@ static inline int no_contacts(sip_msg_t *_m, udomain_t* _d, str* _a, str* _h) /*! \brief * Fills the common part (for all contacts) of the info structure */ -static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, - unsigned int _e, unsigned int _f) +static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, unsigned int _e, unsigned int _f, int _use_regid) { static ucontact_info_t ci; static str no_ua = str_init("n/a"); @@ -365,7 +365,7 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, } if(_c->instance!=NULL && _c->instance->body.len>0) ci.instance = _c->instance->body; - if(_c->instance!=NULL && _c->reg_id!=NULL && _c->reg_id->body.len>0) { + if(_use_regid && _c->instance!=NULL && _c->reg_id!=NULL && _c->reg_id->body.len>0) { if(str2int(&_c->reg_id->body, &ci.reg_id)<0 || ci.reg_id==0) { LM_ERR("invalid reg-id value\n"); @@ -424,7 +424,7 @@ int reg_get_crt_max_contacts(void) * and insert all contacts from the message that have expires * > 0 */ -static inline int insert_contacts(struct sip_msg* _m, udomain_t* _d, str* _a) +static inline int insert_contacts(struct sip_msg* _m, udomain_t* _d, str* _a, int _use_regid) { ucontact_info_t* ci; urecord_t* r = NULL; @@ -480,7 +480,7 @@ static inline int insert_contacts(struct sip_msg* _m, udomain_t* _d, str* _a) } /* pack the contact_info */ - if ( (ci=pack_ci( (ci==0)?_m:0, _c, expires, flags))==0 ) { + if ( (ci=pack_ci( (ci==0)?_m:0, _c, expires, flags, _use_regid))==0 ) { LM_ERR("failed to extract contact info\n"); goto error; } @@ -607,8 +607,7 @@ static int test_max_contacts(struct sip_msg* _m, urecord_t* _r, contact_t* _c, * 3) If contact in usrloc exists and expires * == 0, delete contact */ -static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, - int _mode) +static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, int _mode, int _use_regid) { ucontact_info_t *ci; ucontact_t *c, *ptr, *ptr0; @@ -627,7 +626,7 @@ static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, rc = 0; /* pack the contact_info */ - if ( (ci=pack_ci( _m, 0, 0, flags))==0 ) { + if ( (ci=pack_ci( _m, 0, 0, flags, _use_regid))==0 ) { LM_ERR("failed to initial pack contact info\n"); goto error; } @@ -658,7 +657,7 @@ static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, calc_contact_expires(_m, _c->expires, &expires); /* pack the contact info */ - if ( (ci=pack_ci( 0, _c, expires, 0))==0 ) { + if ( (ci=pack_ci( 0, _c, expires, 0, _use_regid))==0 ) { LM_ERR("failed to pack contact specific info\n"); goto error; } @@ -774,7 +773,7 @@ error: * contained some contact header fields */ static inline int add_contacts(struct sip_msg* _m, udomain_t* _d, - str* _a, int _mode) + str* _a, int _mode, int _use_regid) { int res; int ret; @@ -796,7 +795,7 @@ static inline int add_contacts(struct sip_msg* _m, udomain_t* _d, } if (res == 0) { /* Contacts found */ - if ((ret=update_contacts(_m, r, _mode)) < 0) { + if ((ret=update_contacts(_m, r, _mode, _use_regid)) < 0) { build_contact(_m, r->contacts, &u->host); ul.release_urecord(r); ul.unlock_udomain(_d, _a); @@ -805,7 +804,7 @@ static inline int add_contacts(struct sip_msg* _m, udomain_t* _d, build_contact(_m, r->contacts, &u->host); ul.release_urecord(r); } else { - if (insert_contacts(_m, _d, _a) < 0) { + if (insert_contacts(_m, _d, _a, _use_regid) < 0) { ul.unlock_udomain(_d, _a); return -4; } @@ -827,6 +826,12 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri) str aor; int ret; sip_uri_t *u; + rr_t *route; + struct sip_uri puri; + param_hooks_t hooks; + param_t *params; + contact_t *contact; + int use_ob = 1, use_regid = 1; u = parse_to_uri(_m); if(u==NULL) @@ -855,12 +860,58 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri) if (parse_require(_m) == 0) { if (!(get_require(_m) & F_OPTION_TAG_OUTBOUND) && reg_outbound_mode == REG_OUTBOUND_NONE) { - LM_WARN("Outbound required by client and not supported by server\n"); + LM_WARN("Outbound required by UAC and not supported by server\n"); rerrno = R_OB_REQD; goto error; } } + if (reg_outbound_mode != REG_OUTBOUND_NONE + && !(parse_headers(_m, HDR_VIA2_F, 0) == -1 || _m->via2 == 0 + || _m->via2->error != PARSE_OK)) { + /* Outbound supported on server, and more than one Via: - not the first hop */ + + if (!(parse_headers(_m, HDR_PATH_F, 0) == -1 || _m->path == 0)) { + if (parse_rr_body(_m->path->body.s, _m->path->body.len, &route) < 0) { + LM_ERR("Failed to parse Path: header body\n"); + goto error; + } + if (parse_uri(route->nameaddr.uri.s, route->nameaddr.uri.len, &puri) < 0) { + LM_ERR("Failed to parse Path: URI\n"); + goto error; + } + if (parse_params(&puri.params, CLASS_URI, &hooks, &params) != 0) { + LM_ERR("Failed to parse Path: URI parameters\n"); + goto error; + } + if (!hooks.uri.ob) { + /* No ;ob parameter to top Path: URI - no outbound */ + use_ob = 0; + } + + } else { + /* No Path: header - no outbound */ + use_ob = 0; + + } + + contact = ((contact_body_t *) _m->contact->parsed)->contacts; + if (!contact) { + LM_ERR("empty Contact:\n"); + goto error; + } + + if (use_ob == 0 && (get_supported(_m) & F_OPTION_TAG_OUTBOUND) + && contact->reg_id) { + LM_WARN("Outbound used by UAC but not supported by edge proxy\n"); + rerrno = R_OB_UNSUP_EDGE; + goto error; + } else { + /* ignore ;reg-id parameter */ + use_regid = 0; + } + } + get_act_time(); c = get_first_contact(_m); @@ -882,7 +933,7 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri) } } else { mode = is_cflag_set(REG_SAVE_REPL_FL)?1:0; - if ((ret=add_contacts(_m, (udomain_t*)_d, &aor, mode)) < 0) + if ((ret=add_contacts(_m, (udomain_t*)_d, &aor, mode, use_regid)) < 0) goto error; ret = (ret==0)?1:ret; }

11 years, 9 months

Re: [sr-dev] [SR-Users] openser db on an external mysql server

by Prakash N

Hi Govoiper Free Memory on my server 2309 MB total used free shared buffers cached Mem: 2795 486 2309 0 70 180 -/+ buffers/cache: 234 2561 Swap: 2927 0 2927 *Kamailio error:* * * ERROR: PID file /var/run/kamailio.pid does not exist -- Kamailio start failed *tail -f /var/log/messages:* Feb 12 23:41:28 localhost /usr/local/sbin/kamailio[4280]: INFO: <core> [udp_server.c:230]: INFO: udp_init: SO_RCVBUF is finally 262142 Feb 12 23:41:30 localhost /usr/local/sbin/kamailio[4281]: ERROR: db_mysql [km_my_con.c:109]: driver error: Can't connect to MySQL server on '192.168.1.170' (4) Feb 12 23:41:30 localhost /usr/local/sbin/kamailio[4281]: ERROR: <core> [db.c:320]: could not add connection to the pool Feb 12 23:41:30 localhost /usr/local/sbin/kamailio[4281]: ERROR: usrloc [ul_mod.c:407]: child(1): failed to connect to database Feb 12 23:41:30 localhost /usr/local/sbin/kamailio[4281]: ERROR: <core> [sr_module.c:896]: init_mod_child(): Error while initializing module usrloc (/usr/local/lib64/kamailio/modules_k/usrloc.so) Feb 12 23:41:30 localhost /usr/local/sbin/kamailio[4283]: ERROR: db_mysql [km_my_con.c:109]: driver error: Can't connect to MySQL server on '192.168.1.170' (4) Feb 12 23:41:30 localhost /usr/local/sbin/kamailio[4283]: ERROR: <core> [db.c:320]: could not add connection to the pool Feb 12 23:41:30 localhost /usr/local/sbin/kamailio[4283]: ERROR: auth_db [authdb_mod.c:174]: unable to connect to the database Feb 12 23:41:30 localhost /usr/local/sbin/kamailio[4283]: ERROR: <core> [sr_module.c:896]: init_mod_child(): Error while initializing module auth_db (/usr/local/lib64/kamailio/modules_k/auth_db.so) Feb 12 23:41:30 localhost /usr/local/sbin/kamailio[4283]: ERROR: <core> [pt.c:350]: ERROR: fork_process(): init_child failed for process 3, pid 4283, "udp receiver child=2 sock=127.0.0.1:5060" Feb 12 23:41:30 localhost /usr/local/sbin/kamailio[4283]: : <core> [main.c:1625]: main_loop: Cannot fork With Regards N.Prakash ---------- Forwarded message ---------- > From: SamyGo <govoiper(a)gmail.com> > Date: Tue, Feb 12, 2013 at 5:49 PM > Subject: Re: [SR-Users] [sr-dev] openser db on an external mysql server > To: "SIP Router - Kamailio (OpenSER) and SIP Express Router (SER) - Users > Mailing List" <sr-users(a)lists.sip-router.org> > Cc: Muhammad Shahzad <shaheryarkh(a)gmail.com>, sr-dev(a)lists.sip-router.org, > Prabhakaran B <prabhakaran(a)tevatel.com>, Indu Priya <indu(a)tevatel.com> > > > Hi Prakash, > > Please paste All ERROR appearing and Warnings when you start your > kamailio. What is the free memory situation on your server ? > > Regards, > Sammy > > > > > On Tue, Feb 12, 2013 at 5:12 PM, Prakash N <prakash.n(a)tevatel.com> wrote: > >> Hi Muhammad, >> >> Yes, I have define Mysql on top in Kamailio.cfg >> >> DBURL "mysql://openser:openserrw@192.168.1.170/openser" >> >> >> I have attached Kamailio.cfg ,please advice >> >> With Regards >> >> N.Prakash >> >> >> On Tue, Feb 12, 2013 at 5:37 PM, Muhammad Shahzad <shaheryarkh(a)gmail.com>wrote: >> >>> What is your connection string in kamailio i.e. DBURL? Also make sure >>> you have defined WITH_MYSQL on the top of kamailio.cfg to load necessary >>> drivers. >>> >>> #!define WITH_MYSQL >>> >>> Thank you. >>> >>> >>> On Tue, Feb 12, 2013 at 12:56 PM, Prakash N <prakash.n(a)tevatel.com>wrote: >>> >>>> Hi Shahzad , >>>> >>>> It is not ,We can able to connect remote mysql ( please find >>>> the detail below),moreover we can able create openser db from Kamailio >>>> server to remote mysql server >>>> >>>> *Mysql server : 192.168.1.170* >>>> *Kamailio server : 192.168.1.101* >>>> >>>> >>>> *Mysql output :* >>>> * >>>> * >>>> *mysql -u openser -h 192.168.1.170 -p* >>>> Enter password: >>>> Welcome to the MySQL monitor. Commands end with ; or \g. >>>> Your MySQL connection id is 68 >>>> Server version: 5.1.67 Source distribution >>>> >>>> Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights >>>> reserved. >>>> >>>> Oracle is a registered trademark of Oracle Corporation and/or its >>>> affiliates. Other names may be trademarks of their respective >>>> owners. >>>> >>>> Type 'help;' or '\h' for help. Type '\c' to clear the current input >>>> statement. >>>> >>>> mysql> >>>> >>>> With Regards >>>> >>>> N.Prakash >>>> >>>> >>>>> >>>>> ---------- Forwarded message ---------- >>>>> From: Muhammad Shahzad <shaheryarkh(a)gmail.com> >>>>> Date: Tue, Feb 12, 2013 at 5:16 PM >>>>> Subject: Re: [sr-dev] [SR-Users] openser db on an external mysql server >>>>> To: Development mailing list of the sip-router project < >>>>> sr-dev(a)lists.sip-router.org> >>>>> Cc: Daniel-Constantin Mierla <miconda(a)gmail.com>, >>>>> sr-users(a)lists.sip-router.org, Indu Priya <indu(a)tevatel.com>, >>>>> Prabhakaran B <prabhakaran(a)tevatel.com> >>>>> >>>>> >>>>> Its not a Kamailio error, it is problem with connecting to mysql >>>>> server. Error 4 means No MySQL Server Running On Specified Host. >>>>> >>>>> May be MySQL server is down or there is some firewall running or MySQL >>>>> not listening on IP you specified. >>>>> >>>>> Thank you. >>>>> >>>>> >>>>> On Tue, Feb 12, 2013 at 12:11 PM, Prakash N <prakash.n(a)tevatel.com>wrote: >>>>> >>>>>> Dear Daniel, >>>>>> >>>>>> Thanks for your quick response >>>>>> >>>>>> We can able to create operseb db on remote mysql server ,but >>>>>> Kamailio not getting start >>>>>> >>>>>> Error detail: >>>>>> >>>>>> ERROR: db_mysql [km_my_con.c:109]: driver error: Can't connect to >>>>>> MySQL server on '192.168.1.170' (4) >>>>>> ERROR: <core> [db.c:32 0]: could not add connection to the pool >>>>>> ERROR: auth_db [authdb _mod.c:174]: unable to connect to the database >>>>>> ERROR: <core> [sr_modu le.c:896]: init_mod_child(): Error while >>>>>> initializing module auth_db (/usr/local/lib64/kamailio/modules_k/auth_db.so) >>>>>> >>>>>> >>>>>> I have attached my kamailo.cfg ( we followed Kamailio and >>>>>> Asterisk real time installation) ,please advice >>>>>> >>>>>> With Regards >>>>>> >>>>>> N.Prakash >>>>>> >>>>>>> >>>>>>> ---------- Forwarded message ---------- >>>>>>> From: Daniel-Constantin Mierla <miconda(a)gmail.com> >>>>>>> Date: Tue, Feb 12, 2013 at 2:41 PM >>>>>>> Subject: Re: [SR-Users] openser db on an external mysql server >>>>>>> To: "SIP Router - Kamailio (OpenSER) and SIP Express Router (SER) - >>>>>>> Users Mailing List" <sr-users(a)lists.sip-router.org>, >>>>>>> sr-dev(a)lists.sip-router.org, miconda(a)gmail.com >>>>>>> Cc: Prabhakaran B <prabhakaran(a)tevatel.com> >>>>>>> >>>>>>> >>>>>>> Hello, >>>>>>> >>>>>>> kamailio database is created with: >>>>>>> >>>>>>> kamdbctl create >>>>>>> >>>>>>> the host of mysql server has to be specified in kamctlrc file via >>>>>>> DBHOST variable - kamctlrc is located in same directory as kamailio.cfg. >>>>>>> >>>>>>> In kamailio.cfg, update the db_url value (or DBURL define) to >>>>>>> reflect the mysql server host. >>>>>>> >>>>>>> Cheers, >>>>>>> Daniel >>>>>>> >>>>>>> >>>>>>> On 2/12/13 4:16 AM, Prakash N wrote: >>>>>>> >>>>>>> Hi All, >>>>>>> >>>>>>> I am new this Kamailo ,ther is any step by step document to set >>>>>>> up openser db on an external mysql server ? >>>>>>> >>>>>>> With Regards >>>>>>> >>>>>>> N.Prakash >>>>>>> >>>>>>> >>>>>>> >>>>>>> _______________________________________________ >>>>>>> SIP Express Router (SER) and Kamailio (OpenSER) - sr-users mailing listsr-users@lists.sip-router.orghttp://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users >>>>>>> >>>>>>> >>>>>>> >>>>>>> -- >>>>>>> Daniel-Constantin Mierla - http://www.asipto.comhttp://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda >>>>>>> Kamailio World Conference, April 16-17, 2013, Berlin >>>>>>> - http://conference.kamailio.com - >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> _______________________________________________ >>>>>> sr-dev mailing list >>>>>> sr-dev(a)lists.sip-router.org >>>>>> http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev >>>>>> >>>>>> >>>>> >>>>> >>>>> -- >>>>> Muhammad Shahzad >>>>> ----------------------------------- >>>>> CISCO Rich Media Communication Specialist (CRMCS) >>>>> CISCO Certified Network Associate (CCNA) >>>>> Cell: +49 176 99 83 10 85 >>>>> MSN: shari_786pk(a)hotmail.com >>>>> Email: shaheryarkh(a)googlemail.com >>>>> >>>>> >>>> >>> >>> >>> -- >>> Muhammad Shahzad >>> ----------------------------------- >>> CISCO Rich Media Communication Specialist (CRMCS) >>> CISCO Certified Network Associate (CCNA) >>> Cell: +49 176 99 83 10 85 >>> MSN: shari_786pk(a)hotmail.com >>> Email: shaheryarkh(a)googlemail.com >>> >> >> >> _______________________________________________ >> SIP Express Router (SER) and Kamailio (OpenSER) - sr-users mailing list >> sr-users(a)lists.sip-router.org >> http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users >> >> > >

11 years, 9 months

Cannot hear voice with symmetric NAT and STUN

by Khoa Pham

Hi, I have Kamailio as SIP server and RTP server. Client is PJSIP. I read that STUN is for non-symmetric NAT, and RTP server is for symmetric NAT. Supposed A calls B. If A, B both use symmetric NAT and STUN, they cannot hear each other If A or B use non-symmetric NAT and NOT using STUN, they cannot hear each other. Why is that? I read http://tools.ietf.org/id/draft-takeda-symmetric-nat-traversal-00.txt for Prediction Failure, is that related to this problem ? -- Khoa Pham HCMC University of Science Faculty of Information Technology

11 years, 9 months

git:master: nathelper: add new option sipping_disable_bflag

by Richard Fuchs

Module: sip-router Branch: master Commit: abc1e61dea4e96235ca54955f664effc66568d6d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=abc1e61… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Wed Feb 27 11:17:03 2013 -0500 nathelper: add new option sipping_disable_bflag sipping_disable_bflag can be set on a per-registration basis to disable NAT pings completely --- modules/nathelper/README | 138 ++++++++++++++++------------- modules/nathelper/doc/nathelper_admin.xml | 22 +++++ modules/nathelper/nathelper.c | 6 ++ 3 files changed, 106 insertions(+), 60 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=abc…

11 years, 9 months

git:pd/outbound: modules/registrar: add Require: outbound to 200 OK when required by client and supported by server

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: aabb7adb933185f4bc12dcd82cdee357246c8c2f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aabb7ad… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 27 15:29:35 2013 +0000 modules/registrar: add Require: outbound to 200 OK when required by client and supported by server - Reported by @oej --- modules/registrar/reply.c | 28 ++++++++++++++++++++++++---- modules/registrar/rerrno.h | 3 ++- modules/registrar/save.c | 15 +++++++++++++-- 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/modules/registrar/reply.c b/modules/registrar/reply.c index 97c8274..4b05aa7 100644 --- a/modules/registrar/reply.c +++ b/modules/registrar/reply.c @@ -39,6 +39,7 @@ #include "../../ut.h" #include "../../xavp.h" #include "../../parser/msg_parser.h" +#include "../../lib/kcore/parse_require.h" #include "../../lib/kcore/parse_supported.h" #include "../../data_lump_rpl.h" #include "../usrloc/usrloc.h" @@ -408,6 +409,8 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) #define EI_R_PARSE_PATH "Path parse error" /* R_PARSE_PATH */ #define EI_R_PATH_UNSUP "No support for found Path indicated" /* R_PATH_UNSUP */ #define EI_R_OB_UNSUP "No support for Outbound indicated" /* R_OB_UNSUP */ +#define EI_R_OB_REQD "No support for Outbound on server" /* R_OB_REQD */ + str error_info[] = { {EI_R_FINE, sizeof(EI_R_FINE) - 1}, @@ -441,7 +444,7 @@ str error_info[] = { {EI_R_PARSE_PATH, sizeof(EI_R_PARSE_PATH) - 1}, {EI_R_PATH_UNSUP, sizeof(EI_R_PATH_UNSUP) - 1}, {EI_R_OB_UNSUP, sizeof(EI_R_OB_UNSUP) - 1}, - + {EI_R_OB_REQD, sizeof(EI_R_OB_REQD) - 1}, }; int codes[] = { @@ -475,8 +478,8 @@ int codes[] = { 400, /* R_CALLID_LEN */ 400, /* R_PARSE_PATH */ 420, /* R_PATH_UNSUP */ - 421 /* R_OB_UNSUP */ - + 421, /* R_OB_UNSUP */ + 420 /* R_OB_REQD */ }; @@ -654,14 +657,27 @@ int reg_send_reply(struct sip_msg* _m) if (add_require(_m, &outbound_str) < 0) return -1; + if (add_supported(_m, &outbound_str) < 0) + return -1; + if (reg_flow_timer > 0) { if (add_flow_timer(_m) < 0) return -1; } - /* Fall-thru */ + break; case REG_OUTBOUND_SUPPORTED: if (add_supported(_m, &outbound_str) < 0) return -1; + + if (get_require(_m) & F_OPTION_TAG_OUTBOUND) { + if (add_require(_m, &outbound_str) < 0) + return -1; + + if (reg_flow_timer > 0) { + if (add_flow_timer(_m) < 0) + return -1; + } + } break; } break; @@ -671,6 +687,10 @@ int reg_send_reply(struct sip_msg* _m) if (add_supported(_m, &outbound_str) < 0) return -1; break; + case R_OB_REQD: + if (add_unsupported(_m, &outbound_str) < 0) + return -1; + break; default: break; } diff --git a/modules/registrar/rerrno.h b/modules/registrar/rerrno.h index 63add5a..9bc9338 100644 --- a/modules/registrar/rerrno.h +++ b/modules/registrar/rerrno.h @@ -64,7 +64,8 @@ typedef enum rerr { R_CALLID_LEN, /*!< Callid too long */ R_PARSE_PATH, /*!< Error while parsing Path */ R_PATH_UNSUP, /*!< Path not supported by UAC */ - R_OB_UNSUP /*!< Outbound not supported by UAC */ + R_OB_UNSUP, /*!< Outbound not supported by UAC */ + R_OB_REQD /*!< Outbound required by UAC but not supported on server */ } rerr_t; diff --git a/modules/registrar/save.c b/modules/registrar/save.c index 9cc2dd4..b7a4035 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -61,6 +61,7 @@ #include "../../mod_fix.h" #include "../../lib/srutils/sruid.h" #include "../../lib/kcore/cmpapi.h" +#include "../../lib/kcore/parse_require.h" #include "../../lib/kcore/parse_supported.h" #include "../../lib/kcore/statistics.h" #ifdef USE_TCP @@ -843,13 +844,23 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri) } if (parse_supported(_m) == 0) { - if (!(((struct option_tag_body *)_m->supported->parsed)->option_tags_all - & F_OPTION_TAG_OUTBOUND) && reg_outbound_mode == REG_OUTBOUND_REQUIRE) { + if (!(get_supported(_m) & F_OPTION_TAG_OUTBOUND) + && reg_outbound_mode == REG_OUTBOUND_REQUIRE) { LM_WARN("Outbound required by server and not supported by UAC\n"); rerrno = R_OB_UNSUP; goto error; } } + + if (parse_require(_m) == 0) { + if (!(get_require(_m) & F_OPTION_TAG_OUTBOUND) + && reg_outbound_mode == REG_OUTBOUND_NONE) { + LM_WARN("Outbound required by client and not supported by server\n"); + rerrno = R_OB_REQD; + goto error; + } + } + get_act_time(); c = get_first_contact(_m);

11 years, 9 months

git:pd/outbound: modules/sst: updated for parse_supported refactoring

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: 167283826a4b534bc68d96e5e8eb6bc686a6d293 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1672838… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 27 14:02:47 2013 +0000 modules/sst: updated for parse_supported refactoring --- modules/sst/sst_handlers.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/sst/sst_handlers.c b/modules/sst/sst_handlers.c index 4ecbc1f..20632ed 100644 --- a/modules/sst/sst_handlers.c +++ b/modules/sst/sst_handlers.c @@ -884,8 +884,8 @@ static int parse_msg_for_sst_info(struct sip_msg *msg, sst_msg_info_t *minfo) * it is not found if unsuccessfull. */ if ((rtn = parse_supported(msg)) == 0) { - if ((((struct supported_body*)msg->supported->parsed)->supported_all - & F_SUPPORTED_TIMER)) { + if ((((struct option_tag_body*)msg->supported->parsed)->option_tags_all + & F_OPTION_TAG_TIMER)) { minfo->supported = 1; } }

11 years, 9 months

git:pd/outbound: lib/kcore: added parser for Require: header

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: 936b6892a8a0ff25b108635e48a146b7cbc3a7ff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=936b689… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 27 14:03:27 2013 +0000 lib/kcore: added parser for Require: header --- lib/kcore/parse_require.c | 71 +++++++++++++++++++++++++++++++++++++++++++++ lib/kcore/parse_require.h | 48 ++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 0 deletions(-) diff --git a/lib/kcore/parse_require.c b/lib/kcore/parse_require.c new file mode 100644 index 0000000..7bb1a3d --- /dev/null +++ b/lib/kcore/parse_require.c @@ -0,0 +1,71 @@ +/* + * $Id$ + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/*! + * \file + * \brief Require parser + * \ingroup parser + */ + +#include "../../mem/mem.h" +#include "parse_require.h" + +/*! + * Parse all Require headers + */ +int parse_require( struct sip_msg *msg) +{ + unsigned int require; + struct hdr_field *hdr; + struct option_tag_body *rb; + + /* maybe the header is already parsed! */ + if (msg->require && msg->require->parsed) + return 0; + + /* parse to the end in order to get all SUPPORTED headers */ + if (parse_headers(msg,HDR_EOH_F,0)==-1 || !msg->require) + return -1; + + /* bad luck! :-( - we have to parse them */ + require = 0; + for( hdr=msg->require ; hdr ; hdr=next_sibling_hdr(hdr)) { + if (hdr->parsed) { + require |= ((struct option_tag_body*)hdr->parsed)->option_tags; + continue; + } + + rb = (struct option_tag_body*)pkg_malloc(sizeof(struct option_tag_body)); + if (rb == 0) { + LM_ERR("out of pkg_memory\n"); + return -1; + } + + parse_option_tag_body(&(hdr->body), &(rb->option_tags)); + rb->hfree = hf_free_option_tag; + rb->option_tags_all = 0; + hdr->parsed = (void*)rb; + require |= rb->option_tags; + } + + ((struct option_tag_body*)msg->require->parsed)->option_tags_all = + require; + return 0; +} diff --git a/lib/kcore/parse_require.h b/lib/kcore/parse_require.h new file mode 100644 index 0000000..9214455 --- /dev/null +++ b/lib/kcore/parse_require.h @@ -0,0 +1,48 @@ +/* + * $Id$ + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +/*! + * \file + * \brief Require parser + * \ingroup parser + */ + +#ifndef PARSE_REQUIRE_H +#define PARSE_REQUIRE_H + +#include "../../parser/msg_parser.h" +#include "../../parser/hf.h" +#include "../../mem/mem.h" +#include "option-tags.h" + +#define get_require(p_msg) \ + ((p_msg)->require ? ((struct option_tag_body*)(p_msg)->require->parsed)->option_tags_all : 0) + + +/*! + * Parse all Require headers. + */ +int parse_require( struct sip_msg *msg); + + +void free_require(struct option_tag_body **rb); + +#endif /* PARSE_REQUIRE_H */

11 years, 9 months

git:pd/outbound: parser: updated for parse_supported refactoring

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: be95ad30bf92cce4611f41e7d52d7a12f557e863 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=be95ad3… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 27 14:03:13 2013 +0000 parser: updated for parse_supported refactoring --- parser/keys.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/parser/keys.h b/parser/keys.h index c62fd26..c7c934b 100644 --- a/parser/keys.h +++ b/parser/keys.h @@ -118,6 +118,8 @@ #define _tity_ 0x79746974 /* "tity" */ #define _info_ 0x6f666e69 /* "info" */ #define _path_ 0x68746170 /* "path" */ +#define _100r_ 0x72303031 /* "100r" */ +#define _time_ 0x656d6974 /* "time" */ #define _pt_l_ 0x6c2d7470 /* "pt-l" */ #define _angu_ 0x75676e61 /* "angu" */

11 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2013