sr-dev November 2019

sr-dev@lists.kamailio.org

22 participants
381 discussions

git:5.2:fa777881: cfgt: don't try to create dir if it already exists
by Victor Seva 28 Nov '19

28 Nov '19

Module: kamailio Branch: 5.2 Commit: fa7778816de04aea0b23f4cce06fd8af6da598fb URL: https://github.com/kamailio/kamailio/commit/fa7778816de04aea0b23f4cce06fd8a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-11-28T14:55:42+01:00 cfgt: don't try to create dir if it already exists (cherry picked from commit 6918a96cc61fa0b15e09db01bb02e9b9f8c78abf) --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/fa7778816de04aea0b23f4cce06fd8a… Patch: https://github.com/kamailio/kamailio/commit/fa7778816de04aea0b23f4cce06fd8a… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index 1c5b938e9c..0e3bfecb5d 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -322,13 +322,16 @@ void cfgt_save_node(cfgt_node_p node) FILE *fp; str dest = STR_NULL; int dir = 0; + struct stat sb; if(_cfgt_get_filename(node->msgid, node->uuid, &dest, &dir) < 0) { LM_ERR("can't build filename\n"); return; } dest.s[dir] = '\0'; LM_DBG("dir [%s]\n", dest.s); - if(mkdir(dest.s, S_IRWXO | S_IXGRP | S_IRWXU) < 0) { + if (stat(dest.s, &sb) == 0 && S_ISDIR(sb.st_mode)) { + LM_DBG("dir [%s] already existing\n", dest.s); + } else if(mkdir(dest.s, S_IRWXO | S_IXGRP | S_IRWXU) < 0) { LM_ERR("failed to make directory: %s\n", strerror(errno)); return; }

1 0

git:5.3:aa94a3a3: cfgt: don't try to create dir if it already exists
by Victor Seva 28 Nov '19

28 Nov '19

Module: kamailio Branch: 5.3 Commit: aa94a3a3310f9088b2b48ddeeb69ef0e78d5d6b3 URL: https://github.com/kamailio/kamailio/commit/aa94a3a3310f9088b2b48ddeeb69ef0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-11-28T14:54:17+01:00 cfgt: don't try to create dir if it already exists (cherry picked from commit 6918a96cc61fa0b15e09db01bb02e9b9f8c78abf) --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/aa94a3a3310f9088b2b48ddeeb69ef0… Patch: https://github.com/kamailio/kamailio/commit/aa94a3a3310f9088b2b48ddeeb69ef0… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index 97ebe0b11d..e9f18718dc 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -320,13 +320,16 @@ void cfgt_save_node(cfgt_node_p node) FILE *fp; str dest = STR_NULL; int dir = 0; + struct stat sb; if(_cfgt_get_filename(node->msgid, node->uuid, &dest, &dir) < 0) { LM_ERR("can't build filename\n"); return; } dest.s[dir] = '\0'; LM_DBG("dir [%s]\n", dest.s); - if(mkdir(dest.s, S_IRWXO | S_IXGRP | S_IRWXU) < 0) { + if (stat(dest.s, &sb) == 0 && S_ISDIR(sb.st_mode)) { + LM_DBG("dir [%s] already existing\n", dest.s); + } else if(mkdir(dest.s, S_IRWXO | S_IXGRP | S_IRWXU) < 0) { LM_ERR("failed to make directory: %s\n", strerror(errno)); return; }

1 0

git:master:6918a96c: cfgt: don't try to create dir if it already exists
by Victor Seva 28 Nov '19

28 Nov '19

Module: kamailio Branch: master Commit: 6918a96cc61fa0b15e09db01bb02e9b9f8c78abf URL: https://github.com/kamailio/kamailio/commit/6918a96cc61fa0b15e09db01bb02e9b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-11-28T14:28:14+01:00 cfgt: don't try to create dir if it already exists --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/6918a96cc61fa0b15e09db01bb02e9b… Patch: https://github.com/kamailio/kamailio/commit/6918a96cc61fa0b15e09db01bb02e9b… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index 97ebe0b11d..e9f18718dc 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -320,13 +320,16 @@ void cfgt_save_node(cfgt_node_p node) FILE *fp; str dest = STR_NULL; int dir = 0; + struct stat sb; if(_cfgt_get_filename(node->msgid, node->uuid, &dest, &dir) < 0) { LM_ERR("can't build filename\n"); return; } dest.s[dir] = '\0'; LM_DBG("dir [%s]\n", dest.s); - if(mkdir(dest.s, S_IRWXO | S_IXGRP | S_IRWXU) < 0) { + if (stat(dest.s, &sb) == 0 && S_ISDIR(sb.st_mode)) { + LM_DBG("dir [%s] already existing\n", dest.s); + } else if(mkdir(dest.s, S_IRWXO | S_IXGRP | S_IRWXU) < 0) { LM_ERR("failed to make directory: %s\n", strerror(errno)); return; }

1 0

[kamailio/kamailio] Evaluate deprecation of function t_newtran() (#2155)
by pwakano 28 Nov '19

28 Nov '19

### Description It was discovered that the function t_newtran() is causing a conflict with the transaction flags. When calling it before setting transaction flags, the flags are apparently lost, so for instance when using the ACC module, if the ACC flags are set after the t_newtran, these flags seems to get lost and no ACC entries are saved.... Some discussion around the t_newtran usage was already held in the past and it seems the function is not needed anymore to help detecting retransmissions, given the t_precheck_trans() can do this job without having to have an early creation of the transaction. Not sure if the t_newtran is necessary in any other scenario, but if it is not I think it should be deprecated. ### Reproduction Create simple script which uses ACC and the setflag to save ACC entries in DB. Verify ACC records are being saved properly. Before calling the setflag(), add a call to t_newtran(). Make calls and check ACC records are not saved anymore. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.2.2 (x86_64/linux) 67f967 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: 67f967 compiled on 11:40:41 Mar 11 2019 with gcc 4.8.5 ``` * **Operating System**:  ``` # cat /etc/centos-release CentOS Linux release 7.7.1908 (Core) # uname -a Linux dev1-sbc-01 3.10.0-1062.1.1.el7.x86_64 #1 SMP Fri Sep 13 22:55:44 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/2155

2 2

[kamailio/kamailio] Kamailio xavp_contact - Segmentation Fault (#2153)
by iliesh 27 Nov '19

27 Nov '19

Hello, Kamailio is crashing when I'm trying to set the parameter; `modparam("tm|usrloc", "xavp_contact", "ulattrs") ` The crash is happening when I'm register 2 devices with the same extension. This is the core dump: #### Reproduction Set the following parameter: `modparam("tm|usrloc", "xavp_contact", "ulattrs") ` and register the same extension from 2 different devices. Then send an message to them (NOTIFY/OPTION/INVITE etc) #### Debugging Data [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Core was generated by `/usr/local/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f /usr/local/etc/ka'. Program terminated with signal 11, Segmentation fault. #0 0x000000000057cca2 in xavp_get_internal (name=0x8, list=0x0, idx=0, prv=0x0) at core/xavp.c:288 288 core/xavp.c: No such file or directory. (gdb) bt #0 0x000000000057cca2 in xavp_get_internal (name=0x8, list=0x0, idx=0, prv=0x0) at core/xavp.c:288 #1 0x0000000000581869 in xavp_insert (xavp=0x0, idx=0, list=0x0) at core/xavp.c:752 #2 0x00007f05be0ee3a1 in ki_t_next_contacts (msg=0x7f05cb76c218) at t_serial.c:552 #3 0x00007f05be0f09e8 in t_next_contacts (msg=0x7f05cb76c218, key=0x0, value=0x0) at t_serial.c:756 #4 0x0000000000434d41 in do_action (h=0x7ffe93c9cad0, a=0x7f05cb642250, msg=0x7f05cb76c218) at core/action.c:1067 #5 0x00000000004418e8 in run_actions (h=0x7ffe93c9cad0, a=0x7f05cb642250, msg=0x7f05cb76c218) at core/action.c:1572 #6 0x0000000000441fa9 in run_actions_safe (h=0x7ffe93c9de90, a=0x7f05cb642250, msg=0x7f05cb76c218) at core/action.c:1636 #7 0x000000000065734e in rval_get_int (h=0x7ffe93c9de90, msg=0x7f05cb76c218, i=0x7ffe93c9cf78, rv=0x7f05cb642570, cache=0x0) at core/rvalue.c:912 #8 0x000000000065b8fe in rval_expr_eval_int (h=0x7ffe93c9de90, msg=0x7f05cb76c218, res=0x7ffe93c9cf78, rve=0x7f05cb642568) at core/rvalue.c:1910 #9 0x000000000065bd51 in rval_expr_eval_int (h=0x7ffe93c9de90, msg=0x7f05cb76c218, res=0x7ffe93c9d42c, rve=0x7f05cb642c98) at core/rvalue.c:1918 #10 0x0000000000434807 in do_action (h=0x7ffe93c9de90, a=0x7f05cb645028, msg=0x7f05cb76c218) at core/action.c:1043 #11 0x00000000004418e8 in run_actions (h=0x7ffe93c9de90, a=0x7f05cb637e48, msg=0x7f05cb76c218) at core/action.c:1572 #12 0x0000000000431767 in do_action (h=0x7ffe93c9de90, a=0x7f05cb583858, msg=0x7f05cb76c218) at core/action.c:691 #13 0x00000000004418e8 in run_actions (h=0x7ffe93c9de90, a=0x7f05cb574750, msg=0x7f05cb76c218) at core/action.c:1572 #14 0x0000000000442071 in run_top_route (a=0x7f05cb574750, msg=0x7f05cb76c218, c=0x0) at core/action.c:1657 #15 0x00000000005874a9 in receive_msg (buf=0xa6ec00 <buf.6868> "OPTIONS sip:10 at 192.168.0.231:5060 SIP/2.0\r\nVia: SIP/2.0/UDP 192.168.0.231;branch=z9hG4bKd8a9.1b3abe656532065414a2f35a8916008d.1\r\nVia: SIP/2.0/UDP 192.168.0.131:5060;received=192.168.0.131;branch=z9hG"..., len=694, rcv_info=0x7ffe93c9e4d0) at core/receive.c:341 #16 0x000000000047bf81 in udp_rcv_loop () at core/udp_server.c:541 #17 0x0000000000424f9d in main_loop () at main.c:1669 #18 0x000000000042c688 in main (argc=13, argv=0x7ffe93c9ea18) at main.c:2710 ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.5 (x86_64/linux) 18444d ``` * **Operating System**:  ``` Linux 3.10.0-1062.4.3.el7.x86_64 #1 SMP Wed Nov 13 23:58:53 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux CentOS 7``` -- 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/2153

2 2

git:5.2:ca4d105c: core: safety checks for xavp operations
by Daniel-Constantin Mierla 27 Nov '19

27 Nov '19

Module: kamailio Branch: 5.2 Commit: ca4d105c8b9718138e0d6a62b81cdf2d63470712 URL: https://github.com/kamailio/kamailio/commit/ca4d105c8b9718138e0d6a62b81cdf2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-27T20:33:11+01:00 core: safety checks for xavp operations (cherry picked from commit 1067abf87cdaabc9557a99b36ad60e2349e16fa5) (cherry picked from commit 7e5b726ec106fcc06f9ed406570b3f5fea72bd7e) --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/ca4d105c8b9718138e0d6a62b81cdf2… Patch: https://github.com/kamailio/kamailio/commit/ca4d105c8b9718138e0d6a62b81cdf2… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index c758a98099..44ab3ac3ed 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -54,6 +54,9 @@ void xavp_shm_free_unsafe(void *p) void xavp_free(sr_xavp_t *xa) { + if(xa==NULL) { + return; + } if(xa->val.type == SR_XTYPE_DATA) { if(xa->val.v.data!=NULL && xa->val.v.data->pfree!=NULL) { xa->val.v.data->pfree(xa->val.v.data->p, xavp_shm_free); @@ -67,6 +70,9 @@ void xavp_free(sr_xavp_t *xa) void xavp_free_unsafe(sr_xavp_t *xa) { + if(xa==NULL) { + return; + } if(xa->val.type == SR_XTYPE_DATA) { if(xa->val.v.data!=NULL && xa->val.v.data->pfree!=NULL) { xa->val.v.data->pfree(xa->val.v.data->p, xavp_shm_free_unsafe); @@ -114,8 +120,9 @@ static sr_xavp_t *xavp_new_value(str *name, sr_xval_t *val) int xavp_add(sr_xavp_t *xavp, sr_xavp_t **list) { - if (xavp==NULL) + if (xavp==NULL) { return -1; + } /* Prepend new xavp to the list */ if(list) { xavp->next = *list; @@ -133,8 +140,9 @@ int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list) sr_xavp_t *prev; sr_xavp_t *crt; - if (xavp==NULL) + if (xavp==NULL) { return -1; + } crt = xavp_get_internal(&xavp->name, list, 0, 0); @@ -164,6 +172,10 @@ int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list) int xavp_add_after(sr_xavp_t *nxavp, sr_xavp_t *pxavp) { + if (nxavp==NULL) { + return -1; + } + if(pxavp==NULL) { nxavp->next = *_xavp_list_crt; *_xavp_list_crt = nxavp; @@ -288,7 +300,7 @@ static sr_xavp_t *xavp_get_internal(str *name, sr_xavp_t **list, int idx, sr_xav if(name==NULL || name->s==NULL) return NULL; id = get_hash1_raw(name->s, name->len); - + if(list && *list) avp = *list; else @@ -325,7 +337,7 @@ sr_xavp_t *xavp_get_next(sr_xavp_t *start) if(start==NULL) return NULL; - + avp = start->next; while(avp) { @@ -455,7 +467,7 @@ int xavp_count(str *name, sr_xavp_t **start) if(name==NULL || name->s==NULL) return -1; id = get_hash1_raw(name->s, name->len); - + if(start) avp = *start; else @@ -507,7 +519,7 @@ void xavp_destroy_list(sr_xavp_t **head) void xavp_reset_list(void) { assert(_xavp_list_crt!=0 ); - + if (_xavp_list_crt!=&_xavp_list_head) _xavp_list_crt=&_xavp_list_head; xavp_destroy_list(_xavp_list_crt); @@ -517,7 +529,7 @@ void xavp_reset_list(void) sr_xavp_t **xavp_set_list(sr_xavp_t **head) { sr_xavp_t **avp; - + assert(_xavp_list_crt!=0); avp = _xavp_list_crt; @@ -749,6 +761,10 @@ int xavp_insert(sr_xavp_t *xavp, int idx, sr_xavp_t **list) int n = 0; int i = 0; + if(xavp==NULL) { + return -1; + } + crt = xavp_get_internal(&xavp->name, list, 0, NULL); if (idx == 0 && (!crt || crt->val.type != SR_XTYPE_NULL)) @@ -814,7 +830,7 @@ sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list) avp->next = NULL; } } - + return avp; }

1 0

git:5.3:7e5b726e: core: safety checks for xavp operations
by Daniel-Constantin Mierla 27 Nov '19

27 Nov '19

Module: kamailio Branch: 5.3 Commit: 7e5b726ec106fcc06f9ed406570b3f5fea72bd7e URL: https://github.com/kamailio/kamailio/commit/7e5b726ec106fcc06f9ed406570b3f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-27T20:30:17+01:00 core: safety checks for xavp operations (cherry picked from commit 1067abf87cdaabc9557a99b36ad60e2349e16fa5) --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/7e5b726ec106fcc06f9ed406570b3f5… Patch: https://github.com/kamailio/kamailio/commit/7e5b726ec106fcc06f9ed406570b3f5… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index e5e33f6e9d..7351d830bd 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -52,6 +52,9 @@ void xavp_shm_free_unsafe(void *p) void xavp_free(sr_xavp_t *xa) { + if(xa==NULL) { + return; + } if(xa->val.type == SR_XTYPE_DATA) { if(xa->val.v.data!=NULL && xa->val.v.data->pfree!=NULL) { xa->val.v.data->pfree(xa->val.v.data->p, xavp_shm_free); @@ -69,6 +72,9 @@ void xavp_free(sr_xavp_t *xa) void xavp_free_unsafe(sr_xavp_t *xa) { + if(xa==NULL) { + return; + } if(xa->val.type == SR_XTYPE_DATA) { if(xa->val.v.data!=NULL && xa->val.v.data->pfree!=NULL) { xa->val.v.data->pfree(xa->val.v.data->p, xavp_shm_free_unsafe); @@ -122,8 +128,9 @@ static sr_xavp_t *xavp_new_value(str *name, sr_xval_t *val) int xavp_add(sr_xavp_t *xavp, sr_xavp_t **list) { - if (xavp==NULL) + if (xavp==NULL) { return -1; + } /* Prepend new xavp to the list */ if(list) { xavp->next = *list; @@ -141,8 +148,9 @@ int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list) sr_xavp_t *prev; sr_xavp_t *crt; - if (xavp==NULL) + if (xavp==NULL) { return -1; + } crt = xavp_get_internal(&xavp->name, list, 0, 0); @@ -172,6 +180,10 @@ int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list) int xavp_add_after(sr_xavp_t *nxavp, sr_xavp_t *pxavp) { + if (nxavp==NULL) { + return -1; + } + if(pxavp==NULL) { nxavp->next = *_xavp_list_crt; *_xavp_list_crt = nxavp; @@ -296,7 +308,7 @@ static sr_xavp_t *xavp_get_internal(str *name, sr_xavp_t **list, int idx, sr_xav if(name==NULL || name->s==NULL) return NULL; id = get_hash1_raw(name->s, name->len); - + if(list && *list) avp = *list; else @@ -333,7 +345,7 @@ sr_xavp_t *xavp_get_next(sr_xavp_t *start) if(start==NULL) return NULL; - + avp = start->next; while(avp) { @@ -477,7 +489,7 @@ int xavp_count(str *name, sr_xavp_t **start) if(name==NULL || name->s==NULL) return -1; id = get_hash1_raw(name->s, name->len); - + if(start) avp = *start; else @@ -529,7 +541,7 @@ void xavp_destroy_list(sr_xavp_t **head) void xavp_reset_list(void) { assert(_xavp_list_crt!=0 ); - + if (_xavp_list_crt!=&_xavp_list_head) _xavp_list_crt=&_xavp_list_head; xavp_destroy_list(_xavp_list_crt); @@ -539,7 +551,7 @@ void xavp_reset_list(void) sr_xavp_t **xavp_set_list(sr_xavp_t **head) { sr_xavp_t **avp; - + assert(_xavp_list_crt!=0); avp = _xavp_list_crt; @@ -775,6 +787,10 @@ int xavp_insert(sr_xavp_t *xavp, int idx, sr_xavp_t **list) int n = 0; int i = 0; + if(xavp==NULL) { + return -1; + } + crt = xavp_get_internal(&xavp->name, list, 0, NULL); if (idx == 0 && (!crt || crt->val.type != SR_XTYPE_NULL)) @@ -840,7 +856,7 @@ sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list) avp->next = NULL; } } - + return avp; }

1 0

git:master:1067abf8: core: safety checks for xavp operations
by Daniel-Constantin Mierla 27 Nov '19

27 Nov '19

Module: kamailio Branch: master Commit: 1067abf87cdaabc9557a99b36ad60e2349e16fa5 URL: https://github.com/kamailio/kamailio/commit/1067abf87cdaabc9557a99b36ad60e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-27T20:28:49+01:00 core: safety checks for xavp operations --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/1067abf87cdaabc9557a99b36ad60e2… Patch: https://github.com/kamailio/kamailio/commit/1067abf87cdaabc9557a99b36ad60e2… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index f279def1ed..0899cb308a 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -52,6 +52,9 @@ void xavp_shm_free_unsafe(void *p) void xavp_free(sr_xavp_t *xa) { + if(xa==NULL) { + return; + } if(xa->val.type == SR_XTYPE_DATA) { if(xa->val.v.data!=NULL && xa->val.v.data->pfree!=NULL) { xa->val.v.data->pfree(xa->val.v.data->p, xavp_shm_free); @@ -69,6 +72,9 @@ void xavp_free(sr_xavp_t *xa) void xavp_free_unsafe(sr_xavp_t *xa) { + if(xa==NULL) { + return; + } if(xa->val.type == SR_XTYPE_DATA) { if(xa->val.v.data!=NULL && xa->val.v.data->pfree!=NULL) { xa->val.v.data->pfree(xa->val.v.data->p, xavp_shm_free_unsafe); @@ -122,8 +128,9 @@ static sr_xavp_t *xavp_new_value(str *name, sr_xval_t *val) int xavp_add(sr_xavp_t *xavp, sr_xavp_t **list) { - if (xavp==NULL) + if (xavp==NULL) { return -1; + } /* Prepend new xavp to the list */ if(list) { xavp->next = *list; @@ -141,8 +148,9 @@ int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list) sr_xavp_t *prev; sr_xavp_t *crt; - if (xavp==NULL) + if (xavp==NULL) { return -1; + } crt = xavp_get_internal(&xavp->name, list, 0, 0); @@ -172,6 +180,10 @@ int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list) int xavp_add_after(sr_xavp_t *nxavp, sr_xavp_t *pxavp) { + if (nxavp==NULL) { + return -1; + } + if(pxavp==NULL) { nxavp->next = *_xavp_list_crt; *_xavp_list_crt = nxavp; @@ -296,7 +308,7 @@ static sr_xavp_t *xavp_get_internal(str *name, sr_xavp_t **list, int idx, sr_xav if(name==NULL || name->s==NULL) return NULL; id = get_hash1_raw(name->s, name->len); - + if(list && *list) avp = *list; else @@ -333,7 +345,7 @@ sr_xavp_t *xavp_get_next(sr_xavp_t *start) if(start==NULL) return NULL; - + avp = start->next; while(avp) { @@ -477,7 +489,7 @@ int xavp_count(str *name, sr_xavp_t **start) if(name==NULL || name->s==NULL) return -1; id = get_hash1_raw(name->s, name->len); - + if(start) avp = *start; else @@ -529,7 +541,7 @@ void xavp_destroy_list(sr_xavp_t **head) void xavp_reset_list(void) { assert(_xavp_list_crt!=0 ); - + if (_xavp_list_crt!=&_xavp_list_head) _xavp_list_crt=&_xavp_list_head; xavp_destroy_list(_xavp_list_crt); @@ -539,7 +551,7 @@ void xavp_reset_list(void) sr_xavp_t **xavp_set_list(sr_xavp_t **head) { sr_xavp_t **avp; - + assert(_xavp_list_crt!=0); avp = _xavp_list_crt; @@ -780,6 +792,10 @@ int xavp_insert(sr_xavp_t *xavp, int idx, sr_xavp_t **list) int n = 0; int i = 0; + if(xavp==NULL) { + return -1; + } + crt = xavp_get_internal(&xavp->name, list, 0, NULL); if (idx == 0 && (!crt || crt->val.type != SR_XTYPE_NULL)) @@ -845,7 +861,7 @@ sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list) avp->next = NULL; } } - + return avp; }

1 0

git:master:dd4f2fce: nathelper: use set_alias_to_pv() for kemi export name
by Daniel-Constantin Mierla 27 Nov '19

27 Nov '19

Module: kamailio Branch: master Commit: dd4f2fceb25bf9536a0b6239d49d15f3ded97f5d URL: https://github.com/kamailio/kamailio/commit/dd4f2fceb25bf9536a0b6239d49d15f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-27T20:15:39+01:00 nathelper: use set_alias_to_pv() for kemi export name - same as for config export - helper functions renamed to reflect better their purpose --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/dd4f2fceb25bf9536a0b6239d49d15f… Patch: https://github.com/kamailio/kamailio/commit/dd4f2fceb25bf9536a0b6239d49d15f… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index aae1791b94..c5100a466f 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -127,8 +127,8 @@ static int test_sdp_cline(struct sip_msg *msg); static int w_set_alias_to_pv(struct sip_msg *msg, char *uri_avp, char *hollow); static int ki_set_alias_to_pv(struct sip_msg *msg, str *uri_avp); -static int alias_to_uri(str *contact_header, str *alias_uri); -static int write_to_avp(struct sip_msg *msg, str *data, str *uri_avp); +static int nh_alias_to_uri(str *contact_header, str *alias_uri); +static int nh_write_to_pv(struct sip_msg *msg, str *data, str *pvname); static void nh_timer(unsigned int, void *); static int mod_init(void); @@ -2460,7 +2460,8 @@ static int sel_rewrite_contact(str *res, select_t *s, struct sip_msg *msg) * * @result 1 successful , -1 fail */ -static int w_set_alias_to_pv(struct sip_msg *msg, char *uri_avp, char *hollow){ +static int w_set_alias_to_pv(struct sip_msg *msg, char *uri_avp, char *hollow) +{ str dest_avp={0,0}; if(!uri_avp) @@ -2481,7 +2482,8 @@ static int w_set_alias_to_pv(struct sip_msg *msg, char *uri_avp, char *hollow){ * * @result 1 successful , -1 fail */ -static int ki_set_alias_to_pv(struct sip_msg *msg, str *uri_avp){ +static int ki_set_alias_to_pv(struct sip_msg *msg, str *pvname) +{ str contact; str alias_uri={0,0}; @@ -2503,10 +2505,10 @@ static int ki_set_alias_to_pv(struct sip_msg *msg, str *uri_avp){ contact.s = ((contact_body_t *)msg->contact->parsed)->contacts->name.s; contact.len = ((contact_body_t *)msg->contact->parsed)->contacts->len; - if(alias_to_uri(&contact,&alias_uri)<0) + if(nh_alias_to_uri(&contact, &alias_uri)<0) return -1; - if(write_to_avp(msg, &alias_uri, uri_avp)<0) + if(nh_write_to_pv(msg, &alias_uri, pvname)<0) goto error; if(alias_uri.s) @@ -2518,19 +2520,20 @@ static int ki_set_alias_to_pv(struct sip_msg *msg, str *uri_avp){ if(alias_uri.s) pkg_free(alias_uri.s); - return -1; + return -1; } /*! -* @function write_to_avp -* @abstract write_to_avp function writes data to given avp +* @function nh_write_to_pv +* @abstract nh_write_to_pv function writes data to given avp * @param data source data * @param uri_avp destination avp name * @result 1 successful , -1 fail */ -static int write_to_avp(struct sip_msg *msg, str *data, str *uri_avp){ +static int nh_write_to_pv(struct sip_msg *msg, str *data, str *pvname) +{ pv_spec_t *pvresult = NULL; pv_value_t valx; - pvresult = pv_cache_get(uri_avp); + pvresult = pv_cache_get(pvname); if(pvresult == NULL) { LM_ERR("Failed to malloc destination pseudo-variable \n"); @@ -2538,7 +2541,8 @@ static int write_to_avp(struct sip_msg *msg, str *data, str *uri_avp){ } if(pvresult->setf==NULL) { - LM_ERR("Destination pseudo-variable is not writable: [%.*s] \n",uri_avp->len, uri_avp->s); + LM_ERR("Destination pseudo-variable is not writable: [%.*s] \n", + pvname->len, pvname->s); return -1; } memset(&valx, 0, sizeof(pv_value_t)); @@ -2557,14 +2561,15 @@ static int write_to_avp(struct sip_msg *msg, str *data, str *uri_avp){ return 1; } /*! -* @function alias_to_uri +* @function nh_alias_to_uri * @abstract select alias paramter from contact_header * then writes to alias_uri * @param contact_header Source contact header * @param alias_uri Destination string * @result 1 successful , -1 fail */ -static int alias_to_uri(str *contact_header, str *alias_uri){ +static int nh_alias_to_uri(str *contact_header, str *alias_uri) +{ int i=0; // index str host={0,0}; str port={0,0}; @@ -2700,7 +2705,7 @@ static sr_kemi_t sr_kemi_nathelper_exports[] = { { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("nathelper"), str_init("set_alias_to_avp"), + { str_init("nathelper"), str_init("set_alias_to_pv"), SR_KEMIP_INT, ki_set_alias_to_pv, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }

1 0

git:master:063e6a02: core: increase SHM memory pool to 128 MB
by Henning Westerholt 27 Nov '19

27 Nov '19

Module: kamailio Branch: master Commit: 063e6a025b8ca0163af2147f057d29447c6f9760 URL: https://github.com/kamailio/kamailio/commit/063e6a025b8ca0163af2147f057d294… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-23T22:49:28+01:00 core: increase SHM memory pool to 128 MB - increase SHM memory pool to 128 MB - even an embedded system like Raspberry Pi has 1 GB RAM nowadays - make it less likely that new users run into issues because of lack of memory --- Modified: src/core/config.h --- Diff: https://github.com/kamailio/kamailio/commit/063e6a025b8ca0163af2147f057d294… Patch: https://github.com/kamailio/kamailio/commit/063e6a025b8ca0163af2147f057d294… --- diff --git a/src/core/config.h b/src/core/config.h index 0eda20302b..96196a0224 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -142,7 +142,7 @@ #endif #define PKG_MEM_POOL_SIZE PKG_MEM_SIZE*1024*1024 /*!< used only if PKG_MALLOC is defined*/ -#define SHM_MEM_SIZE 64 /*!< used if SH_MEM is defined*/ +#define SHM_MEM_SIZE 128 /*!< used if SH_MEM is defined*/ #define SHM_MEM_POOL_SIZE SHM_MEM_SIZE*1024*1024 /* dimensioning buckets in q_malloc */

2 5

← Newer
1
...
13
14
15
16
17
18
19
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2019