sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: pv: implemented assignment for branch pvs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 4223ed2097efaba0305c8d8768c34b2d25ff407e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4223ed2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 21 12:46:20 2010 +0200 pv: implemented assignment for branch pvs - branch attributes can be individually changed via $(branch(attr)[index]) - if index is missing, first branch structure is taken - if index is -1, last branch is missing - adding a new branch is possible via km_append_branch("uri") or append_branch() functions - $(branch(uri)[index]) = $null; will drop the branch. Note that the next branches after dropped one will be shifted one possiotn back - for the rest of attributes, $null assignment means reseting the value of the attribute to null (uri is mandatory to have the branch valid) - completed FS#8 --- modules_k/pv/pv_branch.c | 185 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 184 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_branch.c b/modules_k/pv/pv_branch.c index 5fa399e..e162104 100644 --- a/modules_k/pv/pv_branch.c +++ b/modules_k/pv/pv_branch.c @@ -24,6 +24,7 @@ #include "../../parser/parse_uri.h" #include "../../dset.h" #include "../../onsend.h" +#include "../../socket_info.h" #include "pv_core.h" #include "pv_branch.h" @@ -88,7 +89,189 @@ int pv_get_branchx(struct sip_msg *msg, pv_param_t *param, int pv_set_branchx(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) { - /* tbd */ + int idx = 0; + int idxf = 0; + branch_t *br; + struct socket_info *si; + int port, proto; + str host; + char backup; + + if(msg==NULL || param==NULL) + { + LM_ERR("bad parameters\n"); + return -1; + } + + /* get the index */ + if(pv_get_spec_index(msg, param, &idx, &idxf)!=0) + { + LM_ERR("invalid index\n"); + return -1; + } + + br = get_sip_branch(idx); + + if(br==NULL) + { + LM_DBG("no branch to operate on\n"); + return -1; + } + + switch(param->pvn.u.isname.name.n) + { + case 1: /* dst uri */ + if(val==NULL || (val->flags&PV_VAL_NULL)) + { + br->dst_uri[0] = '\0'; + br->dst_uri_len = 0; + break; + } + if(!(val->flags&PV_VAL_STR)) + { + LM_ERR("str value required to set branch dst uri\n"); + return -1; + } + if(val->rs.len<=0) + { + br->dst_uri[0] = '\0'; + br->dst_uri_len = 0; + break; + } + + if (unlikely(val->rs.len > MAX_URI_SIZE - 1)) + { + LM_ERR("too long dst uri: %.*s\n", + val->rs.len, val->rs.s); + return -1; + } + memcpy(br->dst_uri, val->rs.s, val->rs.len); + br->dst_uri[val->rs.len] = 0; + br->dst_uri_len = val->rs.len; + break; + case 2: /* path */ + if(val==NULL || (val->flags&PV_VAL_NULL)) + { + br->path[0] = '\0'; + br->path_len = 0; + break; + } + if(!(val->flags&PV_VAL_STR)) + { + LM_ERR("str value required to set branch path\n"); + return -1; + } + if(val->rs.len<=0) + { + br->path[0] = '\0'; + br->path_len = 0; + break; + } + + if (unlikely(val->rs.len > MAX_PATH_SIZE - 1)) + { + LM_ERR("path too long: %.*s\n", + val->rs.len, val->rs.s); + return -1; + } + memcpy(br->path, val->rs.s, val->rs.len); + br->path[val->rs.len] = 0; + br->path_len = val->rs.len; + break; + case 3: /* Q */ + if(val==NULL || (val->flags&PV_VAL_NULL)) + { + br->q = Q_UNSPECIFIED; + break; + } + if(!(val->flags&PV_VAL_INT)) + { + LM_ERR("int value required to set branch q\n"); + return -1; + } + br->q = val->ri; + break; + case 4: /* send socket */ + if(val==NULL || (val->flags&PV_VAL_NULL)) + { + br->force_send_socket = NULL; + break; + } + if(!(val->flags&PV_VAL_STR)) + { + LM_ERR("str value required to set branch send sock\n"); + return -1; + } + if(val->rs.len<=0) + { + br->force_send_socket = NULL; + break; + } + backup = val->rs.s[val->rs.len]; + val->rs.s[val->rs.len] = '\0'; + if (parse_phostport(val->rs.s, &host.s, &host.len, &port, + &proto) < 0) + { + LM_ERR("invalid socket specification\n"); + val->rs.s[val->rs.len] = backup; + return -1; + } + val->rs.s[val->rs.len] = backup; + si = grep_sock_info(&host, (unsigned short)port, + (unsigned short)proto); + if (si!=NULL) + { + br->force_send_socket = si; + } else { + LM_WARN("no socket found to match [%.*s]\n", + val->rs.len, val->rs.s); + br->force_send_socket = NULL; + } + break; + case 5: /* count */ + /* do nothing - cannot set the branch counter */ + break; + case 6: /* flags */ + if(val==NULL || (val->flags&PV_VAL_NULL)) + { + br->flags = 0; + break; + } + if(!(val->flags&PV_VAL_INT)) + { + LM_ERR("int value required to set branch flags\n"); + return -1; + } + br->flags = val->ri; + break; + default: + /* 0 - uri */ + if(val==NULL || (val->flags&PV_VAL_NULL)) + { + drop_sip_branch(idx); + } else { + if(!(val->flags&PV_VAL_STR)) + { + LM_ERR("str value required to set branch uri\n"); + return -1; + } + if(val->rs.len<=0) + { + drop_sip_branch(idx); + } else { + if (unlikely(val->rs.len > MAX_URI_SIZE - 1)) + { + LM_ERR("too long r-uri: %.*s\n", + val->rs.len, val->rs.s); + return -1; + } + memcpy(br->uri, val->rs.s, val->rs.len); + br->uri[val->rs.len] = 0; + br->len = val->rs.len; + } + } + } + return 0; }

14 years, 9 months

git:master: modules_k/usrloc Fixed 2 bad typos in documentation

by Marius Zbihlei

Module: sip-router Branch: master Commit: e7b8754f25f320f27a3e89f0d02cf1ae6b0d353d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e7b8754… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Apr 21 13:28:04 2010 +0300 modules_k/usrloc Fixed 2 bad typos in documentation Reported by Juha Heinanen --- modules_k/usrloc/doc/usrloc_admin.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/usrloc/doc/usrloc_admin.xml b/modules_k/usrloc/doc/usrloc_admin.xml index ff040a5..2b6d307 100644 --- a/modules_k/usrloc/doc/usrloc_admin.xml +++ b/modules_k/usrloc/doc/usrloc_admin.xml @@ -57,8 +57,8 @@ </listitem> <listitem> <para> - <emphasis>contact and patch based</emphasis> - it an extension - of the first case - the contact and patch must matched as + <emphasis>contact and path based</emphasis> - it an extension + of the first case - the contact and path must matched as string; the cseg must be higher than the previous one - so be careful how you deal with REGISTER retransmissions in this case.

14 years, 9 months

git:master: modules_k/usrloc Added Contact and Path matching mode

by Marius Zbihlei

Module: sip-router Branch: master Commit: d6fbd5a146c01aa0fa856fcb4279d9883f3b12b9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d6fbd5a… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Apr 21 13:16:45 2010 +0300 modules_k/usrloc Added Contact and Path matching mode The binding is matched against Contact and Path Patch provided by Bayan Towfiq ( bayan at flowroute dot com ) --- modules_k/registrar/save.c | 8 ++++---- modules_k/usrloc/doc/usrloc_admin.xml | 18 +++++++++++++++++- modules_k/usrloc/ul_mi.c | 7 ++++--- modules_k/usrloc/ul_mod.c | 1 + modules_k/usrloc/ul_mod.h | 1 + modules_k/usrloc/urecord.c | 31 ++++++++++++++++++++++++++++++- modules_k/usrloc/urecord.h | 8 +++++--- 7 files changed, 62 insertions(+), 12 deletions(-) diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c index 71c8021..4483972 100644 --- a/modules_k/registrar/save.c +++ b/modules_k/registrar/save.c @@ -420,7 +420,7 @@ static inline int insert_contacts(struct sip_msg* _m, contact_t* _c, } if ( r->contacts==0 || - ul.get_ucontact(r, &_c->uri, ci->callid, ci->cseq+1, &c)!=0 ) { + ul.get_ucontact(r, &_c->uri, ci->callid, ci->path, ci->cseq+1, &c) != 0) { if (ul.insert_ucontact( r, &_c->uri, ci, &c) < 0) { rerrno = R_UL_INS_C; LM_ERR("failed to insert contact\n"); @@ -494,8 +494,8 @@ static int test_max_contacts(struct sip_msg* _m, urecord_t* _r, contact_t* _c, for( ; _c ; _c = get_next_contact(_c) ) { /* calculate expires */ calc_contact_expires(_m, _c->expires, &e); - - ret = ul.get_ucontact( _r, &_c->uri, ci->callid, ci->cseq, &cont); + + ret = ul.get_ucontact( _r, &_c->uri, ci->callid, ci->path, ci->cseq, &cont); if (ret==-1) { LM_ERR("invalid cseq for aor <%.*s>\n",_r->aor.len,_r->aor.s); rerrno = R_INV_CSEQ; @@ -575,7 +575,7 @@ static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, calc_contact_expires(_m, _c->expires, &expires); /* search for the contact*/ - ret = ul.get_ucontact( _r, &_c->uri, ci->callid, ci->cseq, &c); + ret = ul.get_ucontact( _r, &_c->uri, ci->callid, ci->path, ci->cseq, &c); if (ret==-1) { LM_ERR("invalid cseq for aor <%.*s>\n",_r->aor.len,_r->aor.s); rerrno = R_INV_CSEQ; diff --git a/modules_k/usrloc/doc/usrloc_admin.xml b/modules_k/usrloc/doc/usrloc_admin.xml index fc7d730..ff040a5 100644 --- a/modules_k/usrloc/doc/usrloc_admin.xml +++ b/modules_k/usrloc/doc/usrloc_admin.xml @@ -48,13 +48,22 @@ </listitem> <listitem> <para> - <emphasis>contact nad callid based</emphasis> - it an extension + <emphasis>contact and callid based</emphasis> - it an extension of the first case - the contact and callid must matched as string; the cseg must be higher than the previous one - so be careful how you deal with REGISTER retransmissions in this case. </para> </listitem> + <listitem> + <para> + <emphasis>contact and patch based</emphasis> - it an extension + of the first case - the contact and patch must matched as + string; the cseg must be higher than the previous one - so be + careful how you deal with REGISTER retransmissions in this + case. + </para> + </listitem> </itemizedlist> <para> How to control/select the contact maching algorithm, please see the @@ -582,6 +591,13 @@ modparam("usrloc", "db_mode", 2) matching algorithm. </para> </listitem> + <listitem> + <para><emphasis>2</emphasis> - CONTACT and PATH based + matching algorithm. This mode is like mode <emphasis>0</emphasis> + but allows for duplicate contacts from differing paths. + If no path is available, it defaults to mode 0. + </para> + </listitem> </itemizedlist> <para> <emphasis> diff --git a/modules_k/usrloc/ul_mi.c b/modules_k/usrloc/ul_mi.c index 1f1f0d9..bb7d50a 100644 --- a/modules_k/usrloc/ul_mi.c +++ b/modules_k/usrloc/ul_mi.c @@ -52,7 +52,8 @@ static str mi_ul_cid = str_init("dfjrewr12386fd6-343(a)openser.mi"); /*! user agent used for ul_add */ static str mi_ul_ua = str_init("SIP Router MI Server"); - +/*! path used for ul_add and ul_rm_contact */ +static str mi_ul_path = str_init("dummypath"); /************************ helper functions ****************************/ @@ -312,7 +313,7 @@ struct mi_root* mi_usrloc_rm_contact(struct mi_root *cmd, void *param) } contact = &node->next->next->value; - ret = get_ucontact( rec, contact, &mi_ul_cid, MI_UL_CSEQ+1, &con); + ret = get_ucontact( rec, contact, &mi_ul_cid, &mi_ul_path, MI_UL_CSEQ+1, &con); if (ret < 0) { unlock_udomain( dom, aor); return 0; @@ -518,7 +519,7 @@ struct mi_root* mi_usrloc_add(struct mi_root *cmd, void *param) goto lock_error; c = 0; } else { - if (get_ucontact( r, contact, &mi_ul_cid, MI_UL_CSEQ+1, &c) < 0) + if (get_ucontact( r, contact, &mi_ul_cid, &mi_ul_path, MI_UL_CSEQ+1, &c) < 0) goto lock_error; } diff --git a/modules_k/usrloc/ul_mod.c b/modules_k/usrloc/ul_mod.c index 865763a..3c74008 100644 --- a/modules_k/usrloc/ul_mod.c +++ b/modules_k/usrloc/ul_mod.c @@ -264,6 +264,7 @@ static int mod_init(void) switch (matching_mode) { case CONTACT_ONLY: case CONTACT_CALLID: + case CONTACT_PATH: break; default: LM_ERR("invalid matching mode %d\n", matching_mode); diff --git a/modules_k/usrloc/ul_mod.h b/modules_k/usrloc/ul_mod.h index c181111..fbe56cb 100644 --- a/modules_k/usrloc/ul_mod.h +++ b/modules_k/usrloc/ul_mod.h @@ -84,6 +84,7 @@ extern db_func_t ul_dbf; */ #define CONTACT_ONLY (0) #define CONTACT_CALLID (1) +#define CONTACT_PATH (2) extern int matching_mode; diff --git a/modules_k/usrloc/urecord.c b/modules_k/usrloc/urecord.c index fe01f9f..e0ff894 100644 --- a/modules_k/usrloc/urecord.c +++ b/modules_k/usrloc/urecord.c @@ -552,18 +552,44 @@ static inline struct ucontact* contact_callid_match( ucontact_t* ptr, return 0; } + /*! ++ * \brief Match a contact record to a contact string and path ++ * \param ptr contact record ++ * \param _c contact string ++ * \param _path path ++ * \return ptr on successfull match, 0 when they not match ++ */ +static inline struct ucontact* contact_path_match( ucontact_t* ptr, str* _c, str *_path) +{ + /* if no path is preset (in REGISTER request) or use_path is not configured + in registrar module, default to contact_match() */ + if( _path == NULL) return contact_match(ptr, _c); + + while(ptr) { + if ( (_c->len==ptr->c.len) && (_path->len==ptr->path.len) + && !memcmp(_c->s, ptr->c.s, _c->len) + && !memcmp(_path->s, ptr->path.s, _path->len) + ) { + return ptr; + } + + ptr = ptr->next; + } + return 0; +} /*! * \brief Get pointer to ucontact with given contact * \param _r record where to search the contacts * \param _c contact string * \param _callid callid + * \param _path path * \param _cseq CSEQ number * \param _co found contact * \return 0 - found, 1 - not found, -1 - invalid found, * -2 - found, but to be skipped (same cseq) */ -int get_ucontact(urecord_t* _r, str* _c, str* _callid, int _cseq, +int get_ucontact(urecord_t* _r, str* _c, str* _callid, str* _path, int _cseq, struct ucontact** _co) { ucontact_t* ptr; @@ -581,6 +607,9 @@ int get_ucontact(urecord_t* _r, str* _c, str* _callid, int _cseq, ptr = contact_callid_match( _r->contacts, _c, _callid); no_callid = 1; break; + case CONTACT_PATH: + ptr = contact_path_match( _r->contacts, _c, _path); + break; default: LM_CRIT("unknown matching_mode %d\n", matching_mode); return -1; diff --git a/modules_k/usrloc/urecord.h b/modules_k/usrloc/urecord.h index 53a79b9..610306f 100644 --- a/modules_k/usrloc/urecord.h +++ b/modules_k/usrloc/urecord.h @@ -177,15 +177,17 @@ int delete_ucontact(urecord_t* _r, struct ucontact* _c); * \param _r record where to search the contacts * \param _c contact string * \param _callid callid + * \param _path path * \param _cseq CSEQ number * \param _co found contact * \return 0 - found, 1 - not found, -1 - invalid found, * -2 - found, but to be skipped (same cseq) */ -typedef int (*get_ucontact_t)(urecord_t* _r, str* _c, str* _callid, int _cseq, +typedef int (*get_ucontact_t)(urecord_t* _r, str* _c, str* _callid, + str* _path, int _cseq, struct ucontact** _co); -int get_ucontact(urecord_t* _r, str* _c, str* _callid, int _cseq, +int get_ucontact(urecord_t* _r, str* _c, str* _callid, str* _path, + int _cseq, struct ucontact** _co); - #endif

14 years, 9 months

git:master: core: The patch allows ser started in daemonize mode to return the proper error code .

by Marius Zbihlei

Module: sip-router Branch: master Commit: 9167c186505abdc122d221dd43f10a261a1b3845 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9167c18… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Apr 21 12:35:16 2010 +0300 core: The patch allows ser started in daemonize mode to return the proper error code. If for example the listen address is not local or a DB connection uses an invalid password, then the command "ser" would return 0 (OK) anyway (even if it fails to start).This occurs because all those checking (socket, DB connections...) are performed *after* invoking daemonize() so the parent process (which could be invoked by "/etc/init.d/ser start") returns 0 knowing nothing about those errors. This caused some management tools like HeartBeat to work badly. The patch is simple: the master process opens a pipe, and reads from one end. The forked main process, after the correct initialization of components, will write some bytes to the writting end. In case of error, no data is written to the pipe. The master process waits for 10 seconds, or else it considers the main process blocked and exits with a different error code( -2 ). In this case, it is left for the user to ensure that all ser children are killed correctly. Patch initially from Iñaki Baz Castillo. --- daemonize.c | 10 +++++--- daemonize.h | 2 +- main.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 65 insertions(+), 7 deletions(-) diff --git a/daemonize.c b/daemonize.c index dee40ee..d39cbb3 100644 --- a/daemonize.c +++ b/daemonize.c @@ -82,7 +82,7 @@ (normally it shouldn't be bigger than 3) */ /*! \brief daemon init, return 0 on success, -1 on error */ -int daemonize(char* name) +int daemonize(char* name, int daemon_status_fd_input) { FILE *pid_stream; pid_t pid; @@ -113,8 +113,8 @@ int daemonize(char* name) LOG(L_CRIT, "Cannot fork:%s\n", strerror(errno)); goto error; }else if (pid!=0){ - /*parent process => exit */ - exit(0); + /*parent process => return 0 */ + return 0; } /* become session leader to drop the ctrl. terminal */ if (setsid()<0){ @@ -211,9 +211,11 @@ int daemonize(char* name) /* continue, leave it open */ }; - /* close any open file descriptors */ + /* close all but the daemon_status_fd_input as the main process + must still write into it to tell the parent to exit with 0 */ closelog(); for (r=3;r<MAX_FD; r++){ + if(r != daemon_status_fd_input) close(r); } diff --git a/daemonize.h b/daemonize.h index d1964d2..af71a1b 100644 --- a/daemonize.h +++ b/daemonize.h @@ -30,7 +30,7 @@ #ifndef _daemonize_h #define _daemonize_h -int daemonize(char* name); +int daemonize(char* name, int daemon_status_fd_input); int do_suid(); int increase_open_fds(int target); int set_core_dump(int enable, int size); diff --git a/main.c b/main.c index 23db569..7d28bcd 100644 --- a/main.c +++ b/main.c @@ -73,6 +73,9 @@ * 2008-08-08 sctp support (andrei) * 2008-08-19 -l support for mmultihomed addresses/addresses lists * (e.g. -l (eth0, 1.2.3.4, foo.bar) ) (andrei) + * 2010-04-19 added daemon_status_fd pipe to communicate the parent process with + the main process in daemonize mode, so the parent process can return + the proper exit status code (ibc) */ /*! @@ -254,6 +257,10 @@ Options:\n\ #endif ; +/*! pipe to communicate the parent and main processes when daemonizing in order + to get the proper exit status code */ +int daemon_status_fd[2]; + /* print compile-time constants */ void print_ct_constants() { @@ -1565,7 +1572,14 @@ int main_loop() } #endif DBG("Expect maximum %d open fds\n", get_max_open_fds()); - + /* in daemonize mode write into daemon_status_fd[1] so the parent process + will exit with 0 */ + if (!dont_fork){ + if (write(daemon_status_fd[1], "go", 2)<0){ + LM_CRIT("error writing into daemon_status_fd[1]\n"); + goto error; + } + } for(;;){ handle_sigs(); pause(); @@ -1634,6 +1648,13 @@ int main(int argc, char** argv) int dont_fork_cnt; struct name_lst* n_lst; + /* variables to control the master process exit status */ + int fd_nbytes; + char fd_readbuffer[5]; + struct timeval tval; + fd_set fds; + int res; + /*init*/ time(&up_since); creator_pid = getpid(); @@ -1827,6 +1848,7 @@ try_again: debug_save = default_core_cfg.debug; if ((yyparse()!=0)||(cfg_errors)){ fprintf(stderr, "ERROR: bad config file (%d errors)\n", cfg_errors); + goto error; } if (cfg_warnings){ @@ -2170,7 +2192,41 @@ try_again: #endif /* USE_SCTP */ /* init_daemon? */ if (!dont_fork){ - if ( daemonize((log_name==0)?argv[0]:log_name) <0 ) goto error; + if (pipe(daemon_status_fd)<0){ + LM_CRIT("could not create pipe(daemon_status_fd), exiting...\n"); + goto error; + } + if (daemonize((log_name==0)?argv[0]:log_name, daemon_status_fd[1]) < 0) + goto error; + /* parent process? then wait the main process to write into the pipe */ + if (getpid() == creator_pid) { + /* close the output side of the pipe */ + close(daemon_status_fd[1]); +#define MASTER_MAX_SLEEP 10 +try_select_again: tval.tv_usec = 0; + tval.tv_sec = MASTER_MAX_SLEEP;/* 10 seconds */ + FD_ZERO(&fds); + FD_SET(daemon_status_fd[0], &fds); + res = select(daemon_status_fd[0]+1, &fds, NULL, NULL, &tval); + if(res == -1 && errno == EINTR && time(NULL)-up_since < 2*MASTER_MAX_SLEEP) + goto try_select_again; + + switch(res){ + case -1: /* error on select*/ LOG(L_ERR, "Error in select in master process\n");exit(-1); + case 0: /* timeout */ LOG(L_ERR, "timeout in select in master process\n");exit(-2); + default:{ + fd_nbytes = read(daemon_status_fd[0], fd_readbuffer, 5); + /* something read, ok, exit with 0 */ + if (fd_nbytes > 0) + exit(0); + /* nothing read, error */ + else{ + LOG(L_ERR, "Main process exited before writing to pipe\n"); + exit(-1); + } + } + } + } } if (install_sigs() != 0){ fprintf(stderr, "ERROR: could not install the signal handlers\n");

14 years, 9 months

[tracker] Task opened: downgrade tcp_send ERRORs

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 - Juha Heinanen (jh) Attached to Project - sip-router Summary - downgrade tcp_send ERRORs Task Type - Improvement Category - tm Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - When sr fails to send a request to a TCP destination, it prints these kind of error messages to syslog: Apr 20 13:23:10 localhost /usr/sbin/sip-proxy[22508]: INFO: Routing first INVITE to <sip:foo at 192.98.102.10:4040;transport=tcp> and <<null>> Apr 20 13:23:10 localhost /usr/sbin/sip-proxy[22508]: ERROR: tm [../../forward.h:169]: msg_send: ERROR: tcp_send failed Apr 20 13:23:10 localhost /usr/sbin/sip-proxy[22508]: ERROR: tm [t_fwd.c:1249]: ERROR: t_send_branch: sending request on branch 0 failed Since there is no real error (destination just happens to be unreachable), it would be desirable to print these messages as NOTICEs or WARNINGs rather than ERRORs. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=68 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.

14 years, 9 months

[tracker] Assignee added: downgrade tcp_send ERRORs

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#68 - downgrade tcp_send ERRORs User who did this - Juha Heinanen (jh) http://sip-router.org/tracker/index.php?do=details&task_id=68 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.

14 years, 9 months

git:master: modules/enum: '&kamailio; ' => '&siprouter; ' in doc.

by Juha Heinanen

Module: sip-router Branch: master Commit: 615ed016d7e846990211bec095d0f7ecee18f112 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=615ed01… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Apr 21 11:18:45 2010 +0300 modules/enum: '&kamailio;' => '&siprouter;' in doc. --- modules/enum/README | 2 +- modules/enum/doc/enum_admin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/enum/README b/modules/enum/README index 1585dbe..b29e1c0 100644 --- a/modules/enum/README +++ b/modules/enum/README @@ -157,7 +157,7 @@ modparam("enum", "domain_suffix", "e1234.arpa.") Note - Currently Kamailio does not support tel URIs. This means that at + Currently SIP Router does not support tel URIs. This means that at present tel_uri_params is appended as URI parameters to every URI. Default value is “” diff --git a/modules/enum/doc/enum_admin.xml b/modules/enum/doc/enum_admin.xml index 0c031c6..050b1ea 100644 --- a/modules/enum/doc/enum_admin.xml +++ b/modules/enum/doc/enum_admin.xml @@ -131,7 +131,7 @@ modparam("enum", "domain_suffix", "e1234.arpa.") </para> <note> <para> - Currently &kamailio; does not support tel URIs. This means that at present + Currently &siprouter; does not support tel URIs. This means that at present tel_uri_params is appended as URI parameters to every URI. </para> </note>

14 years, 9 months

git:master: modules/mediaproxy: added note on required Mediaproxy version

by Juha Heinanen

Module: sip-router Branch: master Commit: 192228ca80f0c78481a9e768d82707ed5aa80ba7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=192228c… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Apr 21 11:14:15 2010 +0300 modules/mediaproxy: added note on required Mediaproxy version - Added note that this modules Mediaproxy version 1.4.2 or higher. - Changed '&kamailio;' string to '&siprouter;' string. --- modules/mediaproxy/README | 53 ++++++++++++++------------- modules/mediaproxy/doc/mediaproxy_admin.xml | 17 +++++---- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/modules/mediaproxy/README b/modules/mediaproxy/README index 6d5efc3..56d7e83 100644 --- a/modules/mediaproxy/README +++ b/modules/mediaproxy/README @@ -10,7 +10,7 @@ Dan Pascu <dan(a)ag-projects.com> - Copyright � 2004 Dan Pascu + Copyright © 2004 Dan Pascu Revision History Revision $Revision$ $Date$ __________________________________________________________________ @@ -24,7 +24,7 @@ Dan Pascu 3. Features 4. Dependencies - 4.1. Kamailio Modules + 4.1. SIP Router Modules 4.2. External Libraries or Applications 5. Exported parameters @@ -65,7 +65,7 @@ Chapter 1. Admin Guide 3. Features 4. Dependencies - 4.1. Kamailio Modules + 4.1. SIP Router Modules 4.2. External Libraries or Applications 5. Exported parameters @@ -86,7 +86,7 @@ Chapter 1. Admin Guide 1. Overview - Mediaproxy is an Kamailio module that is designed to allow automatic + Mediaproxy is an SIP Router module that is designed to allow automatic NAT traversal for the majority of existing SIP clients. This means that there will be no need to configure anything in particular on the NAT box to allow these clients to work behind NAT when using the mediaproxy @@ -100,28 +100,28 @@ Chapter 1. Admin Guide they think they talk directly with each other. Mediaproxy consists of 2 components: - * The Kamailio mediaproxy module + * The SIP Router mediaproxy module * An external application called MediaProxy which employs a dispatcher and multiple distributed media relays. This is available from http://ag-projects.com/MediaProxy.html (version 2.0.0 or newer is required by this module). - The mediaproxy dispatcher runs on the same machine as Kamailio and its - purpose is to select a media relay for a call. The media relay may run - on the same machine as the dispatcher or on multiple remote hosts and - its purpose is to forward the streams between the calling parties. To - find out more about the architecture of MediaProxy please read the + The mediaproxy dispatcher runs on the same machine as SIP Router and + its purpose is to select a media relay for a call. The media relay may + run on the same machine as the dispatcher or on multiple remote hosts + and its purpose is to forward the streams between the calling parties. + To find out more about the architecture of MediaProxy please read the documentation that comes with it. To be able to act as a relay between the 2 user agents, the machine(s) running the module/proxy server must have a public IP address. - Kamailio will ask the media relay to allocate as many ports as there + SIP Router will ask the media relay to allocate as many ports as there are media streams in the SDP offer and answer. The media relay will - send back to Kamailio the IP address and port(s) for them. Then - Kamailio will replace the original contact IP and RTP ports from the - SDP messages with the ones provided by the media relay. By doing this, - both user agents will try to contact the media relay instead of + send back to SIP Router the IP address and port(s) for them. Then SIP + Router will replace the original contact IP and RTP ports from the SDP + messages with the ones provided by the media relay. By doing this, both + user agents will try to contact the media relay instead of communicating directly with each other. Once the user agents contact the media relay, it will record the addresses they came from and will know where to forward packets received from the other endpoint. This is @@ -146,10 +146,10 @@ Chapter 1. Admin Guide 4. Dependencies - 4.1. Kamailio Modules + 4.1. SIP Router Modules 4.2. External Libraries or Applications -4.1. Kamailio Modules +4.1. SIP Router Modules The following modules must be loaded before this module: * dialog module - if engage_media_proxy is used (see below the @@ -158,8 +158,9 @@ Chapter 1. Admin Guide 4.2. External Libraries or Applications The following libraries or applications must be installed before - running Kamailio with this module loaded: - * None. + running SIP Router with this module loaded: + * Mediaproxy version 2.4.2 or higher (but not necessarily on the same + host as SIP Router). 5. Exported parameters @@ -179,7 +180,7 @@ Chapter 1. Admin Guide mediaproxy is disabled, calls to its functions will have no effect, allowing you to use the same configuration without changes. - Default value is "0". + Default value is “0”. Example 1.1. Setting the disable parameter ... @@ -191,7 +192,7 @@ modparam("mediaproxy", "disable", 1) It is the path to the filesystem socket where the mediaproxy dispatcher listens for commands from the module. - Default value is "/var/run/mediaproxy/dispatcher.sock". + Default value is “/var/run/mediaproxy/dispatcher.sock”. Example 1.2. Setting the mediaproxy_socket parameter ... @@ -204,7 +205,7 @@ modparam("mediaproxy", "mediaproxy_socket", "/var/run/mediaproxy/dispatcher.sock How much time (in milliseconds) to wait for an answer from the mediaproxy dispatcher. - Default value is "500". + Default value is “500”. Example 1.3. Setting the mediaproxy_timeout parameter ... @@ -226,7 +227,7 @@ modparam("mediaproxy", "mediaproxy_timeout", 500) to get the correct NAT IP address from where the SIP signaling originated. - Default value is "$avp(s:signaling_ip)". + Default value is “$avp(s:signaling_ip)”. Example 1.4. Setting the signaling_ip_avp parameter ... @@ -241,7 +242,7 @@ modparam("mediaproxy", "signaling_ip_avp", "$avp(s:nat_ip)") before calling use_media_proxy(), it will be preferred by the dispatcher over the normal selection algorithm. - Default value is "$avp(s:media_relay)". + Default value is “$avp(s:media_relay)”. Example 1.5. Setting the media_relay_avp parameter ... @@ -256,7 +257,7 @@ modparam("mediaproxy", "media_relay_avp", "$avp(s:media_relay)") selected then a low priority candidate will be added and if 'high-priority' is selected a high priority one. - Default value is "none". + Default value is “none”. Example 1.6. Setting the ice_candidate parameter ... @@ -273,7 +274,7 @@ modparam("mediaproxy", "ice_candidate", "low-priority") tm module to '1', and if the AVP is not set, the default value will be used. - Default value is "$avp(s:ice_candidate)". + Default value is “$avp(s:ice_candidate)”. Example 1.7. Setting the ice_candidate_avp parameter ... diff --git a/modules/mediaproxy/doc/mediaproxy_admin.xml b/modules/mediaproxy/doc/mediaproxy_admin.xml index d4ee4ad..992af06 100644 --- a/modules/mediaproxy/doc/mediaproxy_admin.xml +++ b/modules/mediaproxy/doc/mediaproxy_admin.xml @@ -17,7 +17,7 @@ <section> <title>Overview</title> <para> - Mediaproxy is an &kamailio; module that is designed to allow automatic + Mediaproxy is an &siprouter; module that is designed to allow automatic NAT traversal for the majority of existing SIP clients. This means that there will be no need to configure anything in particular on the NAT box to allow these clients to work behind NAT when using @@ -38,7 +38,7 @@ Mediaproxy consists of 2 components: <itemizedlist> <listitem> - <para>The &kamailio; mediaproxy module</para> + <para>The &siprouter; mediaproxy module</para> </listitem> <listitem> <para> @@ -52,7 +52,7 @@ </para> <para> - The mediaproxy dispatcher runs on the same machine as &kamailio; + The mediaproxy dispatcher runs on the same machine as &siprouter; and its purpose is to select a media relay for a call. The media relay may run on the same machine as the dispatcher or on multiple remote hosts and its purpose is to forward the streams between the @@ -66,9 +66,9 @@ </para> <para> - &kamailio; will ask the media relay to allocate as many ports as there are + &siprouter; will ask the media relay to allocate as many ports as there are media streams in the SDP offer and answer. The media relay will send back - to &kamailio; the IP address and port(s) for them. Then &kamailio; will + to &siprouter; the IP address and port(s) for them. Then &siprouter; will replace the original contact IP and RTP ports from the SDP messages with the ones provided by the media relay. By doing this, both user agents will try to contact the media relay instead of communicating directly with each @@ -115,7 +115,7 @@ <section> <title>Dependencies</title> <section> - <title>&kamailio; Modules</title> + <title>&siprouter; Modules</title> <para> The following modules must be loaded before this module: <itemizedlist> @@ -133,11 +133,12 @@ <title>External Libraries or Applications</title> <para> The following libraries or applications must be installed before - running &kamailio; with this module loaded: + running &siprouter; with this module loaded: <itemizedlist> <listitem> <para> - <emphasis>None</emphasis>. + <emphasis>Mediaproxy version 2.4.2 or higher (but not + necessarily on the same host as &siprouter;)</emphasis>. </para> </listitem> </itemizedlist>

14 years, 9 months

git:master: modules/mediaproxy: some minor bug fixes and code cleanups

by Juha Heinanen

Module: sip-router Branch: master Commit: 635ac3061b55566b08d31cafcb75e716631c1096 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=635ac30… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Apr 21 10:55:53 2010 +0300 modules/mediaproxy: some minor bug fixes and code cleanups - Changed some comparisons to be case insensitive. - Renamed some variables. - Fixed testing of existence of to tag. - Some editorial cleanups. --- modules/mediaproxy/mediaproxy.c | 89 +++++++++++++++++++-------------------- 1 files changed, 43 insertions(+), 46 deletions(-) diff --git a/modules/mediaproxy/mediaproxy.c b/modules/mediaproxy/mediaproxy.c index 1308c8b..c2d072c 100644 --- a/modules/mediaproxy/mediaproxy.c +++ b/modules/mediaproxy/mediaproxy.c @@ -1,16 +1,15 @@ -/* $Id$ - * +/* * Copyright (C) 2004-2008 Dan Pascu * Copyright (C) 2009 Juha Heinanen (multipart hack) * - * This file is part of Kamailio, a free SIP server. + * This file is part of SIP-Router, a free SIP server. * - * Kamailio is free software; you can redistribute it and/or modify + * SIP-router 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, + * SIP-router 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. @@ -18,7 +17,6 @@ * 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 - * */ #include <stdio.h> @@ -79,7 +77,7 @@ MODULE_VERSION #endif // As Solaris does not have the MSG_NOSIGNAL flag for send(2) syscall, -//it is defined as 0 +// it is defined as 0 #ifndef MSG_NOSIGNAL # define MSG_NOSIGNAL 0 #endif @@ -501,21 +499,21 @@ get_cseq_number(struct sip_msg *msg, str *cseq) static str get_from_uri(struct sip_msg *msg) { - static str notfound = str_init("unknown"); + static str unknown = str_init("unknown"); str uri; char *ptr; if (parse_from_header(msg) < 0) { LM_ERR("cannot parse the From header\n"); - return notfound; + return unknown; } uri = get_from(msg)->uri; if (uri.len == 0) - return notfound; + return unknown; - if (strncmp(uri.s, "sip:", 4)==0) { + if (strncasecmp(uri.s, "sip:", 4)==0) { uri.s += 4; uri.len -= 4; } @@ -531,21 +529,21 @@ get_from_uri(struct sip_msg *msg) static str get_to_uri(struct sip_msg *msg) { - static str notfound = str_init("unknown"); + static str unknown = str_init("unknown"); str uri; char *ptr; if (!msg->to) { LM_ERR("missing To header\n"); - return notfound; + return unknown; } uri = get_to(msg)->uri; if (uri.len == 0) - return notfound; + return unknown; - if (strncmp(uri.s, "sip:", 4)==0) { + if (strncasecmp(uri.s, "sip:", 4)==0) { uri.s += 4; uri.len -= 4; } @@ -561,18 +559,18 @@ get_to_uri(struct sip_msg *msg) static str get_from_tag(struct sip_msg *msg) { - static str notfound = str_init(""); + static str undefined = str_init(""); str tag; if (parse_from_header(msg) < 0) { LM_ERR("cannot parse the From header\n"); - return notfound; + return undefined; } tag = get_from(msg)->tag_value; if (tag.len == 0) - return notfound; + return undefined; return tag; } @@ -581,23 +579,23 @@ get_from_tag(struct sip_msg *msg) static str get_to_tag(struct sip_msg *msg) { - static str notfound = str_init(""); + static str undefined = str_init(""); str tag; - if (!msg->to) { - LM_ERR("missing To header\n"); - return notfound; + if (msg->first_line.type==SIP_REPLY && msg->REPLY_STATUS<200) { + // Ignore the To tag for provisional replies + return undefined; } - if (msg->first_line.type==SIP_REPLY && msg->REPLY_STATUS<200) { - // Ignore the To tag for provisional replies - return notfound; + if (!msg->to) { + LM_ERR("missing To header\n"); + return undefined; } tag = get_to(msg)->tag_value; if (tag.len == 0) - return notfound; + return undefined; return tag; } @@ -606,7 +604,7 @@ get_to_tag(struct sip_msg *msg) static str get_user_agent(struct sip_msg* msg) { - static str notfound = str_init("unknown agent"); + static str unknown = str_init("unknown agent"); str block, server; char *ptr; @@ -616,21 +614,21 @@ get_user_agent(struct sip_msg* msg) } // If we can't find user-agent, look after the `Server' header - // This is a temporary hack. Normally it should be extracted by openser. + // This is a temporary hack. Normally it should be extracted by sip-router. block.s = msg->buf; block.len = msg->len; ptr = find_line_starting_with(&block, "Server:", True); if (!ptr) - return notfound; + return unknown; server.s = ptr + 7; server.len = findendline(server.s, block.s+block.len-server.s) - server.s; trim(&server); if (server.len == 0) - return notfound; + return unknown; return server; } @@ -657,12 +655,12 @@ get_signaling_ip(struct sip_msg* msg) static str get_media_relay(struct sip_msg* msg) { - static str notfound = str_init(""); + static str undefined = str_init(""); int_str value; if (!search_first_avp(media_relay_avp.type | AVP_VAL_STR, media_relay_avp.name, &value, NULL) || value.s.s==NULL || value.s.len==0) { - return notfound; + return undefined; } return value.s; @@ -672,6 +670,7 @@ get_media_relay(struct sip_msg* msg) // Functions to manipulate the SDP message body // + static int find_content_type_application_sdp(struct sip_msg *msg, str *sdp) { @@ -848,8 +847,8 @@ get_direction_attribute(str *block, str *default_direction) line.len = findendline(line.s, zone.s + zone.len - line.s) - line.s; if (line.len==8) { - if (strncmp(line.s, "sendrecv", 8)==0 || strncmp(line.s, "sendonly", 8)==0 || - strncmp(line.s, "recvonly", 8)==0 || strncmp(line.s, "inactive", 8)==0) { + if (strncasecmp(line.s, "sendrecv", 8)==0 || strncasecmp(line.s, "sendonly", 8)==0 || + strncasecmp(line.s, "recvonly", 8)==0 || strncasecmp(line.s, "inactive", 8)==0) { return line; } } @@ -865,14 +864,14 @@ get_direction_attribute(str *block, str *default_direction) static str get_rtcp_port_attribute(str *block) { - str zone, rtcp_port, notfound = {NULL, 0}; + str zone, rtcp_port, undefined = {NULL, 0}; char *ptr; int count; ptr = find_line_starting_with(block, "a=rtcp:", False); if (!ptr) - return notfound; + return undefined; zone.s = ptr + 7; zone.len = findendline(zone.s, block->s + block->len - zone.s) - zone.s; @@ -881,7 +880,7 @@ get_rtcp_port_attribute(str *block) if (count != 1) { LM_ERR("invalid `a=rtcp' line in SDP body\n"); - return notfound; + return undefined; } return rtcp_port; @@ -1611,8 +1610,7 @@ use_media_proxy(struct sip_msg *msg, char *dialog_id, ice_candidate_data *ice_da media_relay.len, media_relay.s, media_str); if (len >= sizeof(request)) { - LM_ERR("mediaproxy request is longer than %lu bytes\n", - (unsigned long)sizeof(request)); + LM_ERR("mediaproxy request is longer than %lu bytes\n", (unsigned long)sizeof(request)); return -1; } @@ -1791,8 +1789,7 @@ end_media_session(str callid, str from_tag, str to_tag) to_tag.len, to_tag.s); if (len >= sizeof(request)) { - LM_ERR("mediaproxy request is longer than %lu bytes\n", - (unsigned long)sizeof(request)); + LM_ERR("mediaproxy request is longer than %lu bytes\n", (unsigned long)sizeof(request)); return -1; } @@ -1953,7 +1950,7 @@ mod_init(void) { pv_spec_t avp_spec; int *param; - modparam_t type; + modparam_t type; // initialize the signaling_ip_avp structure if (signaling_ip_avp.spec.s==NULL || *(signaling_ip_avp.spec.s)==0) { @@ -2018,10 +2015,10 @@ mod_init(void) return -1; } - if (type != INT_PARAM) { - LM_CRIT("dlg_flag parameter found but with wrong type: %d\n", type); - return -1; - } + if (type != INT_PARAM) { + LM_CRIT("dlg_flag parameter found but with wrong type: %d\n", type); + return -1; + } dialog_flag = *param;

14 years, 9 months

git:kamailio_3.0: tm: kamailio flavour enables local-request event

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 11837819caad6234f337ac3843d720a9b664a330 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1183781… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 20 22:06:46 2010 +0200 tm: kamailio flavour enables local-request event - will execute event_route[tm:local-request] - reported by Alex Balashov (cherry picked from commit e4bd74c1718ea2218f2ad426537641cc9ef71d7d) --- modules/tm/Makefile | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/tm/Makefile b/modules/tm/Makefile index 0c60918..93807ca 100644 --- a/modules/tm/Makefile +++ b/modules/tm/Makefile @@ -11,4 +11,8 @@ NAME=tm.so LIBS= DEFS+= -DSER_MOD_INTERFACE +ifeq ($(INSTALL_FLAVOUR),kamailio) +DEFS+= -DWITH_EVENT_LOCAL_REQUEST +endif # INSTALL_FLAVOUR + include ../../Makefile.modules

14 years, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev