sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
410 discussions

git:master:220f2e3a: dialog: extra headers for dlg_bridge() built with memcpy

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 220f2e3a36a7d7f00c77ef6f8cc495b3ff995b01 URL: https://github.com/kamailio/kamailio/commit/220f2e3a36a7d7f00c77ef6f8cc495b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T11:10:01+02:00 dialog: extra headers for dlg_bridge() built with memcpy --- Modified: src/modules/dialog/dlg_transfer.c --- Diff: https://github.com/kamailio/kamailio/commit/220f2e3a36a7d7f00c77ef6f8cc495b… Patch: https://github.com/kamailio/kamailio/commit/220f2e3a36a7d7f00c77ef6f8cc495b… --- diff --git a/src/modules/dialog/dlg_transfer.c b/src/modules/dialog/dlg_transfer.c index c7da054da0..74d43726ad 100644 --- a/src/modules/dialog/dlg_transfer.c +++ b/src/modules/dialog/dlg_transfer.c @@ -68,11 +68,11 @@ int dlg_bridge_init_hdrs(void) LM_ERR("no more pkg memory\n"); return -1; } - strncpy(dlg_bridge_hdrs_buf, + memcpy(dlg_bridge_hdrs_buf, "Contact: <", 10); - strncpy(dlg_bridge_hdrs_buf + 10, + memcpy(dlg_bridge_hdrs_buf + 10, dlg_bridge_contact.s, dlg_bridge_contact.len); - strncpy(dlg_bridge_hdrs_buf + 10 + dlg_bridge_contact.len, + memcpy(dlg_bridge_hdrs_buf + 10 + dlg_bridge_contact.len, ">\r\nContent-Type: application/sdp\r\n", 34); dlg_bridge_hdrs_buf[dlg_bridge_contact.len+44] = '\0'; dlg_bridge_inv_hdrs.s = dlg_bridge_hdrs_buf;

7 years

git:master:a81a8098: ctl: close opened sockets in case of errors

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a81a809897ff381526db38e71af38dfcdfa74f04 URL: https://github.com/kamailio/kamailio/commit/a81a809897ff381526db38e71af38df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T09:15:00+02:00 ctl: close opened sockets in case of errors --- Modified: src/modules/ctl/binrpc.h Modified: src/modules/ctl/binrpc_run.c Modified: src/modules/ctl/ctl.c Modified: src/modules/ctl/ctrl_socks.c Modified: src/modules/ctl/fifo_server.c Modified: src/modules/ctl/init_socks.c Modified: src/modules/ctl/io_listener.c --- Diff: https://github.com/kamailio/kamailio/commit/a81a809897ff381526db38e71af38df… Patch: https://github.com/kamailio/kamailio/commit/a81a809897ff381526db38e71af38df…

7 years

git:master:b81204e2: call_obj: fix convertion from uint32 to uint64

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b81204e213a7ca14b95dda8a9191e622f78661dd URL: https://github.com/kamailio/kamailio/commit/b81204e213a7ca14b95dda8a9191e62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T09:13:42+02:00 call_obj: fix convertion from uint32 to uint64 --- Modified: src/modules/call_obj/call_obj_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b81204e213a7ca14b95dda8a9191e62… Patch: https://github.com/kamailio/kamailio/commit/b81204e213a7ca14b95dda8a9191e62… --- diff --git a/src/modules/call_obj/call_obj_mod.c b/src/modules/call_obj/call_obj_mod.c index 31bc1dade6..3e27245917 100644 --- a/src/modules/call_obj/call_obj_mod.c +++ b/src/modules/call_obj/call_obj_mod.c @@ -121,7 +121,8 @@ static void rpc_call_obj_list(rpc_t *rpc, void *ctx) } uint64_t current_ts; - uint64_t dur_ms = duration*1000; /* duration in milliseconds */ + uint64_t dur_ms = duration; + dur_ms *= 1000; /* duration in milliseconds */ if (get_timestamp(&current_ts)) { LM_ERR("error getting timestamp"); rpc->fault(ctx, 500, "error getting timestamp");

7 years

git:master:a3d32398: avp: typedef hdr name struct to simplify memory allocation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a3d3239833a8ca91566a28de2217ec166601e64f URL: https://github.com/kamailio/kamailio/commit/a3d3239833a8ca91566a28de2217ec1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T09:12:46+02:00 avp: typedef hdr name struct to simplify memory allocation --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/a3d3239833a8ca91566a28de2217ec1… Patch: https://github.com/kamailio/kamailio/commit/a3d3239833a8ca91566a28de2217ec1… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index 84ecf4d6dd..d6c8b3323d 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -60,7 +60,7 @@ MODULE_VERSION #define VAL_TYPE_INT (1<<0) #define VAL_TYPE_STR (1<<1) -struct hdr_name { +typedef struct hdr_name { enum {hdrId, hdrStr} kind; union { int n; @@ -69,7 +69,7 @@ struct hdr_name { char field_delimiter; char array_delimiter; int val_types; -}; +} hdr_name_t; static int xlbuf_size=256; static char* xlbuf=NULL; @@ -1379,7 +1379,7 @@ static int attr_hdr_body2attrs2(struct sip_msg* msg, char* header_, char* prefix static int attr_hdr_body2attrs_fixup(void **param, int param_no) { char *c, *params; - struct hdr_name *h; + hdr_name_t *h; int n; str *s; if(param_no == 1) { @@ -1408,7 +1408,7 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) c, n); return E_CFG; } - h = pkg_malloc(sizeof(*h)); + h = pkg_malloc(sizeof(hdr_name_t)); if(!h) { LOG(L_ERR, "attr_hdr_body2attrs_fixup: out of memory\n"); return E_OUT_OF_MEM; @@ -1428,14 +1428,14 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) LOG(L_ERR, "attr_hdr_body2attrs_fixup: header name is empty\n"); return E_CFG; } - h = pkg_malloc(sizeof(*h) + n + 1); + h = pkg_malloc(sizeof(hdr_name_t) + n + 1); if(!h) { LOG(L_ERR, "attr_hdr_body2attrs_fixup: out of memory\n"); return E_OUT_OF_MEM; } h->kind = HDR_STR; h->name.s.len = n; - h->name.s.s = (char *)h + sizeof(*h); + h->name.s.s = (char *)h + sizeof(hdr_name_t); memcpy(h->name.s.s, c, n + 1); } if(params) { @@ -1478,13 +1478,13 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) if(n == 0) { s = NULL; } else { - s = pkg_malloc(sizeof(*s) + n + 1); + s = pkg_malloc(sizeof(str) + n + 1); if(!s) { LOG(L_ERR, "attr_hdr_body2attrs_fixup: out of memory\n"); return E_OUT_OF_MEM; } s->len = n; - s->s = (char *)s + sizeof(*s); + s->s = (char *)s + sizeof(str); memcpy(s->s, *param, n + 1); } pkg_free(*param); @@ -1506,7 +1506,6 @@ static int attr_hdr_body2attrs2_fixup(void** param, int param_no) } - static int avpgroup_fixup(void** param, int param_no) { unsigned long flags; @@ -1581,7 +1580,6 @@ static int avpgroup_fixup(void** param, int param_no) } - static int select_attr_fixup(str* res, select_t* s, struct sip_msg* msg) { avp_ident_t *avp_ident;

7 years

git:master:67e87eb1: auth_diameter: avoid passing large structs as params and better error handling

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 67e87eb16059351f174fc6f4d740eed33b5ace6b URL: https://github.com/kamailio/kamailio/commit/67e87eb16059351f174fc6f4d740eed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T09:11:17+02:00 auth_diameter: avoid passing large structs as params and better error handling --- Modified: src/modules/auth_diameter/authorize.c Modified: src/modules/auth_diameter/authorize.h Modified: src/modules/auth_diameter/avp.c Modified: src/modules/auth_diameter/message.c Modified: src/modules/auth_diameter/tcp_comm.c Modified: src/modules/auth_diameter/user_in.c --- Diff: https://github.com/kamailio/kamailio/commit/67e87eb16059351f174fc6f4d740eed… Patch: https://github.com/kamailio/kamailio/commit/67e87eb16059351f174fc6f4d740eed…

7 years

git:master:ec4d74ad: app_python: remove condition on classname, being set to non-null

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ec4d74ad7c1d1b14a4f33f995845ac7b299540cf URL: https://github.com/kamailio/kamailio/commit/ec4d74ad7c1d1b14a4f33f995845ac7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T09:09:26+02:00 app_python: remove condition on classname, being set to non-null --- Modified: src/modules/app_python/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ec4d74ad7c1d1b14a4f33f995845ac7… Patch: https://github.com/kamailio/kamailio/commit/ec4d74ad7c1d1b14a4f33f995845ac7… --- diff --git a/src/modules/app_python/app_python_mod.c b/src/modules/app_python/app_python_mod.c index 1b7b490190..73651ba8cf 100644 --- a/src/modules/app_python/app_python_mod.c +++ b/src/modules/app_python/app_python_mod.c @@ -353,7 +353,7 @@ static int child_init(int rank) if (!PyErr_Occurred()) PyErr_Format(PyExc_AttributeError, "class object '%s' has is not callable attribute '%s'", - !classname ? "None" : classname, mod_init_fname.s); + classname, mod_init_fname.s); python_handle_exception("child_init"); Py_DECREF(format_exc_obj); Py_XDECREF(pFunc); @@ -389,9 +389,6 @@ static int child_init(int rank) Py_DECREF(pFunc); Py_DECREF(pArgs); - - - if (PyErr_Occurred()) { python_handle_exception("child_init"); Py_DECREF(format_exc_obj); @@ -422,7 +419,6 @@ static int child_init(int rank) return -1; } - rval = PyInt_AsLong(pResult); Py_DECREF(pResult); PyThreadState_Swap(NULL);

7 years

git:master:e19c1ec5: core: pvapi - remove useless condition

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e19c1ec58c8c51defd91f3e2581544bea224c0bf URL: https://github.com/kamailio/kamailio/commit/e19c1ec58c8c51defd91f3e2581544b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T09:08:24+02:00 core: pvapi - remove useless condition --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/e19c1ec58c8c51defd91f3e2581544b… Patch: https://github.com/kamailio/kamailio/commit/e19c1ec58c8c51defd91f3e2581544b… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 2f85783ea4..7e3d7b9b4b 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -1096,8 +1096,6 @@ int pv_parse_format(str *in, pv_elem_p *el) goto error; p0 = p + len; - if(p0==NULL) - goto error; if(*p0 == '\0') break; p = p0;

7 years

git:master:0cb33abe: core: mem/f_malloc - explicit set to 0 for bit shifting greater than size

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0cb33abe8b2196fb26baf459f66d9d7b9e920013 URL: https://github.com/kamailio/kamailio/commit/0cb33abe8b2196fb26baf459f66d9d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T09:07:09+02:00 core: mem/f_malloc - explicit set to 0 for bit shifting greater than size --- Modified: src/core/mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/0cb33abe8b2196fb26baf459f66d9d7… Patch: https://github.com/kamailio/kamailio/commit/0cb33abe8b2196fb26baf459f66d9d7… --- diff --git a/src/core/mem/f_malloc.c b/src/core/mem/f_malloc.c index 89985a4c72..184037814e 100644 --- a/src/core/mem/f_malloc.c +++ b/src/core/mem/f_malloc.c @@ -122,7 +122,8 @@ inline static int fm_bmp_first_set(struct fm_block* qm, int start) return (start-bit+r); } #endif - v=qm->free_bitmap[bmp_idx]>>(bit+1); + if((bit+1) < 8*sizeof(v)) v=qm->free_bitmap[bmp_idx]>>(bit+1); + else v = 0; return start+1+bit_scan_forward((unsigned long)v); } for (r=bmp_idx+1;r<FM_HASH_BMP_SIZE; r++){

7 years

git:master:107dc767: core: dns cache - avoid bitshifting with more than the size

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 107dc767391902d5d3b000deecafb804c1c68c1b URL: https://github.com/kamailio/kamailio/commit/107dc767391902d5d3b000deecafb80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T09:05:16+02:00 core: dns cache - avoid bitshifting with more than the size - avoid undefined behaviour as per C specs --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/107dc767391902d5d3b000deecafb80… Patch: https://github.com/kamailio/kamailio/commit/107dc767391902d5d3b000deecafb80… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 7f3e33875d..e8bfd7f5e6 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -2344,7 +2344,7 @@ inline static struct dns_rr* dns_srv_get_nxt_rr(struct dns_hash_entry* e, #endif /* i is the winner */ *no=n; /* grp. start */ - srv_mark_tried(tried, i); /* mark it */ + if(i<8*sizeof(*tried)) srv_mark_tried(tried, i); /* mark it */ return r_sums[i].rr; no_more_rrs: *no=n;

7 years

git:master:f3c68a50: core: cfg - removed unreachable code

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f3c68a5013b5a33937dbf735453da29df75ae09e URL: https://github.com/kamailio/kamailio/commit/f3c68a5013b5a33937dbf735453da29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T09:03:26+02:00 core: cfg - removed unreachable code --- Modified: src/core/cfg/cfg_select.c Modified: src/core/cfg/cfg_struct.c --- Diff: https://github.com/kamailio/kamailio/commit/f3c68a5013b5a33937dbf735453da29… Patch: https://github.com/kamailio/kamailio/commit/f3c68a5013b5a33937dbf735453da29… --- diff --git a/src/core/cfg/cfg_select.c b/src/core/cfg/cfg_select.c index ae8b0c8852..19b815332d 100644 --- a/src/core/cfg/cfg_select.c +++ b/src/core/cfg/cfg_select.c @@ -205,10 +205,6 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg) /* use the module's handle to access the variable, so the variables are read from the local config */ p = *(group->handle) + var->offset; - if (p == NULL) - return -1; /* The group is not yet ready. - * (Trying to read the value from the - * main process that has no local configuration) */ switch (CFG_VAR_TYPE(var)) { case CFG_VAR_INT: @@ -308,10 +304,6 @@ unsigned int read_cfg_var(struct cfg_read_handle *read_handle, void **val) /* use the module's handle to access the variable, so the variables are read from the local config */ p = *(group->handle) + var->offset; - if (p == NULL) - return 0; /* The group is not yet ready. - * (Trying to read the value from the - * main process that has no local configuration) */ switch (CFG_VAR_TYPE(var)) { case CFG_VAR_INT: diff --git a/src/core/cfg/cfg_struct.c b/src/core/cfg/cfg_struct.c index 8bfe4295a3..350d49c216 100644 --- a/src/core/cfg/cfg_struct.c +++ b/src/core/cfg/cfg_struct.c @@ -1250,8 +1250,7 @@ int cfg_select_next(cfg_group_t *group) return -1; } - if (!(meta = CFG_GROUP_META(cfg_local, group))) - return -1; + meta = CFG_GROUP_META(cfg_local, group); if (!(old_ginst = CFG_HANDLE_TO_GINST(*(group->handle)) /* the active group instance */)) { LOG(L_ERR, "ERROR: cfg_select_next(): No group instance is set currently. Forgot to call cfg_select_first()?\n");

7 years

← Newer
1
...
12
13
14
15
16
17
18
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017