sr-dev February 2017

sr-dev@lists.kamailio.org

29 participants
364 discussions

git:master:ca276bb7: siptrace: add support for HEPv3

by Giacomo Vacca

Module: kamailio Branch: master Commit: ca276bb702a8ca97bf04b155f87e6cf39c2f0b7d URL: https://github.com/kamailio/kamailio/commit/ca276bb702a8ca97bf04b155f87e6cf… Author: Giacomo Vacca <giacomo.vacca(a)gmail.com> Committer: Giacomo Vacca <giacomo.vacca(a)gmail.com> Date: 2017-02-23T11:48:43+01:00 siptrace: add support for HEPv3 --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/ca276bb702a8ca97bf04b155f87e6cf… Patch: https://github.com/kamailio/kamailio/commit/ca276bb702a8ca97bf04b155f87e6cf…

7 years, 10 months

git:master:281e8e98: sipcapture: add macros to pack HEPv3 chunks

by Giacomo Vacca

Module: kamailio Branch: master Commit: 281e8e980c70f38218844d1da0c5e257399ffda3 URL: https://github.com/kamailio/kamailio/commit/281e8e980c70f38218844d1da0c5e25… Author: Giacomo Vacca <giacomo.vacca(a)gmail.com> Committer: Giacomo Vacca <giacomo.vacca(a)gmail.com> Date: 2017-02-23T11:46:45+01:00 sipcapture: add macros to pack HEPv3 chunks --- Modified: src/modules/sipcapture/hep.h --- Diff: https://github.com/kamailio/kamailio/commit/281e8e980c70f38218844d1da0c5e25… Patch: https://github.com/kamailio/kamailio/commit/281e8e980c70f38218844d1da0c5e25… --- diff --git a/src/modules/sipcapture/hep.h b/src/modules/sipcapture/hep.h index 10812a2..e4ff77b 100644 --- a/src/modules/sipcapture/hep.h +++ b/src/modules/sipcapture/hep.h @@ -177,5 +177,52 @@ struct hep_generic_recv { typedef struct hep_generic_recv hep_generic_recv_t; +#define HEP3_PACK_INIT(buf) \ + union { \ + hep_chunk_uint8_t chunk8; \ + hep_chunk_uint16_t chunk16; \ + hep_chunk_uint32_t chunk32; \ + hep_chunk_t chunkpl; \ + uint16_t len; \ + } _tmpu; \ + char *_tmp_p = (buf); \ + memcpy(_tmp_p, "HEP3", 4); \ + _tmp_p += 4 + 2/* skip length */; + +#define HEP3_PACK_FINALIZE(buf, lenp) \ + do { \ + _tmpu.len = htons(_tmp_p - (char *)(buf)); \ + memcpy((void *)(&(((hep_ctrl_t *)(buf))->length)), (void*)&_tmpu.len, 2); \ + *lenp = _tmp_p - (char *)(buf); \ + } while (0) + +#define _HEP3_PACK_CHUNK_GENERIC(type, tmpvar, vid, tid, val) \ + do { \ + (tmpvar).chunk.vendor_id = htons(vid); \ + (tmpvar).chunk.type_id = htons(tid); \ + (tmpvar).chunk.length = htons(sizeof(type)); \ + (tmpvar).data = (val); \ + memcpy(_tmp_p, (void *) &(tmpvar), sizeof(type)); \ + _tmp_p += sizeof(type); \ + } while (0) + +#define HEP3_PACK_CHUNK_UINT8(vid, tid, val) _HEP3_PACK_CHUNK_GENERIC(hep_chunk_uint8_t, _tmpu.chunk8, vid, tid, val) +#define HEP3_PACK_CHUNK_UINT16(vid, tid, val) _HEP3_PACK_CHUNK_GENERIC(hep_chunk_uint16_t, _tmpu.chunk16, vid, tid, htons(val)) +#define HEP3_PACK_CHUNK_UINT16_NBO(vid, tid, val) _HEP3_PACK_CHUNK_GENERIC(hep_chunk_uint16_t, _tmpu.chunk16, vid, tid, (val)) +#define HEP3_PACK_CHUNK_UINT32(vid, tid, val) _HEP3_PACK_CHUNK_GENERIC(hep_chunk_uint32_t, _tmpu.chunk32, vid, tid, htonl(val)) +#define HEP3_PACK_CHUNK_UINT32_NBO(vid, tid, val) _HEP3_PACK_CHUNK_GENERIC(hep_chunk_uint32_t, _tmpu.chunk32, vid, tid, (val)) + +#define HEP3_PACK_CHUNK_DATA(vid, tid, val, len) \ + do { \ + _tmpu.chunkpl.vendor_id = htons(vid); \ + _tmpu.chunkpl.type_id = htons(tid); \ + _tmpu.chunkpl.length = htons(sizeof(hep_chunk_t) + (len)); \ + memcpy(_tmp_p, (void *) &_tmpu.chunkpl, sizeof(hep_chunk_t)); \ + _tmp_p += sizeof(hep_chunk_t); \ + memcpy(_tmp_p, (void *) (val), len); \ + _tmp_p += len; \ + } while (0) + +#define HEP3_PACK_CHUNK_IP6(vid, tid, paddr) HEP3_PACK_CHUNK_DATA(vid, tid, paddr, sizeof(struct in6_addr)) #endif

7 years, 10 months

[kamailio/kamailio] Add HEPv3 support to siptrace (#1006)

by Giacomo Vacca

This PR allows kamailio to duplicate messages to Homer using HEPv3 [0]. An optional correlation ID (which can contain PVs) can be passed to `sip_trace()`. The packing macros in hep.h are authored by @camilleoudot and I've just used them. An example of formats: ``` modparam("siptrace", "duplicate_uri", "sip:127.0.0.1:9062") ... sip_trace("sip:127.0.0.1:9060", "123"); // duplicate URI + correlation ID sip_trace("", "345"); // default URI + correlation ID sip_trace("", "$fU-678"); // default URI + correlation ID with PVs sip_trace(); // default URI + no correlation ID ``` [0] https://github.com/sipcapture/HEP/blob/master/docs/HEP3_rev12.pdf You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1006 -- Commit Summary -- * sipcapture: add macros to pack HEPv3 chunks * siptrace: add support for HEPv3 * siptrace: update doc with support for HEPv3 * siptrace: update doc with editor -- File Changes -- M src/modules/sipcapture/hep.h (47) M src/modules/siptrace/doc/siptrace.xml (5) M src/modules/siptrace/doc/siptrace_admin.xml (60) M src/modules/siptrace/siptrace.c (321) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1006.patch https://github.com/kamailio/kamailio/pull/1006.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1006

7 years, 10 months

git:master:9e6f94e0: topos: export intermodule api to set storage functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9e6f94e0ed3845f5da0c548e04f549906f58456e URL: https://github.com/kamailio/kamailio/commit/9e6f94e0ed3845f5da0c548e04f5499… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-23T07:52:38+01:00 topos: export intermodule api to set storage functions --- Modified: src/modules/topos/api.h Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/9e6f94e0ed3845f5da0c548e04f5499… Patch: https://github.com/kamailio/kamailio/commit/9e6f94e0ed3845f5da0c548e04f5499… --- diff --git a/src/modules/topos/api.h b/src/modules/topos/api.h index 9002d90..1e27416 100644 --- a/src/modules/topos/api.h +++ b/src/modules/topos/api.h @@ -29,6 +29,7 @@ #ifndef _TOPOS_API_H_ #define _TOPOS_API_H_ +#include "../../core/sr_module.h" #include "tps_storage.h" typedef int (*tps_insert_dialog_f)(tps_data_t *td); @@ -51,4 +52,37 @@ typedef struct tps_storage_api { tps_end_dialog_f end_dialog; } tps_storage_api_t; + +typedef int (*tps_set_storage_api_f)(tps_storage_api_t *tsa); +int tps_set_storage_api(tps_storage_api_t *tsa); + + +/** + * @brief TOPOS API structure + */ +typedef struct topos_api { + tps_set_storage_api_f set_storage_api; +} topos_api_t; + +typedef int (*bind_topos_f)(topos_api_t* api); + +/** + * @brief Load the TOPOS API + */ +static inline int topos_load_api(topos_api_t *api) +{ + bind_topos_f bindtopos; + + bindtopos = (bind_topos_f)find_export("bind_topos", 0, 0); + if(bindtopos == 0) { + LM_ERR("cannot find bind_topos\n"); + return -1; + } + if (bindtopos(api)==-1) { + LM_ERR("cannot bind topos api\n"); + return -1; + } + return 0; +} + #endif diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 29a31c1..00f75a6 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -58,6 +58,7 @@ #include "tps_storage.h" #include "tps_msg.h" +#include "api.h" MODULE_VERSION @@ -92,6 +93,15 @@ static int child_init(int rank); /* Module destroy function prototype */ static void destroy(void); +int bind_topos(topos_api_t *api); + +static cmd_export_t cmds[]={ + {"bind_topos", (cmd_function)bind_topos, 0, + 0, 0, 0}, + + {0, 0, 0, 0, 0, 0} +}; + static param_export_t params[]={ {"db_url", PARAM_STR, &_tps_db_url}, {"mask_callid", PARAM_INT, &_tps_param_mask_callid}, @@ -107,7 +117,7 @@ static param_export_t params[]={ struct module_exports exports= { "topos", DEFAULT_DLFLAGS, /* dlopen flags */ - 0, + cmds, params, 0, /* exported statistics */ 0, /* exported MI functions */ @@ -356,3 +366,17 @@ int tps_msg_sent(void *data) return 0; } +/** + * + */ +int bind_topos(topos_api_t *api) +{ + if (!api) { + ERR("Invalid parameter value\n"); + return -1; + } + memset(api, 0, sizeof(topos_api_t)); + api->set_storage_api = tps_set_storage_api; + + return 0; +} diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 23f0da0..9bb416f 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -85,6 +85,18 @@ static tps_storage_api_t _tps_storage_api = { /** * */ +int tps_set_storage_api(tps_storage_api_t *tsa) +{ + if(tsa==NULL) + return -1; + memcpy(&_tps_storage_api, tsa, sizeof(tps_storage_api_t)); + + return 0; +} + +/** + * + */ int tps_storage_lock_set_init(void) { _tps_storage_lock_set = lock_set_alloc(TPS_STORAGE_LOCK_SIZE);

7 years, 10 months

[kamailio/kamailio] kamailio crashes on CANCEL due to empty reply_lumps (#872)

by apogrebennyk

We have a crash in kamailio 4.4.4 after t_next_contacts() has been called from failure route, if at this very moment when kamailio is preparing new INVITE the caller sends a cancel. #0 build_res_buf_from_sip_req (code=3186024432, code@entry=487, text=0x25, new_tag=0x7f8dcf5fb2b0 <tm_tag>, msg=0x7f8dbde6cf78, returned_len=0xb7, bmark=0x4) at msg_translator.c:2395 #1 0x00007f8dcf35f7b2 in _reply (trans=0x7f8dbde70960, p_msg=0x7f8dbde6cf78, code=487, text=<optimized out>, lock=1) at t_reply.c:712 #2 0x00007f8dcf3b5e8b in e2e_cancel (cancel_msg=0x7f8dbde6dff0, cancel_msg@entry=0x7f8dd26bb750, t_cancel=0x25, t_invite=0x7f8dbde70960) at t_fwd.c:1278 So the scheme is the following: proxy > INVITE < 486 > INVITE* < CANCEL Victor has investigated this and found that the issue seems to be related to the reply lumps added by append_to_reply when processing initial invite. In order to reproduce this you need children>=2. When first target replies 486 the proxy calls t_next_contacts() and starts preparing invite to the next target and at this time another process receives cancel and destroys the transaction, the process handling that invite message(*) gets crashed. While we are investigating the possibility to move the append_to_reply calls to the branch route, would it be possible to avoid crash by some kind of lock mechanism? The thing is that it's not always possible to move append_to_reply to the branch route, e.g. our proxy is deployed behind stateless lb with multiple interfaces and proxy needs to tell lb which interface to use already in the 100 Trying reply it sends to lb as a first thing when receiving a message. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/872

7 years, 10 months

[kamailio/kamailio] ucontacts in shared memory even on DB_ONLY (#997)

by Victor Seva

I've detected that the allocated shared memory is always growing due to ``` proxy[2527]: NOTICE: fm_status: count=376594 size= 103410648 bytes from usrloc: ucontact.c: new_ucontact(98) proxy[2527]: NOTICE: fm_status: count=1882939 size= 110079752 bytes from usrloc: ../../ut.h: shm_str_dup(723) ``` we do have usrloc in db_mode 3 ( DB_ONLY ). This is kamailio 4.4.4 version Investigation underway. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/997

7 years, 10 months

[kamailio/kamailio] rtpproxy: ice_candidate_priority_avp has missleading documentation (#1003)

by Rick

### Description Dokumentation says: ``` If specified and if value of the avp value is not 0, rtpproxy_manage function adds ICE relay candidate attributes to sdp stream(s) containing ICE candidate attributes. ``` I would read it as, if the avp is set and the value is 0 no ICE relay candidate attributes, would be added. Instead a ### Troubleshooting #### Reproduction #### Debugging Data #### Log Messages ``` Feb 20 15:21:45 <local0.err> voip-integration-cust1 kamailio[33439]: ERROR: rtpproxy [rtpproxy.c:2332]: force_rtp_proxy(): invalid ice candidate priority value 0 Feb 20 15:21:51 <local0.err> voip-integration-cust1 kamailio[33439]: ERROR: rtpproxy [rtpproxy.c:2332]: force_rtp_proxy(): invalid ice candidate priority value 0 ``` #### SIP Traffic ### Possible Solutions Accept 0 as a possible value or change documentation to give information that 0 is no valid input. ### Additional Information -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1003

7 years, 10 months

git:4.4:e49eca30: rtpproxy: allow 0 as value for ice candidate avp

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: e49eca307a2e442bb6f362e8317be2a4750cbe25 URL: https://github.com/kamailio/kamailio/commit/e49eca307a2e442bb6f362e8317be2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-22T22:24:58+01:00 rtpproxy: allow 0 as value for ice candidate avp - reported by GH #1003 (cherry picked from commit 0bac7c351ba444c6693c76a7dd2fce6e93b9885a) (cherry picked from commit 71b9cb347eb67489adda62148eb6ebdf0a681217) --- Modified: modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/e49eca307a2e442bb6f362e8317be2a… Patch: https://github.com/kamailio/kamailio/commit/e49eca307a2e442bb6f362e8317be2a… --- diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index c3f39ec..7144418 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -2536,7 +2536,7 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forc &ice_candidate_priority_val, 0) == NULL) { ice_candidate_priority_val.n = 2; - } else if ((ice_candidate_priority_val.n < 1) || + } else if ((ice_candidate_priority_val.n < 0) || (ice_candidate_priority_val.n > 2)) { LM_ERR("invalid ice candidate priority value %d\n", ice_candidate_priority_val.n);

7 years, 10 months

git:5.0:0bac7c35: rtpproxy: allow 0 as value for ice candidate avp

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 0bac7c351ba444c6693c76a7dd2fce6e93b9885a URL: https://github.com/kamailio/kamailio/commit/0bac7c351ba444c6693c76a7dd2fce6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-22T22:19:47+01:00 rtpproxy: allow 0 as value for ice candidate avp - reported by GH #1003 (cherry picked from commit 71b9cb347eb67489adda62148eb6ebdf0a681217) --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/0bac7c351ba444c6693c76a7dd2fce6… Patch: https://github.com/kamailio/kamailio/commit/0bac7c351ba444c6693c76a7dd2fce6… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 61d23e6..e445ea3 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -2326,7 +2326,7 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, &ice_candidate_priority_val, 0) == NULL) { ice_candidate_priority_val.n = 2; - } else if ((ice_candidate_priority_val.n < 1) || + } else if ((ice_candidate_priority_val.n < 0) || (ice_candidate_priority_val.n > 2)) { LM_ERR("invalid ice candidate priority value %d\n", ice_candidate_priority_val.n);

7 years, 10 months

git:master:71b9cb34: rtpproxy: allow 0 as value for ice candidate avp

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 71b9cb347eb67489adda62148eb6ebdf0a681217 URL: https://github.com/kamailio/kamailio/commit/71b9cb347eb67489adda62148eb6ebd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-22T22:16:55+01:00 rtpproxy: allow 0 as value for ice candidate avp - reported by GH #1003 --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/71b9cb347eb67489adda62148eb6ebd… Patch: https://github.com/kamailio/kamailio/commit/71b9cb347eb67489adda62148eb6ebd… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 61d23e6..e445ea3 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -2326,7 +2326,7 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, &ice_candidate_priority_val, 0) == NULL) { ice_candidate_priority_val.n = 2; - } else if ((ice_candidate_priority_val.n < 1) || + } else if ((ice_candidate_priority_val.n < 0) || (ice_candidate_priority_val.n > 2)) { LM_ERR("invalid ice candidate priority value %d\n", ice_candidate_priority_val.n);

7 years, 10 months

← Newer
1
...
7
8
9
10
11
12
13
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2017