sr-dev

sr-dev@lists.kamailio.org

13 participants
44200 discussions

git:janakj/kcore: Function to retrieve the first URI from Path headers.

by Jan Janak

Module: sip-router Branch: janakj/kcore Commit: 49e8baef3465862976999224eeb58123edfa240b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=49e8bae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 29 20:07:28 2009 +0200 Function to retrieve the first URI from Path headers. Signed-off-by: Jan Janak <jan(a)iptel.org> --- lib/kcore/parser_helpers.c | 26 ++++++++++++++++++++++++++ lib/kcore/parser_helpers.h | 1 + 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/lib/kcore/parser_helpers.c b/lib/kcore/parser_helpers.c index e769160..37aa4fa 100644 --- a/lib/kcore/parser_helpers.c +++ b/lib/kcore/parser_helpers.c @@ -174,3 +174,29 @@ int print_rr_body(struct hdr_field *iroute, str *oroute, int order, error: return -1; } + + +/*! + * Path must be available. Function returns the first uri + * from Path without any duplication. + */ +int get_path_dst_uri(str *_p, str *_dst) +{ + rr_t *route = 0; + + LM_DBG("path for branch: '%.*s'\n", _p->len, _p->s); + if(parse_rr_body(_p->s, _p->len, &route) < 0) { + LM_ERR("failed to parse Path body\n"); + return -1; + } + + if(!route) { + LM_ERR("failed to parse Path body no head found\n"); + return -1; + } + *_dst = route->nameaddr.uri; + + free_rr(&route); + + return 0; +} diff --git a/lib/kcore/parser_helpers.h b/lib/kcore/parser_helpers.h index 76f7e98..e078ab6 100644 --- a/lib/kcore/parser_helpers.h +++ b/lib/kcore/parser_helpers.h @@ -17,5 +17,6 @@ struct sip_uri* parse_from_uri(struct sip_msg* msg); int print_rr_body(struct hdr_field *iroute, str *oroute, int order, unsigned int * nb_recs); +int get_path_dst_uri(str *_p, str *_dst); #endif /* _PARSER_HELPERS_H */

15 years, 9 months

git:master: Use shorter default send and SSL handshake timeouts

by Jan Janak

Module: sip-router Branch: master Commit: 2701984ddd24dd074c2e29b6ac6ea22faffdb1b1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2701984… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sat Mar 28 12:13:24 2009 +0100 Use shorter default send and SSL handshake timeouts Instead of 120 seconds we use use 30 seconds by default for both SSL handshake timeouts and send timeouts, this way the server can detect connection problems faster. --- modules/tls/tls_mod.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tls/tls_mod.c b/modules/tls/tls_mod.c index f3f56b1..436785f 100644 --- a/modules/tls/tls_mod.c +++ b/modules/tls/tls_mod.c @@ -167,8 +167,8 @@ tls_domain_t cli_defaults = { static str tls_method = STR_STATIC_INIT("TLSv1"); -int tls_handshake_timeout = 120; -int tls_send_timeout = 120; +int tls_handshake_timeout = 30; +int tls_send_timeout = 30; int tls_con_lifetime = 600; /* this value will be adjusted to ticks later */ int tls_log = 3; int tls_session_cache = 0;

15 years, 9 months

git:master: Introducing run_top_route function

by Jan Janak

Module: sip-router Branch: master Commit: 8402508053d83414ab3eea62a9a24731c4b23bd3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8402508… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 29 17:53:58 2009 +0200 Introducing run_top_route function Function run_top_route can be used to initialize the environment before a SIP message starts processing in *_route blocks. Internally it resets the script flags, resets the select buffer, initializes the environment using init_run_actions_ctx and passes control to the specified route section. --- action.c | 11 +++++++++++ action.h | 4 +--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/action.c b/action.c index 82812d7..b4758a5 100644 --- a/action.c +++ b/action.c @@ -67,6 +67,7 @@ #include "ut.h" #include "lvalue.h" #include "sr_module.h" +#include "select_buf.h" #include "mem/mem.h" #include "globals.h" #include "dset.h" @@ -1268,3 +1269,13 @@ error: h->rec_lev--; return ret; } + + +int run_top_route(struct action* a, sip_msg_t* msg) +{ + struct run_act_ctx ctx; + setsflagsval(0); + reset_static_buffer(); + init_run_actions_ctx(&ctx); + return run_actions(&ctx, a, msg); +} diff --git a/action.h b/action.h index 9739d34..05b68cf 100644 --- a/action.h +++ b/action.h @@ -59,8 +59,6 @@ struct run_act_ctx{ int do_action(struct run_act_ctx* c, struct action* a, struct sip_msg* msg); int run_actions(struct run_act_ctx* c, struct action* a, struct sip_msg* msg); - - - +int run_top_route(struct action* a, sip_msg_t* msg); #endif

15 years, 9 months

git:master: Use run_top_route where appropriate

by Jan Janak

Module: sip-router Branch: master Commit: 4a8fd3e4d16e460b315083b22ce3b52b6d1e0667 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4a8fd3e… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 29 18:05:24 2009 +0200 Use run_top_route where appropriate This patch replaces the sequence of reset_static_buffer(); init_run_actions_ctx(); run_actions(); at the following places in the code: * execution of a branch route in tm * execution of a failure route in tm * execution of an onreply route in tm * execution of on_sl_reply in tm * execution of a route block after t_continue has been called * execution of the top-level route block in the core when a new SIP request arrives * execution of the top-level onreply route block in the core when a new SIP reply arrives --- modules/tm/t_fwd.c | 11 ++++------- modules/tm/t_reply.c | 16 ++++------------ modules/tm/t_suspend.c | 6 ++---- receive.c | 8 ++------ 4 files changed, 12 insertions(+), 29 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 9e7249c..23ebd2e 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -116,7 +116,6 @@ #ifdef USE_DST_BLACKLIST #include "../../dst_blacklist.h" #endif -#include "../../select_buf.h" /* reset_static_buffer() */ #ifdef POSTPONE_MSG_CLONING #include "../../atomic_ops.h" /* membar_depends() */ #endif @@ -152,7 +151,6 @@ static char *print_uac_request( struct cell *t, struct sip_msg *i_req, struct sip_uri parsed_uri_bak; int parsed_uri_ok_bak, uri_backed_up; str msg_uri_bak; - struct run_act_ctx ra_ctx; shbuf=0; msg_uri_bak.s=0; /* kill warnings */ @@ -190,13 +188,12 @@ static char *print_uac_request( struct cell *t, struct sip_msg *i_req, i_req->body_lumps = dup_lump_list(i_req->body_lumps); if (unlikely(branch_route)) { - reset_static_buffer(); /* run branch_route actions if provided */ set_route_type(BRANCH_ROUTE); - init_run_actions_ctx(&ra_ctx); - if (run_actions(&ra_ctx, branch_rt.rlist[branch_route], i_req) < 0) { - LOG(L_ERR, "ERROR: print_uac_request: Error in run_actions\n"); - } + + if (run_top_route(branch_rt.rlist[branch_route], i_req) < 0) { + LOG(L_ERR, "ERROR: print_uac_request: Error in run_top_route\n"); + } } /* run the specific callbacks for this transaction */ diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 4e8a884..a8d1ec3 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -114,7 +114,6 @@ #include "../../usr_avp.h" #include "../../atomic_ops.h" /* membar_write() */ #include "../../compiler_opt.h" -#include "../../select_buf.h" /* reset_static_buffer() */ #ifdef USE_DST_BLACKLIST #include "../../dst_blacklist.h" #endif @@ -824,7 +823,6 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl, static struct sip_msg faked_req; struct sip_msg *shmem_msg = t->uas.request; int on_failure; - struct run_act_ctx ra_ctx; /* failure_route for a local UAC? */ if (!shmem_msg) { @@ -859,11 +857,9 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl, * on failure */ on_failure = t->on_negative; t->on_negative=0; - reset_static_buffer(); /* run a reply_route action if some was marked */ - init_run_actions_ctx(&ra_ctx); - if (run_actions(&ra_ctx, failure_rt.rlist[on_failure], &faked_req)<0) - LOG(L_ERR, "ERROR: run_failure_handlers: Error in do_action\n"); + if (run_top_route(failure_rt.rlist[on_failure], &faked_req)<0) + LOG(L_ERR, "ERROR: run_failure_handlers: Error in run_top_route\n"); } /* restore original environment and free the fake msg */ @@ -1818,7 +1814,6 @@ int reply_received( struct sip_msg *p_msg ) avp_list_t* backup_user_from, *backup_user_to; avp_list_t* backup_domain_from, *backup_domain_to; avp_list_t* backup_uri_from, *backup_uri_to; - struct run_act_ctx ra_ctx; #ifdef USE_DNS_FAILOVER int branch_ret; int prev_branch; @@ -1962,9 +1957,7 @@ int reply_received( struct sip_msg *p_msg ) backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to ); backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from ); backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to ); - reset_static_buffer(); - init_run_actions_ctx(&ra_ctx); - if (run_actions(&ra_ctx, onreply_rt.rlist[t->on_reply], p_msg)<0) + if (run_top_route(onreply_rt.rlist[t->on_reply], p_msg)<0) LOG(L_ERR, "ERROR: on_reply processing failed\n"); /* transfer current message context back to t */ if (t->uas.request) t->uas.request->flags=p_msg->flags; @@ -2090,8 +2083,7 @@ trans_not_found: if (goto_on_sl_reply) { /* the script writer has a chance to decide whether to forward the reply or not */ - init_run_actions_ctx(&ra_ctx); - return run_actions(&ra_ctx, onreply_rt.rlist[goto_on_sl_reply], p_msg); + return run_top_route(onreply_rt.rlist[goto_on_sl_reply], p_msg); } else { /* let the core forward the reply */ return 1; diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 9b418c1..4a31b80 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -106,7 +106,6 @@ int t_continue(unsigned int hash_index, unsigned int label, { struct cell *t; struct sip_msg faked_req; - struct run_act_ctx ra_ctx; int branch; if (t_lookup_ident(&t, hash_index, label) < 0) { @@ -148,9 +147,8 @@ int t_continue(unsigned int hash_index, unsigned int label, } faked_env( t, &faked_req); - init_run_actions_ctx(&ra_ctx); - if (run_actions(&ra_ctx, route, &faked_req)<0) - LOG(L_ERR, "ERROR: t_continue: Error in run_action\n"); + if (run_top_route(route, &faked_req)<0) + LOG(L_ERR, "ERROR: t_continue: Error in run_top_route\n"); /* TODO: save_msg_lumps should clone the lumps to shm mem */ diff --git a/receive.c b/receive.c index beb4c58..9941df7 100644 --- a/receive.c +++ b/receive.c @@ -85,7 +85,6 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) { struct sip_msg* msg; int ret; - struct run_act_ctx ra_ctx; #ifdef STATS int skipped = 1; struct timeval tvb, tve; @@ -123,7 +122,6 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) /* ... clear branches from previous message */ clear_branches(); - reset_static_buffer(); if (msg->first_line.type==SIP_REQUEST){ if (!IS_SIP(msg)){ @@ -171,8 +169,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) set_route_type(REQUEST_ROUTE); /* exec the routing script */ - init_run_actions_ctx(&ra_ctx); - if (run_actions(&ra_ctx, main_rt.rlist[DEFAULT_RT], msg)<0){ + if (run_top_route(main_rt.rlist[DEFAULT_RT], msg)<0){ LOG(L_WARN, "WARNING: receive_msg: " "error while trying script\n"); goto error_req; @@ -215,8 +212,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) /* exec the onreply routing script */ if (onreply_rt.rlist[DEFAULT_RT]){ set_route_type(ONREPLY_ROUTE); - init_run_actions_ctx(&ra_ctx); - ret=run_actions(&ra_ctx, onreply_rt.rlist[DEFAULT_RT], msg); + ret=run_top_route(onreply_rt.rlist[DEFAULT_RT], msg); if (ret<0){ LOG(L_WARN, "WARNING: receive_msg: " "error while trying onreply script\n");

15 years, 9 months

git:master: Export picked branch index via the tm module API.

by Jan Janak

Module: sip-router Branch: master Commit: 148b8faa4c38115bbe47809f0921fd20f86c6567 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=148b8fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Jan Janak <jan(a)iptel.org> Date: Sat Mar 28 15:01:19 2009 +0100 Export picked branch index via the tm module API. This patch turns a function-local variable into a global variable in the module and adds a new function to read the value of the variable. The function is then exported via the tm module API. Signed-off-by: Jan Janak <jan(a)iptel.org> --- modules/tm/t_reply.c | 10 +++++++++- modules/tm/t_reply.h | 3 +++ modules/tm/tm_load.c | 1 + modules/tm/tm_load.h | 1 + 4 files changed, 14 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index a72f134..4e8a884 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -182,6 +182,15 @@ int t_get_reply_totag(struct sip_msg *msg, str *totag) return 1; } +static int picked_branch = -1; + +/*! \brief returns the picked branch */ +int t_get_picked_branch(void) +{ + return picked_branch; +} + + /* we store the reply_route # in private memory which is @@ -1000,7 +1009,6 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, branch_bm_t *cancel_bitmap, struct sip_msg *reply ) { int branch_cnt; - int picked_branch; int picked_code; int new_branch; int inv_through; diff --git a/modules/tm/t_reply.h b/modules/tm/t_reply.h index fa9324d..65b4498 100644 --- a/modules/tm/t_reply.h +++ b/modules/tm/t_reply.h @@ -164,4 +164,7 @@ int fake_req(struct sip_msg *faked_req, void free_faked_req(struct sip_msg *faked_req, struct cell *t); +typedef int (*tget_picked_f)(void); +int t_get_picked_branch(void); + #endif diff --git a/modules/tm/tm_load.c b/modules/tm/tm_load.c index c61d39d..ebdf0a8 100644 --- a/modules/tm/tm_load.c +++ b/modules/tm/tm_load.c @@ -227,5 +227,6 @@ int load_tm( struct tm_binds *tmb) } tmb->t_get_reply_totag = t_get_reply_totag; + tmb->t_get_picked_branch = t_get_picked_branch; return 1; } diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index 98b9ff2..bc99256 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -133,6 +133,7 @@ struct tm_binds { t_suspend_f t_suspend; t_continue_f t_continue; tget_reply_totag_f t_get_reply_totag; + tget_picked_f t_get_picked_branch; }; extern int tm_init;

15 years, 9 months

sip-router: modules & repositories

by Andrei Pelinescu-Onciul

Hi, We've reached the point where we should start adding modules. Me and Jan would like to start moving ser modules to sip-router. ser modules are particularly easy because we can move changes from ser cvs semi-automatically (only a git pull required), so we don't need to stop development on cvs. Soon we will have to add kamailio modules too, but for kamailio it would be more painful, both because of the bigger number of changes required and because it's difficult to update from svn (so it would be better if all developers would move to git or use patches). We must decide if we use separate repositories or a branch in sip-router and we should also start thinking about the version number of the first ser and first kamailio based on sip-router. Repositories: 1. we use branches inside sip-router: master - like now, only core, tm and common modules ser_30 - master merged with ser_modules, next version of ser will come out of it kamailio_30 - same like above Disadvantages: - one big repo - people must be careful _not_ to merge ser_30 or kamailio_30 into master (that would bring all the modules into master which is not what we want) - if someone working on the ser_30 branch (for example) finds a problem in the core and wants to fix it, it has to do it on the master branch. - if the above requirement cannot be avoided and someone does a specific core change in ser_30 or k_30 (e.g. name in makefile), it should always do it in a separate commit (no commits touching both core/tm and some project specific module, instead separate commits for the common part so that they might be cherry-picked) 2. we use 3 repositories: sip-router - like now, only the common part: core, tm and common modules ser-ng - sip-router + ser modules kamailio-ng - sip-router + k modules Advantages: - 3 smaller repos - more difficult to make mistakes and merge kamailio or ser into sip-router/master Disadvantages: - 3 smaller repos :-) - same as for (1) In general whatever we can do with branches in the same repo we can with branches in different repos, so a complete kamailio-ser merge would not be affected if we use separate repos. Version numbers: I think it would be a good idea to come up with a versioning scheme that would reflect the common part used for future ser and kamailio releases. Maybe 3.x (3 being > then both current ser and kamailio version), or mabye v.v.X , where v.v is the sip-router version (common part) and X is the project version (ser or kamailio). What's important is to (very) quickly decide on the repository layout (because this will slow us down) and on the names for the branches or for the different repos. Once this is decided we want to quickly make a test ser version based on sip-router and start testing it. If everything looks ok we want to start using it on iptel.org. Andrei

15 years, 9 months

git:andrei/modules_dirs: build system: support for multiple modules dirs

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/modules_dirs Commit: d3a4a0dbfdc468b2f8808a89fb3ab632dc5dbdf8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d3a4a0d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Mar 27 20:44:36 2009 +0100 build system: support for multiple modules dirs Multiple modules directories are now supported. The list of the modules directories is in Makefile.dirs in $(modules_dirs). Name restrictions: the names must not match any makefile variable name and they shouldn't contain any '-' char. The modules and modules doc/READMEs will be installed in separate dirs (e.g. for modules_dirs="modules modules_s modules_k" , the modules will be installed in .../lib/ser/modules , ...lib/ser/modules_s and ...lib/ser/modules_k). The module man pages will all be installed in the same man dir (but so far only some ser modules have man pages so we should be safe). New make targets: every-module - make all the modules in all the module dirs install-every-module - like above, but install install-every-module-doc install-every-module-man Targets dependent on $(modules_dirs) content: $(m), $(m)-doc, $(m)-readme, $(m)-man, install-$(m), install-$(m)-doc, install-$(m)-man. E.g.: for modules_dirs=modules modules_k modules_s make modules - make all modules in the directory "modules". make modules_k - make all the modules in the directory modules_k. make every-module - make all the modules in the directories modules, modules_k and modules_s. make install-modules_s - install all the modules in the directory modules_s. --- Makefile | 309 ++++++++++++++++++++++++++++++++++-------------------- Makefile.defs | 3 +- Makefile.dirs | 23 ++++ Makefile.modules | 16 ++-- Makefile.rules | 12 +- Makefile.sources | 2 +- Makefile.targets | 22 +++-- 7 files changed, 249 insertions(+), 138 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d3a…

15 years, 9 months

git:master: Exporting TLS module functions through the pseudo-variable interface

by Jan Janak

Module: sip-router Branch: master Commit: 7c757bb1b2e62f2319cff2ed4d79405b6f48f4df URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c757bb… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Mar 27 18:12:12 2009 +0100 Exporting TLS module functions through the pseudo-variable interface This patch adds pseudo-variable related function from kamailio, these function work on top of the generic functions in tls_select.c --- modules/tls/tls_select.c | 430 +++++++++++++++++++++++++++++++++++++++++++++- modules/tls/tls_select.h | 6 +- 2 files changed, 433 insertions(+), 3 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=7c7…

15 years, 9 months

git:master: Prepare for inclusion of kamailio PV functions

by Jan Janak

Module: sip-router Branch: master Commit: 226d8a1af6d95637a9caab0661b202a6ad1020c0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=226d8a1… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Mar 27 15:23:55 2009 +0100 Prepare for inclusion of kamailio PV functions List of changes: * All select functions has been split into a generit part that can be reused by PV function and a select part which contains the code specific for the SER select framework. * Indentation fixed * check_cert renamed to sel_check_cert to follow the naming scheme of all other select functions * get_cert function logs an error message when it fails to retrieve certificate from the SSL structure --- modules/tls/tls_select.c | 358 +++++++++++++++++++++++++++++----------------- 1 files changed, 224 insertions(+), 134 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=226…

15 years, 9 months

git:master: Support for server name TLS extension

by Jan Janak

Module: sip-router Branch: master Commit: 7f42056f688fb9b586d42a2deb974002c393a3a5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f42056… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Mar 27 16:24:58 2009 +0100 Support for server name TLS extension This patch adds support fot the server name TLS extension, the server name string can be retrieved with the following two selects: @tls.serverName or @tls.server_name --- modules/tls/tls_select.c | 76 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 75 insertions(+), 1 deletions(-) diff --git a/modules/tls/tls_select.c b/modules/tls/tls_select.c index fb586aa..613fb14 100644 --- a/modules/tls/tls_select.c +++ b/modules/tls/tls_select.c @@ -59,7 +59,8 @@ enum { COMP_HOST, /* hostname from subject/alternative */ COMP_URI, /* URI from subject/alternative */ COMP_E, /* Email address */ - COMP_IP /* IP from subject/alternative */ + COMP_IP, /* IP from subject/alternative */ + TLSEXT_SN /* Server name of the peer */ }; @@ -691,6 +692,75 @@ static int sel_cert(str* res, select_t* s, struct sip_msg* msg) } +#ifdef OPENSSL_NO_TLSEXT +static int get_tlsext_sn(str* res, int type, sip_msg_t* msg) +{ + ERR("TLS extension 'server name' is not available! " + "please install openssl with TLS extension support and recompile " + "the server\n"); + return -1; +} +#else +static int get_tlsext_sn(str* res, sip_msg_t* msg) +{ + static char buf[1024]; + struct tcp_connection* c; + str server_name; + SSL* ssl; + + c = get_cur_connection(msg); + if (!c) { + INFO("TLS connection not found in select_desc\n"); + goto error; + } + ssl = get_ssl(c); + if (!ssl) goto error; + + buf[0] = '\0'; + + server_name.s = (char*)SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name); + if (server_name.s) { + DBG("received server_name (TLS extension): '%.*s'\n", + STR_FMT(&server_name)); + server_name.len = strlen(server_name.s); + } else { + DBG("SSL_get_servername returned NULL\n"); + goto error; + } + + /* copy server_name into the buffer. If the buffer is too small copy only + * the last bytes as these are the more important ones and prefix with + * '+' */ + if (server_name.len > sizeof(buf)) { + ERR("server_name to big for buffer\n"); + buf[0] = '+'; + memcpy(buf + 1, server_name.s + 1 + server_name.len - sizeof(buf), + sizeof(buf) - 1); + res->len = sizeof(buf); + } else { + memcpy(buf, server_name.s, server_name.len); + res->len = server_name.len; + } + res->s = buf; + + tcpconn_put(c); + return 0; + +error: + if (c) tcpconn_put(c); + return -1; +} +#endif + + +static int sel_tlsext_sn(str* res, select_t* s, sip_msg_t* msg) +{ + return get_tlsext_sn(res, msg); +} + + + + select_row_t tls_sel[] = { /* Current cipher parameters */ { NULL, SEL_PARAM_STR, STR_STATIC_INIT("tls"), sel_tls, 0}, @@ -699,6 +769,10 @@ select_row_t tls_sel[] = { { sel_tls, SEL_PARAM_STR, STR_STATIC_INIT("desc"), sel_desc, 0}, { sel_tls, SEL_PARAM_STR, STR_STATIC_INIT("description"), sel_desc, 0}, { sel_tls, SEL_PARAM_STR, STR_STATIC_INIT("cipher"), sel_cipher, 0}, + + { sel_tls, SEL_PARAM_STR, STR_STATIC_INIT("serverName"), sel_tlsext_sn, 0}, + { sel_tls, SEL_PARAM_STR, STR_STATIC_INIT("server_name"), sel_tlsext_sn, 0}, + { sel_tls, SEL_PARAM_STR, STR_STATIC_INIT("peer"), sel_cert, DIVERSION | CERT_PEER}, { sel_tls, SEL_PARAM_STR, STR_STATIC_INIT("my"), sel_cert, DIVERSION | CERT_LOCAL}, { sel_tls, SEL_PARAM_STR, STR_STATIC_INIT("me"), sel_cert, DIVERSION | CERT_LOCAL},

15 years, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev