sr-dev August 2012

sr-dev@lists.kamailio.org

30 participants
170 discussions

git:3.3: rr(k): add missing '<' in Route header for strict routing
by Daniel-Constantin Mierla 03 Aug '12

03 Aug '12

Module: sip-router Branch: 3.3 Commit: a0ffdb7eb2b1478a98422123c78e15ce2b21449f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a0ffdb7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 3 09:20:03 2012 +0200 rr(k): add missing '<' in Route header for strict routing - if next hop is strict router after loose routing, moving the r-uri to last Route header was missing '<' in front of the address - reported by Varsha Venkatraramani (cherry picked from commit 090be2532da73f51043f9ba5f4b221fe338d60fa) --- modules_k/rr/loose.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules_k/rr/loose.c b/modules_k/rr/loose.c index b74797f..22360df 100644 --- a/modules_k/rr/loose.c +++ b/modules_k/rr/loose.c @@ -49,6 +49,9 @@ #define RR_DRIVEN 1 /*!< The next hop is determined from the route set */ #define NOT_RR_DRIVEN -1 /*!< The next hop is not determined from the route set */ +#define RR_ROUTE_PREFIX ROUTE_PREFIX "<" +#define RR_ROUTE_PREFIX_LEN (sizeof(RR_ROUTE_PREFIX)-1) + #define ROUTE_SUFFIX ">\r\n" /*!< SIP header suffix */ #define ROUTE_SUFFIX_LEN (sizeof(ROUTE_SUFFIX)-1) @@ -307,7 +310,8 @@ static inline int save_ruri(struct sip_msg* _m) } /* Create buffer for new lump */ - len = ROUTE_PREFIX_LEN + _m->first_line.u.request.uri.len + ROUTE_SUFFIX_LEN; + len = RR_ROUTE_PREFIX_LEN + _m->first_line.u.request.uri.len + + ROUTE_SUFFIX_LEN; s = (char*)pkg_malloc(len); if (!s) { LM_ERR("No memory pkg left\n"); @@ -315,9 +319,11 @@ static inline int save_ruri(struct sip_msg* _m) } /* Create new header field */ - memcpy(s, ROUTE_PREFIX, ROUTE_PREFIX_LEN); - memcpy(s + ROUTE_PREFIX_LEN, _m->first_line.u.request.uri.s, _m->first_line.u.request.uri.len); - memcpy(s + ROUTE_PREFIX_LEN + _m->first_line.u.request.uri.len, ROUTE_SUFFIX, ROUTE_SUFFIX_LEN); + memcpy(s, RR_ROUTE_PREFIX, RR_ROUTE_PREFIX_LEN); + memcpy(s + RR_ROUTE_PREFIX_LEN, _m->first_line.u.request.uri.s, + _m->first_line.u.request.uri.len); + memcpy(s + ROUTE_PREFIX_LEN + _m->first_line.u.request.uri.len, + ROUTE_SUFFIX, ROUTE_SUFFIX_LEN); LM_DBG("New header: '%.*s'\n", len, ZSW(s));

1 0

git:master: rr(k): add missing '<' in Route header for strict routing
by Daniel-Constantin Mierla 03 Aug '12

03 Aug '12

Module: sip-router Branch: master Commit: 090be2532da73f51043f9ba5f4b221fe338d60fa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=090be25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 3 09:20:03 2012 +0200 rr(k): add missing '<' in Route header for strict routing - if next hop is strict router after loose routing, moving the r-uri to last Route header was missing '<' in front of the address - reported by Varsha Venkatraramani --- modules_k/rr/loose.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules_k/rr/loose.c b/modules_k/rr/loose.c index b74797f..22360df 100644 --- a/modules_k/rr/loose.c +++ b/modules_k/rr/loose.c @@ -49,6 +49,9 @@ #define RR_DRIVEN 1 /*!< The next hop is determined from the route set */ #define NOT_RR_DRIVEN -1 /*!< The next hop is not determined from the route set */ +#define RR_ROUTE_PREFIX ROUTE_PREFIX "<" +#define RR_ROUTE_PREFIX_LEN (sizeof(RR_ROUTE_PREFIX)-1) + #define ROUTE_SUFFIX ">\r\n" /*!< SIP header suffix */ #define ROUTE_SUFFIX_LEN (sizeof(ROUTE_SUFFIX)-1) @@ -307,7 +310,8 @@ static inline int save_ruri(struct sip_msg* _m) } /* Create buffer for new lump */ - len = ROUTE_PREFIX_LEN + _m->first_line.u.request.uri.len + ROUTE_SUFFIX_LEN; + len = RR_ROUTE_PREFIX_LEN + _m->first_line.u.request.uri.len + + ROUTE_SUFFIX_LEN; s = (char*)pkg_malloc(len); if (!s) { LM_ERR("No memory pkg left\n"); @@ -315,9 +319,11 @@ static inline int save_ruri(struct sip_msg* _m) } /* Create new header field */ - memcpy(s, ROUTE_PREFIX, ROUTE_PREFIX_LEN); - memcpy(s + ROUTE_PREFIX_LEN, _m->first_line.u.request.uri.s, _m->first_line.u.request.uri.len); - memcpy(s + ROUTE_PREFIX_LEN + _m->first_line.u.request.uri.len, ROUTE_SUFFIX, ROUTE_SUFFIX_LEN); + memcpy(s, RR_ROUTE_PREFIX, RR_ROUTE_PREFIX_LEN); + memcpy(s + RR_ROUTE_PREFIX_LEN, _m->first_line.u.request.uri.s, + _m->first_line.u.request.uri.len); + memcpy(s + ROUTE_PREFIX_LEN + _m->first_line.u.request.uri.len, + ROUTE_SUFFIX, ROUTE_SUFFIX_LEN); LM_DBG("New header: '%.*s'\n", len, ZSW(s));

1 0

Kamailio v3.3.1 Released
by Daniel-Constantin Mierla 02 Aug '12

02 Aug '12

Hello, Kamailio SIP Server v3.3.1 stable release is out. This is a maintenance release of the latest stable branch, 3.3, that includes fixes since release of v3.3.0. There is no change to database schema or configuration language structure that you have to do on installations of v3.3.0. Deployments running previous v3.x.x versions are strongly recommended to be upgraded to v3.3.1. For more details about version 3.3.1 (including links and hints to download the tarball or from GIT repository), visit: * http://www.kamailio.org/w/2012/08/kamailio-v3-3-1-released/ RPM, Debian/Ubuntu packages will be available soon as well. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, Seattle, USA, Sep 23-26, 2012 - http://asipto.com/u/katu Kamailio Practical Workshop, Netherlands, Sep 10-12, 2012 - http://asipto.com/u/kpw

1 0

Re: [sr-dev] [SR-Users] Outbound and Registrar. No binding update
by Iñaki Baz Castillo 02 Aug '12

02 Aug '12

Hi, full agree with this bug report. Adding the devel maillist. More comments at the end of the mail: 2012/7/26 José Luis Millán <jmillan(a)aliax.net>: > Hi, > > I'm using Kamilio 3.3.0 as registrar server. I`m using an outbound proxy so > 'use_path' parameter or 'registrar' module is enabled. > > According to RFC 5626, a re-registration from a specific combination of AoR, > instance_id and reg_id must update the binding. > > "" > If the registrar receives a re-registration for a specific > combination of AOR, and instance-id and reg-id values, the registrar > MUST update any information that uniquely identifies the network flow > over which the request arrived if that information has changed, and > SHOULD update the time the binding was last updated. > "" > > In my installation this is not fullfilled as shown: > > "" > AOR:: jmillan > Contact:: sip:jmillan@MY_IP;transport=ws;ov-ob=a570655c14 Q= > Expires:: 181 > Callid:: 1hgq3khalq2rzfr > Cseq:: 108 > User-agent:: JsSIP 0.1.0 > Path:: > <sip:OUTBOUND_IP:9090;transport=tcp;lr;ovid=de0c0b9f>,<sip:a570655c14@OUTBOUND_IP:10080;transport=ws;lr;ovid=de0c0b9f;ob> > State:: CS_SYNC > Flags:: 0 > Cflag:: 0 > Socket:: tcp:KAM_IP:5060 > Methods:: 783 > Ruid:: uloc-50119d99-328e-1 > Instance:: > <urn:uuid:38dce009-ae1f-4fd1-91dc-99ed9affddc1> > Reg-Id:: 1 > Contact:: sip:jmillan@MY_IP;transport=ws;ov-ob=1dd97b4d51 Q= > Expires:: 193 > Callid:: 1hgq3khalq2rzfr > Cseq:: 110 > User-agent:: JsSIP 0.1.0 > Path:: > <sip:OUTBOUND_IP:9090;transport=tcp;lr;ovid=de0c0b9f>,<sip:1dd97b4d51@OUTBOUND_IP:10080;transport=ws;lr;ovid=de0c0b9f;ob> > State:: CS_SYNC > Flags:: 0 > Cflag:: 0 > Socket:: tcp:KAM_IP:5060 > Methods:: 783 > Ruid:: uloc-50119d99-3290-2 > Instance:: > <urn:uuid:38dce009-ae1f-4fd1-91dc-99ed9affddc1> > Reg-Id:: 1 > "" > > The scenario is such that when the client looses the connection with the > Outbound Server, it reconnects and re-registers to Kamailio in order to > replace registration and be able to receive in-dialog messages. Receiving in-dialog requests should work since GRUU is also being used. The problem is that the new REGISTER (after UA disconnection) does not update the previous one (as this thread reports) so Kamailio still chooses the previous binding which does not work anymore. Regards. -- Iñaki Baz Castillo <ibc(a)aliax.net>

4 18

git:3.3: ChangeLog: content updated for version 3.3.1
by Daniel-Constantin Mierla 02 Aug '12

02 Aug '12

Module: sip-router Branch: 3.3 Commit: 2d0f6f1e65a6d56f7489c50ddfeff5aa423d7c21 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d0f6f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 2 15:32:36 2012 +0200 ChangeLog: content updated for version 3.3.1 --- ChangeLog | 241 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 241 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index a59cdda..4616241 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,244 @@ +===================== 2012-08-02 Version 3.3.1 Released ===================== + +===================== Changes Since Version 3.3.0 =========================== + +commit eca8ae21eb2d2c71d4752362fd88ca078941532b +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Thu Aug 2 15:30:06 2012 +0200 + + Makefile.defs: version set to 3.3.1 + +commit da7552bf8983343072415ccafac19f59d1affa34 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Thu Aug 2 15:23:47 2012 +0200 + + pkg/deb: version set to 3.3.1 for deb specs + +commit be9d77be00e1978be97c85e199efd712fabbabf4 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Thu Aug 2 15:19:28 2012 +0200 + + pkg/rpm: version set to 3.3.1 for rpm specs + +commit b5f95a603228fce13b2f168dfbf0120ed2e7befd +Author: Pawel Kuzak <pawel.kuzak(a)1und1.de> +Date: Fri Jul 13 16:06:48 2012 +0300 + + Ported gruu and outbound changes to p_usrloc module + (cherry picked from commit 1f6bfa0b3ba15201c2ca3e2387a9f9e81e989643) + +commit 153baccb8bbbcf08b6485f1cfc75a2b809bdafca +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Mon Jul 30 12:57:09 2012 +0200 + + register(k): pack contact info based on header for searching existing ul records + + - not using the contact header resulted in omitting instance and reg-id + parameters, not following gruu/ob extensions, ending in duplicate + records for same +sip.instance + - reported by JosÃ© Luis MillÃ¡n + (cherry picked from commit efa3099252ca5d200bef6ce71df33f33b55f9941) + +commit b5b534ec77634041d0ed11280241a947b61aff0c +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Mon Jul 30 12:55:36 2012 +0200 + + usrloc(k): on ul update, re-clone uri and callid if instance is set + + - changes can happen when gruu/ob is enabled as the UA can get different + address for same instance + (cherry picked from commit a7cad776a514b0ec73a5c40b7971af8e0f0da92b) + +commit 5f8405f577d66069fde48202862f06cac432139b +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Wed Jul 18 19:00:38 2012 +0200 + + tls: set function to return the id + + - starting with v1.0.0 openssl does not use anymore getpid(), but address + of errno which can point to same virtual address in a multi-process + application + - for refrence http://www.openssl.org/docs/crypto/threads.html + - credits to Jijo on sr-dev mailing list + (cherry picked from commit 0615826fe602c5183fbc7be7c51de5eb5eb7223c) + +commit cd50811c1964e4e2227e45ffcb4e5e1f0db04745 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Wed Jul 18 18:51:54 2012 +0200 + + kamdbctl: mtree tables were not in the list for db creation + (cherry picked from commit e35e16efbbc6c746a7a4dfeddfc241c2c78d30bc) + +commit 87618b2f1c5d6e3724c3935709b81b151c4645b5 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Wed Jul 18 08:27:52 2012 +0200 + + kamailio.cfg: removed sample db_mode parameter for domain module + + - no longer exists since 3.3 domain update + (cherry picked from commit bb4925540d241eb91cc8b68712bec20f1970b086) + +commit fe8265334cef872d8f3fabe407d3f3d744a45960 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Thu Jun 28 16:24:47 2012 +0200 + + p_usrloc: added missing usrloc API members + + - they are set to NULL to get a clean crash, they have to be implemented + - the missing API members are the functions introduced in 3.3 for + handling SIP GRUU and Outbound extensions + - a proper fix to follow + - reported by Dan Bogos + (cherry picked from commit f030b2f274b69526f256e66098de72a074000ed1) + +commit 81149e30785aa1cc6f04e130afafb643d9163cce +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Mon Jun 25 10:36:31 2012 +0200 + + dispatcher(k): allow set id 0 for OPTIONS callback + + - set id is provided in param pointer address, 0 being equivalent to + NULL + - reported by Avi Brender + (cherry picked from commit 2664cb9aa8ffd5d26ef6a0841318ccbcdefbf69b) + +commit 85bda41ac007464efe940713426b54c38e5d4303 +Author: Juha Heinanen <jh(a)tutpro.com> +Date: Fri Jul 27 13:08:21 2012 +0300 + + modules/lcr: improved documentation of lcr_count module param + (cherry picked from commit 9a1450d99accef8e473cf2324412fdfc09a7cd11) + +commit 28be16549831df46dd1b8312da223b02359d8a9c +Author: Richard Fuchs <rfuchs(a)sipwise.com> +Date: Thu Jul 26 09:41:26 2012 -0400 + + modules/lcr: Fix printing of IPv4 addresses in lcr.dump_gws + + IPv4 addresses were printed incorrectly. Also add special handling for + null gw addresses and print them as 0.0.0.0 for backwards compatibility. + +commit 3a8288482aa38afd8048193ef45b8ad979cacfab +Author: Anca Vamanu <anca.vamanu(a)1and1.ro> +Date: Fri Jul 20 16:59:52 2012 +0300 + + modules/matrix Fixed MI command not exported + + Added missing register_mi_mod() call in mod_init. + (cherry picked from commit b26f862322ad311e3c42d899f72eaa1fb665b755) + +commit 32e67eb8ebe8e1ef1190b03151962412ad41dbd3 +Author: Carsten Bock <carsten(a)ng-voice.com> +Date: Tue Jul 17 10:15:46 2012 -0400 + + Remove duplicate entry of "default_domain" in docs. + Remove double occurance of the CSeq Attribute in the XML. + (closes FS#246 - pua_reginfo adds duplicate cseq field in XML body on the Bugtracker) + + Thanks to Andrew Pogrebennyk (apogrebennyk(a)sipwise.com) for pointing this out. + +commit 4aad5415215e4157f7bbe7c1b57178920aaaf3cc +Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> +Date: Sun Jul 15 14:15:17 2012 +0100 + + pkg/kamailio/(centos|fedora): Updated/fixed CentOS/Fedora build appliances and .spec + + - Had fixed some small issues in master, and now merged them back. + +commit 6f47d8ac983cbbd616c7b5b941a8ec671f6e15e6 +Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> +Date: Thu Jul 12 21:46:58 2012 +0100 + + modules_k/registrar: Fixed some errors in module documentation + + - Fix by Hugh Waite @ Crocodile RCS + (cherry picked from commit 6d040935f31be0098a09f4621874268164f3926a) + +commit a897251aaa545c8726587412009f4906ff21e2aa +Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> +Date: Thu Jul 12 21:48:08 2012 +0100 + + modules/sl: Fixed segmentation fault and corrected log messages + + - Fixes by Hugh Waite @ Crocodile RCS + (cherry picked from commit e78ff34f1ecfe9a60a52996126032ea04fb490ab) + +commit 7e412d720b1747fadac3e94c22d270877087b8a0 +Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> +Date: Thu Jul 12 21:44:45 2012 +0100 + + core: update printing of socket lists to show the advertised address if set for the socket + + - useful for diagnosing what is going on with advertised address + - Enhancement added by Hugh Waite @ Crocodile RCS + (cherry picked from commit 274969bcca2301c96dbbcc17c5b1d411073c8277) + +commit ac24a183397924a7dab209c6f205b955936d4379 +Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> +Date: Thu Jul 12 21:20:49 2012 +0100 + + modules_k/presence: Added missing use_table() call + (cherry picked from commit 0de5e17770cd5dcfcdd64174eb24f0bcaccef021) + +commit 4570fc02082f69dd036ab7a3deea57ee8cffa411 +Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> +Date: Thu Jul 12 16:26:38 2012 +0100 + + Makefile: SCTP library check doesn't look in /usr/lib64 + + - This means you can't build Kamailio for a 64-bit OS like CentOS or + Fedora. + (cherry picked from commit f2f8ff72137a39702d284dfe6deb9ef4442e4e78) + +commit 671b52a37e3811bf89c74d83e6438739a67f50a7 +Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> +Date: Wed Jul 11 12:30:51 2012 +0000 + + kamdbctl: add domain_attrs table to standard tables + (cherry picked from commit 699526ddb3b02cb5766bc7ad6f1c7a1861006d4c) + +commit 66240e60d99b6bf9fc8f06c05cb7f4ecf6d8d1ad +Author: Andreas Granig <agranig(a)sipwise.com> +Date: Wed Jul 11 12:52:38 2012 +0200 + + modules_k/uac: fix handling of empty display-part. + + This re-enables the feature to strip the display name by setting + an empty string, like uac_replace_from("", "$var(from)"); + +commit 948df15d215e7d12ad404dec7dfdbb41d58bea3e +Author: Juha Heinanen <jh(a)tutpro.com> +Date: Wed Jul 4 17:15:43 2012 +0300 + + modules/lcr: Fixed to/from_gw tests when proto parameter is 0 (ANY) + + - Also, updated README regarding handling of NULL value in lcr_gw + transport column. + (cherry picked from commit 1382c30da7ffd8831479affafde4d8e038a41240) + +commit 3abf967f61a1bd95c28d4e8a929a8bd5df00671d +Author: Anca Vamanu <anca.vamanu(a)1and1.ro> +Date: Wed Jun 27 18:34:55 2012 +0300 + + modules_k/presence_xml Xcap auth reason when user deleted from list + + The reason in Subscription-Status header in Notify when a user is + deleted from the contact list can be decided by the admin by setting + presence_xml module parameter xcapauth_usedel_reason. Default value is + "probation". + +commit 33a2157ec034c106e5a4bd42aa874e57550a13fe +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Mon Jun 25 18:36:18 2012 +0200 + + dialog(k): proper unlock of profile for mi list command + + - the profile was unlocked in a wrong place, before finishing listing + the its content and could cause a race in accessing it + - reported by Ricardo Martinez + (cherry picked from commit 3a2e929c63c656fe2db78e746546af05c66740ea) + + ===================== 2012-06-18 Version 3.3.0 Released ===================== ===================== Changes Since Version 3.2.0 ===========================

1 0

git:3.3: Makefile.defs: version set to 3.3.1
by Daniel-Constantin Mierla 02 Aug '12

02 Aug '12

Module: sip-router Branch: 3.3 Commit: eca8ae21eb2d2c71d4752362fd88ca078941532b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eca8ae2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 2 15:30:06 2012 +0200 Makefile.defs: version set to 3.3.1 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 9d7a49f..076546d 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -161,7 +161,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) #version number VERSION = 3 PATCHLEVEL = 3 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = # memory debugger switcher

1 0

git:3.3: pkg/rpm: version set to 3.3.1 for rpm specs
by Daniel-Constantin Mierla 02 Aug '12

02 Aug '12

Module: sip-router Branch: 3.3 Commit: be9d77be00e1978be97c85e199efd712fabbabf4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=be9d77b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 2 15:19:28 2012 +0200 pkg/rpm: version set to 3.3.1 for rpm specs --- pkg/kamailio/rpm/kamailio.spec-4.1 | 2 +- pkg/kamailio/rpm/kamailio.spec.CenOS | 2 +- pkg/kamailio/rpm/kamailio.spec.SuSE | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index 8c6683c..ce2d212 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 3.3.0 +%define ver 3.3.1 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index f329292..068e2fe 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 3.3.0 +%define ver 3.3.1 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index 4e529b8..8058627 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 3.3.0 +%define ver 3.3.1 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

git:3.3: pkg/deb: version set to 3.3.1 for deb specs
by Daniel-Constantin Mierla 02 Aug '12

02 Aug '12

Module: sip-router Branch: 3.3 Commit: da7552bf8983343072415ccafac19f59d1affa34 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da7552b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 2 15:23:47 2012 +0200 pkg/deb: version set to 3.3.1 for deb specs --- pkg/kamailio/deb/debian/changelog | 8 +++++++- pkg/kamailio/deb/lenny/changelog | 6 ++++++ pkg/kamailio/deb/lucid/changelog | 6 ++++++ pkg/kamailio/deb/precise/changelog | 6 ++++++ pkg/kamailio/deb/squeeze/changelog | 6 ++++++ pkg/kamailio/deb/wheezy/changelog | 6 ++++++ 6 files changed, 37 insertions(+), 1 deletions(-) diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index a6d9fdc..25f579d 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,8 +1,14 @@ +kamailio (3.3.1) unstable; urgency=low + + * update to 3.3.1 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 2 Aug 2012 14:40:00 +0100 + kamailio (3.3.0) unstable; urgency=low * update to 3.3.0 from upstream - -- Daniel-Constantin Mierla <miconda(a)gmail.com> Mon, 18 Jun 2011 10:20:00 +0100 + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Mon, 18 Jun 2012 10:20:00 +0100 kamailio (3.3.0-rc0) unstable; urgency=low diff --git a/pkg/kamailio/deb/lenny/changelog b/pkg/kamailio/deb/lenny/changelog index 74257cc..25f579d 100644 --- a/pkg/kamailio/deb/lenny/changelog +++ b/pkg/kamailio/deb/lenny/changelog @@ -1,3 +1,9 @@ +kamailio (3.3.1) unstable; urgency=low + + * update to 3.3.1 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 2 Aug 2012 14:40:00 +0100 + kamailio (3.3.0) unstable; urgency=low * update to 3.3.0 from upstream diff --git a/pkg/kamailio/deb/lucid/changelog b/pkg/kamailio/deb/lucid/changelog index a6d9fdc..79099ce 100644 --- a/pkg/kamailio/deb/lucid/changelog +++ b/pkg/kamailio/deb/lucid/changelog @@ -1,3 +1,9 @@ +kamailio (3.3.1) unstable; urgency=low + + * update to 3.3.1 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 2 Aug 2012 14:40:00 +0100 + kamailio (3.3.0) unstable; urgency=low * update to 3.3.0 from upstream diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index a6d9fdc..79099ce 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (3.3.1) unstable; urgency=low + + * update to 3.3.1 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 2 Aug 2012 14:40:00 +0100 + kamailio (3.3.0) unstable; urgency=low * update to 3.3.0 from upstream diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index a6d9fdc..79099ce 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (3.3.1) unstable; urgency=low + + * update to 3.3.1 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 2 Aug 2012 14:40:00 +0100 + kamailio (3.3.0) unstable; urgency=low * update to 3.3.0 from upstream diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index a6d9fdc..79099ce 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (3.3.1) unstable; urgency=low + + * update to 3.3.1 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 2 Aug 2012 14:40:00 +0100 + kamailio (3.3.0) unstable; urgency=low * update to 3.3.0 from upstream

1 0

git:3.3: Ported gruu and outbound changes to p_usrloc module
by Marius Zbihlei 02 Aug '12

02 Aug '12

Module: sip-router Branch: 3.3 Commit: b5f95a603228fce13b2f168dfbf0120ed2e7befd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5f95a6… Author: Pawel Kuzak <pawel.kuzak(a)1und1.de> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Jul 13 16:06:48 2012 +0300 Ported gruu and outbound changes to p_usrloc module (cherry picked from commit 1f6bfa0b3ba15201c2ca3e2387a9f9e81e989643) --- modules_k/p_usrloc/dlist.h | 3 +- modules_k/p_usrloc/p_usrloc_mod.c | 12 ++ modules_k/p_usrloc/p_usrloc_mod.h | 3 + modules_k/p_usrloc/ucontact.c | 86 ++++++++++++++-- modules_k/p_usrloc/udomain.c | 212 +++++++++++++++++++++++++++++++++++-- modules_k/p_usrloc/udomain.h | 12 ++ modules_k/p_usrloc/ul_mi.c | 30 +++++ modules_k/p_usrloc/urecord.c | 48 ++++++++- modules_k/p_usrloc/urecord.h | 12 ++- modules_k/p_usrloc/usrloc.c | 18 ++-- 10 files changed, 406 insertions(+), 30 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b5f…

1 0

git:master: core: added md5 wrapper functions to build with Colin Plumb' s md5 code
by Daniel-Constantin Mierla 02 Aug '12

02 Aug '12

Module: sip-router Branch: master Commit: bcff862df5b937e3a6ff87e4415e0039fd989908 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bcff862… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 2 10:16:31 2012 +0200 core: added md5 wrapper functions to build with Colin Plumb's md5 code Author: Tzafrir Cohen <tzafrir(a)debian.org> --- md5.c | 11 ++++------- md5.h | 19 +++++++++++++++---- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/md5.c b/md5.c index 3da18c9..a0a036a 100644 --- a/md5.c +++ b/md5.c @@ -17,9 +17,6 @@ * will fill a supplied 16-byte array with the digest. */ -#include <config.h> -#include <compat.h> - #include <sys/types.h> #include <string.h> @@ -66,7 +63,7 @@ MD5Init(MD5_CTX *ctx) * of bytes. */ void -MD5Update(MD5_CTX *ctx, const unsigned char *input, size_t len) +U_MD5Update(MD5_CTX *ctx, const unsigned char *input, size_t len) { size_t have, need; @@ -117,15 +114,15 @@ MD5Pad(MD5_CTX *ctx) ((ctx->count >> 3) & (MD5_BLOCK_LENGTH - 1)); if (padlen < 1 + 8) padlen += MD5_BLOCK_LENGTH; - MD5Update(ctx, PADDING, padlen - 8); /* padlen - 8 <= 64 */ - MD5Update(ctx, count, 8); + U_MD5Update(ctx, PADDING, padlen - 8); /* padlen - 8 <= 64 */ + U_MD5Update(ctx, count, 8); } /* * Final wrapup--call MD5Pad, fill in digest and zero out ctx. */ void -MD5Final(unsigned char digest[MD5_DIGEST_LENGTH], MD5_CTX *ctx) +U_MD5Final(unsigned char digest[MD5_DIGEST_LENGTH], MD5_CTX *ctx) { int i; diff --git a/md5.h b/md5.h index f624360..211a131 100644 --- a/md5.h +++ b/md5.h @@ -19,16 +19,27 @@ #define MD5_DIGEST_LENGTH 16 #define MD5_DIGEST_STRING_LENGTH (MD5_DIGEST_LENGTH * 2 + 1) +/* Probably not the proper place, but will do for Debian: */ +#include <sys/types.h> + typedef struct MD5Context { u_int32_t state[4]; /* state */ u_int64_t count; /* number of bits, mod 2^64 */ - u_int8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */ + unsigned char buffer[MD5_BLOCK_LENGTH]; /* input buffer */ } MD5_CTX; void MD5Init(MD5_CTX *); -void MD5Update(MD5_CTX *, const u_int8_t *, size_t); +void U_MD5Update(MD5_CTX *, const unsigned char *, size_t); void MD5Pad(MD5_CTX *); -void MD5Final(u_int8_t [MD5_DIGEST_LENGTH], MD5_CTX *); -void MD5Transform(u_int32_t [4], const u_int8_t [MD5_BLOCK_LENGTH]); +void U_MD5Final(unsigned char [MD5_DIGEST_LENGTH], MD5_CTX *); +void MD5Transform(u_int32_t [4], const unsigned char [MD5_BLOCK_LENGTH]); + +static inline void MD5Update(MD5_CTX *ctx, const char *str, size_t len) { + U_MD5Update(ctx, (const unsigned char *)str, len); +} + +static inline void MD5Final(char buf[MD5_DIGEST_LENGTH], MD5_CTX *ctx) { + U_MD5Final((unsigned char *)buf, ctx); +} #endif /* _MD5_H_ */

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 August 2012