sr-dev September 2014

sr-dev@lists.kamailio.org

33 participants
375 discussions

git:master: websocket: fix checking payload_len safety check for fragmentation
by Daniel-Constantin Mierla 30 Sep '14

30 Sep '14

Module: sip-router Branch: master Commit: 6b8acf3204a8615762b0b5dcc6aac152f40b2ca0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b8acf3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 30 11:29:18 2014 +0200 websocket: fix checking payload_len safety check for fragmentation - a crafted websocket frame using values spanning max unsinged int could have caused a failed detection of unsupported fragmentation and invalid memory access - thanks to Peter Dunkley and Hugh Waite for assisting and pin-pointing where everything happens --- modules/websocket/ws_frame.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index d62a317..d3814bd 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -536,7 +536,8 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, frame->masking_key[3] = (buf[mask_start + 3] & 0xff); /* Decode and unmask payload */ - if (len != frame->payload_len + mask_start + 4) + if ((unsigned long long)len != (unsigned long long)frame->payload_len + + mask_start + 4) { LM_WARN("message not complete frame size %u but received %u\n", frame->payload_len + mask_start + 4, len);

1 0

git:master: kamctl: address dump command to list subnets
by Daniel-Constantin Mierla 29 Sep '14

29 Sep '14

Module: sip-router Branch: master Commit: 852f3dcc58dd07ac3047e0ea75829d3306be70f1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=852f3dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 29 11:37:30 2014 +0200 kamctl: address dump command to list subnets - address table is loaded in memory inside two structures, a matter whether it is a IP or net address. Dump both structures via kamctl address dump --- utils/kamctl/kamctl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index bf12fbd..1f35ea5 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1243,6 +1243,7 @@ permissions_address() { dump) require_ctlengine $CTLCMD address_dump + $CTLCMD subnet_dump ;; show) require_dbengine

1 0

Does kamailio reloads the modules per sip message ?
by Rahul MathuR 29 Sep '14

29 Sep '14

Hello, We have observed a strange behavior in corex module that it gets loaded at every sip packet which arrives to kamailio. We put a static variable and saw that it gets re-initialized to 0 everytime any sip packet comes to it. Could you please tell me how to stop it and load it just once. Thanks in advance ! -- Warm Regds. MathuRahul

2 1

git:master: pkg/kamailio/deb: update version to 4.2.0~pre1
by Victor Seva 29 Sep '14

29 Sep '14

Module: sip-router Branch: master Commit: f4721b3b896a92d30e611a3d6213715935bc70de URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f4721b3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Mon Sep 29 10:20:13 2014 +0200 pkg/kamailio/deb: update version to 4.2.0~pre1 --- pkg/kamailio/deb/debian/changelog | 6 ++++++ pkg/kamailio/deb/jessie/changelog | 6 ++++++ pkg/kamailio/deb/precise/changelog | 6 ++++++ pkg/kamailio/deb/squeeze/changelog | 6 ++++++ pkg/kamailio/deb/trusty/changelog | 6 ++++++ pkg/kamailio/deb/wheezy/changelog | 6 ++++++ 6 files changed, 36 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 7c9a8c9..c1108d5 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~pre1) UNRELEASED; urgency=medium + + * update version to 4.2.0~pre1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Mon, 29 Sep 2014 10:17:56 +0200 + kamailio (4.2.0~pre0) UNRELEASED; urgency=medium * update version to 4.2.0~pre0 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 7c9a8c9..c1108d5 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~pre1) UNRELEASED; urgency=medium + + * update version to 4.2.0~pre1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Mon, 29 Sep 2014 10:17:56 +0200 + kamailio (4.2.0~pre0) UNRELEASED; urgency=medium * update version to 4.2.0~pre0 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 7c9a8c9..c1108d5 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~pre1) UNRELEASED; urgency=medium + + * update version to 4.2.0~pre1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Mon, 29 Sep 2014 10:17:56 +0200 + kamailio (4.2.0~pre0) UNRELEASED; urgency=medium * update version to 4.2.0~pre0 diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index 7c9a8c9..c1108d5 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~pre1) UNRELEASED; urgency=medium + + * update version to 4.2.0~pre1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Mon, 29 Sep 2014 10:17:56 +0200 + kamailio (4.2.0~pre0) UNRELEASED; urgency=medium * update version to 4.2.0~pre0 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 7c9a8c9..c1108d5 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~pre1) UNRELEASED; urgency=medium + + * update version to 4.2.0~pre1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Mon, 29 Sep 2014 10:17:56 +0200 + kamailio (4.2.0~pre0) UNRELEASED; urgency=medium * update version to 4.2.0~pre0 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 7c9a8c9..c1108d5 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~pre1) UNRELEASED; urgency=medium + + * update version to 4.2.0~pre1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Mon, 29 Sep 2014 10:17:56 +0200 + kamailio (4.2.0~pre0) UNRELEASED; urgency=medium * update version to 4.2.0~pre0

1 0

[tracker] Task closed: tm.t_uac_wait does not use advertise address
by sip-router 29 Sep '14

29 Sep '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#471 - tm.t_uac_wait does not use advertise address User who did this - Juha Heinanen (jh) Reason for closing: Fixed More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=471 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: tm: t_append_branches extra checks for cancelled transaction
by Federico Cabiddu 29 Sep '14

29 Sep '14

Module: sip-router Branch: master Commit: ed1a5476e82fa675861a86fb3c75555c578555d2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed1a547… Author: fcabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: Fri Sep 26 18:19:39 2014 +0200 tm: t_append_branches extra checks for cancelled transaction --- modules/tm/t_append_branches.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_append_branches.c b/modules/tm/t_append_branches.c index 637b11a..566a642 100644 --- a/modules/tm/t_append_branches.c +++ b/modules/tm/t_append_branches.c @@ -63,6 +63,7 @@ int t_append_branches(void) { flag_t bflags = 0; int new_branch, branch_ret, lowest_ret; branch_bm_t added_branches; + int replies_locked = 0; t = get_t(); if(t == NULL) @@ -73,6 +74,9 @@ int t_append_branches(void) { LM_DBG("transaction %u:%u in status %d\n", t->hash_index, t->label, t->uas.status); + /* test if transaction has already been canceled */ + if (t->flags & T_CANCELED) goto canceled; + if ((t->uas.status >= 200 && t->uas.status<=399) || ((t->uas.status >= 600 && t->uas.status) && !(t->flags & (T_6xx | T_DISABLE_6xx))) ) { @@ -82,6 +86,7 @@ int t_append_branches(void) { /* set the lock on the transaction here */ LOCK_REPLIES(t); + replies_locked = 1; outgoings = t->nr_of_outgoings; orig_msg = t->uas.request; @@ -125,6 +130,10 @@ int t_append_branches(void) { &path, 0, si, orig_msg->fwd_send_flags, orig_msg->rcv.proto, (dst_uri.len)?-1:UAC_SKIP_BR_DST_F, &instance, &ruid, &location_ua); + + /* test if cancel was received meanwhile */ + if (t->flags & T_CANCELED) goto canceled; + if (new_branch>=0) added_branches |= 1<<new_branch; else @@ -143,6 +152,7 @@ int t_append_branches(void) { if(lowest_ret!=E_CFG) LOG(L_ERR, "ERROR: t_append_branch: failure to add branches\n"); ser_error=lowest_ret; + replies_locked = 0; UNLOCK_REPLIES(t); return lowest_ret; } @@ -175,12 +185,33 @@ int t_append_branches(void) { ser_error=E_SEND; /* else return the last error (?) */ /* the caller should take care and delete the transaction */ + replies_locked = 0; UNLOCK_REPLIES(t); return -1; } ser_error=0; /* clear branch send errors, we have overall success */ set_kr(REQ_FWDED); + replies_locked = 0; UNLOCK_REPLIES(t); return 1; + +canceled: + DBG("t_append_branches: cannot append branches to a canceled transaction\n"); + /* reset processed branches */ + clear_branches(); + /* restore backup flags from initial env */ + setbflagsval(0, backup_bflags); + /* update message flags, if changed in branch route */ + t->uas.request->flags = orig_msg->flags; + /* if needed unlock transaction's replies */ + if (likely(replies_locked)) { + /* restore the number of outgoing branches + * since new branches have not been completed */ + t->nr_of_outgoings = outgoings; + replies_locked = 0; + UNLOCK_REPLIES(t); + } + ser_error=E_CANCELED; + return -1; }

1 0

tm extra checks for CANCEL
by Federico Cabiddu 29 Sep '14

29 Sep '14

Hi, a recent commit on tm module (b66033d) adds a check for cancelled transactions to t_forward_nonack (cf. http://sip-router.org/tracker/index.php?do=details&task_id=468). This made me think that the t_append_branches function, recently added to the module, needs the same kind of checks: - before start adding the branches - after adding the branches and before sending them out Attached a patch to implement these checks. If you agree I can commit it on master. Regards, Federico

2 1

git:master: tsilo: prefixed module's functions with ts_
by Federico Cabiddu 29 Sep '14

29 Sep '14

Module: sip-router Branch: master Commit: a135e7956fcf780fd44dddcfbc2c671630b5d44d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a135e79… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: Mon Sep 29 07:57:12 2014 +0200 tsilo: prefixed module's functions with ts_ --- modules/tsilo/README | 48 ++++++++++++++-------------- modules/tsilo/doc/tsilo_admin.xml | 18 +++++----- modules/tsilo/{t_append.c => ts_append.c} | 8 ++-- modules/tsilo/{t_append.h => ts_append.h} | 8 ++-- modules/tsilo/{t_store.c => ts_store.c} | 4 +- modules/tsilo/{t_store.h => ts_store.h} | 6 ++-- modules/tsilo/tsilo.c | 40 ++++++++++++------------ modules/tsilo/tsilo.h | 4 +- 8 files changed, 68 insertions(+), 68 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a13…

1 0

extra <> around from/to header body
by Juha Heinanen 28 Sep '14

28 Sep '14

while testing tm.t_uac_wait, i noticed that latest master adds extra <> around from/to uri body if it contains tag. i then went back to kamailio build from master on 20140915 (which i happened to have laying around) and the issue disappeared. has something changed in between that could explain the problem? -- juha

2 4

git:master: tm: beter detection of brackets in From/ To values in UAC print functions
by Daniel-Constantin Mierla 28 Sep '14

28 Sep '14

Module: sip-router Branch: master Commit: 181c30705b3cb82245463015d98644c278131af2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=181c307… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Sep 28 21:44:35 2014 +0200 tm: beter detection of brackets in From/To values in UAC print functions - commit fb0cd1cd6a891ab5dc5f559bb6740ba62ac3daf4 fixed the case of avoiding double <> when dispaly name was present, but affected when header parameters were given - reported by Juha Heinanen --- modules/tm/t_msgbuilder.c | 44 +++++++++++++++++++++++++++++++++----------- 1 files changed, 33 insertions(+), 11 deletions(-) diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index a1890c8..fae0cdf 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -1393,16 +1393,16 @@ static inline char* print_request_uri(char* w, str* method, dlg_t* dialog, struc /* * Print To header field */ -static inline char* print_to(char* w, dlg_t* dialog, struct cell* t) +static inline char* print_to(char* w, dlg_t* dialog, struct cell* t, int bracket) { t->to.s = w; t->to.len = TO_LEN + dialog->rem_uri.len + CRLF_LEN + (((dialog->rem_uri.s[dialog->rem_uri.len - 1]!='>'))?2:0); memapp(w, TO, TO_LEN); - if(dialog->rem_uri.s[dialog->rem_uri.len - 1]!='>') memapp(w, "<", 1); + if(bracket) memapp(w, "<", 1); memapp(w, dialog->rem_uri.s, dialog->rem_uri.len); - if(dialog->rem_uri.s[dialog->rem_uri.len - 1]!='>') memapp(w, ">", 1); + if(bracket) memapp(w, ">", 1); if (dialog->id.rem_tag.len) { t->to.len += TOTAG_LEN + dialog->id.rem_tag.len ; @@ -1418,16 +1418,16 @@ static inline char* print_to(char* w, dlg_t* dialog, struct cell* t) /* * Print From header field */ -static inline char* print_from(char* w, dlg_t* dialog, struct cell* t) +static inline char* print_from(char* w, dlg_t* dialog, struct cell* t, int bracket) { t->from.s = w; t->from.len = FROM_LEN + dialog->loc_uri.len + CRLF_LEN + ((dialog->loc_uri.s[dialog->loc_uri.len - 1]!='>')?2:0); memapp(w, FROM, FROM_LEN); - if(dialog->loc_uri.s[dialog->loc_uri.len - 1]!='>') memapp(w, "<", 1); + if(bracket) memapp(w, "<", 1); memapp(w, dialog->loc_uri.s, dialog->loc_uri.len); - if(dialog->loc_uri.s[dialog->loc_uri.len - 1]!='>') memapp(w, ">", 1); + if(bracket) memapp(w, ">", 1); if (dialog->id.loc_tag.len) { t->from.len += FROMTAG_LEN + dialog->id.loc_tag.len; @@ -1514,9 +1514,10 @@ char * _strnstr(const char* s, const char* find, size_t slen) { char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int branch, struct cell *t, int* len, struct dest_info* dst) { - char* buf, *w; + char* buf, *w, *p; str content_length, cseq, via; unsigned int maxfwd_len; + int tbracket, fbracket; if (!method || !dialog) { LOG(L_ERR, "build_uac_req(): Invalid parameter value\n"); @@ -1546,12 +1547,33 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int bra } *len += via.len; + if((p=q_memrchr(dialog->rem_uri.s, '>', dialog->rem_uri.len))!=NULL) { + if((p==dialog->rem_uri.s + dialog->rem_uri.len - 1) + || *(p+1)==';') { + tbracket = 0; + } else { + tbracket = 1; + } + } else { + tbracket = 1; + } + if((p=q_memrchr(dialog->loc_uri.s, '>', dialog->loc_uri.len))!=NULL) { + if((p==dialog->loc_uri.s + dialog->loc_uri.len - 1) + || *(p+1)==';') { + fbracket = 0; + } else { + fbracket = 1; + } + } else { + fbracket = 1; + } + *len += TO_LEN + dialog->rem_uri.len + (dialog->id.rem_tag.len ? (TOTAG_LEN + dialog->id.rem_tag.len) : 0) + CRLF_LEN; /* To */ - if(dialog->rem_uri.s[dialog->rem_uri.len - 1]!='>') *len += 2; /* To-URI < > */ + if(tbracket) *len += 2; /* To-URI < > */ *len += FROM_LEN + dialog->loc_uri.len + (dialog->id.loc_tag.len ? (FROMTAG_LEN + dialog->id.loc_tag.len) : 0) + CRLF_LEN; /* From */ - if(dialog->loc_uri.s[dialog->loc_uri.len - 1]!='>') *len += 2; /* From-URI < > */ + if(fbracket) *len += 2; /* From-URI < > */ *len += CALLID_LEN + dialog->id.call_id.len + CRLF_LEN; /* Call-ID */ *len += CSEQ_LEN + cseq.len + 1 + method->len + CRLF_LEN; /* CSeq */ *len += calculate_routeset_length(dialog); /* Route set */ @@ -1573,8 +1595,8 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int bra w = print_request_uri(w, method, dialog, t, branch); /* Request-URI */ memapp(w, via.s, via.len); /* Top-most Via */ - w = print_to(w, dialog, t); /* To */ - w = print_from(w, dialog, t); /* From */ + w = print_to(w, dialog, t, tbracket); /* To */ + w = print_from(w, dialog, t, fbracket); /* From */ w = print_cseq(w, &cseq, method, t); /* CSeq */ w = print_callid(w, dialog, t); /* Call-ID */ w = print_routeset(w, dialog); /* Route set */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2014