sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
410 discussions

[kamailio/kamailio] pua_reginfo: use outbound proxy for PUBLISHes (#1176)

by Vasiliy Ganchev

Hi, guys! Pua module provides a callback "send_publish". One of the parameters is "outbound_proxy", but pua_reginfo does not use it, even if the parameter is specified. Documentation says: "The outbound_proxy uri to be used when sending Subscribe requests." Any reason to use it only for SUBSCRIBE, and not for PUBLISH? If PR is acceptable, do I need to correct documentation for pua_reginfo module? I have studied the contributing gide, but if something is not OK - please point out,. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1176 -- Commit Summary -- * Update usrloc_cb.c -- File Changes -- M src/modules/pua_reginfo/usrloc_cb.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1176.patch https://github.com/kamailio/kamailio/pull/1176.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/1176

7 years, 5 months

git:master:8eb84f76: core: parse rr - reset head in case of parse error

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8eb84f76a6d52598bb2fd5d13b96fba4c6326b7f URL: https://github.com/kamailio/kamailio/commit/8eb84f76a6d52598bb2fd5d13b96fba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-03T14:58:59+02:00 core: parse rr - reset head in case of parse error - avoid acessing an invalid pointer - proper support if trying to parse into an existing rr list in a second attempt (not the case so far) --- Modified: src/core/parser/parse_rr.c --- Diff: https://github.com/kamailio/kamailio/commit/8eb84f76a6d52598bb2fd5d13b96fba… Patch: https://github.com/kamailio/kamailio/commit/8eb84f76a6d52598bb2fd5d13b96fba… --- diff --git a/src/core/parser/parse_rr.c b/src/core/parser/parse_rr.c index 4fb32b0265..5740461f6c 100644 --- a/src/core/parser/parse_rr.c +++ b/src/core/parser/parse_rr.c @@ -55,6 +55,13 @@ static inline int do_parse_rr_body(char *buf, int len, rr_t **head) trim_leading(&s); last = 0; + if (*head) { + /* go to last rr in list */ + last = *head; + while (last->next) { + last = last->next; + } + } while(1) { /* Allocate and clear rr structure */ @@ -128,7 +135,8 @@ static inline int do_parse_rr_body(char *buf, int len, rr_t **head) error: if (r) free_rr(&r); - free_rr(head); /* Free any contacts created so far */ + free_rr(head); /* Free any rr created so far */ + *head = NULL; LM_ERR("Failed parsing rr header body [%.*s]\n", len, ZSW(buf)); return -1;

7 years, 5 months

git:master:dbd52dac: core: avoid accessing freed structure in case of duplicated listen addresses

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: dbd52dacae17eca5a48359c605a2d93607b7c041 URL: https://github.com/kamailio/kamailio/commit/dbd52dacae17eca5a48359c605a2d93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-03T14:42:03+02:00 core: avoid accessing freed structure in case of duplicated listen addresses --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/dbd52dacae17eca5a48359c605a2d93… Patch: https://github.com/kamailio/kamailio/commit/dbd52dacae17eca5a48359c605a2d93… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 62a15f4c93..8344c950f2 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1597,7 +1597,7 @@ static int fix_socket_list(struct socket_info **list, int* type_flags) ail=ail_next; continue; } - /* 2. check if the extra addresses contain a duplicates for + /* 2. check if the extra addresses contain a duplicates for * other addresses in the same list */ for (tmp_ail=ail->next; tmp_ail;){ tmp_ail_next=tmp_ail->next; @@ -1614,6 +1614,9 @@ static int fix_socket_list(struct socket_info **list, int* type_flags) si->port_no, si->proto); /* remove tmp_ail*/ addr_info_listrm(&si->addr_info_lst, tmp_ail); + if(ail_next==tmp_ail) { + ail_next = tmp_ail_next; + } free_addr_info(tmp_ail); } tmp_ail=tmp_ail_next;

7 years, 5 months

[kamailio/kamailio] Kamailio does not set the right advertised RR (#1174)

by Sam

Using latest master commit. Running on AWS EC2 with elastic IP. If using advertised_address="ELASTICIP" the VIA headers etc get changed correctly but the record route header does not, it still uses the internal IP of the host. If I add: listen=udp:0.0.0.0:5060 advertise ELASTICIP:5060 The RR advertises the correct IP. According to the documentation here: https://www.kamailio.org/wiki/cookbooks/5.0.x/core#advertised_address It should be enough with the advertised_address parameter. Hence, seems to be a problem with the advertised_address parameter. -- 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/1174

7 years, 5 months

git:master:b95e5363: enum: fixed code for country code length

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b95e536335083ee6f1f67e2007463ac7e8403ec8 URL: https://github.com/kamailio/kamailio/commit/b95e536335083ee6f1f67e2007463ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-03T11:53:21+02:00 enum: fixed code for country code length --- Modified: src/modules/enum/enum.c --- Diff: https://github.com/kamailio/kamailio/commit/b95e536335083ee6f1f67e2007463ac… Patch: https://github.com/kamailio/kamailio/commit/b95e536335083ee6f1f67e2007463ac… --- diff --git a/src/modules/enum/enum.c b/src/modules/enum/enum.c index c8dcdc3751..55c2245685 100644 --- a/src/modules/enum/enum.c +++ b/src/modules/enum/enum.c @@ -82,7 +82,7 @@ static int cclen(const char *number) d1 = number[0]; d2 = number[1]; - if(!isdigit((int)d2)) + if(!isdigit((int)d1) || !isdigit((int)d2)) return (0); switch(d1) { @@ -90,13 +90,13 @@ static int cclen(const char *number) case '7': return (1); case '2': - if((d2 == '0') || (d1 == '7')) + if((d2 == '0') || (d2 == '7')) return (2); break; case '3': - if((d2 >= '0') && (d1 <= '4')) + if((d2 >= '0') && (d2 <= '4')) return (2); - if((d2 == '6') || (d1 == '9')) + if((d2 == '6') || (d2 == '9')) return (2); break; case '4': @@ -104,19 +104,19 @@ static int cclen(const char *number) return (2); break; case '5': - if((d2 >= '1') && (d1 <= '8')) + if((d2 >= '1') && (d2 <= '8')) return (2); break; case '6': - if(d1 <= '6') + if(d2 <= '6') return (2); break; case '8': - if((d2 == '1') || (d1 == '2') || (d1 == '4') || (d1 == '6')) + if((d2 == '1') || (d2 == '2') || (d2 == '4') || (d2 == '6')) return (2); break; case '9': - if(d1 <= '5') + if(d2 <= '5') return (2); if(d2 == '8') return (2);

7 years, 5 months

git:master:366104d2: seas: avoid double free and leak

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 366104d2f79ccfa65850cd2e3bfb5ed8be467bc2 URL: https://github.com/kamailio/kamailio/commit/366104d2f79ccfa65850cd2e3bfb5ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-03T11:45:26+02:00 seas: avoid double free and leak --- Modified: src/modules/seas/seas_action.c Modified: src/modules/seas/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/366104d2f79ccfa65850cd2e3bfb5ed… Patch: https://github.com/kamailio/kamailio/commit/366104d2f79ccfa65850cd2e3bfb5ed… --- diff --git a/src/modules/seas/seas_action.c b/src/modules/seas/seas_action.c index 3258ffe328..3cb5513fbd 100644 --- a/src/modules/seas/seas_action.c +++ b/src/modules/seas/seas_action.c @@ -518,7 +518,7 @@ int ac_cancel(as_p the_as,unsigned char processor_id,unsigned int flags,char *ac if(headers.s) pkg_free(headers.s); if(body.s) - pkg_free(headers.s); + pkg_free(body.s); if(my_msg){ if(my_msg->headers) free_hdr_field_lst(my_msg->headers); diff --git a/src/modules/seas/utils.c b/src/modules/seas/utils.c index 367ba7413e..76c2c6af5e 100644 --- a/src/modules/seas/utils.c +++ b/src/modules/seas/utils.c @@ -90,6 +90,7 @@ int buffered_printer(FILE* infd) printf("PARSED:%d,last=%d,end=%d\n",k++,last,end); free_sip_msg(&msg); pkg_free(missatge); + missatge = NULL; memmove(mybuffer,&mybuffer[end],1400-end); last=1400-end; }

7 years, 5 months

git:master:b3030a29: enum: free variable in case of error and safety check for returned pointer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b3030a2965889a788093b2c372c1d7ac9441e8cc URL: https://github.com/kamailio/kamailio/commit/b3030a2965889a788093b2c372c1d7a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-03T10:57:21+02:00 enum: free variable in case of error and safety check for returned pointer --- Modified: src/modules/enum/enum.c --- Diff: https://github.com/kamailio/kamailio/commit/b3030a2965889a788093b2c372c1d7a… Patch: https://github.com/kamailio/kamailio/commit/b3030a2965889a788093b2c372c1d7a… --- diff --git a/src/modules/enum/enum.c b/src/modules/enum/enum.c index e4cb1699ac..c8dcdc3751 100644 --- a/src/modules/enum/enum.c +++ b/src/modules/enum/enum.c @@ -405,6 +405,11 @@ int is_from_user_enum_helper(sip_msg_t *_msg, str *suffix, str *service) zp = 0; proto = PROTO_NONE; he = sip_resolvehost(&luri.host, &zp, &proto); + if(he==NULL) { + LM_ERR("failed to resolve the host\n"); + free_rdata_list(head); /*clean up*/ + return -8; + } hostent2ip_addr(&addr, he, 0); @@ -948,11 +953,13 @@ int i_enum_query_helper(sip_msg_t *_msg, str *suffix, str *service) if((ebl->apex_len > MAX_COMPONENT_SIZE) || (ebl->separator_len > MAX_COMPONENT_SIZE)) { LM_ERR("EBL strings too long\n"); + free_rdata_list(head); return -1; } if(ebl->position > 15) { LM_ERR("EBL position too large (%d)\n", ebl->position); + free_rdata_list(head); return -1; } @@ -1306,4 +1313,4 @@ int ki_enum_pv_query_suffix_service(sip_msg_t *msg, str *ve164, str *vsuffix, str *vservice) { return enum_pv_query_helper(msg, ve164, vsuffix, vservice); -} \ No newline at end of file +}

7 years, 5 months

git:master:8b0a42ab: rr: use macro to get parsed From in record_route_preset()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8b0a42ab64c02a1fa253ce156442bab64a4fe3db URL: https://github.com/kamailio/kamailio/commit/8b0a42ab64c02a1fa253ce156442bab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-03T10:03:18+02:00 rr: use macro to get parsed From in record_route_preset() - safety check for parsed pointer --- Modified: src/modules/rr/record.c --- Diff: https://github.com/kamailio/kamailio/commit/8b0a42ab64c02a1fa253ce156442bab… Patch: https://github.com/kamailio/kamailio/commit/8b0a42ab64c02a1fa253ce156442bab… --- diff --git a/src/modules/rr/record.c b/src/modules/rr/record.c index df7f95553d..0d042b2d36 100644 --- a/src/modules/rr/record.c +++ b/src/modules/rr/record.c @@ -529,12 +529,12 @@ int record_route_preset(struct sip_msg* _m, str* _data) } if (append_fromtag) { - if (parse_from_header(_m) < 0) { + if (parse_from_header(_m) < 0 || get_from(_m)==NULL) { LM_ERR("From parsing failed\n"); ret = -2; goto error; } - from = (struct to_body*)_m->from->parsed; + from = get_from(_m); } l = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, HDR_RECORDROUTE_T);

7 years, 5 months

git:master:72dc534a: core: mem/dl_malloc - fix preprocessor branch comment

by Mikko Lehto

Module: kamailio Branch: master Commit: 72dc534a91cd7d6cb5c432f7a0e9db9eb8d77c35 URL: https://github.com/kamailio/kamailio/commit/72dc534a91cd7d6cb5c432f7a0e9db9… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-03T08:45:56+03:00 core: mem/dl_malloc - fix preprocessor branch comment --- Modified: src/core/mem/dl_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/72dc534a91cd7d6cb5c432f7a0e9db9… Patch: https://github.com/kamailio/kamailio/commit/72dc534a91cd7d6cb5c432f7a0e9db9… --- diff --git a/src/core/mem/dl_malloc.c b/src/core/mem/dl_malloc.c index c4b0b21448..8752e5d9da 100644 --- a/src/core/mem/dl_malloc.c +++ b/src/core/mem/dl_malloc.c @@ -1192,7 +1192,7 @@ int mspace_mallopt(int, int); extern void* sbrk(ptrdiff_t); #endif /* FreeBSD etc */ #endif /* LACKS_UNISTD_H */ -#endif /* HAVE_MMAP */ +#endif /* HAVE_MORECORE */ #ifndef WIN32 #ifndef malloc_getpagesize

7 years, 5 months

git:master:ff2e0d96: core: dns cachec- safety check in log message before abort

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ff2e0d96a50eadf4e872865d43f0fbe15aef18bd URL: https://github.com/kamailio/kamailio/commit/ff2e0d96a50eadf4e872865d43f0fbe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-02T12:22:33+02:00 core: dns cachec- safety check in log message before abort --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/ff2e0d96a50eadf4e872865d43f0fbe… Patch: https://github.com/kamailio/kamailio/commit/ff2e0d96a50eadf4e872865d43f0fbe… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 3b0f5404c4..577eb48d1f 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -456,8 +456,10 @@ int init_dns_cache_stats(int iproc_num) LM_CRIT("%s: crt(%p, %p, %p)," \ " prev(%p, %p, %p), next(%p, %p, %p)\n", txt, \ (l), (l)->next, (l)->prev, \ - (l)->prev, (l)->prev->next, (l)->prev->prev, \ - (l)->next, (l)->next->next, (l)->next->prev \ + (l)->prev, ((l)->prev)?(l)->prev->next:NULL, \ + ((l)->prev)?(l)->prev->prev:NULL, \ + (l)->next, ((l)->next)?(l)->next->next:NULL, \ + ((l)->next)?(l)->next->prev:NULL \ ) #define debug_lu_lst( txt, l) \

7 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017