sr-dev June 2021

sr-dev@lists.kamailio.org

15 participants
313 discussions

git:master:2a9e8b9d: tls: Makefile - pkg-config for libcrypto
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

Module: kamailio Branch: master Commit: 2a9e8b9d5c5556a10229813c8878a81933325a01 URL: https://github.com/kamailio/kamailio/commit/2a9e8b9d5c5556a10229813c8878a81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T10:15:23+02:00 tls: Makefile - pkg-config for libcrypto - some distros have it separate of libssl --- Modified: src/modules/tls/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/2a9e8b9d5c5556a10229813c8878a81… Patch: https://github.com/kamailio/kamailio/commit/2a9e8b9d5c5556a10229813c8878a81… --- diff --git a/src/modules/tls/Makefile b/src/modules/tls/Makefile index 48cb886619..3b90ec8fd6 100644 --- a/src/modules/tls/Makefile +++ b/src/modules/tls/Makefile @@ -20,25 +20,41 @@ SSL_BUILDER=$(shell \ if pkg-config --exists libssl; then \ echo 'pkg-config libssl'; \ fi) +CRYPTO_BUILDER=$(shell \ + if pkg-config --exists libcrypto; then \ + echo 'pkg-config libcrypto'; \ + fi) endif ifneq ($(SSL_BUILDER),) + ifneq ($(LIBSSL_STATIC),yes) DEFS += $(shell $(SSL_BUILDER) --cflags) LIBS += $(shell $(SSL_BUILDER) --libs) -else + +ifneq ($(CRYPTO_BUILDER),) + DEFS += $(shell $(CRYPTO_BUILDER) --cflags) + LIBS += $(shell $(CRYPTO_BUILDER) --libs) +endif # ifneq ($(CRYPTO_BUILDER),) + +else # $(LIBSSL_STATIC),yes) + ifneq ($(LIBSSL_STATIC_SRCLIB),yes) ## when static libs (*.a) from packages are compiled with -fPIC DEFS += $(shell $(SSL_BUILDER) --cflags) LIBS += $(shell $(SSL_BUILDER) --libs-only-L) + # TODO: explore use of LIBS += -Wl,-Bstatic $(shell $(SSL_BUILDER) --libs-only-l) LIBS += -l:libssl.a -l:libcrypto.a -l:libz.a -l:libdl.a else ## when linking against static libs compiled from sources DEFS += -I$(LIBSSL_STATIC_SRCPATH)/include LIBS += $(LIBSSL_STATIC_SRCPATH)/libssl.a $(LIBSSL_STATIC_SRCPATH)/libcrypto.a endif # ifneq ($(LIBSSL_STATIC_SRCLIB),yes) + endif # ifneq ($(LIBSSL_STATIC),yes) -else + +else # ifneq ($(SSL_BUILDER),) + DEFS += -I$(LOCALBASE)/ssl/include LIBS += -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib \ -L$(LOCALBASE)/lib64 -L$(LOCALBASE)/ssl/lib64 \ @@ -46,7 +62,8 @@ else # NOTE: depending on the way in which libssl was compiled you might # have to add -lz -lkrb5 (zlib and kerberos5). # E.g.: make TLS_HOOKS=1 TLS_EXTRA_LIBS="-lz -lkrb5" -endif + +endif # ifneq ($(SSL_BUILDER),) LIBS+= $(TLS_EXTRA_LIBS)

1 0

git:master:795a9f57: core: kemi - exported KSR.to_UDP()
by Daniel-Constantin Mierla 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: 795a9f5714607f829d5a0abfc53cb61cb2f8d421 URL: https://github.com/kamailio/kamailio/commit/795a9f5714607f829d5a0abfc53cb61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-23T18:39:54+02:00 core: kemi - exported KSR.to_UDP() --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/795a9f5714607f829d5a0abfc53cb61… Patch: https://github.com/kamailio/kamailio/commit/795a9f5714607f829d5a0abfc53cb61… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 63be6bb0fc..76ace9c3d2 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2042,6 +2042,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("to_UDP"), + SR_KEMIP_BOOL, sr_kemi_core_to_proto_udp, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("to_TCP"), SR_KEMIP_BOOL, sr_kemi_core_to_proto_tcp, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:bff78b91: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: bff78b91788a35e51bd70c6a693b9addd5b48701 URL: https://github.com/kamailio/kamailio/commit/bff78b91788a35e51bd70c6a693b9ad… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-23T13:16:19+02:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/bff78b91788a35e51bd70c6a693b9ad… Patch: https://github.com/kamailio/kamailio/commit/bff78b91788a35e51bd70c6a693b9ad… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 0028f9e623..a3de550a2b 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -503,7 +503,7 @@ modparam("http_client", "keep_connections", 1) Valid values are: * 0 - Return the entire HTTP result body - * 1 - Return the first oine from HTTP result body + * 1 - Return the first line from HTTP result body Default value: 1 (return first line).

1 0

[kamailio/kamailio] siptrace: added extra params to $siptrace() pseudo-variable (#2777)
by sergey-safarov 23 Jun '21

23 Jun '21

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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) - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description added 1. $siptrace(src_addr) 2. $siptrace(src_host) 3. $siptrace(src_port) 4. $siptrace(src_proto) 5. $siptrace(dst_addr) 6. $siptrace(dst_host) 7. $siptrace(dst_port) 8. $siptrace(dst_proto) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2777 -- Commit Summary -- * siptrace: added extra params to $siptrace() pseudo-variable -- File Changes -- M src/modules/siptrace/siptrace.c (74) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2777.patch https://github.com/kamailio/kamailio/pull/2777.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/2777

2 12

git:master:1f67ac5a: http_client: docs - fixed small typo
by Daniel-Constantin Mierla 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: 1f67ac5a62b58b35df52aedbd1a3d2234a72817e URL: https://github.com/kamailio/kamailio/commit/1f67ac5a62b58b35df52aedbd1a3d22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-23T13:06:19+02:00 http_client: docs - fixed small typo --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1f67ac5a62b58b35df52aedbd1a3d22… Patch: https://github.com/kamailio/kamailio/commit/1f67ac5a62b58b35df52aedbd1a3d22… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 2c8295f07f..e52ec5ce26 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -446,7 +446,7 @@ modparam("http_client", "keep_connections", 1) Valid values are: <itemizedlist> <listitem><para>0 - Return the entire HTTP result body</para></listitem> - <listitem><para>1 - Return the first oine from HTTP result body</para></listitem> + <listitem><para>1 - Return the first line from HTTP result body</para></listitem> </itemizedlist> </para> <para>

1 0

git:master:261c57ae: siptrace: added extra params to $siptrace() pseudo-variable
by Daniel-Constantin Mierla 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: 261c57aedf1f35ddc3959a21043b34750274935f URL: https://github.com/kamailio/kamailio/commit/261c57aedf1f35ddc3959a21043b347… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-23T09:56:51+02:00 siptrace: added extra params to $siptrace() pseudo-variable for more details check GH #2777 --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/261c57aedf1f35ddc3959a21043b347… Patch: https://github.com/kamailio/kamailio/commit/261c57aedf1f35ddc3959a21043b347… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 13cc220457..d7416506dd 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2505,16 +2505,82 @@ static sr_kemi_t sr_kemi_siptrace_exports[] = { int pv_get_siptrace(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) { + str host; + int port; + int proto; + str sproto; if (siptrace_event_data==NULL) { return pv_get_null(msg, param, res); } switch(param->pvn.u.isname.name.n) { - case 1: /* dst_uri*/ + case 2: /* src_host */ + case 4: /* src_port */ + case 6: /* src_proto */ + case 8: /* src_hostip */ + if (parse_phostport(siptrace_event_data->fromip.s, &host.s, &host.len, &port, &proto)!=0) { + LM_ERR("invalid src_addr: %.*s\n", siptrace_event_data->fromip.len, siptrace_event_data->fromip.s); + return pv_get_null(msg, param, res); + } + break; + case 3: /* dst_host */ + case 5: /* dst_port */ + case 7: /* dst_proto */ + case 9: /* dst_hostip */ + if (parse_phostport(siptrace_event_data->toip.s, &host.s, &host.len, &port, &proto)!=0) { + LM_ERR("invalid dst_addr: %.*s\n", siptrace_event_data->toip.len, siptrace_event_data->toip.s); + return pv_get_null(msg, param, res); + } + break; + } + + switch(param->pvn.u.isname.name.n) { + case 6: /* src_proto */ + case 7: /* dst_proto */ + if(get_valid_proto_string(proto, 0, 0, &sproto)<0) + { + sproto.s = "none"; + sproto.len = 4; + } + break; + } + + switch(param->pvn.u.isname.name.n) { + case 8: /* src_hostip */ + case 9: /* dst_hostip */ + + /* now IPv6 address has brakets that not wanted in IP address operations */ + if(host.s[0] == '[' && host.s[host.len-1] == ']') { + host.s++; + host.len = host.len - 2; + } + break; + } + + switch(param->pvn.u.isname.name.n) { + case 0: /* src_addr */ + return pv_get_strval(msg, param, res, &siptrace_event_data->fromip); + case 1: /* dst_addr */ return pv_get_strval(msg, param, res, &siptrace_event_data->toip); + case 2: /* src_host */ + return pv_get_strval(msg, param, res, &host); + case 3: /* dst_host */ + return pv_get_strval(msg, param, res, &host); + case 4: /* src_port */ + return pv_get_sintval(msg, param, res, port); + case 5: /* dst_port */ + return pv_get_sintval(msg, param, res, port); + case 6: /* src_proto */ + return pv_get_strintval(msg, param, res, &sproto, proto); + case 7: /* dst_proto */ + return pv_get_strintval(msg, param, res, &sproto, proto); + case 8: /* src_hostip */ + return pv_get_strval(msg, param, res, &host); + case 9: /* dst_hostip */ + return pv_get_strval(msg, param, res, &host); default: - /* 0 - src_uri */ - return pv_get_strval(msg, param, res, &siptrace_event_data->fromip); + LM_ERR("unexpected config param\n"); + return pv_get_null(msg, param, res); } } @@ -2533,6 +2599,28 @@ int pv_parse_siptrace_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 0; else if(strncmp(in->s, "dst_addr", 8)==0) sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "src_host", 8)==0) + sp->pvp.pvn.u.isname.name.n = 2; + else if(strncmp(in->s, "dst_host", 8)==0) + sp->pvp.pvn.u.isname.name.n = 3; + else if(strncmp(in->s, "src_port", 8)==0) + sp->pvp.pvn.u.isname.name.n = 4; + else if(strncmp(in->s, "dst_port", 8)==0) + sp->pvp.pvn.u.isname.name.n = 5; + else goto error; + break; + case 9: + if(strncmp(in->s, "src_proto", 9)==0) + sp->pvp.pvn.u.isname.name.n = 6; + else if(strncmp(in->s, "dst_proto", 9)==0) + sp->pvp.pvn.u.isname.name.n = 7; + else goto error; + break; + case 10: + if(strncmp(in->s, "src_hostip", 10)==0) + sp->pvp.pvn.u.isname.name.n = 8; + else if(strncmp(in->s, "dst_hostip", 10)==0) + sp->pvp.pvn.u.isname.name.n = 9; else goto error; break; default:

1 0

git:master:b8fbf5e8: xhttp: warning log if tcp_accept_no_cl is not set
by Daniel-Constantin Mierla 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: b8fbf5e8c199b8277053f9c15231695a16058d6e URL: https://github.com/kamailio/kamailio/commit/b8fbf5e8c199b8277053f9c15231695… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-23T08:49:38+02:00 xhttp: warning log if tcp_accept_no_cl is not set --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b8fbf5e8c199b8277053f9c15231695… Patch: https://github.com/kamailio/kamailio/commit/b8fbf5e8c199b8277053f9c15231695… --- diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c index f62c880a9a..1aec2763d9 100644 --- a/src/modules/xhttp/xhttp_mod.c +++ b/src/modules/xhttp/xhttp_mod.c @@ -41,6 +41,7 @@ #include "../../core/sip_msg_clone.h" #include "../../core/mod_fix.h" #include "../../core/pvar.h" +#include "../../core/tcp_options.h" #include "../../core/kemi.h" #include "api.h" @@ -142,6 +143,11 @@ static int mod_init(void) xhttp_route_no = route_no; } + if(cfg_get(tcp, tcp_cfg, accept_no_cl)==0) { + LM_WARN("tcp_accept_no_cl not set - usually required" + " to handle HTTP requests with no Content-Lenght\n"); + } + /* bind the SL API */ if(sl_load_api(&slb) != 0) { LM_ERR("cannot bind to SL API\n");

1 0

git:master:7979925f: modules: readme files regenerated - tcpops ... [skip ci]
by Kamailio Dev 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: 7979925ff2a53dcc2111c1ebbbc94b2cac6103df URL: https://github.com/kamailio/kamailio/commit/7979925ff2a53dcc2111c1ebbbc94b2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-23T08:46:24+02:00 modules: readme files regenerated - tcpops ... [skip ci] --- Modified: src/modules/tcpops/README --- Diff: https://github.com/kamailio/kamailio/commit/7979925ff2a53dcc2111c1ebbbc94b2… Patch: https://github.com/kamailio/kamailio/commit/7979925ff2a53dcc2111c1ebbbc94b2… --- diff --git a/src/modules/tcpops/README b/src/modules/tcpops/README index 70209686f0..5bbd683440 100644 --- a/src/modules/tcpops/README +++ b/src/modules/tcpops/README @@ -34,6 +34,7 @@ Olle E. Johansson 3.7. tcp_get_conid(hostport, pvname) 3.8. tcp_set_otcpid(conid) 3.9. tcp_set_otcpid_flag(mode) + 3.10. tcp_close_connection([conid]) 4. Event routes @@ -55,6 +56,7 @@ Olle E. Johansson 1.9. tcp_get_conid usage 1.10. tcp_set_otcpid usage 1.11. tcp_set_otcpid_flag usage + 1.12. tcp_close_connection usage Chapter 1. Admin Guide @@ -77,6 +79,7 @@ Chapter 1. Admin Guide 3.7. tcp_get_conid(hostport, pvname) 3.8. tcp_set_otcpid(conid) 3.9. tcp_set_otcpid_flag(mode) + 3.10. tcp_close_connection([conid]) 4. Event routes @@ -152,6 +155,7 @@ end 3.7. tcp_get_conid(hostport, pvname) 3.8. tcp_set_otcpid(conid) 3.9. tcp_set_otcpid_flag(mode) + 3.10. tcp_close_connection([conid]) 3.1. tcp_conid_alive(conid) @@ -400,6 +404,25 @@ event_route[tcp:closed] { tcp_set_otcpid_flag("$var(cmode)"); ... +3.10. tcp_close_connection([conid]) + + Trigger a close of the connection corresponding to current SIP message + or to connection id 'conid'. + + Meaning of the parameters is as follows: + * conid - the value of tcp connection id. It can be an integer number + or a variable holding an interver value. + + Return values: + * 1: success + * -1 (or other negative values): failure + + Example 1.12. tcp_close_connection usage +... + $var(conid) = 10; + tcp_close_connection("$var(conid)"); +... + 4. Event routes 4.1. tcp:closed

1 0

git:master:4ea4f598: tcpops: docs for tcp_close_connection()
by Daniel-Constantin Mierla 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: 4ea4f598a10b6f0f690cf8a9b6174997ccb62b6f URL: https://github.com/kamailio/kamailio/commit/4ea4f598a10b6f0f690cf8a9b617499… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-23T08:40:46+02:00 tcpops: docs for tcp_close_connection() --- Modified: src/modules/tcpops/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/4ea4f598a10b6f0f690cf8a9b617499… Patch: https://github.com/kamailio/kamailio/commit/4ea4f598a10b6f0f690cf8a9b617499… --- diff --git a/src/modules/tcpops/doc/functions.xml b/src/modules/tcpops/doc/functions.xml index 94cefaa776..1502386598 100644 --- a/src/modules/tcpops/doc/functions.xml +++ b/src/modules/tcpops/doc/functions.xml @@ -375,4 +375,40 @@ event_route[tcp:closed] { ]]></programlisting> </example> </section> + <section id="tcpops.f.tcp_close_connection"> + <title> + <function>tcp_close_connection([conid])</function> + </title> + <para> + Trigger a close of the connection corresponding to current SIP + message or to connection id 'conid'. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>conid</emphasis> - the value of tcp connection id. + It can be an integer number or a variable holding an interver value. + </para> + </listitem> + </itemizedlist> + <para>Return values:</para> + <itemizedlist> + <listitem> + <para>1: success</para> + </listitem> + <listitem> + <para>-1 (or other negative values): failure</para> + </listitem> + </itemizedlist> + <example> + <title><function>tcp_close_connection</function> usage</title> + <programlisting><![CDATA[ +... + $var(conid) = 10; + tcp_close_connection("$var(conid)"); +... + ]]></programlisting> + </example> + </section> + </section>

1 0

git:master:ac55488b: tcpops: added tcp_close_connection([conid])
by Daniel-Constantin Mierla 22 Jun '21

22 Jun '21

Module: kamailio Branch: master Commit: ac55488bc2fac333b0b777d38875b7516c430925 URL: https://github.com/kamailio/kamailio/commit/ac55488bc2fac333b0b777d38875b75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-22T19:01:02+02:00 tcpops: added tcp_close_connection([conid]) - close connection for current sip message or by conid --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ac55488bc2fac333b0b777d38875b75… Patch: https://github.com/kamailio/kamailio/commit/ac55488bc2fac333b0b777d38875b75… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index 23036fd771..8590e4b6b6 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -39,6 +39,7 @@ #include "../../core/mod_fix.h" #include "../../core/events.h" #include "../../core/kemi.h" +#include "../../core/pass_fd.h" #include "tcpops.h" @@ -63,6 +64,8 @@ static int w_tcp_conid_alive(sip_msg_t* msg, char* con, char *p2); static int w_tcp_get_conid(sip_msg_t* msg, char *paddr, char *pvn); static int w_tcp_set_otcpid(sip_msg_t* msg, char* conid, char *p2); static int w_tcp_set_otcpid_flag(sip_msg_t* msg, char* mode, char *p2); +static int w_tcp_close_connection(sip_msg_t* msg, char* p1, char *p2); +static int w_tcp_close_connection_id(sip_msg_t* msg, char* pconid, char *p2); str tcpops_event_callback = STR_NULL; @@ -103,6 +106,10 @@ static cmd_export_t cmds[]={ fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_otcpid_flag", (cmd_function)w_tcp_set_otcpid_flag, 1, fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, + {"tcp_close_connection", (cmd_function)w_tcp_close_connection, 0, + 0, 0, ANY_ROUTE}, + {"tcp_close_connection", (cmd_function)w_tcp_close_connection_id, 1, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -665,6 +672,65 @@ static int w_tcp_set_otcpid_flag(sip_msg_t* msg, char* mode, char *p2) return ki_tcp_set_otcpid_flag(msg, vmode); } +/*! + * \brief Close a TCP connection + * + * Requests the TCP main process to close the specified TCP connection + * \param conid the internal connection ID + */ +static int ki_tcp_close_connection_id(sip_msg_t *msg, int conid) +{ + struct tcp_connection *con; + long mcmd[2]; + int n; + + if ((con = tcpconn_get(conid, 0, 0, 0, 0))) { + mcmd[0] = (long)con; + mcmd[1] = CONN_EOF; + + con->send_flags.f |= SND_F_CON_CLOSE; + con->flags |= F_CONN_FORCE_EOF; + + n = send_all(unix_tcp_sock, mcmd, sizeof(mcmd)); + if (unlikely(n <= 0)){ + LM_ERR("failed to send close request: %s (%d)\n", strerror(errno), errno); + return -2; + } + return 1; + } + return -1; +} + +/** + * + */ +static int ki_tcp_close_connection(sip_msg_t *msg) +{ + return ki_tcp_close_connection_id(msg, msg->rcv.proto_reserved1); +} + +/** + * + */ +static int w_tcp_close_connection_id(sip_msg_t* msg, char* pconid, char *p2) +{ + int conid = 0; + + if(fixup_get_ivalue(msg, (gparam_t*)pconid, &conid)<0) { + LM_ERR("failed to get conid parameter\n"); + return -1; + } + return ki_tcp_close_connection_id(msg, conid); +} + +/** + * + */ +static int w_tcp_close_connection(sip_msg_t* msg, char* p1, char *p2) +{ + return ki_tcp_close_connection_id(msg, msg->rcv.proto_reserved1); +} + /** * */ @@ -799,6 +865,16 @@ static sr_kemi_t sr_kemi_tcpops_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tcpops"), str_init("tcp_close_connection"), + SR_KEMIP_INT, ki_tcp_close_connection, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("tcpops"), str_init("tcp_close_connection_id"), + SR_KEMIP_INT, ki_tcp_close_connection_id, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2021