sr-dev December 2017

sr-dev@lists.kamailio.org

26 participants
476 discussions

[kamailio/kamailio] acc: Allow nullable cdr extra fields (#1385)
by Carlos Cruz Luengo 02 Jan '18

02 Jan '18

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #1378 #### Description - allow custom cdr fields defined with cdr_extra modparam to be saved as null. Before this change, cdr_extra variables not defined in config operation (or set to $null) were saved as empty string (''). This commit makes possible to save them as NULL value. - new modparam to make this behaviour configurable: cdr_extra_nullable. Set it to 1 to enable this new behaviour (default value: 0) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1385 -- Commit Summary -- * acc: Allow nullable cdr extra fields -- File Changes -- M src/modules/acc/acc_cdr.c (11) M src/modules/acc/acc_mod.c (8) M src/modules/acc/acc_mod.h (1) M src/modules/acc/doc/acc_admin.xml (22) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1385.patch https://github.com/kamailio/kamailio/pull/1385.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/1385

2 2

git:master:2865a1f1: websocket: print len in debug messages when decoding frame
by Daniel-Constantin Mierla 31 Dec '17

31 Dec '17

Module: kamailio Branch: master Commit: 2865a1f16490cadb1c07864f270976d7311373a9 URL: https://github.com/kamailio/kamailio/commit/2865a1f16490cadb1c07864f270976d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-31T10:52:05+01:00 websocket: print len in debug messages when decoding frame --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/2865a1f16490cadb1c07864f270976d… Patch: https://github.com/kamailio/kamailio/commit/2865a1f16490cadb1c07864f270976d… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index aec8a19c8b..9bc3268601 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -375,13 +375,13 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, unsigned int mask_start, j; char *buf = tcpinfo->buf; - LM_DBG("decoding WebSocket frame\n"); + LM_DBG("decoding WebSocket frame (len: %u)\n", len); wsconn_update(frame->wsc); /* Decode and validate first 9 bits */ if(len < 2) { - LM_WARN("message is too short\n"); + LM_WARN("message is too short (%u)\n", len); *err_code = 1002; *err_text = str_status_protocol_error; return -1; @@ -437,7 +437,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, frame->payload_len = (buf[1] & 0xff) & BYTE1_MASK_PAYLOAD_LEN; if(frame->payload_len == 126) { if(len < 4) { - LM_WARN("message is too short\n"); + LM_WARN("message is too short (%u)\n", len); *err_code = 1002; *err_text = str_status_protocol_error; return -1; @@ -447,7 +447,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, frame->payload_len = ((buf[2] & 0xff) << 8) | ((buf[3] & 0xff) << 0); } else if(frame->payload_len == 127) { if(len < 10) { - LM_WARN("message is too short\n"); + LM_WARN("message is too short (%u)\n", len); *err_code = 1002; *err_text = str_status_protocol_error; return -1; @@ -456,7 +456,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, if((buf[2] & 0xff) != 0 || (buf[3] & 0xff) != 0 || (buf[4] & 0xff) != 0 || (buf[5] & 0xff) != 0) { - LM_WARN("message is too long\n"); + LM_WARN("message is too long (%u)\n", len); *err_code = 1009; *err_text = str_status_message_too_big; return -1; @@ -498,8 +498,8 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, frame->payload_data[i] = frame->payload_data[i] ^ frame->masking_key[j]; } - LM_DBG("Rx (decoded): %.*s\n", (int)frame->payload_len, - frame->payload_data); + LM_DBG("Rx (decoded) (len %u): %.*s\n", frame->payload_len, + (int)frame->payload_len, frame->payload_data); return frame->opcode; }

1 0

git:master:fa7688bb: websocket: clang format the code
by Daniel-Constantin Mierla 31 Dec '17

31 Dec '17

Module: kamailio Branch: master Commit: fa7688bb321bbee3d8d6d6c5692c0d142c0830a3 URL: https://github.com/kamailio/kamailio/commit/fa7688bb321bbee3d8d6d6c5692c0d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-31T10:47:16+01:00 websocket: clang format the code --- Modified: src/modules/websocket/config.c Modified: src/modules/websocket/utf8_decode.h Modified: src/modules/websocket/websocket.c Modified: src/modules/websocket/websocket.h Modified: src/modules/websocket/ws_conn.c Modified: src/modules/websocket/ws_conn.h Modified: src/modules/websocket/ws_frame.c Modified: src/modules/websocket/ws_frame.h Modified: src/modules/websocket/ws_handshake.c Modified: src/modules/websocket/ws_handshake.h --- Diff: https://github.com/kamailio/kamailio/commit/fa7688bb321bbee3d8d6d6c5692c0d1… Patch: https://github.com/kamailio/kamailio/commit/fa7688bb321bbee3d8d6d6c5692c0d1…

1 0

git:master:3302687e: websocket: early check for frame size to fit max buf size
by Daniel-Constantin Mierla 31 Dec '17

31 Dec '17

Module: kamailio Branch: master Commit: 3302687e2b995ee9faab1655e6bb5e5d4a0dbc87 URL: https://github.com/kamailio/kamailio/commit/3302687e2b995ee9faab1655e6bb5e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-31T10:39:16+01:00 websocket: early check for frame size to fit max buf size - avoid decoding a large buffer and then fail - allocate BUF_SIZE+1 for fragment buffer, coherent with other recv buffers --- Modified: src/modules/websocket/ws_conn.c Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/3302687e2b995ee9faab1655e6bb5e5… Patch: https://github.com/kamailio/kamailio/commit/3302687e2b995ee9faab1655e6bb5e5… --- diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index 9fedf33f7b..786d87dc50 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -202,13 +202,13 @@ int wsconn_add(struct receive_info rcv, unsigned int sub_protocol) LM_DBG("wsconn_add id [%d]\n", id); /* Allocate and fill in new WebSocket connection */ - wsc = shm_malloc(sizeof(ws_connection_t) + BUF_SIZE); + wsc = shm_malloc(sizeof(ws_connection_t) + BUF_SIZE + 1); if (wsc == NULL) { LM_ERR("allocating shared memory\n"); return -1; } - memset(wsc, 0, sizeof(ws_connection_t) + BUF_SIZE); + memset(wsc, 0, sizeof(ws_connection_t) + BUF_SIZE + 1); wsc->id = id; wsc->id_hash = id_hash; wsc->state = WS_S_OPEN; diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 8e632892f6..5aafe064e9 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -406,7 +406,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, short *err_code, str *err_text) { unsigned int i, len = tcpinfo->len; - int mask_start, j; + unsigned int mask_start, j; char *buf = tcpinfo->buf; LM_DBG("decoding WebSocket frame\n"); @@ -535,6 +535,13 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, *err_text = str_status_protocol_error; return -1; } + if(frame->payload_len >= BUF_SIZE) { + LM_WARN("message is too long for our buffer size (%d / %d)\n", + BUF_SIZE, frame->payload_len); + *err_code = 1009; + *err_text = str_status_message_too_big; + return -1; + } frame->payload_data = &buf[mask_start + 4]; for (i = 0; i < frame->payload_len; i++) {

1 0

git:master:20752cf9: core: resolve - early safety checks to deal faster with broken dns responses
by Daniel-Constantin Mierla 30 Dec '17

30 Dec '17

Module: kamailio Branch: master Commit: 20752cf945d4ba0660d321d73efff5c93f6d20a8 URL: https://github.com/kamailio/kamailio/commit/20752cf945d4ba0660d321d73efff5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-30T16:57:42+01:00 core: resolve - early safety checks to deal faster with broken dns responses --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/20752cf945d4ba0660d321d73efff5c… Patch: https://github.com/kamailio/kamailio/commit/20752cf945d4ba0660d321d73efff5c… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index 0daaa30910..2b1441e36d 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -679,13 +679,16 @@ void free_rdata_list(struct rdata* head) int match_search_list(const struct __res_state* res, char* name) { int i; for (i=0; (i<MAXDNSRCH) && (res->dnsrch[i]); i++) { - if (strcasecmp(name, res->dnsrch[i])==0) + if (strcasecmp(name, res->dnsrch[i])==0) return 1; } return 0; } #endif +#define SR_DNS_MAX_QNO 10 +#define SR_DNS_MAX_ANO 100 + /** gets the DNS records for name:type * returns a dyn. alloc'ed struct rdata linked list with the parsed responses * or 0 on error @@ -714,7 +717,7 @@ struct rdata* get_record(char* name, int type, int flags) int name_len; struct rdata* fullname_rd; char c; - + name_len=strlen(name); for (i = 0; i < name_len; i++) { @@ -744,12 +747,21 @@ struct rdata* get_record(char* name, int type, int flags) else if (unlikely(size > sizeof(buff))) size=sizeof(buff); head=rd=0; last=crt=&head; - + p=buff.buff+DNS_HDR_SIZE; end=buff.buff+size; if (unlikely(p>=end)) goto error_boundary; qno=ntohs((unsigned short)buff.hdr.qdcount); + if(qno!=1) { + /* usually the query is with a single domain name */ + LM_INFO("dns questions number is: %u\n", (uint32_t)qno); + if(qno>SR_DNS_MAX_QNO) { + /* early safe check against broken results */ + LM_ERR("dns questions number is too high: %u\n", (uint32_t)qno); + goto error; + } + } for (r=0; r<qno; r++){ /* skip the name of the question */ if (unlikely((p=dns_skipname(p, end))==0)) { @@ -765,8 +777,13 @@ struct rdata* get_record(char* name, int type, int flags) LM_ERR("p>=end\n"); goto error; } - }; + } answers_no=ntohs((unsigned short)buff.hdr.ancount); + if(answers_no>SR_DNS_MAX_ANO) { + /* early safety check on answers number */ + LM_ERR("dns answers number is too high: %u\n", (uint32_t)answers_no); + goto error; + } again: for (r=0; (r<answers_no) && (p<end); r++){ #if 0 @@ -815,7 +832,7 @@ struct rdata* get_record(char* name, int type, int flags) continue; } /* expand the "type" record (rdata)*/ - + rd=(struct rdata*) local_malloc(sizeof(struct rdata)+rec_name_len+ 1-1); if (rd==0){ @@ -857,14 +874,14 @@ struct rdata* get_record(char* name, int type, int flags) srv_rd= dns_srv_parser(buff.buff, end, rd_end, p); rd->rdata=(void*)srv_rd; if (unlikely(srv_rd==0)) goto error_parse; - + /* insert sorted into the list */ for (crt=&head; *crt; crt= &((*crt)->next)){ if ((*crt)->type!=T_SRV) continue; crt_srv=(struct srv_rdata*)(*crt)->rdata; if ((srv_rd->priority < crt_srv->priority) || - ( (srv_rd->priority == crt_srv->priority) && + ( (srv_rd->priority == crt_srv->priority) && (srv_rd->weight > crt_srv->weight) ) ){ /* insert here */ goto skip; @@ -926,9 +943,9 @@ struct rdata* get_record(char* name, int type, int flags) *last=rd; last=&(rd->next); } - + p+=rdlength; - + } if (flags & RES_AR){ flags&=~RES_AR;

1 0

git:master:539abf29: jsonrpcc: init sockaddr_in structure
by Daniel-Constantin Mierla 30 Dec '17

30 Dec '17

Module: kamailio Branch: master Commit: 539abf29103875f7412b7b3b95c5f6663a7afbe8 URL: https://github.com/kamailio/kamailio/commit/539abf29103875f7412b7b3b95c5f66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-29T11:18:04+01:00 jsonrpcc: init sockaddr_in structure --- Modified: src/modules/jsonrpcc/jsonrpc_io.c --- Diff: https://github.com/kamailio/kamailio/commit/539abf29103875f7412b7b3b95c5f66… Patch: https://github.com/kamailio/kamailio/commit/539abf29103875f7412b7b3b95c5f66… --- diff --git a/src/modules/jsonrpcc/jsonrpc_io.c b/src/modules/jsonrpcc/jsonrpc_io.c index ddefd1b3a1..cae18322ba 100644 --- a/src/modules/jsonrpcc/jsonrpc_io.c +++ b/src/modules/jsonrpcc/jsonrpc_io.c @@ -430,6 +430,7 @@ int connect_server(struct jsonrpc_server *server) struct sockaddr_in server_addr; struct hostent *hp; + memset(&server_addr, 0, sizeof(struct sockaddr_in)); server_addr.sin_family = AF_INET; server_addr.sin_port = htons(server->port);

1 0

git:master:dba589a5: janssonrpcc: use size of data type to allocate memory
by Daniel-Constantin Mierla 30 Dec '17

30 Dec '17

Module: kamailio Branch: master Commit: dba589a52bddc2833c41c91287a328d22fbc2712 URL: https://github.com/kamailio/kamailio/commit/dba589a52bddc2833c41c91287a328d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-29T11:17:25+01:00 janssonrpcc: use size of data type to allocate memory --- Modified: src/modules/janssonrpcc/janssonrpcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dba589a52bddc2833c41c91287a328d… Patch: https://github.com/kamailio/kamailio/commit/dba589a52bddc2833c41c91287a328d… --- diff --git a/src/modules/janssonrpcc/janssonrpcc_mod.c b/src/modules/janssonrpcc/janssonrpcc_mod.c index 654ea8280c..081cf3ca8e 100644 --- a/src/modules/janssonrpcc/janssonrpcc_mod.c +++ b/src/modules/janssonrpcc/janssonrpcc_mod.c @@ -225,7 +225,7 @@ void mod_destroy(void) int parse_server_param(modparam_t type, void* val) { if(global_server_group == NULL) { - global_server_group = shm_malloc(sizeof(void*)); + global_server_group = (jsonrpc_server_group_t**)shm_malloc(sizeof(jsonrpc_server_group_t*)); *global_server_group = NULL; } return jsonrpc_parse_server((char*)val, global_server_group);

1 0

git:master:b46d113e: core: resolve - use unsigned short int to match dns result types
by Daniel-Constantin Mierla 30 Dec '17

30 Dec '17

Module: kamailio Branch: master Commit: b46d113e941c5429914069be48faa181ba1e805e URL: https://github.com/kamailio/kamailio/commit/b46d113e941c5429914069be48faa18… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-29T11:14:56+01:00 core: resolve - use unsigned short int to match dns result types --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/b46d113e941c5429914069be48faa18… Patch: https://github.com/kamailio/kamailio/commit/b46d113e941c5429914069be48faa18… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index 7073a9a9e6..0daaa30910 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -694,8 +694,8 @@ struct rdata* get_record(char* name, int type, int flags) { int size; int skip; - int qno, answers_no; - int i, r; + unsigned short qno, answers_no, r; + int i; static union dns_query buff; unsigned char* p; unsigned char* end;

1 0

Fosdem Kamailio meeting
by Julien Chavanton 30 Dec '17

30 Dec '17

Hi Kamailians, I am planning my trip to Fosdem, I remember there was some discussion about doing a Kamailio dev meeting, I would be happy to join such meeting, in this case I will book accordingly Maybe arrive 24-48 hours before Is there anything scheduled ? Merry christmas ! Julien

3 2

git:master:eb016670: dialog: replaced inline function with a single log with a macro
by Daniel-Constantin Mierla 28 Dec '17

28 Dec '17

Module: kamailio Branch: master Commit: eb016670220c20f1156be838ca6645265b64eacc URL: https://github.com/kamailio/kamailio/commit/eb016670220c20f1156be838ca66452… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-28T17:05:22+01:00 dialog: replaced inline function with a single log with a macro - makes possible to get the file name and line of its usage --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/eb016670220c20f1156be838ca66452… Patch: https://github.com/kamailio/kamailio/commit/eb016670220c20f1156be838ca66452… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index df25d933cf..5779891c29 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -956,18 +956,19 @@ void dlg_release(dlg_cell_t *dlg) /*! - * \brief Small logging helper functions for next_state_dlg. + * \brief Small logging helper macro for next_state_dlg. * \param event logged event * \param dlg dialog data * \see next_state_dlg */ -static inline void log_next_state_dlg(const int event, const struct dlg_cell *dlg) { - LM_CRIT("bogus event %d in state %d for dlg %p [%u:%u] with clid '%.*s' and tags " - "'%.*s' '%.*s'\n", event, dlg->state, dlg, dlg->h_entry, dlg->h_id, - dlg->callid.len, dlg->callid.s, - dlg->tag[DLG_CALLER_LEG].len, dlg->tag[DLG_CALLER_LEG].s, - dlg->tag[DLG_CALLEE_LEG].len, dlg->tag[DLG_CALLEE_LEG].s); -} +#define log_next_state_dlg(event, dlg) do { \ + LM_CRIT("bogus event %d in state %d for dlg %p [%u:%u]" \ + " with clid '%.*s' and tags" \ + " '%.*s' '%.*s'\n", event, (dlg)->state, (dlg), \ + (dlg)->h_entry, (dlg)->h_id, (dlg)->callid.len, (dlg)->callid.s, \ + (dlg)->tag[DLG_CALLER_LEG].len, (dlg)->tag[DLG_CALLER_LEG].s, \ + (dlg)->tag[DLG_CALLEE_LEG].len, (dlg)->tag[DLG_CALLEE_LEG].s); \ + } while(0) /*!

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2017