sr-dev October 2020

sr-dev@lists.kamailio.org

19 participants
527 discussions

[kamailio/kamailio] RTPengine PV varaibles missing the leg wise vallues for media stats attributes like jitter (mos_average_jitter_A_pv), mos (mos_average_A_pv), packetloss (mos_average_packetloss_A_pv ) etc (#2340)

by altanai

### Description Extract media stats per leg from RTPengine but in spite of labels being present in RTPengine logs the values are not extracted in their respective PV's Note : the overall average, max and min values appear fine ### Troubleshooting Opened Kamailio in debug mode and saw that labels are being set , yet appearing as null Snipets ``` tagsd8:91e08b04d3:tag8:91e08b045:label6:caller7:createdi1590686836e16:in dialogue with13:tKtpK3BHjFavK6:mediasld5:indexi1e4:type5:audio8:protocol8:RTP/AVPF7 .. looking for label '<null>' ``` Full logs below in the "Log Messages" section #### Reproduction Using Lua on Kamailio v5.2.1 1. Add labels in RTPengine offer , ensuring the traffic is AVPF ``` local rtpengine_codecs_flag = " codec-strip-all codec-offer-PCMA codec-offer-pcma " local rtpengine_offer_flag = "ICE=remove RTP/AVPF full-rtcp-attribute direction=external direction=external replace-origin replace-session-connection record-call=yes " .. rtpengine_codecs_flag .. " label=caller " local rtpengine_answer_flag = "ICE=remove RTP/AVPF full-rtcp-attribute direction=external direction=external replace-origin replace-session-connection record-call=yes label=callee " ``` 2. set the mos label ``` KSR.pv.sets("$avp(mos_A_label)", "caller"); ``` 3. Make call and do RTPengine offer and answer like usual ``` KSR.rtpengine.rtpengine_offer(rtpengine_offer_flag) ... KSR.rtpengine.rtpengine_answer(rtpengine_answer_flag) ``` 3. On BYE , do rtpengihne delete ``` KSR.rtpengine.rtpengine_delete0() ``` 4. gather PV values for legs ``` KSR.log("info", "mos_A_label " .. KSR.pv.getvn("$avp(mos_A_label)", 1) .. "\n ") KSR.log("info", "mos_average_packetloss_A " .. KSR.pv.getvn("$avp(mos_average_packetloss_A)", 0) .. "\n ") KSR.log("info", "mos_average_jitter_A " .. KSR.pv.getvn("$avp(mos_average_jitter_A)", 0) .. "\n ") KSR.log("info", "mos_average_roundtrip_A " .. KSR.pv.getvn("$avp(mos_average_roundtrip_A)", 0) .. "\n ") KSR.log("info", "mos_average_A " .. KSR.pv.getvn("$avp(mos_average_A)", 0) .. "\n ") ``` #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  Log from kamailio from BYE untill printing overall average mos score ``` 4(11084) INFO: <core> [core/kemi.c:143]: sr_kemi_core_log(): >>> delete RTPengine 4(11084) DEBUG: rtpengine [rtpengine.c:2912]: select_rtpp_node_old(): rtpengine hash table lookup find node=udp:192.168.1.109:2222 for calllen=49 callid=103103ZjIzOGM1MWRlYjQxZDhjYWQ4YTlhN2I3ODg0YWNmN2I viabranch= 4(11084) DEBUG: rtpengine [rtpengine.c:2452]: rtpp_function_call(): proxy reply: d7:createdi1590686836e10:created_usi219955e11:last signali1590686836e4:SSRCd10:2899397750d11:average MOSd3:MOSi43e15:round-trip timei14365e6:jitteri0e11:packet lossi0e7:samplesi3ee10:lowest MOSd3:MOSi43e15:round-trip timei12630e6:jitteri1e11:packet lossi0e11:reported ati1590686846ee11:highest MOSd3:MOSi44e15:round-trip timei7559e6:jitteri0e11:packet lossi0e11:reported ati1590686849ee15:MOS progressiond8:intervali0e7:entriesld3:MOSi43e15:round-trip timei12630e6:jitteri1e11:packet lossi0e11:reported ati1590686846eed3:MOSi44e15:round-trip timei7559e6:jitteri0e11:packet lossi0e11:reported ati1590686849eed3:MOSi43e15:round-trip timei22908e6:jitteri0e11:packet lossi0e11:reported ati1590686855eeeee10:3469957276d11:average MOSd3:MOSi43e15:round-trip timei17045e6:jitteri0e11:packet lossi0e7:samplesi5ee10:lowest MOSd3:MOSi43e15:round-trip timei10048e6:jitteri0e11:packet lossi0e11:reported ati1590686844ee11:highest MOSd3:MOSi44e15:round-trip timei7134e6:jitteri0e11:packet lossi0e11:reported ati1590686848ee15:MOS progressiond8:intervali1e7:entriesld3:MOSi43e15:round-trip timei10048e6:jitteri0e11:packet lossi0e11:reported ati1590686844eed3:MOSi44e15:round-trip timei7134e6:jitteri0e11:packet lossi0e11:reported ati1590686848eed3:MOSi43e15:round-trip timei22738e6:jitteri0e11:packet lossi0e11:reported ati1590686852eed3:MOSi43e15:round-trip timei22566e6:jitteri0e11:packet lossi0e11:reported ati1590686853eed3:MOSi43e15:round-trip timei22739e6:jitteri0e11:packet lossi0e11:reported ati1590686854eeeeee4:tagsd8:91e08b04d3:tag8:91e08b045:label6:caller7:createdi1590686836e16:in dialogue with13:tKtpK3BHjFavK6:mediasld5:indexi1e4:type5:audio8:protocol8:RTP/AVPF7:streamsld10:local porti31052e8:endpointd6:family4:IPv47:address13:192.168.1.1084:porti58004ee19:advertised endpointd6:family4:IPv47:address13:192.168.1.1084:porti58004ee11:last packeti1590686855e5:flagsl3:RTP6:filled9:confirmed10:kernelized17:no kernel supporte4:SSRCi2899397750e5:statsd7:packetsi928e5:bytesi157696e6:errorsi12eeed10:local porti31053e8:endpointd6:family4:IPv47:address13:192.168.1.1084:porti58005ee19:advertised endpointd6:family4:IPv47:address13:192.168.1.1084:porti58005ee11:last packeti1590686855e5:flagsl4:RTCP6:filled9:confirmed10:kernelized17:no kernel supporte4:SSRCi2899397750e5:statsd7:packetsi5e5:bytesi400e6:errorsi0eeee5:flagsl11:initialized4:send4:recveeee13:tKtpK3BHjFavKd3:tag13:tKtpK3BHjFavK5:label6:callee7:createdi1590686836e16:in dialogue with8:91e08b046:mediasld5:indexi1e4:type5:audio8:protocol8:RTP/AVPF7:streamsld10:local porti31044e8:endpointd6:family4:IPv47:address13:192.168.1.1094:porti27984ee19:advertised endpointd6:family4:IPv47:address13:192.168.1.1094:porti27984ee11:last packeti1590686855e5:flagsl3:RTP6:filled9:confirmed10:kernelized17:no kernel support3:ICEe4:SSRCi3469957276e5:statsd7:packetsi653e5:bytesi112316e6:errorsi0eeed10:local porti31045e8:endpointd6:family4:IPv47:address13:192.168.1.1094:porti27985ee19:advertised endpointd6:family4:IPv47:address13:192.168.1.1094:porti27985ee11:last packeti1590686854e5:flagsl4:RTCP6:filled9:confirmed10:kernelized17:no kernel support3:ICEe4:SSRCi3469957276e5:statsd7:packetsi6e5:bytesi652e6:errorsi0eeee5:flagsl11:initialized4:send4:recv3:ICE15:ICE controllingeeeee6:totalsd3:RTPd7:packetsi1581e5:bytesi270012e6:errorsi12ee4:RTCPd7:packetsi11e5:bytesi1052e6:errorsi0eee6:result2:oke 4(11084) DEBUG: rtpengine [rtpengine.c:2536]: rtpp_function_call(): rtpengine hash table remove entry for callen=49 callid=103103ZjIzOGM1MWRlYjQxZDhjYWQ4YTlhN2I3ODg0YWNmN2I viabranch= 4(11084) DEBUG: rtpengine [rtpengine.c:3129]: parse_call_stats_1(): rtpengine: looking for label '<null>' 4(11084) DEBUG: rtpengine [rtpengine.c:3135]: parse_call_stats_1(): rtpengine: XXX got tags 4(11084) DEBUG: rtpengine [rtpengine.c:3138]: parse_call_stats_1(): rtpengine: XXX got tag 4(11084) DEBUG: rtpengine [rtpengine.c:3143]: parse_call_stats_1(): rtpengine: XXX got label caller 4(11084) DEBUG: rtpengine [rtpengine.c:3138]: parse_call_stats_1(): rtpengine: XXX got tag 4(11084) DEBUG: rtpengine [rtpengine.c:3143]: parse_call_stats_1(): rtpengine: XXX got label callee 4(11084) DEBUG: rtpengine [rtpengine.c:3129]: parse_call_stats_1(): rtpengine: looking for label '<null>' 4(11084) DEBUG: rtpengine [rtpengine.c:3135]: parse_call_stats_1(): rtpengine: XXX got tags 4(11084) DEBUG: rtpengine [rtpengine.c:3138]: parse_call_stats_1(): rtpengine: XXX got tag 4(11084) DEBUG: rtpengine [rtpengine.c:3143]: parse_call_stats_1(): rtpengine: XXX got label caller 4(11084) DEBUG: rtpengine [rtpengine.c:3138]: parse_call_stats_1(): rtpengine: XXX got tag 4(11084) DEBUG: rtpengine [rtpengine.c:3143]: parse_call_stats_1(): rtpengine: XXX got label callee 4(11084) DEBUG: app_lua [app_lua_sr.c:1024]: lua_sr_pv_get_valx(): pv set: $avp(mos_average) 4(11084) DEBUG: <core> [core/pvapi.c:395]: pv_cache_lookup(): pvar [$avp(mos_average)] found in cache 4(11084) DEBUG: app_lua [app_lua_sr.c:1651]: sr_kemi_lua_exec_func_ex(): param[0] for: log is str: info 4(11084) DEBUG: app_lua [app_lua_sr.c:1651]: sr_kemi_lua_exec_func_ex(): param[1] for: log is str: mos average 4.3 4(11084) INFO: <core> [core/kemi.c:143]: sr_kemi_core_log(): mos average 4.3 ``` Logs from the same trace printing A leg values as nill , I'm using get getvn such as ``` KSR.log("info", "mos_average_B " .. KSR.pv.getvn("$avp(mos_average_B)", 0) .. "\n ") ``` the traces thus show all values as 0 ``` 4(11084) INFO: <core> [core/kemi.c:143]: sr_kemi_core_log(): mos_A_label 1 4(11084) DEBUG: app_lua [app_lua_sr.c:1024]: lua_sr_pv_get_valx(): pv set: $avp(mos_average_packetloss_A) 4(11084) DEBUG: <core> [core/pvapi.c:395]: pv_cache_lookup(): pvar [$avp(mos_average_packetloss_A)] found in cache 4(11084) DEBUG: app_lua [app_lua_sr.c:1651]: sr_kemi_lua_exec_func_ex(): param[0] for: log is str: info 4(11084) DEBUG: app_lua [app_lua_sr.c:1651]: sr_kemi_lua_exec_func_ex(): param[1] for: log is str: mos_average_packetloss_A 0 4(11084) INFO: <core> [core/kemi.c:143]: sr_kemi_core_log(): mos_average_packetloss_A 0 4(11084) DEBUG: app_lua [app_lua_sr.c:1024]: lua_sr_pv_get_valx(): pv set: $avp(mos_average_jitter_A) 4(11084) DEBUG: <core> [core/pvapi.c:395]: pv_cache_lookup(): pvar [$avp(mos_average_jitter_A)] found in cache 4(11084) DEBUG: app_lua [app_lua_sr.c:1651]: sr_kemi_lua_exec_func_ex(): param[0] for: log is str: info 4(11084) DEBUG: app_lua [app_lua_sr.c:1651]: sr_kemi_lua_exec_func_ex(): param[1] for: log is str: mos_average_jitter_A 0 4(11084) INFO: <core> [core/kemi.c:143]: sr_kemi_core_log(): mos_average_jitter_A 0 4(11084) DEBUG: app_lua [app_lua_sr.c:1024]: lua_sr_pv_get_valx(): pv set: $avp(mos_average_roundtrip_A) 4(11084) DEBUG: <core> [core/pvapi.c:395]: pv_cache_lookup(): pvar [$avp(mos_average_roundtrip_A)] found in cache 4(11084) DEBUG: app_lua [app_lua_sr.c:1651]: sr_kemi_lua_exec_func_ex(): param[0] for: log is str: info 4(11084) DEBUG: app_lua [app_lua_sr.c:1651]: sr_kemi_lua_exec_func_ex(): param[1] for: log is str: mos_average_roundtrip_A 0 4(11084) INFO: <core> [core/kemi.c:143]: sr_kemi_core_log(): mos_average_roundtrip_A 0 4(11084) DEBUG: app_lua [app_lua_sr.c:1024]: lua_sr_pv_get_valx(): pv set: $avp(mos_average_A) 4(11084) DEBUG: <core> [core/pvapi.c:395]: pv_cache_lookup(): pvar [$avp(mos_average_A)] found in cache 4(11084) DEBUG: app_lua [app_lua_sr.c:1651]: sr_kemi_lua_exec_func_ex(): param[0] for: log is str: info 4(11084) DEBUG: app_lua [app_lua_sr.c:1651]: sr_kemi_lua_exec_func_ex(): param[1] for: log is str: mos_average_A 0 4(11084) INFO: <core> [core/kemi.c:143]: sr_kemi_core_log(): mos_average_A 0 4(11084) DEBUG: app_lua [app_lua_sr.c:1024]: lua_sr_pv_get_valx(): pv set: $avp(mos_B_label) 4(11084) DEBUG: <core> [core/pvapi.c:395]: pv_cache_lookup(): pvar [$avp(mos_B_label)] found in cache 4(11084) DEBUG: app_lua [app_lua_sr.c:1651]: sr_kemi_lua_exec_func_ex(): param[0] for: log is str: info 4(11084) DEBUG: app_lua [app_lua_sr.c:1651]: sr_kemi_lua_exec_func_ex(): param[1] for: log is str: mos_B_label 1 ``` All IPs are local network so I didn't bother masking them #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  I did manage to extract the leg A values by first commenting out pase_call stats for overall and leg B ``` //parse_call_stats_1(&global_mos_stats, dict, msg); parse_call_stats_1(&side_A_mos_stats, dict, msg); //parse_call_stats_1(&side_B_mos_stats, dict, msg); ``` and then commenting out the check between the label and well another label , which is where I figured it was breaking the loop ``` //if (str_cmp(&check, &label)) // continue; ``` I understand this isn't an acceptable approach and I looking forward to learning whether this really is a bug or a bad setting on my end Initially though it an RTPengine issue and raised a bug there too https://github.com/sipwise/rtpengine/issues/947 pretty sure it isn't an RTPenginhe issue now . ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio -v version: kamailio 5.2.1 (x86_64/linux) b71938-dirty flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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 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: b71938 -dirty compiled on 13:06:02 May 28 2020 with gcc 7.5.0 ``` * **Operating System**:  ``` Linux altanai-Inspiron-15-5578 4.15.0-62-generic #69-Ubuntu SMP Wed Sep 4 20:55:53 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/2340

3 years, 10 months

git:master:7c3612c2: core: parser - clean header in case of parsing error

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7c3612c27425c04912c879af463f74831b17c5e4 URL: https://github.com/kamailio/kamailio/commit/7c3612c27425c04912c879af463f748… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-10T12:08:25+02:00 core: parser - clean header in case of parsing error --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/7c3612c27425c04912c879af463f748… Patch: https://github.com/kamailio/kamailio/commit/7c3612c27425c04912c879af463f748… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 39ed0c437c..1e24b21e49 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -609,7 +609,10 @@ int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int error: ser_error=E_BAD_REQ; - if (hf) pkg_free(hf); + if (hf) { + clean_hdr_field(hf); + pkg_free(hf); + } /* restore original flags */ msg->parsed_flag |= orig_flag; return -1;

3 years, 10 months

git:master:0c91f8cb: core: new global parameter sip_parser_mode

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0c91f8cbe756133761886e9e22f2c10e51737e90 URL: https://github.com/kamailio/kamailio/commit/0c91f8cbe756133761886e9e22f2c10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-10T11:20:48+02:00 core: new global parameter sip_parser_mode - allow to control how sip parser behaves - 0 - be less restrictive, to support more protocols - 1 - be more strict on sip headers checks - default 1 --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/parser/msg_parser.c Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/0c91f8cbe756133761886e9e22f2c10… Patch: https://github.com/kamailio/kamailio/commit/0c91f8cbe756133761886e9e22f2c10…

3 years, 10 months

git:5.4:f57c900b: tm: do not add duplicate headers in local requests

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: f57c900b438f3233fa1e9a9d3ca8cd383a30baa6 URL: https://github.com/kamailio/kamailio/commit/f57c900b438f3233fa1e9a9d3ca8cd3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-09T22:31:12+02:00 tm: do not add duplicate headers in local requests (cherry picked from commit ada3701d22b1fd579f06b4f54fa695fa988e685f) --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/f57c900b438f3233fa1e9a9d3ca8cd3… Patch: https://github.com/kamailio/kamailio/commit/f57c900b438f3233fa1e9a9d3ca8cd3… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index bd75b271be..cda84b6f5d 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -268,6 +268,7 @@ char *build_local_reparse(tm_cell_t *Trans,unsigned int branch, struct hdr_field *reas1, *reas_last, *hdr; int hadded = 0; sr_cfgenv_t *cenv = NULL; + hdr_flags_t hdr_flags = 0; invite_buf = Trans->uac[branch].request.buffer; invite_len = Trans->uac[branch].request.buffer_len; @@ -361,6 +362,11 @@ char *build_local_reparse(tm_cell_t *Trans,unsigned int branch, switch(hf_type) { case HDR_CSEQ_T: /* find the method name and replace it */ + if(hdr_flags & HDR_CSEQ_F) { + LM_DBG("duplicate CSeq header\n"); + goto errorhdr; + } + hdr_flags |= HDR_CSEQ_F; while ((s < invite_buf_end) && ((*s == ':') || (*s == ' ') || (*s == '\t') || ((*s >= '0') && (*s <= '9'))) @@ -381,6 +387,12 @@ char *build_local_reparse(tm_cell_t *Trans,unsigned int branch, break; case HDR_TO_T: + if(hdr_flags & HDR_TO_F) { + LM_DBG("duplicate To header\n"); + goto errorhdr; + } + hdr_flags |= HDR_TO_F; + if (to_len == 0) { /* there is no To tag required, just copy paste * the header */ @@ -395,7 +407,25 @@ char *build_local_reparse(tm_cell_t *Trans,unsigned int branch, break; case HDR_FROM_T: + /* copy hf */ + if(hdr_flags & HDR_FROM_F) { + LM_DBG("duplicate From header\n"); + goto errorhdr; + } + hdr_flags |= HDR_FROM_F; + s = lw_next_line(s, invite_buf_end); + append_str(d, s1, s - s1); + break; case HDR_CALLID_T: + /* copy hf */ + if(hdr_flags & HDR_CALLID_F) { + LM_DBG("duplicate Call-Id header\n"); + goto errorhdr; + } + hdr_flags |= HDR_CALLID_F; + s = lw_next_line(s, invite_buf_end); + append_str(d, s1, s - s1); + break; case HDR_ROUTE_T: case HDR_MAXFORWARDS_T: /* copy hf */ @@ -495,6 +525,7 @@ char *build_local_reparse(tm_cell_t *Trans,unsigned int branch, /* HDR_EOH_T was not found in the buffer, the message is corrupt */ LM_ERR("HDR_EOH_T was not found\n"); +errorhdr: shm_free(cancel_buf); error: LM_ERR("cannot build %.*s request\n", method_len, method);

3 years, 10 months

git:5.4:6e2bdf10: core: parser - print lenghts in to header parsing debug message

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 6e2bdf1056e3a31f1ca1f485473fcd26f9ccf044 URL: https://github.com/kamailio/kamailio/commit/6e2bdf1056e3a31f1ca1f485473fcd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-09T22:31:03+02:00 core: parser - print lenghts in to header parsing debug message (cherry picked from commit 2648eb330b133a20f1398d59a28c53532106cad3) --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/6e2bdf1056e3a31f1ca1f485473fcd2… Patch: https://github.com/kamailio/kamailio/commit/6e2bdf1056e3a31f1ca1f485473fcd2… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index aff3c0a989..5ac16f1b18 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -169,9 +169,9 @@ char* get_hdr_field(char* const buf, char* const end, struct hdr_field* const hd hdr->body.len=tmp-hdr->body.s; DBG("<%.*s> [%d]; uri=[%.*s]\n", hdr->name.len, ZSW(hdr->name.s), hdr->body.len, to_b->uri.len, ZSW(to_b->uri.s)); - DBG("to body [%.*s], to tag [%.*s]\n", to_b->body.len, - ZSW(to_b->body.s), to_b->tag_value.len, - ZSW(to_b->tag_value.s)); + DBG("to body (%d)[%.*s], to tag (%d)[%.*s]\n", to_b->body.len, + to_b->body.len, ZSW(to_b->body.s), to_b->tag_value.len, + to_b->tag_value.len, ZSW(to_b->tag_value.s)); break; case HDR_CONTENTLENGTH_T: hdr->body.s=tmp;

3 years, 10 months

git:5.4:7adf410a: sanity: extended check 4 (required headers) for uniqueness

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 7adf410af754f1bb737edca6f427ef02d3441cda URL: https://github.com/kamailio/kamailio/commit/7adf410af754f1bb737edca6f427ef0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-09T22:30:53+02:00 sanity: extended check 4 (required headers) for uniqueness - Call-ID, CSeq, From and To have to be only once (cherry picked from commit a9ede56b35990fcc9164af0775f503e49e33377e) --- Modified: src/modules/sanity/sanity.c --- Diff: https://github.com/kamailio/kamailio/commit/7adf410af754f1bb737edca6f427ef0… Patch: https://github.com/kamailio/kamailio/commit/7adf410af754f1bb737edca6f427ef0… --- diff --git a/src/modules/sanity/sanity.c b/src/modules/sanity/sanity.c index 04ad2b86d6..842d394194 100644 --- a/src/modules/sanity/sanity.c +++ b/src/modules/sanity/sanity.c @@ -299,8 +299,21 @@ int check_ruri_scheme(sip_msg_t* msg) { return SANITY_CHECK_PASSED; } +#define SANITY_HDR_DUPCHECK(_hf, _hdr_flags, _hdr_type, _hdr_flag, _hdr_name) \ + do { \ + if((_hf)->type == _hdr_type) { \ + if(_hdr_flags & _hdr_flag) { \ + LM_DBG("duplicated %s header\n", _hdr_name); \ + return SANITY_CHECK_FAILED; \ + } \ + _hdr_flags |= _hdr_flag; \ + } \ + } while(0) + /* check for the presence of the minimal required headers */ int check_required_headers(sip_msg_t* msg) { + hdr_field_t* hf; + hdr_flags_t hdr_flags = 0; LM_DBG("check_required_headers entered\n"); @@ -309,6 +322,20 @@ int check_required_headers(sip_msg_t* msg) { LM_DBG("check_required_headers failed\n"); return SANITY_CHECK_FAILED; } + if (parse_headers(msg, HDR_EOH_F, 0) != 0) { + LM_ERR("failed to parse headers\n"); + if (sanity_reply(msg, 400, "Bad Headers") < 0) { + LM_WARN("failed to send 400 reply\n"); + } + return SANITY_CHECK_FAILED; + } + for (hf=msg->headers; hf; hf=hf->next) { + SANITY_HDR_DUPCHECK(hf, hdr_flags, HDR_FROM_T, HDR_FROM_F, "From"); + SANITY_HDR_DUPCHECK(hf, hdr_flags, HDR_TO_T, HDR_TO_F, "To"); + SANITY_HDR_DUPCHECK(hf, hdr_flags, HDR_CALLID_T, HDR_CALLID_F, "Call-Id"); + SANITY_HDR_DUPCHECK(hf, hdr_flags, HDR_CSEQ_T, HDR_CSEQ_F, "CSeq"); + } + /* TODO: check for other required headers according to request type */ LM_DBG("check_required_headers passed\n");

3 years, 10 months

git:5.4:f4d5b1b8: usrloc: send keepalive over ws and wss connections

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: f4d5b1b86a821ed7e5168b15765bb40e83b3ec21 URL: https://github.com/kamailio/kamailio/commit/f4d5b1b86a821ed7e5168b15765bb40… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-09T22:30:42+02:00 usrloc: send keepalive over ws and wss connections (cherry picked from commit 5dda7f336121b6068fd306340cb90a7d7e76c708) --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/f4d5b1b86a821ed7e5168b15765bb40… Patch: https://github.com/kamailio/kamailio/commit/f4d5b1b86a821ed7e5168b15765bb40… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index a1070f3f74..a69a76d8b9 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -253,6 +253,11 @@ static int ul_ka_send(str *kamsg, dest_info_t *kadst) } #ifdef USE_TCP + else if(kadst->proto == PROTO_WS || kadst->proto == PROTO_WSS) { + /*ws-wss*/ + kadst->id=0; + return wss_send(kadst, kamsg->s, kamsg->len); + } else if(kadst->proto == PROTO_TCP) { /*tcp*/ kadst->id=0;

3 years, 10 months

git:5.4:83f24284: core: tcp - helper function to send data over ws/wss connection

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 83f242845a8b2759d8eec0559154cfd62cf89278 URL: https://github.com/kamailio/kamailio/commit/83f242845a8b2759d8eec0559154cfd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-09T22:30:32+02:00 core: tcp - helper function to send data over ws/wss connection (cherry picked from commit 5e107824d684cdf30514b033e7f600862123ece5) --- Modified: src/core/tcp_main.c Modified: src/core/tcp_server.h --- Diff: https://github.com/kamailio/kamailio/commit/83f242845a8b2759d8eec0559154cfd… Patch: https://github.com/kamailio/kamailio/commit/83f242845a8b2759d8eec0559154cfd… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index f19f75a588..84fec376a3 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -95,6 +95,7 @@ #include "tcp_info.h" #include "tcp_options.h" #include "ut.h" +#include "events.h" #include "cfg/cfg_struct.h" #include <fcntl.h> /* must be included after io_wait.h if SIGIO_RT is used */ @@ -5135,4 +5136,88 @@ void tcp_get_info(struct tcp_gen_info *ti) #endif /* TCP_ASYNC */ } + +/* finds an ws/wss tcpconn & sends on it + * uses the dst members to, proto (ws/wss) and id and tries to send + * returns: number of bytes written (>=0) on success + * <0 on error */ +int wss_send(dest_info_t* dst, const char* buf, unsigned len) +{ + int port; + struct ip_addr ip; + union sockaddr_union* from = NULL; + union sockaddr_union local_addr; + struct tcp_connection *con = NULL; + struct ws_event_info wsev; + sr_event_param_t evp = {0}; + int ret; + + if (unlikely((dst->proto == PROTO_WS +#ifdef USE_TLS + || dst->proto == PROTO_WSS #endif + ) && sr_event_enabled(SREV_TCP_WS_FRAME_OUT))) { + if (unlikely(dst->send_flags.f & SND_F_FORCE_SOCKET + && dst->send_sock)) { + + local_addr = dst->send_sock->su; +#ifdef SO_REUSEPORT + if (cfg_get(tcp, tcp_cfg, reuse_port)) { + LM_DBG("sending to: %s, force_socket=%d, send_sock=%p\n", + su2a(&dst->to,sizeof(struct sockaddr_in)), + (dst->send_flags.f & SND_F_FORCE_SOCKET), + dst->send_sock); + + su_setport(&local_addr, dst->send_sock->port_no); + } + else + su_setport(&local_addr, 0); /* any local port will do */ +#else + su_setport(&local_addr, 0); /* any local port will do */ +#endif + from = &local_addr; + } + + port = su_getport(&dst->to); + if (likely(port)) { + su2ip_addr(&ip, &dst->to); + if(tcp_connection_match==TCPCONN_MATCH_STRICT) { + con = tcpconn_lookup(dst->id, &ip, port, from, + (dst->send_sock)?dst->send_sock->port_no:0, 0); + } else { + con = tcpconn_get(dst->id, &ip, port, from, 0); + } + } + else if (likely(dst->id)) + con = tcpconn_get(dst->id, 0, 0, 0, 0); + else { + LM_CRIT("null_id & to\n"); + goto error; + } + + if (con == NULL) { + LM_WARN("TCP/TLS connection for WebSocket could not be found\n"); + goto error; + } + + memset(&wsev, 0, sizeof(ws_event_info_t)); + wsev.type = SREV_TCP_WS_FRAME_OUT; + wsev.buf = (char*)buf; + wsev.len = len; + wsev.id = con->id; + evp.data = (void *)&wsev; + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + goto done; + } else { + LM_CRIT("used with invalid proto %d\n", dst->proto); + goto error; + } + +done: + return ret; +error: + return -1; +} + +#endif /* USE_TCP */ diff --git a/src/core/tcp_server.h b/src/core/tcp_server.h index 0566c500dc..dac25bb152 100644 --- a/src/core/tcp_server.h +++ b/src/core/tcp_server.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 */ @@ -33,7 +33,7 @@ int tcp_send(struct dest_info* dst, union sockaddr_union* from, int tcpconn_add_alias(int id, int port, int proto); - +int wss_send(dest_info_t* dst, const char* buf, unsigned len); #endif

3 years, 10 months

git:master:ada3701d: tm: do not add duplicate headers in local requests

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ada3701d22b1fd579f06b4f54fa695fa988e685f URL: https://github.com/kamailio/kamailio/commit/ada3701d22b1fd579f06b4f54fa695f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-09T22:15:12+02:00 tm: do not add duplicate headers in local requests --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/ada3701d22b1fd579f06b4f54fa695f… Patch: https://github.com/kamailio/kamailio/commit/ada3701d22b1fd579f06b4f54fa695f… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index bd75b271be..cda84b6f5d 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -268,6 +268,7 @@ char *build_local_reparse(tm_cell_t *Trans,unsigned int branch, struct hdr_field *reas1, *reas_last, *hdr; int hadded = 0; sr_cfgenv_t *cenv = NULL; + hdr_flags_t hdr_flags = 0; invite_buf = Trans->uac[branch].request.buffer; invite_len = Trans->uac[branch].request.buffer_len; @@ -361,6 +362,11 @@ char *build_local_reparse(tm_cell_t *Trans,unsigned int branch, switch(hf_type) { case HDR_CSEQ_T: /* find the method name and replace it */ + if(hdr_flags & HDR_CSEQ_F) { + LM_DBG("duplicate CSeq header\n"); + goto errorhdr; + } + hdr_flags |= HDR_CSEQ_F; while ((s < invite_buf_end) && ((*s == ':') || (*s == ' ') || (*s == '\t') || ((*s >= '0') && (*s <= '9'))) @@ -381,6 +387,12 @@ char *build_local_reparse(tm_cell_t *Trans,unsigned int branch, break; case HDR_TO_T: + if(hdr_flags & HDR_TO_F) { + LM_DBG("duplicate To header\n"); + goto errorhdr; + } + hdr_flags |= HDR_TO_F; + if (to_len == 0) { /* there is no To tag required, just copy paste * the header */ @@ -395,7 +407,25 @@ char *build_local_reparse(tm_cell_t *Trans,unsigned int branch, break; case HDR_FROM_T: + /* copy hf */ + if(hdr_flags & HDR_FROM_F) { + LM_DBG("duplicate From header\n"); + goto errorhdr; + } + hdr_flags |= HDR_FROM_F; + s = lw_next_line(s, invite_buf_end); + append_str(d, s1, s - s1); + break; case HDR_CALLID_T: + /* copy hf */ + if(hdr_flags & HDR_CALLID_F) { + LM_DBG("duplicate Call-Id header\n"); + goto errorhdr; + } + hdr_flags |= HDR_CALLID_F; + s = lw_next_line(s, invite_buf_end); + append_str(d, s1, s - s1); + break; case HDR_ROUTE_T: case HDR_MAXFORWARDS_T: /* copy hf */ @@ -495,6 +525,7 @@ char *build_local_reparse(tm_cell_t *Trans,unsigned int branch, /* HDR_EOH_T was not found in the buffer, the message is corrupt */ LM_ERR("HDR_EOH_T was not found\n"); +errorhdr: shm_free(cancel_buf); error: LM_ERR("cannot build %.*s request\n", method_len, method);

3 years, 10 months

git:master:2648eb33: core: parser - print lenghts in to header parsing debug message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2648eb330b133a20f1398d59a28c53532106cad3 URL: https://github.com/kamailio/kamailio/commit/2648eb330b133a20f1398d59a28c535… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-09T22:00:47+02:00 core: parser - print lenghts in to header parsing debug message --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/2648eb330b133a20f1398d59a28c535… Patch: https://github.com/kamailio/kamailio/commit/2648eb330b133a20f1398d59a28c535… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 6663f51f54..13ab6c14e2 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -169,9 +169,9 @@ char* get_hdr_field(char* const buf, char* const end, struct hdr_field* const hd hdr->body.len=tmp-hdr->body.s; DBG("<%.*s> [%d]; uri=[%.*s]\n", hdr->name.len, ZSW(hdr->name.s), hdr->body.len, to_b->uri.len, ZSW(to_b->uri.s)); - DBG("to body [%.*s], to tag [%.*s]\n", to_b->body.len, - ZSW(to_b->body.s), to_b->tag_value.len, - ZSW(to_b->tag_value.s)); + DBG("to body (%d)[%.*s], to tag (%d)[%.*s]\n", to_b->body.len, + to_b->body.len, ZSW(to_b->body.s), to_b->tag_value.len, + to_b->tag_value.len, ZSW(to_b->tag_value.s)); break; case HDR_CONTENTLENGTH_T: hdr->body.s=tmp;

3 years, 10 months

← Newer
1
...
34
35
36
37
38
39
40
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2020