sr-dev April 2020

sr-dev@lists.kamailio.org

33 participants
420 discussions

git:master:8ba747b8: rr: new param sockname_mode
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: 8ba747b8af8068f0ee8e3d440ac9f094d7dec28a URL: https://github.com/kamailio/kamailio/commit/8ba747b8af8068f0ee8e3d440ac9f09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T14:18:30+02:00 rr: new param sockname_mode - if set to 1, socket name is added to Path URI in 'sn' param --- Modified: src/modules/rr/record.c Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8ba747b8af8068f0ee8e3d440ac9f09… Patch: https://github.com/kamailio/kamailio/commit/8ba747b8af8068f0ee8e3d440ac9f09… --- diff --git a/src/modules/rr/record.c b/src/modules/rr/record.c index 936a348b22..54da64cf99 100644 --- a/src/modules/rr/record.c +++ b/src/modules/rr/record.c @@ -70,6 +70,7 @@ #define RR_PARAM_BUF_SIZE 512 /*!< buffer for RR parameter */ extern int rr_ignore_sips; +extern int rr_sockname_mode; /*! * \brief RR param buffer @@ -207,6 +208,7 @@ static inline int build_rr(struct lump* _l, struct lump* _l2, str* user, char *p; char *rr_prefix; int rr_prefix_len; + int rr_lump_type; if(_sips==0) { rr_prefix = RR_PREFIX_SIP; @@ -281,7 +283,10 @@ static inline int build_rr(struct lump* _l, struct lump* _l2, str* user, if (!(_l = insert_new_lump_after(_l, prefix, prefix_len, 0))) goto lump_err; prefix = 0; - _l = insert_subst_lump_after(_l, _inbound?SUBST_RCV_ALL:SUBST_SND_ALL, 0); + rr_lump_type = (_inbound)? + (rr_sockname_mode?SUBST_RCV_ALL_EX:SUBST_RCV_ALL) + :(rr_sockname_mode?SUBST_SND_ALL_EX:SUBST_SND_ALL); + _l = insert_subst_lump_after(_l, rr_lump_type, 0); if (_l ==0 ) goto lump_err; if (enable_double_rr) { diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index f61c693cb0..6643239fcb 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -62,6 +62,7 @@ int enable_socket_mismatch_warning = 1; /*!< enable socket mismatch warning */ static str custom_user_spec = {NULL, 0}; pv_spec_t custom_user_avp; int rr_ignore_sips = 0; /*!< ignore sips schema when building record-route */ +int rr_sockname_mode = 0; /*!< add socket name to R-R header */ ob_api_t rr_obb; @@ -136,6 +137,7 @@ static param_export_t params[] ={ {"custom_user_avp", PARAM_STR, &custom_user_spec}, {"force_send_socket", PARAM_INT, &rr_force_send_socket}, {"ignore_sips", PARAM_INT, &rr_ignore_sips}, + {"sockname_mode", PARAM_INT, &rr_sockname_mode}, {0, 0, 0 } };

1 0

git:master:31d92814: path: new param sockname_mode
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: 31d92814679fdeca96d7f90bb85938eb9894a4e4 URL: https://github.com/kamailio/kamailio/commit/31d92814679fdeca96d7f90bb85938e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T14:17:36+02:00 path: new param sockname_mode - if set to 1, socket name is added to Path URI in 'sn' param --- Modified: src/modules/path/path.c Modified: src/modules/path/path_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/31d92814679fdeca96d7f90bb85938e… Patch: https://github.com/kamailio/kamailio/commit/31d92814679fdeca96d7f90bb85938e… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index f95d68ab70..55cd859c90 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -56,6 +56,8 @@ const static char *proto_strings[] = { [PROTO_WSS] = "%3Btransport%3Dws", }; +extern int path_sockname_mode; + static char *path_strzdup(char *src, int len) { char *res; @@ -187,7 +189,8 @@ static int prepend_path(sip_msg_t* _m, str *user, path_param_t param, l = insert_new_lump_before(l, prefix, prefix_len, 0); if (!l) goto out3; - l = insert_subst_lump_before(l, SUBST_SND_ALL, 0); + l = insert_subst_lump_before(l, + (path_sockname_mode)?SUBST_SND_ALL_EX:SUBST_SND_ALL, 0); if (!l) goto out2; l = insert_new_lump_before(l, suffix, cp - suffix, 0); if (!l) goto out2; @@ -197,7 +200,8 @@ static int prepend_path(sip_msg_t* _m, str *user, path_param_t param, if(dp==NULL) goto out1; l = insert_new_lump_before(l, dp, prefix_len, 0); if (!l) goto out1; - l = insert_subst_lump_before(l, SUBST_RCV_ALL, 0); + l = insert_subst_lump_before(l, + (path_sockname_mode)?SUBST_RCV_ALL_EX:SUBST_RCV_ALL, 0); if (!l) goto out1; dp = path_strzdup(suffix, cp - suffix); if(dp==NULL) goto out1; diff --git a/src/modules/path/path_mod.c b/src/modules/path/path_mod.c index 21f1a256df..cc27d1a457 100644 --- a/src/modules/path/path_mod.c +++ b/src/modules/path/path_mod.c @@ -68,6 +68,7 @@ int path_use_received = 0; int path_received_format = 0; int path_enable_r2 = 0; +int path_sockname_mode = 0; /*! \brief * Module initialization function prototype @@ -111,6 +112,7 @@ static param_export_t params[] = { {"use_received", INT_PARAM, &path_use_received }, {"received_format", INT_PARAM, &path_received_format }, {"enable_r2", INT_PARAM, &path_enable_r2 }, + {"sockname_mode", INT_PARAM, &path_sockname_mode }, { 0, 0, 0 } };

1 0

git:master:53c5d86c: core: new conditional lump types SUBST_RCV_ALL_EX and SUBST_SND_ALL_EX
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: 53c5d86c37f407368cf9600a1b6745db83e38124 URL: https://github.com/kamailio/kamailio/commit/53c5d86c37f407368cf9600a1b6745d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T13:29:56+02:00 core: new conditional lump types SUBST_RCV_ALL_EX and SUBST_SND_ALL_EX - build conditional uri adding socket name in 'sn' param --- Modified: src/core/config.h Modified: src/core/lump_struct.h Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/53c5d86c37f407368cf9600a1b6745d… Patch: https://github.com/kamailio/kamailio/commit/53c5d86c37f407368cf9600a1b6745d…

1 0

[kamailio/kamailio] Kamailio ignore 404 as part of transaction during REGISTER (#2271)
by jpVm5jYYRE1VIKL 02 Apr '20

02 Apr '20

### Description In following configuration : UA -> KAMALIO PROXY -> REGISTRAR In case if REGISTRAR answer 404 on first REGISTER kamailio just ignore it and reply not passed to onreply_route. ie 404 just dropped and not passed to UA. In case if REGISTRAR answer 401 on first REGISTER kamailio works like it have to be. Grepped example : ``` 77.77.77.77 - UA 88.88.88.88 - Kamailio 10.34.64.2 - registrar U 2020/04/02 10:47:02.345372 77.77.77.77:5060 -> 88.88.88.88:7060 #26887 REGISTER sip:proxy.domain.com:7060 SIP/2.0. Via: SIP/2.0/UDP 10.32.0.9:5060;branch=z9hG4bK4153798595. From: "999100044" <sip:999100044@proxy.domain.com:7060>;tag=3123330837. To: "999100044" <sip:999100044@proxy.domain.com:7060>. Call-ID: 2_912627073(a)10.32.0.9. CSeq: 1 REGISTER. Contact: <sip:999100044@10.32.0.9:5060>. Allow: INVITE, INFO, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE. Max-Forwards: 70. User-Agent: Yealink SIP-T46G 28.81.188.7 001565b577b2. Expires: 3600. Allow-Events: talk,hold,conference,refer,check-sync. Content-Length: 0. .. U 2020/04/02 10:47:04.289850 88.88.88.88:7060 -> 10.34.64.2:5060 #26888 REGISTER sip:proxy.domain.com:7060 SIP/2.0. Record-Route: <sip:88.88.88.88:7060;lr>. Via: SIP/2.0/UDP 88.88.88.88:7060;branch=z9hG4bK0636.d927d7e86ebc02302d9ad6ae7d778817.0. Via: SIP/2.0/UDP 10.32.0.9:5060;received=77.77.77.77;branch=z9hG4bK4153798595. From: "999100044" <sip:999100044@proxy.domain.com:7060>;tag=3123330837. To: "999100044" <sip:999100044@proxy.domain.com:7060>. Call-ID: 2_912627073(a)10.32.0.9. CSeq: 1 REGISTER. Contact: <sip:999100044@10.32.0.9:5060>. Allow: INVITE, INFO, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE. Max-Forwards: 69. User-Agent: Yealink SIP-T46G 28.81.188.7 001565b577b2. Expires: 3600. Allow-Events: talk,hold,conference,refer,check-sync. Content-Length: 0. Path: <sip:88.88.88.88:7060;lr;received=sip:77.77.77.77:5060>. Supported: path. .. U 2020/04/02 10:47:04.290295 10.34.64.2:5060 -> 88.88.88.88:7060 #26889 SIP/2.0 404 Not Found. Via: SIP/2.0/UDP 88.88.88.88:7060;branch=z9hG4bK0636.d927d7e86ebc02302d9ad6ae7d778817.0. Via: SIP/2.0/UDP 10.32.0.9:5060;received=77.77.77.77;branch=z9hG4bK4153798595. From: "999100044" <sip:999100044@proxy.domain.com:7060>;tag=3123330837. To: "999100044" <sip:999100044@proxy.domain.com:7060>;tag=1598650872. Call-ID: 2_912627073(a)10.32.0.9. CSeq: 1 REGISTER. Content-Length: 0. Date: Thu, 02 Apr 2020 10:47:03 GMT. Warning: Not maintaining bindings for domain. .. ``` ### Troubleshooting After checking RFC 3261 i found that ``` 5. The registrar extracts the address-of-record from the To header field of the request. If the address-of-record is not valid for the domain in the Request-URI, the registrar MUST send a 404 (Not Found) response and skip the remaining steps. ``` #### Reproduction following schema : UA -> KAMALIO PROXY -> REGISTRAR modules related to issue: in kamailio.cfg loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "db_mysql" loadmodule "domain" loadmodule "outbound" loadmodule "path" simple conception route config which illustrate issue : ``` request_route { # per request initial checks route(REQINIT); route(CATCH_CANCEL); route(RR_PARSE); route(REGISTRATION); xlog("L_INFO", "Initial relay packet\n"); $du = "sip:10.34.64.2:5060"; route(FORWARD); # update $du to set the destination address for proxying exit; } route[CATCH_CANCEL] { if (is_method("CANCEL") == true) { if (t_check_trans() == true) { route(FORWARD); } sl_reply("500", "Internal Server Error"); drop; } } route[RR_PARSE] { if(loose_route() == true ) { xlog("L_INFO", "RR-enforced\n"); append_hf("P-hint: rr-enforced\r\n"); route(FORWARD); } else { xlog("L_INFO", "RR simple\n"); record_route(); } } route[REGISTRATION] { if(is_method("REGISTER") == true) { add_path_received(); append_hf("Supported: path\r\n"); xlog("L_INFO", "GOT REGISTER\n"); } } route[FORWARD] { if(t_relay() == false) { sl_reply_error(); } drop; } onreply_route { xlog("Reply SIP message from $si:$sp\n"); if (t_check_trans() == false) { drop; } } ``` #### Debugging Data #### Log Messages ``` Apr 2 11:05:26 fsinnosbc /usr/sbin/kamailio[16037]: INFO: {1 1 REGISTER 2_1386563412(a)10.32.0.9} <script>: RR simple Apr 2 11:05:26 fsinnosbc /usr/sbin/kamailio[16037]: INFO: {1 1 REGISTER 2_1386563412(a)10.32.0.9} <script>: GOT REGISTER Apr 2 11:05:26 fsinnosbc /usr/sbin/kamailio[16037]: INFO: {1 1 REGISTER 2_1386563412(a)10.32.0.9} <script>: Initial relay packet ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.3 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 8.3.0 ``` * **Operating System**:  ``` root@fsinnosbc:~# lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 10 (buster) Release: 10 Codename: buster root@fsinnosbc:~# ``` -- 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/issues/2271

3 8

git:master:10af978e: pv: new config variable $fsn - forced send socket name
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: 10af978e2ee6dcb7bb2dfcec07d14987600b7c43 URL: https://github.com/kamailio/kamailio/commit/10af978e2ee6dcb7bb2dfcec07d1498… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T12:22:51+02:00 pv: new config variable $fsn - forced send socket name - retrieve the name of the forced send socket - setting the send socket can be done by assigning socket name: $fsn = "sock1"; --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/10af978e2ee6dcb7bb2dfcec07d1498… Patch: https://github.com/kamailio/kamailio/commit/10af978e2ee6dcb7bb2dfcec07d1498… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 1c4133c6e7..6ee89e7e52 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -250,6 +250,9 @@ static pv_export_t mod_pvs[] = { {{"fs", (sizeof("fs")-1)}, /* */ PVT_OTHER, pv_get_force_sock, pv_set_force_sock, 0, 0, 0, 0}, + {{"fsn", (sizeof("fsn")-1)}, /* */ + PVT_OTHER, pv_get_force_sock_name, pv_set_force_sock_name, + 0, 0, 0, 0}, {{"ft", (sizeof("ft")-1)}, /* */ PVT_OTHER, pv_get_from_attr, 0, 0, 0, pv_init_iname, 4}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 9087fe01bf..ad5db64eb4 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -1021,6 +1021,21 @@ int pv_get_force_sock(struct sip_msg *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &msg->force_send_socket->sock_str); } +int pv_get_force_sock_name(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) { + return -1; + } + + if (msg->force_send_socket==0 + || msg->force_send_socket->sockname.s == NULL) { + return pv_get_null(msg, param, res); + } + + return pv_get_strval(msg, param, res, &msg->force_send_socket->sockname); +} + int pv_get_useragent(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { @@ -2655,6 +2670,40 @@ int pv_set_force_sock(struct sip_msg* msg, pv_param_t *param, return -1; } +int pv_set_force_sock_name(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val) +{ + struct socket_info *si; + + if(msg==NULL || param==NULL) { + LM_ERR("bad parameters\n"); + return -1; + } + + if(val==NULL || (val->flags&PV_VAL_NULL)) { + reset_force_socket(msg); + return 0; + } + + if(!(val->flags&PV_VAL_STR) || val->rs.len<=0) { + LM_ERR("str value required to set the force send sock\n"); + goto error; + } + + LM_DBG("trying to set send-socket to name [%.*s]\n", val->rs.len, val->rs.s); + si = ksr_get_socket_by_name(&val->rs); + if (si!=NULL) { + set_force_socket(msg, si); + } else { + LM_WARN("no socket found to match name [%.*s]\n", + val->rs.len, val->rs.s); + } + + return 0; +error: + return -1; +} + int pv_set_mflags(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index ee45b915cd..919fa3910f 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -175,6 +175,9 @@ int pv_get_rcvadv_uri_full(struct sip_msg *msg, pv_param_t *param, int pv_get_force_sock(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_force_sock_name(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_useragent(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); @@ -295,6 +298,9 @@ int pv_set_branch(struct sip_msg* msg, pv_param_t *param, int pv_set_force_sock(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val); +int pv_set_force_sock_name(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val); + int pv_set_mflags(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val);

1 0

git:master:64069867: core: function to search socket by name
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: 64069867c65239af912d96b7865f4faefb64e338 URL: https://github.com/kamailio/kamailio/commit/64069867c65239af912d96b7865f4fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T12:20:32+02:00 core: function to search socket by name --- Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/64069867c65239af912d96b7865f4fa… Patch: https://github.com/kamailio/kamailio/commit/64069867c65239af912d96b7865f4fa… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 82e66123b4..16a7491f83 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -687,6 +687,40 @@ struct socket_info* grep_sock_info(str* host, unsigned short port, return si; } +socket_info_t* ksr_get_socket_by_name(str *sockname) +{ + socket_info_t *si = NULL; + struct socket_info** list; + unsigned short c_proto; + + c_proto = PROTO_UDP; + do { + /* get the proper sock_list */ + list=get_sock_info_list(c_proto); + + if (list==0) { + /* disabled or unknown protocol */ + continue; + } + + for (si=*list; si; si=si->next) { + if(si->sockname.s == NULL) { + continue; + } + LM_DBG("checking if sockname %.*s matches %.*s\n", + sockname->len, sockname->s, + si->sockname.len, si->sockname.s); + if (sockname->len == si->sockname.len + && strncasecmp(sockname->s, si->sockname.s, + sockname->len)==0) { + return si; + } + } + } while((c_proto = next_proto(c_proto))!=0); + + return NULL; +} + /* checks if the proto:port is one of the ports we listen on * and returns the corresponding socket_info structure. * if proto==0 (PROTO_NONE) the protocol is ignored diff --git a/src/core/socket_info.h b/src/core/socket_info.h index ffdc419921..4bf7b3e96c 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -103,6 +103,7 @@ struct socket_info* grep_sock_info_by_port(unsigned short port, unsigned short proto); struct socket_info* find_si(struct ip_addr* ip, unsigned short port, unsigned short proto); +socket_info_t* ksr_get_socket_by_name(str *sockname); struct socket_info** get_sock_info_list(unsigned short proto);

1 0

git:master:cf64fcef: corex: print socket name in rpc command output
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: cf64fcef56deee64ec324ccc64054e27d051d89a URL: https://github.com/kamailio/kamailio/commit/cf64fcef56deee64ec324ccc64054e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T11:38:01+02:00 corex: print socket name in rpc command output --- Modified: src/modules/corex/corex_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/cf64fcef56deee64ec324ccc64054e2… Patch: https://github.com/kamailio/kamailio/commit/cf64fcef56deee64ec324ccc64054e2… --- diff --git a/src/modules/corex/corex_rpc.c b/src/modules/corex/corex_rpc.c index 11c8836333..8677c35d22 100644 --- a/src/modules/corex/corex_rpc.c +++ b/src/modules/corex/corex_rpc.c @@ -52,7 +52,7 @@ static void corex_rpc_list_sockets(rpc_t* rpc, void* ctx) struct socket_info** list; struct addr_info* ai; unsigned short proto; - + proto=PROTO_UDP; do { list=get_sock_info_list(proto); @@ -79,7 +79,7 @@ static void corex_rpc_list_sockets(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Internal error address structure"); return; } - + if (si->addr_info_lst) { @@ -95,10 +95,11 @@ static void corex_rpc_list_sockets(rpc_t* rpc, void* ctx) } } - if(rpc->struct_add(th, "ssss", + if(rpc->struct_add(th, "sssss", "PORT", si->port_no_str.s, "MCAST", si->flags & SI_IS_MCAST ? "yes" : "no", "MHOMED", si->flags & SI_IS_MHOMED? "yes" : "no", + "SOCKNAME", si->sockname.s? si->sockname.s : "-", "ADVERTISE", si->useinfo.name.s?si->useinfo.name.s:"-")<0) { rpc->fault(ctx, 500, "Internal error attrs structure");

1 0

git:master:76889dec: core: support to asign names to listen sockets
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: 76889decfc6e8371eadf15388ba18d9899f57294 URL: https://github.com/kamailio/kamailio/commit/76889decfc6e8371eadf15388ba18d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T11:35:00+02:00 core: support to asign names to listen sockets - full format: listen=proto:address:port advertise address:port name string - example: listen=udp:10.0.0.10:5060 advertise 1.2.3.4:5060 name "sock1" - the value for the name has to be enclosed in quotes - name can be provided also when advertise is not needed --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/ip_addr.h Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/76889decfc6e8371eadf15388ba18d9… Patch: https://github.com/kamailio/kamailio/commit/76889decfc6e8371eadf15388ba18d9…

1 0

git:master:e533a7e4: pv: kemi functions for xavu management
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: e533a7e43e84745347dd11cede69db2d348e5107 URL: https://github.com/kamailio/kamailio/commit/e533a7e43e84745347dd11cede69db2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T11:27:13+02:00 pv: kemi functions for xavu management --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/e533a7e43e84745347dd11cede69db2… Patch: https://github.com/kamailio/kamailio/commit/e533a7e43e84745347dd11cede69db2…

1 0

git:master:02b168d3: core: function to remove an xavu child value
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: 02b168d34786c363c6b5ce5a5e885c419f7de9e4 URL: https://github.com/kamailio/kamailio/commit/02b168d34786c363c6b5ce5a5e885c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T11:26:52+02:00 core: function to remove an xavu child value --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/02b168d34786c363c6b5ce5a5e885c4… Patch: https://github.com/kamailio/kamailio/commit/02b168d34786c363c6b5ce5a5e885c4… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 12c52512fd..dc60fffd0a 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1258,6 +1258,21 @@ int xavu_rm_by_name(str *name, sr_xavp_t **head) return 0; } +/** + * + */ +int xavu_rm_child_by_name(str *rname, str *cname) +{ + sr_xavp_t *avu=NULL; + + avu = xavu_lookup(rname, NULL); + + if(avu == NULL || avu->val.type!=SR_XTYPE_XAVP) { + return 0; + } + return xavu_rm_by_name(cname, &avu->val.v.xavp); +} + /** * */ diff --git a/src/core/xavp.h b/src/core/xavp.h index 66addbfff8..9145497d05 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -124,6 +124,7 @@ sr_xavp_t *xavu_get(str *name, sr_xavp_t *start); sr_xavp_t *xavu_lookup(str *name, sr_xavp_t **start); int xavu_rm(sr_xavp_t *xa, sr_xavp_t **head); int xavu_rm_by_name(str *name, sr_xavp_t **head); +int xavu_rm_child_by_name(str *rname, str *cname); sr_xavp_t *xavu_set_xval(str *name, sr_xval_t *val, sr_xavp_t **list); sr_xavp_t *xavu_set_ival(str *rname, int ival); sr_xavp_t *xavu_set_sval(str *rname, str *sval);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2020