sr-dev January 2011

sr-dev@lists.kamailio.org

14 participants
226 discussions

by Juha Heinanen

i have tried to enable sctp by including in debian/rules SCTP=1 and by including SCTP=$(SCTP) in make params. in cfg file, i have enable_sctp=1 but when i start sr, it does not report listening on sctp, only udp, tcp, and tls. i have not found anything about sctp in sr README/INSTALL etc files in source dir. question: how to enable sctp? -- juha

13 years, 11 months

New commits on branch 3.1

by Daniel-Constantin Mierla

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=622c16f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 13:17:26 2011 +0100 pkg/deb(k): removed rls from excluded list - patch by Klaus Darilion (cherry picked from commit 5d205c718032511a0cd1d29830bd0a0e9a0c8e70) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0cfbb69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 13:15:32 2011 +0100 xcap_server: fix len for 'uri' comparison - patch by Klaus Darilion (cherry picked from commit 9f2919ad77a16787f59a7f99c98597fb0176806c) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6dbcb60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 12:59:41 2011 +0100 rls(k): documented server_address parameter - patch by Klaus Darilion (cherry picked from commit 6d17c7421464a85ba5cf10f8c52d868fca5d3f43) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf92c37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 12:47:37 2011 +0100 rls(k): use server_address paramter as contact in reply - server_address was just defined as parameter, but not used at all - server_address defines the rls server address to be set in Contact header of 200 replies. It has to be a valid SIP URI - fix cseq stale check - remove Max-Forward header because it is automatically added and use Suppoted instead of Support for header name with supported events - patch by Klaus Darilion (cherry picked from commit 436b9532e0bdfd115705a6ae5300aa7b2c1729fe) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=21b0e85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 12:45:58 2011 +0100 rls(k): added CRLF for Subscription-State header - for the case of subscrition termination on timeout, the header was missing CRLF to its end - patch by Klaus Darilion (cherry picked from commit 7925ae1a9ae6083fcdd04249eefe974e2a5f6e8f) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cff248a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 11:19:49 2011 +0100 rls(k): documented outbound_proxy parameter (cherry picked from commit 8654b01c184d41da019a9e80ecfbca9da8f882ce) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4a5829a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 11:15:28 2011 +0100 rls(k): added outbound_proxy parameter - set SIP uri where to send subscriptions (cherry picked from commit aabeca534aebe7953b63884db9bf58e176ce5a6c) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=009cd6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 4 00:43:08 2011 +0100 db_flatstore: skip child init for proc init rank (cherry picked from commit ef2906d5036dd48320702285f6390e9e688a292a) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bca5098… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 4 00:39:58 2011 +0100 db_flatstore: use PROC_MIN to compute process uid - PROC_TCP_MAIN is no longer the lowerest and can produce overlappings (cherry picked from commit 4727a534f767e6f2422dc58bb22bbf266408874c) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e1f8647… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 4 00:29:16 2011 +0100 pdb: skip child init for proc init and tcp main (cherry picked from commit 0f376a2589b4a11a6829ca1bdf052cf6126851bd) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d2cf073… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 4 00:25:20 2011 +0100 matrix: don't do db init for rank==proc_init and tcp main (cherry picked from commit 24731c59cd9dcb0d1c567821ffdfb1860d4def9c) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fbee512… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 2 19:56:40 2011 +0100 dialog(k): open db connection for main process in db delayed mode - used at shutdown to write to db (cherry picked from commit 7c530f69da7368f87e78d7a3ad1f3439005402a5) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd6b004… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 2 19:44:18 2011 +0100 pdt(k): mi child init function name updated - child_init => mi_child_init - mod_child_init => child_init (cherry picked from commit 8cd8d0e18a8ead373229ce413ad7cd7f827a98e5) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=67f2b49… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 2 19:39:11 2011 +0100 mtree: skip db init for special ranks (cherry picked from commit 517df28fc695b047d1f7f3cd4376a5f9240b7906) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=89e65a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 31 00:40:32 2010 +0100 xhttp: safety checks for null parameter values (cherry picked from commit b5866451f323aa892bb48ba86424d6a45d8108b5) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3dafb10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 31 00:00:26 2010 +0100 dialplan: specific reply for translation failure - 404 no translation returned if dp_translate MI command fails to do dialplan translate - added extra debug message (cherry picked from commit 4abe2eec5305de4157dc2d0d5dd9511f43c77bf2) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f33a59… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Dec 21 14:38:45 2010 +0100 core: fix ignored force_rport The global force_rport config setting (not the force_rport() script function), was ignored in some cases (e.g. tm & sl). Reported-by: Tomas Mandys tomas.mandys iptel org (cherry picked from commit 70b2fe02a634ed2fd020eab27cbc8e7f676289bf) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1756648… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 19 11:56:49 2010 +0100 acc(k): take r-uri from winning branch for missed call acc - only if the branch was relayed, otherwise uac struct might be unfinished due to drop call in config. Use r-uri from uas struct otherwise - reported by Juha Henanen (cherry picked from commit ade20f7c8c26e732b7e7ad89a6d2c22b71228f60) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0323835… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Dec 18 00:34:54 2010 +0100 dialplan: don't print PV name in replacement - reported by Andreas Granig (cherry picked from commit eb005b74c1d47d215b17ac395efafe56c14ec295) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d9c704… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 8 00:20:44 2010 +0100 uac(k): stop trying to re-auth if first attempt fails - don't do cascade authentication if server keeps sending 401 for new attepts - reported by Bernhard Suttner, part of FS#108 (cherry picked from commit 9ebbbf3f53d88729add23980695ff84dace90342) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d191397… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 6 10:23:54 2010 +0100 drouting: added note about dr_gateways - it can link to dr_gw_lists with '#' - reported by Marc Cardinal, FS#96 (cherry picked from commit 07959c8330861275ffe1a611805e7eadbf7799c1) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=59bd637… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 6 00:05:46 2010 +0100 pv: $snd(id) broken in $sndto(id) and $sndfrom(id) - $snd(id) is aliased to $sndto(id) - $sndto(id) points to next hop address - $sndfrom(id) points to local socket to be used for sending (cherry picked from commit f6e2325aa6770840c25dbb64afd405f73077fc79) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e6def30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 5 22:33:02 2010 +0100 db_berkeley: updated module name - module name was set to db_bdb upon integration of k and s version, instead of module path name - set now to db_berkeley - reported by stas - FS#106 (cherry picked from commit 610126b748b3f35b7bcdfe784553f9f88f8bfdd9) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9ec1efc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 3 10:59:05 2010 +0100 uac: safety checks for empty values in uacreg - the values in uacreg table must not be empty - reported by Bernhard Suttner (cherry picked from commit dd663a733845510a9ee0557b8d49f058c77ef02c) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c81064… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 3 10:45:00 2010 +0100 dispatcher(k): fixed use of use_default parameter - when there was a single destination in destination set and it was in inactive state, then having parameter use_default=1 caused a divion by 0 while atteptimpting to look for active destaintaion - reported by Eric Hiller (cherry picked from commit 0f5e21c668e46492fb9f9ec69e5b5aafe41bd272)

13 years, 11 months

git:master: xcap_server: fix len for 'uri' comparison

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9f2919ad77a16787f59a7f99c98597fb0176806c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9f2919a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 13:15:32 2011 +0100 xcap_server: fix len for 'uri' comparison - patch by Klaus Darilion --- modules_k/xcap_server/xcap_misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/xcap_server/xcap_misc.c b/modules_k/xcap_server/xcap_misc.c index 16a403d..58b40fd 100644 --- a/modules_k/xcap_server/xcap_misc.c +++ b/modules_k/xcap_server/xcap_misc.c @@ -683,7 +683,7 @@ int pv_parse_xcap_uri_name(pv_spec_p sp, str *in) pxs->key.len, pxs->key.s); if(pxs->key.len==4 && strncmp(pxs->key.s, "data", 4)==0) { pxs->ktype = 0; - } else if(pxs->key.len==3 && strncmp(pxs->key.s, "uri", 4)==0) { + } else if(pxs->key.len==3 && strncmp(pxs->key.s, "uri", 3)==0) { pxs->ktype = 1; } else if(pxs->key.len==4 && strncmp(pxs->key.s, "root", 4)==0) { pxs->ktype = 2;

13 years, 11 months

git:master: rls(k): use server_address paramter as contact in reply

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 436b9532e0bdfd115705a6ae5300aa7b2c1729fe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=436b953… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 12:47:37 2011 +0100 rls(k): use server_address paramter as contact in reply - server_address was just defined as parameter, but not used at all - server_address defines the rls server address to be set in Contact header of 200 replies. It has to be a valid SIP URI - fix cseq stale check - remove Max-Forward header because it is automatically added and use Suppoted instead of Support for header name with supported events - patch by Klaus Darilion --- modules_k/rls/rls.c | 9 +++++---- modules_k/rls/subscribe.c | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index cff2a71..b3fe8f4 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -222,12 +222,13 @@ static int mod_init(void) LM_DBG("start\n"); - if(!server_address.s) + if(server_address.s==NULL) { - LM_DBG("server_address parameter not set in configuration file\n"); + LM_ERR("server_address parameter not set in configuration file\n"); + return -1; } - else - server_address.len= strlen(server_address.s); + + server_address.len= strlen(server_address.s); if(!rls_integrated_xcap_server && xcap_root== NULL) { diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c index 25c7aa1..9e6e168 100644 --- a/modules_k/rls/subscribe.c +++ b/modules_k/rls/subscribe.c @@ -598,7 +598,7 @@ found_support: } /*** if correct reply with 200 OK*/ - if(reply_200(msg, &subs.contact, subs.expires)< 0) + if(reply_200(msg, &subs.local_contact, subs.expires)< 0) goto error; /* call sending Notify with full state */ @@ -669,7 +669,6 @@ int update_rlsubs( subs_t* subs, unsigned int hash_code) } s->expires= subs->expires+ (int)time(NULL); - s->remote_cseq= subs->remote_cseq; if(s->db_flag & NO_UPDATEDB_FLAG) s->db_flag= UPDATEDB_FLAG; @@ -681,6 +680,8 @@ int update_rlsubs( subs_t* subs, unsigned int hash_code) return Stale_cseq_code; } + s->remote_cseq= subs->remote_cseq; + subs->pres_uri.s= (char*)pkg_malloc(s->pres_uri.len* sizeof(char)); if(subs->pres_uri.s== NULL) { @@ -771,7 +772,7 @@ int resource_subscriptions(subs_t* subs, xmlNodePtr rl_node) } s.id= did_str; s.watcher_uri= &wuri; - s.contact= &subs->local_contact; + s.contact= &server_address; s.event= get_event_flag(&subs->event->name); if(s.event< 0) { @@ -784,7 +785,7 @@ int resource_subscriptions(subs_t* subs, xmlNodePtr rl_node) s.outbound_proxy= &outbound_proxy; extra_headers.s= buf; extra_headers.len= sprintf(extra_headers.s, - "Max-Forwards: 70\r\nSupport: eventlist\r\n"); + "Supported: eventlist\r\n"); s.extra_headers= &extra_headers; if(process_list_and_exec(rl_node, send_resource_subs,(void*)(&s))< 0)

13 years, 11 months

git:master: rls(k): documented server_address parameter

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 6d17c7421464a85ba5cf10f8c52d868fca5d3f43 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d17c74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 12:59:41 2011 +0100 rls(k): documented server_address parameter - patch by Klaus Darilion --- modules_k/rls/README | 23 +++++++++++++++++++---- modules_k/rls/doc/rls_admin.xml | 17 +++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/modules_k/rls/README b/modules_k/rls/README index aa23744..1d0299a 100644 --- a/modules_k/rls/README +++ b/modules_k/rls/README @@ -39,6 +39,7 @@ Anca-Maria Vamanu 3.11. to_presence_code (int) 3.12. rls_event (str) 3.13. outbound_proxy (str) + 3.14. server_address (str) 4. Exported Functions @@ -64,8 +65,9 @@ Anca-Maria Vamanu 1.11. Set to_presence_code parameter 1.12. Set rls_event parameter 1.13. Set outbound_proxy parameter - 1.14. rls_handle_subscribe usage - 1.15. rls_handle_notify usage + 1.14. Set server_address parameter + 1.15. rls_handle_subscribe usage + 1.16. rls_handle_notify usage Chapter 1. Admin Guide @@ -92,6 +94,7 @@ Chapter 1. Admin Guide 3.11. to_presence_code (int) 3.12. rls_event (str) 3.13. outbound_proxy (str) + 3.14. server_address (str) 4. Exported Functions @@ -162,6 +165,7 @@ Chapter 1. Admin Guide 3.11. to_presence_code (int) 3.12. rls_event (str) 3.13. outbound_proxy (str) + 3.14. server_address (str) 3.1. db_url(str) @@ -323,6 +327,17 @@ modparam("rls", "rls_event", "dialog;sla") modparam("rls", "outbound_proxy", "sip:presence.kamailio.org") ... +3.14. server_address (str) + + The address of the server that will be used as a contact in sent + Subscribe requests and 200 OK replies for Subscribe requests for RLS. + It is a mandatory parameter. + + Example 1.14. Set server_address parameter +... +modparam("rls", "server_address", "sip:rls@ip.address.ofyour.proxy:5060") +... + 4. Exported Functions 4.1. rls_handle_subscribe() @@ -337,7 +352,7 @@ modparam("rls", "outbound_proxy", "sip:presence.kamailio.org") This function can be used from REQUEST_ROUTE. - Example 1.14. rls_handle_subscribe usage + Example 1.15. rls_handle_subscribe usage ... For presence and rls on the same machine: modparam("rls", "to_presence_code", 10) @@ -365,7 +380,7 @@ For rls only: This function can be used from REQUEST_ROUTE. - Example 1.15. rls_handle_notify usage + Example 1.16. rls_handle_notify usage ... if(method=="NOTIFY") rls_handle_notify(); diff --git a/modules_k/rls/doc/rls_admin.xml b/modules_k/rls/doc/rls_admin.xml index e02f003..351deb6 100644 --- a/modules_k/rls/doc/rls_admin.xml +++ b/modules_k/rls/doc/rls_admin.xml @@ -361,6 +361,23 @@ modparam("rls", "outbound_proxy", "sip:presence.kamailio.org") </example> </section> + <section> + <title><varname>server_address</varname> (str)</title> + <para> + The address of the server that will be used as a contact in sent + Subscribe requests and 200 OK replies for Subscribe requests for RLS. + It is a mandatory parameter. + </para> + <example> + <title>Set <varname>server_address</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rls", "server_address", "sip:rls@ip.address.ofyour.proxy:5060") +... + </programlisting> + </example> + </section> + </section> <section>

13 years, 11 months

git:master: pkg/deb(k): removed rls from excluded list

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 5d205c718032511a0cd1d29830bd0a0e9a0c8e70 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d205c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 13:17:26 2011 +0100 pkg/deb(k): removed rls from excluded list - patch by Klaus Darilion --- pkg/kamailio/deb/lenny/rules | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pkg/kamailio/deb/lenny/rules b/pkg/kamailio/deb/lenny/rules index 84ebd65..d9ec443 100755 --- a/pkg/kamailio/deb/lenny/rules +++ b/pkg/kamailio/deb/lenny/rules @@ -25,7 +25,7 @@ EXCLUDED_MODULES= geoip # extra modules to skip, because they are not compilable now # - regardless if they go to the main kamailio package or to some module package, # they will be excluded from compile and install of all -EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa rls iptrtpproxy +EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy #EXTRA_EXCLUDED_MODULES= # possible module directories that can appear in MODULES_SP

13 years, 11 months

git:master: rls(k): added CRLF for Subscription-State header

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7925ae1a9ae6083fcdd04249eefe974e2a5f6e8f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7925ae1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 12:45:58 2011 +0100 rls(k): added CRLF for Subscription-State header - for the case of subscrition termination on timeout, the header was missing CRLF to its end - patch by Klaus Darilion --- modules_k/rls/notify.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index 85c62a4..9d22036 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -595,7 +595,7 @@ str* rls_notify_extra_hdr(subs_t* subs, char* start_cid, char* boundary_string) "Subscription-State: active;expires=%d\r\n", expires); else str_hdr->len+= sprintf(str_hdr->s+str_hdr->len, - "Subscription-State: terminated;reason=timeout"); + "Subscription-State: terminated;reason=timeout\r\n"); str_hdr->len+= sprintf(str_hdr->s+str_hdr->len, "Require: eventlist\r\n");

13 years, 11 months

git:master: rls(k): documented outbound_proxy parameter

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8654b01c184d41da019a9e80ecfbca9da8f882ce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8654b01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 11:19:49 2011 +0100 rls(k): documented outbound_proxy parameter --- modules_k/rls/README | 301 +++++++++++++++++++++++---------------- modules_k/rls/doc/rls_admin.xml | 20 +++ 2 files changed, 201 insertions(+), 120 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=865…

13 years, 11 months

git:master: rls(k): added outbound_proxy parameter

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: aabeca534aebe7953b63884db9bf58e176ce5a6c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aabeca5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 11:15:28 2011 +0100 rls(k): added outbound_proxy parameter - set SIP uri where to send subscriptions --- modules_k/rls/rls.c | 5 +++++ modules_k/rls/rls.h | 5 +++-- modules_k/rls/subscribe.c | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index e932639..cff2a71 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -148,6 +148,8 @@ str str_doc_type_col = str_init("doc_type"); str str_etag_col = str_init("etag"); str str_doc_col = str_init("doc"); +/* outbound proxy address */ +str outbound_proxy = {0, 0}; /** module functions */ @@ -183,6 +185,7 @@ static param_export_t params[]={ { "xcap_root", STR_PARAM, &xcap_root }, /*address and port(default: 80):"http://192.168.2.132:8000/xcap-root"*/ { "rls_event", STR_PARAM|USE_FUNC_PARAM,(void*)add_rls_event}, + { "outbound_proxy", STR_PARAM, &outbound_proxy.s }, {0, 0, 0 } }; @@ -231,6 +234,8 @@ static int mod_init(void) LM_ERR("xcap_root parameter not set\n"); return -1; } + if(outbound_proxy.s!=NULL) + outbound_proxy.len = strlen(outbound_proxy.s); /* extract port if any */ if(xcap_root) { diff --git a/modules_k/rls/rls.h b/modules_k/rls/rls.h index 082b12e..0d35fa1 100644 --- a/modules_k/rls/rls.h +++ b/modules_k/rls/rls.h @@ -82,8 +82,8 @@ typedef struct rls_resource extern char* xcap_root; extern unsigned int xcap_port; -extern str server_address; -extern int waitn_time; +extern str server_address; +extern int waitn_time; extern str rlsubs_table; extern str rlpres_table; extern str rls_xcap_table; @@ -95,6 +95,7 @@ extern int rls_max_expires; extern int rls_integrated_xcap_server; extern int rls_events; extern int to_presence_code; +extern str outbound_proxy; /* database connection */ extern db1_con_t *rls_db; diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c index 783cf87..25c7aa1 100644 --- a/modules_k/rls/subscribe.c +++ b/modules_k/rls/subscribe.c @@ -780,6 +780,8 @@ int resource_subscriptions(subs_t* subs, xmlNodePtr rl_node) } s.expires= subs->expires; s.source_flag= RLS_SUBSCRIBE; + if(outbound_proxy.s) + s.outbound_proxy= &outbound_proxy; extra_headers.s= buf; extra_headers.len= sprintf(extra_headers.s, "Max-Forwards: 70\r\nSupport: eventlist\r\n");

13 years, 11 months

git:master: pdb: skip child init for proc init and tcp main

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 0f376a2589b4a11a6829ca1bdf052cf6126851bd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f376a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 4 00:29:16 2011 +0100 pdb: skip child init for proc init and tcp main --- modules/pdb/pdb.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/pdb/pdb.c b/modules/pdb/pdb.c index 5ae47f3..b5ceb65 100644 --- a/modules/pdb/pdb.c +++ b/modules/pdb/pdb.c @@ -670,6 +670,8 @@ static int mod_init(void) static int child_init (int rank) { + if(rank==PROC_INIT || rank==PROC_TCP_MAIN) + return 0; return mi_child_init(); }

13 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2011