sr-dev May 2015

sr-dev@lists.kamailio.org

34 participants
297 discussions

git:master:63127b26: erlang: fix build on squeeze and precise

by Seudin Kasumovic

Module: kamailio Branch: master Commit: 63127b261668e0efdea5b0ddb5f16a03dd9f02bc URL: https://github.com/kamailio/kamailio/commit/63127b261668e0efdea5b0ddb5f16a0… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2015-05-28T18:26:34+02:00 erlang: fix build on squeeze and precise Check if defined decode of unicode atoms type. --- Modified: modules/erlang/handle_emsg.c Modified: modules/erlang/pv_xbuff.c --- Diff: https://github.com/kamailio/kamailio/commit/63127b261668e0efdea5b0ddb5f16a0… Patch: https://github.com/kamailio/kamailio/commit/63127b261668e0efdea5b0ddb5f16a0… --- diff --git a/modules/erlang/handle_emsg.c b/modules/erlang/handle_emsg.c index a599f9f..e43bb1f 100644 --- a/modules/erlang/handle_emsg.c +++ b/modules/erlang/handle_emsg.c @@ -460,9 +460,13 @@ int handle_rex_call(cnode_handler_t *phandler,erlang_ref_ex_t *ref, erlang_pid * */ ei_get_type(request->buff,&request->index,&type,&size); - +#ifdef ERL_SMALL_ATOM_EXT if (type == ERL_ATOM_EXT || type == ERL_SMALL_ATOM_EXT) { +#else + if (type == ERL_ATOM_EXT) + { +#endif if (ei_decode_atom(request->buff,&request->index,module)) { encode_error_msg(response, ref, "error", "Failed to decode module name"); @@ -477,8 +481,13 @@ int handle_rex_call(cnode_handler_t *phandler,erlang_ref_ex_t *ref, erlang_pid * ei_get_type(request->buff,&request->index,&type,&size); +#ifdef ERL_SMALL_ATOM_EXT if (type == ERL_ATOM_EXT || type == ERL_SMALL_ATOM_EXT) { +#else + if (type == ERL_ATOM_EXT) + { +#endif if (ei_decode_atom(request->buff,&request->index,method)) { encode_error_msg(response, ref, "error", "Failed to decode method name"); diff --git a/modules/erlang/pv_xbuff.c b/modules/erlang/pv_xbuff.c index 7e80e92..cdfbd58 100644 --- a/modules/erlang/pv_xbuff.c +++ b/modules/erlang/pv_xbuff.c @@ -977,7 +977,9 @@ int xavp_decode(ei_x_buff *xbuff, int *index, sr_xavp_t **xavp,int level) switch (type) { case ERL_ATOM_EXT: - +#ifdef ERL_SMALL_ATOM_EXT + case ERL_SMALL_ATOM_EXT: +#endif name.len = snprintf(_s,sizeof(_s),"a%d",counter++); pbuf = (char*)pkg_realloc(pbuf,size+1);

8 years, 11 months

git:master:89382ad9: modules/ims_registrar_scscf: on save send back contact params in 200OK

by jaybeepee

Module: kamailio Branch: master Commit: 89382ad9ced840c0e4822cc0c5af6397aa6e1468 URL: https://github.com/kamailio/kamailio/commit/89382ad9ced840c0e4822cc0c5af639… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-05-28T17:49:30+02:00 modules/ims_registrar_scscf: on save send back contact params in 200OK - this is required to tell VoLTE phones what capabilities have been accepted by IMS - TODO: nice to have a black/whitelist --- Modified: modules/ims_registrar_scscf/reply.c --- Diff: https://github.com/kamailio/kamailio/commit/89382ad9ced840c0e4822cc0c5af639… Patch: https://github.com/kamailio/kamailio/commit/89382ad9ced840c0e4822cc0c5af639… --- diff --git a/modules/ims_registrar_scscf/reply.c b/modules/ims_registrar_scscf/reply.c index 17022da..5847e7a 100644 --- a/modules/ims_registrar_scscf/reply.c +++ b/modules/ims_registrar_scscf/reply.c @@ -93,6 +93,7 @@ static inline unsigned int calc_buf_len(impurecord_t* impurec) { int qlen; int i=0; ucontact_t* c; + param_t *tmp; len = 0; while (i<MAX_CONTACTS_PER_IMPU && (c=impurec->newcontacts[i])) { @@ -111,6 +112,27 @@ static inline unsigned int calc_buf_len(impurecord_t* impurec) { + 1 /* dquote */ ; } + tmp = c->params; + while (tmp) { + if ((tmp->name.s[0] == 'R' || tmp->name.s[0]=='r') && tmp->name.len == 8 && !memcmp(tmp->name.s+1, "eceived", 7)) { + tmp = tmp->next; + continue; + } + if ((tmp->name.s[0] == 'Q' || tmp->name.s[0]=='q') && tmp->name.len == 1) { + tmp = tmp->next; + continue; + } + if ((tmp->name.s[0] == 'E' || tmp->name.s[0] == 'e') && tmp->name.len == 7 && !memcmp(tmp->name.s + 1, "xpires", 6)) { + tmp = tmp->next; + continue; + } + len += tmp->name.len; + if (tmp->body.len > 0) { + len = len + 1/*=*/ + 2/*2 x "*/; + len += tmp->body.len; + } + tmp=tmp->next; + } } i++; } @@ -401,6 +423,7 @@ int build_contact(impurecord_t* impurec, contact_for_header_t** contact_header) char *p, *cp; int fl, len; ucontact_t* c; + param_t* tmp; *contact_header = 0; int i=0; @@ -460,6 +483,34 @@ int build_contact(impurecord_t* impurec, contact_for_header_t** contact_header) p += c->received.len; *p++ = '\"'; } + + /* put in the rest of the params except Q and received */ + tmp = c->params; + while (tmp) { + if ((tmp->name.s[0] == 'R' || tmp->name.s[0]=='r') && tmp->name.len == 8 && !memcmp(tmp->name.s+1, "eceived", 7)) { + tmp = tmp->next; + continue; + } + if ((tmp->name.s[0] == 'Q' || tmp->name.s[0]=='q') && tmp->name.len == 1) { + tmp = tmp->next; + continue; + } + if ((tmp->name.s[0] == 'E' || tmp->name.s[0]=='e') && tmp->name.len == 7 && !memcmp(tmp->name.s+1, "xpires", 6)) { + tmp = tmp->next; + continue; + } + *p++ = ';'; + memcpy(p, tmp->name.s, tmp->name.len); + p += tmp->name.len; + if (tmp->body.len > 0) { + *p++ = '='; + *p++ = '\"'; + memcpy(p, tmp->body.s, tmp->body.len); + p += tmp->body.len; + *p++ = '\"'; + } + tmp = tmp->next; + } } i++; }

8 years, 11 months

git:master:b1d22743: modules/ims_registrar_scscf: changed order of locking to be consistently ordered

by jaybeepee

Module: kamailio Branch: master Commit: b1d227435e368d37ff0f354a43045ada5d8010a7 URL: https://github.com/kamailio/kamailio/commit/b1d227435e368d37ff0f354a43045ad… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-05-28T17:47:05+02:00 modules/ims_registrar_scscf: changed order of locking to be consistently ordered --- Modified: modules/ims_registrar_scscf/registrar_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/b1d227435e368d37ff0f354a43045ad… Patch: https://github.com/kamailio/kamailio/commit/b1d227435e368d37ff0f354a43045ad… --- diff --git a/modules/ims_registrar_scscf/registrar_notify.c b/modules/ims_registrar_scscf/registrar_notify.c index ae2d95b..cb57f9c 100644 --- a/modules/ims_registrar_scscf/registrar_notify.c +++ b/modules/ims_registrar_scscf/registrar_notify.c @@ -232,8 +232,8 @@ int can_publish_reg(struct sip_msg *msg, char *_t, char *str2) { LM_DBG("Identity found in SP[%d][%d]\n", i, j); ret = CSCF_RETURN_TRUE; - ul.unlock_udomain((udomain_t*) _t, &presentity_uri); ul.unlock_subscription(r->s); + ul.unlock_udomain((udomain_t*) _t, &presentity_uri); goto done; } } @@ -390,8 +390,8 @@ int can_subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) { LM_DBG("Identity found in SP[%d][%d]\n", i, j); ret = CSCF_RETURN_TRUE; + ul.unlock_subscription(r->s); ul.unlock_udomain((udomain_t*) _t, &presentity_uri); - ul.unlock_subscription(r->s); goto done; } }

8 years, 11 months

git:master:55d8344d: ims_registrar_scscf: Align ims_registrar_scscf with latest ims_usrloc_scscf

by Carsten Bock

Module: kamailio Branch: master Commit: 55d8344d4fd0e7b7671c871d82768a0798ba3a52 URL: https://github.com/kamailio/kamailio/commit/55d8344d4fd0e7b7671c871d82768a0… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-05-28T17:36:58+02:00 ims_registrar_scscf: Align ims_registrar_scscf with latest ims_usrloc_scscf --- Modified: modules/ims_registrar_scscf/save.c Modified: modules/ims_registrar_scscf/userdata_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/55d8344d4fd0e7b7671c871d82768a0… Patch: https://github.com/kamailio/kamailio/commit/55d8344d4fd0e7b7671c871d82768a0… --- diff --git a/modules/ims_registrar_scscf/save.c b/modules/ims_registrar_scscf/save.c index 7100b2c..b3ecfac 100644 --- a/modules/ims_registrar_scscf/save.c +++ b/modules/ims_registrar_scscf/save.c @@ -474,10 +474,10 @@ void free_ims_subscription_data(ims_subscription *s) { shm_free(s->private_identity.s); ul.unlock_subscription(s); #ifdef EXTRA_DEBUG - LM_DBG("SUBSCRIPTION LOCK %p destroyed\n", s->slock); + LM_DBG("SUBSCRIPTION LOCK %p destroyed\n", s->lock); #endif - lock_destroy(s->slock); - lock_dealloc(s->slock); + lock_destroy(s->lock); + lock_dealloc(s->lock); shm_free(s); } diff --git a/modules/ims_registrar_scscf/userdata_parser.c b/modules/ims_registrar_scscf/userdata_parser.c index eeeb901..362570b 100644 --- a/modules/ims_registrar_scscf/userdata_parser.c +++ b/modules/ims_registrar_scscf/userdata_parser.c @@ -859,21 +859,21 @@ static ims_subscription* parse_ims_subscription(xmlDocPtr doc, xmlNodePtr root) if (rc) s->service_profiles_cnt++; } - s->slock = lock_alloc(); - if (s->slock==0) { + s->lock = lock_alloc(); + if (s->lock==0) { LM_ERR("Failed to allocate Lock for IMS Subscription\n"); shm_free(s); return 0; } - if (lock_init(s->slock)==0){ + if (lock_init(s->lock)==0){ LM_ERR("Failed to initialize Lock for IMS Subscription\n"); - lock_dealloc(s->slock); - s->slock=0; + lock_dealloc(s->lock); + s->lock=0; shm_free(s); return 0; } #ifdef EXTRA_DEBUG - LM_DBG("LOCK CREATED FOR SUBSCRIPTION [%.*s]: %p\n", s->private_identity.len, s->private_identity.s, s->slock); + LM_DBG("LOCK CREATED FOR SUBSCRIPTION [%.*s]: %p\n", s->private_identity.len, s->private_identity.s, s->lock); #endif return s; }

8 years, 11 months

git:master:ca2d6314: smsops: New module for handling 3GPP SMS over IP

by Carsten Bock

Module: kamailio Branch: master Commit: ca2d6314df6163b301a97e8829cb18926bf51e38 URL: https://github.com/kamailio/kamailio/commit/ca2d6314df6163b301a97e8829cb189… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-05-28T17:33:01+02:00 smsops: New module for handling 3GPP SMS over IP --- Added: modules/smsops/Makefile Added: modules/smsops/doc/Makefile Added: modules/smsops/doc/smsops.xml Added: modules/smsops/doc/smsops_admin.xml Added: modules/smsops/smsops.c Added: modules/smsops/smsops_impl.c Added: modules/smsops/smsops_impl.h Modified: Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/ca2d6314df6163b301a97e8829cb189… Patch: https://github.com/kamailio/kamailio/commit/ca2d6314df6163b301a97e8829cb189…

8 years, 11 months

git:master:4e6d2ae0: rtpengine: regenerate README

by Richard Fuchs

Module: kamailio Branch: master Commit: 4e6d2ae0171669a351148f5d199d68d2c3c7c2eb URL: https://github.com/kamailio/kamailio/commit/4e6d2ae0171669a351148f5d199d68d… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2015-05-28T10:24:43-04:00 rtpengine: regenerate README --- Modified: modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/4e6d2ae0171669a351148f5d199d68d… Patch: https://github.com/kamailio/kamailio/commit/4e6d2ae0171669a351148f5d199d68d…

8 years, 11 months

git:master:054b501e: rtpengine: update docs

by Richard Fuchs

Module: kamailio Branch: master Commit: 054b501e5571e129adc5c642b3b5d3d4261347e5 URL: https://github.com/kamailio/kamailio/commit/054b501e5571e129adc5c642b3b5d3d… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2015-05-28T10:24:43-04:00 rtpengine: update docs --- Modified: modules/rtpengine/doc/rtpengine.xml Modified: modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/054b501e5571e129adc5c642b3b5d3d… Patch: https://github.com/kamailio/kamailio/commit/054b501e5571e129adc5c642b3b5d3d… --- diff --git a/modules/rtpengine/doc/rtpengine.xml b/modules/rtpengine/doc/rtpengine.xml index 6b0e208..438baf2 100644 --- a/modules/rtpengine/doc/rtpengine.xml +++ b/modules/rtpengine/doc/rtpengine.xml @@ -91,7 +91,7 @@ <holder><ulink url='http://www.voipembedded.com'>VoIPEmbedded Inc.</ulink></holder> </copyright> <copyright> - <year>2013-2014</year> + <year>2013-2015</year> <holder>Sipwise GmbH</holder> </copyright> </bookinfo> diff --git a/modules/rtpengine/doc/rtpengine_admin.xml b/modules/rtpengine/doc/rtpengine_admin.xml index 140ad6b..ecc5c1e 100644 --- a/modules/rtpengine/doc/rtpengine_admin.xml +++ b/modules/rtpengine/doc/rtpengine_admin.xml @@ -476,11 +476,17 @@ rtpengine_offer(); </para></listitem> <listitem><para> <emphasis>trust-address</emphasis> - flags that IP address in &sdp; should - be trusted. Without this flag, the &rtp; proxy ignores address in + be trusted. Starting with rtpengine 3.8, this is the default behaviour. + In older versions, without this flag the &rtp; proxy ignores the address in the &sdp; and uses source address of the &sip; message as media address which is passed to the &rtp; proxy. </para></listitem> <listitem><para> + <emphasis>SIP-source-address</emphasis> - the opposite of + <emphasis>trust-address</emphasis>. Restores the old default behaviour + of ignoring endpoint addresses in the &sdp; body. + </para></listitem> + <listitem><para> <emphasis>replace-origin</emphasis> - flags that IP from the origin description (o=) should be also changed. </para></listitem> @@ -590,6 +596,39 @@ rtpengine_offer(); immediate deletion. This option only makes sense for <emphasis>delete</emphasis> operations. </para></listitem> + <listitem><para> + <emphasis>strict-source</emphasis> - instructs the &rtp; proxy to check the + source addresses of all incoming &rtp; packets and drop the packets if the + address doesn't match. + </para></listitem> + <listitem><para> + <emphasis>media-handover</emphasis> - the antithesis of + <emphasis>strict-source</emphasis>. Instructs the &rtp; proxy not only to accept + mismatching &rtp; source addresses (as it normally would), but also to accept + them as the new endpoint address of the opposite media flow. Not recommended + as it allows media streams to be hijacked by an attacker. + </para></listitem> + <listitem><para> + <emphasis>DTLS=...</emphasis> - influence the behaviour of DTLS-SRTP. Possible + values are <quote>no</quote> or <quote>off</quote> to suppress offering or + accepting DTLS-SRTP, and <quote>passive</quote> to prefer participating in + DTLS-SRTP in a passive role. + </para></listitem> + <listitem><para> + <emphasis>SDES-off</emphasis> - don't offer SDES when it normally would. In an SRTP + context, this leaves DTLS-SRTP as the only other option. + </para></listitem> + <listitem><para> + <emphasis>SDES-unencrypted_srtp, SDES-unencrypted_srtcp, + SDES-unauthenticated_srtp</emphasis> - these directly reflect the SDES session + parameters from RFC 4568 and will make the &rtp; proxy offer these parameters + when offering SDES. + </para></listitem> + <listitem><para> + <emphasis>SDES-encrypted_srtp, SDES-encrypted_srtcp, + SDES-authenticated_srtp</emphasis> - the opposites of the flags above. Useful + if accepting these parameters is not desired and they should be rejected instead. + </para></listitem> </itemizedlist> </listitem> </itemizedlist>

8 years, 11 months

git:master:ca62f577: rtpengine: parse delete-delay option as integer, not string

by Richard Fuchs

Module: kamailio Branch: master Commit: ca62f577232aa60c5679224965cde377b61b71ee URL: https://github.com/kamailio/kamailio/commit/ca62f577232aa60c5679224965cde37… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2015-05-28T10:24:43-04:00 rtpengine: parse delete-delay option as integer, not string --- Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/ca62f577232aa60c5679224965cde37… Patch: https://github.com/kamailio/kamailio/commit/ca62f577232aa60c5679224965cde37… --- diff --git a/modules/rtpengine/doc/rtpengine_admin.xml b/modules/rtpengine/doc/rtpengine_admin.xml index 6be5386..140ad6b 100644 --- a/modules/rtpengine/doc/rtpengine_admin.xml +++ b/modules/rtpengine/doc/rtpengine_admin.xml @@ -584,6 +584,12 @@ rtpengine_offer(); value will revert to the default TOS (normally 184). A value of -1 may be used to leave the currently used TOS unchanged. </para></listitem> + <listitem><para> + <emphasis>delete-delay=...</emphasis> - override the default delay (in seconds) + before a call is actually deleted from memory. Can be set to zero to effectuate + immediate deletion. This option only makes sense for <emphasis>delete</emphasis> + operations. + </para></listitem> </itemizedlist> </listitem> </itemizedlist> diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index 609ebc5..c48757f 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -1260,6 +1260,8 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu } else if (str_eq(&key, "TOS") && val.s) bencode_dictionary_add_integer(ng_flags->dict, "TOS", atoi(val.s)); + else if (str_eq(&key, "delete-delay") && val.s) + bencode_dictionary_add_integer(ng_flags->dict, "delete delay", atoi(val.s)); else goto generic; goto next;

8 years, 11 months

git:master:a129cc1a: Revert "modules/ims_usrloc_scscf: clean up plus some small improvements"

by jaybeepee

Module: kamailio Branch: master Commit: a129cc1a5aee03d6a6e846f29763c40122d78c00 URL: https://github.com/kamailio/kamailio/commit/a129cc1a5aee03d6a6e846f29763c40… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-05-28T15:45:45+02:00 Revert "modules/ims_usrloc_scscf: clean up plus some small improvements" This reverts commit 21d6237ac620b552656bd5510064cc91823a26a0. --- Modified: modules/ims_usrloc_scscf/bin_utils.c Modified: modules/ims_usrloc_scscf/bin_utils.h Modified: modules/ims_usrloc_scscf/dlist.c Modified: modules/ims_usrloc_scscf/dlist.h Modified: modules/ims_usrloc_scscf/hslot_sp.c Modified: modules/ims_usrloc_scscf/hslot_sp.h Modified: modules/ims_usrloc_scscf/impurecord.c Modified: modules/ims_usrloc_scscf/impurecord.h Modified: modules/ims_usrloc_scscf/udomain.c Modified: modules/ims_usrloc_scscf/udomain.h Modified: modules/ims_usrloc_scscf/ul_mod.c Modified: modules/ims_usrloc_scscf/ul_rpc.c Modified: modules/ims_usrloc_scscf/usrloc.c Modified: modules/ims_usrloc_scscf/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/a129cc1a5aee03d6a6e846f29763c40… Patch: https://github.com/kamailio/kamailio/commit/a129cc1a5aee03d6a6e846f29763c40…

8 years, 11 months

git:master:21d6237a: modules/ims_usrloc_scscf: clean up plus some small improvements

by jaybeepee

Module: kamailio Branch: master Commit: 21d6237ac620b552656bd5510064cc91823a26a0 URL: https://github.com/kamailio/kamailio/commit/21d6237ac620b552656bd5510064cc9… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-05-28T15:16:43+02:00 modules/ims_usrloc_scscf: clean up plus some small improvements - changed from stats to counters - IMS subscription now referenced and stored in a list (less memory/easier mngmt) - cleanup around locking and reference counting --- Modified: modules/ims_usrloc_scscf/bin_utils.c Modified: modules/ims_usrloc_scscf/bin_utils.h Modified: modules/ims_usrloc_scscf/dlist.c Modified: modules/ims_usrloc_scscf/dlist.h Modified: modules/ims_usrloc_scscf/hslot_sp.c Modified: modules/ims_usrloc_scscf/hslot_sp.h Modified: modules/ims_usrloc_scscf/impurecord.c Modified: modules/ims_usrloc_scscf/impurecord.h Modified: modules/ims_usrloc_scscf/udomain.c Modified: modules/ims_usrloc_scscf/udomain.h Modified: modules/ims_usrloc_scscf/ul_mod.c Modified: modules/ims_usrloc_scscf/ul_rpc.c Modified: modules/ims_usrloc_scscf/usrloc.c Modified: modules/ims_usrloc_scscf/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/21d6237ac620b552656bd5510064cc9… Patch: https://github.com/kamailio/kamailio/commit/21d6237ac620b552656bd5510064cc9…

8 years, 11 months

← Newer
1
2
3
4
5
6
7
8
9
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2015