sr-dev September 2017

sr-dev@lists.kamailio.org

26 participants
271 discussions

git:master:0954a069: usrloc: test first if all params are retrieved for rpc ul.add

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0954a069ac92c70e190875fdc05150a7d2004ddb URL: https://github.com/kamailio/kamailio/commit/0954a069ac92c70e190875fdc05150a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-17T10:11:03+02:00 usrloc: test first if all params are retrieved for rpc ul.add - avoid logging unset values --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/0954a069ac92c70e190875fdc05150a… Patch: https://github.com/kamailio/kamailio/commit/0954a069ac92c70e190875fdc05150a… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index c27921d0fc..f679ef5cff 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -579,19 +579,21 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) ret = rpc->scan(ctx, "SSSdfSddd", &table, &aor, &contact, &ci.expires, &dtemp, &path, &ci.flags, &ci.cflags, &ci.methods); + if ( ret != 9) { + rpc->fault(ctx, 500, "Not enough parameters or wrong format"); + return; + } if(path.len==1 && (strncmp(path.s, "0", 1)==0)) { LM_DBG("path == 0 -> unset\n"); - } - else { + } else { ci.path = &path; } - LM_DBG("ret: %d table:%.*s aor:%.*s contact:%.*s expires:%d dtemp:%f path:%.*s flags:%d bflags:%d methods:%d\n", + LM_DBG("ret: %d table:%.*s aor:%.*s contact:%.*s expires:%d" + " dtemp:%f path:%.*s flags:%d bflags:%d methods:%d\n", ret, table.len, table.s, aor.len, aor.s, contact.len, contact.s, - (int) ci.expires, dtemp, (ci.path)?ci.path->len:0, (ci.path && ci.path->s)?ci.path->s:"", ci.flags, ci.cflags, (int) ci.methods); - if ( ret != 9) { - rpc->fault(ctx, 500, "Not enough parameters or wrong format"); - return; - } + (int) ci.expires, dtemp, (ci.path)?ci.path->len:0, + (ci.path && ci.path->s)?ci.path->s:"", ci.flags, ci.cflags, + (int) ci.methods); ci.q = double2q(dtemp); temp.s = q2str(ci.q, (unsigned int*)&temp.len); LM_DBG("q:%.*s\n", temp.len, temp.s); @@ -627,7 +629,8 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) } c = 0; } else { - if (get_ucontact( r, &contact, &rpc_ul_cid, &rpc_ul_path, RPC_UL_CSEQ+1, &c) < 0) + if (get_ucontact( r, &contact, &rpc_ul_cid, &rpc_ul_path, + RPC_UL_CSEQ+1, &c) < 0) { unlock_udomain( dom, &aor); rpc->fault(ctx, 500, "Can't get record");

7 years, 2 months

git:master:0e38dabe: msrp: updates to log macros

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0e38dabe44e475e8054d3905e553637977dd26e1 URL: https://github.com/kamailio/kamailio/commit/0e38dabe44e475e8054d3905e553637… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-17T10:11:03+02:00 msrp: updates to log macros --- Modified: src/modules/msrp/msrp_netio.c --- Diff: https://github.com/kamailio/kamailio/commit/0e38dabe44e475e8054d3905e553637… Patch: https://github.com/kamailio/kamailio/commit/0e38dabe44e475e8054d3905e553637… --- diff --git a/src/modules/msrp/msrp_netio.c b/src/modules/msrp/msrp_netio.c index ac34686e13..92f7cf525b 100644 --- a/src/modules/msrp/msrp_netio.c +++ b/src/modules/msrp/msrp_netio.c @@ -43,7 +43,7 @@ int msrp_forward_frame(msrp_frame_t *mf, int flags) if ((msrp_uri_to_dstinfo(0, &dst, uac_r->dialog->send_sock, snd_flags, uac_r->dialog->hooks.next_hop, PROTO_NONE)==0) || (dst.send_sock==0)){ - LOG(L_ERR, "no send socket found\n"); + LM_ERR("no send socket found\n"); return -1; } #endif @@ -158,7 +158,7 @@ int msrp_relay(msrp_frame_t *mf) LM_WARN("TCP/TLS connection not found\n"); return -1; } - + if (unlikely((con->rcv.proto == PROTO_WS || con->rcv.proto == PROTO_WSS) && sr_event_enabled(SREV_TCP_WS_FRAME_OUT))) { ws_event_info_t wsev; @@ -333,13 +333,13 @@ struct dest_info *msrp_uri_to_dstinfo(struct dns_srv_handle* dns_h, LM_ERR("bad msrp uri: %.*s\n", uri->len, uri->s ); return 0; } - + if (parsed_uri.scheme_no==MSRP_SCHEME_MSRPS){ dst->proto = PROTO_TLS; } else { dst->proto = PROTO_TCP; } - + dst->send_flags=sflags; host=&parsed_uri.host; port = parsed_uri.port_no; @@ -371,20 +371,20 @@ struct dest_info *msrp_uri_to_dstinfo(struct dns_srv_handle* dns_h, return dst; /* found a good one */ } } while(dns_srv_handle_next(dns_h, err)); - ERR("no corresponding socket for \"%.*s\" af %d\n", host->len, + LM_ERR("no corresponding socket for \"%.*s\" af %d\n", host->len, ZSW(host->s), dst->to.s.sa_family); /* try to continue */ return dst; } if (sip_hostport2su(&dst->to, host, port, &dst->proto)!=0){ - ERR("failed to resolve \"%.*s\"\n", host->len, ZSW(host->s)); + LM_ERR("failed to resolve \"%.*s\"\n", host->len, ZSW(host->s)); return 0; } dst->send_sock = get_send_socket2(force_send_socket, &dst->to, dst->proto, 0); if (dst->send_sock==0) { - ERR("no corresponding socket for af %d\n", dst->to.s.sa_family); + LM_ERR("no corresponding socket for af %d\n", dst->to.s.sa_family); /* try to continue */ } return dst;

7 years, 2 months

git:master:574f2d4d: rtpproxy: removed function name from log messages

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 574f2d4d40fbdecf379292d65ad0218e8ecaab10 URL: https://github.com/kamailio/kamailio/commit/574f2d4d40fbdecf379292d65ad0218… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-17T10:11:03+02:00 rtpproxy: removed function name from log messages --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/574f2d4d40fbdecf379292d65ad0218… Patch: https://github.com/kamailio/kamailio/commit/574f2d4d40fbdecf379292d65ad0218… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index ff1cc27317..4251a9ac82 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1307,12 +1307,12 @@ insert_candidates(struct sip_msg *msg, char *where, str *ip, unsigned int port, anchor = anchor_lump(msg, where - msg->buf, 0, 0); if (anchor == 0) { - LOG(L_ERR, "insert_candidates: can't get anchor\n"); + LM_ERR("can't get anchor\n"); pkg_free(buf); return -1; } if (insert_new_lump_before(anchor, buf, at - buf, 0) == 0) { - LM_ERR("insert_candidates: insert_new_lump_before failed\n"); + LM_ERR("insert_new_lump_before failed\n"); pkg_free(buf); return -1; }

7 years, 2 months

[kamailio/kamailio] Dispatcher ds_is_from_list (#1235)

by iliesh

### Description "ds_is_from_list" function from Dispatcher module give false result - when actually it should be true.  ### Troubleshooting #### Reproduction modparam("dispatcher", "db_url",DBURL) modparam("dispatcher", "table_name", "dispatcher") modparam("dispatcher", "setid_col", "setid") modparam("dispatcher", "destination_col", "destination") modparam("dispatcher", "flags", 2) modparam("dispatcher", "dst_avp", "$avp(AVP_DST)") modparam("dispatcher", "grp_avp", "$avp(AVP_GRP)") modparam("dispatcher", "cnt_avp", "$avp(AVP_CNT)") modparam("dispatcher", "sock_avp", "$avp(AVP_SOCK)") request_route { xlog("L_INFO","[=Start Routing=]") if(ds_is_from_list("1")) { xlog("L_INFO","[=FROM ASTERISK=]"); } else { xlog("L_INFO","[=TO ASTERISK=]"); } if($si=="192.168.1.10") { xlog("L_INFO","[=FROM ASTERISK BY IP=]"); } else { xlog("L_INFO","[=TO ASTERISK BY IP=]"); } root@kamailio:/var/log# kamctl dispatcher show dispatcher gateways +----+-------+---------------------+-------+----------+-------+-----------------+ | id | setid | destination | flags | priority | attrs | description | +----+-------+---------------------+-------+----------+-------+-----------------+ | 1 | 1 | sip:192.168.1.10:5060 | 0 | 3 | | Main Asterisk | | 2 | 2 | sip:192.168.1.11:5060 | 0 | 2 | | Backup Asterisk | | 3 | 3 | sip:192.168.1.12:5060 | 0 | 1 | | Test Asterisk | +----+-------+---------------------+-------+----------+-------+-----------------+ root@kamailio:/var/log# cat /var/log/kamailio.log [=Start Routing=] **[=TO ASTERISK=]** **[=FROM ASTERISK BY IP=]** ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@kamailio:/var/log# kamailio -v version: kamailio 5.0.3 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, 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_LISTEN 16, 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 on 12:12:14 Sep 7 2017 with gcc 6.3.0 root@kamailio:/var/log# ``` * **Operating System**:  ``` Debian 9.1/ Linux kamailio1 4.9.0-3-amd64 #1 SMP Debian 4.9.30-2+deb9u3 (2017-08-06) 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/1235

7 years, 2 months

git:master:cb0869db: Merge pull request #1236 from jchavanton/dispatcher_latency_fix

by GitHub

Module: kamailio Branch: master Commit: cb0869db90c3e808dcd2f0a06d24544e32e26802 URL: https://github.com/kamailio/kamailio/commit/cb0869db90c3e808dcd2f0a06d24544… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-09-17T10:05:13+02:00 Merge pull request #1236 from jchavanton/dispatcher_latency_fix dispatcher: latency fix stdev calculation --- Modified: src/modules/dispatcher/Makefile Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/cb0869db90c3e808dcd2f0a06d24544… Patch: https://github.com/kamailio/kamailio/commit/cb0869db90c3e808dcd2f0a06d24544… --- diff --git a/src/modules/dispatcher/Makefile b/src/modules/dispatcher/Makefile index 66520636d7..16ca65c34f 100644 --- a/src/modules/dispatcher/Makefile +++ b/src/modules/dispatcher/Makefile @@ -9,7 +9,7 @@ include ../../Makefile.defs auto_gen= NAME=dispatcher.so -LIBS= +LIBS=-lm DEFS+=-DKAMAILIO_MOD_INTERFACE diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 04354476f9..a8ec1fd15b 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2274,15 +2274,16 @@ int ds_mark_dst(struct sip_msg *msg, int state) return (ret == 0) ? 1 : -1; } - static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int latency) { - float current_average, current_q; - /* after 2^21 smaples, ~24 days at 1s interval, the average becomes weighted moving average */ - if (latency_stats->count < 2097152) + /* after 2^21 ~24 days at 1s interval, the average becomes a weighted average */ + if (latency_stats->count < 2097152) { latency_stats->count++; + } else { /* We adjust the sum of squares used by the oneline algorithm proportionally */ + latency_stats->m2 -= latency_stats->m2/latency_stats->count; + } if (latency_stats->count == 1) { latency_stats->stdev = 0.0f; - latency_stats->last_q = 0.0f; + latency_stats->m2 = 0.0f; latency_stats->max = latency; latency_stats->min = latency; latency_stats->average = latency; @@ -2293,13 +2294,14 @@ static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int l if (latency_stats->max < latency) latency_stats->max = latency; - /* standard deviation of the average/weighted moving average */ + /* standard deviation using oneline algorithm */ + /* https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Online_al… */ if (latency_stats->count > 1) { - current_average = latency_stats->average + (latency - latency_stats->average) / latency_stats->count; - current_q = latency_stats->last_q + (latency - latency_stats->average)*(latency - current_average); - latency_stats->average = current_average; - latency_stats->last_q = current_q; - latency_stats->stdev = sqrt(current_q/(latency_stats->count-1)); + float delta = latency - latency_stats->average; + latency_stats->average += delta/latency_stats->count; + float delta2 = latency - latency_stats->average; + latency_stats->m2 += delta*delta2; + latency_stats->stdev = sqrt(latency_stats->m2 / (latency_stats->count-1)); } /* exponentialy weighted moving average */ if (latency_stats->count < 10) { diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index fe03d6d379..419e7dcc5d 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -163,7 +163,7 @@ typedef struct _ds_latency_stats { float average; // weigthed average, estimate of the last few weeks float stdev; // last standard deviation float estimate; // short term estimate, EWMA exponential weighted moving average - float last_q; // q for N-1 + double m2; // sum of squares, used for recursive variance calculation int32_t count; uint32_t timeout; } ds_latency_stats_t;

7 years, 2 months

git:master:b103fefd: dispatcher: latency fix stdev calculation

by Julien Chavanton

Module: kamailio Branch: master Commit: b103fefdd871af95c3f7e1ac7b1605b5ea5b402a URL: https://github.com/kamailio/kamailio/commit/b103fefdd871af95c3f7e1ac7b1605b… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2017-09-16T07:38:30-07:00 dispatcher: latency fix stdev calculation - adding linking to lm library --- Modified: src/modules/dispatcher/Makefile Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/b103fefdd871af95c3f7e1ac7b1605b… Patch: https://github.com/kamailio/kamailio/commit/b103fefdd871af95c3f7e1ac7b1605b… --- diff --git a/src/modules/dispatcher/Makefile b/src/modules/dispatcher/Makefile index 66520636d7..16ca65c34f 100644 --- a/src/modules/dispatcher/Makefile +++ b/src/modules/dispatcher/Makefile @@ -9,7 +9,7 @@ include ../../Makefile.defs auto_gen= NAME=dispatcher.so -LIBS= +LIBS=-lm DEFS+=-DKAMAILIO_MOD_INTERFACE diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 04354476f9..a8ec1fd15b 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2274,15 +2274,16 @@ int ds_mark_dst(struct sip_msg *msg, int state) return (ret == 0) ? 1 : -1; } - static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int latency) { - float current_average, current_q; - /* after 2^21 smaples, ~24 days at 1s interval, the average becomes weighted moving average */ - if (latency_stats->count < 2097152) + /* after 2^21 ~24 days at 1s interval, the average becomes a weighted average */ + if (latency_stats->count < 2097152) { latency_stats->count++; + } else { /* We adjust the sum of squares used by the oneline algorithm proportionally */ + latency_stats->m2 -= latency_stats->m2/latency_stats->count; + } if (latency_stats->count == 1) { latency_stats->stdev = 0.0f; - latency_stats->last_q = 0.0f; + latency_stats->m2 = 0.0f; latency_stats->max = latency; latency_stats->min = latency; latency_stats->average = latency; @@ -2293,13 +2294,14 @@ static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int l if (latency_stats->max < latency) latency_stats->max = latency; - /* standard deviation of the average/weighted moving average */ + /* standard deviation using oneline algorithm */ + /* https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Online_al… */ if (latency_stats->count > 1) { - current_average = latency_stats->average + (latency - latency_stats->average) / latency_stats->count; - current_q = latency_stats->last_q + (latency - latency_stats->average)*(latency - current_average); - latency_stats->average = current_average; - latency_stats->last_q = current_q; - latency_stats->stdev = sqrt(current_q/(latency_stats->count-1)); + float delta = latency - latency_stats->average; + latency_stats->average += delta/latency_stats->count; + float delta2 = latency - latency_stats->average; + latency_stats->m2 += delta*delta2; + latency_stats->stdev = sqrt(latency_stats->m2 / (latency_stats->count-1)); } /* exponentialy weighted moving average */ if (latency_stats->count < 10) { diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index fe03d6d379..419e7dcc5d 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -163,7 +163,7 @@ typedef struct _ds_latency_stats { float average; // weigthed average, estimate of the last few weeks float stdev; // last standard deviation float estimate; // short term estimate, EWMA exponential weighted moving average - float last_q; // q for N-1 + double m2; // sum of squares, used for recursive variance calculation int32_t count; uint32_t timeout; } ds_latency_stats_t;

7 years, 2 months

[kamailio/kamailio] dispatcher: latency fix stdev calculation (#1236)

by Julien Chavanton

#### 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description This PR to fix a calculation error on the latency standard deviation test with random values from 1-30 ``` total[1726000000]value[3] count[2097152] std[8.654594] avg[15.541001] est[14.098082] total[1727000000]value[2] count[2097152] std[8.654230] avg[15.542887] est[16.070623] total[1728000000]value[2] count[2097152] std[8.655254] avg[15.546928] est[13.154167] ``` test with random values 1-500 ``` total[1056000000]value[373] count[2097152] std[144.397552] avg[249.993790] est[297.913574] total[1057000000]value[118] count[2097152] std[144.369400] avg[250.121262] est[222.419662] total[1058000000]value[431] count[2097152] std[144.314056] avg[250.138077] est[295.765625] ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1236 -- Commit Summary -- * dispatcher: latency fix stdev calculation -- File Changes -- M src/modules/dispatcher/dispatch.c (29) M src/modules/dispatcher/dispatch.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1236.patch https://github.com/kamailio/kamailio/pull/1236.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/1236

7 years, 2 months

git:5.0:1ecc8843: core: tcp_read_headers() safety checks for parsed pointer

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 1ecc88431777f0013aa29cbcccc041168002dea5 URL: https://github.com/kamailio/kamailio/commit/1ecc88431777f0013aa29cbcccc0411… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-15T14:46:29+02:00 core: tcp_read_headers() safety checks for parsed pointer - reset if it is out of read buffer range and the state is H_SKIP_EMPTY (cherry picked from commit f47f42ac12ad111b3bad52aa2d495fbed5ef395d) --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/1ecc88431777f0013aa29cbcccc0411… Patch: https://github.com/kamailio/kamailio/commit/1ecc88431777f0013aa29cbcccc0411… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 7014353c62..818bc52b7f 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -428,7 +428,7 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) r->state=(newstate); break; \ crlf_default_skip_case; \ } - + #define change_state_case(state0, upper, lower, newstate)\ case state0: \ change_state(upper, lower, newstate); \ @@ -437,6 +437,22 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) r=&c->req; + if(r->parsed<r->buf || r->parsed>r->buf+r->b_size) { + if(r->parsed<r->buf && (unsigned char)r->state==H_SKIP_EMPTY) { + /* give it a chance to parse from beginning */ + LM_WARN("resetting parsed pointer (buf:%p parsed:%p bsize:%u)\n", + r->buf, r->parsed, r->b_size); + r->parsed = r->buf; + } else { + LM_ERR("out of bounds parsed pointer (buf:%p parsed:%p bsize:%u)\n", + r->buf, r->parsed, r->b_size); + r->parsed = r->buf; + r->content_len=0; + r->error=TCP_REQ_BAD_LEN; + r->state=H_SKIP; /* skip state now */ + return -1; + } + } /* if we still have some unparsed part, parse it first, don't do the read*/ if (unlikely(r->parsed<r->pos)){ bytes=0;

7 years, 2 months

git:5.0:fd96ab48: core: tcp_read_ws() - safety checks for very large advetised lenght

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: fd96ab480515713e4a390376f38bc09aa28e93b4 URL: https://github.com/kamailio/kamailio/commit/fd96ab480515713e4a390376f38bc09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-15T14:46:20+02:00 core: tcp_read_ws() - safety checks for very large advetised lenght - use unsigned for lenght to avoid going negative on large read values (cherry picked from commit 35ee3a4b0357820bf31b3aa68323dcb7df267e94) --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/fd96ab480515713e4a390376f38bc09… Patch: https://github.com/kamailio/kamailio/commit/fd96ab480515713e4a390376f38bc09… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index b2a9e9fbe8..7014353c62 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1079,8 +1079,8 @@ int msrp_process_msg(char* tcpbuf, unsigned int len, #ifdef READ_WS static int tcp_read_ws(struct tcp_connection *c, int* read_flags) { - int bytes, size, pos, mask_present; - unsigned int len; + int bytes; + uint32_t size, pos, mask_present, len; char *p; struct tcp_req *r; @@ -1137,22 +1137,27 @@ static int tcp_read_ws(struct tcp_connection *c, int* read_flags) /* Work out real length */ if (len == 126) { + /* 2 bytes store the payload size */ if (size < pos + 2) goto skip; - len = ((p[pos + 0] & 0xff) << 8) - | ((p[pos + 1] & 0xff) << 0); + len = ((p[pos + 0] & 0xff) << 8) | ((p[pos + 1] & 0xff) << 0); pos += 2; - } - else if (len == 127) - { - if (size < pos + 8) + } else if (len == 127) { + /* 8 bytes store the payload size */ + if (size < pos + 8) { goto skip; + } /* Only decoding the last four bytes of the length... This limits the size of WebSocket messages that can be handled to 2^32 - which should be plenty for SIP! */ - len = ((p[pos + 4] & 0xff) << 24) + if((p[pos] & 0xff)!=0 || (p[pos + 1] & 0xff)!=0 + || (p[pos + 2] & 0xff)!=0 || (p[pos + 3] & 0xff)!=0) { + LM_WARN("advertised lenght is too large (more than 2^32)\n"); + goto skip; + } + len = ((p[pos + 4] & 0xff) << 24) | ((p[pos + 5] & 0xff) << 16) | ((p[pos + 6] & 0xff) << 8) | ((p[pos + 7] & 0xff) << 0); @@ -1167,6 +1172,12 @@ static int tcp_read_ws(struct tcp_connection *c, int* read_flags) pos += 4; } + /* check if advertised lenght fits in read buffer */ + if(len>=r->b_size) { + LM_WARN("advertised lenght (%u) greater than buffer size (%u)\n", + len, r->b_size); + goto skip; + } /* Now check the whole message has been received */ if (size < pos + len) goto skip;

7 years, 2 months

git:master:f47f42ac: core: tcp_read_headers() safety checks for parsed pointer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f47f42ac12ad111b3bad52aa2d495fbed5ef395d URL: https://github.com/kamailio/kamailio/commit/f47f42ac12ad111b3bad52aa2d495fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-15T09:27:07+02:00 core: tcp_read_headers() safety checks for parsed pointer - reset if it is out of read buffer range and the state is H_SKIP_EMPTY --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/f47f42ac12ad111b3bad52aa2d495fb… Patch: https://github.com/kamailio/kamailio/commit/f47f42ac12ad111b3bad52aa2d495fb… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 77a86854e8..edd136e3d2 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -430,7 +430,7 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) r->state=(newstate); break; \ crlf_default_skip_case; \ } - + #define change_state_case(state0, upper, lower, newstate)\ case state0: \ change_state(upper, lower, newstate); \ @@ -439,6 +439,22 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) r=&c->req; + if(r->parsed<r->buf || r->parsed>r->buf+r->b_size) { + if(r->parsed<r->buf && (unsigned char)r->state==H_SKIP_EMPTY) { + /* give it a chance to parse from beginning */ + LM_WARN("resetting parsed pointer (buf:%p parsed:%p bsize:%u)\n", + r->buf, r->parsed, r->b_size); + r->parsed = r->buf; + } else { + LM_ERR("out of bounds parsed pointer (buf:%p parsed:%p bsize:%u)\n", + r->buf, r->parsed, r->b_size); + r->parsed = r->buf; + r->content_len=0; + r->error=TCP_REQ_BAD_LEN; + r->state=H_SKIP; /* skip state now */ + return -1; + } + } /* if we still have some unparsed part, parse it first, don't do the read*/ if (unlikely(r->parsed<r->pos)){ bytes=0;

7 years, 2 months

← Newer
1
...
17
18
19
20
21
22
23
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2017