sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:carstenbock/rtpproxy: Added the changes to the RTP-Proxy as a patch, for easier review.

by Carsten Bock

Module: sip-router Branch: carstenbock/rtpproxy Commit: ab5549128fa86197ffdb8ed8773b9b016086b952 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ab55491… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Tue Aug 24 11:08:34 2010 +0200 Added the changes to the RTP-Proxy as a patch, for easier review. --- modules_k/rtpproxy/test/rtpproxy.patch | 337 ++++++++++++++++++++++++++++++++ 1 files changed, 337 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ab5…

14 years, 5 months

git:carstenbock/rtpproxy: - fixed identation

by Carsten Bock

Module: sip-router Branch: carstenbock/rtpproxy Commit: 262e55278e8b8b0e853f00465c38e3a9d13694f0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=262e552… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Thu Aug 19 19:55:01 2010 +0200 - fixed identation - added modified RTP-Proxy (rtpproxy.tar.gz, based on latest git, needs some cleanup) (please note, that you have to have libcurl-dev and libxmlrpc-client (same as for Kamailio-mi_xmlrpc) installed) - some simple testing files (sample config, command line parameters for pjsua (used for testing) and rtpproxy) --- modules_k/rtpproxy/rtpproxy.c | 2 +- modules_k/rtpproxy/test/exec_pjsua.txt | 3 + modules_k/rtpproxy/test/exec_rtpproxy.txt | 1 + modules_k/rtpproxy/test/kamailio.cfg | 359 +++++++++++++++++++++++++++++ modules_k/rtpproxy/test/rtpproxy.tar.gz | Bin 0 -> 1095581 bytes 5 files changed, 364 insertions(+), 1 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=262…

14 years, 5 months

git:carstenbock/dialog: - Use only call-id to get the h_id; otherwise dlg_list_dlg and dlg_terminate_dlg would require the from-tag, which is marked as optional in the docs

by Carsten Bock

Module: sip-router Branch: carstenbock/dialog Commit: da19a78a2bdfb85766bc1cb48fabf38c27732991 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da19a78… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Thu Aug 19 19:38:55 2010 +0200 - Use only call-id to get the h_id; otherwise dlg_list_dlg and dlg_terminate_dlg would require the from-tag, which is marked as optional in the docs - dlg_terminate_dlg does request the call-id to terminate a specific call (terminating all calls require a little more development) - match_downstream_dialog does only match by call-id (see first point) --- modules_k/dialog/dialog.c | 4 ++-- modules_k/dialog/dlg_hash.c | 31 +++++++------------------------ modules_k/dialog/dlg_hash.h | 20 +++++++++++++------- modules_k/dialog/doc/dialog_admin.xml | 11 ++--------- 4 files changed, 24 insertions(+), 42 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index dbfccb4..677cb41 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -233,7 +233,7 @@ static mi_export_t mi_cmds[] = { { "dlg_list", mi_print_dlgs, 0, 0, 0}, { "dlg_list_ctx", mi_print_dlgs_ctx, 0, 0, 0}, { "dlg_end_dlg", mi_terminate_dlg, 0, 0, 0}, - { "dlg_terminate_dlgs", mi_terminate_dlgs, 0, 0, 0}, + { "dlg_terminate_dlg", mi_terminate_dlgs, 0, 0, 0}, { "profile_get_size", mi_get_profile, 0, 0, 0}, { "profile_list_dlgs", mi_profile_list, 0, 0, 0}, { "dlg_bridge", mi_dlg_bridge, 0, 0, 0}, @@ -1201,7 +1201,7 @@ static void internal_rpc_print_single_dlg(rpc_t *rpc, void *c, int with_context) if (rpc->scan(c, ".S.S", &callid, &from_tag) < 2) return; - h_entry = core_hash( &callid, &from_tag, d_table->size); + h_entry = core_hash( &callid, 0, d_table->size); d_entry = &(d_table->entries[h_entry]); dlg_lock( d_table, d_entry); for( dlg = d_entry->first ; dlg ; dlg = dlg->next ) { diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index 80f506f..848ee66 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -240,7 +240,7 @@ struct dlg_cell* build_new_dlg( str *callid, str *from_uri, str *to_uri, memset( dlg, 0, len); dlg->state = DLG_STATE_UNCONFIRMED; - dlg->h_entry = core_hash( callid, from_tag->len?from_tag:0, d_table->size); + dlg->h_entry = core_hash( callid, 0, d_table->size); LM_DBG("new dialog on hash %u\n",dlg->h_entry); p = (char*)(dlg+1); @@ -470,7 +470,7 @@ struct dlg_cell* get_dlg( str *callid, str *ftag, str *ttag, unsigned int *dir, { struct dlg_cell *dlg; - if ((dlg = internal_get_dlg(core_hash(callid, ftag->len?ftag:0, + if ((dlg = internal_get_dlg(core_hash(callid, 0, d_table->size), callid, ftag, ttag, dir, del)) == 0 && (dlg = internal_get_dlg(core_hash(callid, ttag->len ?ttag:0, d_table->size), callid, ftag, ttag, dir, del)) == 0) { @@ -971,7 +971,7 @@ static inline struct mi_root* process_mi_params(struct mi_root *cmd_tree, return init_mi_tree( 400, MI_SSTR(MI_MISSING_PARM)); } - h_entry = core_hash( callid, from_tag, d_table->size); + h_entry = core_hash( callid, 0, d_table->size); d_entry = &(d_table->entries[h_entry]); dlg_lock( d_table, d_entry); @@ -1084,32 +1084,15 @@ struct mi_root * mi_terminate_dlgs(struct mi_root *cmd_tree, void *param ) if (rpl_tree) /* param error */ return rpl_tree; + if (dlg==NULL) + return init_mi_tree( 400, MI_SSTR(MI_MISSING_PARM)); rpl_tree = init_mi_tree( 200, MI_SSTR(MI_OK)); if (rpl_tree==0) return 0; - - if (dlg==NULL) { - LM_DBG("terminating %i dialogs\n", d_table->size); - - for( i=0 ; i<d_table->size ; i++ ) { - dlg_lock( d_table, &(d_table->entries[i]) ); - - for( dlg=d_table->entries[i].first ; dlg ; dlg=dlg->next ) { - if (dlg_bye_all(dlg, &headers)!=0) - goto error_all; - } - dlg_unlock( d_table, &(d_table->entries[i]) ); - } - } else { - if (dlg_bye_all(dlg, &headers)!=0) - goto error; - } + if (dlg_bye_all(dlg, &headers)!=0) + goto error; return rpl_tree; -error_all: - dlg_unlock( d_table, &(d_table->entries[i]) ); - free_mi_tree(rpl_tree); - return NULL; error: free_mi_tree(rpl_tree); return NULL; diff --git a/modules_k/dialog/dlg_hash.h b/modules_k/dialog/dlg_hash.h index aa70d84..b902fc0 100644 --- a/modules_k/dialog/dlg_hash.h +++ b/modules_k/dialog/dlg_hash.h @@ -328,7 +328,7 @@ struct mi_root * mi_print_dlgs(struct mi_root *cmd, void *param ); struct mi_root * mi_print_dlgs_ctx(struct mi_root *cmd, void *param ); /*! - * \brief Terminate all or selected dialogs via the MI interface + * \brief Terminate selected dialogs via the MI interface * \param cmd_tree MI command tree * \param param unused * \return mi node with the dialog information, or NULL on failure @@ -435,13 +435,19 @@ static inline int match_dialog(struct dlg_cell *dlg, str *callid, */ static inline int match_downstream_dialog(struct dlg_cell *dlg, str *callid, str *ftag) { - if(dlg==NULL || callid==NULL || ftag==NULL) - return 0; - if (dlg->callid.len!=callid->len || - dlg->tag[DLG_CALLER_LEG].len!=ftag->len || - strncmp(dlg->callid.s,callid->s,callid->len)!=0 || - strncmp(dlg->tag[DLG_CALLER_LEG].s,ftag->s,ftag->len)!=0) + if(dlg==NULL || callid==NULL) return 0; + if (ftag==NULL) { + if (dlg->callid.len!=callid->len || + strncmp(dlg->callid.s,callid->s,callid->len)!=0) + return 0; + } else { + if (dlg->callid.len!=callid->len || + dlg->tag[DLG_CALLER_LEG].len!=ftag->len || + strncmp(dlg->callid.s,callid->s,callid->len)!=0 || + strncmp(dlg->tag[DLG_CALLER_LEG].s,ftag->s,ftag->len)!=0) + return 0; + } return 1; } diff --git a/modules_k/dialog/doc/dialog_admin.xml b/modules_k/dialog/doc/dialog_admin.xml index 98769f5..bda7e76 100644 --- a/modules_k/dialog/doc/dialog_admin.xml +++ b/modules_k/dialog/doc/dialog_admin.xml @@ -1532,9 +1532,7 @@ if(dlg_get("abcdef", "123", "456")) <section> <title><varname>dlg_terminate_dlgs</varname></title> <para> - Terminates a dialog or of all dialogs (calls). If only - one dialogs is to be terminated, the dialog identifiers are to be passed - as parameter (callid and fromtag). + Terminates a singe dialog, identified by a Call-ID. </para> <para> Name: <emphasis>dlg_terminate_dlgs</emphasis> @@ -1542,8 +1540,7 @@ if(dlg_get("abcdef", "123", "456")) <para>Parameters:</para> <itemizedlist> <listitem><para> - <emphasis>callid</emphasis> (optional) - callid if a single - dialog to be terminated. + <emphasis>callid</emphasis> - callid of the dialog to be terminated. </para></listitem> <listitem><para> <emphasis>from_tag</emphasis> (optional, but cannot be present @@ -1559,10 +1556,6 @@ if(dlg_get("abcdef", "123", "456")) </para> <programlisting format="linespecific"> :dlg_terminate_dlgs:_reply_fifo_file_ - _empty_line_ - </programlisting> - <programlisting format="linespecific"> - :dlg_terminate_dlgs:_reply_fifo_file_ abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 </programlisting>

14 years, 5 months

git:kamailio_3.0: tls: fix state change while waiting for lock return

by Andrei Pelinescu-Onciul

Module: sip-router Branch: kamailio_3.0 Commit: 82fe7671c9c65cde0bd53bab615fa37b627fe3c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82fe767… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Aug 20 12:22:56 2010 +0200 tls: fix state change while waiting for lock return tls_h_fix_read_conn() did not return the right thing if the state changed while waiting for the lock (the fall-through return was error instead of success). Reported-by: Couprie Geoffroy geoffroy couprie atosorigin com (cherry picked from commit 513c21f67f88484dd12dd6adce6d6ddc7fb60c31) --- modules/tls/tls_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index 6d32af6..52b62e3 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -971,7 +971,7 @@ int tls_h_fix_read_conn(struct tcp_connection *c) int ret; struct tls_extra_data* tls_c; - ret = -1; + ret = 1; tls_c = 0; if (unlikely(c->extra_data==0)){ lock_get(&c->write_lock);

14 years, 5 months

git:sr_3.0: tls: fix state change while waiting for lock return

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 513c21f67f88484dd12dd6adce6d6ddc7fb60c31 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=513c21f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Aug 20 12:22:56 2010 +0200 tls: fix state change while waiting for lock return tls_h_fix_read_conn() did not return the right thing if the state changed while waiting for the lock (the fall-through return was error instead of success). Reported-by: Couprie Geoffroy geoffroy couprie atosorigin com --- modules/tls/tls_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index 6d32af6..52b62e3 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -971,7 +971,7 @@ int tls_h_fix_read_conn(struct tcp_connection *c) int ret; struct tls_extra_data* tls_c; - ret = -1; + ret = 1; tls_c = 0; if (unlikely(c->extra_data==0)){ lock_get(&c->write_lock);

14 years, 5 months

NOTIFY being sent through UDP instead of TCP

by nikita

Hello list, I have some trouble with the presence module, I'm registering and subscribing to a presentity through TCP, and kamailio is sending me NOTIFY to the correct ip/port, but through UDP. I have checked in modules_k/presence/notify.c::1578, the value of the dialog's proto field is PROTO_TCP. but It's looke like that the function modules/tm/uac.c:t_uac_prepare() is trying to guess the transport (in ut.h at line 319 the function sip_hostport2su choose UDP as transport) instead of using the one present in the dialog. And as result I'm getting this warning and the NOTIFY through the wrong transport: 1(28921) WARNING: <core> [forward.c:248]: WARNING: get_send_socket: protocol/port mismatch It's maybe a foolishness from my part but why can't we just use the dialog's transport for the notify request, so it will be the same transport as subscribe ? In forward.c:242, when we find that force_send_socket->proto != guessed_proto, why we don't use the force_send_socket proto ? What do you think about it ? If someone want to take a closer look, I can post a sipp scenario which reproduce this issue. Thanks by advance, -- Nikita

14 years, 5 months

git:master: core: daemon status/pipe fixes & interface changes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 83e91df1441b671b358efa0f1919e8ecb122cebf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=83e91df… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 19 20:03:54 2010 +0200 core: daemon status/pipe fixes & interface changes - moved most of the daemon status stuff to daemonize.[ch]. - nicer interface (e.g. daemon_status_send(code)) - send/read only 1 byte which will be used as exit code - send an error status on error (fixes "Main process exited before writing to pipe" error message) - disabled the timeout. Not needed (now a status is sent always and even an unlikely process crash before sending it is detected via the read() failure) and very hard to find a good value (some setups start very slow). - close the pipe "send" fd in processes not needing it - attempt to send back status only if dont_daemonize is not set (not only if dont_fork==0, it is possible to have forking enabled, but daemonize disabled: ser -DD) - BSDed daemonize.[ch] and pt.[ch] --- daemonize.c | 206 +++++++++++++++++++++++++++++++++++++++++++++++++++------- daemonize.h | 36 ++++++----- main.c | 74 ++++++--------------- pt.c | 43 +++++-------- pt.h | 35 ++++------ 5 files changed, 253 insertions(+), 141 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=83e…

14 years, 5 months

git:kamailio_3.0: PKG: Debian changelog updates

by Jon Bonilla

Module: sip-router Branch: kamailio_3.0 Commit: 938b4fac168309d4b5e774b4e3a1bc6bf1f7ae53 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=938b4fa… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Fri Aug 20 14:05:12 2010 +0200 PKG: Debian changelog updates --- pkg/kamailio/debian-etch/changelog | 104 +++++++++++++++++++++++++++++++++ pkg/kamailio/debian-squeeze/changelog | 104 +++++++++++++++++++++++++++++++++ pkg/kamailio/debian/changelog | 102 +++++++++++++++++++++++++++++++- 3 files changed, 308 insertions(+), 2 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=938…

14 years, 5 months

git:refs/tags/sr_3.0.3: Tag sr_3.0.3: Bugfixes, documentation updates and DragonFly BSD support.

by Andrei Pelinescu-Onciul

Module: sip-router Branch: refs/tags/sr_3.0.3 Tag: 7b3cac86a40d9c88b027efbc5c1cd24f02ffcedd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=tag;h=7b3cac86a4… Tagger: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 19 21:12:57 2010 +0200 Bugfixes, documentation updates and DragonFly BSD support. Among the most important/critical bugfixes: - *BSD compile/install fixes - tcp fix fd passing bug (30fabfb9c). In worst case scenarios (very heavy traffic and connections opened and closed very quickly) it is possible that some processes will remain blocked while trying to send on tcp. - *BSD specific tcp fixes (ea37f13, ef1e1b4a, 0a38c9ab, 4cfd8e1d). Under very heavy traffic some of these can cause crashes. - memory leak (pkg) in some tm script functions (ebe29085) - various modules_k/dialog fixes - ser radius modules revived (k ones cannot be used with ser auth module): 5d214e8 Roughly synchronized with kamailio 3.0.3 (except packaging, xavps and the warning headers default).

14 years, 5 months

git:sr_3.0: make: version number set to 3.0.3

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 5d7ea16b9f95ead073d2da00bc71c78ea57aeee9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d7ea16… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 19 20:46:40 2010 +0200 make: version number set to 3.0.3 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index c3614fc..9e8de09 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -149,7 +149,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) #version number VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 2 +SUBLEVEL = 3 EXTRAVERSION = # memory debugger switcher

14 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev