sr-dev May 2021

sr-dev@lists.kamailio.org

12 participants
288 discussions

git:master:2d4b4939: ldap: several functions exported to kemi framework
by Daniel-Constantin Mierla 31 May '21

31 May '21

Module: kamailio Branch: master Commit: 2d4b4939d1845fffdc3fa3ced9889720d0213d47 URL: https://github.com/kamailio/kamailio/commit/2d4b4939d1845fffdc3fa3ced988972… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-31T13:36:11+02:00 ldap: several functions exported to kemi framework --- Modified: src/modules/ldap/ldap_exp_fn.c Modified: src/modules/ldap/ldap_exp_fn.h Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2d4b4939d1845fffdc3fa3ced988972… Patch: https://github.com/kamailio/kamailio/commit/2d4b4939d1845fffdc3fa3ced988972…

1 0

git:master:b0bfe7af: core: store start of via body start in the structure
by Daniel-Constantin Mierla 31 May '21

31 May '21

Module: kamailio Branch: master Commit: b0bfe7afc52335774f8de8b31c19621f86fc4bc7 URL: https://github.com/kamailio/kamailio/commit/b0bfe7afc52335774f8de8b31c19621… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-31T13:32:14+02:00 core: store start of via body start in the structure - paired with bsize field --- Modified: src/core/parser/parse_via.c Modified: src/core/parser/parse_via.h Modified: src/core/sip_msg_clone.c --- Diff: https://github.com/kamailio/kamailio/commit/b0bfe7afc52335774f8de8b31c19621… Patch: https://github.com/kamailio/kamailio/commit/b0bfe7afc52335774f8de8b31c19621… --- diff --git a/src/core/parser/parse_via.c b/src/core/parser/parse_via.c index 8805fad5ca..78bd304f32 100644 --- a/src/core/parser/parse_via.c +++ b/src/core/parser/parse_via.c @@ -2667,6 +2667,7 @@ char *parse_via( /*DBG("parse_via: rest=<%s>\n", tmp);*/ vb->error = PARSE_OK; + vb->bstart = buffer; vb->bsize = tmp - buffer; if(vb->port_str.s) { vb->port = str2s(vb->port_str.s, vb->port_str.len, &err); @@ -2680,6 +2681,7 @@ char *parse_via( nextvia: DBG("parsing via: next via\n"); vb->error = PARSE_OK; + vb->bstart = buffer; vb->bsize = tmp - buffer; if(vb->port_str.s) { vb->port = str2s(vb->port_str.s, vb->port_str.len, &err); diff --git a/src/core/parser/parse_via.h b/src/core/parser/parse_via.h index e4957961f1..b4e99a09df 100644 --- a/src/core/parser/parse_via.h +++ b/src/core/parser/parse_via.h @@ -76,6 +76,7 @@ typedef struct via_body { str port_str; str params; str comment; + char *bstart; /* body content, not including hdr */ int bsize; /* body size, not including hdr */ struct via_param* param_lst; /* list of parameters*/ struct via_param* last_param; /*last via parameter, internal use*/ diff --git a/src/core/sip_msg_clone.c b/src/core/sip_msg_clone.c index e69c7f785d..f66614c99c 100644 --- a/src/core/sip_msg_clone.c +++ b/src/core/sip_msg_clone.c @@ -159,6 +159,8 @@ static inline struct via_body* via_body_cloner( char* new_buf, /* hdr (str type) */ new_via->hdr.s=translate_pointer(new_buf,org_buf,org_via->hdr.s); + /* bstart (char* type) */ + new_via->bstart=translate_pointer(new_buf,org_buf,org_via->bstart); /* name (str type) */ new_via->name.s=translate_pointer(new_buf,org_buf,org_via->name.s); /* version (str type) */

1 0

git:master:01664d1d: core: parse via - fixed whitespacing
by Daniel-Constantin Mierla 31 May '21

31 May '21

Module: kamailio Branch: master Commit: 01664d1d82dcfe952fce29033b4fcd5e44cf2319 URL: https://github.com/kamailio/kamailio/commit/01664d1d82dcfe952fce29033b4fcd5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-31T12:05:01+02:00 core: parse via - fixed whitespacing --- Modified: src/core/parser/parse_via.h --- Diff: https://github.com/kamailio/kamailio/commit/01664d1d82dcfe952fce29033b4fcd5… Patch: https://github.com/kamailio/kamailio/commit/01664d1d82dcfe952fce29033b4fcd5… --- diff --git a/src/core/parser/parse_via.h b/src/core/parser/parse_via.h index fca486e358..e4957961f1 100644 --- a/src/core/parser/parse_via.h +++ b/src/core/parser/parse_via.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -32,11 +32,11 @@ struct sip_msg; /* via param types - * WARNING: keep in sync with parse_via.c FIN_HIDDEN... + * WARNING: keep in sync with parse_via.c FIN_HIDDEN... * and with tm/sip_msg.c via_body_cloner */ enum { - PARAM_HIDDEN=230, PARAM_TTL, PARAM_BRANCH, + PARAM_HIDDEN=230, PARAM_TTL, PARAM_BRANCH, PARAM_MADDR, PARAM_RECEIVED, PARAM_RPORT, PARAM_I, PARAM_ALIAS, #ifdef USE_COMP PARAM_COMP, @@ -60,12 +60,12 @@ typedef struct via_param { /* Format: name/version/transport host:port;params comment */ - /* WARNING: keep in sync with tm/sip_msg.c via_body_cloner */ -typedef struct via_body { +/* WARNING: keep in sync with tm/sip_msg.c via_body_cloner */ +typedef struct via_body { int error; str hdr; /* Contains "Via" or "v" */ str name; - str version; + str version; str transport; str host; short proto; /* transport */ @@ -80,7 +80,7 @@ typedef struct via_body { struct via_param* param_lst; /* list of parameters*/ struct via_param* last_param; /*last via parameter, internal use*/ - /* shortcuts to "important" params*/ + /* shortcuts to "important" params*/ struct via_param* branch; str tid; /* transaction id, part of branch */ struct via_param* received; @@ -90,8 +90,8 @@ typedef struct via_body { #ifdef USE_COMP struct via_param* comp; /* see rfc3486 */ #endif - struct via_body* next; /* pointer to next via body string if - compact via or null */ + struct via_body* next; /* pointer to next via body string + if compact via or null */ } via_body_t;

1 0

git:master:9da83aae: textops: new function for finding start of a header
by Daniel-Constantin Mierla 31 May '21

31 May '21

Module: kamailio Branch: master Commit: 9da83aae38199afa82d8b4eab4efd7b48d81b0b9 URL: https://github.com/kamailio/kamailio/commit/9da83aae38199afa82d8b4eab4efd7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-31T10:44:37+02:00 textops: new function for finding start of a header - use it to find Content-Type start - GH #2748 --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/9da83aae38199afa82d8b4eab4efd7b… Patch: https://github.com/kamailio/kamailio/commit/9da83aae38199afa82d8b4eab4efd7b… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index b192c1306c..cbc2309cfe 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1597,6 +1597,52 @@ static inline int find_line_start(char *text, unsigned int text_len, return 0; } +static inline int find_hdr_line_start(char *hname, unsigned int hname_len, + char **buf, unsigned int *buf_len) +{ + hdr_field_t h1; + hdr_field_t h2; + str sname; + char *ch, *start; + unsigned int len; + + sname.s = hname; + sname.len = hname_len; + + start = *buf; + len = *buf_len; + if(parse_hname2_str(&sname, &h1)==NULL) { + LM_ERR("not a header name: %.*s\n", hname_len, hname); + return 0; + } + + while (hname_len <= len) { + if(parse_hname2(start, start + hname_len, &h2)!=NULL) { + if(h1.type>0 && h1.type==h2.type) { + *buf = start; + *buf_len = len; + return 1; + } else if(cmp_hdrname_str(&h1.name, &h2.name)==0) { + *buf = start; + *buf_len = len; + return 1; + } + } + if ((ch = memchr(start, 13, len - 1))) { + if (*(ch + 1) != 10) { + LM_ERR("No LF after CR\n"); + return 0; + } + len = len - (ch - start + 2); + start = ch + 2; + } else { + LM_ERR("No CRLF found\n"); + return 0; + } + } + return 0; +} + /** * return: * 1: multipart @@ -1645,7 +1691,7 @@ static int ki_filter_body(struct sip_msg* msg, str *content_type) start = body.s; len = body.len; - while (find_line_start("Content-Type: ", 14, &start, &len)) + while (find_hdr_line_start("Content-Type: ", 14, &start, &len)) { start = start + 14; len = len - 14; @@ -3187,7 +3233,7 @@ static int ki_remove_multibody(sip_msg_t* msg, str* content_type) start = body.s; len = body.len; - while (find_line_start("Content-Type: ", 14, &start, &len)) + while (find_hdr_line_start("Content-Type: ", 14, &start, &len)) { end = start + 14; len = len - 14; @@ -3293,7 +3339,7 @@ static int ki_get_body_part_helper(sip_msg_t* msg, str* ctype, pv_spec_t *dst, len = body.len; /* note: header body can follow just after name: - fixit */ - while (find_line_start("Content-Type: ", 14, &start, &len)) + while (find_hdr_line_start("Content-Type: ", 14, &start, &len)) { end = start + 14; len = len - 14;

1 0

[kamailio/kamailio] msg_parser.c:747: cannot parse "503 Service Unavailable" (#2751)
by sergey-safarov 31 May '21

31 May '21

### Description I sending an error "503 Service Unavailable" message for HTTP requests using `xhttp` module. Also, I use `siptrace` module to send packets to Homer. Looks as in this use case `msg_parser` not able to parse HTTP error message. ### Troubleshooting #### Reproduction Need to start Kamailio with config below and execute command `curl -v http://127.0.0.1:5060` Kamailio config ``` listen=udp:127.0.0.1:5060 listen=tcp:127.0.0.1:5060 loadmodule "tm.so" loadmodule "sl.so" loadmodule "pv.so" loadmodule "xlog.so" loadmodule "xhttp.so" loadmodule "siptrace.so" modparam("siptrace", "duplicate_uri", "sip:127.0.0.1:9060") modparam("siptrace", "hep_mode_on", 1) modparam("siptrace", "hep_version", 3) modparam("siptrace", "hep_capture_id", 1) modparam("siptrace", "trace_to_database", 0) modparam("siptrace", "trace_on", 1) modparam("siptrace", "trace_mode", 1) modparam("siptrace", "trace_init_mode", 1) # allow HTTP request tcp_accept_no_cl=yes request_route { drop; } event_route[siptrace:msg] { #xlog("L_ERROR", "trace|sip trace for method $mb\n"); drop(); } event_route[xhttp:request] { $var(status_code) = 503; $var(reason_phrase) = "Service Unavailable"; $var(response) = "{}"; xhttp_reply("$var(status_code)", "$var(reason_phrase)", "application/json", "$var(response)"); } ``` #### Log Messages Kamailio log messages for GET requests ``` 20(408) DEBUG: <core> [core/ip_addr.c:571]: print_ip(): tcpconn_new: new tcp connection: 127.0.0.1 20(408) DEBUG: <core> [core/tcp_main.c:1175]: tcpconn_new(): on port 55462, type 2, socket 35 20(408) DEBUG: <core> [core/tcp_main.c:1494]: tcpconn_add(): hashes: 2537:2327:2804, 1 20(408) DEBUG: <core> [core/io_wait.h:374]: io_watch_add(): DBG: io_watch_add(0x91b580, 35, 2, 0x7f8ec4bff0e0), fd_no=28 20(408) DEBUG: <core> [core/io_wait.h:599]: io_watch_del(): DBG: io_watch_del (0x91b580, 35, -1, 0x0) fd_no=29 called 20(408) DEBUG: <core> [core/tcp_main.c:4457]: handle_tcpconn_ev(): sending to child, events 1 20(408) DEBUG: <core> [core/tcp_main.c:4127]: send2child(): selected tcp worker idx:0 proc:12 pid:400 for activity on [tcp:127.0.0.1:5060], 0x7f8ec4bff0e0 12(400) DEBUG: <core> [core/tcp_read.c:1737]: handle_io(): received n=8 con=0x7f8ec4bff0e0, fd=7 12(400) DEBUG: <core> [core/parser/parse_fline.c:249]: parse_first_line(): first line type 1 (request) flags 2 12(400) DEBUG: <core> [core/parser/parse_fline.c:249]: parse_first_line(): first line type 1 (request) flags 2 12(400) DEBUG: <core> [core/parser/msg_parser.c:677]: parse_msg(): SIP Request: 12(400) DEBUG: <core> [core/parser/msg_parser.c:678]: parse_msg(): method: <GET> 12(400) DEBUG: <core> [core/parser/msg_parser.c:680]: parse_msg(): uri: </> 12(400) DEBUG: <core> [core/parser/msg_parser.c:682]: parse_msg(): version: <HTTP/1.1> 12(400) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [Host] type 0 12(400) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [User-Agent] type 28 12(400) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [Accept] type 23 12(400) DEBUG: <core> [core/parser/msg_parser.c:91]: get_hdr_field(): found end of header 12(400) DEBUG: <core> [core/receive.c:387]: receive_msg(): --- received sip message - request - call-id: [] - cseq: [] 12(400) DEBUG: <core> [core/receive.c:259]: ksr_evrt_pre_routing(): event route core:pre-routing not defined 12(400) DEBUG: xhttp [xhttp_mod.c:365]: xhttp_handler(): new fake msg created (112 bytes): <GET / HTTP/1.1 Via: SIP/2.0/TCP 127.0.0.1:55462 Host: 127.0.0.1:5060 User-Agent: curl/7.71.1 Accept: */* > 12(400) DEBUG: <core> [core/parser/parse_fline.c:249]: parse_first_line(): first line type 1 (request) flags 2 12(400) DEBUG: <core> [core/parser/msg_parser.c:677]: parse_msg(): SIP Request: 12(400) DEBUG: <core> [core/parser/msg_parser.c:678]: parse_msg(): method: <GET> 12(400) DEBUG: <core> [core/parser/msg_parser.c:680]: parse_msg(): uri: </> 12(400) DEBUG: <core> [core/parser/msg_parser.c:682]: parse_msg(): version: <HTTP/1.1> 12(400) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [Via] type 1 12(400) DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 12(400) DEBUG: <core> [core/parser/msg_parser.c:555]: parse_headers(): Via found, flags=2 12(400) DEBUG: <core> [core/parser/msg_parser.c:557]: parse_headers(): this is the first via 12(400) DEBUG: xhttp [xhttp_mod.c:410]: xhttp_send_reply(): response with content-type: application/json 12(400) DEBUG: xhttp [xhttp_mod.c:418]: xhttp_send_reply(): response with body: {} 12(400) DEBUG: xhttp [xhttp_mod.c:420]: xhttp_send_reply(): sending out response: 503 Service Unavailable 12(400) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [Host] type 0 12(400) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [User-Agent] type 28 12(400) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [Accept] type 23 12(400) DEBUG: <core> [core/parser/msg_parser.c:91]: get_hdr_field(): found end of header 12(400) DEBUG: <core> [core/msg_translator.c:162]: check_via_address(): (127.0.0.1, 127.0.0.1, 0) 12(400) DEBUG: <core> [core/tcp_main.c:1590]: _tcpconn_find(): found connection by id: 1 12(400) DEBUG: <core> [core/tcp_main.c:2471]: tcpconn_send_put(): send from reader (400 (12)), reusing fd 12(400) DEBUG: <core> [core/tcp_main.c:2706]: tcpconn_do_send(): sending... 12(400) DEBUG: <core> [core/tcp_main.c:2739]: tcpconn_do_send(): after real write: c= 0x7f8ec4bff0e0 n=169 fd=7 12(400) DEBUG: <core> [core/tcp_main.c:2740]: tcpconn_do_send(): buf= HTTP/1.1 503 Service Unavailable Sia: SIP/2.0/TCP 127.0.0.1:55462 Content-Type: application/json Server: kamailio (5.6.0-dev0 (x86_64/linux)) Content-Length: 2 {} 12(400) DEBUG: <core> [core/parser/parse_fline.c:255]: parse_first_line(): bad request first line 12(400) DEBUG: <core> [core/parser/parse_fline.c:258]: parse_first_line(): at line 0 char 20: 12(400) DEBUG: <core> [core/parser/parse_fline.c:264]: parse_first_line(): parsed so far: HTTP/1.1 503 Service 12(400) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 20) 12(400) DEBUG: <core> [core/parser/msg_parser.c:673]: parse_msg(): invalid message 12(400) ERROR: <core> [core/parser/msg_parser.c:747]: parse_msg(): ERROR: parse_msg: message=<HTTP/1.1 503 Service Unavailable Sia: SIP/2.0/TCP 127.0.0.1:55462 Content-Type: application/json Server: kamailio (5.6.0-dev0 (x86_64/linux)) Content-Length: 2 {}> 12(400) DEBUG: siptrace [siptrace.c:2063]: siptrace_exec_evcb_msg(): parse_msg failed 12(400) DEBUG: siptrace [siptrace.c:2279]: siptrace_net_data_sent(): processing message mode 1 12(400) DEBUG: siptrace [siptrace_hep.c:496]: pipport2su(): the port string is 5060 12(400) DEBUG: siptrace [siptrace_hep.c:496]: pipport2su(): the port string is 55462 12(400) DEBUG: <core> [core/proxy.c:264]: mk_proxy(): doing DNS lookup... 12(400) DEBUG: siptrace [siptrace_hep.c:184]: trace_send_hep3_duplicate(): setting up the socket_info 12(400) DEBUG: <core> [core/usr_avp.c:637]: destroy_avp_list(): destroying list (nil) 12(400) DEBUG: <core> [core/usr_avp.c:637]: destroy_avp_list(): destroying list (nil) 12(400) DEBUG: <core> [core/usr_avp.c:637]: destroy_avp_list(): destroying list (nil) 12(400) DEBUG: <core> [core/usr_avp.c:637]: destroy_avp_list(): destroying list (nil) 12(400) DEBUG: <core> [core/usr_avp.c:637]: destroy_avp_list(): destroying list (nil) 12(400) DEBUG: <core> [core/usr_avp.c:637]: destroy_avp_list(): destroying list (nil) 12(400) DEBUG: <core> [core/xavp.c:541]: xavp_destroy_list(): destroying xavp list (nil) 12(400) DEBUG: <core> [core/xavp.c:541]: xavp_destroy_list(): destroying xavp list (nil) 12(400) DEBUG: <core> [core/xavp.c:541]: xavp_destroy_list(): destroying xavp list (nil) 12(400) DEBUG: <core> [core/receive.c:606]: receive_msg(): cleaning up 12(400) DEBUG: <core> [core/io_wait.h:374]: io_watch_add(): DBG: io_watch_add(0x95f820, 7, 2, 0x7f8ec4bff0e0), fd_no=1 12(400) DEBUG: <core> [core/tcp_read.c:300]: tcp_read_data(): EOF on connection 0x7f8ec4bff0e0 (state: 0, flags: 4018) - FD 7, bytes 0, rd-flags 10000 ([127.0.0.1]:55462 -> [127.0.0.1]:5060)12(400) DEBUG: <core> [core/tcp_read.c:184]: tcp_emit_closed_event(): TCP closed event creation triggered (reason: 0) 12(400) DEBUG: <core> [core/tcp_read.c:192]: tcp_emit_closed_event(): no callback registering for handling TCP closed event 12(400) DEBUG: <core> [core/tcp_read.c:1503]: tcp_read_req(): EOF 12(400) DEBUG: <core> [core/io_wait.h:599]: io_watch_del(): DBG: io_watch_del (0x95f820, 7, -1, 0x10) fd_no=2 called 12(400) DEBUG: <core> [core/tcp_read.c:1872]: handle_io(): removing from list 0x7f8ec4bff0e0 id 1 fd 7, state 2, flags 4018, main fd 35, refcnt 2 ([127.0.0.1]:55462 -> [127.0.0.1]:5060) 12(400) DEBUG: <core> [core/tcp_read.c:1656]: release_tcpconn(): releasing con 0x7f8ec4bff0e0, state -1, fd=7, id=1 ([127.0.0.1]:55462 -> [127.0.0.1]:5060) 12(400) DEBUG: <core> [core/tcp_read.c:1660]: release_tcpconn(): extra_data (nil) 20(408) DEBUG: <core> [core/tcp_main.c:3559]: handle_tcp_child(): reader response= 7f8ec4bff0e0, -1 from 0 ``` ### Additional Information Tested master branch, commit 79fbb7c6df5d4c742b1283b752c2df0f51e77f09 -- 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/2751

2 2

git:master:5ef7331d: modules: readme files regenerated - mtree ... [skip ci]
by Kamailio Dev 29 May '21

29 May '21

Module: kamailio Branch: master Commit: 5ef7331dc691d7becf899a9e31961f9381e85878 URL: https://github.com/kamailio/kamailio/commit/5ef7331dc691d7becf899a9e31961f9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-29T16:01:22+02:00 modules: readme files regenerated - mtree ... [skip ci] --- Modified: src/modules/mtree/README --- Diff: https://github.com/kamailio/kamailio/commit/5ef7331dc691d7becf899a9e31961f9… Patch: https://github.com/kamailio/kamailio/commit/5ef7331dc691d7becf899a9e31961f9…

1 0

[kamailio/kamailio] mtree: Missing docs of params "pv_dstid", "pv_weight", "pv_count" (#2750)
by Olle E. Johansson 29 May '21

29 May '21

The mtree_mod.c file has three pv param settings that is not documented in the README https://kamailio.org/docs/modules/devel/modules/mtree.html * pv_dstid * pv_count * pv_weight I see that pv_dstid and pv_weight is set in the code. I can't really guess what they are, so I can't add docs myself... -- 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/2750

2 5

git:master:07643b70: mtree: docs for pv_dstid, pv_weight and pv_count
by Daniel-Constantin Mierla 29 May '21

29 May '21

Module: kamailio Branch: master Commit: 07643b70aa8e80551105ae99a5d2340798167669 URL: https://github.com/kamailio/kamailio/commit/07643b70aa8e80551105ae99a5d2340… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-29T15:31:53+02:00 mtree: docs for pv_dstid, pv_weight and pv_count - GH #2750 --- Modified: src/modules/mtree/doc/mtree_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/07643b70aa8e80551105ae99a5d2340… Patch: https://github.com/kamailio/kamailio/commit/07643b70aa8e80551105ae99a5d2340… --- diff --git a/src/modules/mtree/doc/mtree_admin.xml b/src/modules/mtree/doc/mtree_admin.xml index 10e69a30a0..7465226efb 100644 --- a/src/modules/mtree/doc/mtree_admin.xml +++ b/src/modules/mtree/doc/mtree_admin.xml @@ -139,10 +139,19 @@ modparam("mtree", "db_table", "mtrees") </listitem> <listitem> <para> - type - the type of tree elements (0 = string, 2 = integer). - It is valid only when the (tprefix, tvalue) pairs are loaded + type - the type of tree elements (0 = string, 1 = d:w, 2 = integer). + None-zero is valid only when the (tprefix, tvalue) pairs are loaded (not for multi-column values). </para> + <para> + When the type is 1, the value in database has to be two integers + separated by colon, the first one (d - dstid) will be stored in + pv_dstid AVP and the second (w - weight) will be stored in + pv_weight AVP. If in the matching records are many with the same + dstid, it will keep only the one with the longest prefix. Then + the records are ordered by the weight and stored in the specified + AVPs. The number of stored records is saved in pv_count variable. + </para> </listitem> <listitem> <para> @@ -318,6 +327,67 @@ modparam("mtree", "pv_values", "$avp(mtvals)") </example> </section> + <section> + <title><varname>pv_dstid</varname> (string)</title> + <para> + The AVP name where to store the first integer value when tree type is 1. + </para> + <para> + <emphasis> + Default value is <quote>$avp(tdstid)</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>pv_dstid</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("mtree", "pv_dstid", "$var(dstid)") +... +</programlisting> + </example> + </section> + + <section> + <title><varname>pv_weight</varname> (string)</title> + <para> + The AVP name where to store the second integer value when tree type is 1. + </para> + <para> + <emphasis> + Default value is <quote>$avp(tweight)</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>pv_weight</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("mtree", "pv_dstid", "$var(weight)") +... +</programlisting> + </example> + </section> + + <section> + <title><varname>pv_count</varname> (string)</title> + <para> + The PV spec where to store the count of matched values when tree type + is 1. It can be any writable PV. + </para> + <para> + <emphasis> + Default value is <quote>$avp(tcount)</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>pv_count</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("mtree", "pv_count", "$var(count)") +... +</programlisting> + </example> + </section> + <section> <title><varname>mt_tree_type</varname> (integer)</title> <para> @@ -389,8 +459,8 @@ modparam("mtree", "mt_allow_duplicates", 1) </title> <para> Match 'pv' value against 'mtree'. If 'mtree' type is 0 or 2 and value - of 'mode' is NOT 2, sets a value of the longest matching prefix to - pseudo variable specified by pv_value parameter. If 'mtree' type is + of 'mode' is NOT 2, sets associated value of the longest matching prefix + to pseudo variable specified by pv_value parameter. If 'mtree' type is 0 or 2 and value of 'mode' is 2, sets values of all matching prefixes to avp specified by pv_values parameter so that a value of longest matching prefix is in avp index 0. Parameter 'mode' can be an integer

1 0

git:master:4e29c23e: mtree: number of matched records for tree type=1 stored in pv_count
by Daniel-Constantin Mierla 29 May '21

29 May '21

Module: kamailio Branch: master Commit: 4e29c23e8b310d111503dee44b6de3aa8f57d2ce URL: https://github.com/kamailio/kamailio/commit/4e29c23e8b310d111503dee44b6de3a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-28T14:55:42+02:00 mtree: number of matched records for tree type=1 stored in pv_count --- Modified: src/modules/mtree/mtree.c --- Diff: https://github.com/kamailio/kamailio/commit/4e29c23e8b310d111503dee44b6de3a… Patch: https://github.com/kamailio/kamailio/commit/4e29c23e8b310d111503dee44b6de3a… --- diff --git a/src/modules/mtree/mtree.c b/src/modules/mtree/mtree.c index fe4dba1a20..f9b755d4d8 100644 --- a/src/modules/mtree/mtree.c +++ b/src/modules/mtree/mtree.c @@ -44,6 +44,7 @@ extern pv_spec_t pv_value; extern pv_spec_t pv_values; extern pv_spec_t pv_dstid; extern pv_spec_t pv_weight; +extern pv_spec_t pv_count; extern int _mt_tree_type; extern int _mt_ignore_duplicates; extern int _mt_allow_duplicates; @@ -599,6 +600,13 @@ int mt_match_prefix(struct sip_msg *msg, m_tree_t *it, add_avp(dstid_name_type, dstid_avp_name, avp_value); } } + memset(&val, 0, sizeof(pv_value_t)); + val.flags = PV_VAL_INT; + val.ri = n; + if(pv_value.setf(msg, &pv_count.pvp, (int)EQ_T, &val)<0) { + LM_ERR("setting PV count failed\n"); + return -2; + } return 0; }

1 0

git:master:63b03452: mtree: check if pv_count var is r/w
by Daniel-Constantin Mierla 29 May '21

29 May '21

Module: kamailio Branch: master Commit: 63b0345207ba67fcc6290d6dfc55f99ba58b13c9 URL: https://github.com/kamailio/kamailio/commit/63b0345207ba67fcc6290d6dfc55f99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-28T13:54:08+02:00 mtree: check if pv_count var is r/w - reported by GH #2750 --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/63b0345207ba67fcc6290d6dfc55f99… Patch: https://github.com/kamailio/kamailio/commit/63b0345207ba67fcc6290d6dfc55f99… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index c04f031cfd..63180bbfb7 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -203,7 +203,7 @@ static int mod_init(void) } if(pv_parse_spec(&count_param, &pv_count) < 0 - || !(pv_is_w(&pv_weight))) + || !(pv_is_w(&pv_count))) { LM_ERR("cannot parse count pv or pv is read-only\n"); return -1;

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2021