sr-dev November 2015

sr-dev@lists.kamailio.org

27 participants
315 discussions

[kamailio] add systemd support to deb packages (#294)

by zabbal

Right now kamailio.service is available in pkg/kamailio/fedora/17 but not in pkg/kamailio/deb. With both Ubuntu and Debian switched to systemd it would make sense to unify packaging and use .service for deb packages as well. In addition to give users chance to better test this before next LTS release it might make sense to add builds for ubuntu 15.04 too. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/294

8 years, 8 months

git:master:112406d8: pkg/kamailio/deb: add systemd support

by Victor Seva

Module: kamailio Branch: master Commit: 112406d8fa05b5d739bdf06565b77e3974200652 URL: https://github.com/kamailio/kamailio/commit/112406d8fa05b5d739bdf06565b77e3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-11-03T23:28:32+01:00 pkg/kamailio/deb: add systemd support Fix #294 --- Added: pkg/kamailio/deb/debian/kamailio.service Added: pkg/kamailio/deb/jessie/kamailio.service Added: pkg/kamailio/deb/sid/kamailio.service Added: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/squeeze Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/stretch/rules --- Diff: https://github.com/kamailio/kamailio/commit/112406d8fa05b5d739bdf06565b77e3… Patch: https://github.com/kamailio/kamailio/commit/112406d8fa05b5d739bdf06565b77e3…

8 years, 8 months

git:master:e9acce2d: pua_usrloc: removed local variables aliasing functions from pua api

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e9acce2d1bf295e1b6707fc1c16f53fc160978cb URL: https://github.com/kamailio/kamailio/commit/e9acce2d1bf295e1b6707fc1c16f53f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-03T23:06:14+01:00 pua_usrloc: removed local variables aliasing functions from pua api - use directly the pua bind structure, which was global already --- Modified: modules/pua_usrloc/pua_usrloc.c Modified: modules/pua_usrloc/pua_usrloc.h Modified: modules/pua_usrloc/ul_publish.c --- Diff: https://github.com/kamailio/kamailio/commit/e9acce2d1bf295e1b6707fc1c16f53f… Patch: https://github.com/kamailio/kamailio/commit/e9acce2d1bf295e1b6707fc1c16f53f… --- diff --git a/modules/pua_usrloc/pua_usrloc.c b/modules/pua_usrloc/pua_usrloc.c index f81a77b..e8044fe 100644 --- a/modules/pua_usrloc/pua_usrloc.c +++ b/modules/pua_usrloc/pua_usrloc.c @@ -64,7 +64,7 @@ int pua_ul_publish = 0; int pua_ul_bflag = -1; int pua_ul_bmask = 0; -pua_api_t pua; +pua_api_t _pu_pua; str pres_prefix= STR_NULL; /*! \brief Structure containing pointers to usrloc functions */ @@ -76,9 +76,6 @@ static int mod_init(void); int pua_set_publish(struct sip_msg* , char*, char*); -send_publish_t pua_send_publish; -send_subscribe_t pua_send_subscribe; - static cmd_export_t cmds[]= { {"pua_set_publish", (cmd_function)pua_set_publish, 0, 0, 0, REQUEST_ROUTE}, @@ -174,24 +171,22 @@ static int mod_init(void) return -1; } - if (bind_pua(&pua) < 0) + if (bind_pua(&_pu_pua) < 0) { LM_ERR("Can't bind pua\n"); return -1; } - if(pua.send_publish == NULL) + if(_pu_pua.send_publish == NULL) { LM_ERR("Could not import send_publish\n"); return -1; } - pua_send_publish= pua.send_publish; - if(pua.send_subscribe == NULL) + if(_pu_pua.send_subscribe == NULL) { LM_ERR("Could not import send_subscribe\n"); return -1; } - pua_send_subscribe= pua.send_subscribe; /* register post-script pua_unset_publish unset function */ if(register_script_cb(pua_unset_publish, POST_SCRIPT_CB|REQUEST_CB, 0)<0) diff --git a/modules/pua_usrloc/pua_usrloc.h b/modules/pua_usrloc/pua_usrloc.h index 452d8d6..66371e9 100644 --- a/modules/pua_usrloc/pua_usrloc.h +++ b/modules/pua_usrloc/pua_usrloc.h @@ -34,8 +34,6 @@ #define _PUA_UL_ #include "../pua/pua_bind.h" -extern send_publish_t pua_send_publish; -extern send_subscribe_t pua_send_subscribe; void ul_publish(ucontact_t* c, int type, void* param); int pua_unset_publish(struct sip_msg* msg, unsigned int flags, void* param); @@ -43,4 +41,5 @@ extern str pres_prefix; extern int pua_ul_bflag; extern int pua_ul_bmask; +extern pua_api_t _pu_pua; #endif diff --git a/modules/pua_usrloc/ul_publish.c b/modules/pua_usrloc/ul_publish.c index 566a9eb..beb5aa6 100644 --- a/modules/pua_usrloc/ul_publish.c +++ b/modules/pua_usrloc/ul_publish.c @@ -321,7 +321,7 @@ void ul_publish(ucontact_t* c, int type, void* param) publ->event|= PRESENCE_EVENT; publ->extra_headers= NULL; print_publ(publ); - if((error=pua_send_publish(publ))< 0) + if((error=_pu_pua.send_publish(publ))< 0) { LM_ERR("while sending publish for ul event %d\n", type); if((type & UL_CONTACT_UPDATE) && error == ERR_PUBLISH_NO_BODY) {

8 years, 8 months

git:master:b8458c65: ims_registrar_scscf: Safety check the length of the destination string

by Carsten Bock

Module: kamailio Branch: master Commit: b8458c65917c1b1fe9b94bae795dcdb75ecf4f07 URL: https://github.com/kamailio/kamailio/commit/b8458c65917c1b1fe9b94bae795dcdb… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-11-03T17:34:18+01:00 ims_registrar_scscf: Safety check the length of the destination string --- Modified: modules/ims_registrar_scscf/registrar_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/b8458c65917c1b1fe9b94bae795dcdb… Patch: https://github.com/kamailio/kamailio/commit/b8458c65917c1b1fe9b94bae795dcdb… --- diff --git a/modules/ims_registrar_scscf/registrar_notify.c b/modules/ims_registrar_scscf/registrar_notify.c index c0e6aec..77abf90 100644 --- a/modules/ims_registrar_scscf/registrar_notify.c +++ b/modules/ims_registrar_scscf/registrar_notify.c @@ -2024,10 +2024,8 @@ reg_notification * new_notification(str subscription_state, return 0; } - sprintf(bufc, content.s, r->version); buf.s = bufc; - buf.len = strlen(bufc); - + buf.len = snprintf(buf.s, MAX_REGINFO_SIZE, content.s, r->version); int len; char *p;

8 years, 8 months

git:master:ad552d4e: pua: test call-id value before inserting in db

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ad552d4e45a8311d50444d76e9862d40421e1715 URL: https://github.com/kamailio/kamailio/commit/ad552d4e45a8311d50444d76e9862d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-03T16:18:36+01:00 pua: test call-id value before inserting in db - reported by GH#345 --- Modified: modules/pua/pua.c --- Diff: https://github.com/kamailio/kamailio/commit/ad552d4e45a8311d50444d76e9862d4… Patch: https://github.com/kamailio/kamailio/commit/ad552d4e45a8311d50444d76e9862d4… --- diff --git a/modules/pua/pua.c b/modules/pua/pua.c index 06b3077..44eb709 100644 --- a/modules/pua/pua.c +++ b/modules/pua/pua.c @@ -1099,7 +1099,14 @@ static void db_update(unsigned int ticks,void *param) q_vals[puri_col].val.str_val = *(p->pres_uri); q_vals[pid_col].val.str_val = p->id; q_vals[flag_col].val.int_val = p->flag; - q_vals[callid_col].val.str_val = p->call_id; + if(p->call_id.s) { + LM_DBG("p->callid = %.*s\n", p->call_id.len, p->call_id.s); + q_vals[callid_col].val.str_val = p->call_id; + } else { + LM_DBG("p->callid is empty\n"); + q_vals[callid_col].val.str_val.s = ""; + q_vals[callid_col].val.str_val.len = 0; + } q_vals[fromtag_col].val.str_val = p->from_tag; q_vals[cseq_col].val.int_val= p->cseq; q_vals[expires_col].val.int_val = p->expires;

8 years, 8 months

git:4.3:a56e5980: uac: Sanity checks

by Stefan Mititelu

Module: kamailio Branch: 4.3 Commit: a56e5980e572357f9d3c0152623850c34ddb8963 URL: https://github.com/kamailio/kamailio/commit/a56e5980e572357f9d3c0152623850c… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-03T16:56:07+02:00 uac: Sanity checks Sanity checks for decode_uri(). Add NULL and len > 0 checks. Segfault when vsf parameter was empty in the Route: header (e.g 'vsf='). (cherry picked from commit d956f397c8cea4774e5941bdad8f76ecc44acdd5) --- Modified: modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/a56e5980e572357f9d3c0152623850c… Patch: https://github.com/kamailio/kamailio/commit/a56e5980e572357f9d3c0152623850c… --- diff --git a/modules/uac/replace.c b/modules/uac/replace.c index 1c30fe2..354b2f9 100644 --- a/modules/uac/replace.c +++ b/modules/uac/replace.c @@ -128,6 +128,22 @@ static inline int decode_uri( str *src , str *dst) int i,j; signed char c; + /* sanity checks */ + if (!src) { + LM_ERR("NULL src\n"); + return -1; + } + + if (!dst) { + LM_ERR("NULL dst\n"); + return -1; + } + + if (!src->s || src->len == 0) { + LM_ERR("empty src\n"); + return -1; + } + /* Count '-' at end and disregard them */ for( n=0,i=src->len-1; src->s[i]=='-'; i--) n++;

8 years, 8 months

git:4.3:83938d21: dialog: Sanity checks

by Stefan Mititelu

Module: kamailio Branch: 4.3 Commit: 83938d2153d0d33f1e3248a9ae280dae38440855 URL: https://github.com/kamailio/kamailio/commit/83938d2153d0d33f1e3248a9ae280da… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-03T16:55:13+02:00 dialog: Sanity checks Add NULL checks for the parse_dlg_rr_param(). Segfault when 'did' parameter was empty in the Route header (e.g. 'did='). (cherry picked from commit 876787d977c46ffcb1288f5eb66e91145cba1061) --- Modified: modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/83938d2153d0d33f1e3248a9ae280da… Patch: https://github.com/kamailio/kamailio/commit/83938d2153d0d33f1e3248a9ae280da… --- diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 75dc86f..b20f795 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -970,7 +970,29 @@ static inline int parse_dlg_rr_param(char *p, char *end, int *h_entry, int *h_id { char *s; + /* sanity checks */ + if (!p) { + LM_ERR("NULL start of parameter string"); + return -1; + } + + if (!end) { + LM_ERR("NULL end of parameter string"); + return -1; + } + + if (!h_entry) { + LM_ERR("NULL h_entry"); + return -1; + } + + if (!h_id) { + LM_ERR("NULL h_id"); + return -1; + } + for ( s=p ; p<end && *p!=DLG_SEPARATOR ; p++ ); + if (*p!=DLG_SEPARATOR) { LM_ERR("malformed rr param '%.*s'\n", (int)(long)(end-s), s); return -1;

8 years, 8 months

git:4.2:3af67d81: uac: Sanity checks

by Stefan Mititelu

Module: kamailio Branch: 4.2 Commit: 3af67d8142691e89aa4f9d77898c5af4ba026cbf URL: https://github.com/kamailio/kamailio/commit/3af67d8142691e89aa4f9d77898c5af… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-03T16:52:03+02:00 uac: Sanity checks Sanity checks for decode_uri(). Add NULL and len > 0 checks. Segfault when vsf parameter was empty in the Route: header (e.g 'vsf='). (cherry picked from commit d956f397c8cea4774e5941bdad8f76ecc44acdd5) --- Modified: modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/3af67d8142691e89aa4f9d77898c5af… Patch: https://github.com/kamailio/kamailio/commit/3af67d8142691e89aa4f9d77898c5af… --- diff --git a/modules/uac/replace.c b/modules/uac/replace.c index ccb2d46..bf54aad 100644 --- a/modules/uac/replace.c +++ b/modules/uac/replace.c @@ -142,6 +142,22 @@ static inline int decode_uri( str *src , str *dst) int i,j; signed char c; + /* sanity checks */ + if (!src) { + LM_ERR("NULL src\n"); + return -1; + } + + if (!dst) { + LM_ERR("NULL dst\n"); + return -1; + } + + if (!src->s || src->len == 0) { + LM_ERR("empty src\n"); + return -1; + } + /* Count '-' at end and disregard them */ for( n=0,i=src->len-1; src->s[i]=='-'; i--) n++;

8 years, 8 months

git:4.2:1e4043f5: dialog: Sanity checks

by Stefan Mititelu

Module: kamailio Branch: 4.2 Commit: 1e4043f5c7af6204117a8780b0afe5c00b26be28 URL: https://github.com/kamailio/kamailio/commit/1e4043f5c7af6204117a8780b0afe5c… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-03T16:51:12+02:00 dialog: Sanity checks Add NULL checks for the parse_dlg_rr_param(). Segfault when 'did' parameter was empty in the Route header (e.g. 'did='). (cherry picked from commit 876787d977c46ffcb1288f5eb66e91145cba1061) --- Modified: modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/1e4043f5c7af6204117a8780b0afe5c… Patch: https://github.com/kamailio/kamailio/commit/1e4043f5c7af6204117a8780b0afe5c… --- diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 7dc8478..d4eab6a 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -996,7 +996,29 @@ static inline int parse_dlg_rr_param(char *p, char *end, int *h_entry, int *h_id { char *s; + /* sanity checks */ + if (!p) { + LM_ERR("NULL start of parameter string"); + return -1; + } + + if (!end) { + LM_ERR("NULL end of parameter string"); + return -1; + } + + if (!h_entry) { + LM_ERR("NULL h_entry"); + return -1; + } + + if (!h_id) { + LM_ERR("NULL h_id"); + return -1; + } + for ( s=p ; p<end && *p!=DLG_SEPARATOR ; p++ ); + if (*p!=DLG_SEPARATOR) { LM_ERR("malformed rr param '%.*s'\n", (int)(long)(end-s), s); return -1;

8 years, 8 months

git:4.1:cb65228e: dialog: Sanity checks

by Stefan Mititelu

Module: kamailio Branch: 4.1 Commit: cb65228e2509cef518d595cc4737994393f7d51e URL: https://github.com/kamailio/kamailio/commit/cb65228e2509cef518d595cc4737994… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-03T16:35:21+02:00 dialog: Sanity checks Add NULL checks for the parse_dlg_rr_param(). Segfault when 'did' parameter was empty in the Route header (e.g. 'did='). --- Modified: modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/cb65228e2509cef518d595cc4737994… Patch: https://github.com/kamailio/kamailio/commit/cb65228e2509cef518d595cc4737994… --- diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 1991eee..f9a645c 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -992,7 +992,29 @@ static inline int parse_dlg_rr_param(char *p, char *end, int *h_entry, int *h_id { char *s; + /* sanity checks */ + if (!p) { + LM_ERR("NULL start of parameter string"); + return -1; + } + + if (!end) { + LM_ERR("NULL end of parameter string"); + return -1; + } + + if (!h_entry) { + LM_ERR("NULL h_entry"); + return -1; + } + + if (!h_id) { + LM_ERR("NULL h_id"); + return -1; + } + for ( s=p ; p<end && *p!=DLG_SEPARATOR ; p++ ); + if (*p!=DLG_SEPARATOR) { LM_ERR("malformed rr param '%.*s'\n", (int)(long)(end-s), s); return -1;

8 years, 8 months

← Newer
1
...
25
26
27
28
29
30
31
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2015