sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
530 discussions

git:master:93289188: core: memset 0 the struct in first line parsing; split type and flags

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9328918897d44bec0f0a393af91483c2413a1446 URL: https://github.com/kamailio/kamailio/commit/9328918897d44bec0f0a393af91483c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-07T18:08:35+01:00 core: memset 0 the struct in first line parsing; split type and flags - initialize to 0 first line struct msg_start_t in parse_first_line() - split field int type in short type and short flags to be able to store more info about first line without changes in other places of existing code - set in flags if the protocol in first line is sip or http - useful to avoid string comparison whenever needed to get the two very used protocols --- Modified: parser/parse_fline.c Modified: parser/parse_fline.h --- Diff: https://github.com/kamailio/kamailio/commit/9328918897d44bec0f0a393af91483c… Patch: https://github.com/kamailio/kamailio/commit/9328918897d44bec0f0a393af91483c… --- diff --git a/parser/parse_fline.c b/parser/parse_fline.c index dbbe4de..861b5fd 100644 --- a/parser/parse_fline.c +++ b/parser/parse_fline.c @@ -45,6 +45,11 @@ #include "../mem/mem.h" #include "../ut.h" +/* flags for first line + * - stored on a short field (16 flags) */ +#define FLINE_FLAG_PROTO_SIP (1<<0) +#define FLINE_FLAG_PROTO_HTTP (1<<1) + int http_reply_parse = 0; /* grammar: @@ -56,7 +61,7 @@ int http_reply_parse = 0; /* parses the first line, returns pointer to next line & fills fl; also modifies buffer (to avoid extra copy ops) */ -char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl) +char* parse_first_line(char* buffer, unsigned int len, struct msg_start* fl) { char *tmp; @@ -77,6 +82,7 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl) */ + memset(fl, 0, sizeof(struct msg_start)); offset = 0; end=buffer+len; /* see if it's a reply (status) */ @@ -97,6 +103,7 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl) strncasecmp( tmp+1, SIP_VERSION+1, SIP_VERSION_LEN-1)==0 && (*(tmp+SIP_VERSION_LEN)==' ')) { fl->type=SIP_REPLY; + fl->flags|=FLINE_FLAG_PROTO_SIP; fl->u.reply.version.len=SIP_VERSION_LEN; tmp=buffer+SIP_VERSION_LEN; } else if (http_reply_parse != 0 && @@ -111,6 +118,7 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl) * - the message is marked as SIP_REPLY (ugly) */ fl->type=SIP_REPLY; + fl->flags|=FLINE_FLAG_PROTO_HTTP; fl->u.reply.version.len=HTTP_VERSION_LEN+1 /*include last digit*/; tmp=buffer+HTTP_VERSION_LEN+1 /* last digit */; } else IFISMETHOD( INVITE, 'I' ) @@ -223,6 +231,22 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl) fl->u.request.version.len=tmp-third; fl->len=nl-buffer; + if (fl->type==SIP_REQUEST) { + if(fl->u.request.version.len >= SIP_VERSION_LEN + && (fl->u.request.version.s[0]=='S' + || fl->u.request.version.s[0]=='s') + && !strncasecmp(fl->u.request.version.s+1, + SIP_VERSION+1, SIP_VERSION_LEN-1)) { + fl->flags|=FLINE_FLAG_PROTO_SIP; + } else if(fl->u.request.version.len >= HTTP_VERSION_LEN + && (fl->u.request.version.s[0]=='H' + || fl->u.request.version.s[0]=='h') + && !strncasecmp(fl->u.request.version.s+1, + HTTP_VERSION+1, HTTP_VERSION_LEN-1)) { + fl->flags|=FLINE_FLAG_PROTO_HTTP; + } + } + return nl; error: @@ -245,3 +269,12 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl) nl=eat_line(buffer,len); return nl; } + +char* parse_fline(char* buffer, char* end, struct msg_start* fl) +{ + if(end<=buffer) { + /* make it throw error via parse_first_line() for consistency */ + return parse_first_line(buffer, 0, fl); + } + return parse_first_line(buffer, (unsigned int)(end-buffer), fl); +} diff --git a/parser/parse_fline.h b/parser/parse_fline.h index 7564b9f..62873f5 100644 --- a/parser/parse_fline.h +++ b/parser/parse_fline.h @@ -69,7 +69,8 @@ #define PUBLISH_LEN 7 struct msg_start { - int type; /*!< Type of the Message - Request/Response */ + short type; /*!< Type of the message - request/response */ + short flags; /*!< First line flags */ int len; /*!< length including delimiter */ union { struct {

9 years, 10 months

git:master:b22c63a9: ratelimite: take in consideration number of cpus for load

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b22c63a930a3c8d4055ddeea48bb29b7fb3b2eb1 URL: https://github.com/kamailio/kamailio/commit/b22c63a930a3c8d4055ddeea48bb29b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-07T18:08:35+01:00 ratelimite: take in consideration number of cpus for load - on multi core systems, the sums of stats can go over 100%, resulting in out of range for expected load_value to be 0.0 to 1.0 - safety checks to avoid overflows --- Modified: modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/b22c63a930a3c8d4055ddeea48bb29b… Patch: https://github.com/kamailio/kamailio/commit/b22c63a930a3c8d4055ddeea48bb29b… --- diff --git a/modules/ratelimit/ratelimit.c b/modules/ratelimit/ratelimit.c index 1d6d1a5..561185f 100644 --- a/modules/ratelimit/ratelimit.c +++ b/modules/ratelimit/ratelimit.c @@ -293,6 +293,36 @@ static int str_cpy(str * dest, str * src) return 0; } +#if defined (__OS_darwin) || defined (__OS_freebsd) +#include <sys/param.h> +#include <sys/sysctl.h> +#else +#include <unistd.h> +#endif + +int get_num_cpus() { + int count = 0; + +#if defined (__OS_darwin) || defined (__OS_freebsd) + int nm[2]; + size_t len; + + len = sizeof(count); + + nm[0] = CTL_HW; nm[1] = HW_AVAILCPU; + sysctl(nm, 2, &count, &len, NULL, 0); + + if(count < 1) { + nm[1] = HW_NCPU; + sysctl(nm, 2, &count, &len, NULL, 0); + } +#else + count = sysconf(_SC_NPROCESSORS_ONLN); +#endif + if(count < 1) return 1; + return count; +} + /* not using /proc/loadavg because it only works when our_timer_interval == theirs */ static int get_cpuload(double * load) { @@ -301,6 +331,8 @@ static int get_cpuload(double * load) long long n_user, n_nice, n_sys, n_idle, n_iow, n_irq, n_sirq, n_stl; static int first_time = 1; FILE * f = fopen("/proc/stat", "r"); + double vload; + int ncpu; if (! f) { LM_ERR("could not open /proc/stat\n"); @@ -327,7 +359,16 @@ static int get_cpuload(double * load) (n_stl - o_stl); long long d_idle = (n_idle - o_idle); - *load = 1.0 - ((double)d_idle) / (double)d_total; + vload = ((double)d_idle) / (double)d_total; + + /* divide by numbers of cpu */ + ncpu = get_num_cpus(); + vload = vload/ncpu; + vload = 1.0 - vload; + if(vload<0.0) vload = 0.0; + else if (vload>1.0) vload = 1.0; + + *load = vload; } o_user = n_user;

9 years, 10 months

git:master:d9e87383: pipelimit: take in consideration number of cpus for load

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d9e87383613d4d24efe3d1eb144ad6c9cc30b2b0 URL: https://github.com/kamailio/kamailio/commit/d9e87383613d4d24efe3d1eb144ad6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-07T18:08:35+01:00 pipelimit: take in consideration number of cpus for load - on multi core systems, the sums of stats can go over 100%, resulting in out of range for expected load_value to be 0.0 to 1.0 - safety checks to avoid overflows - reported by Luca M. --- Modified: modules/pipelimit/pipelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/d9e87383613d4d24efe3d1eb144ad6c… Patch: https://github.com/kamailio/kamailio/commit/d9e87383613d4d24efe3d1eb144ad6c… --- diff --git a/modules/pipelimit/pipelimit.c b/modules/pipelimit/pipelimit.c index a060df7..b966fc5 100644 --- a/modules/pipelimit/pipelimit.c +++ b/modules/pipelimit/pipelimit.c @@ -182,6 +182,36 @@ struct module_exports exports= { }; +#if defined (__OS_darwin) || defined (__OS_freebsd) +#include <sys/param.h> +#include <sys/sysctl.h> +#else +#include <unistd.h> +#endif + +int get_num_cpus() { + int count = 0; + +#if defined (__OS_darwin) || defined (__OS_freebsd) + int nm[2]; + size_t len; + + len = sizeof(count); + + nm[0] = CTL_HW; nm[1] = HW_AVAILCPU; + sysctl(nm, 2, &count, &len, NULL, 0); + + if(count < 1) { + nm[1] = HW_NCPU; + sysctl(nm, 2, &count, &len, NULL, 0); + } +#else + count = sysconf(_SC_NPROCESSORS_ONLN); +#endif + if(count < 1) return 1; + return count; +} + /* not using /proc/loadavg because it only works when our_timer_interval == theirs */ static int get_cpuload(double * load) { @@ -190,6 +220,8 @@ static int get_cpuload(double * load) long long n_user, n_nice, n_sys, n_idle, n_iow, n_irq, n_sirq, n_stl; static int first_time = 1; FILE * f = fopen("/proc/stat", "r"); + double vload; + int ncpu; if (! f) { LM_ERR("could not open /proc/stat\n"); @@ -216,7 +248,16 @@ static int get_cpuload(double * load) (n_stl - o_stl); long long d_idle = (n_idle - o_idle); - *load = 1.0 - ((double)d_idle) / (double)d_total; + vload = ((double)d_idle) / (double)d_total; + + /* divide by numbers of cpu */ + ncpu = get_num_cpus(); + vload = vload/ncpu; + vload = 1.0 - vload; + if(vload<0.0) vload = 0.0; + else if (vload>1.0) vload = 1.0; + + *load = vload; } o_user = n_user;

9 years, 10 months

git:master:c52e4e13: seas: fixed inline functions warnings for clang

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c52e4e13ea57702aeed45a7a2059b97faf4d06f6 URL: https://github.com/kamailio/kamailio/commit/c52e4e13ea57702aeed45a7a2059b97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-07T18:08:35+01:00 seas: fixed inline functions warnings for clang --- Modified: modules/seas/ha.c Modified: modules/seas/ha.h Modified: modules/seas/statistics.c Modified: modules/seas/statistics.h --- Diff: https://github.com/kamailio/kamailio/commit/c52e4e13ea57702aeed45a7a2059b97… Patch: https://github.com/kamailio/kamailio/commit/c52e4e13ea57702aeed45a7a2059b97…

9 years, 10 months

git:master:d7111b95: modules/ims_usrloc_scscf: fixed pkg_mem leak - free db_result

by Jason Penton

Module: kamailio Branch: master Commit: d7111b957c4fb230e88f18f1e15039254e9c01ab URL: https://github.com/kamailio/kamailio/commit/d7111b957c4fb230e88f18f1e150392… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: 2015-01-07T13:40:28+02:00 modules/ims_usrloc_scscf: fixed pkg_mem leak - free db_result --- Modified: modules/ims_usrloc_scscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/d7111b957c4fb230e88f18f1e150392… Patch: https://github.com/kamailio/kamailio/commit/d7111b957c4fb230e88f18f1e150392… --- diff --git a/modules/ims_usrloc_scscf/usrloc_db.c b/modules/ims_usrloc_scscf/usrloc_db.c index 7571ee5..c5d569f 100644 --- a/modules/ims_usrloc_scscf/usrloc_db.c +++ b/modules/ims_usrloc_scscf/usrloc_db.c @@ -1064,6 +1064,7 @@ int db_unlink_subscriber_from_impu(impurecord_t* _r, reg_subscriber* _reg_subscr LM_ERR("Unable to un-link impu-subscriber in DB - impu [%.*s], subscriber [%.*s]\n", _r->public_identity.len, _r->public_identity.s, _reg_subscriber->presentity_uri.len, _reg_subscriber->presentity_uri.s); return -1; } + ul_dbf.free_result(ul_dbh, rs); LM_DBG("Delete query success\n"); return 0; @@ -1105,6 +1106,7 @@ int db_link_subscriber_to_impu(impurecord_t* _r, reg_subscriber* _reg_subscriber return -1; } LM_DBG("Query success\n"); + ul_dbf.free_result(ul_dbh, rs); return 0; }

9 years, 10 months

jsonrpc-s crash

by Alex Balashov

Hi, I'm running 4.2:ca60c77acddc13d36ab691f8cac1f566323f6d86 and seem to be able to dependably crash Kamailio by sending the following JSONRPC stanza to the jsonrpc-s module: {"jsonrpc":2,"id":"126491c7ce1e1ba1552f18ebf1271f19","method":"core.version"}\n The number of HTTP requests needed to crash it varies, but seems to generally be about 8-10 on my system: Jan 7 02:32:04 localhost /usr/local/sbin/kamailio[2785]: INFO: [R-XHTTP-REQUEST:<null>] -> Handling JSON RPC request: /csrp_rpc/ Jan 7 02:32:05 localhost /usr/local/sbin/kamailio[2791]: CRITICAL: <core> [pass_fd.c:293]: receive_fd(): EOF on 59 Jan 7 02:32:05 localhost /usr/local/sbin/kamailio[2734]: ALERT: <core> [main.c:784]: handle_sigs(): child process 2785 exited by a signal 11 Jan 7 02:32:05 localhost /usr/local/sbin/kamailio[2734]: ALERT: <core> [main.c:787]: handle_sigs(): core was generated The core dump says it's because jsonrpc_dispatch() is being invoked with two empty parameters: #0 0x00007fc2b0b6f171 in __strlen_sse2 () from /lib64/libc.so.6 #1 0x00007fc2a6ffea72 in jsonrpc_dispatch (msg=0x7fff5721ceb0, s1=0x0, s2=0x0) at jsonrpc-s_mod.c:943 #2 0x000000000041d29b in do_action (h=0x7fff5721cdd0, a=0x7fc2b051b2c0, msg=0x7fff5721ceb0) at action.c:1088 #3 0x00000000004299b1 in run_actions (h=0x7fff5721cdd0, a=0x7fc2b051b070, msg=0x7fff5721ceb0) at action.c:1583 #4 0x000000000041d204 in do_action (h=0x7fff5721cdd0, a=0x7fc2b051b9d0, msg=0x7fff5721ceb0) at action.c:1079 #5 0x00000000004299b1 in run_actions (h=0x7fff5721cdd0, a=0x7fc2b051b9d0, msg=0x7fff5721ceb0) at action.c:1583 #6 0x00007fc2a720ad2b in xhttp_process_request (orig_msg=0x7fc2b0561438, new_buf=0x7fc2b051d550 "POST /csrp_rpc/ HTTP/1.1\r\nVia: SIP/2.0/TCP 172.30.110.4:42861\r\nHost: 172.30.110.4:5060\r\nConnection: close\r\nTransfer-Encoding: chunked\r\n\r\n{\"jsonrpc\":2,\"id\":\"126491c7ce1e1ba1552f18ebf1271f19\",\"method\":\""..., new_len=215) at xhttp_mod.c:284 #7 0x00007fc2a720bd98 in xhttp_handler (msg=0x7fc2b0561438) at xhttp_mod.c:359 #8 0x00000000004de163 in nonsip_msg_run_hooks (msg=0x7fc2b0561438) at nonsip_hooks.c:125 #9 0x0000000000506999 in receive_msg ( buf=0x2a9d5a0 "POST /csrp_rpc/ HTTP/1.1\r\nHost: 172.30.110.4:5060\r\nConnection: close\r\nTransfer-Encoding: chunked\r\n\r\n{\"jsonrpc\":2,\"id\":\"126491c7ce1e1ba1552f18ebf1271f19\",\"method\":\"core.version\"}\n", len=178, ... I'll see what changes I can make to try to get it to not crash. -- Alex Balashov - Principal Evariste Systems LLC 235 E Ponce de Leon Ave Suite 106 Decatur, GA 30030 United States Tel: +1-678-954-0670 Web: http://www.evaristesys.com/, http://www.alexbalashov.com/

9 years, 10 months

git:master:29fe7a81: jsonrpc-s: safety check for str value of jsonrpc and method fileds

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 29fe7a813b17af898dbe0c4e978dd05766f41aec URL: https://github.com/kamailio/kamailio/commit/29fe7a813b17af898dbe0c4e978dd05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-07T11:30:01+01:00 jsonrpc-s: safety check for str value of jsonrpc and method fileds - reported by Alex Balashov --- Modified: modules/jsonrpc-s/jsonrpc-s_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/29fe7a813b17af898dbe0c4e978dd05… Patch: https://github.com/kamailio/kamailio/commit/29fe7a813b17af898dbe0c4e978dd05… --- diff --git a/modules/jsonrpc-s/jsonrpc-s_mod.c b/modules/jsonrpc-s/jsonrpc-s_mod.c index b004108..2946288 100644 --- a/modules/jsonrpc-s/jsonrpc-s_mod.c +++ b/modules/jsonrpc-s/jsonrpc-s_mod.c @@ -935,8 +935,8 @@ static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) /* sanity checks on jsonrpc request */ nj = srjson_GetObjectItem(ctx->jreq, ctx->jreq->root, "jsonrpc"); - if(nj==NULL) { - LM_ERR("missing jsonrpc field in request\n"); + if(nj==NULL || nj->valuestring==NULL) { + LM_ERR("missing or invalid jsonrpc field in request\n"); goto send_reply; } val.s = nj->valuestring; @@ -947,8 +947,8 @@ static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) } /* run jsonrpc command */ nj = srjson_GetObjectItem(ctx->jreq, ctx->jreq->root, "method"); - if(nj==NULL) { - LM_ERR("missing jsonrpc method field in request\n"); + if(nj==NULL || nj->valuestring==NULL) { + LM_ERR("missing or invalid jsonrpc method field in request\n"); goto send_reply; } val.s = nj->valuestring;

9 years, 10 months

Filtering GIT commit notifications

by Daniel-Constantin Mierla

Hello, it appears that the traffic with commits on personal branches is increasing, therefore I am trying to figure out if there is a need to filter the email notifications (being suggested to me by someone here, as well). I extended the notification script (https://github.com/miconda/gitpushub) to be able to filter on branch name and send email notifications to different addresses or skip notifying. If people think there is too much traffic with notification from personal branches, we can update to: 1) send notifications of commits to official branches (master, 4.2, 4.1, and older releases) to sr-dev 2) for the rest of commits, several options a) skip notifying them b) create another mailing list where to send all commits notifications (including for official branches) c) decide case by case - a dev can request to skip notifications to its personal branches (if she/he uses them extensevely) or the community asks to ingnore some particular branches (if it appears to be a lot of no important activity) If you think of other combinations, don't hesitate to propose here. At this moment I tend for 1, 2b). Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

9 years, 10 months

git:master:f8d64b19: async: removed svn $Id$

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f8d64b1946503a766c6d5414f940db8479c5674a URL: https://github.com/kamailio/kamailio/commit/f8d64b1946503a766c6d5414f940db8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-07T00:34:20+01:00 async: removed svn $Id$ --- Modified: modules/async/async_mod.c Modified: modules/async/async_sleep.c Modified: modules/async/async_sleep.h --- Diff: https://github.com/kamailio/kamailio/commit/f8d64b1946503a766c6d5414f940db8… Patch: https://github.com/kamailio/kamailio/commit/f8d64b1946503a766c6d5414f940db8… --- diff --git a/modules/async/async_mod.c b/modules/async/async_mod.c index 5314439..8cd6fac 100644 --- a/modules/async/async_mod.c +++ b/modules/async/async_mod.c @@ -1,6 +1,4 @@ /** - * $Id$ - * * Copyright (C) 2011 Daniel-Constantin Mierla (asipto.com) * * This file is part of Kamailio, a free SIP server. diff --git a/modules/async/async_sleep.c b/modules/async/async_sleep.c index f353de1..8ed62e6 100644 --- a/modules/async/async_sleep.c +++ b/modules/async/async_sleep.c @@ -1,6 +1,4 @@ /** - * $Id$ - * * Copyright (C) 2011 Daniel-Constantin Mierla (asipto.com) * * This file is part of Kamailio, a free SIP server. diff --git a/modules/async/async_sleep.h b/modules/async/async_sleep.h index b08f98f..0eb2fd7 100644 --- a/modules/async/async_sleep.h +++ b/modules/async/async_sleep.h @@ -1,6 +1,4 @@ /** - * $Id$ - * * Copyright (C) 2011 Daniel-Constantin Mierla (asipto.com) * * This file is part of Kamailio, a free SIP server.

9 years, 10 months

git:lazedo/4.2:4b0b95f7: Merge branch '4.2' into lazedo/4.2

by Luis Azedo

Module: kamailio Branch: lazedo/4.2 Commit: 4b0b95f79f7c8abac5e994c6db2abb9019036730 URL: https://github.com/kamailio/kamailio/commit/4b0b95f79f7c8abac5e994c6db2abb9… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-01-06T23:05:17Z Merge branch '4.2' into lazedo/4.2 * 4.2: usrloc: fixed issue updating last_modified usrloc: fix db_update_addr and db_delete_ucontact_addr test/travis: move travis scripts to tests/travis ( Closes #20 ) --- Added: test/travis/build_deps.sh Added: test/travis/build_travis.sh Modified: .travis.yml Modified: modules/usrloc/ucontact.c Removed: pkg/kamailio/deb/build_deps.sh Removed: pkg/kamailio/deb/build_travis.sh --- Diff: https://github.com/kamailio/kamailio/commit/4b0b95f79f7c8abac5e994c6db2abb9… Patch: https://github.com/kamailio/kamailio/commit/4b0b95f79f7c8abac5e994c6db2abb9…

9 years, 10 months

← Newer
1
...
36
37
38
39
40
41
42
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2015