sr-dev January 2013

sr-dev@lists.kamailio.org

46 participants
326 discussions

git:master: dialog: fixed ka_timer linking
by Daniel-Constantin Mierla 06 Jan '13

06 Jan '13

Module: sip-router Branch: master Commit: ddcef074088df261ce3fb98adfbb1b76b73c30a6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ddcef07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 6 15:24:39 2013 +0100 dialog: fixed ka_timer linking - patch by Rinor Hoxha --- modules_k/dialog/dlg_hash.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index c9f38bb..3aee269 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -189,7 +189,7 @@ int dlg_ka_run(ticks_t ti) } if(*dlg_ka_list_head == *dlg_ka_list_tail) { *dlg_ka_list_head = NULL; - *dlg_ka_list_head = NULL; + *dlg_ka_list_tail = NULL; } *dlg_ka_list_head = dka->next; lock_release(dlg_ka_list_lock); @@ -213,7 +213,7 @@ int dlg_ka_run(ticks_t ti) if(*dlg_ka_list_tail!=NULL) (*dlg_ka_list_tail)->next = dka; if(*dlg_ka_list_head==NULL) - *dlg_ka_list_tail = dka; + *dlg_ka_list_head = dka; *dlg_ka_list_tail = dka; lock_release(dlg_ka_list_lock); }

1 0

git:master: msrp: added rpc command to list active connections
by Daniel-Constantin Mierla 05 Jan '13

05 Jan '13

Module: sip-router Branch: master Commit: bc8b005ba4d4c89afa6152dd212eda9b6689bb86 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc8b005… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 5 23:36:43 2013 +0100 msrp: added rpc command to list active connections --- modules/msrp/README | 33 ++++++++++-- modules/msrp/doc/msrp_admin.xml | 20 ++++++++ modules/msrp/msrp_cmap.c | 103 +++++++++++++++++++++++++++++++++++++++ modules/msrp/msrp_cmap.h | 1 + modules/msrp/msrp_mod.c | 6 ++ 5 files changed, 157 insertions(+), 6 deletions(-) diff --git a/modules/msrp/README b/modules/msrp/README index 0d3c0b5..7a50456 100644 --- a/modules/msrp/README +++ b/modules/msrp/README @@ -50,8 +50,12 @@ Alex Balashov 4.9. msrp_cmap_lookup() 5. Pseudo Variables - 6. Event Routes - 7. Usage + 6. RPC Commands + + 6.1. msrp.cmaplist + + 7. Event Routes + 8. Usage List of Examples @@ -102,8 +106,12 @@ Chapter 1. Admin Guide 4.9. msrp_cmap_lookup() 5. Pseudo Variables - 6. Event Routes - 7. Usage + 6. RPC Commands + + 6.1. msrp.cmaplist + + 7. Event Routes + 8. Usage 1. Overview @@ -401,12 +409,25 @@ event_route[msrp:frame-in] { These are documented in the appropriate Wiki pages hosted on the project web site. -6. Event Routes +6. RPC Commands + + 6.1. msrp.cmaplist + +6.1. msrp.cmaplist + + List active MSRP connections. + + Example: +... +kamcmd msrp.cmaplist +... + +7. Event Routes For each MSRP frame received from the network, the module executes event_route[msrp:frame-in] block in the config file. -7. Usage +8. Usage When 'sipmsg' parameter is set to 1 (which is default), the module internally builds a SIP request from the MSRP frame and exposes it to diff --git a/modules/msrp/doc/msrp_admin.xml b/modules/msrp/doc/msrp_admin.xml index 451ebe6..58621d3 100644 --- a/modules/msrp/doc/msrp_admin.xml +++ b/modules/msrp/doc/msrp_admin.xml @@ -452,6 +452,26 @@ event_route[msrp:frame-in] { </section> <section> + <title>RPC Commands</title> + <section> + <title> + <function moreinfo="none">msrp.cmaplist</function> + </title> + <para> + List active MSRP connections. + </para> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +&sercmd; msrp.cmaplist +... +</programlisting> + </section> + </section> + + <section> <title>Event Routes</title> <para> For each MSRP frame received from the network, the module executes diff --git a/modules/msrp/msrp_cmap.c b/modules/msrp/msrp_cmap.c index e8c4f19..887274e 100644 --- a/modules/msrp/msrp_cmap.c +++ b/modules/msrp/msrp_cmap.c @@ -29,6 +29,8 @@ #include "../../ut.h" #include "../../lib/srutils/sruid.h" +#include "../../rpc.h" +#include "../../rpc_lookup.h" #include "msrp_netio.h" #include "msrp_env.h" @@ -403,3 +405,104 @@ int msrp_cmap_clean(void) return 0; } + +static const char* msrp_cmap_rpc_list_doc[2] = { + "Return the content of dispatcher sets", + 0 +}; + + +/* + * RPC command to print connections map table + */ +static void msrp_cmap_rpc_list(rpc_t* rpc, void* ctx) +{ + void* th; + void* ih; + void* vh; + msrp_citem_t *it; + int i; + int n; + str edate; + + if(_msrp_cmap_head==NULL) + { + LM_ERR("no connections map table\n"); + rpc->fault(ctx, 500, "No Connections Map Table"); + return; + } + + /* add entry node */ + if (rpc->add(ctx, "{", &th) < 0) + { + rpc->fault(ctx, 500, "Internal error root reply"); + return; + } + + if(rpc->struct_add(th, "d{", + "MAP_SIZE", _msrp_cmap_head->mapsize, + "CONLIST", &ih)<0) + { + rpc->fault(ctx, 500, "Internal error set structure"); + return; + } + n = 0; + for(i=0; i<_msrp_cmap_head->mapsize; i++) + { + lock_get(&_msrp_cmap_head->cslots[i].lock); + for(it=_msrp_cmap_head->cslots[i].first; it; it=it->next) + { + if(rpc->struct_add(ih, "{", + "CONDATA", &vh)<0) + { + rpc->fault(ctx, 500, "Internal error creating connection"); + lock_release(&_msrp_cmap_head->cslots[i].lock); + return; + } + edate.s = ctime(&it->expires); + edate.len = 24; + if(rpc->struct_add(vh, "dSSSSSdd", + "CITEMID", it->citemid, + "SESSIONID", &it->sessionid, + "PEER", &it->peer, + "ADDR", &it->addr, + "SOCK", &it->sock, + "EXPIRES", &edate, + "CONID", it->conid, + "FLAGS", it->cflags)<0) + { + rpc->fault(ctx, 500, "Internal error creating dest struct"); + lock_release(&_msrp_cmap_head->cslots[i].lock); + return; + } + n++; + } + lock_release(&_msrp_cmap_head->cslots[i].lock); + } + if(rpc->struct_add(th, "d", "CONCOUNT", n)<0) + { + rpc->fault(ctx, 500, "Internal error connection counter"); + return; + } + return; +} + +rpc_export_t msrp_cmap_rpc_cmds[] = { + {"msrp.cmaplist", msrp_cmap_rpc_list, + msrp_cmap_rpc_list_doc, 0}, + {0, 0, 0, 0} +}; + +/** + * + */ +int msrp_cmap_init_rpc(void) +{ + if (rpc_register_array(msrp_cmap_rpc_cmds)!=0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + + return 0; +} diff --git a/modules/msrp/msrp_cmap.h b/modules/msrp/msrp_cmap.h index 6ec4464..871067d 100644 --- a/modules/msrp/msrp_cmap.h +++ b/modules/msrp/msrp_cmap.h @@ -70,4 +70,5 @@ int msrp_cmap_lookup(msrp_frame_t *mf); int msrp_sruid_init(void); +int msrp_cmap_init_rpc(void); #endif diff --git a/modules/msrp/msrp_mod.c b/modules/msrp/msrp_mod.c index 432b7e7..4ff4559 100644 --- a/modules/msrp/msrp_mod.c +++ b/modules/msrp/msrp_mod.c @@ -146,6 +146,12 @@ static int mod_init(void) return -1; } + if(msrp_cmap_init_rpc()<0) + { + LM_ERR("failed to register cmap RPC commands\n"); + return -1; + } + if(msrp_cmap_size>0) { if(msrp_cmap_size>16) msrp_cmap_size = 16;

1 0

git:master: msrp: new parameter use_path_addr
by Daniel-Constantin Mierla 05 Jan '13

05 Jan '13

Module: sip-router Branch: master Commit: 830af85c45933b3cdc3c48152667162fcf969a55 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=830af85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 5 23:51:07 2013 +0100 msrp: new parameter use_path_addr - specify host and port for usage in Use-Path header --- modules/msrp/README | 55 ++++++++++++++++++++++++-------------- modules/msrp/doc/msrp_admin.xml | 21 ++++++++++++++- modules/msrp/msrp_cmap.c | 7 +++- modules/msrp/msrp_mod.c | 12 +++++--- 4 files changed, 67 insertions(+), 28 deletions(-) diff --git a/modules/msrp/README b/modules/msrp/README index 7a50456..81e6a44 100644 --- a/modules/msrp/README +++ b/modules/msrp/README @@ -36,6 +36,7 @@ Alex Balashov 3.3. timer_interval (int) 3.4. auth_min_expires (int) 3.5. auth_max_expires (int) + 3.6. use_path_addr (str) 4. Functions @@ -64,16 +65,17 @@ Alex Balashov 1.3. Set timer_interval parameter 1.4. Set auth_min_expires parameter 1.5. Set auth_max_expires parameter - 1.6. msrp usage - 1.7. msrp_reply usage - 1.8. msrp_is_request usage - 1.9. msrp_is_reply usage - 1.10. msrp_set_dst usage - 1.11. msrp_relay_flags usage - 1.12. msrp_reply_flags usage - 1.13. msrp_cmap_save usage - 1.14. msrp_cmap_lookup usage - 1.15. Event Route + 1.6. Set use_path_addr parameter + 1.7. msrp_relay usage + 1.8. msrp_reply usage + 1.9. msrp_is_request usage + 1.10. msrp_is_reply usage + 1.11. msrp_set_dst usage + 1.12. msrp_relay_flags usage + 1.13. msrp_reply_flags usage + 1.14. msrp_cmap_save usage + 1.15. msrp_cmap_lookup usage + 1.16. Event Route Chapter 1. Admin Guide @@ -92,6 +94,7 @@ Chapter 1. Admin Guide 3.3. timer_interval (int) 3.4. auth_min_expires (int) 3.5. auth_max_expires (int) + 3.6. use_path_addr (str) 4. Functions @@ -167,6 +170,7 @@ Chapter 1. Admin Guide 3.3. timer_interval (int) 3.4. auth_min_expires (int) 3.5. auth_max_expires (int) + 3.6. use_path_addr (str) 3.1. sipmsg (int) @@ -228,6 +232,17 @@ modparam("msrp", "auth_min_expiresl", 90) modparam("msrp", "auth_max_expiresl", 1800) ... +3.6. use_path_addr (str) + + The hostname:port to be used when building Use-Path header. + + Default value is NULL (server IP and port are used). + + Example 1.6. Set use_path_addr parameter +... +modparam("msrp", "use_path_addr", "msrp.kamailio.org:5061") +... + 4. Functions 4.1. msrp_relay() @@ -249,7 +264,7 @@ modparam("msrp", "auth_max_expiresl", 1800) This function can be used in ANY_ROUTE. - Example 1.6. msrp usage + Example 1.7. msrp_relay usage ... event_route[msrp:frame-in] { msrp_relay(); @@ -264,7 +279,7 @@ event_route[msrp:frame-in] { This function can be used in ANY_ROUTE. - Example 1.7. msrp_reply usage + Example 1.8. msrp_reply usage ... event_route[msrp:frame-in] { msrp_reply("403", "Not allowed"); @@ -277,7 +292,7 @@ event_route[msrp:frame-in] { This function can be used in ANY_ROUTE. - Example 1.8. msrp_is_request usage + Example 1.9. msrp_is_request usage ... event_route[msrp:frame-in] { if(msrp_is_request()) @@ -294,7 +309,7 @@ event_route[msrp:frame-in] { This function can be used in ANY_ROUTE. - Example 1.9. msrp_is_reply usage + Example 1.10. msrp_is_reply usage ... event_route[msrp:frame-in] { if(msrp_is_reply()) @@ -314,7 +329,7 @@ event_route[msrp:frame-in] { This function can be used in ANY_ROUTE. - Example 1.10. msrp_set_dst usage + Example 1.11. msrp_set_dst usage ... event_route[msrp:frame-in] { ... @@ -333,7 +348,7 @@ event_route[msrp:frame-in] { This function can be used in ANY_ROUTE. - Example 1.11. msrp_relay_flags usage + Example 1.12. msrp_relay_flags usage ... event_route[msrp:frame-in] { ... @@ -352,7 +367,7 @@ event_route[msrp:frame-in] { This function can be used in ANY_ROUTE. - Example 1.12. msrp_reply_flags usage + Example 1.13. msrp_reply_flags usage ... event_route[msrp:frame-in] { ... @@ -368,7 +383,7 @@ event_route[msrp:frame-in] { This function can be used in ANY_ROUTE. - Example 1.13. msrp_cmap_save usage + Example 1.14. msrp_cmap_save usage ... event_route[msrp:frame-in] { ... @@ -383,7 +398,7 @@ event_route[msrp:frame-in] { This function can be used in ANY_ROUTE. - Example 1.14. msrp_cmap_lookup usage + Example 1.15. msrp_cmap_lookup usage ... event_route[msrp:frame-in] { ... @@ -490,7 +505,7 @@ Content-Type: text/plain Next is an example of configuration file with the routing block for MSRP frames. In this config, the SIP traffic is rejected. - Example 1.15. Event Route + Example 1.16. Event Route ... #!KAMAILIO diff --git a/modules/msrp/doc/msrp_admin.xml b/modules/msrp/doc/msrp_admin.xml index 58621d3..271cd84 100644 --- a/modules/msrp/doc/msrp_admin.xml +++ b/modules/msrp/doc/msrp_admin.xml @@ -183,6 +183,25 @@ modparam("msrp", "auth_max_expiresl", 1800) </programlisting> </example> </section> + <section> + <title><varname>use_path_addr</varname> (str)</title> + <para> + The hostname:port to be used when building Use-Path header. + </para> + <para> + <emphasis> + Default value is NULL (server IP and port are used). + </emphasis> + </para> + <example> + <title>Set <varname>use_path_addr</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("msrp", "use_path_addr", "msrp.kamailio.org:5061") +... +</programlisting> + </example> + </section> </section> <section> @@ -202,7 +221,7 @@ modparam("msrp", "auth_max_expiresl", 1800) This function can be used in ANY_ROUTE. </para> <example> - <title><function>msrp</function> usage</title> + <title><function>msrp_relay</function> usage</title> <programlisting format="linespecific"> ... event_route[msrp:frame-in] { diff --git a/modules/msrp/msrp_cmap.c b/modules/msrp/msrp_cmap.c index 887274e..23a216b 100644 --- a/modules/msrp/msrp_cmap.c +++ b/modules/msrp/msrp_cmap.c @@ -42,6 +42,7 @@ static sruid_t _msrp_sruid; extern int msrp_auth_min_expires; extern int msrp_auth_max_expires; +extern str msrp_use_path_addr; /** * @@ -298,13 +299,15 @@ int msrp_cmap_save(msrp_frame_t *mf) { srcaddr.len = snprintf(sbuf, MSRP_SBUF_SIZE, "Use-Path: msrps://%.*s/%.*s;tcp\r\nExpires: %d\r\n", - srcsock.len-4, srcsock.s+4, + (msrp_use_path_addr.s)?msrp_use_path_addr.len:(srcsock.len-4), + (msrp_use_path_addr.s)?msrp_use_path_addr.s:(srcsock.s+4), _msrp_sruid.uid.len, _msrp_sruid.uid.s, expires); } else { srcaddr.len = snprintf(sbuf, MSRP_SBUF_SIZE, "Use-Path: msrp://%.*s/%.*s;tcp\r\nExpires: %d\r\n", - srcsock.len-4, srcsock.s+4, + (msrp_use_path_addr.s)?msrp_use_path_addr.len:(srcsock.len-4), + (msrp_use_path_addr.s)?msrp_use_path_addr.s:(srcsock.s+4), _msrp_sruid.uid.len, _msrp_sruid.uid.s, expires); } diff --git a/modules/msrp/msrp_mod.c b/modules/msrp/msrp_mod.c index 4ff4559..3204dfc 100644 --- a/modules/msrp/msrp_mod.c +++ b/modules/msrp/msrp_mod.c @@ -68,6 +68,7 @@ int msrp_cmap_size = 0; int msrp_auth_min_expires = 60; int msrp_auth_max_expires = 3600; int msrp_timer_interval = 60; +str msrp_use_path_addr = { 0 }; static int msrp_frame_received(void *data); sip_msg_t *msrp_fake_sipmsg(msrp_frame_t *mf); @@ -111,11 +112,12 @@ static cmd_export_t cmds[]={ }; static param_export_t params[]={ - {"sipmsg", INT_PARAM, &msrp_param_sipmsg}, - {"cmap_size", INT_PARAM, &msrp_cmap_size}, - {"auth_min_expires", INT_PARAM, &msrp_auth_min_expires}, - {"auth_max_expires", INT_PARAM, &msrp_auth_max_expires}, - {"timer_interval", INT_PARAM, &msrp_timer_interval}, + {"sipmsg", PARAM_INT, &msrp_param_sipmsg}, + {"cmap_size", PARAM_INT, &msrp_cmap_size}, + {"auth_min_expires", PARAM_INT, &msrp_auth_min_expires}, + {"auth_max_expires", PARAM_INT, &msrp_auth_max_expires}, + {"timer_interval", PARAM_INT, &msrp_timer_interval}, + {"use_path_addr", PARAM_STR, &msrp_use_path_addr}, {0, 0, 0} };

1 0

git:master: core: command line option -v replaced with -K
by Daniel-Constantin Mierla 05 Jan '13

05 Jan '13

Module: sip-router Branch: master Commit: 70d6cae27153d6641b2a781634aeb585b741d3a0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=70d6cae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 6 00:00:40 2013 +0100 core: command line option -v replaced with -K - -v was exposing to misusage for -V (version), now is aliased to it --- main.c | 10 ++++++---- sip-router.8 | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/main.c b/main.c index cf3d665..84500c8 100644 --- a/main.c +++ b/main.c @@ -225,7 +225,7 @@ Options:\n\ field to a via\n\ -R Same as `-r` but use reverse dns;\n\ (to use both use `-rR`)\n\ - -v Turn on \"via:\" host checking when forwarding replies\n\ + -K Turn on \"via:\" host checking when forwarding replies\n\ -d Debugging mode (multiple -d increase the level)\n\ -D no 1..do not fork (almost) anyway, 2..do not daemonize creator\n\ 3..daemonize (default)\n\ @@ -1860,7 +1860,7 @@ int main(int argc, char** argv) dprint_init_colors(); /* command line options */ - options= ":f:cm:M:dVIhEeb:l:L:n:vrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:" + options= ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:" #ifdef STATS "s:" #endif @@ -1957,6 +1957,7 @@ int main(int argc, char** argv) case 'd': /* ignore it, was parsed immediately after startup */ break; + case 'v': case 'V': printf("version: %s\n", full_version); printf("flags: %s\n", ver_flags ); @@ -2019,7 +2020,7 @@ int main(int argc, char** argv) case 'b': case 'l': case 'n': - case 'v': + case 'K': case 'r': case 'R': case 'D': @@ -2129,6 +2130,7 @@ try_again: case 'm': case 'M': case 'd': + case 'v': case 'V': case 'I': case 'h': @@ -2175,7 +2177,7 @@ try_again: goto error; } break; - case 'v': + case 'K': check_via=1; break; case 'r': diff --git a/sip-router.8 b/sip-router.8 index a45a585..bc50354 100644 --- a/sip-router.8 +++ b/sip-router.8 @@ -66,7 +66,7 @@ Same as .B \-r but uses reverse dns. .TP -.BI \-v +.BI \-K Turns on via host checking when forwarding replies. .TP .BI \-d

1 0

[tracker] Comment added: kamailio can't accept new connections(tls)
by sip-router 05 Jan '13

05 Jan '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#257 - kamailio can't accept new connections(tls) User who did this - Shaobin.Feng (saxon_leo) ---------- ... ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=257#comment761 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.

1 0

ice support in media/rtp proxy
by Juha Heinanen 05 Jan '13

05 Jan '13

ice seems to be at least in theory supported by several sip clients: baresip, csipsimple, pjsip based clients, etc. one of the problems of ice is that is uses turn protocol to find ip addresses/ports of relays in case end-to-end connectivity cannot be established otherwise. turn server, on the other hand, must authenticates its clients. this doubles authentication work and, worse, a single turn server does not seem to be able to handle more than one domain. having each domain its own turn server is clearly not a scalable solution. so life would be easier without turn servers. mediaproxy module has solved this problem so that it adds the ice relay candidates to sdp on behalf of ice clients and therefore no separate turn servers nor turn client authentication are needed. have people who have worked on rtpproxy or mediaproxy-ng considered supporting ice in the way mediaproxy modules does today? any other thoughts about this? -- juha

5 5

git:master: pipelimit: implemented support for RPC commands
by Ovidiu Sas 05 Jan '13

05 Jan '13

Module: sip-router Branch: master Commit: f432022f943ad4f72d3643974f065c6007af6589 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f432022… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Jan 4 21:34:50 2013 -0500 pipelimit: implemented support for RPC commands --- modules/pipelimit/README | 133 ++++++++++++++++++++++--- modules/pipelimit/doc/pipelimit.xml | 9 ++ modules/pipelimit/doc/pipelimit_admin.xml | 154 ++++++++++++++++++++++++++++- modules/pipelimit/pipelimit.c | 88 ++++++++++++++++ modules/pipelimit/pl_ht.c | 98 ++++++++++++++++++ 5 files changed, 465 insertions(+), 17 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f43…

1 0

Re: [sr-dev] [SR-Users] Next major release proposed as v4.0.0
by Daniel-Constantin Mierla 04 Jan '13

04 Jan '13

The base version in development branch has been updated to 4.0.0, which will be the version number for the next major release. Cheers, Daniel On 1/3/13 10:57 AM, Klaus Darilion wrote: > > > On 02.01.2013 10:36, Olle E. Johansson wrote: >> >> 2 jan 2013 kl. 10:15 skrev Daniel-Constantin Mierla <miconda(a)gmail.com>: > ... >>> It seems that there are lot of good reasons for numbering the next >>> major version 4.0.0. Other comments, opinions? >> >> +1 from me. > > So, 5.0.0? :-) > > I also second 4.0.0 > > Klaus > > _______________________________________________ > 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 -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

1 0

git:master: sl: new function sl_forward_reply(...)
by Daniel-Constantin Mierla 04 Jan '13

04 Jan '13

Module: sip-router Branch: master Commit: d01b11b0cbbbfb84ae3d10fb90c05aedf07c9ccc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d01b11b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 4 19:26:21 2013 +0100 sl: new function sl_forward_reply(...) - forward the received reply fron configuration, before it would be done by the core. It has the option to change the status code and reason phrase - the forwarding is statelessy, not affecting the tm states --- modules/sl/README | 27 ++++++- modules/sl/doc/sl_functions.xml | 36 ++++++++++ modules/sl/sl.c | 147 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 205 insertions(+), 5 deletions(-) diff --git a/modules/sl/README b/modules/sl/README index 9d5b29c..d15521a 100644 --- a/modules/sl/README +++ b/modules/sl/README @@ -19,6 +19,7 @@ Daniel-Constantin Mierla 4. sl_send_reply usage 5. send_reply usage 6. sl_reply_error usage + 7. send_reply usage 1. Overview @@ -92,8 +93,9 @@ modparam("sl", "bind_tm", 0) # feature disabled 3.1. sl_send_reply(code, reason) 3.2. send_reply(code, reason) 3.3. sl_reply_error() + 3.4. sl_forward _reply([ code, [ reason ] ]) -3.1. sl_send_reply(code, reason) +3.1. sl_send_reply(code, reason) For the current request, a reply is sent back having the given code and text reason. The reply is sent stateless, totally independent of the @@ -108,7 +110,7 @@ modparam("sl", "bind_tm", 0) # feature disabled sl_send_reply("404", "Not found"); ... -3.2. send_reply(code, reason) +3.2. send_reply(code, reason) For the current request, a reply is sent back having the given code and text reason. The reply is sent stateful or stateless, depending of the @@ -129,7 +131,7 @@ send_reply("404", "Not found"); send_reply("403", "Invalid user - $fU"); ... -3.3. sl_reply_error() +3.3. sl_reply_error() Sends back an error reply describing the nature of the last internal error. Usually this function should be used after a script function @@ -140,6 +142,25 @@ send_reply("403", "Invalid user - $fU"); sl_reply_error(); ... +3.4. sl_forward _reply([ code, [ reason ] ]) + + Forward statelessy the current received SIP reply, with the option to + change the status code and reason text. The new code has to be in the + same class. The received reply is forwarded as well by core when the + config execution ended, unless it is dropped from config. + + Meaning of the parameters is as follows: + * code - Status code. + * reason - Reason phrase. + + This function can be used from ONREPLY_ROUTE. + + Example 7. send_reply usage +... +if(status=="408") + sl_forward_reply("404", "Not found"); +... + 4. Statistics 4.1. 1xx_replies diff --git a/modules/sl/doc/sl_functions.xml b/modules/sl/doc/sl_functions.xml index 63abcb6..bf58ce0 100644 --- a/modules/sl/doc/sl_functions.xml +++ b/modules/sl/doc/sl_functions.xml @@ -92,4 +92,40 @@ sl_reply_error(); </programlisting> </example> </section> + + <section id="sl_forward_reply"> + <title> + <function moreinfo="none">sl_forward _reply([ code, [ reason ] ])</function> + </title> + <para> + Forward statelessy the current received SIP reply, with the option to + change the status code and reason text. The new code has to be in the same + class. The received reply is forwarded as well by core when the config + execution ended, unless it is dropped from config. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>code</emphasis> - Status code. + </para> + </listitem> + <listitem> + <para><emphasis>reason</emphasis> - Reason phrase. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ONREPLY_ROUTE. + </para> + <example> + <title><function>send_reply</function> usage</title> + <programlisting format="linespecific"> +... +if(status=="408") + sl_forward_reply("404", "Not found"); +... +</programlisting> + </example> + </section> + </section> diff --git a/modules/sl/sl.c b/modules/sl/sl.c index eedb953..6d05569 100644 --- a/modules/sl/sl.c +++ b/modules/sl/sl.c @@ -62,6 +62,8 @@ #include "../../dprint.h" #include "../../error.h" #include "../../ut.h" +#include "../../data_lump.h" +#include "../../mod_fix.h" #include "../../script_cb.h" #include "../../mem/mem.h" @@ -81,9 +83,12 @@ int _sl_filtered_ack_route = -1; /* default disabled */ static int sl_bind_tm = 1; static struct tm_binds tmb; -static int w_sl_send_reply(struct sip_msg* msg, char* str, char* str2); +static int w_sl_send_reply(struct sip_msg* msg, char* str1, char* str2); static int w_send_reply(struct sip_msg* msg, char* str1, char* str2); -static int w_sl_reply_error(struct sip_msg* msg, char* str, char* str2); +static int w_sl_reply_error(struct sip_msg* msg, char* str1, char* str2); +static int w_sl_forward_reply0(sip_msg_t* msg, char* str1, char* str2); +static int w_sl_forward_reply1(sip_msg_t* msg, char* str1, char* str2); +static int w_sl_forward_reply2(sip_msg_t* msg, char* str1, char* str2); static int bind_sl(sl_api_t* api); static int mod_init(void); static int child_init(int rank); @@ -99,6 +104,12 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE}, {"sl_reply_error", w_sl_reply_error, 0, 0, REQUEST_ROUTE}, + {"sl_forward_reply", w_sl_forward_reply0, 0, 0, + ONREPLY_ROUTE}, + {"sl_forward_reply", w_sl_forward_reply1, 1, fixup_spve_all, + ONREPLY_ROUTE}, + {"sl_forward_reply", w_sl_forward_reply2, 2, fixup_spve_all, + ONREPLY_ROUTE}, {"bind_sl", (cmd_function)bind_sl, 0, 0, 0}, {0,0,0,0,0} }; @@ -347,6 +358,138 @@ static int fixup_sl_reply(void** param, int param_no) return 0; } +/** + * @brief forward SIP reply statelessy with different code and reason text + */ +static int w_sl_forward_reply(sip_msg_t* msg, str* code, str* reason) +{ + char oldscode[3]; + int oldncode; + int ret; + struct lump *ldel = NULL; + struct lump *ladd = NULL; + char *rbuf; + + if(msg->first_line.type!=SIP_REPLY) { + LM_ERR("invalid SIP message type\n"); + return -1; + } + if(code!=NULL) { + if(code->len!=3) { + LM_ERR("invalid reply code value %.*s\n", code->len, code->s); + return -1; + } + if(msg->first_line.u.reply.status.s[0]!=code->s[0]) { + LM_ERR("reply code class cannot be changed\n"); + return -1; + } + if(code->s[1]<'0' || code->s[1]>'9' + || code->s[2]<'0' || code->s[2]>'9') { + LM_ERR("invalid reply code value %.*s!\n", code->len, code->s); + return -1; + } + } + if(reason!=NULL && reason->len<=0) { + LM_ERR("invalid reply reason value\n"); + return -1; + } + if(code!=NULL) { + /* backup old values */ + oldscode[0] = msg->first_line.u.reply.status.s[0]; + oldscode[1] = msg->first_line.u.reply.status.s[1]; + oldscode[2] = msg->first_line.u.reply.status.s[2]; + oldncode = msg->first_line.u.reply.statuscode; + /* update status code directly in msg buffer */ + msg->first_line.u.reply.statuscode = (code->s[0]-'0')*100 + + (code->s[1]-'0')*10 + code->s[2]-'0'; + msg->first_line.u.reply.status.s[0] = code->s[0]; + msg->first_line.u.reply.status.s[1] = code->s[1]; + msg->first_line.u.reply.status.s[2] = code->s[2]; + + } + if(reason!=NULL) { + ldel = del_lump(msg, + msg->first_line.u.reply.reason.s - msg->buf, + msg->first_line.u.reply.reason.len, + 0); + if (ldel==NULL) { + LM_ERR("failed to add del lump\n"); + ret = -1; + goto restore; + } + rbuf = (char *)pkg_malloc(reason->len); + if (rbuf==NULL) { + LM_ERR("not enough memory\n"); + ret = -1; + goto restore; + } + memcpy(rbuf, reason->s, reason->len); + ladd = insert_new_lump_after(ldel, rbuf, reason->len, 0); + if (ladd==0) { + LOG(L_ERR, "failed to add reason lump: %.*s\n", + reason->len, reason->s); + pkg_free(rbuf); + ret = -1; + goto restore; + } + } + ret = forward_reply(msg); +restore: + if(reason!=NULL) { + if(ldel!=NULL) { + remove_lump(msg, ldel); + } + if(ladd!=NULL) { + remove_lump(msg, ladd); + } + } + if(code!=NULL) { + msg->first_line.u.reply.statuscode = oldncode; + msg->first_line.u.reply.status.s[0] = oldscode[0]; + msg->first_line.u.reply.status.s[1] = oldscode[1]; + msg->first_line.u.reply.status.s[2] = oldscode[2]; + } + return ret; +} + +/** + * @brief forward SIP reply statelessy + */ +static int w_sl_forward_reply0(sip_msg_t* msg, char* str1, char* str2) +{ + return w_sl_forward_reply(msg, NULL, NULL); +} + +/** + * @brief forward SIP reply statelessy with a new code + */ +static int w_sl_forward_reply1(sip_msg_t* msg, char* str1, char* str2) +{ + str code; + if(fixup_get_svalue(msg, (gparam_t*)str1, &code)<0) { + LM_ERR("cannot get the reply code parameter value\n"); + return -1; + } + return w_sl_forward_reply(msg, &code, NULL); +} + +/** + * @brief forward SIP reply statelessy with new code and reason text + */ +static int w_sl_forward_reply2(sip_msg_t* msg, char* str1, char* str2) +{ + str code; + str reason; + if(fixup_get_svalue(msg, (gparam_t*)str1, &code)<0) { + LM_ERR("cannot get the reply code parameter value\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)str2, &reason)<0) { + LM_ERR("cannot get the reply reason parameter value\n"); + return -1; + } + return w_sl_forward_reply(msg, &code, &reason); +} /** * @brief bind functions to SL API structure

1 0

git:master: Makefile.defs: major version base updated to 4.0.0
by Daniel-Constantin Mierla 04 Jan '13

04 Jan '13

Module: sip-router Branch: master Commit: e03be11d30abd9f6a5a756ae142444395f09df93 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e03be11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 4 19:29:30 2013 +0100 Makefile.defs: major version base updated to 4.0.0 - development version is now 4.0.0-dev8 --- Makefile.defs | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 95623c5..cebf608 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -159,10 +159,10 @@ endif INSTALL_FLAVOUR=$(FLAVOUR) #version number -VERSION = 3 -PATCHLEVEL = 4 +VERSION = 4 +PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -dev7 +EXTRAVERSION = -dev8 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2013