sr-dev August 2019

sr-dev@lists.kamailio.org

17 participants
339 discussions

git:master:308b7a2f: core: tcp - new core parameter tcp_accept_unique

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 308b7a2f7b6a7c50e05a2c83537f85b95f979c32 URL: https://github.com/kamailio/kamailio/commit/308b7a2f7b6a7c50e05a2c83537f85b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T10:11:21+02:00 core: tcp - new core parameter tcp_accept_unique - if set to 1, do an extra check when a new connection is created to be sure the is no overlapping with another connection on local ip/port and remote ip/port - recently some tcp/ip router/balancers can do port sharing, but that can create troubles for routing of the requests with the current tcp routing implementation (e.g., using the wrong connection in such group) - default is set to 0 --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/308b7a2f7b6a7c50e05a2c83537f85b… Patch: https://github.com/kamailio/kamailio/commit/308b7a2f7b6a7c50e05a2c83537f85b… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index dd1b935d8f..20a8fd94ef 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -375,6 +375,7 @@ MHOMED mhomed DISABLE_TCP "disable_tcp" TCP_CHILDREN "tcp_children" TCP_ACCEPT_ALIASES "tcp_accept_aliases" +TCP_ACCEPT_UNIQUE "tcp_accept_unique" TCP_SEND_TIMEOUT "tcp_send_timeout" TCP_CONNECT_TIMEOUT "tcp_connect_timeout" TCP_CON_LIFETIME "tcp_connection_lifetime" @@ -814,6 +815,8 @@ IMPORTFILE "import_file" <INITIAL>{TCP_CHILDREN} { count(); yylval.strval=yytext; return TCP_CHILDREN; } <INITIAL>{TCP_ACCEPT_ALIASES} { count(); yylval.strval=yytext; return TCP_ACCEPT_ALIASES; } +<INITIAL>{TCP_ACCEPT_UNIQUE} { count(); yylval.strval=yytext; + return TCP_ACCEPT_UNIQUE; } <INITIAL>{TCP_SEND_TIMEOUT} { count(); yylval.strval=yytext; return TCP_SEND_TIMEOUT; } <INITIAL>{TCP_CONNECT_TIMEOUT} { count(); yylval.strval=yytext; diff --git a/src/core/cfg.y b/src/core/cfg.y index 4c7dcd1307..3adff2429b 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -406,6 +406,7 @@ extern char *default_routename; %token MHOMED %token DISABLE_TCP %token TCP_ACCEPT_ALIASES +%token TCP_ACCEPT_UNIQUE %token TCP_CHILDREN %token TCP_CONNECT_TIMEOUT %token TCP_SEND_TIMEOUT @@ -994,6 +995,14 @@ assign_stm: #endif } | TCP_ACCEPT_ALIASES EQUAL error { yyerror("boolean value expected"); } + | TCP_ACCEPT_UNIQUE EQUAL NUMBER { + #ifdef USE_TCP + tcp_accept_unique=$3; + #else + warn("tcp support not compiled in"); + #endif + } + | TCP_ACCEPT_UNIQUE EQUAL error { yyerror("number expected"); } | TCP_CHILDREN EQUAL NUMBER { #ifdef USE_TCP tcp_cfg_children_no=$3; diff --git a/src/core/globals.h b/src/core/globals.h index 3790058075..78a8e5aadc 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -93,6 +93,7 @@ extern int socket_workers; #ifdef USE_TCP extern int tcp_main_pid; extern int tcp_cfg_children_no; +extern int tcp_accept_unique; extern int tcp_children_no; extern int tcp_disable; extern enum poll_types tcp_poll_method; diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 54288e908f..7ecaf47eb6 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -158,6 +158,7 @@ enum poll_types tcp_poll_method=0; /* by default choose the best method */ int tcp_main_max_fd_no=0; int tcp_max_connections=DEFAULT_TCP_MAX_CONNECTIONS; int tls_max_connections=DEFAULT_TLS_MAX_CONNECTIONS; +int tcp_accept_unique=0; static union sockaddr_union tcp_source_ipv4_addr; /* saved bind/srv v4 addr. */ static union sockaddr_union* tcp_source_ipv4=0; @@ -1655,6 +1656,24 @@ struct tcp_connection* _tcpconn_find(int id, struct ip_addr* ip, int port, } +/** + * find if a tcp connection exits by id or remote+local address/port + * - return: 1 if found; 0 if not found + */ +int tcpconn_exists(int conn_id, ip_addr_t* peer_ip, int peer_port, + ip_addr_t* local_ip, int local_port) +{ + tcp_connection_t* c; + + TCPCONN_LOCK; + c=_tcpconn_find(conn_id, peer_ip, peer_port, local_ip, local_port); + TCPCONN_UNLOCK; + if (c) { + return 1; + } + return 0; + +} /* _tcpconn_find with locks and timeout * local_addr contains the desired local ip:port. If null any local address @@ -4245,6 +4264,15 @@ static inline int handle_new_connect(struct socket_info* si) /* add socket to list */ tcpconn=tcpconn_new(new_sock, &su, dst_su, si, si->proto, S_CONN_ACCEPT); if (likely(tcpconn)){ + if(tcp_accept_unique) { + if(tcpconn_exists(0, &tcpconn->rcv.dst_ip, tcpconn->rcv.dst_port, + &tcpconn->rcv.src_ip, tcpconn->rcv.src_port)) { + LM_ERR("duplicated connection by local and remote addresses\n"); + _tcpconn_free(tcpconn); + tcp_safe_close(new_sock); + return 1; /* success, because the accept was succesfull */ + } + } tcpconn->flags|=F_CONN_PASSIVE; #ifdef TCP_PASS_NEW_CONNECTION_ON_DATA atomic_set(&tcpconn->refcnt, 1); /* safe, not yet available to the

5 years, 3 months

[kamailio/kamailio] lost: code review, updates to memory managment and error handling (#2034)

by Wolfgang Kampichler

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2034 -- Commit Summary -- * lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing * lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing * lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing * lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing -- File Changes -- A src/modules/lost/Makefile (23) A src/modules/lost/doc/Makefile (4) A src/modules/lost/doc/lost.xml (36) A src/modules/lost/doc/lost_admin.xml (265) A src/modules/lost/functions.c (590) A src/modules/lost/functions.h (40) A src/modules/lost/lost.c (339) A src/modules/lost/pidf.c (137) A src/modules/lost/pidf.h (50) A src/modules/lost/utilities.c (653) A src/modules/lost/utilities.h (76) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2034.patch https://github.com/kamailio/kamailio/pull/2034.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2034

5 years, 3 months

git:master:edd056dd: lost: small spelling fix in docs

by Henning Westerholt

Module: kamailio Branch: master Commit: edd056dd85e2f68fd7877592e7bd2fc5d15b7b64 URL: https://github.com/kamailio/kamailio/commit/edd056dd85e2f68fd7877592e7bd2fc… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:16:03+02:00 lost: small spelling fix in docs --- Modified: src/modules/lost/doc/lost_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/edd056dd85e2f68fd7877592e7bd2fc… Patch: https://github.com/kamailio/kamailio/commit/edd056dd85e2f68fd7877592e7bd2fc… --- diff --git a/src/modules/lost/doc/lost_admin.xml b/src/modules/lost/doc/lost_admin.xml index 9acfc3e4b6..d4228f3044 100644 --- a/src/modules/lost/doc/lost_admin.xml +++ b/src/modules/lost/doc/lost_admin.xml @@ -239,7 +239,7 @@ xlog("L_INFO", "LOST findService: Result code $var(res)\nUri: $var(uri)\nName: $ <section id="lost.s.counters"> <title>Counters</title> <para> - This module has no specific counters but uses http_client therfore + This module has no specific counters but uses http_client therefore according counters may apply. </para> </section>

5 years, 3 months

git:master:4b317d12: build: add new lost module to extra module group

by Henning Westerholt

Module: kamailio Branch: master Commit: 4b317d12a3b9786b1d5ba152e9fb1f1189484e02 URL: https://github.com/kamailio/kamailio/commit/4b317d12a3b9786b1d5ba152e9fb1f1… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:15:24+02:00 build: add new lost module to extra module group --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/4b317d12a3b9786b1d5ba152e9fb1f1… Patch: https://github.com/kamailio/kamailio/commit/4b317d12a3b9786b1d5ba152e9fb1f1… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 4d6236bc02..936c8817ca 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -22,7 +22,7 @@ mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \ carrierroute pdb qos sca seas sms sst timer tmrec uac_redirect \ xhttp xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ log_custom keepalive ss7ops app_sqlang acc_diameter evrexec \ - sipjson xhttp_prom + sipjson xhttp_prom lost # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

5 years, 3 months

git:master:2ab96d98: lost: initial checkin of README file

by Henning Westerholt

Module: kamailio Branch: master Commit: 2ab96d985676889f4145f7aecbb7ca21a9048f29 URL: https://github.com/kamailio/kamailio/commit/2ab96d985676889f4145f7aecbb7ca2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:09:52+02:00 lost: initial checkin of README file --- Added: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/2ab96d985676889f4145f7aecbb7ca2… Patch: https://github.com/kamailio/kamailio/commit/2ab96d985676889f4145f7aecbb7ca2…

5 years, 3 months

[kamailio/kamailio] lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-bas… (#2031)

by Wolfgang Kampichler

…ed routing - lost_held_query() takes specific id (pvar, P-A-I, or From), assembles a locationRequest (XML), and sends it to an http_client connection, responses are parsed (pidf-lo and location reference are returned) - lost_query() takes pidf-lo (pvar, msg body, or de-referenced), a service urn (pvar, request line) assembles a findService request (XML), and sends it to an http_client connection, responses are parsed (target uri and display name are returned)   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2031 -- Commit Summary -- * lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing -- File Changes -- A src/modules/lost/Makefile (23) A src/modules/lost/README (238) A src/modules/lost/doc/Makefile (4) A src/modules/lost/doc/lost.xml (36) A src/modules/lost/doc/lost_admin.xml (265) A src/modules/lost/functions.c (551) A src/modules/lost/functions.h (40) A src/modules/lost/lost.c (343) A src/modules/lost/pidf.c (143) A src/modules/lost/pidf.h (53) A src/modules/lost/utilities.c (592) A src/modules/lost/utilities.h (73) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2031.patch https://github.com/kamailio/kamailio/pull/2031.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2031

5 years, 3 months

git:master:31866942: lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing

by Henning Westerholt

Module: kamailio Branch: master Commit: 318669423164b7c96e48861fd49de17d34e957ab URL: https://github.com/kamailio/kamailio/commit/318669423164b7c96e48861fd49de17… Author: wkampich <wolfgang.kampichler(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:04:03+02:00 lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing - header comment included --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/318669423164b7c96e48861fd49de17… Patch: https://github.com/kamailio/kamailio/commit/318669423164b7c96e48861fd49de17… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index 78fb45caab..5b6afe8b39 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -95,7 +95,7 @@ void lost_rand_str(char *dest, size_t lgth) /* * lost_free_loc(ptr) - * freess a location object + * frees a location object */ void lost_free_loc(p_loc_t ptr) { @@ -106,6 +106,10 @@ void lost_free_loc(p_loc_t ptr) pkg_free(ptr); } +/* + * lost_free_string(ptr) + * frees and resets a string + */ void lost_free_string(str *string) { str ptr = *string;

5 years, 3 months

git:master:c655e401: lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing

by Henning Westerholt

Module: kamailio Branch: master Commit: c655e401e0a839a73c60217b3feb7be87d183bf5 URL: https://github.com/kamailio/kamailio/commit/c655e401e0a839a73c60217b3feb7be… Author: wkampich <wolfgang.kampichler(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:04:03+02:00 lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing - code review, updates to memory managment and error handling --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/lost.c Modified: src/modules/lost/pidf.c Modified: src/modules/lost/pidf.h Modified: src/modules/lost/utilities.c Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/c655e401e0a839a73c60217b3feb7be… Patch: https://github.com/kamailio/kamailio/commit/c655e401e0a839a73c60217b3feb7be…

5 years, 3 months

git:master:0f006f09: lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing

by Henning Westerholt

Module: kamailio Branch: master Commit: 0f006f092cc56f06a153b3c8f363c2d81e2afb1e URL: https://github.com/kamailio/kamailio/commit/0f006f092cc56f06a153b3c8f363c2d… Author: wkampich <wolfgang.kampichler(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:04:03+02:00 lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing - code review, updates to memory managment and error handling --- Removed: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/0f006f092cc56f06a153b3c8f363c2d… Patch: https://github.com/kamailio/kamailio/commit/0f006f092cc56f06a153b3c8f363c2d…

5 years, 3 months

git:master:e255aaa5: lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing

by Henning Westerholt

Module: kamailio Branch: master Commit: e255aaa596d622103628903d08f07a226dacdbd9 URL: https://github.com/kamailio/kamailio/commit/e255aaa596d622103628903d08f07a2… Author: wkampich <wolfgang.kampichler(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:04:03+02:00 lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing - lost_held_query() takes specific id (pvar, P-A-I, or From), assembles a locationRequest (XML), and sends it to an http_client connection, responses are parsed (pidf-lo and location reference are returned) - lost_query() takes pidf-lo (pvar, msg body, or de-referenced), a service urn (pvar, request line) assembles a findService request (XML), and sends it to an http_client connection, responses are parsed (target uri and display name are returned) --- Added: src/modules/lost/Makefile Added: src/modules/lost/README Added: src/modules/lost/doc/Makefile Added: src/modules/lost/doc/lost.xml Added: src/modules/lost/doc/lost_admin.xml Added: src/modules/lost/functions.c Added: src/modules/lost/functions.h Added: src/modules/lost/lost.c Added: src/modules/lost/pidf.c Added: src/modules/lost/pidf.h Added: src/modules/lost/utilities.c Added: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/e255aaa596d622103628903d08f07a2… Patch: https://github.com/kamailio/kamailio/commit/e255aaa596d622103628903d08f07a2…

5 years, 3 months

← Newer
1
...
18
19
20
21
22
23
24
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2019