sr-dev May 2010

sr-dev@lists.kamailio.org

18 participants
140 discussions

git:master: pv: added $rv returning protocol version

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 871c77702ae7aef9efdc8cf24e2367abc4a6429c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=871c777… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 26 11:57:54 2010 +0200 pv: added $rv returning protocol version - return the string representing the protocol version in first line of request/reply --- modules_k/pv/pv.c | 3 +++ modules_k/pv/pv_core.c | 16 ++++++++++++++++ modules_k/pv/pv_core.h | 3 +++ 3 files changed, 22 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index 76e590c..feb0f72 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -303,6 +303,9 @@ static pv_export_t mod_pvs[] = { {{"ruri.user", (sizeof("ruri.user")-1)}, /* */ PVT_RURI_USERNAME, pv_get_ruri_attr, pv_set_ruri_user, 0, 0, pv_init_iname, 1}, + {{"rv", (sizeof("rv")-1)}, /* */ + PVT_OTHER, pv_get_version, 0, + 0, 0, 0, 0}, {{"Ri", (sizeof("Ri")-1)}, /* */ PVT_OTHER, pv_get_rcvip, 0, 0, 0, 0, 0}, diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index 10d378f..ccc41dc 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -127,6 +127,22 @@ int pv_get_method(struct sip_msg *msg, pv_param_t *param, get_cseq(msg)->method_id); } +int pv_get_version(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->first_line.type == SIP_REQUEST) + { + return pv_get_strval(msg, param, res, + &msg->first_line.u.request.version); + } + + return pv_get_strval(msg, param, res, + &msg->first_line.u.reply.version); +} + int pv_get_status(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/modules_k/pv/pv_core.h b/modules_k/pv/pv_core.h index 32b6b37..e9b490d 100644 --- a/modules_k/pv/pv_core.h +++ b/modules_k/pv/pv_core.h @@ -190,6 +190,9 @@ int pv_get_scriptvar(struct sip_msg *msg, pv_param_t *param, int pv_get_true(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_version(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + /********* end PV get functions *********/ /********* start PV set functions *********/

14 years, 6 months

git:master: core: socket_str enclose IPv6 addresses in betwen [ ]

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 426c6b7e2103d38aca47ca9728d22355bd44b7e9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=426c6b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 25 21:10:32 2010 +0200 core: socket_str enclose IPv6 addresses in betwen [ ] - string representation of socket string takes in consideration IPv6 addresses --- socket_info.c | 9 +++++++++ socket_info.h | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/socket_info.c b/socket_info.c index aca7793..5cdc790 100644 --- a/socket_info.c +++ b/socket_info.c @@ -328,6 +328,9 @@ int socket2str(char* s, int* len, struct socket_info* si) proto.len = strlen(proto.s); l = proto.len + si->address_str.len + si->port_no_str.len + 2; + + if(si->address.af==AF_INET6) + l += 2; if (*len < l) { ERR("socket2str: Destionation buffer too short\n"); @@ -338,8 +341,14 @@ int socket2str(char* s, int* len, struct socket_info* si) memcpy(s, proto.s, proto.len); s += proto.len; *s = ':'; s++; + if(si->address.af==AF_INET6) { + *s = '['; s++; + } memcpy(s, si->address_str.s, si->address_str.len); s += si->address_str.len; + if(si->address.af==AF_INET6) { + *s = ']'; s++; + } *s = ':'; s++; memcpy(s, si->port_no_str.s, si->port_no_str.len); s += si->port_no_str.len; diff --git a/socket_info.h b/socket_info.h index 6da9437..7923e65 100644 --- a/socket_info.h +++ b/socket_info.h @@ -47,7 +47,7 @@ * the text description of any socket, not counting the terminating zero added * by socket2str */ #define MAX_SOCKET_STR (sizeof("unknown") - 1 + IP_ADDR_MAX_STR_SIZE + \ - INT2STR_MAX_LEN + 2) + INT2STR_MAX_LEN + 2 + 2) int socket2str(char* s, int* len, struct socket_info* si);

14 years, 7 months

git:master: xhttp: new module to handle http requests

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: bdba8801cdea18d5cd2852cdecf692a15d349925 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bdba880… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 25 16:14:32 2010 +0200 xhttp: new module to handle http requests - the module can handle http requests sent over TCP/TLS to SIP server - event_route[xhttp:request] is executed in such case - if you need to handle HTTP requests without Content-Lenght header, set tcp_accept_no_cl=1 - it may conflict in HTTP handling with xmlrpc as they use same concept, you can set parameter mode=1 for xmrpc module and then call xmlrpc functions from event_route[xhttp:request] - you can use url_match parameter to filter which HTTP requests are handled by this module --- modules/xhttp/Makefile | 14 ++ modules/xhttp/README | 114 +++++++++ modules/xhttp/doc/Makefile | 4 + modules/xhttp/doc/xhttp.xml | 37 +++ modules/xhttp/doc/xhttp_admin.xml | 108 +++++++++ modules/xhttp/xhttp_mod.c | 468 +++++++++++++++++++++++++++++++++++++ 6 files changed, 745 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=bdb…

14 years, 7 months

git:master: tcp: new parameter to accept messages without CL

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d4cc410326a5b0662f267ed5dc5bba3b67c901f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d4cc410… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 25 10:48:54 2010 +0200 tcp: new parameter to accept messages without CL - some non-sip messages with empty body do not carry content-length - useful for http traffic handled locally - global parameter name: tcp_accept_no_cl - default is 0 (report error of CL is missing, default behaviour so far) - value can be changed at runtime --- cfg.lex | 3 +++ cfg.y | 9 +++++++++ tcp_options.h | 1 + tcp_read.c | 22 ++++++++++++++++------ 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/cfg.lex b/cfg.lex index b265559..e4b5486 100644 --- a/cfg.lex +++ b/cfg.lex @@ -418,6 +418,7 @@ TCP_OPT_KEEPIDLE "tcp_keepidle" TCP_OPT_KEEPINTVL "tcp_keepintvl" TCP_OPT_KEEPCNT "tcp_keepcnt" TCP_OPT_CRLF_PING "tcp_crlf_ping" +TCP_OPT_ACCEPT_NO_CL "tcp_accept_no_cl" DISABLE_TLS "disable_tls"|"tls_disable" ENABLE_TLS "enable_tls"|"tls_enable" TLSLOG "tlslog"|"tls_log" @@ -792,6 +793,8 @@ SUBST subst return TCP_OPT_KEEPCNT; } <INITIAL>{TCP_OPT_CRLF_PING} { count(); yylval.strval=yytext; return TCP_OPT_CRLF_PING; } +<INITIAL>{TCP_OPT_ACCEPT_NO_CL} { count(); yylval.strval=yytext; + return TCP_OPT_ACCEPT_NO_CL; } <INITIAL>{DISABLE_TLS} { count(); yylval.strval=yytext; return DISABLE_TLS; } <INITIAL>{ENABLE_TLS} { count(); yylval.strval=yytext; return ENABLE_TLS; } <INITIAL>{TLSLOG} { count(); yylval.strval=yytext; return TLS_PORT_NO; } diff --git a/cfg.y b/cfg.y index f4e32ed..5052078 100644 --- a/cfg.y +++ b/cfg.y @@ -461,6 +461,7 @@ extern char *finame; %token TCP_OPT_KEEPINTVL %token TCP_OPT_KEEPCNT %token TCP_OPT_CRLF_PING +%token TCP_OPT_ACCEPT_NO_CL %token DISABLE_TLS %token ENABLE_TLS %token TLSLOG @@ -1172,6 +1173,14 @@ assign_stm: #endif } | TCP_OPT_CRLF_PING EQUAL error { yyerror("boolean value expected"); } + | TCP_OPT_ACCEPT_NO_CL EQUAL NUMBER { + #ifdef USE_TCP + tcp_default_cfg.accept_no_cl=$3; + #else + warn("tcp support not compiled in"); + #endif + } + | TCP_OPT_ACCEPT_NO_CL EQUAL error { yyerror("boolean value expected"); } | DISABLE_TLS EQUAL NUMBER { #ifdef USE_TLS tls_disable=$3; diff --git a/tcp_options.h b/tcp_options.h index a82a574..ae8215c 100644 --- a/tcp_options.h +++ b/tcp_options.h @@ -141,6 +141,7 @@ struct cfg_group_tcp{ /* internal, "fixed" vars */ unsigned int rd_buf_size; /* read buffer size (should be > max. datagram)*/ unsigned int wq_blk_size; /* async write block size (debugging use) */ + int accept_no_cl; /* on/off - accpet messages without content-lenght */ }; extern struct cfg_group_tcp tcp_default_cfg; diff --git a/tcp_read.c b/tcp_read.c index c5fc575..fc9552a 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -370,9 +370,17 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) goto skip; } }else{ - DBG("tcp_read_headers: ERROR: no clen, p=%X\n", + if (cfg_get(tcp, tcp_cfg, accept_no_cl)!=0) { + r->body=p+1; + r->bytes_to_go=0; + r->flags|=F_TCP_REQ_COMPLETE; + p++; + goto skip; + } else { + DBG("tcp_read_headers: ERROR: no clen, p=%X\n", *p); - r->error=TCP_REQ_BAD_LEN; + r->error=TCP_REQ_BAD_LEN; + } } }else r->state=H_SKIP; p++; @@ -719,11 +727,13 @@ again: DBG("tcp_read_req: body:\n%.*s\n", req->content_len,req->body); #endif }else{ - req->error=TCP_REQ_BAD_LEN; - LOG(L_ERR, "ERROR: tcp_read_req: content length not present or" + if (cfg_get(tcp, tcp_cfg, accept_no_cl)==0) { + req->error=TCP_REQ_BAD_LEN; + LOG(L_ERR, "ERROR: tcp_read_req: content length not present or" " unparsable\n"); - resp=CONN_ERROR; - goto end_req; + resp=CONN_ERROR; + goto end_req; + } } /* if we are here everything is nice and ok*/ resp=CONN_RELEASE;

14 years, 7 months

git:master: xcap_server: new module providing xcap server functinality

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e6d56890d7325da00e76ef561185d7b7426514d7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e6d5689… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 25 16:19:43 2010 +0200 xcap_server: new module providing xcap server functinality - re-use the transport layer from SIP server - XCAP documents can be sent via SIP (UDP, TCP, TLS, SCTP, HTTP and HTTPS - re-use xcap table from K presence server to store the documents - implemented basic ops: PUT, GET and DELETE - no much testing done so far - todo: document validation and xcap diff operations --- modules_k/xcap_server/Makefile | 22 + modules_k/xcap_server/README | 310 ++++++++ modules_k/xcap_server/doc/Makefile | 4 + modules_k/xcap_server/doc/xcap_server.xml | 37 + modules_k/xcap_server/doc/xcap_server_admin.xml | 362 ++++++++++ modules_k/xcap_server/xcap_server.c | 860 +++++++++++++++++++++++ 6 files changed, 1595 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e6d…

14 years, 7 months

git:master: tcp: filled description of tcp_accept_no_cl

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 866a36998ffee5fd7ce182c5dd6ca16c0231bd8c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=866a369… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 25 15:15:38 2010 +0200 tcp: filled description of tcp_accept_no_cl - added missing description in tcp options structure --- tcp_options.c | 2 ++ tcp_options.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tcp_options.c b/tcp_options.c index 79fe196..734f9fb 100644 --- a/tcp_options.c +++ b/tcp_options.c @@ -110,6 +110,8 @@ static cfg_def_t tcp_cfg_def[] = { "flags used for adding new aliases (FORCE_ADD:1 , REPLACE:2) "}, { "new_conn_alias_flags", CFG_VAR_INT | CFG_ATOMIC, 0, 2, 0, 0, "flags for the def. aliases for a new conn. (FORCE_ADD:1, REPLACE:2 "}, + { "accept_no_cl", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, + "accept TCP messges without Content-Lenght "}, /* internal and/or "fixed" versions of some vars (not supposed to be writeable, read will provide only debugging value*/ { "rd_buf_size", CFG_VAR_INT | CFG_ATOMIC, 512, 65536, 0, 0, diff --git a/tcp_options.h b/tcp_options.h index ae8215c..f869c9a 100644 --- a/tcp_options.h +++ b/tcp_options.h @@ -138,10 +138,11 @@ struct cfg_group_tcp{ int accept_aliases; int alias_flags; int new_conn_alias_flags; + int accept_no_cl; /* on/off - accpet messages without content-lenght */ + /* internal, "fixed" vars */ unsigned int rd_buf_size; /* read buffer size (should be > max. datagram)*/ unsigned int wq_blk_size; /* async write block size (debugging use) */ - int accept_no_cl; /* on/off - accpet messages without content-lenght */ }; extern struct cfg_group_tcp tcp_default_cfg;

14 years, 7 months

git:master: xmlrpc: new parameter - mode

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 42d7638f14064c5901048131ad7887c6f4b70447 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=42d7638… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 25 10:29:03 2010 +0200 xmlrpc: new parameter - mode - mode parameter controls the registration for non-SIP message callbacks - if set to 1, module does not register the callback, the execution of XMLRPC functions being done from config. Useful if other module register callback for same type of messages, i.e., HTTP - default is 0 (backward compatible default behavior) --- modules/xmlrpc/README | 21 +++++++++++++++++---- modules/xmlrpc/doc/params.xml | 19 +++++++++++++++++++ modules/xmlrpc/xmlrpc.c | 21 +++++++++++++-------- 3 files changed, 49 insertions(+), 12 deletions(-) diff --git a/modules/xmlrpc/README b/modules/xmlrpc/README index fed4a70..7a7b6f7 100644 --- a/modules/xmlrpc/README +++ b/modules/xmlrpc/README @@ -2,7 +2,7 @@ Jan Janak iptelorg GmbH - Copyright � 2005 iptelorg GmbH + Copyright © 2005 iptelorg GmbH Revision History Revision $Revision$ $Date$ __________________________________________________________________ @@ -24,6 +24,7 @@ Jan Janak 1.5.2. autoconversion (string) 1.5.3. escape_cr (integer) 1.5.4. double_lf_to_crlf (integer) + 1.5.5. mode (integer) 1.6. Functions @@ -407,7 +408,7 @@ Content-Length: 276 1.3.3. Type Conversion The data types of the RPC API are converted to the data types of - XML-RPC and vice versa. Table 1, "Data Type Conversion" shows for each + XML-RPC and vice versa. Table 1, “Data Type Conversion” shows for each RPC API data type corresponding XML-RPC data type. Table 1. Data Type Conversion @@ -565,6 +566,18 @@ modparam("xmlrpc", "escape_cr", 1) Example 5. Set the double_lf_to_crlf parameter modparam("xmlrpc", "double_lf_to_crlf", 1) +1.5.5. mode (integer) + + When set to 1, xmlrpc module does not register to core the callback + functions for non-SIP messages. Useful when other module register a + callback for HTTP request, being the decision of admin when to call the + XMLRPC route (or functions). + + Default: 0. + + Example 6. Set the mode parameter +modparam("xmlrpc", "mode", 1) + 1.6. Functions Revision History @@ -586,7 +599,7 @@ modparam("xmlrpc", "double_lf_to_crlf", 1) function with matching name. If such a function is found then dispatch_rpc() will pass control to the function to handle the request. - Example 6. dispatch_rpc usage + Example 7. dispatch_rpc usage #... modparam("xmlrpc", "route", "XMLRPC"); #... @@ -602,7 +615,7 @@ route[XMLRPC]{ This function can be called from the config script to directly generate an XML-RPC reply. - Example 7. xmlrpc_reply usage + Example 8. xmlrpc_reply usage #... modparam("xmlrpc", "route", "XMLRPC"); #... diff --git a/modules/xmlrpc/doc/params.xml b/modules/xmlrpc/doc/params.xml index f200b55..67e7a5f 100644 --- a/modules/xmlrpc/doc/params.xml +++ b/modules/xmlrpc/doc/params.xml @@ -116,6 +116,25 @@ modparam("xmlrpc", "double_lf_to_crlf", 1) </example> </section> + <section id="param_mode"> + <title><varname>mode</varname> (integer)</title> + <para> + When set to 1, xmlrpc module does not register to core the callback + functions for non-SIP messages. Useful when other module register + a callback for HTTP request, being the decision of admin when to + call the XMLRPC route (or functions). + </para> + <para> + Default: 0. + </para> + <example> + <title>Set the <varname>mode</varname> parameter</title> + <programlisting> +modparam("xmlrpc", "mode", 1) + </programlisting> + </example> + </section> + <!-- Obsolete (hardwired on in the rpc core functions, cannot be turned off) -andrei diff --git a/modules/xmlrpc/xmlrpc.c b/modules/xmlrpc/xmlrpc.c index dc7af86..c502ad9 100644 --- a/modules/xmlrpc/xmlrpc.c +++ b/modules/xmlrpc/xmlrpc.c @@ -397,7 +397,8 @@ static int escape_cr=1; /* default on */ /* convert double LF to CR LF (when on, LFLF becomes an escape for CRLF, needed with some xmlrpc clients that are not escaping CR to  )*/ static int lflf2crlf=0; /* default off */ - +/* do not register for non-sip requests */ +static int xmlrpc_mode = 0; /* * Exported functions @@ -417,6 +418,7 @@ static param_export_t params[] = { {"autoconversion", PARAM_INT, &autoconvert}, {"escape_cr", PARAM_INT, &escape_cr}, {"double_lf_to_crlf", PARAM_INT, &lflf2crlf}, + {"mode", PARAM_INT, &xmlrpc_mode}, {0, 0, 0} }; @@ -2388,13 +2390,16 @@ static int mod_init(void) register_select_table(xmlrpc_sel); /* register non-sip hooks */ - memset(&nsh, 0, sizeof(nsh)); - nsh.name="xmlrpc"; - nsh.destroy=0; - nsh.on_nonsip_req=process_xmlrpc; - if (register_nonsip_msg_hook(&nsh)<0){ - ERR("Failed to register non sip msg hooks\n"); - return -1; + if(xmlrpc_mode==0) + { + memset(&nsh, 0, sizeof(nsh)); + nsh.name="xmlrpc"; + nsh.destroy=0; + nsh.on_nonsip_req=process_xmlrpc; + if (register_nonsip_msg_hook(&nsh)<0){ + ERR("Failed to register non sip msg hooks\n"); + return -1; + } } return 0; }

14 years, 7 months

Re: [sr-dev] direction check missing in record_route()

by NeoTel Lists

This patch does it for me: --- --- modules/rr/record.c.ori 2010-05-25 13:10:48.000000000 +0200 +++ modules/rr/record.c 2010-05-25 13:37:26.000000000 +0200 @@ -41,6 +41,7 @@ #include "../../data_lump.h" #include "record.h" #include "rr_mod.h" +#include "loose.h" #define RR_PREFIX "Record-Route: <sip:" @@ -291,12 +292,20 @@ } if (append_fromtag) { - if (parse_from_header(_m) < 0) { - LM_ERR("From parsing failed\n"); - return -2; + if (is_direction(_m, RR_FLOW_UPSTREAM)==0) { + /* use to-tag in script! */ + + LM_DBG("from-tag not added on upstream request (it's wrong anyway)! Must be done manually using record_route(\";ftag=$tt\");"); + + tag = 0; + } else { + if (parse_from_header(_m) < 0) { + LM_ERR("From parsing failed\n"); + return -2; + } + from = (struct to_body*)_m->from->parsed; + tag = &from->tag_value; } - from = (struct to_body*)_m->from->parsed; - tag = &from->tag_value; } else { tag = 0; } --- Plus in script after loose_route(): if (check_route_param("vsf=")) { # fix broken UAC not sending initial route-set $(var(vsf)) = $(hdr(Route)[0]{s.select,0,,}{param.value,vsf}{s.select,0,>}); xlog("L_INFO", ">> Stored UAC param vsf=$(var(vsf))"); if (is_direction("upstream")) { record_route(";ftag=$tt;vsf=$(var(vsf))"); } else { record_route(";vsf=$(var(vsf))"); } } else { if (is_direction("upstream")) { record_route(";ftag=$tt"); } else { record_route(); } } Br Walter Von: sr-dev-bounces(a)lists.sip-router.org [mailto:sr-dev-bounces@lists.sip-router.org] Im Auftrag von NeoTel Lists Gesendet: Dienstag, 25. Mai 2010 13:04 An: sr-dev(a)lists.sip-router.org Betreff: [sr-dev] direction check missing in record_route() Hi! Can someone of the experts pls help me with a fix in record.c/record_route() please? IMHO in append_fromtag=1 mode the direction check is missing, if record_route() is called in loose_route block. (Sure, I know, there is no need to call record_route() there, but since nearly all of the UA out there don't use first record set on reInvites, I must do record routing on reInvites, too!) (And I really do need the vsf parameter in subsequent messages J) So I would do the following: if (append_fromtag) { if (is_direction(_m, RR_FLOW_UPSTREAM)) { /* if not in dialog, would return 0 anyway, e.g. no Route param ftag present */ /* use to-tag! */ Unfortunately there is no "parse_to_header", bec. then it would be simple.... How to access the to-tag, if any? } else { if (parse_from_header(_m) < 0) { LM_ERR("From parsing failed\n"); return -2; } from = (struct to_body*)_m->from->parsed; tag = &from->tag_value; } } else { tag = 0; } -- What I do now is not nice: I set modparam("rr", "append_fromtag", 0) and patched rr_mod.c and uac.c not to return an Error, if append_fromtag is 0 J [root@p01-1 rr]# more ../../../rr_mod.c.patch --- modules/rr/rr_mod.c.ori 2010-05-25 11:03:29.000000000 +0200 +++ modules/rr/rr_mod.c 2010-05-25 12:08:34.000000000 +0200 @@ -172,9 +172,10 @@ int n; if (!append_fromtag) { - LM_ERR("usage of \"is_direction\" function requires parameter" - "\"append_fromtag\" enabled!!"); - return E_CFG; + LM_WARN("usage of \"is_direction\" function requires parameter" + "\"append_fromtag\" enabled!!" + " - must be done manually to work correctly!"); + /* return E_CFG; */ } if (param_no==1) { n = 0; [root@p01-1 rr]# more ../../../uac.c.patch --- modules/uac/uac.c.orig 2010-05-25 10:57:59.000000000 +0200 +++ modules/uac/uac.c 2010-05-25 11:00:40.000000000 +0200 @@ -206,9 +206,13 @@ if (from_restore_mode==FROM_AUTO_RESTORE) { /* we need the append_fromtag on in RR */ if (!uac_rrb.append_fromtag) { - LM_ERR("'append_fromtag' RR param is not enabled!" - " - required by AUTO restore mode\n"); - goto error; + LM_WARN("'append_fromtag' RR param is not enabled!" + " - required by AUTO restore mode" + " - make sure it's done manually!\n"); + /* normally ERR, but just remind script writer, that she has to do ;ftag=$ft/$tt manually + normally this would be OK, but record_route() add $ft in upsteam request + should be fixed in rr module! + goto error; */ } /* get all requests doing loose route */ if (uac_rrb.register_rrcb( rr_checker, 0)!=0) { -- Many thanks! Walter --------------------------------------- NeoTel Telefonservice GmbH & Co KG Esterhazygasse 18a/15 A-1060 Wien T: +43 1 4094181 - 81 M: +43 660 88866 - 81 F: +43 1 4094181 - 981

14 years, 7 months

direction check missing in record_route()

by NeoTel Lists

Hi! Can someone of the experts pls help me with a fix in record.c/record_route() please? IMHO in append_fromtag=1 mode the direction check is missing, if record_route() is called in loose_route block. (Sure, I know, there is no need to call record_route() there, but since nearly all of the UA out there don't use first record set on reInvites, I must do record routing on reInvites, too!) (And I really do need the vsf parameter in subsequent messages J) So I would do the following: if (append_fromtag) { if (is_direction(_m, RR_FLOW_UPSTREAM)) { /* if not in dialog, would return 0 anyway, e.g. no Route param ftag present */ /* use to-tag! */ Unfortunately there is no "parse_to_header", bec. then it would be simple.... How to access the to-tag, if any? } else { if (parse_from_header(_m) < 0) { LM_ERR("From parsing failed\n"); return -2; } from = (struct to_body*)_m->from->parsed; tag = &from->tag_value; } } else { tag = 0; } -- What I do now is not nice: I set modparam("rr", "append_fromtag", 0) and patched rr_mod.c and uac.c not to return an Error, if append_fromtag is 0 J [root@p01-1 rr]# more ../../../rr_mod.c.patch --- modules/rr/rr_mod.c.ori 2010-05-25 11:03:29.000000000 +0200 +++ modules/rr/rr_mod.c 2010-05-25 12:08:34.000000000 +0200 @@ -172,9 +172,10 @@ int n; if (!append_fromtag) { - LM_ERR("usage of \"is_direction\" function requires parameter" - "\"append_fromtag\" enabled!!"); - return E_CFG; + LM_WARN("usage of \"is_direction\" function requires parameter" + "\"append_fromtag\" enabled!!" + " - must be done manually to work correctly!"); + /* return E_CFG; */ } if (param_no==1) { n = 0; [root@p01-1 rr]# more ../../../uac.c.patch --- modules/uac/uac.c.orig 2010-05-25 10:57:59.000000000 +0200 +++ modules/uac/uac.c 2010-05-25 11:00:40.000000000 +0200 @@ -206,9 +206,13 @@ if (from_restore_mode==FROM_AUTO_RESTORE) { /* we need the append_fromtag on in RR */ if (!uac_rrb.append_fromtag) { - LM_ERR("'append_fromtag' RR param is not enabled!" - " - required by AUTO restore mode\n"); - goto error; + LM_WARN("'append_fromtag' RR param is not enabled!" + " - required by AUTO restore mode" + " - make sure it's done manually!\n"); + /* normally ERR, but just remind script writer, that she has to do ;ftag=$ft/$tt manually + normally this would be OK, but record_route() add $ft in upsteam request + should be fixed in rr module! + goto error; */ } /* get all requests doing loose route */ if (uac_rrb.register_rrcb( rr_checker, 0)!=0) { -- Many thanks! Walter --------------------------------------- NeoTel Telefonservice GmbH & Co KG Esterhazygasse 18a/15 A-1060 Wien T: +43 1 4094181 - 81 M: +43 660 88866 - 81 F: +43 1 4094181 - 981

14 years, 7 months

git:andrei/tcp_tls_changes: tls: async support (major tls core rewrite)

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 93c495f34ebb001f9509db82acad5a7483b61d41 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=93c495f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 20 18:24:38 2010 +0200 tls: async support (major tls core rewrite) The new tls hook interface (exported by the tcp code) is now used. All the IO operations are made through a custom SSL BIO, that reads and writes in some memory buffers (see tls_bio.h), while externally emulating a socket. This BIO provides in fact some functions that will be called by the openssl code on IO. In the case of a read event, the data is first read in memory (using tcp_read_data()), then assigned to the BIO and after that one of SSL_read(), SSL_connect/accept (if the connection is not yet established) or SSL_write (if the last write wanted to read some data due to re-keying) are called. They will all read from the custom BIO. A SSL_read() might not use all the data (in some very unlikely situations), so in this case the encrypted data is queued and the tcp code is signaled (via some flags) that it should repeat the read call when more space is available. Writes are split in 2: 1st write on a new connection in async mode and other writes (they need to be handled slightly differently). The encrypted data will end up in a memory buffer (via SSL_write() and the custom BIO). From there it will be either sent directly if possible or queued (tcp_async). In the case when the SSL_write() needs to read some data (e.g. re-keying), the whole clear text data will be queued and the SSL_write() will be retried on the first read event. There is no separate async mode for tls, if tcp is in async mode, then tls will be too and vice versa. Runtime tunning (queue sizes a.s.o) and statistics are missing for now. (C) and license changes: - moved tls_dump_verification_failure into a separate file (tls_dump_vf.c), out of tls_server.c. - the remaining tcp_server.[ch] code is either re-written (most of it, the entire read & write part) or comes from old iptel code => changed the (c) to iptelorg only and the license to BSD-like (only for tcp_server.[ch]). --- modules/tls/tls_dump_vf.c | 144 ++++++ modules/tls/tls_dump_vf.h | 41 ++ modules/tls/tls_init.c | 2 + modules/tls/tls_mod.c | 34 +- modules/tls/tls_server.c | 1105 ++++++++++++++++++++++++--------------------- modules/tls/tls_server.h | 76 ++-- 6 files changed, 831 insertions(+), 571 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=93c…

14 years, 7 months

← Newer
1
...
6
7
8
9
10
11
12
13
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2010