sr-dev September 2015

sr-dev@lists.kamailio.org

37 participants
388 discussions

git:master:5d50171a: ipops: fixed wrong location of double quites in example in docs
by Daniel-Constantin Mierla 15 Sep '15

15 Sep '15

Module: kamailio Branch: master Commit: 5d50171a4443eeafa5734afec58bbf41c07fece7 URL: https://github.com/kamailio/kamailio/commit/5d50171a4443eeafa5734afec58bbf4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-15T19:05:12+02:00 ipops: fixed wrong location of double quites in example in docs - reported by GH#327 --- Modified: modules/ipops/README Modified: modules/ipops/doc/ipops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5d50171a4443eeafa5734afec58bbf4… Patch: https://github.com/kamailio/kamailio/commit/5d50171a4443eeafa5734afec58bbf4… --- diff --git a/modules/ipops/README b/modules/ipops/README index b213b03..bc48751 100644 --- a/modules/ipops/README +++ b/modules/ipops/README @@ -453,10 +453,10 @@ if (srv_query ("_sip._udp.example.com", "udp") > 0) { $var(cnt) = $srvquery(udp=>count); $var(i) = 0; while ($var(i) < $var(cnt)) { - xlog ("port[$var(i)] $srvquery(udp=>port[$var(i)])\n)"; - xlog ("priority[$var(i)] $srvquery(udp=>priority[$var(i)])\n)"; - xlog ("target[$var(i)] $srvquery(udp=>target[$var(i)])\n)"; - xlog ("weight[$var(i)] $srvquery(udp=>weight[$var(i)])\n)"; + xlog ("port[$var(i)] $srvquery(udp=>port[$var(i)])\n"); + xlog ("priority[$var(i)] $srvquery(udp=>priority[$var(i)])\n"); + xlog ("target[$var(i)] $srvquery(udp=>target[$var(i)])\n"); + xlog ("weight[$var(i)] $srvquery(udp=>weight[$var(i)])\n"); $var(i) = $var(i) + 1; } } diff --git a/modules/ipops/doc/ipops_admin.xml b/modules/ipops/doc/ipops_admin.xml index 90c4168..4d77b9e 100644 --- a/modules/ipops/doc/ipops_admin.xml +++ b/modules/ipops/doc/ipops_admin.xml @@ -752,10 +752,10 @@ if (srv_query ("_sip._udp.example.com", "udp") > 0) { $var(cnt) = $srvquery(udp=>count); $var(i) = 0; while ($var(i) < $var(cnt)) { - xlog ("port[$var(i)] $srvquery(udp=>port[$var(i)])\n)"; - xlog ("priority[$var(i)] $srvquery(udp=>priority[$var(i)])\n)"; - xlog ("target[$var(i)] $srvquery(udp=>target[$var(i)])\n)"; - xlog ("weight[$var(i)] $srvquery(udp=>weight[$var(i)])\n)"; + xlog ("port[$var(i)] $srvquery(udp=>port[$var(i)])\n"); + xlog ("priority[$var(i)] $srvquery(udp=>priority[$var(i)])\n"); + xlog ("target[$var(i)] $srvquery(udp=>target[$var(i)])\n"); + xlog ("weight[$var(i)] $srvquery(udp=>weight[$var(i)])\n"); $var(i) = $var(i) + 1; } }

1 0

Utils module with HTTPS support
by Alessio Casco 15 Sep '15

15 Sep '15

Hello! Have you got any plans in the future to implement the Utils module with the HTTP over SSL capability? I'd like to have all the internal API requests encrypted. Thanks Alessio

1 0

git:master:80aa92a9: mem: updated prototype for qm_sums when q_malloc is compiled with debug mode off
by Daniel-Constantin Mierla 15 Sep '15

15 Sep '15

Module: kamailio Branch: master Commit: 80aa92a96a8b67e89c4555deba0cd4437d45fec6 URL: https://github.com/kamailio/kamailio/commit/80aa92a96a8b67e89c4555deba0cd44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-15T14:41:47+02:00 mem: updated prototype for qm_sums when q_malloc is compiled with debug mode off - reported by Juha Heinanen --- Modified: mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/80aa92a96a8b67e89c4555deba0cd44… Patch: https://github.com/kamailio/kamailio/commit/80aa92a96a8b67e89c4555deba0cd44… --- diff --git a/mem/q_malloc.c b/mem/q_malloc.c index 746ada8..518a511 100644 --- a/mem/q_malloc.c +++ b/mem/q_malloc.c @@ -916,7 +916,7 @@ void qm_sums(void* qmp) } #else -void qm_sums(struct qm_block* qm) +void qm_sums(void* qm) { return; }

1 0

git:master:d19719dd: htable.dump: add the type of the value to the result
by Daniel-Constantin Mierla 15 Sep '15

15 Sep '15

Module: kamailio Branch: master Commit: d19719dd3cbaa577a7a66360843ae6679445f123 URL: https://github.com/kamailio/kamailio/commit/d19719dd3cbaa577a7a66360843ae66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-15T13:20:02+02:00 htable.dump: add the type of the value to the result --- Modified: modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/d19719dd3cbaa577a7a66360843ae66… Patch: https://github.com/kamailio/kamailio/commit/d19719dd3cbaa577a7a66360843ae66… --- diff --git a/modules/htable/htable.c b/modules/htable/htable.c index 13ec1dd..c6e2250 100644 --- a/modules/htable/htable.c +++ b/modules/htable/htable.c @@ -990,17 +990,19 @@ static void htable_rpc_dump(rpc_t* rpc, void* c) goto error; } if(it->flags&AVP_VAL_STR) { - if(rpc->struct_add(vh, "SS", + if(rpc->struct_add(vh, "SSs", "name", &it->name.s, - "value", &it->value.s)<0) + "value", &it->value.s, + "type", "str")<0) { rpc->fault(c, 500, "Internal error adding item"); goto error; } } else { - if(rpc->struct_add(vh, "Sd", + if(rpc->struct_add(vh, "Sds", "name", &it->name.s, - "value", (int)it->value.n)<0) + "value", (int)it->value.n, + "type", "int")<0) { rpc->fault(c, 500, "Internal error adding item"); goto error;

1 0

git:4.3:637e7274: textopsx: include : in the value to be parsed as header name inside fixup_hname_param()
by Daniel-Constantin Mierla 15 Sep '15

15 Sep '15

Module: kamailio Branch: 4.3 Commit: 637e727484affa52489ff6d7bf2fe06fd6bb1085 URL: https://github.com/kamailio/kamailio/commit/637e727484affa52489ff6d7bf2fe06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-15T13:13:10+02:00 textopsx: include : in the value to be parsed as header name inside fixup_hname_param() - reported by BjÃ¶rn Bylander (cherry picked from commit 5f301c9e9b3d4b67a11aeaab45c21fd8d8929695) --- Modified: modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/637e727484affa52489ff6d7bf2fe06… Patch: https://github.com/kamailio/kamailio/commit/637e727484affa52489ff6d7bf2fe06… --- diff --git a/modules/textopsx/textopsx.c b/modules/textopsx/textopsx.c index ba49aee..b170eb8 100644 --- a/modules/textopsx/textopsx.c +++ b/modules/textopsx/textopsx.c @@ -544,7 +544,7 @@ static int fixup_hname_param(char *hname, struct hname_data** h) { (*h)->hname.len = hname - (*h)->hname.s; savec = *hname; *hname = ':'; - parse_hname2_short((*h)->hname.s, (*h)->hname.s+(*h)->hname.len, &hdr); + parse_hname2_short((*h)->hname.s, (*h)->hname.s+(*h)->hname.len+1, &hdr); *hname = savec; if (hdr.type == HDR_ERROR_T) goto err;

1 0

git:4.3:0b20349c: parse: more log messages in case of errors in parse_hname2_short()
by Daniel-Constantin Mierla 15 Sep '15

15 Sep '15

Module: kamailio Branch: 4.3 Commit: 0b20349c487f9a486db7407b3f712ca06531b9d1 URL: https://github.com/kamailio/kamailio/commit/0b20349c487f9a486db7407b3f712ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-15T13:13:01+02:00 parse: more log messages in case of errors in parse_hname2_short() (cherry picked from commit 3913cc881030cccc9518733e18363402f2dfb18e) --- Modified: parser/parse_hname2.c --- Diff: https://github.com/kamailio/kamailio/commit/0b20349c487f9a486db7407b3f712ca… Patch: https://github.com/kamailio/kamailio/commit/0b20349c487f9a486db7407b3f712ca… --- diff --git a/parser/parse_hname2.c b/parser/parse_hname2.c index ff273d0..9db38af 100644 --- a/parser/parse_hname2.c +++ b/parser/parse_hname2.c @@ -276,12 +276,18 @@ char* parse_hname2_short(char* const begin, const char* const end, struct hdr_fi return parse_hname2(begin, end, hdr); } /* not enough space */ + LM_ERR("not enough space to parse the header name in [%.*s] (%d)\n", + (int)(end-begin), begin, (int)(end-begin)); return NULL; } /* pad with whitespace - tipycal char after the ':' of the header name */ memset(hbuf, ' ', HBUF_MAX_SIZE); memcpy(hbuf, begin, end-begin); p = parse_hname2(hbuf, hbuf + 4 + (end-begin), hdr); - if(!p) return NULL; + if(!p) { + LM_ERR("failed to parse the header name in [%.*s] (%d)\n", + (int)(end-begin), begin, (int)(end-begin)); + return NULL; + } return begin + (p-hbuf); }

1 0

git:master:5f301c9e: textopsx: include : in the value to be parsed as header name inside fixup_hname_param()
by Daniel-Constantin Mierla 15 Sep '15

15 Sep '15

Module: kamailio Branch: master Commit: 5f301c9e9b3d4b67a11aeaab45c21fd8d8929695 URL: https://github.com/kamailio/kamailio/commit/5f301c9e9b3d4b67a11aeaab45c21fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-15T13:09:36+02:00 textopsx: include : in the value to be parsed as header name inside fixup_hname_param() - reported by BjÃ¶rn Bylander --- Modified: modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/5f301c9e9b3d4b67a11aeaab45c21fd… Patch: https://github.com/kamailio/kamailio/commit/5f301c9e9b3d4b67a11aeaab45c21fd… --- diff --git a/modules/textopsx/textopsx.c b/modules/textopsx/textopsx.c index ba49aee..b170eb8 100644 --- a/modules/textopsx/textopsx.c +++ b/modules/textopsx/textopsx.c @@ -544,7 +544,7 @@ static int fixup_hname_param(char *hname, struct hname_data** h) { (*h)->hname.len = hname - (*h)->hname.s; savec = *hname; *hname = ':'; - parse_hname2_short((*h)->hname.s, (*h)->hname.s+(*h)->hname.len, &hdr); + parse_hname2_short((*h)->hname.s, (*h)->hname.s+(*h)->hname.len+1, &hdr); *hname = savec; if (hdr.type == HDR_ERROR_T) goto err;

1 0

git:master:3913cc88: parse: more log messages in case of errors in parse_hname2_short()
by Daniel-Constantin Mierla 15 Sep '15

15 Sep '15

Module: kamailio Branch: master Commit: 3913cc881030cccc9518733e18363402f2dfb18e URL: https://github.com/kamailio/kamailio/commit/3913cc881030cccc9518733e1836340… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-15T13:08:53+02:00 parse: more log messages in case of errors in parse_hname2_short() --- Modified: parser/parse_hname2.c --- Diff: https://github.com/kamailio/kamailio/commit/3913cc881030cccc9518733e1836340… Patch: https://github.com/kamailio/kamailio/commit/3913cc881030cccc9518733e1836340… --- diff --git a/parser/parse_hname2.c b/parser/parse_hname2.c index ff273d0..9db38af 100644 --- a/parser/parse_hname2.c +++ b/parser/parse_hname2.c @@ -276,12 +276,18 @@ char* parse_hname2_short(char* const begin, const char* const end, struct hdr_fi return parse_hname2(begin, end, hdr); } /* not enough space */ + LM_ERR("not enough space to parse the header name in [%.*s] (%d)\n", + (int)(end-begin), begin, (int)(end-begin)); return NULL; } /* pad with whitespace - tipycal char after the ':' of the header name */ memset(hbuf, ' ', HBUF_MAX_SIZE); memcpy(hbuf, begin, end-begin); p = parse_hname2(hbuf, hbuf + 4 + (end-begin), hdr); - if(!p) return NULL; + if(!p) { + LM_ERR("failed to parse the header name in [%.*s] (%d)\n", + (int)(end-begin), begin, (int)(end-begin)); + return NULL; + } return begin + (p-hbuf); }

1 0

git:master:1aa95fbc: Add Rx-Specific-Action AVPs to work with some PCRFs
by Carsten Bock 14 Sep '15

14 Sep '15

Module: kamailio Branch: master Commit: 1aa95fbc87c6ec118d7675b5c9c0e01a61de091b URL: https://github.com/kamailio/kamailio/commit/1aa95fbc87c6ec118d7675b5c9c0e01… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-09-14T21:48:06+02:00 Add Rx-Specific-Action AVPs to work with some PCRFs --- Modified: modules/ims_qos/rx_aar.c Modified: modules/ims_qos/rx_avp.c Modified: modules/ims_qos/rx_avp.h --- Diff: https://github.com/kamailio/kamailio/commit/1aa95fbc87c6ec118d7675b5c9c0e01… Patch: https://github.com/kamailio/kamailio/commit/1aa95fbc87c6ec118d7675b5c9c0e01… --- diff --git a/modules/ims_qos/rx_aar.c b/modules/ims_qos/rx_aar.c index 13d91ac..2840cb0 100644 --- a/modules/ims_qos/rx_aar.c +++ b/modules/ims_qos/rx_aar.c @@ -796,6 +796,15 @@ int rx_send_aar(struct sip_msg *req, struct sip_msg *res, goto error; } + /* Add specific action AVP's */ + rx_add_specific_action_avp(aar, 1); // CHARGING_CORRELATION_EXCHANGE + rx_add_specific_action_avp(aar, 2); // INDICATION_OF_LOSS_OF_BEARER + rx_add_specific_action_avp(aar, 3); // INDICATION_RECOVERY_OF_BEARER + rx_add_specific_action_avp(aar, 4); // INDICATION_RELEASE_OF_BEARER + rx_add_specific_action_avp(aar, 5); // INDICATION_ESTABLISHMENT_OF_BEARER (now void) + rx_add_specific_action_avp(aar, 6); // IP-CAN_CHANGE + rx_add_specific_action_avp(aar, 12); // ACCESS_NETWORK_INFO_REPORT + show_callsessiondata(p_session_data); LM_DBG("Unlocking AAA session...\n"); @@ -886,6 +895,15 @@ int rx_send_aar_register(struct sip_msg *msg, AAASession* auth, saved_transactio /* Add media component description avp for register*/ rx_add_media_component_description_avp_register(aar); + /* Add specific action AVP's */ + rx_add_specific_action_avp(aar, 1); // CHARGING_CORRELATION_EXCHANGE + rx_add_specific_action_avp(aar, 2); // INDICATION_OF_LOSS_OF_BEARER + rx_add_specific_action_avp(aar, 3); // INDICATION_RECOVERY_OF_BEARER + rx_add_specific_action_avp(aar, 4); // INDICATION_RELEASE_OF_BEARER + rx_add_specific_action_avp(aar, 5); // INDICATION_ESTABLISHMENT_OF_BEARER (now void) + rx_add_specific_action_avp(aar, 6); // IP-CAN_CHANGE + rx_add_specific_action_avp(aar, 12); // ACCESS_NETWORK_INFO_REPORT + /* Add Framed IP address AVP*/ if (!rx_add_framed_ip_avp(&aar->avpList, ip, ip_version)) { LM_ERR("Unable to add framed IP AVP\n"); diff --git a/modules/ims_qos/rx_avp.c b/modules/ims_qos/rx_avp.c index a0a79f9..5f8cb5a 100644 --- a/modules/ims_qos/rx_avp.c +++ b/modules/ims_qos/rx_avp.c @@ -900,3 +900,22 @@ inline int rx_get_result_code(AAAMessage *msg, unsigned int *data) { } +/** + * Creates and adds an Acct-Application-Id AVP. + * @param msg - the Diameter message to add to. + * @param data - the value for the AVP payload + * @return CSCF_RETURN_TRUE on success or 0 on error + */ +inline int rx_add_specific_action_avp(AAAMessage *msg, unsigned int data) { + char x[4]; + set_4bytes(x, data); + + return + rx_add_avp(msg, x, 4, + AVP_IMS_Specific_Action, + AAA_AVP_FLAG_MANDATORY|AAA_AVP_FLAG_VENDOR_SPECIFIC, + IMS_vendor_id_3GPP, + AVP_DUPLICATE_DATA, + __FUNCTION__); +} + diff --git a/modules/ims_qos/rx_avp.h b/modules/ims_qos/rx_avp.h index 85c5cb3..894a3fd 100644 --- a/modules/ims_qos/rx_avp.h +++ b/modules/ims_qos/rx_avp.h @@ -93,5 +93,6 @@ AAA_AVP* rx_create_codec_data_avp(str *raw_sdp_stream, int number, int direction inline int rx_get_result_code(AAAMessage *msg, unsigned int *data); unsigned int rx_get_abort_cause(AAAMessage *msg); +inline int rx_add_specific_action_avp(AAAMessage *msg, unsigned int data); #endif /*__PCC_AVP_H*/

2 1

git:master:19b3d02c: Makefile: install-initd-centos target creates run dir
by Daniel-Constantin Mierla 14 Sep '15

14 Sep '15

Module: kamailio Branch: master Commit: 19b3d02c0fc4188b175d0d86e27f3c092900b10c URL: https://github.com/kamailio/kamailio/commit/19b3d02c0fc4188b175d0d86e27f3c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-14T22:29:55+02:00 Makefile: install-initd-centos target creates run dir --- Modified: Makefile --- Diff: https://github.com/kamailio/kamailio/commit/19b3d02c0fc4188b175d0d86e27f3c0… Patch: https://github.com/kamailio/kamailio/commit/19b3d02c0fc4188b175d0d86e27f3c0… --- diff --git a/Makefile b/Makefile index 2d28777..e89b8fc 100644 --- a/Makefile +++ b/Makefile @@ -997,9 +997,11 @@ install_initd_centos install-initd-centos: -e "s#GROUP=kamailio#GROUP=$(NAME)#g" \ < pkg/kamailio/rpm/kamailio.default \ > /etc/default/$(NAME) + mkdir -p /var/run/$(NAME) /usr/sbin/groupadd -r $(NAME) /usr/sbin/useradd -r -g $(NAME) -s /bin/false -c "Kamailio Daemon" \ -d /var/run/$(NAME) $(NAME) + chown $(NAME):$(NAME) /var/run/$(NAME) .PHONY: dbschema dbschema:

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2015